85 lines
3.2 KiB
Diff
85 lines
3.2 KiB
Diff
|
From 05ee3017d156005e3d8d8fb19514d593858abd44 Mon Sep 17 00:00:00 2001
|
||
|
|
From: fangyi <eric.fangyi@huawei.com>
|
||
|
|
Date: Tue, 29 Oct 2024 19:51:41 +0800
|
||
|
|
Subject: [PATCH 3/6] Revert "vdpa: add vhost_vdpa_suspend"
|
||
|
|
|
||
|
|
Use a new scheme instead for kernel vdpa, So revert it.
|
||
|
|
|
||
|
|
This reverts commit 0bb302a9960a186fc488068d268dc373e6b70876.
|
||
|
|
---
|
||
|
|
hw/virtio/trace-events | 1 -
|
||
|
|
hw/virtio/vhost-vdpa.c | 26 --------------------------
|
||
|
|
2 files changed, 27 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
|
||
|
|
index 637cac4edf..de02bdc1d0 100644
|
||
|
|
--- a/hw/virtio/trace-events
|
||
|
|
+++ b/hw/virtio/trace-events
|
||
|
|
@@ -52,7 +52,6 @@ vhost_vdpa_set_vring_ready(void *dev, unsigned i, int r) "dev: %p, idx: %u, r: %
|
||
|
|
vhost_vdpa_dump_config(void *dev, const char *line) "dev: %p %s"
|
||
|
|
vhost_vdpa_set_config(void *dev, uint32_t offset, uint32_t size, uint32_t flags) "dev: %p offset: %"PRIu32" size: %"PRIu32" flags: 0x%"PRIx32
|
||
|
|
vhost_vdpa_get_config(void *dev, void *config, uint32_t config_len) "dev: %p config: %p config_len: %"PRIu32
|
||
|
|
-vhost_vdpa_suspend(void *dev) "dev: %p"
|
||
|
|
vhost_vdpa_dev_start(void *dev, bool started) "dev: %p started: %d"
|
||
|
|
vhost_vdpa_set_log_base(void *dev, uint64_t base, unsigned long long size, int refcnt, int fd, void *log) "dev: %p base: 0x%"PRIx64" size: %llu refcnt: %d fd: %d log: %p"
|
||
|
|
vhost_vdpa_set_vring_addr(void *dev, unsigned int index, unsigned int flags, uint64_t desc_user_addr, uint64_t used_user_addr, uint64_t avail_user_addr, uint64_t log_guest_addr) "dev: %p index: %u flags: 0x%x desc_user_addr: 0x%"PRIx64" used_user_addr: 0x%"PRIx64" avail_user_addr: 0x%"PRIx64" log_guest_addr: 0x%"PRIx64
|
||
|
|
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
|
||
|
|
index d49826845f..130afb06dc 100644
|
||
|
|
--- a/hw/virtio/vhost-vdpa.c
|
||
|
|
+++ b/hw/virtio/vhost-vdpa.c
|
||
|
|
@@ -865,13 +865,11 @@ static int vhost_vdpa_get_device_id(struct vhost_dev *dev,
|
||
|
|
|
||
|
|
static int vhost_vdpa_reset_device(struct vhost_dev *dev)
|
||
|
|
{
|
||
|
|
- struct vhost_vdpa *v = dev->opaque;
|
||
|
|
int ret;
|
||
|
|
uint8_t status = 0;
|
||
|
|
|
||
|
|
ret = vhost_vdpa_call(dev, VHOST_VDPA_SET_STATUS, &status);
|
||
|
|
trace_vhost_vdpa_reset_device(dev);
|
||
|
|
- v->suspended = false;
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -1274,29 +1272,6 @@ static void vhost_vdpa_svqs_stop(struct vhost_dev *dev)
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-static void vhost_vdpa_suspend(struct vhost_dev *dev)
|
||
|
|
-{
|
||
|
|
- struct vhost_vdpa *v = dev->opaque;
|
||
|
|
- int r;
|
||
|
|
-
|
||
|
|
- if (!vhost_vdpa_first_dev(dev)) {
|
||
|
|
- return;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- if (dev->backend_cap & BIT_ULL(VHOST_BACKEND_F_SUSPEND)) {
|
||
|
|
- trace_vhost_vdpa_suspend(dev);
|
||
|
|
- r = ioctl(v->device_fd, VHOST_VDPA_SUSPEND);
|
||
|
|
- if (unlikely(r)) {
|
||
|
|
- error_report("Cannot suspend: %s(%d)", g_strerror(errno), errno);
|
||
|
|
- } else {
|
||
|
|
- v->suspended = true;
|
||
|
|
- return;
|
||
|
|
- }
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- vhost_vdpa_reset_device(dev);
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)
|
||
|
|
{
|
||
|
|
struct vhost_vdpa *v = dev->opaque;
|
||
|
|
@@ -1310,7 +1285,6 @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
} else {
|
||
|
|
- vhost_vdpa_suspend(dev);
|
||
|
|
vhost_vdpa_svqs_stop(dev);
|
||
|
|
vhost_vdpa_host_notifiers_uninit(dev, dev->nvqs);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.43.0
|
||
|
|
|