From patchwork Wed Nov 15 09:04:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 165209 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp2412212vqg; Wed, 15 Nov 2023 01:05:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IFFOxg83ns/cWej7i60UIcTtI6G8ymOYN4ECzR2Ff0SNRnqnANa+uvXYs87oKxVnTo8j7gZ X-Received: by 2002:a17:90b:1e10:b0:280:2935:af27 with SMTP id pg16-20020a17090b1e1000b002802935af27mr12155287pjb.7.1700039130535; Wed, 15 Nov 2023 01:05:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700039130; cv=none; d=google.com; s=arc-20160816; b=aHdMbS3FmPsnrm74e7L3potTfzxkbu0WdK2rK7rAVO6LxqsxngPrhVykGf8RBaudMa Cv30UVjPp3MLJFn21E4IUrZrlh7g425LIO/h15qsTxuXb+GuTzcS7ov3D/vQtSbaYBV5 Zb7iKZX2p+ie8st5hWqbd/d/S5qjOOZSNGfu7rj82OOMI0CzzJYAm6ZRBeCzC22csKU4 yc+moKYU0nfIcHHvuNeMeoD6UrPQS98lwfdCN8jm89YQgJ7H2RohfnVnUaqaYo875GCu FdMs1IdVu1rHQzP3/VceA2M95sQJe+uOGgkzt504d4IkfiXI1ehYDDVj5mI9QJNa7DTJ sueg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=a+Xn9PC8PidLfilee3y3+kbGqjJKaz153ycWxRdvCpc=; fh=qNy26Va+1I0hsFCAhzA7GZ0btNXRBhEj2DvIZV+sFc4=; b=hAAoDFjnFSYZnYGFpwxmg0gTIL1lalUepI9xMypHX1qQdWtu5ItuFn1WJ4uqpQ2AIG GwWGCSC2LqixfimY5T4z8ulMsyRNWlvoFY1SVD/C6pu+p7z6jMoMh2xAfKH4z2y/qflN Dqsq9TaBKzrRjGlC2XYrHZxiOcytQRU44EirA9gCnW/CesW7DPUKx9XEXPN5hA5LXR5R DTnDE/GVF5I9J83MsY1uPkbgHjHEWjPJBB/BjSn30sGKzXWzwfhXFG7b+KBxJ7MNnY1Z fz6vXUVY6xQnjheHlqim01HSKf5BbV0MioBhduHkb1Tk8i0UWQXt9lYUkYgZzTCGyuuo KtSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=VbWDU9Xu; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=KS0RLuFH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id mt16-20020a17090b231000b00282eb8021fasi9640655pjb.188.2023.11.15.01.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 01:05:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=VbWDU9Xu; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=KS0RLuFH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A4A218138984; Wed, 15 Nov 2023 01:05:20 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234764AbjKOJFN (ORCPT + 28 others); Wed, 15 Nov 2023 04:05:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234706AbjKOJE7 (ORCPT ); Wed, 15 Nov 2023 04:04:59 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 569CA11D; Wed, 15 Nov 2023 01:04:55 -0800 (PST) Date: Wed, 15 Nov 2023 09:04:53 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1700039094; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a+Xn9PC8PidLfilee3y3+kbGqjJKaz153ycWxRdvCpc=; b=VbWDU9XuHH6heSYftJbO4SyXdKfb9qupLxKg+yebqqe5kUANKkSs9TlMq73J7Tl3kzsH35 UjhKfVs/XwHSW2UoNs52Xm406ojbl+hLXWe25mdNXHfLDrYTyIb655xOQJl4mRz/tca/qd Q7FZahwzHFbw0ygMrJgN641k4n8QyWAgvwifJsLjQg95odHz5OuGLHZJQsV0FmFUxv7eC2 BkZSeP8H0JUBYDplxvaL+gzavb4HmgOftKRhTNRjAWdwiCEtQtd1swvUPxVwY4l1iCiB2M u4rKjWYxny0Xp9kN4lGtwVnUU2hsouGY/srLQBgmFpWKboG3n6eZT5agpD8fqw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1700039094; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a+Xn9PC8PidLfilee3y3+kbGqjJKaz153ycWxRdvCpc=; b=KS0RLuFH3R5qA6FIWpfGPPZVOZ/PT+cVfU69nk71Ydxt/wZPPiOv60YJ04qF2PVwKPwyKs jnwCFEcDU35dyaCw== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched: Unify runtime accounting across classes Cc: "Peter Zijlstra (Intel)" , Daniel Bristot de Oliveira , Phil Auld , Valentin Schneider , "Steven Rostedt (Google)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <54d148a144f26d9559698c4dd82d8859038a7380.1699095159.git.bristot@kernel.org> References: <54d148a144f26d9559698c4dd82d8859038a7380.1699095159.git.bristot@kernel.org> MIME-Version: 1.0 Message-ID: <170003909330.391.5813018846891804100.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails 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_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 15 Nov 2023 01:05:20 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781630960555242789 X-GMAIL-MSGID: 1782620230945616567 The following commit has been merged into the sched/core branch of tip: Commit-ID: 5d69eca542ee17c618f9a55da52191d5e28b435f Gitweb: https://git.kernel.org/tip/5d69eca542ee17c618f9a55da52191d5e28b435f Author: Peter Zijlstra AuthorDate: Sat, 04 Nov 2023 11:59:18 +01:00 Committer: Peter Zijlstra CommitterDate: Wed, 15 Nov 2023 09:57:48 +01:00 sched: Unify runtime accounting across classes All classes use sched_entity::exec_start to track runtime and have copies of the exact same code around to compute runtime. Collapse all that. Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Daniel Bristot de Oliveira Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Phil Auld Reviewed-by: Valentin Schneider Reviewed-by: Steven Rostedt (Google) Link: https://lkml.kernel.org/r/54d148a144f26d9559698c4dd82d8859038a7380.1699095159.git.bristot@kernel.org --- include/linux/sched.h | 2 +- kernel/sched/deadline.c | 15 ++-------- kernel/sched/fair.c | 57 +++++++++++++++++++++++++++++---------- kernel/sched/rt.c | 15 ++-------- kernel/sched/sched.h | 12 +------- kernel/sched/stop_task.c | 13 +--------- 6 files changed, 53 insertions(+), 61 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index cd56d40..44b46d9 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -523,7 +523,7 @@ struct sched_statistics { u64 block_max; s64 sum_block_runtime; - u64 exec_max; + s64 exec_max; u64 slice_max; u64 nr_migrations_cold; diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index b281144..de79719 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -1275,9 +1275,8 @@ static void update_curr_dl(struct rq *rq) { struct task_struct *curr = rq->curr; struct sched_dl_entity *dl_se = &curr->dl; - u64 delta_exec, scaled_delta_exec; + s64 delta_exec, scaled_delta_exec; int cpu = cpu_of(rq); - u64 now; if (!dl_task(curr) || !on_dl_rq(dl_se)) return; @@ -1290,21 +1289,13 @@ static void update_curr_dl(struct rq *rq) * natural solution, but the full ramifications of this * approach need further study. */ - now = rq_clock_task(rq); - delta_exec = now - curr->se.exec_start; - if (unlikely((s64)delta_exec <= 0)) { + delta_exec = update_curr_common(rq); + if (unlikely(delta_exec <= 0)) { if (unlikely(dl_se->dl_yielded)) goto throttle; return; } - schedstat_set(curr->stats.exec_max, - max(curr->stats.exec_max, delta_exec)); - - trace_sched_stat_runtime(curr, delta_exec, 0); - - update_current_exec_runtime(curr, now, delta_exec); - if (dl_entity_is_special(dl_se)) return; diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index d3e045d..11073cf 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1103,23 +1103,17 @@ static void update_tg_load_avg(struct cfs_rq *cfs_rq) } #endif /* CONFIG_SMP */ -/* - * Update the current task's runtime statistics. - */ -static void update_curr(struct cfs_rq *cfs_rq) +static s64 update_curr_se(struct rq *rq, struct sched_entity *curr) { - struct sched_entity *curr = cfs_rq->curr; - u64 now = rq_clock_task(rq_of(cfs_rq)); - u64 delta_exec; - - if (unlikely(!curr)) - return; + u64 now = rq_clock_task(rq); + s64 delta_exec; delta_exec = now - curr->exec_start; - if (unlikely((s64)delta_exec <= 0)) - return; + if (unlikely(delta_exec <= 0)) + return delta_exec; curr->exec_start = now; + curr->sum_exec_runtime += delta_exec; if (schedstat_enabled()) { struct sched_statistics *stats; @@ -1129,8 +1123,43 @@ static void update_curr(struct cfs_rq *cfs_rq) max(delta_exec, stats->exec_max)); } - curr->sum_exec_runtime += delta_exec; - schedstat_add(cfs_rq->exec_clock, delta_exec); + return delta_exec; +} + +/* + * Used by other classes to account runtime. + */ +s64 update_curr_common(struct rq *rq) +{ + struct task_struct *curr = rq->curr; + s64 delta_exec; + + delta_exec = update_curr_se(rq, &curr->se); + if (unlikely(delta_exec <= 0)) + return delta_exec; + + trace_sched_stat_runtime(curr, delta_exec, 0); + + account_group_exec_runtime(curr, delta_exec); + cgroup_account_cputime(curr, delta_exec); + + return delta_exec; +} + +/* + * Update the current task's runtime statistics. + */ +static void update_curr(struct cfs_rq *cfs_rq) +{ + struct sched_entity *curr = cfs_rq->curr; + s64 delta_exec; + + if (unlikely(!curr)) + return; + + delta_exec = update_curr_se(rq_of(cfs_rq), curr); + if (unlikely(delta_exec <= 0)) + return; curr->vruntime += calc_delta_fair(delta_exec, curr); update_deadline(cfs_rq, curr); diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 6aaf0a3..3261b06 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -1002,24 +1002,15 @@ static void update_curr_rt(struct rq *rq) { struct task_struct *curr = rq->curr; struct sched_rt_entity *rt_se = &curr->rt; - u64 delta_exec; - u64 now; + s64 delta_exec; if (curr->sched_class != &rt_sched_class) return; - now = rq_clock_task(rq); - delta_exec = now - curr->se.exec_start; - if (unlikely((s64)delta_exec <= 0)) + delta_exec = update_curr_common(rq); + if (unlikely(delta_exec <= 0)) return; - schedstat_set(curr->stats.exec_max, - max(curr->stats.exec_max, delta_exec)); - - trace_sched_stat_runtime(curr, delta_exec, 0); - - update_current_exec_runtime(curr, now, delta_exec); - if (!rt_bandwidth_enabled()) return; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 539c7e7..6703e9e 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2212,6 +2212,8 @@ struct affinity_context { unsigned int flags; }; +extern s64 update_curr_common(struct rq *rq); + struct sched_class { #ifdef CONFIG_UCLAMP_TASK @@ -3262,16 +3264,6 @@ extern int sched_dynamic_mode(const char *str); extern void sched_dynamic_update(int mode); #endif -static inline void update_current_exec_runtime(struct task_struct *curr, - u64 now, u64 delta_exec) -{ - curr->se.sum_exec_runtime += delta_exec; - account_group_exec_runtime(curr, delta_exec); - - curr->se.exec_start = now; - cgroup_account_cputime(curr, delta_exec); -} - #ifdef CONFIG_SCHED_MM_CID #define SCHED_MM_CID_PERIOD_NS (100ULL * 1000000) /* 100ms */ diff --git a/kernel/sched/stop_task.c b/kernel/sched/stop_task.c index 6cf7304..b1b8fe6 100644 --- a/kernel/sched/stop_task.c +++ b/kernel/sched/stop_task.c @@ -70,18 +70,7 @@ static void yield_task_stop(struct rq *rq) static void put_prev_task_stop(struct rq *rq, struct task_struct *prev) { - struct task_struct *curr = rq->curr; - u64 now, delta_exec; - - now = rq_clock_task(rq); - delta_exec = now - curr->se.exec_start; - if (unlikely((s64)delta_exec < 0)) - delta_exec = 0; - - schedstat_set(curr->stats.exec_max, - max(curr->stats.exec_max, delta_exec)); - - update_current_exec_runtime(curr, now, delta_exec); + update_curr_common(rq); } /*