From: Michal Hocko <mhocko@suse.cz>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>,
Tejun Heo <tj@kernel.org>, David Rientjes <rientjes@google.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Oleg Nesterov <oleg@redhat.com>,
Cong Wang <xiyou.wangcong@gmail.com>,
LKML <linux-kernel@vger.kernel.org>,
linux-pm@vger.kernel.org
Subject: Re: [PATCH -v2 3/5] PM: convert printk to pr_* equivalent
Date: Sun, 7 Dec 2014 11:26:07 +0100 [thread overview]
Message-ID: <20141207102607.GG15892@dhcp22.suse.cz> (raw)
In-Reply-To: <6656448.TBhAod4SQC@vostro.rjw.lan>
On Fri 05-12-14 23:40:55, Rafael J. Wysocki wrote:
> On Friday, December 05, 2014 05:41:45 PM Michal Hocko wrote:
> > While touching this area let's convert printk to pr_*. This also makes
> > the printing of continuation lines done properly.
> >
> > Signed-off-by: Michal Hocko <mhocko@suse.cz>
>
> This is fine by me.
>
> Please let me know if you want me to take it. Otherwise, please feel free to
> push it through a different tree.
I guess it will be easier to push this through Andrew's tree due to
other dependencies.
> > ---
> > kernel/power/process.c | 29 +++++++++++++++--------------
> > 1 file changed, 15 insertions(+), 14 deletions(-)
> >
> > diff --git a/kernel/power/process.c b/kernel/power/process.c
> > index 5a6ec8678b9a..3ac45f192e9f 100644
> > --- a/kernel/power/process.c
> > +++ b/kernel/power/process.c
> > @@ -84,8 +84,8 @@ static int try_to_freeze_tasks(bool user_only)
> > elapsed_msecs = elapsed_msecs64;
> >
> > if (todo) {
> > - printk("\n");
> > - printk(KERN_ERR "Freezing of tasks %s after %d.%03d seconds "
> > + pr_cont("\n");
> > + pr_err("Freezing of tasks %s after %d.%03d seconds "
> > "(%d tasks refusing to freeze, wq_busy=%d):\n",
> > wakeup ? "aborted" : "failed",
> > elapsed_msecs / 1000, elapsed_msecs % 1000,
> > @@ -101,7 +101,7 @@ static int try_to_freeze_tasks(bool user_only)
> > read_unlock(&tasklist_lock);
> > }
> > } else {
> > - printk("(elapsed %d.%03d seconds) ", elapsed_msecs / 1000,
> > + pr_cont("(elapsed %d.%03d seconds) ", elapsed_msecs / 1000,
> > elapsed_msecs % 1000);
> > }
> >
> > @@ -155,7 +155,7 @@ int freeze_processes(void)
> > atomic_inc(&system_freezing_cnt);
> >
> > pm_wakeup_clear();
> > - printk("Freezing user space processes ... ");
> > + pr_info("Freezing user space processes ... ");
> > pm_freezing = true;
> > oom_kills_saved = oom_kills_count();
> > error = try_to_freeze_tasks(true);
> > @@ -171,13 +171,13 @@ int freeze_processes(void)
> > if (oom_kills_count() != oom_kills_saved &&
> > !check_frozen_processes()) {
> > __usermodehelper_set_disable_depth(UMH_ENABLED);
> > - printk("OOM in progress.");
> > + pr_cont("OOM in progress.");
> > error = -EBUSY;
> > } else {
> > - printk("done.");
> > + pr_cont("done.");
> > }
> > }
> > - printk("\n");
> > + pr_cont("\n");
> > BUG_ON(in_atomic());
> >
> > if (error)
> > @@ -197,13 +197,14 @@ int freeze_kernel_threads(void)
> > {
> > int error;
> >
> > - printk("Freezing remaining freezable tasks ... ");
> > + pr_info("Freezing remaining freezable tasks ... ");
> > +
> > pm_nosig_freezing = true;
> > error = try_to_freeze_tasks(false);
> > if (!error)
> > - printk("done.");
> > + pr_cont("done.");
> >
> > - printk("\n");
> > + pr_cont("\n");
> > BUG_ON(in_atomic());
> >
> > if (error)
> > @@ -224,7 +225,7 @@ void thaw_processes(void)
> >
> > oom_killer_enable();
> >
> > - printk("Restarting tasks ... ");
> > + pr_info("Restarting tasks ... ");
> >
> > __usermodehelper_set_disable_depth(UMH_FREEZING);
> > thaw_workqueues();
> > @@ -243,7 +244,7 @@ void thaw_processes(void)
> > usermodehelper_enable();
> >
> > schedule();
> > - printk("done.\n");
> > + pr_cont("done.\n");
> > trace_suspend_resume(TPS("thaw_processes"), 0, false);
> > }
> >
> > @@ -252,7 +253,7 @@ void thaw_kernel_threads(void)
> > struct task_struct *g, *p;
> >
> > pm_nosig_freezing = false;
> > - printk("Restarting kernel threads ... ");
> > + pr_info("Restarting kernel threads ... ");
> >
> > thaw_workqueues();
> >
> > @@ -264,5 +265,5 @@ void thaw_kernel_threads(void)
> > read_unlock(&tasklist_lock);
> >
> > schedule();
> > - printk("done.\n");
> > + pr_cont("done.\n");
> > }
> >
>
> --
> I speak only for myself.
> Rafael J. Wysocki, Intel Open Source Technology Center.
--
Michal Hocko
SUSE Labs
next prev parent reply other threads:[~2014-12-07 10:26 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-21 7:27 [PATCH 0/4 -v2] OOM vs. freezer interaction fixes Michal Hocko
2014-10-21 7:27 ` [PATCH 1/4] freezer: Do not freeze tasks killed by OOM killer Michal Hocko
2014-10-21 12:04 ` Rafael J. Wysocki
2014-10-21 7:27 ` [PATCH 2/4] freezer: remove obsolete comments in __thaw_task() Michal Hocko
2014-10-21 12:04 ` Rafael J. Wysocki
2014-10-21 7:27 ` [PATCH 3/4] OOM, PM: OOM killed task shouldn't escape PM suspend Michal Hocko
2014-10-21 12:09 ` Rafael J. Wysocki
2014-10-21 13:14 ` Michal Hocko
2014-10-21 13:42 ` Rafael J. Wysocki
2014-10-21 14:11 ` Michal Hocko
2014-10-21 14:41 ` Rafael J. Wysocki
2014-10-21 14:29 ` Michal Hocko
2014-10-22 14:39 ` Rafael J. Wysocki
2014-10-22 14:22 ` Michal Hocko
2014-10-22 21:18 ` Rafael J. Wysocki
2014-10-26 18:49 ` Pavel Machek
2014-11-04 19:27 ` Tejun Heo
2014-11-05 12:46 ` Michal Hocko
2014-11-05 13:02 ` Tejun Heo
2014-11-05 13:31 ` Michal Hocko
2014-11-05 13:42 ` Michal Hocko
2014-11-05 14:14 ` Michal Hocko
2014-11-05 15:45 ` Michal Hocko
2014-11-05 15:44 ` Tejun Heo
2014-11-05 16:01 ` Michal Hocko
2014-11-05 16:29 ` Tejun Heo
2014-11-05 16:39 ` Michal Hocko
2014-11-05 16:54 ` Tejun Heo
2014-11-05 17:01 ` Tejun Heo
2014-11-06 13:05 ` Michal Hocko
2014-11-06 15:09 ` Tejun Heo
2014-11-06 16:01 ` Michal Hocko
2014-11-06 16:12 ` Tejun Heo
2014-11-06 16:31 ` Michal Hocko
2014-11-06 16:33 ` Tejun Heo
2014-11-06 16:58 ` Michal Hocko
2014-11-05 17:46 ` Michal Hocko
2014-11-05 17:55 ` Tejun Heo
2014-11-06 12:49 ` Michal Hocko
2014-11-06 15:01 ` Tejun Heo
2014-11-06 16:02 ` Michal Hocko
2014-11-06 16:28 ` Tejun Heo
2014-11-10 16:30 ` Michal Hocko
2014-11-12 18:58 ` [RFC 0/4] OOM vs PM freezer fixes Michal Hocko
2014-11-12 18:58 ` [RFC 1/4] OOM, PM: Do not miss OOM killed frozen tasks Michal Hocko
2014-11-14 17:55 ` Tejun Heo
2014-11-12 18:58 ` [RFC 2/4] OOM, PM: make OOM detection in the freezer path raceless Michal Hocko
2014-11-12 18:58 ` [RFC 3/4] OOM, PM: handle pm freezer as an OOM victim correctly Michal Hocko
2014-11-12 18:58 ` [RFC 4/4] OOM: thaw the OOM victim if it is frozen Michal Hocko
2014-11-14 20:14 ` [RFC 0/4] OOM vs PM freezer fixes Tejun Heo
2014-11-18 21:08 ` Michal Hocko
2014-11-18 21:10 ` [RFC 1/2] oom: add helper for setting and clearing TIF_MEMDIE Michal Hocko
2014-11-18 21:10 ` [RFC 2/2] OOM, PM: make OOM detection in the freezer path raceless Michal Hocko
2014-11-27 0:47 ` Rafael J. Wysocki
2014-12-02 22:08 ` Tejun Heo
2014-12-04 14:16 ` Michal Hocko
2014-12-04 14:44 ` Tejun Heo
2014-12-04 16:56 ` Michal Hocko
2014-12-04 17:18 ` Michal Hocko
2014-12-05 16:41 ` [PATCH 0/4] OOM vs PM freezer fixes Michal Hocko
2014-12-05 16:41 ` [PATCH -v2 1/5] oom: add helpers for setting and clearing TIF_MEMDIE Michal Hocko
2014-12-06 12:56 ` Tejun Heo
2014-12-07 10:13 ` Michal Hocko
2015-01-07 17:57 ` Tejun Heo
2015-01-07 18:23 ` Michal Hocko
2014-12-05 16:41 ` [PATCH -v2 2/5] OOM: thaw the OOM victim if it is frozen Michal Hocko
2014-12-06 13:06 ` Tejun Heo
2014-12-07 10:24 ` Michal Hocko
2014-12-07 10:45 ` Michal Hocko
2014-12-07 13:59 ` Tejun Heo
2014-12-07 18:55 ` Michal Hocko
2014-12-05 16:41 ` [PATCH -v2 3/5] PM: convert printk to pr_* equivalent Michal Hocko
2014-12-05 22:40 ` Rafael J. Wysocki
2014-12-07 10:26 ` Michal Hocko [this message]
2014-12-06 13:08 ` Tejun Heo
2014-12-05 16:41 ` [PATCH -v2 4/5] sysrq: " Michal Hocko
2014-12-06 13:09 ` Tejun Heo
2014-12-05 16:41 ` [PATCH -v2 5/5] OOM, PM: make OOM detection in the freezer path raceless Michal Hocko
2014-12-06 13:11 ` Tejun Heo
2014-12-07 10:11 ` Michal Hocko
2015-01-07 18:41 ` Tejun Heo
2015-01-07 18:48 ` Michal Hocko
2015-01-08 11:51 ` Michal Hocko
2014-12-07 10:09 ` [PATCH 0/4] OOM vs PM freezer fixes Michal Hocko
2014-12-07 13:55 ` Tejun Heo
2014-12-07 19:00 ` Michal Hocko
2014-12-18 16:27 ` Michal Hocko
2014-11-05 14:55 ` [PATCH 3/4] OOM, PM: OOM killed task shouldn't escape PM suspend Michal Hocko
2014-10-26 18:40 ` Pavel Machek
2014-10-21 7:27 ` [PATCH 4/4] PM: convert do_each_thread to for_each_process_thread Michal Hocko
2014-10-21 12:10 ` Rafael J. Wysocki
2014-10-21 13:19 ` Michal Hocko
2014-10-21 13:43 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141207102607.GG15892@dhcp22.suse.cz \
--to=mhocko@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-pm@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=rientjes@google.com \
--cc=rjw@rjwysocki.net \
--cc=tj@kernel.org \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).