From patchwork Fri Oct 28 07:36:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 12138 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp679526wru; Fri, 28 Oct 2022 00:42:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6CrESmcIYAf33Zgo0FYq1Tiz8LW1UGwej2n8Fq3vdtXEg2oFaCfuHBZrsX9NX82qnUW1e8 X-Received: by 2002:a17:907:7b86:b0:78d:cb21:da0c with SMTP id ne6-20020a1709077b8600b0078dcb21da0cmr47409886ejc.24.1666942952610; Fri, 28 Oct 2022 00:42:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666942952; cv=none; d=google.com; s=arc-20160816; b=qOlwlAAmj1K2j7j1QY8/P6jAoPR3auCuvYbvtJVF+0f5On7oeWM+h6u3XMi8D2ls/0 C4Ae2vgbx/XsS+e/txsMFxqdvDAgnMrKE5cAZM1creJxD+tAmVBSAxZ1pgkSrSOln/8m lSpqfxMjqmAoE9AyLFrwsO65QYtZcYd3n7NhaTBkThKlrmfSe+fKCwZ/5J868pug/Wxp pfMLDWsLdnBCxcrc/a3G/zwfiw3WdOnR8VC9j5DN2UV5dYu0XpzTxzXJFoIV31UoawGW pWrlDTgQBVfxR++B6aDly/iL/Tv3x/RehO0676YNho2xFwj1o26KpGnvca8/fRlEXVLJ yJmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=t3r9zn7TCuvGykxEk/g32GjM6BAQKOwVz31FtxjXSRY=; b=PLAaiXQoC34aouXLAKfK/km3CiYCOz7+c7qmQ6g3HM8KJPg30PVwNExw99bHd4evcP 75BmAsLKsTxx7Cuo0Zgh24qXRvUPO9q0C94RcI4pBz6Oeizof0dNEyabvNA6YUXwJ2or h1YA5P5eJf/ZQi3jk3MaGEG+415z5K7te+xEMAaNEqHE4yXQZw7qNr3zt8ADBAdcQ8Qm WgXP2qNlb9X4Af9ZU39MVpcdWVdVf1Qr6A1dihtgxkII+ZYXfBAbIe2McJmhgOsHzYlc fnDmXg7IcF+/BcYPyz3c2byFk/wrFuQbtAeZ1KjLTPnv93mUR0ysFp7m+26Ca1ic4GG/ tR9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oUxnh8+s; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id du17-20020a17090772d100b0077b83f3dc20si4102924ejc.63.2022.10.28.00.42.09; Fri, 28 Oct 2022 00:42:32 -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=@linaro.org header.s=google header.b=oUxnh8+s; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230211AbiJ1HhU (ORCPT + 99 others); Fri, 28 Oct 2022 03:37:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230187AbiJ1HhF (ORCPT ); Fri, 28 Oct 2022 03:37:05 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE3AD1BC148 for ; Fri, 28 Oct 2022 00:37:01 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id bp11so5826970wrb.9 for ; Fri, 28 Oct 2022 00:37:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=t3r9zn7TCuvGykxEk/g32GjM6BAQKOwVz31FtxjXSRY=; b=oUxnh8+sy2cgAkT3Y6CJ0Q1GBMMkUDOp19hE+ohIJsgSG3AiN7i8Vydo4AzMexODgN kupn/n/FxTPhN64X4dqYr5wTx8e5xA0Zl3Uil946yAp9cED7a9UN+D5Zkx/dPD9AIMUU JXvWBT08CP3mQYrkqwOZuLCjBlYM2zGcqWuvwQsGbd/+A6F9nCdKxDn0vZQnSelWY29z jIBhT8IAxcQ8+zT0rPnBQge2kJ070WRnKjfiakNz8zo24qNUJNCJly85bVmaBEZtQyS4 WePJ1zQU/LELR3qXFGzRZorE7t0uCF1qcQgJpnpBks8fe8/u/FtKml4NG/T1smjHUBiC GNCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=t3r9zn7TCuvGykxEk/g32GjM6BAQKOwVz31FtxjXSRY=; b=ho/ZMa8hN6QQRj8Wmau42y582oa2JUcN3KzwzKW2RESBpFRqOiF7yxj+Gpy+DGZTCz 4qV5tffhN30DbtoRVpz7ciYHfie5AJ96WlkqqLbxFJMxwm2iaDcq1g3tMyN8zMX5MN92 /3sRwBP7/9DeXTkJOIXzC7LkFbkS3r+TaMYEW3ffhjJaFUrY/Bpq1mVSpwlK7Ap3xZfh kGNhaesrDz90rHurs6IKM85ohkWEiQw4I+PiLxMpMwFWPfu+t/ZcoGsPh/s0iQyEjgZn vh1HCKmeG24IRqiGWdzH2lcJzkeJXU+eNTizehVTbvR/99wFDunmMkr638jkWoBOfWyE eMkg== X-Gm-Message-State: ACrzQf136kFI8El5m2Ii+a0GCOsq5k9uZUX23ug9+jZuRn2iA4Wkejyj VrS7Gonrx9Ub5gOoec/CNL3IWA== X-Received: by 2002:a05:6000:1d94:b0:22c:c4d1:3622 with SMTP id bk20-20020a0560001d9400b0022cc4d13622mr33678684wrb.63.1666942620323; Fri, 28 Oct 2022 00:37:00 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:f:6020:c12b:b448:f0a9:83ef]) by smtp.gmail.com with ESMTPSA id j8-20020a05600c190800b003b47e8a5d22sm7783129wmq.23.2022.10.28.00.36.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 00:36:59 -0700 (PDT) From: Vincent Guittot To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, linux-kernel@vger.kernel.org, parth@linux.ibm.com Cc: qais.yousef@arm.com, chris.hyser@oracle.com, patrick.bellasi@matbug.net, David.Laight@aculab.com, pjt@google.com, pavel@ucw.cz, tj@kernel.org, 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, Vincent Guittot Subject: [PATCH v6 6/9] sched/fair: Add sched group latency support Date: Fri, 28 Oct 2022 09:36:34 +0200 Message-Id: <20221028073637.31195-7-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221028073637.31195-1-vincent.guittot@linaro.org> References: <20221028073637.31195-1-vincent.guittot@linaro.org> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham 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?1747916373431723807?= X-GMAIL-MSGID: =?utf-8?q?1747916373431723807?= Task can set its latency priority with sched_setattr(), which is then used to set the latency offset of its sched_enity, but sched group entities still have the default latency offset value. Add a latency.nice field in cpu cgroup controller to set the latency priority of the group similarly to sched_setattr(). The latency priority is then used to set the offset of the sched_entities of the group. Signed-off-by: Vincent Guittot --- Documentation/admin-guide/cgroup-v2.rst | 8 ++++ kernel/sched/core.c | 52 +++++++++++++++++++++++++ kernel/sched/fair.c | 33 ++++++++++++++++ kernel/sched/sched.h | 4 ++ 4 files changed, 97 insertions(+) diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst index be4a77baf784..d8ae7e411f9c 100644 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst @@ -1095,6 +1095,14 @@ All time durations are in microseconds. values similar to the sched_setattr(2). This maximum utilization value is used to clamp the task specific maximum utilization clamp. + cpu.latency.nice + A read-write single value file which exists on non-root + cgroups. The default is "0". + + The nice value is in the range [-20, 19]. + + This interface file allows reading and setting latency using the + same values used by sched_setattr(2). Memory diff --git a/kernel/sched/core.c b/kernel/sched/core.c index caf54e54a74f..3f42b1f61a7e 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -10890,6 +10890,47 @@ static int cpu_idle_write_s64(struct cgroup_subsys_state *css, { return sched_group_set_idle(css_tg(css), idle); } + +static s64 cpu_latency_nice_read_s64(struct cgroup_subsys_state *css, + struct cftype *cft) +{ + int prio, delta, last_delta = INT_MAX; + s64 weight; + + weight = css_tg(css)->latency_offset * NICE_LATENCY_WEIGHT_MAX; + weight = div_s64(weight, get_sched_latency(false)); + + /* Find the closest nice value to the current weight */ + for (prio = 0; prio < ARRAY_SIZE(sched_latency_to_weight); prio++) { + delta = abs(sched_latency_to_weight[prio] - weight); + if (delta >= last_delta) + break; + last_delta = delta; + } + + return LATENCY_TO_NICE(prio-1); +} + +static int cpu_latency_nice_write_s64(struct cgroup_subsys_state *css, + struct cftype *cft, s64 nice) +{ + s64 latency_offset; + long weight; + int idx; + + if (nice < MIN_LATENCY_NICE || nice > MAX_LATENCY_NICE) + return -ERANGE; + + idx = NICE_TO_LATENCY(nice); + idx = array_index_nospec(idx, LATENCY_NICE_WIDTH); + weight = sched_latency_to_weight[idx]; + + latency_offset = weight * get_sched_latency(false); + latency_offset = div_s64(latency_offset, NICE_LATENCY_WEIGHT_MAX); + + return sched_group_set_latency(css_tg(css), latency_offset); +} + #endif static struct cftype cpu_legacy_files[] = { @@ -10904,6 +10945,11 @@ static struct cftype cpu_legacy_files[] = { .read_s64 = cpu_idle_read_s64, .write_s64 = cpu_idle_write_s64, }, + { + .name = "latency.nice", + .read_s64 = cpu_latency_nice_read_s64, + .write_s64 = cpu_latency_nice_write_s64, + }, #endif #ifdef CONFIG_CFS_BANDWIDTH { @@ -11121,6 +11167,12 @@ static struct cftype cpu_files[] = { .read_s64 = cpu_idle_read_s64, .write_s64 = cpu_idle_write_s64, }, + { + .name = "latency.nice", + .flags = CFTYPE_NOT_ON_ROOT, + .read_s64 = cpu_latency_nice_read_s64, + .write_s64 = cpu_latency_nice_write_s64, + }, #endif #ifdef CONFIG_CFS_BANDWIDTH { diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 4299d5108dc7..9583936ce30c 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -11764,6 +11764,7 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent) goto err; tg->shares = NICE_0_LOAD; + tg->latency_offset = 0; init_cfs_bandwidth(tg_cfs_bandwidth(tg)); @@ -11862,6 +11863,9 @@ void init_tg_cfs_entry(struct task_group *tg, struct cfs_rq *cfs_rq, } se->my_q = cfs_rq; + + se->latency_offset = tg->latency_offset; + /* guarantee group entities always have weight */ update_load_set(&se->load, NICE_0_LOAD); se->parent = parent; @@ -11992,6 +11996,35 @@ int sched_group_set_idle(struct task_group *tg, long idle) return 0; } +int sched_group_set_latency(struct task_group *tg, s64 latency) +{ + int i; + + if (tg == &root_task_group) + return -EINVAL; + + if (abs(latency) > sysctl_sched_latency) + return -EINVAL; + + mutex_lock(&shares_mutex); + + if (tg->latency_offset == latency) { + mutex_unlock(&shares_mutex); + return 0; + } + + tg->latency_offset = latency; + + for_each_possible_cpu(i) { + struct sched_entity *se = tg->se[i]; + + WRITE_ONCE(se->latency_offset, latency); + } + + mutex_unlock(&shares_mutex); + return 0; +} + #else /* CONFIG_FAIR_GROUP_SCHED */ void free_fair_sched_group(struct task_group *tg) { } diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index cca09ce8d0d6..b22113c8939b 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -407,6 +407,8 @@ struct task_group { /* A positive value indicates that this is a SCHED_IDLE group. */ int idle; + /* latency constraint of the group. */ + int latency_offset; #ifdef CONFIG_SMP /* @@ -517,6 +519,8 @@ extern int sched_group_set_shares(struct task_group *tg, unsigned long shares); extern int sched_group_set_idle(struct task_group *tg, long idle); +extern int sched_group_set_latency(struct task_group *tg, s64 latency); + #ifdef CONFIG_SMP extern void set_task_rq_fair(struct sched_entity *se, struct cfs_rq *prev, struct cfs_rq *next);