Commit 6df8d9aa authored by Alex Ng's avatar Alex Ng Committed by Greg Kroah-Hartman

Drivers: hv: balloon: Correctly update onlined page count

Previously, num_pages_onlined was updated using value from memory online
notifier. This is incorrect because they assume that all hot-added pages
are online, even though we only online the amount that's backed by the
host. We should update num_pages_onlined only when the balloon driver
marks a page as online.
Signed-off-by: default avatarAlex Ng <alexng@messages.microsoft.com>
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ea81fdf0
...@@ -584,10 +584,6 @@ static int hv_memory_notifier(struct notifier_block *nb, unsigned long val, ...@@ -584,10 +584,6 @@ static int hv_memory_notifier(struct notifier_block *nb, unsigned long val,
switch (val) { switch (val) {
case MEM_ONLINE: case MEM_ONLINE:
spin_lock_irqsave(&dm_device.ha_lock, flags);
dm_device.num_pages_onlined += mem->nr_pages;
spin_unlock_irqrestore(&dm_device.ha_lock, flags);
/* Fall through */
case MEM_CANCEL_ONLINE: case MEM_CANCEL_ONLINE:
if (dm_device.ha_waiting) { if (dm_device.ha_waiting) {
dm_device.ha_waiting = false; dm_device.ha_waiting = false;
...@@ -644,6 +640,9 @@ static void hv_page_online_one(struct hv_hotadd_state *has, struct page *pg) ...@@ -644,6 +640,9 @@ static void hv_page_online_one(struct hv_hotadd_state *has, struct page *pg)
__online_page_set_limits(pg); __online_page_set_limits(pg);
__online_page_increment_counters(pg); __online_page_increment_counters(pg);
__online_page_free(pg); __online_page_free(pg);
WARN_ON_ONCE(!spin_is_locked(&dm_device.ha_lock));
dm_device.num_pages_onlined++;
} }
static void hv_bring_pgs_online(struct hv_hotadd_state *has, static void hv_bring_pgs_online(struct hv_hotadd_state *has,
......
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