forked from luck/tmp_suning_uos_patched
dbf520a9d7
This reverts commit6aa9707099
. Commit6aa9707099
("lockdep: check that no locks held at freeze time") causes problems with NFS root filesystems. The failures were noticed on OMAP2 and 3 boards during kernel init: [ BUG: swapper/0/1 still has locks held! ] 3.9.0-rc3-00344-ga937536 #1 Not tainted ------------------------------------- 1 lock held by swapper/0/1: #0: (&type->s_umount_key#13/1){+.+.+.}, at: [<c011e84c>] sget+0x248/0x574 stack backtrace: rpc_wait_bit_killable __wait_on_bit out_of_line_wait_on_bit __rpc_execute rpc_run_task rpc_call_sync nfs_proc_get_root nfs_get_root nfs_fs_mount_common nfs_try_mount nfs_fs_mount mount_fs vfs_kern_mount do_mount sys_mount do_mount_root mount_root prepare_namespace kernel_init_freeable kernel_init Although the rootfs mounts, the system is unstable. Here's a transcript from a PM test: http://www.pwsan.com/omap/testlogs/test_v3.9-rc3/20130317194234/pm/37xxevm/37xxevm_log.txt Here's what the test log should look like: http://www.pwsan.com/omap/testlogs/test_v3.8/20130218214403/pm/37xxevm/37xxevm_log.txt Mailing list discussion is here: http://lkml.org/lkml/2013/3/4/221 Deal with this for v3.9 by reverting the problem commit, until folks can figure out the right long-term course of action. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Mandeep Singh Baines <msb@chromium.org> Cc: Jeff Layton <jlayton@redhat.com> Cc: Shawn Guo <shawn.guo@linaro.org> Cc: <maciej.rutecki@gmail.com> Cc: Fengguang Wu <fengguang.wu@intel.com> Cc: Trond Myklebust <Trond.Myklebust@netapp.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Ben Chan <benchan@chromium.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Tejun Heo <tj@kernel.org> Cc: Rafael J. Wysocki <rjw@sisk.pl> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
243 lines
7.2 KiB
C++
243 lines
7.2 KiB
C++
/* Freezer declarations */
|
|
|
|
#ifndef FREEZER_H_INCLUDED
|
|
#define FREEZER_H_INCLUDED
|
|
|
|
#include <linux/sched.h>
|
|
#include <linux/wait.h>
|
|
#include <linux/atomic.h>
|
|
|
|
#ifdef CONFIG_FREEZER
|
|
extern atomic_t system_freezing_cnt; /* nr of freezing conds in effect */
|
|
extern bool pm_freezing; /* PM freezing in effect */
|
|
extern bool pm_nosig_freezing; /* PM nosig freezing in effect */
|
|
|
|
/*
|
|
* Timeout for stopping processes
|
|
*/
|
|
extern unsigned int freeze_timeout_msecs;
|
|
|
|
/*
|
|
* Check if a process has been frozen
|
|
*/
|
|
static inline bool frozen(struct task_struct *p)
|
|
{
|
|
return p->flags & PF_FROZEN;
|
|
}
|
|
|
|
extern bool freezing_slow_path(struct task_struct *p);
|
|
|
|
/*
|
|
* Check if there is a request to freeze a process
|
|
*/
|
|
static inline bool freezing(struct task_struct *p)
|
|
{
|
|
if (likely(!atomic_read(&system_freezing_cnt)))
|
|
return false;
|
|
return freezing_slow_path(p);
|
|
}
|
|
|
|
/* Takes and releases task alloc lock using task_lock() */
|
|
extern void __thaw_task(struct task_struct *t);
|
|
|
|
extern bool __refrigerator(bool check_kthr_stop);
|
|
extern int freeze_processes(void);
|
|
extern int freeze_kernel_threads(void);
|
|
extern void thaw_processes(void);
|
|
extern void thaw_kernel_threads(void);
|
|
|
|
static inline bool try_to_freeze(void)
|
|
{
|
|
might_sleep();
|
|
if (likely(!freezing(current)))
|
|
return false;
|
|
return __refrigerator(false);
|
|
}
|
|
|
|
extern bool freeze_task(struct task_struct *p);
|
|
extern bool set_freezable(void);
|
|
|
|
#ifdef CONFIG_CGROUP_FREEZER
|
|
extern bool cgroup_freezing(struct task_struct *task);
|
|
#else /* !CONFIG_CGROUP_FREEZER */
|
|
static inline bool cgroup_freezing(struct task_struct *task)
|
|
{
|
|
return false;
|
|
}
|
|
#endif /* !CONFIG_CGROUP_FREEZER */
|
|
|
|
/*
|
|
* The PF_FREEZER_SKIP flag should be set by a vfork parent right before it
|
|
* calls wait_for_completion(&vfork) and reset right after it returns from this
|
|
* function. Next, the parent should call try_to_freeze() to freeze itself
|
|
* appropriately in case the child has exited before the freezing of tasks is
|
|
* complete. However, we don't want kernel threads to be frozen in unexpected
|
|
* places, so we allow them to block freeze_processes() instead or to set
|
|
* PF_NOFREEZE if needed. Fortunately, in the ____call_usermodehelper() case the
|
|
* parent won't really block freeze_processes(), since ____call_usermodehelper()
|
|
* (the child) does a little before exec/exit and it can't be frozen before
|
|
* waking up the parent.
|
|
*/
|
|
|
|
|
|
/**
|
|
* freezer_do_not_count - tell freezer to ignore %current
|
|
*
|
|
* Tell freezers to ignore the current task when determining whether the
|
|
* target frozen state is reached. IOW, the current task will be
|
|
* considered frozen enough by freezers.
|
|
*
|
|
* The caller shouldn't do anything which isn't allowed for a frozen task
|
|
* until freezer_cont() is called. Usually, freezer[_do_not]_count() pair
|
|
* wrap a scheduling operation and nothing much else.
|
|
*/
|
|
static inline void freezer_do_not_count(void)
|
|
{
|
|
current->flags |= PF_FREEZER_SKIP;
|
|
}
|
|
|
|
/**
|
|
* freezer_count - tell freezer to stop ignoring %current
|
|
*
|
|
* Undo freezer_do_not_count(). It tells freezers that %current should be
|
|
* considered again and tries to freeze if freezing condition is already in
|
|
* effect.
|
|
*/
|
|
static inline void freezer_count(void)
|
|
{
|
|
current->flags &= ~PF_FREEZER_SKIP;
|
|
/*
|
|
* If freezing is in progress, the following paired with smp_mb()
|
|
* in freezer_should_skip() ensures that either we see %true
|
|
* freezing() or freezer_should_skip() sees !PF_FREEZER_SKIP.
|
|
*/
|
|
smp_mb();
|
|
try_to_freeze();
|
|
}
|
|
|
|
/**
|
|
* freezer_should_skip - whether to skip a task when determining frozen
|
|
* state is reached
|
|
* @p: task in quesion
|
|
*
|
|
* This function is used by freezers after establishing %true freezing() to
|
|
* test whether a task should be skipped when determining the target frozen
|
|
* state is reached. IOW, if this function returns %true, @p is considered
|
|
* frozen enough.
|
|
*/
|
|
static inline bool freezer_should_skip(struct task_struct *p)
|
|
{
|
|
/*
|
|
* The following smp_mb() paired with the one in freezer_count()
|
|
* ensures that either freezer_count() sees %true freezing() or we
|
|
* see cleared %PF_FREEZER_SKIP and return %false. This makes it
|
|
* impossible for a task to slip frozen state testing after
|
|
* clearing %PF_FREEZER_SKIP.
|
|
*/
|
|
smp_mb();
|
|
return p->flags & PF_FREEZER_SKIP;
|
|
}
|
|
|
|
/*
|
|
* These macros are intended to be used whenever you want allow a sleeping
|
|
* task to be frozen. Note that neither return any clear indication of
|
|
* whether a freeze event happened while in this function.
|
|
*/
|
|
|
|
/* Like schedule(), but should not block the freezer. */
|
|
#define freezable_schedule() \
|
|
({ \
|
|
freezer_do_not_count(); \
|
|
schedule(); \
|
|
freezer_count(); \
|
|
})
|
|
|
|
/* Like schedule_timeout_killable(), but should not block the freezer. */
|
|
#define freezable_schedule_timeout_killable(timeout) \
|
|
({ \
|
|
long __retval; \
|
|
freezer_do_not_count(); \
|
|
__retval = schedule_timeout_killable(timeout); \
|
|
freezer_count(); \
|
|
__retval; \
|
|
})
|
|
|
|
/*
|
|
* Freezer-friendly wrappers around wait_event_interruptible(),
|
|
* wait_event_killable() and wait_event_interruptible_timeout(), originally
|
|
* defined in <linux/wait.h>
|
|
*/
|
|
|
|
#define wait_event_freezekillable(wq, condition) \
|
|
({ \
|
|
int __retval; \
|
|
freezer_do_not_count(); \
|
|
__retval = wait_event_killable(wq, (condition)); \
|
|
freezer_count(); \
|
|
__retval; \
|
|
})
|
|
|
|
#define wait_event_freezable(wq, condition) \
|
|
({ \
|
|
int __retval; \
|
|
for (;;) { \
|
|
__retval = wait_event_interruptible(wq, \
|
|
(condition) || freezing(current)); \
|
|
if (__retval || (condition)) \
|
|
break; \
|
|
try_to_freeze(); \
|
|
} \
|
|
__retval; \
|
|
})
|
|
|
|
#define wait_event_freezable_timeout(wq, condition, timeout) \
|
|
({ \
|
|
long __retval = timeout; \
|
|
for (;;) { \
|
|
__retval = wait_event_interruptible_timeout(wq, \
|
|
(condition) || freezing(current), \
|
|
__retval); \
|
|
if (__retval <= 0 || (condition)) \
|
|
break; \
|
|
try_to_freeze(); \
|
|
} \
|
|
__retval; \
|
|
})
|
|
|
|
#else /* !CONFIG_FREEZER */
|
|
static inline bool frozen(struct task_struct *p) { return false; }
|
|
static inline bool freezing(struct task_struct *p) { return false; }
|
|
static inline void __thaw_task(struct task_struct *t) {}
|
|
|
|
static inline bool __refrigerator(bool check_kthr_stop) { return false; }
|
|
static inline int freeze_processes(void) { return -ENOSYS; }
|
|
static inline int freeze_kernel_threads(void) { return -ENOSYS; }
|
|
static inline void thaw_processes(void) {}
|
|
static inline void thaw_kernel_threads(void) {}
|
|
|
|
static inline bool try_to_freeze_nowarn(void) { return false; }
|
|
static inline bool try_to_freeze(void) { return false; }
|
|
|
|
static inline void freezer_do_not_count(void) {}
|
|
static inline void freezer_count(void) {}
|
|
static inline int freezer_should_skip(struct task_struct *p) { return 0; }
|
|
static inline void set_freezable(void) {}
|
|
|
|
#define freezable_schedule() schedule()
|
|
|
|
#define freezable_schedule_timeout_killable(timeout) \
|
|
schedule_timeout_killable(timeout)
|
|
|
|
#define wait_event_freezable(wq, condition) \
|
|
wait_event_interruptible(wq, condition)
|
|
|
|
#define wait_event_freezable_timeout(wq, condition, timeout) \
|
|
wait_event_interruptible_timeout(wq, condition, timeout)
|
|
|
|
#define wait_event_freezekillable(wq, condition) \
|
|
wait_event_killable(wq, condition)
|
|
|
|
#endif /* !CONFIG_FREEZER */
|
|
|
|
#endif /* FREEZER_H_INCLUDED */
|