Commit ffc763d0 authored by David Hildenbrand's avatar David Hildenbrand Committed by Linus Torvalds

virtio-mem: factor out hotplug specifics from virtio_mem_remove() into virtio_mem_deinit_hotplug()

Let's prepare for a new virtio-mem kdump mode in which we don't actually
hot(un)plug any memory but only observe the state of device blocks.

Link: https://lkml.kernel.org/r/20211005121430.30136-9-david@redhat.comSigned-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 84e17e68
...@@ -2667,9 +2667,8 @@ static int virtio_mem_probe(struct virtio_device *vdev) ...@@ -2667,9 +2667,8 @@ static int virtio_mem_probe(struct virtio_device *vdev)
return rc; return rc;
} }
static void virtio_mem_remove(struct virtio_device *vdev) static void virtio_mem_deinit_hotplug(struct virtio_mem *vm)
{ {
struct virtio_mem *vm = vdev->priv;
unsigned long mb_id; unsigned long mb_id;
int rc; int rc;
...@@ -2716,7 +2715,8 @@ static void virtio_mem_remove(struct virtio_device *vdev) ...@@ -2716,7 +2715,8 @@ static void virtio_mem_remove(struct virtio_device *vdev)
* away. Warn at least. * away. Warn at least.
*/ */
if (virtio_mem_has_memory_added(vm)) { if (virtio_mem_has_memory_added(vm)) {
dev_warn(&vdev->dev, "device still has system memory added\n"); dev_warn(&vm->vdev->dev,
"device still has system memory added\n");
} else { } else {
virtio_mem_delete_resource(vm); virtio_mem_delete_resource(vm);
kfree_const(vm->resource_name); kfree_const(vm->resource_name);
...@@ -2730,6 +2730,13 @@ static void virtio_mem_remove(struct virtio_device *vdev) ...@@ -2730,6 +2730,13 @@ static void virtio_mem_remove(struct virtio_device *vdev)
} else { } else {
vfree(vm->bbm.bb_states); vfree(vm->bbm.bb_states);
} }
}
static void virtio_mem_remove(struct virtio_device *vdev)
{
struct virtio_mem *vm = vdev->priv;
virtio_mem_deinit_hotplug(vm);
/* reset the device and cleanup the queues */ /* reset the device and cleanup the queues */
vdev->config->reset(vdev); vdev->config->reset(vdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment