From nobody Sat Sep 13 06:20:08 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 1B170C2BA2B for ; Sat, 16 Sep 2023 23:35:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236026AbjIPXaf (ORCPT ); Sat, 16 Sep 2023 19:30:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232626AbjIPXaU (ORCPT ); Sat, 16 Sep 2023 19:30:20 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4829CD5 for ; Sat, 16 Sep 2023 16:30:14 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-401b393ddd2so38229645e9.0 for ; Sat, 16 Sep 2023 16:30:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=layalina-io.20230601.gappssmtp.com; s=20230601; t=1694907013; x=1695511813; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CvpHqEWL9tMeSEEzcenarEoP8GnGGnnH5tB09ndPi7w=; b=212WK3aKLXkp/Ji6htbdVwyWND4jzTXqmQxi0i+zI1H9DPa0Fj1gBl5MGtWPD3DuVs ctKF9oXotBhTigLzIwENut93eKCeaLDhffu81gcKquas7Le5Ad3RUy0Q0YfoqCz7TeDa 9ybxNXyoqDRbtokMndlh5UalyGbKgINz3szXaJwJ7n8ciepy2pJ8Bx20O2Z7GAnttnxn 2FfFLl7IF3lw2de2v6hu2IE5V+14lxfpnVy40mwwnUKt8tlQE7VM62yhW0DSAO1m+Dfn B16LfRx2dLOeMB8eITJAzlydgZl+SNnB3YcDmQ3aoRA1aLyg/MmrSSdSJ4qbCqnMF4yc 6A6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694907013; x=1695511813; h=content-transfer-encoding:mime-version: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=CvpHqEWL9tMeSEEzcenarEoP8GnGGnnH5tB09ndPi7w=; b=J5ucWGRUAKyzQMezRLD5Tt1q3yxEbOFD9zRQgOpMcSntKmSxi8O2gBkTWQTE6U1j+J skfInh1l6HJLFxRmxodFwi9kqHPfhEy3hZ8R+GRubwCPt1PlDQsf7VPyfEqUCZHHjjDK FWu61oDuYAYu4/YfTRqzKw+4dnDc6gddModKNAWMcbEjsd3FJI4vGZsSa9FqeZ5Vph0A Bxh1CVdqpGSghtTGw7rlGBYAh21tYJV2sCKHa67GMUNMlGwu3ELyDlyWEYYdyu833JWC cQFD9pyuEOn/rkahJybOy+1F/KKNNlk9/0JuXbDSFzKupRGhvJwXx8R49p07E0aMGGLR KbEA== X-Gm-Message-State: AOJu0YxcsS/YLka1aNZHXgkVnzLPMNmkQOgOyZm0+0trXwPsaOSbOhyY G1BDyTRGXLv5dE25350CzjTXjg== X-Google-Smtp-Source: AGHT+IGJaftLGOz56YNHXpoJKuj24Fzr5v2Elkfs4cvzy8dqPeKRUBAW5iVc1kJAXF0umJTJC6K+Uw== X-Received: by 2002:a7b:cd0b:0:b0:401:d947:c8a9 with SMTP id f11-20020a7bcd0b000000b00401d947c8a9mr4506416wmj.19.1694907013344; Sat, 16 Sep 2023 16:30:13 -0700 (PDT) Received: from airbuntu.. (host109-151-228-137.range109-151.btcentralplus.com. [109.151.228.137]) by smtp.gmail.com with ESMTPSA id b14-20020a05600c11ce00b003fee8502999sm11203929wmi.18.2023.09.16.16.30.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Sep 2023 16:30:13 -0700 (PDT) From: Qais Yousef To: Ingo Molnar , Peter Zijlstra , Vincent Guittot , Dietmar Eggemann Cc: linux-kernel@vger.kernel.org, Lukasz Luba , Wei Wang , Xuewen Yan , Hank , Jonathan JMChen , Hongyan Xia , Qais Yousef Subject: [PATCH v5 3/3] sched/tp: Add new tracepoint to track compute energy computation Date: Sun, 17 Sep 2023 00:29:55 +0100 Message-Id: <20230916232955.2099394-4-qyousef@layalina.io> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230916232955.2099394-1-qyousef@layalina.io> References: <20230916232955.2099394-1-qyousef@layalina.io> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" It was useful to track feec() placement decision and debug the spare capacity and optimization issues vs uclamp_max. Reviewed-by: Dietmar Eggemann Signed-off-by: Qais Yousef (Google) --- include/trace/events/sched.h | 5 +++++ kernel/sched/core.c | 1 + kernel/sched/fair.c | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index fbb99a61f714..a13d5d06be9d 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -735,6 +735,11 @@ DECLARE_TRACE(sched_update_nr_running_tp, TP_PROTO(struct rq *rq, int change), TP_ARGS(rq, change)); =20 +DECLARE_TRACE(sched_compute_energy_tp, + TP_PROTO(struct task_struct *p, int dst_cpu, unsigned long energy, + unsigned long max_util, unsigned long busy_time), + TP_ARGS(p, dst_cpu, energy, max_util, busy_time)); + #endif /* _TRACE_SCHED_H */ =20 /* This part must be outside protection */ diff --git a/kernel/sched/core.c b/kernel/sched/core.c index f39482d6a6e6..cc87627a7c63 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -114,6 +114,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(sched_overutilized_tp); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_util_est_cfs_tp); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_util_est_se_tp); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_update_nr_running_tp); +EXPORT_TRACEPOINT_SYMBOL_GPL(sched_compute_energy_tp); =20 DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); =20 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 0d0582e02409..fd7fd7b5aef2 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7592,11 +7592,16 @@ compute_energy(struct energy_env *eenv, struct perf= _domain *pd, { unsigned long max_util =3D eenv_pd_max_util(eenv, pd_cpus, p, dst_cpu); unsigned long busy_time =3D eenv->pd_busy_time; + unsigned long energy; =20 if (dst_cpu >=3D 0) busy_time =3D min(eenv->pd_cap, busy_time + eenv->task_busy_time); =20 - return em_cpu_energy(pd->em_pd, max_util, busy_time, eenv->cpu_cap); + energy =3D em_cpu_energy(pd->em_pd, max_util, busy_time, eenv->cpu_cap); + + trace_sched_compute_energy_tp(p, dst_cpu, energy, max_util, busy_time); + + return energy; } =20 /* --=20 2.34.1