[PATCH v2] drm/amdgpu: fix sysfs_emit/sysfs_emit_at warnings(v2)
Huang Rui
ray.huang at amd.com
Thu Sep 9 11:08:24 UTC 2021
On Thu, Sep 09, 2021 at 04:00:05PM +0800, Yu, Lang wrote:
> sysfs_emit and sysfs_emit_at requrie a page boundary
> aligned buf address. Make them happy!
>
> v2: use an inline function
>
> Warning Log:
> [ 492.545174] invalid sysfs_emit_at: buf:00000000f19bdfde at:0
> [ 492.546416] WARNING: CPU: 7 PID: 1304 at fs/sysfs/file.c:765 sysfs_emit_at+0x4a/0xa0
> [ 492.654805] Call Trace:
> [ 492.655353] ? smu_cmn_get_metrics_table+0x40/0x50 [amdgpu]
> [ 492.656780] vangogh_print_clk_levels+0x369/0x410 [amdgpu]
> [ 492.658245] vangogh_common_print_clk_levels+0x77/0x80 [amdgpu]
> [ 492.659733] ? preempt_schedule_common+0x18/0x30
> [ 492.660713] smu_print_ppclk_levels+0x65/0x90 [amdgpu]
> [ 492.662107] amdgpu_get_pp_od_clk_voltage+0x13d/0x190 [amdgpu]
> [ 492.663620] dev_attr_show+0x1d/0x40
>
> Signed-off-by: Lang Yu <lang.yu at amd.com>
Looks OK for me. Although it's not perfect, the legacy design impact a lot
of ASICs and it's hard to change it one by one, so this solution is OK with
minimal impact at this moment.
Acked-by: Huang Rui <ray.huang at amd.com>
> ---
> .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 8 ++++++--
> drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 4 +++-
> .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 4 +++-
> drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 16 ++++++++++------
> drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 2 ++
> .../gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 12 ++++++++----
> .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 6 ++++--
> drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 13 +++++++++++++
> 8 files changed, 49 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
> index e343cc218990..2e5a362aa06b 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
> @@ -771,8 +771,12 @@ static int arcturus_print_clk_levels(struct smu_context *smu,
> struct smu_11_0_dpm_context *dpm_context = NULL;
> uint32_t gen_speed, lane_width;
>
> - if (amdgpu_ras_intr_triggered())
> - return sysfs_emit(buf, "unavailable\n");
> + smu_cmn_get_sysfs_buf(&buf, size);
> +
> + if (amdgpu_ras_intr_triggered()) {
> + size += sysfs_emit_at(buf, size, "unavailable\n");
> + return size;
> + }
>
> dpm_context = smu_dpm->dpm_context;
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
> index 4c81989b8162..63e1f0db579c 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
> @@ -1279,6 +1279,8 @@ static int navi10_print_clk_levels(struct smu_context *smu,
> struct smu_11_0_overdrive_table *od_settings = smu->od_settings;
> uint32_t min_value, max_value;
>
> + smu_cmn_get_sysfs_buf(&buf, &size);
> +
> switch (clk_type) {
> case SMU_GFXCLK:
> case SMU_SCLK:
> @@ -1392,7 +1394,7 @@ static int navi10_print_clk_levels(struct smu_context *smu,
> case SMU_OD_RANGE:
> if (!smu->od_enabled || !od_table || !od_settings)
> break;
> - size = sysfs_emit(buf, "%s:\n", "OD_RANGE");
> + size += sysfs_emit_at(buf, size, "%s:\n", "OD_RANGE");
>
> if (navi10_od_feature_is_supported(od_settings, SMU_11_0_ODCAP_GFXCLK_LIMITS)) {
> navi10_od_setting_get_range(od_settings, SMU_11_0_ODSETTING_GFXCLKFMIN,
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
> index 5e292c3f5050..d7519688065f 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
> @@ -1058,6 +1058,8 @@ static int sienna_cichlid_print_clk_levels(struct smu_context *smu,
> uint32_t min_value, max_value;
> uint32_t smu_version;
>
> + smu_cmn_get_sysfs_buf(&buf, &size);
> +
> switch (clk_type) {
> case SMU_GFXCLK:
> case SMU_SCLK:
> @@ -1180,7 +1182,7 @@ static int sienna_cichlid_print_clk_levels(struct smu_context *smu,
> if (!smu->od_enabled || !od_table || !od_settings)
> break;
>
> - size = sysfs_emit(buf, "%s:\n", "OD_RANGE");
> + size += sysfs_emit_at(buf, size, "%s:\n", "OD_RANGE");
>
> if (sienna_cichlid_is_od_feature_supported(od_settings, SMU_11_0_7_ODCAP_GFXCLK_LIMITS)) {
> sienna_cichlid_get_od_setting_range(od_settings, SMU_11_0_7_ODSETTING_GFXCLKFMIN,
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
> index 3a3421452e57..f6ef0ce6e9e2 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
> @@ -589,10 +589,12 @@ static int vangogh_print_legacy_clk_levels(struct smu_context *smu,
> if (ret)
> return ret;
>
> + smu_cmn_get_sysfs_buf(&buf, &size);
> +
> switch (clk_type) {
> case SMU_OD_SCLK:
> if (smu_dpm_ctx->dpm_level == AMD_DPM_FORCED_LEVEL_MANUAL) {
> - size = sysfs_emit(buf, "%s:\n", "OD_SCLK");
> + size += sysfs_emit_at(buf, size, "%s:\n", "OD_SCLK");
> size += sysfs_emit_at(buf, size, "0: %10uMhz\n",
> (smu->gfx_actual_hard_min_freq > 0) ? smu->gfx_actual_hard_min_freq : smu->gfx_default_hard_min_freq);
> size += sysfs_emit_at(buf, size, "1: %10uMhz\n",
> @@ -601,7 +603,7 @@ static int vangogh_print_legacy_clk_levels(struct smu_context *smu,
> break;
> case SMU_OD_CCLK:
> if (smu_dpm_ctx->dpm_level == AMD_DPM_FORCED_LEVEL_MANUAL) {
> - size = sysfs_emit(buf, "CCLK_RANGE in Core%d:\n", smu->cpu_core_id_select);
> + size += sysfs_emit_at(buf, size, "CCLK_RANGE in Core%d:\n", smu->cpu_core_id_select);
> size += sysfs_emit_at(buf, size, "0: %10uMhz\n",
> (smu->cpu_actual_soft_min_freq > 0) ? smu->cpu_actual_soft_min_freq : smu->cpu_default_soft_min_freq);
> size += sysfs_emit_at(buf, size, "1: %10uMhz\n",
> @@ -610,7 +612,7 @@ static int vangogh_print_legacy_clk_levels(struct smu_context *smu,
> break;
> case SMU_OD_RANGE:
> if (smu_dpm_ctx->dpm_level == AMD_DPM_FORCED_LEVEL_MANUAL) {
> - size = sysfs_emit(buf, "%s:\n", "OD_RANGE");
> + size += sysfs_emit_at(buf, size, "%s:\n", "OD_RANGE");
> size += sysfs_emit_at(buf, size, "SCLK: %7uMhz %10uMhz\n",
> smu->gfx_default_hard_min_freq, smu->gfx_default_soft_max_freq);
> size += sysfs_emit_at(buf, size, "CCLK: %7uMhz %10uMhz\n",
> @@ -688,10 +690,12 @@ static int vangogh_print_clk_levels(struct smu_context *smu,
> if (ret)
> return ret;
>
> + smu_cmn_get_sysfs_buf(&buf, &size);
> +
> switch (clk_type) {
> case SMU_OD_SCLK:
> if (smu_dpm_ctx->dpm_level == AMD_DPM_FORCED_LEVEL_MANUAL) {
> - size = sysfs_emit(buf, "%s:\n", "OD_SCLK");
> + size += sysfs_emit_at(buf, size, "%s:\n", "OD_SCLK");
> size += sysfs_emit_at(buf, size, "0: %10uMhz\n",
> (smu->gfx_actual_hard_min_freq > 0) ? smu->gfx_actual_hard_min_freq : smu->gfx_default_hard_min_freq);
> size += sysfs_emit_at(buf, size, "1: %10uMhz\n",
> @@ -700,7 +704,7 @@ static int vangogh_print_clk_levels(struct smu_context *smu,
> break;
> case SMU_OD_CCLK:
> if (smu_dpm_ctx->dpm_level == AMD_DPM_FORCED_LEVEL_MANUAL) {
> - size = sysfs_emit(buf, "CCLK_RANGE in Core%d:\n", smu->cpu_core_id_select);
> + size += sysfs_emit_at(buf, size, "CCLK_RANGE in Core%d:\n", smu->cpu_core_id_select);
> size += sysfs_emit_at(buf, size, "0: %10uMhz\n",
> (smu->cpu_actual_soft_min_freq > 0) ? smu->cpu_actual_soft_min_freq : smu->cpu_default_soft_min_freq);
> size += sysfs_emit_at(buf, size, "1: %10uMhz\n",
> @@ -709,7 +713,7 @@ static int vangogh_print_clk_levels(struct smu_context *smu,
> break;
> case SMU_OD_RANGE:
> if (smu_dpm_ctx->dpm_level == AMD_DPM_FORCED_LEVEL_MANUAL) {
> - size = sysfs_emit(buf, "%s:\n", "OD_RANGE");
> + size += sysfs_emit_at(buf, size, "%s:\n", "OD_RANGE");
> size += sysfs_emit_at(buf, size, "SCLK: %7uMhz %10uMhz\n",
> smu->gfx_default_hard_min_freq, smu->gfx_default_soft_max_freq);
> size += sysfs_emit_at(buf, size, "CCLK: %7uMhz %10uMhz\n",
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
> index 5aa175e12a78..145f13b8c977 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
> @@ -497,6 +497,8 @@ static int renoir_print_clk_levels(struct smu_context *smu,
> if (ret)
> return ret;
>
> + smu_cmn_get_sysfs_buf(&buf, &size);
> +
> switch (clk_type) {
> case SMU_OD_RANGE:
> if (smu_dpm_ctx->dpm_level == AMD_DPM_FORCED_LEVEL_MANUAL) {
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
> index ab652028e003..5019903db492 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
> @@ -733,15 +733,19 @@ static int aldebaran_print_clk_levels(struct smu_context *smu,
> uint32_t freq_values[3] = {0};
> uint32_t min_clk, max_clk;
>
> - if (amdgpu_ras_intr_triggered())
> - return sysfs_emit(buf, "unavailable\n");
> + smu_cmn_get_sysfs_buf(&buf, &size);
> +
> + if (amdgpu_ras_intr_triggered()) {
> + size += sysfs_emit_at(buf, size, "unavailable\n");
> + return size;
> + }
>
> dpm_context = smu_dpm->dpm_context;
>
> switch (type) {
>
> case SMU_OD_SCLK:
> - size = sysfs_emit(buf, "%s:\n", "GFXCLK");
> + size += sysfs_emit_at(buf, size, "%s:\n", "GFXCLK");
> fallthrough;
> case SMU_SCLK:
> ret = aldebaran_get_current_clk_freq_by_table(smu, SMU_GFXCLK, &now);
> @@ -795,7 +799,7 @@ static int aldebaran_print_clk_levels(struct smu_context *smu,
> break;
>
> case SMU_OD_MCLK:
> - size = sysfs_emit(buf, "%s:\n", "MCLK");
> + size += sysfs_emit_at(buf, size, "%s:\n", "MCLK");
> fallthrough;
> case SMU_MCLK:
> ret = aldebaran_get_current_clk_freq_by_table(smu, SMU_UCLK, &now);
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
> index 627ba2eec7fd..a403657151ba 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
> @@ -1052,16 +1052,18 @@ static int yellow_carp_print_clk_levels(struct smu_context *smu,
> int i, size = 0, ret = 0;
> uint32_t cur_value = 0, value = 0, count = 0;
>
> + smu_cmn_get_sysfs_buf(&buf, &size);
> +
> switch (clk_type) {
> case SMU_OD_SCLK:
> - size = sysfs_emit(buf, "%s:\n", "OD_SCLK");
> + size += sysfs_emit_at(buf, size, "%s:\n", "OD_SCLK");
> size += sysfs_emit_at(buf, size, "0: %10uMhz\n",
> (smu->gfx_actual_hard_min_freq > 0) ? smu->gfx_actual_hard_min_freq : smu->gfx_default_hard_min_freq);
> size += sysfs_emit_at(buf, size, "1: %10uMhz\n",
> (smu->gfx_actual_soft_max_freq > 0) ? smu->gfx_actual_soft_max_freq : smu->gfx_default_soft_max_freq);
> break;
> case SMU_OD_RANGE:
> - size = sysfs_emit(buf, "%s:\n", "OD_RANGE");
> + size += sysfs_emit_at(buf, size, "%s:\n", "OD_RANGE");
> size += sysfs_emit_at(buf, size, "SCLK: %7uMhz %10uMhz\n",
> smu->gfx_default_hard_min_freq, smu->gfx_default_soft_max_freq);
> break;
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h
> index 16993daa2ae0..4054d9493e77 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h
> @@ -110,5 +110,18 @@ void smu_cmn_init_soft_gpu_metrics(void *table, uint8_t frev, uint8_t crev);
> int smu_cmn_set_mp1_state(struct smu_context *smu,
> enum pp_mp1_state mp1_state);
>
> +/*
> + * Helper function to make sysfs_emit_at() happy. Align buf to
> + * the current page boundary and record the offset.
> + */
> +static inline void smu_cmn_get_sysfs_buf(char **buf, int *offset)
> +{
> + if (!*buf || !offset)
> + return;
> +
> + *offset = offset_in_page(*buf);
> + *buf -= *offset;
> +}
> +
> #endif
> #endif
> --
> 2.25.1
>
More information about the amd-gfx
mailing list