2021-01-23 10:08:42

by Yunfeng Ye

Subject: [PATCH 1/2] powercap/intel_rapl: Use topology interface in rapl_add_package()

It's not a good way to access phys_proc_id and cpu_die_id directly.
So using topology_physical_package_id(cpu) and topology_die_id(cpu)
instead.

Signed-off-by: Yunfeng Ye <[email protected]>
---
drivers/powercap/intel_rapl_common.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index c9e57237d778..5f3d39b8212a 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -1309,7 +1309,6 @@ struct rapl_package *rapl_add_package(int cpu, struct rapl_if_priv *priv)
{
int id = topology_logical_die_id(cpu);
struct rapl_package *rp;
- struct cpuinfo_x86 *c = &cpu_data(cpu);
int ret;

if (!rapl_defaults)
@@ -1326,10 +1325,11 @@ struct rapl_package *rapl_add_package(int cpu, struct rapl_if_priv *priv)

if (topology_max_die_per_package() > 1)
snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH,
- "package-%d-die-%d", c->phys_proc_id, c->cpu_die_id);
+ "package-%d-die-%d",
+ topology_physical_package_id(cpu), topology_die_id(cpu));
else
snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH, "package-%d",
- c->phys_proc_id);
+ topology_physical_package_id(cpu));

/* check if the package contains valid domains */
if (rapl_detect_domains(rp, cpu) || rapl_defaults->check_unit(rp, cpu)) {
--
2.27.0

2021-01-23 10:10:10

by Yunfeng Ye

Subject: [PATCH 2/2] powercap/intel_rapl: Use topology interface in rapl_init_domains()

It's not a good way to access the phys_proc_id of cpuinfo directly.
So using topology_physical_package_id(cpu) instead.

Signed-off-by: Yunfeng Ye <[email protected]>
---
drivers/powercap/intel_rapl_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index 5f3d39b8212a..8888adcb3927 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -547,7 +547,7 @@ static void rapl_init_domains(struct rapl_package *rp)

if (i == RAPL_DOMAIN_PLATFORM && rp->id > 0) {
snprintf(rd->name, RAPL_DOMAIN_NAME_LENGTH, "psys-%d",
- cpu_data(rp->lead_cpu).phys_proc_id);
+ topology_physical_package_id(rp->lead_cpu));
} else
snprintf(rd->name, RAPL_DOMAIN_NAME_LENGTH, "%s",
rapl_domain_names[i]);
--
2.27.0

2021-02-05 12:53:00

by Rafael J. Wysocki

Subject: Re: [PATCH 2/2] powercap/intel_rapl: Use topology interface in rapl_init_domains()

On Sat, Jan 23, 2021 at 11:07 AM Yunfeng Ye <[email protected]> wrote:
>
> It's not a good way to access the phys_proc_id of cpuinfo directly.
> So using topology_physical_package_id(cpu) instead.
>
> Signed-off-by: Yunfeng Ye <[email protected]>

Srinivas, Rui, any concerns?

> ---
> drivers/powercap/intel_rapl_common.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
> index 5f3d39b8212a..8888adcb3927 100644
> --- a/drivers/powercap/intel_rapl_common.c
> +++ b/drivers/powercap/intel_rapl_common.c
> @@ -547,7 +547,7 @@ static void rapl_init_domains(struct rapl_package *rp)
>
> if (i == RAPL_DOMAIN_PLATFORM && rp->id > 0) {
> snprintf(rd->name, RAPL_DOMAIN_NAME_LENGTH, "psys-%d",
> - cpu_data(rp->lead_cpu).phys_proc_id);
> + topology_physical_package_id(rp->lead_cpu));
> } else
> snprintf(rd->name, RAPL_DOMAIN_NAME_LENGTH, "%s",
> rapl_domain_names[i]);
> --
> 2.27.0
>

2021-02-05 19:43:06

by Srinivas Pandruvada

Subject: Re: [PATCH 2/2] powercap/intel_rapl: Use topology interface in rapl_init_domains()

On Fri, 2021-02-05 at 13:46 +0100, Rafael J. Wysocki wrote:
> On Sat, Jan 23, 2021 at 11:07 AM Yunfeng Ye <[email protected]>
> wrote:
> > It's not a good way to access the phys_proc_id of cpuinfo directly.
> > So using topology_physical_package_id(cpu) instead.
> >
> > Signed-off-by: Yunfeng Ye <[email protected]>
>
> Srinivas, Rui, any concerns?
Looks good.

Thanks,
Srinivas

>
> > ---
> > drivers/powercap/intel_rapl_common.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/powercap/intel_rapl_common.c
> > b/drivers/powercap/intel_rapl_common.c
> > index 5f3d39b8212a..8888adcb3927 100644
> > --- a/drivers/powercap/intel_rapl_common.c
> > +++ b/drivers/powercap/intel_rapl_common.c
> > @@ -547,7 +547,7 @@ static void rapl_init_domains(struct
> > rapl_package *rp)
> >
> > if (i == RAPL_DOMAIN_PLATFORM && rp->id > 0) {
> > snprintf(rd->name, RAPL_DOMAIN_NAME_LENGTH,
> > "psys-%d",
> > - cpu_data(rp-
> > >lead_cpu).phys_proc_id);
> > + topology_physical_package_id(rp-
> > >lead_cpu));
> > } else
> > snprintf(rd->name, RAPL_DOMAIN_NAME_LENGTH,
> > "%s",
> > rapl_domain_names[i]);
> > --
> > 2.27.0
> >

2021-02-05 19:43:17

by Srinivas Pandruvada

Subject: Re: [PATCH 1/2] powercap/intel_rapl: Use topology interface in rapl_add_package()

