From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
To: Petr Mladek <pmladek@suse.com>, Steven Rostedt <rostedt@goodmis.org>
Cc: Jan Kara <jack@suse.cz>,
Andrew Morton <akpm@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
Eric Biederman <ebiederm@xmission.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>, Pavel Machek <pavel@ucw.cz>,
Andreas Mohr <andi@lisas.de>,
Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>,
linux-kernel@vger.kernel.org,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Subject: [RFC][PATCHv4 7/7] printk: add printk cpumask sysctl
Date: Fri, 2 Jun 2017 18:03:45 +0900 [thread overview]
Message-ID: <20170602090345.624-8-sergey.senozhatsky@gmail.com> (raw)
In-Reply-To: <20170602090345.624-1-sergey.senozhatsky@gmail.com>
Add `sysctl kernel.printk_cpumask' knob so user can enforce printk
kthread cpumask and control both the number of kthreads we wake up
during printk offloading and the CPUs those wake ups happen.
For example,
sysctl kernel.printk_cpumask = 0-3
will force printk to offload printing only to CPU0-CPU3.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
---
include/linux/printk.h | 4 ++++
kernel/printk/printk.c | 32 ++++++++++++++++++++++++++++++++
kernel/sysctl.c | 7 +++++++
3 files changed, 43 insertions(+)
diff --git a/include/linux/printk.h b/include/linux/printk.h
index e10f27468322..200499b9f23a 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -81,6 +81,7 @@ static inline void console_verbose(void)
#define DEVKMSG_STR_MAX_SIZE 10
extern char devkmsg_log_str[];
struct ctl_table;
+extern unsigned long *printk_cpumask_bits;
struct va_format {
const char *fmt;
@@ -196,6 +197,9 @@ devkmsg_sysctl_set_loglvl(struct ctl_table *table, int write, void __user *buf,
extern void wake_up_klogd(void);
+extern int proc_printk_cpumask(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos);
+
char *log_buf_addr_get(void);
u32 log_buf_len_get(void);
void log_buf_vmcoreinfo_setup(void);
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 4e5233a265cb..46d82faf8613 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -3049,6 +3049,38 @@ static int __init init_printk_kthreads(void)
}
late_initcall(init_printk_kthreads);
+#ifdef CONFIG_SYSCTL
+static DEFINE_MUTEX(printk_kthread_proc_mutex);
+unsigned long *printk_cpumask_bits = cpumask_bits(&printk_cpumask);
+
+/*
+ * Update printk kthread cpumask, so user can limit the number of printk
+ * kthreads we wake up during printing offloading.
+ */
+int proc_printk_cpumask(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+ int err;
+
+ mutex_lock(&printk_kthread_proc_mutex);
+
+ if (printk_enforce_emergency)
+ goto out;
+
+ err = proc_do_large_bitmap(table, write, buffer, lenp, ppos);
+ if (!err && write) {
+ if (smpboot_update_cpumask_percpu_thread(&printk_kthreads,
+ &printk_cpumask)) {
+ printk_enforce_emergency = true;
+ pr_err("printk: can't update cpumask\n");
+ }
+ }
+out:
+ mutex_unlock(&printk_kthread_proc_mutex);
+ return err;
+}
+#endif
+
void wake_up_klogd(void)
{
preempt_disable();
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index df9f2a367882..d03dc7fa4f7f 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -853,6 +853,13 @@ static struct ctl_table kern_table[] = {
.extra1 = &zero,
.extra2 = &two,
},
+ {
+ .procname = "printk_cpumask",
+ .data = &printk_cpumask_bits,
+ .maxlen = NR_CPUS,
+ .mode = 0644,
+ .proc_handler = proc_printk_cpumask,
+ },
#endif
{
.procname = "ngroups_max",
--
2.13.0
next prev parent reply other threads:[~2017-06-02 9:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-02 9:03 [RFC][PATCHv4 0/7] printk: introduce printing kernel threads Sergey Senozhatsky
2017-06-02 9:03 ` [RFC][PATCHv4 1/7] printk: move printk_pending out of per-cpu Sergey Senozhatsky
2017-06-02 9:03 ` [RFC][PATCHv4 2/7] printk: introduce printing kernel SMP threads Sergey Senozhatsky
2017-06-02 9:03 ` [RFC][PATCHv4 3/7] printk: add enforce_emergency parameter Sergey Senozhatsky
2017-06-02 9:03 ` [RFC][PATCHv4 4/7] printk: enable printk offloading Sergey Senozhatsky
2017-06-02 9:03 ` [RFC][PATCHv4 5/7] printk: register PM notifier Sergey Senozhatsky
2017-06-02 9:03 ` [RFC][PATCHv4 6/7] printk: register syscore notifier Sergey Senozhatsky
2017-06-02 9:03 ` Sergey Senozhatsky [this message]
2017-06-08 8:18 ` [RFC][PATCHv4 0/7] printk: introduce printing kernel threads Sergey Senozhatsky
2017-06-28 13:42 ` Petr Mladek
2017-06-29 7:56 ` Sergey Senozhatsky
2017-06-30 12:11 ` Petr Mladek
2017-06-30 12:45 ` Sergey Senozhatsky
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=20170602090345.624-8-sergey.senozhatsky@gmail.com \
--to=sergey.senozhatsky@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=andi@lisas.de \
--cc=ebiederm@xmission.com \
--cc=gregkh@linuxfoundation.org \
--cc=jack@suse.cz \
--cc=jslaby@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=rjw@rjwysocki.net \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky.work@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
all inboxes | Powered by JetHome®