Received-SPF: pass (google.com: domain of linux-kernel+bounces-154934-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Tue, 23 Apr 2024 19:00:09 +0800
From: Huang Rui <ray.huang@amd.com>
To: "Yuan, Perry" <Perry.Yuan@amd.com>
Cc: "rafael.j.wysocki@intel.com" <rafael.j.wysocki@intel.com>,
	"Limonciello, Mario" <Mario.Limonciello@amd.com>,
	"viresh.kumar@linaro.org" <viresh.kumar@linaro.org>,
	"Shenoy, Gautham Ranjal" <gautham.shenoy@amd.com>,
	"Petkov, Borislav" <Borislav.Petkov@amd.com>,
	"Deucher, Alexander" <Alexander.Deucher@amd.com>,
	"Huang, Shimmer" <Shimmer.Huang@amd.com>,
	"oleksandr@natalenko.name" <oleksandr@natalenko.name>,
	"Du, Xiaojian" <Xiaojian.Du@amd.com>,
	"Meng, Li (Jassmine)" <Li.Meng@amd.com>,
	"linux-pm@vger.kernel.org" <linux-pm@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v7 3/6] cpufreq: amd-pstate: implement cpb_boost sysfs
 entry for boost control
Message-ID: <ZieUuaKRAPFr1EzS@amd.com>
References: <cover.1713861200.git.perry.yuan@amd.com>
 <5a357c1ac3504f8a69def8834a6d9557b5d592ed.1713861200.git.perry.yuan@amd.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <5a357c1ac3504f8a69def8834a6d9557b5d592ed.1713861200.git.perry.yuan@amd.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?h5D+tqs1FDgnUigTcAffzckZRnUqP3bbcFA4nFdspkzPtXwQ3hhGc2sxWiCx?=
 =?us-ascii?Q?+3w0vrBc8IIzOGpWicOqJN/uufnymJ59MbLNhBDkRZ5y03K+mG4qFInueYoF?=
 =?us-ascii?Q?vNZ2T8W02tEDE2xNyTMn2gXCp9IY0pKCdXh+E7rcel/RuukFmxOe+sWuPtN9?=
 =?us-ascii?Q?pMLsQYEWzjSiz2eIpl2q9wryBmM0OmXREesDvgdDY4uhP8DjsK/2kb0dGOmW?=
 =?us-ascii?Q?UVPqIfzkH6+7/mjZoDqtz+nF6kTNNEY8sCLgMrmuhISNdQ6HEef6M3eaW/UW?=
 =?us-ascii?Q?YnxgnfNwbFAu14KNd8jM77rmQnADJfgRmflhdBXTmCJCBbR4bS+4UuMuGV3k?=
 =?us-ascii?Q?0YbIwiWbwWm59K7/BWzva2V8AZg/ffoNGijhZW0HrTRd9zfG1BOcvBh2tbwM?=
 =?us-ascii?Q?SbewgllBLITvPnYgbxsqSDiPCxwrUb+FVSt1/spiz+MubLNuWrrUl1HoUsg7?=
 =?us-ascii?Q?BPPV/bKzA9o+OBLWdipmAnUkzoPZXA8UCO555992WSEpYpRmId/+vmbxshbt?=
 =?us-ascii?Q?KxsOz5yYg2mwE2g5feutzrtE7YM3flA2ugKec9RpETRqTaQCG/L7ViVi2kCJ?=
 =?us-ascii?Q?G18fYDwxX/TY783SSCX77brXiPcsOGdhyjP+pbM5wLnPaW967IHPYEALmx50?=
 =?us-ascii?Q?oEyLoqaotmTtDiD9Q9SR2sddwymqhB0iiW8WjRxylrCNPoUwtKmcCQvxasUo?=
 =?us-ascii?Q?2h9/stShdL22JcMrSzwUhqmM4y1LAMjZj62L1z9+80jbkLRWx29O5ZrC2k2X?=
 =?us-ascii?Q?UUmHSrchCTAaFtGGqy98kr6wlThI9QPTTESkNZJNDgTundMSL72icv7l3ynO?=
 =?us-ascii?Q?3mk9enNA67wp3SzUD8WYU0AylpLqbKuQeVyw+fzLxnYpmCmcm1hzJlpbP0+9?=
 =?us-ascii?Q?HIPum0+3rADZqG6+ixJXCWX/uawkKxK+vsNAAfKXc3IGLiRxckIqsIxMCm8U?=
 =?us-ascii?Q?ccL89gCKf53MgHiGWvoiMYQ/ang9U2bf1qrDD4ZJX80tDPdlke8PdAmyYqx+?=
 =?us-ascii?Q?XvRatfwHFMAFZqL5I1p8wKBLB4yVb9tdu3TF3FBdC9ppkdDaZUf2lUcIGJXd?=
 =?us-ascii?Q?ns2GUYlbCPVkgQEno1+d+OHvHKWlwt78SlEcfJvNy0Yevr0OE6QUFABv3Lhk?=
 =?us-ascii?Q?cym4dUkFPVKWGFsE+ErWV3KVjotrl18ZchseKFjVVi8jhev3CMjqVvRusyjY?=
 =?us-ascii?Q?bAiOMnRxOQpWfx6Omp0Xxdrzkj2VXnP/atRY76nZoDZ5szw8bZ88ZxlBmwpW?=
 =?us-ascii?Q?Eb/dvMdvrvfkFJ2DQppBbZlKIfQ66M8D94XxI7xW3m5q6t6UajDpWnNB5/nq?=
 =?us-ascii?Q?w6Mvv5+Fxn3yqpwAebnSWLEJOTBaZIj2wIjwowUlwVgL084zP9yOCuLw/ja9?=
 =?us-ascii?Q?uAAtNAAUWefQBaNq4DE+akjld8QWvQN9IszDPx+4f/vrxTp3NIjfBzkc4icc?=
 =?us-ascii?Q?UYgmPeteHYvjqUlSJ/NWMJZ/lsXALKTsjV8y0VldacSIMbQPKj5ilQMtyrVC?=
 =?us-ascii?Q?wL0Sfo96SI5ZNMmQ+iO6qO9kZPdZKFwn6GFk6OpO1+K0/bD2FrKKorBedH8X?=
 =?us-ascii?Q?jFRfZfcbZSb76YvJ4hbn9j6p8RAEu+CNgNF1W5YS?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 42732365-ea78-451c-db84-08dc63849711