On Fri, 2021-02-05 at 13:45 +0100, Rafael J. Wysocki wrote:
> On Sat, Jan 23, 2021 at 11:07 AM Yunfeng Ye <[email protected]>
> wrote:
> > It's not a good way to access phys_proc_id and cpu_die_id directly.
> > So using topology_physical_package_id(cpu) and topology_die_id(cpu)
> > instead.
> >
> > Signed-off-by: Yunfeng Ye <[email protected]>
>
> Srinivas, Rui, any concerns?
Looks good.

Thanks,
Srinivas

>
> > ---
> > drivers/powercap/intel_rapl_common.c | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/powercap/intel_rapl_common.c
> > b/drivers/powercap/intel_rapl_common.c
> > index c9e57237d778..5f3d39b8212a 100644
> > --- a/drivers/powercap/intel_rapl_common.c
> > +++ b/drivers/powercap/intel_rapl_common.c
> > @@ -1309,7 +1309,6 @@ struct rapl_package *rapl_add_package(int
> > cpu, struct rapl_if_priv *priv)
> > {
> > int id = topology_logical_die_id(cpu);
> > struct rapl_package *rp;
> > - struct cpuinfo_x86 *c = &cpu_data(cpu);
> > int ret;
> >
> > if (!rapl_defaults)
> > @@ -1326,10 +1325,11 @@ struct rapl_package *rapl_add_package(int
> > cpu, struct rapl_if_priv *priv)
> >
> > if (topology_max_die_per_package() > 1)
> > snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH,
> > - "package-%d-die-%d", c->phys_proc_id, c-
> > >cpu_die_id);
> > + "package-%d-die-%d",
> > + topology_physical_package_id(cpu),
> > topology_die_id(cpu));
> > else
> > snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH,
> > "package-%d",
> > - c->phys_proc_id);
> > + topology_physical_package_id(cpu));
> >
> > /* check if the package contains valid domains */
> > if (rapl_detect_domains(rp, cpu) || rapl_defaults-
> > >check_unit(rp, cpu)) {
> > --
> > 2.27.0
> >

2021-02-06 00:27:01

by Rafael J. Wysocki

Subject: Re: [PATCH 1/2] powercap/intel_rapl: Use topology interface in rapl_add_package()

On Sat, Jan 23, 2021 at 11:07 AM Yunfeng Ye <[email protected]> wrote:
>
> It's not a good way to access phys_proc_id and cpu_die_id directly.
> So using topology_physical_package_id(cpu) and topology_die_id(cpu)
> instead.
>
> Signed-off-by: Yunfeng Ye <[email protected]>

Srinivas, Rui, any concerns?

> ---
> drivers/powercap/intel_rapl_common.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
> index c9e57237d778..5f3d39b8212a 100644
> --- a/drivers/powercap/intel_rapl_common.c
> +++ b/drivers/powercap/intel_rapl_common.c
> @@ -1309,7 +1309,6 @@ struct rapl_package *rapl_add_package(int cpu, struct rapl_if_priv *priv)
> {
> int id = topology_logical_die_id(cpu);
> struct rapl_package *rp;
> - struct cpuinfo_x86 *c = &cpu_data(cpu);
> int ret;
>
> if (!rapl_defaults)
> @@ -1326,10 +1325,11 @@ struct rapl_package *rapl_add_package(int cpu, struct rapl_if_priv *priv)
>
> if (topology_max_die_per_package() > 1)
> snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH,
> - "package-%d-die-%d", c->phys_proc_id, c->cpu_die_id);
> + "package-%d-die-%d",
> + topology_physical_package_id(cpu), topology_die_id(cpu));
> else
> snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH, "package-%d",
> - c->phys_proc_id);
> + topology_physical_package_id(cpu));
>
> /* check if the package contains valid domains */
> if (rapl_detect_domains(rp, cpu) || rapl_defaults->check_unit(rp, cpu)) {
> --
> 2.27.0
>

2021-02-12 15:58:02

by Rafael J. Wysocki

Subject: Re: [PATCH 1/2] powercap/intel_rapl: Use topology interface in rapl_add_package()

On Sat, Jan 23, 2021 at 11:07 AM Yunfeng Ye <[email protected]> wrote:
>
> It's not a good way to access phys_proc_id and cpu_die_id directly.
> So using topology_physical_package_id(cpu) and topology_die_id(cpu)
> instead.
>
> Signed-off-by: Yunfeng Ye <[email protected]>
> ---
> drivers/powercap/intel_rapl_common.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
> index c9e57237d778..5f3d39b8212a 100644
> --- a/drivers/powercap/intel_rapl_common.c
> +++ b/drivers/powercap/intel_rapl_common.c
> @@ -1309,7 +1309,6 @@ struct rapl_package *rapl_add_package(int cpu, struct rapl_if_priv *priv)
> {
> int id = topology_logical_die_id(cpu);
> struct rapl_package *rp;
> - struct cpuinfo_x86 *c = &cpu_data(cpu);
> int ret;
>
> if (!rapl_defaults)
> @@ -1326,10 +1325,11 @@ struct rapl_package *rapl_add_package(int cpu, struct rapl_if_priv *priv)
>
> if (topology_max_die_per_package() > 1)
> snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH,
> - "package-%d-die-%d", c->phys_proc_id, c->cpu_die_id);
> + "package-%d-die-%d",
> + topology_physical_package_id(cpu), topology_die_id(cpu));
> else
> snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH, "package-%d",
> - c->phys_proc_id);
> + topology_physical_package_id(cpu));
>
> /* check if the package contains valid domains */
> if (rapl_detect_domains(rp, cpu) || rapl_defaults->check_unit(rp, cpu)) {
> --

Applied along with the [2/2] with some minor changelog edits as 5.12 material.

Thanks!