From nobody Wed Dec 31 16:50:29 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FF12C4332F for ; Tue, 31 Oct 2023 13:00:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344350AbjJaNAG (ORCPT ); Tue, 31 Oct 2023 09:00:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344400AbjJaNAE (ORCPT ); Tue, 31 Oct 2023 09:00:04 -0400 Received: from out-170.mta0.migadu.com (out-170.mta0.migadu.com [IPv6:2001:41d0:1004:224b::aa]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15E28DB for ; Tue, 31 Oct 2023 06:00:01 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1698757199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=16cXTdi5/ep7w7uZRWQYSJHZkPZmLLf1mG23Gp6fSwY=; b=vNeWMJBD0MKX8+m7eW+z7P4Ht1LQVJelagkCOeXvHrpq3TSwhMAT43SrGdGqKfT6lIAA8P qBtjNlpvgSsu716T8XasjmEh1v5U4v0pycNKQtaqpEsQ/1Yx8UhTkHfrEo6y+LT0aR8B4N 1V0pm6k2LDub39CdqsQZFJj5kVn1I6c= From: Yajun Deng To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com Cc: linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH v3 1/3] sched: Don't account execution time for task group Date: Tue, 31 Oct 2023 20:59:26 +0800 Message-Id: <20231031125928.235685-2-yajun.deng@linux.dev> In-Reply-To: <20231031125928.235685-1-yajun.deng@linux.dev> References: <20231031125928.235685-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The rt entity can be a task group. We will account execution time for each task. For consistency, we don't need to account execution time for task group. Pass a parameter to update_current_exec_runtime, let the caller decide whether account execution time. Signed-off-by: Yajun Deng Suggested-by: Peter Zijlstra --- v3: Pass a parameter to update_current_exec_runtime. v2: Add the missing '#endif'. v1: https://lore.kernel.org/all/20231023065418.1548239-1-yajun.deng@linux.d= ev/ --- kernel/sched/deadline.c | 2 +- kernel/sched/rt.c | 3 ++- kernel/sched/sched.h | 10 ++++++---- kernel/sched/stop_task.c | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index b28114478b82..a9f84428c4b5 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -1303,7 +1303,7 @@ static void update_curr_dl(struct rq *rq) =20 trace_sched_stat_runtime(curr, delta_exec, 0); =20 - update_current_exec_runtime(curr, now, delta_exec); + update_current_exec_runtime(curr, now, delta_exec, true); =20 if (dl_entity_is_special(dl_se)) return; diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 6aaf0a3d6081..79cf80d73822 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -1018,7 +1018,8 @@ static void update_curr_rt(struct rq *rq) =20 trace_sched_stat_runtime(curr, delta_exec, 0); =20 - update_current_exec_runtime(curr, now, delta_exec); + update_current_exec_runtime(curr, now, delta_exec, + rt_entity_is_task(rt_se)); =20 if (!rt_bandwidth_enabled()) return; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 2e5a95486a42..6f0169d9b306 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3262,13 +3262,15 @@ extern void sched_dynamic_update(int mode); #endif =20 static inline void update_current_exec_runtime(struct task_struct *curr, - u64 now, u64 delta_exec) + u64 now, u64 delta_exec, bool task) { curr->se.sum_exec_runtime +=3D delta_exec; - account_group_exec_runtime(curr, delta_exec); - curr->se.exec_start =3D now; - cgroup_account_cputime(curr, delta_exec); + + if (task) { + account_group_exec_runtime(curr, delta_exec); + cgroup_account_cputime(curr, delta_exec); + } } =20 #ifdef CONFIG_SCHED_MM_CID diff --git a/kernel/sched/stop_task.c b/kernel/sched/stop_task.c index 6cf7304e6449..1bec2af7ce8d 100644 --- a/kernel/sched/stop_task.c +++ b/kernel/sched/stop_task.c @@ -81,7 +81,7 @@ static void put_prev_task_stop(struct rq *rq, struct task= _struct *prev) schedstat_set(curr->stats.exec_max, max(curr->stats.exec_max, delta_exec)); =20 - update_current_exec_runtime(curr, now, delta_exec); + update_current_exec_runtime(curr, now, delta_exec, true); } =20 /* --=20 2.25.1 From nobody Wed Dec 31 16:50:29 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C0D9C4332F for ; Tue, 31 Oct 2023 13:00:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344423AbjJaNAQ (ORCPT ); Tue, 31 Oct 2023 09:00:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344417AbjJaNAO (ORCPT ); Tue, 31 Oct 2023 09:00:14 -0400 Received: from out-183.mta0.migadu.com (out-183.mta0.migadu.com [91.218.175.183]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 896DCEA for ; Tue, 31 Oct 2023 06:00:11 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1698757209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/sO/0GN20MYb/vNaKkzhBBtk0+YYiOECkhCnCZjqjhI=; b=lisl5PHvh0WYFyUnrtBihMVHL0yL31Xhwkl7H6OVMudPPWdfH9gKGOwiTbyIH2ntZzlO+b y9sMXRR4kUMcpL9A0QiyDSbAdKayPDWEcebo59oOOrWdaPvyq7czi5+J0/7JlorkMXsD/B J+4wQke+ZlRprsuD4m4Ao2MjrPgU49M= From: Yajun Deng To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com Cc: linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH v3 2/3] sched: Don't trace stat runtime for task group Date: Tue, 31 Oct 2023 20:59:27 +0800 Message-Id: <20231031125928.235685-3-yajun.deng@linux.dev> In-Reply-To: <20231031125928.235685-1-yajun.deng@linux.dev> References: <20231031125928.235685-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The rt entity can be a task group. We will trace stat runtime for each task, so we don't need to trace stat runtime for task group. Move trace_sched_stat_runtime in update_current_exec_runtime. Signed-off-by: Yajun Deng --- v3: New patch. --- kernel/sched/deadline.c | 2 -- kernel/sched/rt.c | 2 -- kernel/sched/sched.h | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index a9f84428c4b5..70b5c5b47106 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -1301,8 +1301,6 @@ static void update_curr_dl(struct rq *rq) schedstat_set(curr->stats.exec_max, max(curr->stats.exec_max, delta_exec)); =20 - trace_sched_stat_runtime(curr, delta_exec, 0); - update_current_exec_runtime(curr, now, delta_exec, true); =20 if (dl_entity_is_special(dl_se)) diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 79cf80d73822..1e155c7658ae 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -1016,8 +1016,6 @@ static void update_curr_rt(struct rq *rq) schedstat_set(curr->stats.exec_max, max(curr->stats.exec_max, delta_exec)); =20 - trace_sched_stat_runtime(curr, delta_exec, 0); - update_current_exec_runtime(curr, now, delta_exec, rt_entity_is_task(rt_se)); =20 diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 6f0169d9b306..f7014e19bc0a 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3268,6 +3268,7 @@ static inline void update_current_exec_runtime(struct= task_struct *curr, curr->se.exec_start =3D now; =20 if (task) { + trace_sched_stat_runtime(curr, delta_exec, curr->se.vruntime); account_group_exec_runtime(curr, delta_exec); cgroup_account_cputime(curr, delta_exec); } --=20 2.25.1 From nobody Wed Dec 31 16:50:29 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAC83C4332F for ; Tue, 31 Oct 2023 13:00:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344433AbjJaNAd (ORCPT ); Tue, 31 Oct 2023 09:00:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344430AbjJaNA0 (ORCPT ); Tue, 31 Oct 2023 09:00:26 -0400 Received: from out-172.mta0.migadu.com (out-172.mta0.migadu.com [IPv6:2001:41d0:1004:224b::ac]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8B6EFD for ; Tue, 31 Oct 2023 06:00:23 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1698757221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i7mRzGepikGwf8IInKfZWrq3Ja/myVvXm98PYematwc=; b=TQvO/62h1NO17SquF88fUpY2eQXVXl/k9nBKSzhcRfe9yYNpYkurG3z+udinUJBmAvUZRp uZJ+4XY8KE2msF1PjSG2XL2hNBmSbuOY5xjrrs8VMtEedUg20kxqTq3AZPcTAdS+hSch+T xrMx9qEi3OLK0Bhv5kbLlZWi1nbKK8A= From: Yajun Deng To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com Cc: linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH v3 3/3] sched/fair: Simplify update_curr() Date: Tue, 31 Oct 2023 20:59:28 +0800 Message-Id: <20231031125928.235685-4-yajun.deng@linux.dev> In-Reply-To: <20231031125928.235685-1-yajun.deng@linux.dev> References: <20231031125928.235685-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use update_current_exec_runtime() simplify update_curr(). Signed-off-by: Yajun Deng --- v3: New patch. --- kernel/sched/fair.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 2048138ce54b..ffc000e49db5 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1135,6 +1135,7 @@ static void update_tg_load_avg(struct cfs_rq *cfs_rq) static void update_curr(struct cfs_rq *cfs_rq) { struct sched_entity *curr =3D cfs_rq->curr; + struct task_struct *curtask =3D rq_of(cfs_rq)->curr; u64 now =3D rq_clock_task(rq_of(cfs_rq)); u64 delta_exec; =20 @@ -1145,8 +1146,6 @@ static void update_curr(struct cfs_rq *cfs_rq) if (unlikely((s64)delta_exec <=3D 0)) return; =20 - curr->exec_start =3D now; - if (schedstat_enabled()) { struct sched_statistics *stats; =20 @@ -1155,20 +1154,14 @@ static void update_curr(struct cfs_rq *cfs_rq) max(delta_exec, stats->exec_max)); } =20 - curr->sum_exec_runtime +=3D delta_exec; schedstat_add(cfs_rq->exec_clock, delta_exec); =20 curr->vruntime +=3D calc_delta_fair(delta_exec, curr); update_deadline(cfs_rq, curr); update_min_vruntime(cfs_rq); =20 - if (entity_is_task(curr)) { - struct task_struct *curtask =3D task_of(curr); - - trace_sched_stat_runtime(curtask, delta_exec, curr->vruntime); - cgroup_account_cputime(curtask, delta_exec); - account_group_exec_runtime(curtask, delta_exec); - } + update_current_exec_runtime(curtask, now, delta_exec, + entity_is_task(curr)); =20 account_cfs_rq_runtime(cfs_rq, delta_exec); } --=20 2.25.1