From: peterz@infradead.org To: Steven Rostedt <rostedt@goodmis.org> Cc: kernel test robot <lkp@intel.com>, kbuild-all@lists.01.org, linux-kernel@vger.kernel.org, x86@kernel.org, Ingo Molnar <mingo@kernel.org>, sfr@canb.auug.org.au Subject: [PATCH v2] sched,tracing: Convert to sched_set_fifo() Date: Fri, 24 Jul 2020 23:50:03 +0200 [thread overview] Message-ID: <20200724215003.GY119549@hirez.programming.kicks-ass.net> (raw) In-Reply-To: <20200724174618.7487ee7c@oasis.local.home> Subject: sched,tracing: Convert to sched_set_fifo() From: Peter Zijlstra <peterz@infradead.org> Date: Mon, 20 Jul 2020 23:49:18 +0200 One module user of sched_setscheduler() was overlooked and is obviously causing build failures. Convert ring_buffer_benchmark to use sched_set_fifo_low() when fifo==1 and sched_set_fifo() when fifo==2. This is a bit of an abuse, but it makes the thing 'work' again. Specifically, it enables all combinations that were previously possible: producer higher than consumer consumer higher than producer Fixes: 616d91b68cd5 ("sched: Remove sched_setscheduler*() EXPORTs") Reported-by: kernel test robot <lkp@intel.com> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> --- kernel/trace/ring_buffer_benchmark.c | 48 ++++++++++++++++------------------- 1 file changed, 23 insertions(+), 25 deletions(-) --- a/kernel/trace/ring_buffer_benchmark.c +++ b/kernel/trace/ring_buffer_benchmark.c @@ -45,8 +45,8 @@ MODULE_PARM_DESC(write_iteration, "# of static int producer_nice = MAX_NICE; static int consumer_nice = MAX_NICE; -static int producer_fifo = -1; -static int consumer_fifo = -1; +static int producer_fifo; +static int consumer_fifo; module_param(producer_nice, int, 0644); MODULE_PARM_DESC(producer_nice, "nice prio for producer"); @@ -55,10 +55,10 @@ module_param(consumer_nice, int, 0644); MODULE_PARM_DESC(consumer_nice, "nice prio for consumer"); module_param(producer_fifo, int, 0644); -MODULE_PARM_DESC(producer_fifo, "fifo prio for producer"); +MODULE_PARM_DESC(producer_fifo, "use fifo for producer: 0 - disabled, 1 - low prio, 2 - fifo"); module_param(consumer_fifo, int, 0644); -MODULE_PARM_DESC(consumer_fifo, "fifo prio for consumer"); +MODULE_PARM_DESC(consumer_fifo, "use fifo for consumer: 0 - disabled, 1 - low prio, 2 - fifo"); static int read_events; @@ -303,22 +303,22 @@ static void ring_buffer_producer(void) trace_printk("ERROR!\n"); if (!disable_reader) { - if (consumer_fifo < 0) + if (consumer_fifo) + trace_printk("Running Consumer at SCHED_FIFO %s\n", + consumer_fifo == 1 ? "low" : "high"); + else trace_printk("Running Consumer at nice: %d\n", consumer_nice); - else - trace_printk("Running Consumer at SCHED_FIFO %d\n", - consumer_fifo); } - if (producer_fifo < 0) + if (producer_fifo) + trace_printk("Running Producer at SCHED_FIFO %s\n", + consumer_fifo == 1 ? "low" : "high"); + else trace_printk("Running Producer at nice: %d\n", producer_nice); - else - trace_printk("Running Producer at SCHED_FIFO %d\n", - producer_fifo); /* Let the user know that the test is running at low priority */ - if (producer_fifo < 0 && consumer_fifo < 0 && + if (!producer_fifo && !consumer_fifo && producer_nice == MAX_NICE && consumer_nice == MAX_NICE) trace_printk("WARNING!!! This test is running at lowest priority.\n"); @@ -455,21 +455,19 @@ static int __init ring_buffer_benchmark_ * Run them as low-prio background tasks by default: */ if (!disable_reader) { - if (consumer_fifo >= 0) { - struct sched_param param = { - .sched_priority = consumer_fifo - }; - sched_setscheduler(consumer, SCHED_FIFO, ¶m); - } else + if (consumer_fifo >= 2) + sched_set_fifo(consumer); + else if (consumer_fifo == 1) + sched_set_fifo_low(consumer); + else set_user_nice(consumer, consumer_nice); } - if (producer_fifo >= 0) { - struct sched_param param = { - .sched_priority = producer_fifo - }; - sched_setscheduler(producer, SCHED_FIFO, ¶m); - } else + if (producer_fifo >= 2) + sched_set_fifo(producer); + else if (producer_fifo == 1) + sched_set_fifo_low(producer); + else set_user_nice(producer, producer_nice); return 0;
WARNING: multiple messages have this Message-ID (diff)
From: peterz@infradead.org To: kbuild-all@lists.01.org Subject: [PATCH v2] sched,tracing: Convert to sched_set_fifo() Date: Fri, 24 Jul 2020 23:50:03 +0200 [thread overview] Message-ID: <20200724215003.GY119549@hirez.programming.kicks-ass.net> (raw) In-Reply-To: <20200724174618.7487ee7c@oasis.local.home> [-- Attachment #1: Type: text/plain, Size: 3921 bytes --] Subject: sched,tracing: Convert to sched_set_fifo() From: Peter Zijlstra <peterz@infradead.org> Date: Mon, 20 Jul 2020 23:49:18 +0200 One module user of sched_setscheduler() was overlooked and is obviously causing build failures. Convert ring_buffer_benchmark to use sched_set_fifo_low() when fifo==1 and sched_set_fifo() when fifo==2. This is a bit of an abuse, but it makes the thing 'work' again. Specifically, it enables all combinations that were previously possible: producer higher than consumer consumer higher than producer Fixes: 616d91b68cd5 ("sched: Remove sched_setscheduler*() EXPORTs") Reported-by: kernel test robot <lkp@intel.com> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> --- kernel/trace/ring_buffer_benchmark.c | 48 ++++++++++++++++------------------- 1 file changed, 23 insertions(+), 25 deletions(-) --- a/kernel/trace/ring_buffer_benchmark.c +++ b/kernel/trace/ring_buffer_benchmark.c @@ -45,8 +45,8 @@ MODULE_PARM_DESC(write_iteration, "# of static int producer_nice = MAX_NICE; static int consumer_nice = MAX_NICE; -static int producer_fifo = -1; -static int consumer_fifo = -1; +static int producer_fifo; +static int consumer_fifo; module_param(producer_nice, int, 0644); MODULE_PARM_DESC(producer_nice, "nice prio for producer"); @@ -55,10 +55,10 @@ module_param(consumer_nice, int, 0644); MODULE_PARM_DESC(consumer_nice, "nice prio for consumer"); module_param(producer_fifo, int, 0644); -MODULE_PARM_DESC(producer_fifo, "fifo prio for producer"); +MODULE_PARM_DESC(producer_fifo, "use fifo for producer: 0 - disabled, 1 - low prio, 2 - fifo"); module_param(consumer_fifo, int, 0644); -MODULE_PARM_DESC(consumer_fifo, "fifo prio for consumer"); +MODULE_PARM_DESC(consumer_fifo, "use fifo for consumer: 0 - disabled, 1 - low prio, 2 - fifo"); static int read_events; @@ -303,22 +303,22 @@ static void ring_buffer_producer(void) trace_printk("ERROR!\n"); if (!disable_reader) { - if (consumer_fifo < 0) + if (consumer_fifo) + trace_printk("Running Consumer at SCHED_FIFO %s\n", + consumer_fifo == 1 ? "low" : "high"); + else trace_printk("Running Consumer at nice: %d\n", consumer_nice); - else - trace_printk("Running Consumer at SCHED_FIFO %d\n", - consumer_fifo); } - if (producer_fifo < 0) + if (producer_fifo) + trace_printk("Running Producer at SCHED_FIFO %s\n", + consumer_fifo == 1 ? "low" : "high"); + else trace_printk("Running Producer at nice: %d\n", producer_nice); - else - trace_printk("Running Producer at SCHED_FIFO %d\n", - producer_fifo); /* Let the user know that the test is running at low priority */ - if (producer_fifo < 0 && consumer_fifo < 0 && + if (!producer_fifo && !consumer_fifo && producer_nice == MAX_NICE && consumer_nice == MAX_NICE) trace_printk("WARNING!!! This test is running@lowest priority.\n"); @@ -455,21 +455,19 @@ static int __init ring_buffer_benchmark_ * Run them as low-prio background tasks by default: */ if (!disable_reader) { - if (consumer_fifo >= 0) { - struct sched_param param = { - .sched_priority = consumer_fifo - }; - sched_setscheduler(consumer, SCHED_FIFO, ¶m); - } else + if (consumer_fifo >= 2) + sched_set_fifo(consumer); + else if (consumer_fifo == 1) + sched_set_fifo_low(consumer); + else set_user_nice(consumer, consumer_nice); } - if (producer_fifo >= 0) { - struct sched_param param = { - .sched_priority = producer_fifo - }; - sched_setscheduler(producer, SCHED_FIFO, ¶m); - } else + if (producer_fifo >= 2) + sched_set_fifo(producer); + else if (producer_fifo == 1) + sched_set_fifo_low(producer); + else set_user_nice(producer, producer_nice); return 0;
next prev parent reply other threads:[~2020-07-24 21:50 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-19 14:15 [tip:sched/fifo 44/45] ERROR: modpost: "sched_setscheduler" undefined! kernel test robot 2020-06-19 14:15 ` kernel test robot 2020-07-09 12:45 ` Peter Zijlstra 2020-07-09 12:45 ` Peter Zijlstra 2020-07-09 15:58 ` Steven Rostedt 2020-07-09 15:58 ` Steven Rostedt 2020-07-20 21:49 ` Peter Zijlstra 2020-07-20 21:49 ` Peter Zijlstra 2020-07-20 22:19 ` Steven Rostedt 2020-07-20 22:19 ` Steven Rostedt 2020-07-21 8:36 ` peterz 2020-07-21 8:36 ` peterz 2020-07-21 10:13 ` Qais Yousef 2020-07-21 10:13 ` Qais Yousef 2020-07-29 10:23 ` Dietmar Eggemann 2020-07-29 10:23 ` Dietmar Eggemann 2020-07-29 10:38 ` Qais Yousef 2020-07-29 10:38 ` Qais Yousef 2020-07-30 15:29 ` Qais Yousef 2020-07-30 15:29 ` Qais Yousef 2020-07-21 13:30 ` Steven Rostedt 2020-07-21 13:30 ` Steven Rostedt 2020-07-24 21:39 ` [PATCH] sched,tracing: Convert to sched_set_fifo() peterz 2020-07-24 21:39 ` peterz 2020-07-24 21:46 ` Steven Rostedt 2020-07-24 21:46 ` Steven Rostedt 2020-07-24 21:50 ` peterz [this message] 2020-07-24 21:50 ` [PATCH v2] " peterz 2020-07-24 22:18 ` Steven Rostedt 2020-07-24 22:18 ` [PATCH v2] sched, tracing: " Steven Rostedt 2020-07-25 16:58 ` [PATCH v2] sched,tracing: " Peter Zijlstra 2020-07-25 16:58 ` [PATCH v2] sched, tracing: " Peter Zijlstra 2020-07-27 20:56 ` [PATCH v2] sched,tracing: " Steven Rostedt 2020-07-27 20:56 ` [PATCH v2] sched, tracing: " Steven Rostedt 2020-07-29 10:54 ` [tip: sched/fifo] sched,tracing: " tip-bot2 for Peter Zijlstra
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=20200724215003.GY119549@hirez.programming.kicks-ass.net \ --to=peterz@infradead.org \ --cc=kbuild-all@lists.01.org \ --cc=linux-kernel@vger.kernel.org \ --cc=lkp@intel.com \ --cc=mingo@kernel.org \ --cc=rostedt@goodmis.org \ --cc=sfr@canb.auug.org.au \ --cc=x86@kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.