Commit fecba962 authored by Brian King's avatar Brian King Committed by Paul Mackerras

powerpc: Add reboot notifier to Collaborative Memory Manager

When running Active Memory Sharing, pages can get marked as
"loaned" with the hypervisor by the CMM driver. This state gets
cleared by the system firmware when rebooting the partition.
When using kexec to boot a new kernel, this state never gets
cleared and the hypervisor and CMM driver can get out of sync
with respect to the number of pages currently marked "loaned".
Fix this by adding a reboot notifier to the CMM driver to deflate
the balloon and mark all pages as active.
Signed-off-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 2218108e
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/oom.h> #include <linux/oom.h>
#include <linux/reboot.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/stringify.h> #include <linux/stringify.h>
#include <linux/swap.h> #include <linux/swap.h>
...@@ -383,6 +384,26 @@ static void cmm_unregister_sysfs(struct sys_device *sysdev) ...@@ -383,6 +384,26 @@ static void cmm_unregister_sysfs(struct sys_device *sysdev)
sysdev_class_unregister(&cmm_sysdev_class); sysdev_class_unregister(&cmm_sysdev_class);
} }
/**
* cmm_reboot_notifier - Make sure pages are not still marked as "loaned"
*
**/
static int cmm_reboot_notifier(struct notifier_block *nb,
unsigned long action, void *unused)
{
if (action == SYS_RESTART) {
if (cmm_thread_ptr)
kthread_stop(cmm_thread_ptr);
cmm_thread_ptr = NULL;
cmm_free_pages(loaned_pages);
}
return NOTIFY_DONE;
}
static struct notifier_block cmm_reboot_nb = {
.notifier_call = cmm_reboot_notifier,
};
/** /**
* cmm_init - Module initialization * cmm_init - Module initialization
* *
...@@ -399,9 +420,12 @@ static int cmm_init(void) ...@@ -399,9 +420,12 @@ static int cmm_init(void)
if ((rc = register_oom_notifier(&cmm_oom_nb)) < 0) if ((rc = register_oom_notifier(&cmm_oom_nb)) < 0)
return rc; return rc;
if ((rc = cmm_sysfs_register(&cmm_sysdev))) if ((rc = register_reboot_notifier(&cmm_reboot_nb)))
goto out_oom_notifier; goto out_oom_notifier;
if ((rc = cmm_sysfs_register(&cmm_sysdev)))
goto out_reboot_notifier;
if (cmm_disabled) if (cmm_disabled)
return rc; return rc;
...@@ -415,6 +439,8 @@ static int cmm_init(void) ...@@ -415,6 +439,8 @@ static int cmm_init(void)
out_unregister_sysfs: out_unregister_sysfs:
cmm_unregister_sysfs(&cmm_sysdev); cmm_unregister_sysfs(&cmm_sysdev);
out_reboot_notifier:
unregister_reboot_notifier(&cmm_reboot_nb);
out_oom_notifier: out_oom_notifier:
unregister_oom_notifier(&cmm_oom_nb); unregister_oom_notifier(&cmm_oom_nb);
return rc; return rc;
...@@ -431,6 +457,7 @@ static void cmm_exit(void) ...@@ -431,6 +457,7 @@ static void cmm_exit(void)
if (cmm_thread_ptr) if (cmm_thread_ptr)
kthread_stop(cmm_thread_ptr); kthread_stop(cmm_thread_ptr);
unregister_oom_notifier(&cmm_oom_nb); unregister_oom_notifier(&cmm_oom_nb);
unregister_reboot_notifier(&cmm_reboot_nb);
cmm_free_pages(loaned_pages); cmm_free_pages(loaned_pages);
cmm_unregister_sysfs(&cmm_sysdev); cmm_unregister_sysfs(&cmm_sysdev);
} }
......
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