From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 716A1C4346E for ; Fri, 24 Jul 2020 21:39:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 42329206EB for ; Fri, 24 Jul 2020 21:39:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="pP6X5adz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726777AbgGXVjl (ORCPT ); Fri, 24 Jul 2020 17:39:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726591AbgGXVjk (ORCPT ); Fri, 24 Jul 2020 17:39:40 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 936CEC0619D3 for ; Fri, 24 Jul 2020 14:39:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=jC8AJ6jvec7x7bKVCEbUfd5SLuTjOzGleJmXQGdd3Ac=; b=pP6X5adzAebVP0qUpN5DyXOf68 tjsKgXXzFCdf5JjPqCNpbtrU85H9465GUFvtfb+Ee/A71WOWU2ZmwCh4ugDGt6fwjqBb+xNf8OhaQ p9H/A0+CEXC3pc/uejJoF87tKUAh4o83Nb9MTxWBqibO3opCUJISA4F7WUfpkcYYEokOzVN9aganF lEL6Jt/vFzLk0cM0JD6x67s4YzskA4DErpscFNAbkT5fAuQuNBsDLLi6XQpDkMnnOY7V2JHM03p5z Fq4OGYdLQxctENmeFqzbSLlR1G5brwySUWIdMCU81FRMQS1wAPu707kwlGcB4asTGJru7lwQCLrbS BCmEjncQ==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jz5PO-0002OO-B6; Fri, 24 Jul 2020 21:39:14 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 16FDA301124; Fri, 24 Jul 2020 23:39:11 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 1000) id 9C1F42141FBB1; Fri, 24 Jul 2020 23:39:11 +0200 (CEST) Date: Fri, 24 Jul 2020 23:39:11 +0200 From: peterz@infradead.org To: Steven Rostedt Cc: kernel test robot , kbuild-all@lists.01.org, linux-kernel@vger.kernel.org, x86@kernel.org, Ingo Molnar , sfr@canb.auug.org.au Subject: [PATCH] sched,tracing: Convert to sched_set_fifo() Message-ID: <20200724213911.GX119549@hirez.programming.kicks-ass.net> References: <202006192249.AYnVBGCH%lkp@intel.com> <20200709124505.GT597537@hirez.programming.kicks-ass.net> <20200709115818.36a956a4@oasis.local.home> <20200720214918.GM5523@worktop.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200720214918.GM5523@worktop.programming.kicks-ass.net> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 20, 2020 at 11:49:18PM +0200, Peter Zijlstra wrote: > Steve, would this work for you, or would you prefer renaming the > parameters as well? Steve mentioned he's like to have the parameters changes after all. How's this then? --- Subject: sched,tracing: Convert to sched_set_fifo() From: Peter Zijlstra 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 Reported-by: Stephen Rothwell Signed-off-by: Peter Zijlstra (Intel) --- 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 = 0; +static int consumer_fifo = 0; 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) - trace_printk("Running Consumer at nice: %d\n", - consumer_nice); - else + if (consumer_fifo) trace_printk("Running Consumer at SCHED_FIFO %d\n", consumer_fifo); + else + trace_printk("Running Consumer at nice: %d\n", + consumer_nice); } - if (producer_fifo < 0) - trace_printk("Running Producer at nice: %d\n", - producer_nice); - else + if (producer_fifo) trace_printk("Running Producer at SCHED_FIFO %d\n", producer_fifo); + else + trace_printk("Running Producer at nice: %d\n", + producer_nice); /* 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;