From: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nathan Lynch <nathanl@linux.ibm.com>,
Gautham R Shenoy <ego@linux.vnet.ibm.com>,
Oliver OHalloran <oliveroh@au1.ibm.com>,
Michael Neuling <mikey@linux.ibm.com>,
Michael Ellerman <michaele@au1.ibm.com>,
Anton Blanchard <anton@au1.ibm.com>,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
Nick Piggin <npiggin@au1.ibm.com>
Subject: Re: [PATCH 00/11] Support for grouping cores
Date: Tue, 14 Jul 2020 10:36:06 +0530 [thread overview]
Message-ID: <20200714050606.GA26776@linux.vnet.ibm.com> (raw)
In-Reply-To: <20200714043624.5648-1-srikar@linux.vnet.ibm.com>
* Srikar Dronamraju <srikar@linux.vnet.ibm.com> [2020-07-14 10:06:13]:
>
> On Power 9 (with device-tree enablement to show coregroups).
> -----------------------------------------------------------
With help of Gautham, I tried to kexec into a newer kernel with a modified
dtb. However when passing with the dtb option, kexec would get stuck.
Hence alternatively, I hardcoded some assumptions to test the same.
These hunks apply on top of all the patches.
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 8ec7ff05ae47..762aa573c313 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -56,6 +56,12 @@ static int n_mem_addr_cells, n_mem_size_cells;
static int form1_affinity;
#define MAX_DISTANCE_REF_POINTS 4
+/*
+ * HAck2: On Power9, there are 12 SMT8 cores per chip.
+ * Hard code this for now.
+ */
+#define CORES_PER_CHIP 12
+#define CORES_PER_COREGROUP (CORES_PER_CHIP / 2)
static int distance_ref_points_depth;
static const __be32 *distance_ref_points;
static int distance_lookup_table[MAX_NUMNODES][MAX_DISTANCE_REF_POINTS];
@@ -326,6 +332,13 @@ static int __init find_min_common_depth(void)
if (form1_affinity) {
depth = of_read_number(distance_ref_points, 1);
+ /*
+ * Hack: Hack: Hack:
+ * For now only on Phyp machines.
+ */
+ if (!firmware_has_feature(FW_FEATURE_OPAL))
+ depth--;
} else {
if (distance_ref_points_depth < 2) {
printk(KERN_WARNING "NUMA: "
@@ -1247,8 +1260,8 @@ int cpu_to_coregroup_id(int cpu)
goto out;
index = of_read_number(associativity, 1);
- if ((index > min_common_depth + 1) && coregroup_enabled)
- return of_read_number(&associativity[index - 1], 1);
+ if ((index > min_common_depth + 1) && coregroup_enabled && has_big_cores)
+ return of_read_number(&associativity[index], 1) / CORES_PER_COREGROUP;
out:
return cpu_to_core_id(cpu);
--
Thanks and Regards
Srikar Dronamraju
prev parent reply other threads:[~2020-07-14 5:08 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 4:36 [PATCH 00/11] Support for grouping cores Srikar Dronamraju
2020-07-14 4:36 ` [PATCH 01/11] powerpc/smp: Cache node for reuse Srikar Dronamraju
2020-07-17 4:51 ` Gautham R Shenoy
2020-07-14 4:36 ` [PATCH 02/11] powerpc/smp: Merge Power9 topology with Power topology Srikar Dronamraju
2020-07-17 5:44 ` Gautham R Shenoy
2020-07-20 8:10 ` Srikar Dronamraju
2020-07-14 4:36 ` [PATCH 03/11] powerpc/smp: Move powerpc_topology above Srikar Dronamraju
2020-07-17 5:45 ` Gautham R Shenoy
2020-07-14 4:36 ` [PATCH 04/11] powerpc/smp: Enable small core scheduling sooner Srikar Dronamraju
2020-07-17 5:48 ` Gautham R Shenoy
2020-07-20 7:20 ` Srikar Dronamraju
2020-07-20 7:47 ` Jordan Niethe
2020-07-20 8:52 ` Srikar Dronamraju
2020-07-14 4:36 ` [PATCH 05/11] powerpc/smp: Dont assume l2-cache to be superset of sibling Srikar Dronamraju
2020-07-14 5:40 ` Oliver O'Halloran
2020-07-14 6:30 ` Srikar Dronamraju
2020-07-17 6:00 ` Gautham R Shenoy
2020-07-20 6:45 ` Srikar Dronamraju
2020-07-20 8:58 ` Gautham R Shenoy
2020-07-14 4:36 ` [PATCH 06/11] powerpc/smp: Generalize 2nd sched domain Srikar Dronamraju
2020-07-17 6:37 ` Gautham R Shenoy
2020-07-20 6:19 ` Srikar Dronamraju
2020-07-20 9:07 ` Gautham R Shenoy
2020-07-14 4:36 ` [PATCH 07/11] Powerpc/numa: Detect support for coregroup Srikar Dronamraju
2020-07-17 8:08 ` Gautham R Shenoy
2020-07-20 13:56 ` Michael Ellerman
2020-07-21 2:57 ` Srikar Dronamraju
2020-07-14 4:36 ` [PATCH 08/11] powerpc/smp: Allocate cpumask only after searching thread group Srikar Dronamraju
2020-07-17 8:08 ` Gautham R Shenoy
2020-07-14 4:36 ` [PATCH 09/11] Powerpc/smp: Create coregroup domain Srikar Dronamraju
2020-07-17 8:19 ` Gautham R Shenoy
2020-07-17 8:23 ` Gautham R Shenoy
2020-07-20 6:02 ` Srikar Dronamraju
2020-07-14 4:36 ` [PATCH 10/11] powerpc/smp: Implement cpu_to_coregroup_id Srikar Dronamraju
2020-07-17 8:26 ` Gautham R Shenoy
2020-07-20 5:48 ` Srikar Dronamraju
2020-07-20 9:10 ` Gautham R Shenoy
2020-07-20 10:26 ` Srikar Dronamraju
2020-07-14 4:36 ` [PATCH 11/11] powerpc/smp: Provide an ability to disable coregroup Srikar Dronamraju
2020-07-17 8:28 ` Gautham R Shenoy
2020-07-20 13:57 ` Michael Ellerman
2020-07-14 5:06 ` Srikar Dronamraju [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200714050606.GA26776@linux.vnet.ibm.com \
--to=srikar@linux.vnet.ibm.com \
--cc=anton@au1.ibm.com \
--cc=ego@linux.vnet.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=michaele@au1.ibm.com \
--cc=mikey@linux.ibm.com \
--cc=mpe@ellerman.id.au \
--cc=nathanl@linux.ibm.com \
--cc=npiggin@au1.ibm.com \
--cc=oliveroh@au1.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).