From patchwork Tue Oct 31 12:59:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yajun Deng X-Patchwork-Id: 160105 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b90f:0:b0:403:3b70:6f57 with SMTP id t15csp216161vqg; Tue, 31 Oct 2023 06:00:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHGUpuaeNTBXsFm0MVYbsdV5Pa4mRgrpNgTBzvFVkP5lhBcPFh2Y/Ss0KIZ/hpTQeX/Jjrx X-Received: by 2002:a05:6870:6ec8:b0:1e9:cb7f:2287 with SMTP id qv8-20020a0568706ec800b001e9cb7f2287mr16632130oab.46.1698757213801; Tue, 31 Oct 2023 06:00:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698757213; cv=none; d=google.com; s=arc-20160816; b=aOY0Wvt9mEeVZEABCTEsdcFoB4eKckb/FIUevzXQDIKQ2qNsD7b7Zrp1BkNht7PmrK +le/RWxScfeNaq+eaCL6Jn3AhbPXtvTgKEBJMXOFwPR5gsJ0ZhvImx7+HqygvlGeVPzE ZqJr4KESXRUmjtvcLrJpnVfb4zEub7IeomvjkDDeVECYqp8tZHYaHMeIhS3EPpGUS8X2 Tc8nG/iIbbHZ0Bi7Vl0XqZcG3Uh1MJ1YD8V2j3ghNHv10X97WisCE8PwZmKRvZ4uXnjP Zb4tJM+/pDRAfGzE7+LULXa9VE9wOK+bLrXzaI8i4gCJ2f1ibu1JLcu00RC8TY8md9g6 UNog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=16cXTdi5/ep7w7uZRWQYSJHZkPZmLLf1mG23Gp6fSwY=; fh=kY5sJNvn29qhEh2SatEVpXE2cTkcQ8AnU+xu9Bnn8Ic=; b=mjtG2gSiD8rXrgYmTqS8cdWOkIhyRMBXufVt/kRV1dM3+lgH78t6GeLVUXDovKRT8C lciAKOv/kVhllqGHH/wQTK6xIq9GUxE5q8QxHIrYx2ei3JJoK11vf31Bdc72ODa+R24Y cL7e/k3EttoYGFOIT95i0k/e28Iv+11ec2jgoVot8BHnJdk8mY1pnWIjG2oYZUdNWUW8 NkwNNKaya0Pq9/Ikg2+H6r1pmoEOlTEQn2Hb8pkovyww7b7CpUV247HUhYZFj24a7/Ea Iopcoe1/aQ5GbDJ/59F9UQ/6yMGn8FloAjJVOrA3orqsKuH95XBidvVC5x3XPz2/AFmP sLIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=vNeWMJBD; 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=NONE dis=NONE) header.from=linux.dev Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id ch6-20020a056a0208c600b005a9e65341besi1050631pgb.216.2023.10.31.06.00.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 06:00:13 -0700 (PDT) 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=@linux.dev header.s=key1 header.b=vNeWMJBD; 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=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id CC427801F74E; Tue, 31 Oct 2023 06:00:10 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344412AbjJaNAG (ORCPT + 33 others); 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 X-Migadu-Flow: FLOW_OUT 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]); Tue, 31 Oct 2023 06:00:10 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781276044561452970 X-GMAIL-MSGID: 1781276044561452970 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.dev/ --- 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) trace_sched_stat_runtime(curr, delta_exec, 0); - update_current_exec_runtime(curr, now, delta_exec); + update_current_exec_runtime(curr, now, delta_exec, true); 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) trace_sched_stat_runtime(curr, delta_exec, 0); - update_current_exec_runtime(curr, now, delta_exec); + update_current_exec_runtime(curr, now, delta_exec, + rt_entity_is_task(rt_se)); 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 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 += delta_exec; - account_group_exec_runtime(curr, delta_exec); - curr->se.exec_start = now; - cgroup_account_cputime(curr, delta_exec); + + if (task) { + account_group_exec_runtime(curr, delta_exec); + cgroup_account_cputime(curr, delta_exec); + } } #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)); - update_current_exec_runtime(curr, now, delta_exec); + update_current_exec_runtime(curr, now, delta_exec, true); } /* From patchwork Tue Oct 31 12:59:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yajun Deng X-Patchwork-Id: 160106 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b90f:0:b0:403:3b70:6f57 with SMTP id t15csp216848vqg; Tue, 31 Oct 2023 06:00:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEquY7cGI8+VGt+5hgpj9n3nZvruVK5LHZu35I9jQMAIPvIIuITR3LIZnml81kDIP6+gwwo X-Received: by 2002:a05:6e02:198b:b0:357:9ec8:87f1 with SMTP id g11-20020a056e02198b00b003579ec887f1mr19216953ilf.1.1698757254494; Tue, 31 Oct 2023 06:00:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698757254; cv=none; d=google.com; s=arc-20160816; b=ZXew0v2eh7dv+6Qhs0VKy7O/I7m7nIDQcrL/mhOFpN5K298jhYgZh67nMrF56PTHKD pThHpFYLhbwfVDwPU8Z/GAsnReQGtdiRptd3/m4TPut7zxTma6RIa/XY9tiJ9xSSZBgs XjCJYzoMXeRWPZb17fUxKT7norwy7yU0ZLZ7kW9E16hm73O2ydqQvuCPgkr55QocNK8V wx3H3foU4W1nqL4f4FV0mhpd8cyouvRf2SOf7x+S8iCOiiHNy6roB1QkehPBOGenebkq zHUcKyoUmDeo2ga6EVsrxEbnyNyiv1P+EE5npHPuBB0sraDmkUg3qECoM9ewkVDpql+v Ttrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/sO/0GN20MYb/vNaKkzhBBtk0+YYiOECkhCnCZjqjhI=; fh=kY5sJNvn29qhEh2SatEVpXE2cTkcQ8AnU+xu9Bnn8Ic=; b=j5Y/HzW46sUsQTJ4b77DnkaWiDZwnYA3BC1DVRyq3QQTkqQdoyuOvyjc8l3QsIIOM1 Oh4LpsPiJNbEQwFqA+p3RW+PoogkVA258XRS1ZnlyI2VN78xXsue1sc7KkaO8/vluOIP FAmy60dmVJXhlbPw6GI8qZjplsy2X6TW8ftEemm4B+tmhBlwmLHbrIxBEtsbDwNCJObP sfXh7El+VPVubXcgHsypEyzPMcnW3OqJ8FvA4wWWY8X2qgI/oZPrr4HGY+IZ6tWydjMq eUSqpjtVVHJNUQYmcE+H79RGl5Ed9g90IiI/HCVclQhyDVXwr9TBQYWnpQ5xxj11yCFw oblw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=lisl5PHv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id e8-20020a656bc8000000b005b4a9b2f404si1033905pgw.710.2023.10.31.06.00.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 06:00:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=lisl5PHv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 5313B8076E62; Tue, 31 Oct 2023 06:00:25 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344414AbjJaNAP (ORCPT + 33 others); Tue, 31 Oct 2023 09:00:15 -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 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email 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 (groat.vger.email [0.0.0.0]); Tue, 31 Oct 2023 06:00:25 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781276086689821939 X-GMAIL-MSGID: 1781276086689821939 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)); - trace_sched_stat_runtime(curr, delta_exec, 0); - update_current_exec_runtime(curr, now, delta_exec, true); 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)); - trace_sched_stat_runtime(curr, delta_exec, 0); - update_current_exec_runtime(curr, now, delta_exec, rt_entity_is_task(rt_se)); 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 = now; 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); } From patchwork Tue Oct 31 12:59:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yajun Deng X-Patchwork-Id: 160107 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b90f:0:b0:403:3b70:6f57 with SMTP id t15csp216900vqg; Tue, 31 Oct 2023 06:00:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHhiKEoV69ZTVz4I1+McWx9r5Xyazq6L8nvcIor0xx/9Eir8W0rRJZW88OcxaHnaV/ap2jG X-Received: by 2002:a17:90b:4c81:b0:280:74fc:6545 with SMTP id my1-20020a17090b4c8100b0028074fc6545mr4025675pjb.24.1698757258818; Tue, 31 Oct 2023 06:00:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698757258; cv=none; d=google.com; s=arc-20160816; b=zoOPnmRsleF1I6KqorbiEsvN3dZ/0t+2lzTNjyIS+yOptR4F7eV6jh8F7aBYD1NaFS iMJrIePm9PQypMNepHMOoL6vaDHoZTNCQT4PnW7YhUORavK0+quZgfhl7VwJdWyYWcp5 LYwFz1WGcPlE0fhDlxje2/0T2gEt4zRtdVnCzGhu8YfPgDoELHtkEmLUmDl31dKMyScf N9tg3a+he4nBQet8/t9j81vZH5pkISth2/XkdQG9Lr/G5jgM+BjE+OzbAmPPnX2MpBfj soydZWHvEMmt2pLar24mIqVveTmY0JQI6n4WXtIKMGNDYWhw9gQ31xG1NL/rE4xB0x1L Qmzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=i7mRzGepikGwf8IInKfZWrq3Ja/myVvXm98PYematwc=; fh=kY5sJNvn29qhEh2SatEVpXE2cTkcQ8AnU+xu9Bnn8Ic=; b=MHfnLW3lvgySroQBCAB4uCJgKZBs++Ex6QBQ8joirxpgXLH5ENuQ4SNcl3UvvrfMFq RjYKwvHfJQWBZaRT7NSzQNRf9tbypsWEErkvPMGZETkQIMe8S2Vv95DHdyS/PdGg72Pz JHAgBOecINKFlbIdCr6ND02xl+KUNj2SUD9MaS2RJ9tUm7uNqykLL0wOPI+vLIT7Tm7S gCTFy18aTyWz87G4cWRE8qqIZ9qcBgmHUaWp8epCBrE+WJcbqLgs1oXKiiJcRL72ksL4 Ec2N1DguOxI8aneIFR3HbSWKftOat+Px9ltG0NfbvnpYGSPKrHNplX06jEbB9IazS2EW Hw3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b="TQvO/62h"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id fa18-20020a17090af0d200b002804438ebcfsi924532pjb.171.2023.10.31.06.00.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 06:00:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b="TQvO/62h"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id D1B6A80A90F0; Tue, 31 Oct 2023 06:00:46 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344422AbjJaNAb (ORCPT + 33 others); Tue, 31 Oct 2023 09:00:31 -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 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email 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 (groat.vger.email [0.0.0.0]); Tue, 31 Oct 2023 06:00:46 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781276091775934591 X-GMAIL-MSGID: 1781276091775934591 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 = cfs_rq->curr; + struct task_struct *curtask = rq_of(cfs_rq)->curr; u64 now = rq_clock_task(rq_of(cfs_rq)); u64 delta_exec; @@ -1145,8 +1146,6 @@ static void update_curr(struct cfs_rq *cfs_rq) if (unlikely((s64)delta_exec <= 0)) return; - curr->exec_start = now; - if (schedstat_enabled()) { struct sched_statistics *stats; @@ -1155,20 +1154,14 @@ 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); curr->vruntime += calc_delta_fair(delta_exec, curr); update_deadline(cfs_rq, curr); update_min_vruntime(cfs_rq); - if (entity_is_task(curr)) { - struct task_struct *curtask = 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)); account_cfs_rq_runtime(cfs_rq, delta_exec); }