| Message ID | 20190527111152.16324-6-david@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mm/memory_hotplug: Factor out memory block devicehandling | expand |
On Mon, May 27, 2019 at 01:11:46PM +0200, David Hildenbrand wrote: >We'll rework hotplug_memory_register() shortly, so it no longer consumes >pass a section. > >Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> >Cc: "Rafael J. Wysocki" <rafael@kernel.org> >Signed-off-by: David Hildenbrand <david@redhat.com> >--- > drivers/base/memory.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > >diff --git a/drivers/base/memory.c b/drivers/base/memory.c >index f180427e48f4..f914fa6fe350 100644 >--- a/drivers/base/memory.c >+++ b/drivers/base/memory.c >@@ -651,21 +651,18 @@ int register_memory(struct memory_block *memory) > return ret; > } > >-static int init_memory_block(struct memory_block **memory, >- struct mem_section *section, unsigned long state) >+static int init_memory_block(struct memory_block **memory, int block_id, >+ unsigned long state) > { > struct memory_block *mem; > unsigned long start_pfn; >- int scn_nr; > int ret = 0; > > mem = kzalloc(sizeof(*mem), GFP_KERNEL); > if (!mem) > return -ENOMEM; > >- scn_nr = __section_nr(section); >- mem->start_section_nr = >- base_memory_block_id(scn_nr) * sections_per_block; >+ mem->start_section_nr = block_id * sections_per_block; > mem->end_section_nr = mem->start_section_nr + sections_per_block - 1; > mem->state = state; > start_pfn = section_nr_to_pfn(mem->start_section_nr); >@@ -694,7 +691,8 @@ static int add_memory_block(int base_section_nr) > > if (section_count == 0) > return 0; >- ret = init_memory_block(&mem, __nr_to_section(section_nr), MEM_ONLINE); >+ ret = init_memory_block(&mem, base_memory_block_id(base_section_nr), >+ MEM_ONLINE); If my understanding is correct, section_nr could be removed too. > if (ret) > return ret; > mem->section_count = section_count; >@@ -707,6 +705,7 @@ static int add_memory_block(int base_section_nr) > */ > int hotplug_memory_register(int nid, struct mem_section *section) > { >+ int block_id = base_memory_block_id(__section_nr(section)); > int ret = 0; > struct memory_block *mem; > >@@ -717,7 +716,7 @@ int hotplug_memory_register(int nid, struct mem_section *section) > mem->section_count++; > put_device(&mem->dev); > } else { >- ret = init_memory_block(&mem, section, MEM_OFFLINE); >+ ret = init_memory_block(&mem, block_id, MEM_OFFLINE); > if (ret) > goto out; > mem->section_count++; >-- >2.20.1
On 03.06.19 23:49, Wei Yang wrote: > On Mon, May 27, 2019 at 01:11:46PM +0200, David Hildenbrand wrote: >> We'll rework hotplug_memory_register() shortly, so it no longer consumes >> pass a section. >> >> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> >> Cc: "Rafael J. Wysocki" <rafael@kernel.org> >> Signed-off-by: David Hildenbrand <david@redhat.com> >> --- >> drivers/base/memory.c | 15 +++++++-------- >> 1 file changed, 7 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/base/memory.c b/drivers/base/memory.c >> index f180427e48f4..f914fa6fe350 100644 >> --- a/drivers/base/memory.c >> +++ b/drivers/base/memory.c >> @@ -651,21 +651,18 @@ int register_memory(struct memory_block *memory) >> return ret; >> } >> >> -static int init_memory_block(struct memory_block **memory, >> - struct mem_section *section, unsigned long state) >> +static int init_memory_block(struct memory_block **memory, int block_id, >> + unsigned long state) >> { >> struct memory_block *mem; >> unsigned long start_pfn; >> - int scn_nr; >> int ret = 0; >> >> mem = kzalloc(sizeof(*mem), GFP_KERNEL); >> if (!mem) >> return -ENOMEM; >> >> - scn_nr = __section_nr(section); >> - mem->start_section_nr = >> - base_memory_block_id(scn_nr) * sections_per_block; >> + mem->start_section_nr = block_id * sections_per_block; >> mem->end_section_nr = mem->start_section_nr + sections_per_block - 1; >> mem->state = state; >> start_pfn = section_nr_to_pfn(mem->start_section_nr); >> @@ -694,7 +691,8 @@ static int add_memory_block(int base_section_nr) >> >> if (section_count == 0) >> return 0; >> - ret = init_memory_block(&mem, __nr_to_section(section_nr), MEM_ONLINE); >> + ret = init_memory_block(&mem, base_memory_block_id(base_section_nr), >> + MEM_ONLINE); > > If my understanding is correct, section_nr could be removed too. Yes you are, this has already been addressed in linux-next.
On Mon 27-05-19 13:11:46, David Hildenbrand wrote: > We'll rework hotplug_memory_register() shortly, so it no longer consumes > pass a section. > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: "Rafael J. Wysocki" <rafael@kernel.org> > Signed-off-by: David Hildenbrand <david@redhat.com> Acked-by: Michal Hocko <mhocko@suse.com> > --- > drivers/base/memory.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/drivers/base/memory.c b/drivers/base/memory.c > index f180427e48f4..f914fa6fe350 100644 > --- a/drivers/base/memory.c > +++ b/drivers/base/memory.c > @@ -651,21 +651,18 @@ int register_memory(struct memory_block *memory) > return ret; > } > > -static int init_memory_block(struct memory_block **memory, > - struct mem_section *section, unsigned long state) > +static int init_memory_block(struct memory_block **memory, int block_id, > + unsigned long state) > { > struct memory_block *mem; > unsigned long start_pfn; > - int scn_nr; > int ret = 0; > > mem = kzalloc(sizeof(*mem), GFP_KERNEL); > if (!mem) > return -ENOMEM; > > - scn_nr = __section_nr(section); > - mem->start_section_nr = > - base_memory_block_id(scn_nr) * sections_per_block; > + mem->start_section_nr = block_id * sections_per_block; > mem->end_section_nr = mem->start_section_nr + sections_per_block - 1; > mem->state = state; > start_pfn = section_nr_to_pfn(mem->start_section_nr); > @@ -694,7 +691,8 @@ static int add_memory_block(int base_section_nr) > > if (section_count == 0) > return 0; > - ret = init_memory_block(&mem, __nr_to_section(section_nr), MEM_ONLINE); > + ret = init_memory_block(&mem, base_memory_block_id(base_section_nr), > + MEM_ONLINE); > if (ret) > return ret; > mem->section_count = section_count; > @@ -707,6 +705,7 @@ static int add_memory_block(int base_section_nr) > */ > int hotplug_memory_register(int nid, struct mem_section *section) > { > + int block_id = base_memory_block_id(__section_nr(section)); > int ret = 0; > struct memory_block *mem; > > @@ -717,7 +716,7 @@ int hotplug_memory_register(int nid, struct mem_section *section) > mem->section_count++; > put_device(&mem->dev); > } else { > - ret = init_memory_block(&mem, section, MEM_OFFLINE); > + ret = init_memory_block(&mem, block_id, MEM_OFFLINE); > if (ret) > goto out; > mem->section_count++; > -- > 2.20.1
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index f180427e48f4..f914fa6fe350 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -651,21 +651,18 @@ int register_memory(struct memory_block *memory) return ret; } -static int init_memory_block(struct memory_block **memory, - struct mem_section *section, unsigned long state) +static int init_memory_block(struct memory_block **memory, int block_id, + unsigned long state) { struct memory_block *mem; unsigned long start_pfn; - int scn_nr; int ret = 0; mem = kzalloc(sizeof(*mem), GFP_KERNEL); if (!mem) return -ENOMEM; - scn_nr = __section_nr(section); - mem->start_section_nr = - base_memory_block_id(scn_nr) * sections_per_block; + mem->start_section_nr = block_id * sections_per_block; mem->end_section_nr = mem->start_section_nr + sections_per_block - 1; mem->state = state; start_pfn = section_nr_to_pfn(mem->start_section_nr); @@ -694,7 +691,8 @@ static int add_memory_block(int base_section_nr) if (section_count == 0) return 0; - ret = init_memory_block(&mem, __nr_to_section(section_nr), MEM_ONLINE); + ret = init_memory_block(&mem, base_memory_block_id(base_section_nr), + MEM_ONLINE); if (ret) return ret; mem->section_count = section_count; @@ -707,6 +705,7 @@ static int add_memory_block(int base_section_nr) */ int hotplug_memory_register(int nid, struct mem_section *section) { + int block_id = base_memory_block_id(__section_nr(section)); int ret = 0; struct memory_block *mem; @@ -717,7 +716,7 @@ int hotplug_memory_register(int nid, struct mem_section *section) mem->section_count++; put_device(&mem->dev); } else { - ret = init_memory_block(&mem, section, MEM_OFFLINE); + ret = init_memory_block(&mem, block_id, MEM_OFFLINE); if (ret) goto out; mem->section_count++;
We'll rework hotplug_memory_register() shortly, so it no longer consumes pass a section. Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: "Rafael J. Wysocki" <rafael@kernel.org> Signed-off-by: David Hildenbrand <david@redhat.com> --- drivers/base/memory.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)