[PATCH 4.14 164/193] powerpc/perf/imc: Use cpu_to_node() not topology_physical_package_id()

[Greg Kroah-Hartman]

4.14-stable review patch.  If anyone has any objections, please let me know.

--

From: Michael Ellerman 

commit f3f1dfd600ff82b18b7ea73d80eb27f476a6aa97 upstream.

init_imc_pmu() uses topology_physical_package_id() to detect the
node id of the processor it is on to get local memory, but that's
wrong, and can lead to crashes. Fix it to use cpu_to_node().

Fixes: 885dcd709ba9 ("powerpc/perf: Add nest IMC PMU support")
Reported-By: Rob Lippert 
Tested-By: Madhavan Srinivasan 
Signed-off-by: Madhavan Srinivasan 
Signed-off-by: Michael Ellerman 
Signed-off-by: Greg Kroah-Hartman 

---
 arch/powerpc/perf/imc-pmu.c |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

--- a/arch/powerpc/perf/imc-pmu.c
+++ b/arch/powerpc/perf/imc-pmu.c
@@ -467,7 +467,7 @@ static int nest_imc_event_init(struct pe
 * Nest HW counter memory resides in a per-chip reserve-memory (HOMER).
 * Get the base memory addresss for this cpu.
 */
-   chip_id = topology_physical_package_id(event->cpu);
+   chip_id = cpu_to_chip_id(event->cpu);
pcni = pmu->mem_info;
do {
if (pcni->id == chip_id) {
@@ -524,19 +524,19 @@ static int nest_imc_event_init(struct pe
  */
 static int core_imc_mem_init(int cpu, int size)
 {
-   int phys_id, rc = 0, core_id = (cpu / threads_per_core);
+   int nid, rc = 0, core_id = (cpu / threads_per_core);
struct imc_mem_info *mem_info;
 
/*
 * alloc_pages_node() will allocate memory for core in the
 * local node only.
 */
-   phys_id = topology_physical_package_id(cpu);
+   nid = cpu_to_node(cpu);
mem_info = _imc_pmu->mem_info[core_id];
mem_info->id = core_id;
 
/* We need only vbase for core counters */
-   mem_info->vbase = page_address(alloc_pages_node(phys_id,
+   mem_info->vbase = page_address(alloc_pages_node(nid,
  GFP_KERNEL | __GFP_ZERO | 
__GFP_THISNODE |
  __GFP_NOWARN, get_order(size)));
if (!mem_info->vbase)
@@ -797,14 +797,14 @@ static int core_imc_event_init(struct pe
 static int thread_imc_mem_alloc(int cpu_id, int size)
 {
u64 ldbar_value, *local_mem = per_cpu(thread_imc_mem, cpu_id);
-   int phys_id = topology_physical_package_id(cpu_id);
+   int nid = cpu_to_node(cpu_id);
 
if (!local_mem) {
/*
 * This case could happen only once at start, since we dont
 * free the memory in cpu offline path.
 */
-   local_mem = page_address(alloc_pages_node(phys_id,
+   local_mem = page_address(alloc_pages_node(nid,
  GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE |
  __GFP_NOWARN, get_order(size)));
if (!local_mem)

[PATCH 4.14 164/193] powerpc/perf/imc: Use cpu_to_node() not topology_physical_package_id()

[Greg Kroah-Hartman]

4.14-stable review patch.  If anyone has any objections, please let me know.

--

From: Michael Ellerman 

commit f3f1dfd600ff82b18b7ea73d80eb27f476a6aa97 upstream.

init_imc_pmu() uses topology_physical_package_id() to detect the
node id of the processor it is on to get local memory, but that's
wrong, and can lead to crashes. Fix it to use cpu_to_node().

Fixes: 885dcd709ba9 ("powerpc/perf: Add nest IMC PMU support")
Reported-By: Rob Lippert 
Tested-By: Madhavan Srinivasan 
Signed-off-by: Madhavan Srinivasan 
Signed-off-by: Michael Ellerman 
Signed-off-by: Greg Kroah-Hartman 

---
 arch/powerpc/perf/imc-pmu.c |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

--- a/arch/powerpc/perf/imc-pmu.c
+++ b/arch/powerpc/perf/imc-pmu.c
@@ -467,7 +467,7 @@ static int nest_imc_event_init(struct pe
 * Nest HW counter memory resides in a per-chip reserve-memory (HOMER).
 * Get the base memory addresss for this cpu.
 */
-   chip_id = topology_physical_package_id(event->cpu);
+   chip_id = cpu_to_chip_id(event->cpu);
pcni = pmu->mem_info;
do {
if (pcni->id == chip_id) {
@@ -524,19 +524,19 @@ static int nest_imc_event_init(struct pe
  */
 static int core_imc_mem_init(int cpu, int size)
 {
-   int phys_id, rc = 0, core_id = (cpu / threads_per_core);
+   int nid, rc = 0, core_id = (cpu / threads_per_core);
struct imc_mem_info *mem_info;
 
/*
 * alloc_pages_node() will allocate memory for core in the
 * local node only.
 */
-   phys_id = topology_physical_package_id(cpu);
+   nid = cpu_to_node(cpu);
mem_info = _imc_pmu->mem_info[core_id];
mem_info->id = core_id;
 
/* We need only vbase for core counters */
-   mem_info->vbase = page_address(alloc_pages_node(phys_id,
+   mem_info->vbase = page_address(alloc_pages_node(nid,
  GFP_KERNEL | __GFP_ZERO | 
__GFP_THISNODE |
  __GFP_NOWARN, get_order(size)));
if (!mem_info->vbase)
@@ -797,14 +797,14 @@ static int core_imc_event_init(struct pe
 static int thread_imc_mem_alloc(int cpu_id, int size)
 {
u64 ldbar_value, *local_mem = per_cpu(thread_imc_mem, cpu_id);
-   int phys_id = topology_physical_package_id(cpu_id);
+   int nid = cpu_to_node(cpu_id);
 
if (!local_mem) {
/*
 * This case could happen only once at start, since we dont
 * free the memory in cpu offline path.
 */
-   local_mem = page_address(alloc_pages_node(phys_id,
+   local_mem = page_address(alloc_pages_node(nid,
  GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE |
  __GFP_NOWARN, get_order(size)));
if (!local_mem)