Commit 1d33c2ca authored by David Hildenbrand's avatar David Hildenbrand Committed by Michael S. Tsirkin
Browse files

virtio-mem: don't always trigger the workqueue when offlining memory 



Let's trigger from offlining code only when we're not allowed to unplug
online memory. Handle the other case (memmap possibly freeing up another
memory block) when actually removing memory. We now also properly handle
the case when removing already offline memory blocks via
virtio_mem_mb_remove(). When removing via virtio_mem_remove(), when
unloading the driver, virtio_mem_retry() is a NOP and safe to use.

While at it, move retry handling when offlining out of
virtio_mem_notify_offline(), to share it with Big Block Mode (BBM)
soon.

This is a preparation for Big Block Mode (BBM), whereby we can see some
temporary offlining of memory blocks without actually making progress.
Imagine you have a Big Block that spans to Linux memory blocks. Assume
the first Linux memory blocks has no unmovable data on it. When we would
call offline_and_remove_memory() on the big block, we would
	1. Try to offline the first block. Works, notifiers triggered.
	   virtio_mem_retry() called.
	2. Try to offline the second block. Does not work.
	3. Re-online first block.
	4. Exit to main loop, exit workqueue.
	5. Retry immediately (due to virtio_mem_retry()), go to 1.
The result are endless retries.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Link: https://lore.kernel.org/r/20201112133815.13332-16-david@redhat.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 42006682

drivers/virtio/virtio_mem.c

+28 −12
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ static void virtio_mem_fake_offline_going_offline(unsigned long pfn, 
						  unsigned long nr_pages);

static void virtio_mem_fake_offline_cancel_offline(unsigned long pfn,

						   unsigned long nr_pages);

static void virtio_mem_retry(struct virtio_mem *vm);



/*

 * Register a virtio-mem device so it will be considered for the online_page
@@ -447,9 +448,17 @@ static int virtio_mem_mb_add(struct virtio_mem *vm, unsigned long mb_id) 
static int virtio_mem_mb_remove(struct virtio_mem *vm, unsigned long mb_id)

{

	const uint64_t addr = virtio_mem_mb_id_to_phys(mb_id);

	int rc;



	dev_dbg(&vm->vdev->dev, "removing memory block: %lu\n", mb_id);

	return remove_memory(vm->nid, addr, memory_block_size_bytes());

	rc = remove_memory(vm->nid, addr, memory_block_size_bytes());

	if (!rc)

		/*

		 * We might have freed up memory we can now unplug, retry

		 * immediately instead of waiting.

		 */

		virtio_mem_retry(vm);

	return rc;

}



/*
@@ -464,11 +473,19 @@ static int virtio_mem_mb_offline_and_remove(struct virtio_mem *vm, 
					    unsigned long mb_id)

{

	const uint64_t addr = virtio_mem_mb_id_to_phys(mb_id);

	int rc;



	dev_dbg(&vm->vdev->dev, "offlining and removing memory block: %lu\n",

		mb_id);

	return offline_and_remove_memory(vm->nid, addr,

	rc = offline_and_remove_memory(vm->nid, addr,

				       memory_block_size_bytes());

	if (!rc)

		/*

		 * We might have freed up memory we can now unplug, retry

		 * immediately instead of waiting.

		 */

		virtio_mem_retry(vm);

	return rc;

}



/*
@@ -546,15 +563,6 @@ static void virtio_mem_notify_offline(struct virtio_mem *vm, 
		BUG();

		break;

	}



	/*

	 * Trigger the workqueue, maybe we can now unplug memory. Also,

	 * when we offline and remove a memory block, this will re-trigger

	 * us immediately - which is often nice because the removal of

	 * the memory block (e.g., memmap) might have freed up memory

	 * on other memory blocks we manage.

	 */

	virtio_mem_retry(vm);

}



static void virtio_mem_notify_online(struct virtio_mem *vm, unsigned long mb_id)
@@ -672,6 +680,14 @@ static int virtio_mem_memory_notifier_cb(struct notifier_block *nb, 
		break;

	case MEM_OFFLINE:

		virtio_mem_notify_offline(vm, mb_id);



		/*

		 * Trigger the workqueue. Now that we have some offline memory,

		 * maybe we can handle pending unplug requests.

		 */

		if (!unplug_online)

			virtio_mem_retry(vm);



		vm->hotplug_active = false;

		mutex_unlock(&vm->hotplug_mutex);

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE