The patch titled container freezer: uninline thaw_process() has been added to the -mm tree. Its filename is container-freezer-implement-freezer-cgroup-subsystem-uninline-thaw_process.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: container freezer: uninline thaw_process() From: Matt Helsley <matthltc@xxxxxxxxxx> Now that the cgroup freezer system also calls thaw_process() inlining these functions uses more space. Uninlining returns some space: Before: text data bss dec hex filename 4260872 275532 290816 4827220 49a854 vmlinux After: text data bss dec hex filename 4260852 275532 290816 4827200 49a840 vmlinux Signed-off-by: Matt Helsley <matthltc@xxxxxxxxxx> Cc: Rafael J. Wysocki <rjw@xxxxxxx> Cc: Pavel Machek <pavel@xxxxxxx> Cc: Cedric Le Goater <clg@xxxxxxxxxx> Cc: Serge E. Hallyn <serue@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/freezer.h | 29 +++-------------------------- kernel/freezer.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 26 deletions(-) diff -puN include/linux/freezer.h~container-freezer-implement-freezer-cgroup-subsystem-uninline-thaw_process include/linux/freezer.h --- a/include/linux/freezer.h~container-freezer-implement-freezer-cgroup-subsystem-uninline-thaw_process +++ a/include/linux/freezer.h @@ -46,34 +46,11 @@ static inline bool should_send_signal(st /* * Wake up a frozen process - * - * task_lock() is needed to prevent the race with refrigerator() which may - * occur if the freezing of tasks fails. Namely, without the lock, if the - * freezing of tasks failed, thaw_tasks() might have run before a task in - * refrigerator() could call frozen_process(), in which case the task would be - * frozen and no one would thaw it. */ -static inline int __thaw_process(struct task_struct *p) -{ - if (frozen(p)) { - p->flags &= ~PF_FROZEN; - return 1; - } - clear_freeze_flag(p); - return 0; -} +extern int __thaw_process(struct task_struct *p); -static inline int thaw_process(struct task_struct *p) -{ - task_lock(p); - if (__thaw_process(p) == 1) { - task_unlock(p); - wake_up_process(p); - return 1; - } - task_unlock(p); - return 0; -} +/* Takes and releases task alloc lock using task_lock() */ +extern int thaw_process(struct task_struct *p); extern void refrigerator(void); extern int freeze_processes(void); diff -puN kernel/freezer.c~container-freezer-implement-freezer-cgroup-subsystem-uninline-thaw_process kernel/freezer.c --- a/kernel/freezer.c~container-freezer-implement-freezer-cgroup-subsystem-uninline-thaw_process +++ a/kernel/freezer.c @@ -120,3 +120,34 @@ void cancel_freezing(struct task_struct spin_unlock_irqrestore(&p->sighand->siglock, flags); } } + +/* + * Wake up a frozen process + * + * task_lock() is needed to prevent the race with refrigerator() which may + * occur if the freezing of tasks fails. Namely, without the lock, if the + * freezing of tasks failed, thaw_tasks() might have run before a task in + * refrigerator() could call frozen_process(), in which case the task would be + * frozen and no one would thaw it. + */ +int __thaw_process(struct task_struct *p) +{ + if (frozen(p)) { + p->flags &= ~PF_FROZEN; + return 1; + } + clear_freeze_flag(p); + return 0; +} + +int thaw_process(struct task_struct *p) +{ + task_lock(p); + if (__thaw_process(p) == 1) { + task_unlock(p); + wake_up_process(p); + return 1; + } + task_unlock(p); + return 0; +} _ Patches currently in -mm which might be from matthltc@xxxxxxxxxx are container-freezer-add-tif_freeze-flag-to-all-architectures.patch container-freezer-make-refrigerator-always-available.patch container-freezer-implement-freezer-cgroup-subsystem.patch container-freezer-implement-freezer-cgroup-subsystem-checkpatch-fixes.patch container-freezer-implement-freezer-cgroup-subsystem-fix-freezer-kconfig.patch container-freezer-implement-freezer-cgroup-subsystem-uninline-thaw_process.patch container-freezer-skip-frozen-cgroups-during-power-management-resume.patch container-freezer-prevent-frozen-tasks-or-cgroups-from-changing.patch container-freezer-make-freezer-state-names-less-generic.patch container-freezer-cleanup-comment.patch container-freezer-rename-check_if_frozen.patch container-freezer-document-the-cgroup-freezer-subsystem.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html