Commit f504e15b authored by David Hildenbrand's avatar David Hildenbrand Committed by Michael S. Tsirkin

virtio-mem: remove unsafe unplug in Big Block Mode (BBM)

When "unsafe unplug" is enabled, we don't fake-offline all memory ahead of
actual memory offlining using alloc_contig_range(). Instead, we rely on
offline_pages() to also perform actual page migration, which might fail
or take a very long time.

In that case, it's possible to easily run into endless loops that cannot be
aborted anymore (as offlining is triggered by a workqueue then): For
example, a single (accidentally) permanently unmovable page in
ZONE_MOVABLE results in an endless loop. For ZONE_NORMAL, races between
isolating the pageblock (and checking for unmovable pages) and
concurrent page allocation are possible and similarly result in endless
loops.

The idea of the unsafe unplug mode was to make it possible to more
reliably unplug large memory blocks. However, (a) we really should be
tackling that differently, by extending the alloc_contig_range()-based
mechanism; and (b) this mode is not the default and as far as I know,
it's unused either way.

So let's simply get rid of it.
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20230713145551.2824980-2-david@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 8efc365b
...@@ -38,11 +38,6 @@ module_param(bbm_block_size, ulong, 0444); ...@@ -38,11 +38,6 @@ module_param(bbm_block_size, ulong, 0444);
MODULE_PARM_DESC(bbm_block_size, MODULE_PARM_DESC(bbm_block_size,
"Big Block size in bytes. Default is 0 (auto-detection)."); "Big Block size in bytes. Default is 0 (auto-detection).");
static bool bbm_safe_unplug = true;
module_param(bbm_safe_unplug, bool, 0444);
MODULE_PARM_DESC(bbm_safe_unplug,
"Use a safe unplug mechanism in BBM, avoiding long/endless loops");
/* /*
* virtio-mem currently supports the following modes of operation: * virtio-mem currently supports the following modes of operation:
* *
...@@ -2111,7 +2106,6 @@ static int virtio_mem_bbm_offline_remove_and_unplug_bb(struct virtio_mem *vm, ...@@ -2111,7 +2106,6 @@ static int virtio_mem_bbm_offline_remove_and_unplug_bb(struct virtio_mem *vm,
VIRTIO_MEM_BBM_BB_ADDED)) VIRTIO_MEM_BBM_BB_ADDED))
return -EINVAL; return -EINVAL;
if (bbm_safe_unplug) {
/* /*
* Start by fake-offlining all memory. Once we marked the device * Start by fake-offlining all memory. Once we marked the device
* block as fake-offline, all newly onlined memory will * block as fake-offline, all newly onlined memory will
...@@ -2119,8 +2113,7 @@ static int virtio_mem_bbm_offline_remove_and_unplug_bb(struct virtio_mem *vm, ...@@ -2119,8 +2113,7 @@ static int virtio_mem_bbm_offline_remove_and_unplug_bb(struct virtio_mem *vm,
* onlining/offlining until we have a consistent state. * onlining/offlining until we have a consistent state.
*/ */
mutex_lock(&vm->hotplug_mutex); mutex_lock(&vm->hotplug_mutex);
virtio_mem_bbm_set_bb_state(vm, bb_id, virtio_mem_bbm_set_bb_state(vm, bb_id, VIRTIO_MEM_BBM_BB_FAKE_OFFLINE);
VIRTIO_MEM_BBM_BB_FAKE_OFFLINE);
for (pfn = start_pfn; pfn < end_pfn; pfn += PAGES_PER_SECTION) { for (pfn = start_pfn; pfn < end_pfn; pfn += PAGES_PER_SECTION) {
page = pfn_to_online_page(pfn); page = pfn_to_online_page(pfn);
...@@ -2130,19 +2123,15 @@ static int virtio_mem_bbm_offline_remove_and_unplug_bb(struct virtio_mem *vm, ...@@ -2130,19 +2123,15 @@ static int virtio_mem_bbm_offline_remove_and_unplug_bb(struct virtio_mem *vm,
rc = virtio_mem_fake_offline(pfn, PAGES_PER_SECTION); rc = virtio_mem_fake_offline(pfn, PAGES_PER_SECTION);
if (rc) { if (rc) {
end_pfn = pfn; end_pfn = pfn;
goto rollback_safe_unplug; goto rollback;
} }
} }
mutex_unlock(&vm->hotplug_mutex); mutex_unlock(&vm->hotplug_mutex);
}
rc = virtio_mem_bbm_offline_and_remove_bb(vm, bb_id); rc = virtio_mem_bbm_offline_and_remove_bb(vm, bb_id);
if (rc) { if (rc) {
if (bbm_safe_unplug) {
mutex_lock(&vm->hotplug_mutex); mutex_lock(&vm->hotplug_mutex);
goto rollback_safe_unplug; goto rollback;
}
return rc;
} }
rc = virtio_mem_bbm_unplug_bb(vm, bb_id); rc = virtio_mem_bbm_unplug_bb(vm, bb_id);
...@@ -2154,7 +2143,7 @@ static int virtio_mem_bbm_offline_remove_and_unplug_bb(struct virtio_mem *vm, ...@@ -2154,7 +2143,7 @@ static int virtio_mem_bbm_offline_remove_and_unplug_bb(struct virtio_mem *vm,
VIRTIO_MEM_BBM_BB_UNUSED); VIRTIO_MEM_BBM_BB_UNUSED);
return rc; return rc;
rollback_safe_unplug: rollback:
for (pfn = start_pfn; pfn < end_pfn; pfn += PAGES_PER_SECTION) { for (pfn = start_pfn; pfn < end_pfn; pfn += PAGES_PER_SECTION) {
page = pfn_to_online_page(pfn); page = pfn_to_online_page(pfn);
if (!page) if (!page)
......
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