| Message ID | 1475778995-1420-4-git-send-email-arbab@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On 07/10/16 05:36, Reza Arbab wrote: > Remove the check which prevents us from hotplugging into an empty node. > > This limitation has been questioned before [1], and judging by the > response, there doesn't seem to be a reason we can't remove it. No issues > have been found in light testing. > > [1] http://lkml.kernel.org/r/CAGZKiBrmkSa1yyhbf5hwGxubcjsE5SmkSMY4tpANERMe2UG4bg@mail.gmail.com > http://lkml.kernel.org/r/20160511215051.GF22115@arbab-laptop.austin.ibm.com > > Signed-off-by: Reza Arbab <arbab@linux.vnet.ibm.com> > Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> > Acked-by: Balbir Singh <bsingharora@gmail.com> > Cc: Nathan Fontenot <nfont@linux.vnet.ibm.com> > Cc: Bharata B Rao <bharata@linux.vnet.ibm.com> > --- > arch/powerpc/mm/numa.c | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > > diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c > index 75b9cd6..d7ac419 100644 > --- a/arch/powerpc/mm/numa.c > +++ b/arch/powerpc/mm/numa.c > @@ -1121,7 +1121,7 @@ static int hot_add_node_scn_to_nid(unsigned long scn_addr) > int hot_add_scn_to_nid(unsigned long scn_addr) > { > struct device_node *memory = NULL; > - int nid, found = 0; > + int nid; > > if (!numa_enabled || (min_common_depth < 0)) > return first_online_node; > @@ -1137,17 +1137,6 @@ int hot_add_scn_to_nid(unsigned long scn_addr) > if (nid < 0 || !node_online(nid)) > nid = first_online_node; > > - if (NODE_DATA(nid)->node_spanned_pages) > - return nid; > - > - for_each_online_node(nid) { > - if (NODE_DATA(nid)->node_spanned_pages) { > - found = 1; > - break; > - } > - } > - > - BUG_ON(!found); > return nid; FYI, these checks were temporary to begin with I found this in git history b226e462124522f2f23153daff31c311729dfa2f (powerpc: don't add memory to empty node/zone) Balbir Singh.
On Thu, Oct 20, 2016 at 02:30:42PM +1100, Balbir Singh wrote: >FYI, these checks were temporary to begin with > >I found this in git history > >b226e462124522f2f23153daff31c311729dfa2f (powerpc: don't add memory to empty node/zone) Nice find! I spent some time digging, but this had eluded me.
Balbir Singh <bsingharora@gmail.com> writes: > FYI, these checks were temporary to begin with > > I found this in git history > > b226e462124522f2f23153daff31c311729dfa2f (powerpc: don't add memory to empty node/zone) Nice thanks for digging it up. commit b226e462124522f2f23153daff31c311729dfa2f Author: Mike Kravetz <kravetz@us.ibm.com> AuthorDate: Fri Dec 16 14:30:35 2005 -0800 ^^^^ That is why maintainers don't like to merge "temporary" patches :) cheers
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 75b9cd6..d7ac419 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -1121,7 +1121,7 @@ static int hot_add_node_scn_to_nid(unsigned long scn_addr) int hot_add_scn_to_nid(unsigned long scn_addr) { struct device_node *memory = NULL; - int nid, found = 0; + int nid; if (!numa_enabled || (min_common_depth < 0)) return first_online_node; @@ -1137,17 +1137,6 @@ int hot_add_scn_to_nid(unsigned long scn_addr) if (nid < 0 || !node_online(nid)) nid = first_online_node; - if (NODE_DATA(nid)->node_spanned_pages) - return nid; - - for_each_online_node(nid) { - if (NODE_DATA(nid)->node_spanned_pages) { - found = 1; - break; - } - } - - BUG_ON(!found); return nid; }
Remove the check which prevents us from hotplugging into an empty node. This limitation has been questioned before [1], and judging by the response, there doesn't seem to be a reason we can't remove it. No issues have been found in light testing. [1] http://lkml.kernel.org/r/CAGZKiBrmkSa1yyhbf5hwGxubcjsE5SmkSMY4tpANERMe2UG4bg@mail.gmail.com http://lkml.kernel.org/r/20160511215051.GF22115@arbab-laptop.austin.ibm.com Signed-off-by: Reza Arbab <arbab@linux.vnet.ibm.com> Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Acked-by: Balbir Singh <bsingharora@gmail.com> Cc: Nathan Fontenot <nfont@linux.vnet.ibm.com> Cc: Bharata B Rao <bharata@linux.vnet.ibm.com> --- arch/powerpc/mm/numa.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)