From patchwork Tue Mar 28 09:26:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 75988 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2127874vqo; Tue, 28 Mar 2023 04:09:05 -0700 (PDT) X-Google-Smtp-Source: AKy350bLVL/Z7Kf0Fdk5Hk7RZlQHBQhPTr2dj9qhJsGQRdBXi9GBAiLb76IQdMSrp9/YQmIUO/Gv X-Received: by 2002:a17:907:a0b:b0:93e:739f:b0b3 with SMTP id bb11-20020a1709070a0b00b0093e739fb0b3mr19355894ejc.50.1680001745624; Tue, 28 Mar 2023 04:09:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680001745; cv=none; d=google.com; s=arc-20160816; b=FgJic3aXarpCdu5a3Ru3LLkUWm36VWAuIzLQy459AnwD159EAGUnNelCoLXRsHqeTv +VhxHH7kdJCmpaqBZQEKX6saQvwaOlA0xENl2udwUR6okZVJtCHbMq7Ax/2pGYHy3gL6 ioTauYb3PzzY1mJt6Ppnt+PCNCwZl5JOQ8CjnAn/aqEjSlfa9SehPM9F4BK5/14yay4g 1jARik8yHnJvvcjD32ChJELAYlFKwlfqTWucQmMetatYnAOtVkiylT4hgV6xFsHNcQpC TlKcB4e0JNXUQPZyckkAdWhqUYEtwUbKCmkAhEEnge4RiU9AZQZvAlYiSEZPQRtrhOyg +Icw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id:dkim-signature; bh=ChQJJCdcacurj6PDeiSczxM1Ai8HwF4oJqBp0TPIkNE=; b=AaupcgysNbljzb05Aqm4NNAi/Dpikmfov++61xSR17MrWfZtEMf7NaCzfZs3G2i6Qf 1Zm/KqfPTjoQPTkwBNPEKor6nZUbPsNNLtb4qskGxO0FyrR1wNUBqvhqaGRLwQ92qDu2 poNiYL+pkELrOHbEXsz6RpIBsBsfYjsX8egFFlcWiVO+o29TiumSP1ChnMN8tFSGJBqY 2CRhdlpKd/e9xT4Z/iAJeLWL5ORDKJEHmdNObKqpeTmTwpbLxbEeepZo/Gk7nNvKIzbi 52OOx81vJyR0vvq1znDyRkUXkxply9L5YtReMhZrFQnVrW3pgY9GqrRNDtbRgx12Ybvo invw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=cIB8rYoc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o3-20020a056402038300b00501ea9bef40si17376320edv.159.2023.03.28.04.08.41; Tue, 28 Mar 2023 04:09:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=cIB8rYoc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232625AbjC1LH3 (ORCPT + 99 others); Tue, 28 Mar 2023 07:07:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231365AbjC1LHL (ORCPT ); Tue, 28 Mar 2023 07:07:11 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 461057D93 for ; Tue, 28 Mar 2023 04:07:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=ChQJJCdcacurj6PDeiSczxM1Ai8HwF4oJqBp0TPIkNE=; b=cIB8rYocU95kjDFWxHwMBhIwpF vDNY2Gp8+ReobdmgwEegEa/lJA2YS/solY8Tw48Z26ONoNBrXS/heKRSkZ9bzz7KcQ+TbVekoRCpk axsUCEO3k+9B5bY5uhyU9C3oLzu1tyDkefSFYISJEU5C4Le+en5Xcq3Wvr5OTfu0hkYQS00GwbtpW 4yAqtpICPcMdeH/9GqumGWi4gVqLY5oGDlg4GKWEGGJztVcoipObDgdSju489RK2c3vye9QQDRhMc 4L18p3CJkDaVw2uNIEsBr7ewyL8VOYhQ3i8vyo6f1PgGr7j1jqjRMdSr/rp/uwHuLICtD/zl3G2RX Fj0W0AdQ==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1ph79m-008MDH-A0; Tue, 28 Mar 2023 11:06:26 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 682B2302ECC; Tue, 28 Mar 2023 13:06:23 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id E41D82CB8D7A6; Tue, 28 Mar 2023 13:06:20 +0200 (CEST) Message-ID: <20230328110354.426388922@infradead.org> User-Agent: quilt/0.66 Date: Tue, 28 Mar 2023 11:26:34 +0200 From: Peter Zijlstra To: mingo@kernel.org, vincent.guittot@linaro.org Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, juri.lelli@redhat.com, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, corbet@lwn.net, qyousef@layalina.io, chris.hyser@oracle.com, patrick.bellasi@matbug.net, pjt@google.com, pavel@ucw.cz, qperret@google.com, tim.c.chen@linux.intel.com, joshdon@google.com, timj@gnu.org, kprateek.nayak@amd.com, yu.c.chen@intel.com, youssefesmat@chromium.org, joel@joelfernandes.org, efault@gmx.de Subject: [PATCH 12/17] sched/debug: Rename min_granularity to base_slice References: <20230328092622.062917921@infradead.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761609510528002640?= X-GMAIL-MSGID: =?utf-8?q?1761609510528002640?= Signed-off-by: Peter Zijlstra (Intel) --- kernel/sched/debug.c | 4 ++-- kernel/sched/fair.c | 10 +++++----- kernel/sched/sched.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -308,7 +308,7 @@ static __init int sched_init_debug(void) debugfs_create_file("preempt", 0644, debugfs_sched, NULL, &sched_dynamic_fops); #endif - debugfs_create_u32("min_granularity_ns", 0644, debugfs_sched, &sysctl_sched_min_granularity); + debugfs_create_u32("base_slice_ns", 0644, debugfs_sched, &sysctl_sched_base_slice); debugfs_create_u32("latency_warn_ms", 0644, debugfs_sched, &sysctl_resched_latency_warn_ms); debugfs_create_u32("latency_warn_once", 0644, debugfs_sched, &sysctl_resched_latency_warn_once); @@ -816,7 +816,7 @@ static void sched_debug_header(struct se SEQ_printf(m, " .%-40s: %Ld\n", #x, (long long)(x)) #define PN(x) \ SEQ_printf(m, " .%-40s: %Ld.%06ld\n", #x, SPLIT_NS(x)) - PN(sysctl_sched_min_granularity); + PN(sysctl_sched_base_slice); P(sysctl_sched_child_runs_first); P(sysctl_sched_features); #undef PN --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -75,8 +75,8 @@ unsigned int sysctl_sched_tunable_scalin * * (default: 0.75 msec * (1 + ilog(ncpus)), units: nanoseconds) */ -unsigned int sysctl_sched_min_granularity = 750000ULL; -static unsigned int normalized_sysctl_sched_min_granularity = 750000ULL; +unsigned int sysctl_sched_base_slice = 750000ULL; +static unsigned int normalized_sysctl_sched_base_slice = 750000ULL; /* * After fork, child runs first. If set to 0 (default) then @@ -237,7 +237,7 @@ static void update_sysctl(void) #define SET_SYSCTL(name) \ (sysctl_##name = (factor) * normalized_sysctl_##name) - SET_SYSCTL(sched_min_granularity); + SET_SYSCTL(sched_base_slice); #undef SET_SYSCTL } @@ -882,7 +882,7 @@ int sched_update_scaling(void) #define WRT_SYSCTL(name) \ (normalized_sysctl_##name = sysctl_##name / (factor)) - WRT_SYSCTL(sched_min_granularity); + WRT_SYSCTL(sched_base_slice); #undef WRT_SYSCTL return 0; @@ -892,7 +892,7 @@ int sched_update_scaling(void) long calc_latency_offset(int prio) { u32 weight = sched_prio_to_weight[prio]; - u64 base = sysctl_sched_min_granularity; + u64 base = sysctl_sched_base_slice; return div_u64(base << SCHED_FIXEDPOINT_SHIFT, weight); } --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2464,7 +2464,7 @@ extern const_debug unsigned int sysctl_s extern const_debug unsigned int sysctl_sched_migration_cost; #ifdef CONFIG_SCHED_DEBUG -extern unsigned int sysctl_sched_min_granularity; +extern unsigned int sysctl_sched_base_slice; extern int sysctl_resched_latency_warn_ms; extern int sysctl_resched_latency_warn_once;