From: Vaibhav Jain <vaibhav@linux•ibm.com>
To: "Aneesh Kumar K.V" <aneesh.kumar@linux•ibm.com>,
npiggin@gmail•com, paulus@samba•org, mpe@ellerman•id.au
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux•ibm.com>,
linuxppc-dev@lists•ozlabs.org
Subject: Re: ["RFC PATCH" 2/2] powerpc/mm: Conslidate numa_enable check and min_common_depth check
Date: Sat, 29 Jun 2019 21:09:42 +0530 [thread overview]
Message-ID: <87imsos8n5.fsf@vajain21.in.ibm.com> (raw)
In-Reply-To: <20190629083629.29037-2-aneesh.kumar@linux.ibm.com>
"Aneesh Kumar K.V" <aneesh.kumar@linux•ibm.com> writes:
> Update min_common_depth = -1 if numa is disabled. This
> help us to avoid checking for both in different code paths.
>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux•ibm.com>
> ---
> arch/powerpc/mm/numa.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
> index f6d68baeaa96..c84062a390cc 100644
> --- a/arch/powerpc/mm/numa.c
> +++ b/arch/powerpc/mm/numa.c
> @@ -212,7 +212,7 @@ static int associativity_to_nid(const __be32 *associativity)
> {
> int nid = NUMA_NO_NODE;
>
> - if (min_common_depth == -1 || !numa_enabled)
> + if (min_common_depth == -1)
> goto out;
>
> if (of_read_number(associativity, 1) >= min_common_depth)
> @@ -625,6 +625,7 @@ static int __init parse_numa_properties(void)
>
> if (numa_enabled == 0) {
> printk(KERN_WARNING "NUMA disabled by user\n");
> + min_common_depth = -1;
> return -1;
> }
I would prefer updating the definition of variable 'min_common_depth' to
static int min_common_depth = -1;
This would handle the case where someone calls 'associativity_to_nid()' and
other functions that read 'min_common_depth' and get an invalid result
back. And also handle the case where kernel is booted with 'numa = off'.
Also the init value 'min_common_depth == 0' indicates that the
first word in "ibm,associativity" array represents the node-id which is
wrong. Instead its the length of the "ibm,associativity" array.
>
> @@ -747,7 +748,7 @@ void __init dump_numa_cpu_topology(void)
> unsigned int node;
> unsigned int cpu, count;
>
> - if (min_common_depth == -1 || !numa_enabled)
> + if (min_common_depth == -1)
> return;
>
> for_each_online_node(node) {
> @@ -812,7 +813,7 @@ static void __init find_possible_nodes(void)
> struct device_node *rtas;
> u32 numnodes, i;
>
> - if (min_common_depth <= 0 || !numa_enabled)
> + if (min_common_depth <= 0)
> return;
>
> rtas = of_find_node_by_path("/rtas");
> @@ -1014,7 +1015,7 @@ int hot_add_scn_to_nid(unsigned long scn_addr)
> struct device_node *memory = NULL;
> int nid;
>
> - if (!numa_enabled || (min_common_depth < 0))
> + if (min_common_depth < 0)
> return first_online_node;
>
> memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
> --
> 2.21.0
>
--
Vaibhav Jain <vaibhav@linux•ibm.com>
Linux Technology Center, IBM India Pvt. Ltd.
next prev parent reply other threads:[~2019-06-29 15:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-29 8:36 ["RFC PATCH" 1/2] powerpc/mm: Fix node look up with numa=off boot Aneesh Kumar K.V
2019-06-29 8:36 ` ["RFC PATCH" 2/2] powerpc/mm: Conslidate numa_enable check and min_common_depth check Aneesh Kumar K.V
2019-06-29 9:06 ` Aneesh Kumar K.V
2019-06-29 15:39 ` Vaibhav Jain [this message]
2019-06-29 15:54 ` Aneesh Kumar K.V
2019-06-29 9:03 ` ["RFC PATCH" 1/2] powerpc/mm: Fix node look up with numa=off boot Aneesh Kumar K.V
2019-07-01 16:42 ` Nathan Lynch
2019-07-02 2:45 ` Aneesh Kumar K.V
2019-07-02 15:57 ` Nathan Lynch
2019-07-04 14:29 ` Michael Ellerman
2019-07-09 14:56 ` Nathan Lynch
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=87imsos8n5.fsf@vajain21.in.ibm.com \
--to=vaibhav@linux$(echo .)ibm.com \
--cc=aneesh.kumar@linux$(echo .)ibm.com \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=npiggin@gmail$(echo .)com \
--cc=paulus@samba$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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