| Message ID | 20191006085646.5768-10-david@redhat.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | mm/memory_hotplug: Shrink zones before removing memory | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch next (6edfc6487b474fe01857dc3f1a9cd701bb9b21c8) |
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch merge (b05e997bf5d33f38e3fc6a66d52303eb109598ec) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 45 lines checked |
On Sun, Oct 06, 2019 at 10:56:45AM +0200, David Hildenbrand wrote: > Get rid of the unnecessary local variables. > > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: Oscar Salvador <osalvador@suse.de> > Cc: David Hildenbrand <david@redhat.com> > Cc: Michal Hocko <mhocko@suse.com> > Cc: Pavel Tatashin <pasha.tatashin@soleen.com> > Cc: Dan Williams <dan.j.williams@intel.com> > Cc: Wei Yang <richardw.yang@linux.intel.com> > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > mm/memory_hotplug.c | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) > > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > index 8dafa1ba8d9f..843481bd507d 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -374,14 +374,11 @@ static unsigned long find_biggest_section_pfn(int nid, struct zone *zone, > static void shrink_zone_span(struct zone *zone, unsigned long start_pfn, > unsigned long end_pfn) > { > - unsigned long zone_start_pfn = zone->zone_start_pfn; > - unsigned long z = zone_end_pfn(zone); /* zone_end_pfn namespace clash */ > - unsigned long zone_end_pfn = z; > unsigned long pfn; > int nid = zone_to_nid(zone); We could also remove the nid, right? AFAICS, the nid is only used in find_{smallest/biggest}_section_pfn so we could place there as well. Anyway, nothing to nit-pick about: Reviewed-by: Oscar Salvador <osalvador@suse.de> > > zone_span_writelock(zone); > - if (zone_start_pfn == start_pfn) { > + if (zone->zone_start_pfn == start_pfn) { > /* > * If the section is smallest section in the zone, it need > * shrink zone->zone_start_pfn and zone->zone_spanned_pages. > @@ -389,25 +386,25 @@ static void shrink_zone_span(struct zone *zone, unsigned long start_pfn, > * for shrinking zone. > */ > pfn = find_smallest_section_pfn(nid, zone, end_pfn, > - zone_end_pfn); > + zone_end_pfn(zone)); > if (pfn) { > + zone->spanned_pages = zone_end_pfn(zone) - pfn; > zone->zone_start_pfn = pfn; > - zone->spanned_pages = zone_end_pfn - pfn; > } else { > zone->zone_start_pfn = 0; > zone->spanned_pages = 0; > } > - } else if (zone_end_pfn == end_pfn) { > + } else if (zone_end_pfn(zone) == end_pfn) { > /* > * If the section is biggest section in the zone, it need > * shrink zone->spanned_pages. > * In this case, we find second biggest valid mem_section for > * shrinking zone. > */ > - pfn = find_biggest_section_pfn(nid, zone, zone_start_pfn, > + pfn = find_biggest_section_pfn(nid, zone, zone->zone_start_pfn, > start_pfn); > if (pfn) > - zone->spanned_pages = pfn - zone_start_pfn + 1; > + zone->spanned_pages = pfn - zone->zone_start_pfn + 1; > else { > zone->zone_start_pfn = 0; > zone->spanned_pages = 0; > -- > 2.21.0 >
On 04.02.20 10:26, Oscar Salvador wrote: > On Sun, Oct 06, 2019 at 10:56:45AM +0200, David Hildenbrand wrote: >> Get rid of the unnecessary local variables. >> >> Cc: Andrew Morton <akpm@linux-foundation.org> >> Cc: Oscar Salvador <osalvador@suse.de> >> Cc: David Hildenbrand <david@redhat.com> >> Cc: Michal Hocko <mhocko@suse.com> >> Cc: Pavel Tatashin <pasha.tatashin@soleen.com> >> Cc: Dan Williams <dan.j.williams@intel.com> >> Cc: Wei Yang <richardw.yang@linux.intel.com> >> Signed-off-by: David Hildenbrand <david@redhat.com> >> --- >> mm/memory_hotplug.c | 15 ++++++--------- >> 1 file changed, 6 insertions(+), 9 deletions(-) >> >> diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c >> index 8dafa1ba8d9f..843481bd507d 100644 >> --- a/mm/memory_hotplug.c >> +++ b/mm/memory_hotplug.c >> @@ -374,14 +374,11 @@ static unsigned long find_biggest_section_pfn(int nid, struct zone *zone, >> static void shrink_zone_span(struct zone *zone, unsigned long start_pfn, >> unsigned long end_pfn) >> { >> - unsigned long zone_start_pfn = zone->zone_start_pfn; >> - unsigned long z = zone_end_pfn(zone); /* zone_end_pfn namespace clash */ >> - unsigned long zone_end_pfn = z; >> unsigned long pfn; >> int nid = zone_to_nid(zone); > > We could also remove the nid, right? > AFAICS, the nid is only used in find_{smallest/biggest}_section_pfn so we could > place there as well. I remember sending a patch on this (which was acked, but not picked up yet)... oh, there it is :) https://lore.kernel.org/linux-mm/20191127174158.28226-1-david@redhat.com/ Thanks!
On Sun, Oct 06, 2019 at 10:56:45AM +0200, David Hildenbrand wrote: >Get rid of the unnecessary local variables. > >Cc: Andrew Morton <akpm@linux-foundation.org> >Cc: Oscar Salvador <osalvador@suse.de> >Cc: David Hildenbrand <david@redhat.com> >Cc: Michal Hocko <mhocko@suse.com> >Cc: Pavel Tatashin <pasha.tatashin@soleen.com> >Cc: Dan Williams <dan.j.williams@intel.com> >Cc: Wei Yang <richardw.yang@linux.intel.com> >Signed-off-by: David Hildenbrand <david@redhat.com> Looks reasonable. Reviewed-by: Wei Yang <richardw.yang@linux.intel.com> >--- > mm/memory_hotplug.c | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) > >diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c >index 8dafa1ba8d9f..843481bd507d 100644 >--- a/mm/memory_hotplug.c >+++ b/mm/memory_hotplug.c >@@ -374,14 +374,11 @@ static unsigned long find_biggest_section_pfn(int nid, struct zone *zone, > static void shrink_zone_span(struct zone *zone, unsigned long start_pfn, > unsigned long end_pfn) > { >- unsigned long zone_start_pfn = zone->zone_start_pfn; >- unsigned long z = zone_end_pfn(zone); /* zone_end_pfn namespace clash */ >- unsigned long zone_end_pfn = z; > unsigned long pfn; > int nid = zone_to_nid(zone); > > zone_span_writelock(zone); >- if (zone_start_pfn == start_pfn) { >+ if (zone->zone_start_pfn == start_pfn) { > /* > * If the section is smallest section in the zone, it need > * shrink zone->zone_start_pfn and zone->zone_spanned_pages. >@@ -389,25 +386,25 @@ static void shrink_zone_span(struct zone *zone, unsigned long start_pfn, > * for shrinking zone. > */ > pfn = find_smallest_section_pfn(nid, zone, end_pfn, >- zone_end_pfn); >+ zone_end_pfn(zone)); > if (pfn) { >+ zone->spanned_pages = zone_end_pfn(zone) - pfn; > zone->zone_start_pfn = pfn; >- zone->spanned_pages = zone_end_pfn - pfn; > } else { > zone->zone_start_pfn = 0; > zone->spanned_pages = 0; > } >- } else if (zone_end_pfn == end_pfn) { >+ } else if (zone_end_pfn(zone) == end_pfn) { > /* > * If the section is biggest section in the zone, it need > * shrink zone->spanned_pages. > * In this case, we find second biggest valid mem_section for > * shrinking zone. > */ >- pfn = find_biggest_section_pfn(nid, zone, zone_start_pfn, >+ pfn = find_biggest_section_pfn(nid, zone, zone->zone_start_pfn, > start_pfn); > if (pfn) >- zone->spanned_pages = pfn - zone_start_pfn + 1; >+ zone->spanned_pages = pfn - zone->zone_start_pfn + 1; > else { > zone->zone_start_pfn = 0; > zone->spanned_pages = 0; >-- >2.21.0
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 8dafa1ba8d9f..843481bd507d 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -374,14 +374,11 @@ static unsigned long find_biggest_section_pfn(int nid, struct zone *zone, static void shrink_zone_span(struct zone *zone, unsigned long start_pfn, unsigned long end_pfn) { - unsigned long zone_start_pfn = zone->zone_start_pfn; - unsigned long z = zone_end_pfn(zone); /* zone_end_pfn namespace clash */ - unsigned long zone_end_pfn = z; unsigned long pfn; int nid = zone_to_nid(zone); zone_span_writelock(zone); - if (zone_start_pfn == start_pfn) { + if (zone->zone_start_pfn == start_pfn) { /* * If the section is smallest section in the zone, it need * shrink zone->zone_start_pfn and zone->zone_spanned_pages. @@ -389,25 +386,25 @@ static void shrink_zone_span(struct zone *zone, unsigned long start_pfn, * for shrinking zone. */ pfn = find_smallest_section_pfn(nid, zone, end_pfn, - zone_end_pfn); + zone_end_pfn(zone)); if (pfn) { + zone->spanned_pages = zone_end_pfn(zone) - pfn; zone->zone_start_pfn = pfn; - zone->spanned_pages = zone_end_pfn - pfn; } else { zone->zone_start_pfn = 0; zone->spanned_pages = 0; } - } else if (zone_end_pfn == end_pfn) { + } else if (zone_end_pfn(zone) == end_pfn) { /* * If the section is biggest section in the zone, it need * shrink zone->spanned_pages. * In this case, we find second biggest valid mem_section for * shrinking zone. */ - pfn = find_biggest_section_pfn(nid, zone, zone_start_pfn, + pfn = find_biggest_section_pfn(nid, zone, zone->zone_start_pfn, start_pfn); if (pfn) - zone->spanned_pages = pfn - zone_start_pfn + 1; + zone->spanned_pages = pfn - zone->zone_start_pfn + 1; else { zone->zone_start_pfn = 0; zone->spanned_pages = 0;
Get rid of the unnecessary local variables. Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Oscar Salvador <osalvador@suse.de> Cc: David Hildenbrand <david@redhat.com> Cc: Michal Hocko <mhocko@suse.com> Cc: Pavel Tatashin <pasha.tatashin@soleen.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Wei Yang <richardw.yang@linux.intel.com> Signed-off-by: David Hildenbrand <david@redhat.com> --- mm/memory_hotplug.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)