From patchwork Mon Jan 16 09:28:51 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: 44038 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1098933wrn; Mon, 16 Jan 2023 01:31:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXtjbCCMCRPHkFsMj2FUo1tgAH+5pFT947ahxSr+Ql6Sti6sCkfwoWCC9QsoCmhdhgXPwo2V X-Received: by 2002:a17:90a:468d:b0:229:983:f3f9 with SMTP id z13-20020a17090a468d00b002290983f3f9mr15551158pjf.40.1673861512858; Mon, 16 Jan 2023 01:31:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673861512; cv=none; d=google.com; s=arc-20160816; b=L0DgdrFPe2harl28TAVvpPvZ72ZP2HOTYVVnQsEDcaK9rz34W2eGavhy34/52J9SQe 0CAEgvd6JYb3AEJLt+wUV4j/w6eBC7EPazBG095PFtdCu+hwvPDgzzDSHOWxSg41hXat EsW4pWZX7kXnuSBSq1YBfSDGRTEY3Yio/bePj01V6q75lqCcnYUaxN2Tcfxk0Py+vWcn mDPtdFqs3NZybrgPRpxKRQYiqNgT4HfZjbXhOWtjdFSOCnvh/4c/K93Usfu2GBSN0a3E yAwzrh+lZSWx2SsjK29T3Kb9kA2nhJwM5S7PPoR89iaui0LASZ/WS3x3WWL4UssUQdLn K/0A== 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=G5OPga9s9el+CHbJ947Z6+l1jBqfCaiyuLxg70TImQI=; b=acyEl4Rh3GM3jIysl6xWSOPLhAuPFAt48yUbPAb11a/q8crF6P+wQH9wMldxjv5Xnl 9e0DOoVGCTEmpq423S8uAJImzUqLHeNJ7TSa7K9UNDE+d26M63abV09VpbfhBl964CtE 6dcgIsDicVAjWLAk14X5CwI4R3MNb6yoKKF1qQqS6bKctg6icxFBcUJ3xDRDFhdT3SnE cI+e55xBsY0nSMOLNBZz5AQVqZ7tfvOkrG1YMeKhp3SKEPhlcRMBhxNH/TkG70nbDAO3 +vA3/MZmTZdv83s17xpU8SnI9H55N3RLcE6BvRY3ys/pgyBIFIvcjWQVuY92OWifFpAN bsIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="mXgF/mdv"; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lp15-20020a17090b4a8f00b00223770a1235si1135201pjb.138.2023.01.16.01.31.40; Mon, 16 Jan 2023 01:31:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="mXgF/mdv"; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231897AbjAPJ3y (ORCPT + 99 others); Mon, 16 Jan 2023 04:29:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232702AbjAPJ2z (ORCPT ); Mon, 16 Jan 2023 04:28:55 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EEB0A16AC4; Mon, 16 Jan 2023 01:28:53 -0800 (PST) Date: Mon, 16 Jan 2023 09:28:51 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1673861332; 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=G5OPga9s9el+CHbJ947Z6+l1jBqfCaiyuLxg70TImQI=; b=mXgF/mdvSH/Q6YlDNvzjgbl5+BUz48NBSFltjq16o4dE9A5N909n/tT6vuxMCodrmPhiyA PFLopFJ6OY/j1jBDiXYJZG0zUxXgOZq0rsdnkk+ftZ+8JSZkbqFZZ4sOkdK6UprtxmbYgZ +F9S9e/fj9/fbTE4KR7ksAX0tOFotCrvYXjkCsr3x7kLD2+GMVJhDTpS6CdrW6J74xdaHo KH768kK+PDYHBwGFjtSCQDK1+6IkaowxJNavZy0JJ2jQLUJCCutTZRuDFypq6cRa6MRLAq remUama9eA3fuheTERoMI3qe1bcJdsuwCWUjJU+m5fZIv3C5Cpp7qrkl4OvrTg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1673861332; 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=G5OPga9s9el+CHbJ947Z6+l1jBqfCaiyuLxg70TImQI=; b=VQufeeKpZGn1kYgRPd4AKwfCq0hIRDSc47/Oz8WNSfT25i+HGUAF2uC/Fg26A9SBHNpLPv o/ph6TS07ugK64CA== From: "tip-bot2 for Yair Podemsky" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/urgent] x86/aperfmperf: Erase stale arch_freq_scale values when disabling frequency invariance readings Cc: Yair Podemsky , Ingo Molnar , Peter Zijlstra , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230110160206.75912-1-ypodemsk@redhat.com> References: <20230110160206.75912-1-ypodemsk@redhat.com> MIME-Version: 1.0 Message-ID: <167386133169.4906.2168836143666979819.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755171010067473337?= X-GMAIL-MSGID: =?utf-8?q?1755171010067473337?= The following commit has been merged into the sched/urgent branch of tip: Commit-ID: 5f5cc9ed992cbab6361f198966f0edba5fc52688 Gitweb: https://git.kernel.org/tip/5f5cc9ed992cbab6361f198966f0edba5fc52688 Author: Yair Podemsky AuthorDate: Tue, 10 Jan 2023 18:02:06 +02:00 Committer: Ingo Molnar CommitterDate: Mon, 16 Jan 2023 10:19:15 +01:00 x86/aperfmperf: Erase stale arch_freq_scale values when disabling frequency invariance readings Once disable_freq_invariance_work is called the scale_freq_tick function will not compute or update the arch_freq_scale values. However the scheduler will still read these values and use them. The result is that the scheduler might perform unfair decisions based on stale values. This patch adds the step of setting the arch_freq_scale values for all cpus to the default (max) value SCHED_CAPACITY_SCALE, Once all cpus have the same arch_freq_scale value the scaling is meaningless. Signed-off-by: Yair Podemsky Signed-off-by: Ingo Molnar Acked-by: Peter Zijlstra Link: https://lore.kernel.org/r/20230110160206.75912-1-ypodemsk@redhat.com --- arch/x86/kernel/cpu/aperfmperf.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/x86/kernel/cpu/aperfmperf.c b/arch/x86/kernel/cpu/aperfmperf.c index 1f60a2b..fdbb5f0 100644 --- a/arch/x86/kernel/cpu/aperfmperf.c +++ b/arch/x86/kernel/cpu/aperfmperf.c @@ -330,7 +330,16 @@ static void __init bp_init_freq_invariance(void) static void disable_freq_invariance_workfn(struct work_struct *work) { + int cpu; + static_branch_disable(&arch_scale_freq_key); + + /* + * Set arch_freq_scale to a default value on all cpus + * This negates the effect of scaling + */ + for_each_possible_cpu(cpu) + per_cpu(arch_freq_scale, cpu) = SCHED_CAPACITY_SCALE; } static DECLARE_WORK(disable_freq_invariance_work,