linux-kernel - Re: [patch 046/181] mm: remove sparsemem allocation details from the bootmem allocator

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20120623091752.GK27816@cmpxchg.org>
Date:	Sat, 23 Jun 2012 11:17:52 +0200
From:	Johannes Weiner <hannes@...xchg.org>
To:	Yinghai Lu <yinghai@...nel.org>
Cc:	akpm@...ux-foundation.org, torvalds@...ux-foundation.org,
	davem@...emloft.net, shangw@...ux.vnet.ibm.com, tj@...nel.org,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [patch 046/181] mm: remove sparsemem allocation details from the
 bootmem allocator

On Fri, Jun 22, 2012 at 07:05:45PM -0700, Yinghai Lu wrote:
> On Fri, Jun 22, 2012 at 6:11 PM, Yinghai Lu <yinghai@...nel.org> wrote:
> > On Tue, May 29, 2012 at 3:06 PM,  <akpm@...ux-foundation.org> wrote:
> >> From: Johannes Weiner <hannes@...xchg.org>
> >> Subject: mm: remove sparsemem allocation details from the bootmem allocator
> >>
> >> alloc_bootmem_section() derives allocation area constraints from the
> >> specified sparsemem section.  This is a bit specific for a generic memory
> >> allocator like bootmem, though, so move it over to sparsemem.
> >>
> >> As __alloc_bootmem_node_nopanic() already retries failed allocations with
> >> relaxed area constraints, the fallback code in sparsemem.c can be removed
> >> and the code becomes a bit more compact overall.
> >>
> >> [akpm@...ux-foundation.org: fix build]
> >> Signed-off-by: Johannes Weiner <hannes@...xchg.org>
> >> Acked-by: Tejun Heo <tj@...nel.org>
> >> Acked-by: David S. Miller <davem@...emloft.net>
> >> Cc: Yinghai Lu <yinghai@...nel.org>
> >> Cc: Gavin Shan <shangw@...ux.vnet.ibm.com>
> >> Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
> >
> > hi, this one cause regression, will put usemap to last node's memory
> > instead of each node.
> 
> attached patch fixes the problem.

Sorry for the trouble and thanks for the patch!  The number of bugs in
these three lines is too damn high...

> Subject: [PATCH] mm: fix goal calculating with usemap
> 
> PAGE_SECTION_MASK should be used with pfn instead of pa.
> 
> Signed-off-by: Yinghai Lu <yinghai@...nel.org>
> 
> diff --git a/mm/sparse.c b/mm/sparse.c
> index 6a4bf91..fd00928 100644
> --- a/mm/sparse.c
> +++ b/mm/sparse.c
> @@ -287,7 +287,7 @@ sparse_early_usemaps_alloc_pgdat_section(struct pglist_data *pgdat,
>  	 * from the same section as the pgdat where possible to avoid
>  	 * this problem.
>  	 */
> -	goal = __pa(pgdat) & PAGE_SECTION_MASK;
> +	goal = ((__pa(pgdat) >> PAGE_SHIFT) & PAGE_SECTION_MASK) << PAGE_SHIFT;

How about

	goal = __pa(pgdat) & (PAGE_SECTION_MASK << PAGE_SHIFT);

instead?

>  	host_pgdat = NODE_DATA(early_pfn_to_nid(goal >> PAGE_SHIFT));
>  	return __alloc_bootmem_node_nopanic(host_pgdat, size,
>  					    SMP_CACHE_BYTES, goal);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/