From patchwork Wed Nov 29 06:54:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meng Li X-Patchwork-Id: 171114 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp161526vqn; Tue, 28 Nov 2023 22:56:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IFvJ1hTHw7Hl3i5cH3QBYJodVVY8MjIQHmI6ZdIv8kxzeClH1Kjj8nMehcRwT6x5IAyDV72 X-Received: by 2002:a05:6870:9a14:b0:1fa:ca1:1f1c with SMTP id fo20-20020a0568709a1400b001fa0ca11f1cmr23314960oab.44.1701240974301; Tue, 28 Nov 2023 22:56:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1701240974; cv=pass; d=google.com; s=arc-20160816; b=IkmZjdV7oycPlTfTaaPxFMfyKolTTV17B1452VT9O+TD5VIINil4qkC0846PgMwpEv R/05JzrvPL3hNOuWHQhryG71BvlDOtc/OtYvArg5wSRPogpu9L/yyHxJISF/yZOZaIzq /JTU9u6dhAdhJASYzt2UZLjHmzGUmGUOWamApTgD44EvuxLwDIcf2srwSTPxDakq8DKP wlkCf2hUeezeKu37RI0QnvEUCOZEp5uI75y70JXe7wvIMXJvpBbaFtREoTMdWBdVuvoS 9SsmwKBnZpZoN1poemqKtciA1MydZPmza8F8S2fFyxbqB3M4BmgU3zNH20hhBHOCLaGP RiNA== ARC-Message-Signature: i=2; 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=BZfBTGHs/aaFa64YDeOLwIc7fexU39yB9me9j3V1LJw=; fh=px4bRiBuq3I9SXanjlkRNLIg6oMFdG8uo3HGDz2F7II=; b=iFviGwQh4dJlm8n1zW2h7DeVwE1+bKOD8IfkDglUEkGvUG1QDumzThmWxt/PadqJTX 99wcNTIm10WHQqsT0YzTqmJ8P/xQsFEfOoO7za+wfS2wZD3H6Wk7SQ/SSaO9umDTmfVT 4B1JvBsebY6B3RSsWKgNBZEXiMprSZgqlTA8r9whVhPG+avcTE1wDnZwG0f3jRkf5DA7 3iZregyQn4Ex/FDuGHPL/0dCl85BbEd2lDJ2qY8GbPqKYcpRP2OyCFhRzikDxPKdVdK/ nRLVMxzpjTnSm6LUuP+hJChPNfPLeep6vFAIR8LfnN72/lQ7BQecL6DVs2TKrzd9sr+Y Y56g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=KpHiLn+b; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id 7-20020a630207000000b00563f72935e3si10453893pgc.608.2023.11.28.22.56.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 22:56:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=KpHiLn+b; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id E371C81D55F9; Tue, 28 Nov 2023 22:56:09 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234983AbjK2Gzg (ORCPT + 99 others); Wed, 29 Nov 2023 01:55:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234638AbjK2Gz3 (ORCPT ); Wed, 29 Nov 2023 01:55:29 -0500 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2059.outbound.protection.outlook.com [40.107.243.59]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8A321BC5; Tue, 28 Nov 2023 22:55:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c0cBbhpcBVbbKwXgGfcUyHYOy8/Oqn8EfyLhl4ChECVoS+saU81as2zqSxvq+hybUOuwtp/ArOhqTw2zwTxSDF1GSpPXy+ct4Bu5YxvT4P7QUn7+wy7Spv/UYj2kDXebt0yudSZaiX84glSQgNQVPpKGZdTRV0oCSYsfo7v6ROqNeDA8vMALdB1PPEpn6zeC5UZMTNlJSQrAYfHfDsM7KY8guUTuaOp296KXp3z1+xcA7Sp/U7yGvZ+Sx6G1LaaJTWyWefR9NzUykux4I/yAmkjdjyiqwkuBqEkfmiPkxpGW5sedUz4kiBrWiKeZ8OeGVI8bi1DP/iVoQuAN7PX4Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BZfBTGHs/aaFa64YDeOLwIc7fexU39yB9me9j3V1LJw=; b=nd+6Xg6LTPOH8alVjawY7705e9wu0R++h9d+PXB8YeHqI94NYz+UNZUv9QsJQfkDuNu515zJmPKhDK7LoVDlwL2hr2S8O+XfiUG9sE2MvrndIEUCXVzzf6MgRYhHR22Uhpyzm8w+zV78KGcWh5mloq28BN6rN5j83M3qrY26vlPyFpaXyelfIckBuyiqPntRYQtNB6mDg+ytOTiPTUCeUHoH8yv0GfE4r4nEwg89A1eGQBy21AQLXafFPIks0Csk1bPk7dPG7ajQ0t/1NtfzeSqKVmKGc/XWKET+bKLsuf5QUCKScbNJuH8DBgGPMiAfmbAjL2bxg3hMtlR6LNuvgQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=intel.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BZfBTGHs/aaFa64YDeOLwIc7fexU39yB9me9j3V1LJw=; b=KpHiLn+bEm3HxFseFoEMrEdEElm1nORSwsuQNYsa41RxcoO1LhxgTGnIeIyJItKoKtJyfNEd0zMMAJa9yLOoId6u3WIhJ4XkN3sSdlXOz5A5PY7BCNw21mVsDEL/dv59+AzQjYAxgRpGYsIBt233C56/ehcjDmPxOIiAGo7I40o= Received: from PR3P192CA0028.EURP192.PROD.OUTLOOK.COM (2603:10a6:102:56::33) by BL1PR12MB5333.namprd12.prod.outlook.com (2603:10b6:208:31f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.22; Wed, 29 Nov 2023 06:55:28 +0000 Received: from SN1PEPF0002BA51.namprd03.prod.outlook.com (2603:10a6:102:56:cafe::6e) by PR3P192CA0028.outlook.office365.com (2603:10a6:102:56::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.27 via Frontend Transport; Wed, 29 Nov 2023 06:55:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF0002BA51.mail.protection.outlook.com (10.167.242.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7046.17 via Frontend Transport; Wed, 29 Nov 2023 06:55:26 +0000 Received: from jasmine-meng.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Wed, 29 Nov 2023 00:55:21 -0600 From: Meng Li To: "Rafael J . Wysocki" , Huang Rui CC: , , , , Shuah Khan , , "Nathan Fontenot" , Deepak Sharma , Alex Deucher , Mario Limonciello , Shimmer Huang , "Perry Yuan" , Xiaojian Du , Viresh Kumar , Borislav Petkov , "Oleksandr Natalenko" , Meng Li , Wyes Karny Subject: [PATCH V11 5/7] cpufreq: amd-pstate: Update amd-pstate preferred core ranking dynamically Date: Wed, 29 Nov 2023 14:54:35 +0800 Message-ID: <20231129065437.290183-6-li.meng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231129065437.290183-1-li.meng@amd.com> References: <20231129065437.290183-1-li.meng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002BA51:EE_|BL1PR12MB5333:EE_ X-MS-Office365-Filtering-Correlation-Id: b874ced8-ae55-482f-6740-08dbf0a82b0a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3hsDF6RMvrZrPHNWoeqYKGFRTkUh/iCL1sKZi7dhLrxPFNwiBBoYdVCeeyfa1CZX3nTEvh+qs0sKxNeoo3EciHCHYknPEjfBnMfSanyIcNYjD2igaJHTOyZ9FP9svPUHrG1sDKXsyLipK73PEYzme1oMlA5u8F3nc8INWD3zIjtOC6MN3kBaF2vOv5xRlRgQZJ6n28y0ATAq/IZkkgNYCk6wHrmwRL8EHzBAZmBizrnZg0eEcLk/MSeWMHovmWLC/IbqAhUO498dI0TkWMWjyoaS0NgZurkeMXkVmFC4LB7UpjRKJk0iengKxeYVha1oQ0SenCUsVPSmn8eHzozNhZ/l0Y7shauJeJol9/1LCV20K0p6fg3MNfEEiZW80hD6GqQbbODCOBG3/x54m7jcBmqBvZqXHez2/OqgZfe36YuMD3B6bfRuu8O58Xd4XQJ6jZOPHAnJpLs3vqvzupy0fydAYLvtZlqPj1Nk1D0xLUb8TI+34rd0L9z0wfUufTrCONRGZuPUpP9EkrcXicrpJStCH4I+1CLzE2pewj6ZFX56gApc8cR44MyYfSw6o9IrJpNXYA4wNfLEcnmT2f8qh/p07eBvlGGNteSMEQvRMiWm/pgMiv7MA870zL42M75Ack7fYJIb16nN0IS/ZxDe7e08GhdxHutJY5U8A3cSpBBFTPjTCzpQ8oVRWpvs0hNONKAvxS2bRt4gOEf2ApcR9tho7PNwNybJUyGYoAQboGS5CEDvWXXQfR/rNnIXL3vVta6rF4IshjAgSKiIXQU0Pg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(346002)(39860400002)(396003)(136003)(376002)(230922051799003)(186009)(451199024)(64100799003)(1800799012)(82310400011)(36840700001)(46966006)(40470700004)(82740400003)(426003)(336012)(36860700001)(40480700001)(81166007)(40460700003)(83380400001)(47076005)(356005)(66899024)(2906002)(110136005)(86362001)(5660300002)(8936002)(8676002)(4326008)(6636002)(316002)(7416002)(70586007)(54906003)(70206006)(15650500001)(478600001)(6666004)(41300700001)(7696005)(36756003)(16526019)(26005)(2616005)(1076003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2023 06:55:26.9706 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b874ced8-ae55-482f-6740-08dbf0a82b0a X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002BA51.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5333 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,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 pete.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 (pete.vger.email [0.0.0.0]); Tue, 28 Nov 2023 22:56:10 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783880455632487606 X-GMAIL-MSGID: 1783880455632487606 Preferred core rankings can be changed dynamically by the platform based on the workload and platform conditions and accounting for thermals and aging. When this occurs, cpu priority need to be set. Tested-by: Oleksandr Natalenko Reviewed-by: Mario Limonciello Reviewed-by: Wyes Karny Reviewed-by: Huang Rui Signed-off-by: Meng Li Reviewed-by: Perry Yuan --- drivers/cpufreq/amd-pstate.c | 46 ++++++++++++++++++++++++++++++++++++ include/linux/amd-pstate.h | 6 +++++ 2 files changed, 52 insertions(+) diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c index 74dcf63d75f9..88df6510dcc0 100644 --- a/drivers/cpufreq/amd-pstate.c +++ b/drivers/cpufreq/amd-pstate.c @@ -312,6 +312,7 @@ static int pstate_init_perf(struct amd_cpudata *cpudata) WRITE_ONCE(cpudata->nominal_perf, AMD_CPPC_NOMINAL_PERF(cap1)); WRITE_ONCE(cpudata->lowest_nonlinear_perf, AMD_CPPC_LOWNONLIN_PERF(cap1)); WRITE_ONCE(cpudata->lowest_perf, AMD_CPPC_LOWEST_PERF(cap1)); + WRITE_ONCE(cpudata->prefcore_ranking, AMD_CPPC_HIGHEST_PERF(cap1)); return 0; } @@ -333,6 +334,7 @@ static int cppc_init_perf(struct amd_cpudata *cpudata) WRITE_ONCE(cpudata->lowest_nonlinear_perf, cppc_perf.lowest_nonlinear_perf); WRITE_ONCE(cpudata->lowest_perf, cppc_perf.lowest_perf); + WRITE_ONCE(cpudata->prefcore_ranking, cppc_perf.highest_perf); if (cppc_state == AMD_PSTATE_ACTIVE) return 0; @@ -749,6 +751,34 @@ static void amd_pstate_init_prefcore(struct amd_cpudata *cpudata) schedule_work(&sched_prefcore_work); } +static void amd_pstate_update_highest_perf(unsigned int cpu) +{ + struct cpufreq_policy *policy; + struct amd_cpudata *cpudata; + u32 prev_high = 0, cur_high = 0; + int ret; + + if ((!amd_pstate_prefcore) || (!cpudata->hw_prefcore)) + return; + + ret = amd_pstate_get_highest_perf(cpu, &cur_high); + if (ret) + return; + + policy = cpufreq_cpu_get(cpu); + cpudata = policy->driver_data; + prev_high = READ_ONCE(cpudata->prefcore_ranking); + + if (prev_high != cur_high) { + WRITE_ONCE(cpudata->prefcore_ranking, cur_high); + + if (cur_high < CPPC_MAX_PERF) + sched_set_itmt_core_prio((int)cur_high, cpu); + } + + cpufreq_cpu_put(policy); +} + static int amd_pstate_cpu_init(struct cpufreq_policy *policy) { int min_freq, max_freq, nominal_freq, lowest_nonlinear_freq, ret; @@ -920,6 +950,17 @@ static ssize_t show_amd_pstate_highest_perf(struct cpufreq_policy *policy, return sysfs_emit(buf, "%u\n", perf); } +static ssize_t show_amd_pstate_prefcore_ranking(struct cpufreq_policy *policy, + char *buf) +{ + u32 perf; + struct amd_cpudata *cpudata = policy->driver_data; + + perf = READ_ONCE(cpudata->prefcore_ranking); + + return sysfs_emit(buf, "%u\n", perf); +} + static ssize_t show_amd_pstate_hw_prefcore(struct cpufreq_policy *policy, char *buf) { @@ -1133,6 +1174,7 @@ cpufreq_freq_attr_ro(amd_pstate_max_freq); cpufreq_freq_attr_ro(amd_pstate_lowest_nonlinear_freq); cpufreq_freq_attr_ro(amd_pstate_highest_perf); +cpufreq_freq_attr_ro(amd_pstate_prefcore_ranking); cpufreq_freq_attr_ro(amd_pstate_hw_prefcore); cpufreq_freq_attr_rw(energy_performance_preference); cpufreq_freq_attr_ro(energy_performance_available_preferences); @@ -1143,6 +1185,7 @@ static struct freq_attr *amd_pstate_attr[] = { &amd_pstate_max_freq, &amd_pstate_lowest_nonlinear_freq, &amd_pstate_highest_perf, + &amd_pstate_prefcore_ranking, &amd_pstate_hw_prefcore, NULL, }; @@ -1151,6 +1194,7 @@ static struct freq_attr *amd_pstate_epp_attr[] = { &amd_pstate_max_freq, &amd_pstate_lowest_nonlinear_freq, &amd_pstate_highest_perf, + &amd_pstate_prefcore_ranking, &amd_pstate_hw_prefcore, &energy_performance_preference, &energy_performance_available_preferences, @@ -1491,6 +1535,7 @@ static struct cpufreq_driver amd_pstate_driver = { .suspend = amd_pstate_cpu_suspend, .resume = amd_pstate_cpu_resume, .set_boost = amd_pstate_set_boost, + .update_highest_perf = amd_pstate_update_highest_perf, .name = "amd-pstate", .attr = amd_pstate_attr, }; @@ -1505,6 +1550,7 @@ static struct cpufreq_driver amd_pstate_epp_driver = { .online = amd_pstate_epp_cpu_online, .suspend = amd_pstate_epp_suspend, .resume = amd_pstate_epp_resume, + .update_highest_perf = amd_pstate_update_highest_perf, .name = "amd-pstate-epp", .attr = amd_pstate_epp_attr, }; diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h index 87e140e9e6db..426822612373 100644 --- a/include/linux/amd-pstate.h +++ b/include/linux/amd-pstate.h @@ -39,11 +39,16 @@ struct amd_aperf_mperf { * @cppc_req_cached: cached performance request hints * @highest_perf: the maximum performance an individual processor may reach, * assuming ideal conditions + * For platforms that do not support the preferred core feature, the + * highest_pef may be configured with 166 or 255, to avoid max frequency + * calculated wrongly. we take the fixed value as the highest_perf. * @nominal_perf: the maximum sustained performance level of the processor, * assuming ideal operating conditions * @lowest_nonlinear_perf: the lowest performance level at which nonlinear power * savings are achieved * @lowest_perf: the absolute lowest performance level of the processor + * @prefcore_ranking: the preferred core ranking, the higher value indicates a higher + * priority. * @max_freq: the frequency that mapped to highest_perf * @min_freq: the frequency that mapped to lowest_perf * @nominal_freq: the frequency that mapped to nominal_perf @@ -73,6 +78,7 @@ struct amd_cpudata { u32 nominal_perf; u32 lowest_nonlinear_perf; u32 lowest_perf; + u32 prefcore_ranking; u32 max_freq; u32 min_freq;