From patchwork Tue Feb 20 14:59:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 13564125 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 404CAC48BC3 for ; Tue, 20 Feb 2024 15:00:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=w99HwhNi4JXUGi7zo2VGItuVo89XYKe8bkBAC+mtM2o=; b=wnxA6yfiBk0g21 aIogJVpQ6QoZUou+3A3NSp0UzUCaAszyJVLASFZ82qc/OTT/Q3DqtuqFfsYEiQoD+1Nox/TJyIZk3 jIuXHy1sxWuTFfiKaZDt8psH1KQXM5KqMBNp+vJ+5zlBIJHAOTK+eww6+RTVZm7iq1XUAJ8NqSSCa 6CAyBRRLubbDvjOk1fyfqrHeY7GQ81YL8SpZu56I6MUmzyBlqgwTwa94q0pxUoWIdAykmZw3mencB aJ5OoR2/GEtr5qcle/k/rvXvdbWrIoBCOddFurR2CtRbXf8auRRUsrPAQJraztObgnGWeneg14d0E ItVtppEfi/9v03VNmVYg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcRbk-0000000FAne-1vhj; Tue, 20 Feb 2024 15:00:33 +0000 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcRbJ-0000000FAXu-1uUw for linux-arm-kernel@lists.infradead.org; Tue, 20 Feb 2024 15:00:13 +0000 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-33d153254b7so2674340f8f.0 for ; Tue, 20 Feb 2024 07:00:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708441202; x=1709046002; darn=lists.infradead.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=oXsi9e0ZJaTq8tCuJHkWD66aNk20DvqQuX0JKE5P0uc=; b=qDZHjPUorkmx+/7MdeMawmouTYDFaw2p9hXCxGVcjDrPfZuuMBx+enA6ZXxW291fZz O2rD0ADUuZ0VdI6UH/I25jIVh5HqrkX9HGP/w5O+JHhMjIb7M8N/cqFkOpkP85aEwK+Y cr7cpENN2IvhUoo8qusHiqc7nCvDPPIOeVFxrKZQa1DnswsiwMimpSmUqhjbPpQdW7Mw fAbMrhrTfgVAzGwXPe+x2yonkMYsEs+EMwT6sc450TVjH3O7+GPlqzSElaQO5tgNp7lY x5eiS8M6GA1bsDg7DoKuDN2f6PJgFinQzA7nxX6eHtLBic/3SLiSzhnQxzxDjRAK10RW gSHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708441202; x=1709046002; 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=oXsi9e0ZJaTq8tCuJHkWD66aNk20DvqQuX0JKE5P0uc=; b=Q2mVJohede1D6e02OMBetaIs2VpTInkAhXQ5ciisy9ECb7qIRZnsvjWHESIWyzqfAg y+St6i9Oyj4y1/FHROQpNoYNZjilEIciMpgHN+TSbbYkr1NSQmMuF31o9t3uQP6yWTYD DiByAYymlP+CbuE2Mz6VcRhUvaptoqZf/nRZg8HnMyeDRLpTca1xaqbKKD0j+CUIg5Gu MgRuWxYgktc37lWKnN2z7ZE1QpToiEAhfYsUazffum4Ad0eAgZpXebjPgpDSl2+EjaN2 lVKkjmWfkGRB3WKLJAiQcx9yFWf+ZIMrenA65K0YmD5UYrRlRRgPVKg1hm/7rkHNTDSN KW8A== X-Forwarded-Encrypted: i=1; AJvYcCVf5w4n+md0kk0sQnQHm2Ag4YQRN+eBeaUHA7kMMGssCUbMpkhZJ7yZIbVbM+UHA0ui0ww6dvxgQuznpH0hRBM7JyN3GQN6+nyStDy+HXSdj3/EmJs= X-Gm-Message-State: AOJu0Yx8TgO4K2QW5BSk9jymB4bV59aJBCWAVrOg/S2G80Hz7xtkWyV7 uS9tGNtVr3Qb3U3Xie5SGlpGgQ/RsAM6Sy0qiDx8p74IFGWxuevSfv02ZsBG+E8= X-Google-Smtp-Source: AGHT+IEGJuS9S6rDAwOVJ71L9m5a65+6iLz6u9I0qEZvXUIWtxH6o/5l2zVbIcoozPQzIagXT47Q0A== X-Received: by 2002:a05:6000:1a43:b0:33d:32ff:9629 with SMTP id t3-20020a0560001a4300b0033d32ff9629mr6355629wry.23.1708441202610; Tue, 20 Feb 2024 07:00:02 -0800 (PST) Received: from vingu-book.. ([2a01:e0a:f:6020:8deb:bfb9:b028:6d5c]) by smtp.gmail.com with ESMTPSA id v4-20020a5d6784000000b0033d39626c27sm9304405wru.76.2024.02.20.07.00.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 07:00:01 -0800 (PST) From: Vincent Guittot To: linux@armlinux.org.uk, catalin.marinas@arm.com, will@kernel.org, sudeep.holla@arm.com, rafael@kernel.org, viresh.kumar@linaro.org, agross@kernel.org, andersson@kernel.org, konrad.dybcio@linaro.org, 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, lukasz.luba@arm.com, rui.zhang@intel.com, mhiramat@kernel.org, daniel.lezcano@linaro.org, amit.kachhap@gmail.com, corbet@lwn.net, gregkh@linuxfoundation.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-doc@vger.kernel.org Cc: Vincent Guittot , Qais Yousef Subject: [PATCH v5 5/5] sched/pelt: Remove shift of thermal clock Date: Tue, 20 Feb 2024 15:59:47 +0100 Message-Id: <20240220145947.1107937-6-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240220145947.1107937-1-vincent.guittot@linaro.org> References: <20240220145947.1107937-1-vincent.guittot@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_070005_583099_4E05FFC0 X-CRM114-Status: GOOD ( 15.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The optional shift of the clock used by thermal/hw load avg has been introduced to handle case where the signal was not always a high frequency hw signal. Now that cpufreq provides a signal for firmware and SW pressure, we can remove this exception and always keep this PELT signal aligned with other signals. Mark sysctl_sched_migration_cost boot parameter as deprecated Signed-off-by: Vincent Guittot Reviewed-by: Qais Yousef --- .../admin-guide/kernel-parameters.txt | 1 + kernel/sched/core.c | 2 +- kernel/sched/fair.c | 10 ++-------- kernel/sched/sched.h | 18 ------------------ 4 files changed, 4 insertions(+), 27 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 31b3a25680d0..4dc54bd1bbf2 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -5749,6 +5749,7 @@ but is useful for debugging and performance tuning. sched_thermal_decay_shift= + [Deprecated] [KNL, SMP] Set a decay shift for scheduler thermal pressure signal. Thermal pressure signal follows the default decay period of other scheduler pelt diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 8bfe5ce4ccd3..b740dcdc86a0 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5669,7 +5669,7 @@ void scheduler_tick(void) update_rq_clock(rq); hw_pressure = arch_scale_hw_pressure(cpu_of(rq)); - update_hw_load_avg(rq_clock_hw(rq), rq, hw_pressure); + update_hw_load_avg(rq_clock_task(rq), rq, hw_pressure); curr->sched_class->task_tick(rq, curr, 0); if (sched_feat(LATENCY_WARN)) resched_latency = cpu_resched_latency(rq); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 8961d307f232..f7c2bf0eba65 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -78,15 +78,9 @@ static unsigned int normalized_sysctl_sched_base_slice = 750000ULL; const_debug unsigned int sysctl_sched_migration_cost = 500000UL; -int sched_hw_decay_shift; static int __init setup_sched_thermal_decay_shift(char *str) { - int _shift = 0; - - if (kstrtoint(str, 0, &_shift)) - pr_warn("Unable to set scheduler thermal pressure decay shift parameter\n"); - - sched_hw_decay_shift = clamp(_shift, 0, 10); + pr_warn("Ignoring the deprecated sched_thermal_decay_shift= option\n"); return 1; } __setup("sched_thermal_decay_shift=", setup_sched_thermal_decay_shift); @@ -9296,7 +9290,7 @@ static bool __update_blocked_others(struct rq *rq, bool *done) decayed = update_rt_rq_load_avg(now, rq, curr_class == &rt_sched_class) | update_dl_rq_load_avg(now, rq, curr_class == &dl_sched_class) | - update_hw_load_avg(rq_clock_hw(rq), rq, hw_pressure) | + update_hw_load_avg(now, rq, hw_pressure) | update_irq_load_avg(rq, 0); if (others_have_blocked(rq)) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 1f8799788cea..638c61efe19d 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1531,24 +1531,6 @@ static inline u64 rq_clock_task(struct rq *rq) return rq->clock_task; } -/** - * By default the decay is the default pelt decay period. - * The decay shift can change the decay period in - * multiples of 32. - * Decay shift Decay period(ms) - * 0 32 - * 1 64 - * 2 128 - * 3 256 - * 4 512 - */ -extern int sched_hw_decay_shift; - -static inline u64 rq_clock_hw(struct rq *rq) -{ - return rq_clock_task(rq) >> sched_hw_decay_shift; -} - static inline void rq_clock_skip_update(struct rq *rq) { lockdep_assert_rq_held(rq);