X-MS-Exchange-CrossTenant-AuthSource: SJ2PR12MB8690.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2024 11:00:30.2670
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: n3H46eNh9fffwI4nmP6jeDNcln2/S9QrRRT0BAw79XFcUZ7M5pFvkn7GiR5aGnn2STlvucLyNHGqPVFdM5IeKA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5756

On Tue, Apr 23, 2024 at 04:40:56PM +0800, Yuan, Perry wrote:
> From: Perry Yuan <Perry.Yuan@amd.com>
> 
> With this new sysfs entry `cpb_boost`created, user can change CPU boost
> state dynamically under `active`, `guided` and `passive` modes.
> And the highest perf and frequency will also be updated as the boost
> state changing.
> 
> 0): check current boost state
> cat /sys/devices/system/cpu/amd_pstate/cpb_boost
> 
> 1): disable CPU boost
> sudo bash -c "echo 0 > /sys/devices/system/cpu/amd_pstate/cpb_boost"
> 
> 2): enable CPU boost
> sudo bash -c "echo 1 > /sys/devices/system/cpu/amd_pstate/cpb_boost"
> 
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217931
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217618
> Signed-off-by: Perry Yuan <Perry.Yuan@amd.com>
> ---
>  drivers/cpufreq/amd-pstate.c | 99 ++++++++++++++++++++++++++++++++++++
>  1 file changed, 99 insertions(+)
> 
> diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> index 3d86cd7c9073..49eeb38fcf20 100644
> --- a/drivers/cpufreq/amd-pstate.c
> +++ b/drivers/cpufreq/amd-pstate.c
> @@ -1291,6 +1291,103 @@ static ssize_t prefcore_show(struct device *dev,
>  	return sysfs_emit(buf, "%s\n", str_enabled_disabled(amd_pstate_prefcore));
>  }
>  
> +static int amd_cpu_boost_update(struct amd_cpudata *cpudata, u32 on)
> +{
> +	struct cpufreq_policy *policy = cpufreq_cpu_acquire(cpudata->cpu);
> +	struct cppc_perf_ctrls perf_ctrls;
> +	u32 highest_perf, nominal_perf, nominal_freq, max_freq;
> +	int ret;
> +
> +	if (!policy)
> +		return -ENODATA;
> +
> +	highest_perf = READ_ONCE(cpudata->highest_perf);
> +	nominal_perf = READ_ONCE(cpudata->nominal_perf);
> +	nominal_freq = READ_ONCE(cpudata->nominal_freq);
> +	max_freq = READ_ONCE(cpudata->max_freq);
> +
> +	if (boot_cpu_has(X86_FEATURE_CPPC)) {
> +		u64 value = READ_ONCE(cpudata->cppc_req_cached);
> +
> +		value &= ~GENMASK_ULL(7, 0);
> +		value |= on ? highest_perf : nominal_perf;
> +		WRITE_ONCE(cpudata->cppc_req_cached, value);
> +
> +		wrmsrl_on_cpu(cpudata->cpu, MSR_AMD_CPPC_REQ, value);
> +
> +	} else {
> +		perf_ctrls.max_perf = on ? highest_perf : nominal_perf;
> +		ret = cppc_set_epp_perf(cpudata->cpu, &perf_ctrls, 1);
> +		if (ret) {
> +			pr_debug("failed to set energy perf value (%d)\n", ret);

Do we need cpufreq_cpu_release here? 

> +			return ret;
> +		}
> +	}
> +
> +	if (on)
> +		policy->cpuinfo.max_freq = max_freq;
> +	else
> +		policy->cpuinfo.max_freq = nominal_freq;
> +
> +	policy->max = policy->cpuinfo.max_freq;
> +
> +	if (cppc_state == AMD_PSTATE_PASSIVE) {
> +		ret = freq_qos_update_request(&cpudata->req[1],
> +				      policy->cpuinfo.max_freq);
> +	}
> +
> +	cpufreq_cpu_release(policy);
> +
> +	return ret;
> +}
> +
> +static ssize_t cpb_boost_show(struct device *dev,
> +			   struct device_attribute *attr, char *buf)
> +{
> +	return sysfs_emit(buf, "%u\n", amd_pstate_global_params.cpb_boost);
> +}
> +
> +static ssize_t cpb_boost_store(struct device *dev, struct device_attribute *b,
> +			    const char *buf, size_t count)
> +{
> +	bool new_state;
> +	ssize_t ret;
> +	int cpu;
> +
> +	mutex_lock(&amd_pstate_driver_lock);
> +	if (!amd_pstate_global_params.cpb_supported) {
> +		pr_err("Boost mode is not supported by this processor or SBIOS\n");
> +		return -EINVAL;
> +	}
> +
> +	ret = kstrtobool(buf, &new_state);
> +	if (ret)

If get a falure, amd_pstate_driver_lock will be always locked.

Thanks,
Ray

> +		return -EINVAL;
> +
> +	amd_pstate_global_params.cpb_boost = !!new_state;
> +
> +	for_each_present_cpu(cpu) {
> +
> +		struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
> +		struct amd_cpudata *cpudata = policy->driver_data;
> +
> +		if (!cpudata) {
> +			pr_err("cpudata is NULL\n");
> +			ret = -ENODATA;
> +			cpufreq_cpu_put(policy);
> +			goto err_exit;
> +		}
> +
> +		amd_cpu_boost_update(cpudata, amd_pstate_global_params.cpb_boost);
> +		refresh_frequency_limits(policy);
> +		cpufreq_cpu_put(policy);
> +	}
> +
> +err_exit:
> +	mutex_unlock(&amd_pstate_driver_lock);
> +	return ret < 0 ? ret : count;
> +}
> +
>  cpufreq_freq_attr_ro(amd_pstate_max_freq);
>  cpufreq_freq_attr_ro(amd_pstate_lowest_nonlinear_freq);
>  
> @@ -1301,6 +1398,7 @@ cpufreq_freq_attr_rw(energy_performance_preference);
>  cpufreq_freq_attr_ro(energy_performance_available_preferences);
>  static DEVICE_ATTR_RW(status);
>  static DEVICE_ATTR_RO(prefcore);
> +static DEVICE_ATTR_RW(cpb_boost);
>  
>  static struct freq_attr *amd_pstate_attr[] = {
>  	&amd_pstate_max_freq,
> @@ -1325,6 +1423,7 @@ static struct freq_attr *amd_pstate_epp_attr[] = {
>  static struct attribute *pstate_global_attributes[] = {
>  	&dev_attr_status.attr,
>  	&dev_attr_prefcore.attr,
> +	&dev_attr_cpb_boost.attr,
>  	NULL
>  };
>  
> -- 
> 2.34.1
>