| From: David Hildenbrand <david@redhat.com> |
| Subject: virtio-mem: mark device ready before registering callbacks in kdump mode |
| Date: Wed, 4 Dec 2024 13:54:40 +0100 |
| |
| After the callbacks are registered we may immediately get a callback. So |
| mark the device ready before registering the callbacks. |
| |
| Link: https://lkml.kernel.org/r/20241204125444.1734652-10-david@redhat.com |
| Signed-off-by: David Hildenbrand <david@redhat.com> |
| Cc: Alexander Gordeev <agordeev@linux.ibm.com> |
| Cc: Baoquan He <bhe@redhat.com> |
| Cc: Christian Borntraeger <borntraeger@linux.ibm.com> |
| Cc: Claudio Imbrenda <imbrenda@linux.ibm.com> |
| Cc: Cornelia Huck <cohuck@redhat.com> |
| Cc: Dave Young <dyoung@redhat.com> |
| Cc: Eric Farman <farman@linux.ibm.com> |
| Cc: Eugenio Pérez <eperezma@redhat.com> |
| Cc: Heiko Carstens <hca@linux.ibm.com> |
| Cc: Janosch Frank <frankja@linux.ibm.com> |
| Cc: Jason Wang <jasowang@redhat.com> |
| Cc: Michael S. Tsirkin <mst@redhat.com> |
| Cc: Sven Schnelle <svens@linux.ibm.com> |
| Cc: Thomas Huth <thuth@redhat.com> |
| Cc: Vasily Gorbik <gor@linux.ibm.com> |
| Cc: Vivek Goyal <vgoyal@redhat.com> |
| Cc: Xuan Zhuo <xuanzhuo@linux.alibaba.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| drivers/virtio/virtio_mem.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/virtio/virtio_mem.c~virtio-mem-mark-device-ready-before-registering-callbacks-in-kdump-mode |
| +++ a/drivers/virtio/virtio_mem.c |
| @@ -2648,6 +2648,7 @@ static int virtio_mem_init_hotplug(struc |
| if (rc) |
| goto out_unreg_pm; |
| |
| + virtio_device_ready(vm->vdev); |
| return 0; |
| out_unreg_pm: |
| unregister_pm_notifier(&vm->pm_notifier); |
| @@ -2729,6 +2730,8 @@ static bool virtio_mem_vmcore_pfn_is_ram |
| |
| static int virtio_mem_init_kdump(struct virtio_mem *vm) |
| { |
| + /* We must be prepared to receive a callback immediately. */ |
| + virtio_device_ready(vm->vdev); |
| #ifdef CONFIG_PROC_VMCORE |
| dev_info(&vm->vdev->dev, "memory hot(un)plug disabled in kdump kernel\n"); |
| vm->vmcore_cb.pfn_is_ram = virtio_mem_vmcore_pfn_is_ram; |
| @@ -2870,8 +2873,6 @@ static int virtio_mem_probe(struct virti |
| if (rc) |
| goto out_del_vq; |
| |
| - virtio_device_ready(vdev); |
| - |
| /* trigger a config update to start processing the requested_size */ |
| if (!vm->in_kdump) { |
| atomic_set(&vm->config_changed, 1); |
| _ |
