On 06/27/18 at 11:14pm, Pavel Tatashin wrote:
> Honestly, I do not like this new agrument, but it will do for now. I
> could not think of a better way without rewriting everything.
>
> Reviewed-by: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx>
>
> However, I will submit a series of patches to cleanup sparse.c and
> completely remove large and confusing temporary buffers: map_map, and
> usemap_map. In those patches, I will remove alloc_usemap_and_memmap().
Great, look forward to seeing them, I can help review.
> On Tue, Jun 26, 2018 at 9:31 PM Baoquan He <bhe@xxxxxxxxxx> wrote:
> >
> > alloc_usemap_and_memmap() is passing in a "void *" that points to
> > usemap_map or memmap_map. In next patch we will change both of the
> > map allocation from taking 'NR_MEM_SECTIONS' as the length to taking
> > 'nr_present_sections' as the length. After that, the passed in 'void*'
> > needs to update as things get consumed. But, it knows only the
> > quantity of objects consumed and not the type. This effectively
> > tells it enough about the type to let it update the pointer as
> > objects are consumed.
> >
> > Signed-off-by: Baoquan He <bhe@xxxxxxxxxx>
> > ---
> > mm/sparse.c | 10 +++++++---
> > 1 file changed, 7 insertions(+), 3 deletions(-)
> >
> > diff --git a/mm/sparse.c b/mm/sparse.c
> > index 71ad53da2cd1..b2848cc6e32a 100644
> > --- a/mm/sparse.c
> > +++ b/mm/sparse.c
> > @@ -489,10 +489,12 @@ void __weak __meminit vmemmap_populate_print_last(void)
> > /**
> > * alloc_usemap_and_memmap - memory alloction for pageblock flags and vmemmap
> > * @map: usemap_map for pageblock flags or mmap_map for vmemmap
> > + * @unit_size: size of map unit
> > */
> > static void __init alloc_usemap_and_memmap(void (*alloc_func)
> > (void *, unsigned long, unsigned long,
> > - unsigned long, int), void *data)
> > + unsigned long, int), void *data,
> > + int data_unit_size)
> > {
> > unsigned long pnum;
> > unsigned long map_count;
> > @@ -569,7 +571,8 @@ void __init sparse_init(void)
> > if (!usemap_map)
> > panic("can not allocate usemap_map\n");
> > alloc_usemap_and_memmap(sparse_early_usemaps_alloc_node,
> > - (void *)usemap_map);
> > + (void *)usemap_map,
> > + sizeof(usemap_map[0]));
> >
> > #ifdef CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER
> > size2 = sizeof(struct page *) * NR_MEM_SECTIONS;
> > @@ -577,7 +580,8 @@ void __init sparse_init(void)
> > if (!map_map)
> > panic("can not allocate map_map\n");
> > alloc_usemap_and_memmap(sparse_early_mem_maps_alloc_node,
> > - (void *)map_map);
> > + (void *)map_map,
> > + sizeof(map_map[0]));
> > #endif
> >
> > for_each_present_section_nr(0, pnum) {
> > --
> > 2.13.6
> >
