* [PATCH] ARM: mm: initialize pfn limits with find_limits()
@ 2018-12-27 23:47 Doug Berger
2019-01-10 19:07 ` Doug Berger
0 siblings, 1 reply; 4+ messages in thread
From: Doug Berger @ 2018-12-27 23:47 UTC (permalink / raw)
To: Russell King
Cc: Nicolas Pitre, Michal Hocko, Catalin Marinas, linux-kernel,
Steven Rostedt (VMware),
Jinbum Park, Mike Rapoport, Doug Berger, Andrew Morton,
linux-arm-kernel
The max_low_pfn value must be set before sparse_init() is called to
keep the early memblock allocations and frees balanced for kmemleak
initialization when sparsemem is enabled.
This commit accomplishes that by replacing the local variables min,
max_low, and max_high with the global limit variables min_low_pfn,
max_low_pfn, and max_pfn respectively in bootmem_init(). The global
variables are initialized directly by find_limits() and used in the
remainder of the function.
Fixes: 9099daed9c69 ("mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping")
Signed-off-by: Doug Berger <opendmb@gmail.com>
---
arch/arm/mm/init.c | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 32e4845af2b6..98a733f3a5b9 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -302,15 +302,12 @@ void __init arm_memblock_init(const struct machine_desc *mdesc)
void __init bootmem_init(void)
{
- unsigned long min, max_low, max_high;
-
memblock_allow_resize();
- max_low = max_high = 0;
- find_limits(&min, &max_low, &max_high);
+ find_limits(&min_low_pfn, &max_low_pfn, &max_pfn);
- early_memtest((phys_addr_t)min << PAGE_SHIFT,
- (phys_addr_t)max_low << PAGE_SHIFT);
+ early_memtest((phys_addr_t)min_low_pfn << PAGE_SHIFT,
+ (phys_addr_t)max_low_pfn << PAGE_SHIFT);
/*
* Sparsemem tries to allocate bootmem in memory_present(),
@@ -328,16 +325,7 @@ void __init bootmem_init(void)
* the sparse mem_map arrays initialized by sparse_init()
* for memmap_init_zone(), otherwise all PFNs are invalid.
*/
- zone_sizes_init(min, max_low, max_high);
-
- /*
- * This doesn't seem to be used by the Linux memory manager any
- * more, but is used by ll_rw_block. If we can get rid of it, we
- * also get rid of some of the stuff above as well.
- */
- min_low_pfn = min;
- max_low_pfn = max_low;
- max_pfn = max_high;
+ zone_sizes_init(min_low_pfn, max_low_pfn, max_pfn);
}
/*
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: mm: initialize pfn limits with find_limits()
2018-12-27 23:47 [PATCH] ARM: mm: initialize pfn limits with find_limits() Doug Berger
@ 2019-01-10 19:07 ` Doug Berger
2019-01-21 20:48 ` Florian Fainelli
0 siblings, 1 reply; 4+ messages in thread
From: Doug Berger @ 2019-01-10 19:07 UTC (permalink / raw)
To: Russell King
Cc: Nicolas Pitre, Michal Hocko, Catalin Marinas, linux-kernel,
Steven Rostedt (VMware),
Jinbum Park, Mike Rapoport, Andrew Morton, linux-arm-kernel
On 12/27/18 3:47 PM, Doug Berger wrote:
> The max_low_pfn value must be set before sparse_init() is called to
> keep the early memblock allocations and frees balanced for kmemleak
> initialization when sparsemem is enabled.
>
> This commit accomplishes that by replacing the local variables min,
> max_low, and max_high with the global limit variables min_low_pfn,
> max_low_pfn, and max_pfn respectively in bootmem_init(). The global
> variables are initialized directly by find_limits() and used in the
> remainder of the function.
>
> Fixes: 9099daed9c69 ("mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping")
> Signed-off-by: Doug Berger <opendmb@gmail.com>
> ---
> arch/arm/mm/init.c | 20 ++++----------------
> 1 file changed, 4 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
> index 32e4845af2b6..98a733f3a5b9 100644
> --- a/arch/arm/mm/init.c
> +++ b/arch/arm/mm/init.c
> @@ -302,15 +302,12 @@ void __init arm_memblock_init(const struct machine_desc *mdesc)
>
> void __init bootmem_init(void)
> {
> - unsigned long min, max_low, max_high;
> -
> memblock_allow_resize();
> - max_low = max_high = 0;
>
> - find_limits(&min, &max_low, &max_high);
> + find_limits(&min_low_pfn, &max_low_pfn, &max_pfn);
>
> - early_memtest((phys_addr_t)min << PAGE_SHIFT,
> - (phys_addr_t)max_low << PAGE_SHIFT);
> + early_memtest((phys_addr_t)min_low_pfn << PAGE_SHIFT,
> + (phys_addr_t)max_low_pfn << PAGE_SHIFT);
>
> /*
> * Sparsemem tries to allocate bootmem in memory_present(),
> @@ -328,16 +325,7 @@ void __init bootmem_init(void)
> * the sparse mem_map arrays initialized by sparse_init()
> * for memmap_init_zone(), otherwise all PFNs are invalid.
> */
> - zone_sizes_init(min, max_low, max_high);
> -
> - /*
> - * This doesn't seem to be used by the Linux memory manager any
> - * more, but is used by ll_rw_block. If we can get rid of it, we
> - * also get rid of some of the stuff above as well.
> - */
> - min_low_pfn = min;
> - max_low_pfn = max_low;
> - max_pfn = max_high;
> + zone_sizes_init(min_low_pfn, max_low_pfn, max_pfn);
> }
>
> /*
>
Any feedback on this patch?
Thanks,
Doug
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: mm: initialize pfn limits with find_limits()
2019-01-10 19:07 ` Doug Berger
@ 2019-01-21 20:48 ` Florian Fainelli
2019-01-21 21:22 ` Mike Rapoport
0 siblings, 1 reply; 4+ messages in thread
From: Florian Fainelli @ 2019-01-21 20:48 UTC (permalink / raw)
To: Doug Berger, Russell King, Catalin Marinas, Mike Rapoport
Cc: Nicolas Pitre, Michal Hocko, linux-kernel,
Steven Rostedt (VMware),
Jinbum Park, Andrew Morton, linux-arm-kernel
On 1/10/19 11:07 AM, Doug Berger wrote:
> On 12/27/18 3:47 PM, Doug Berger wrote:
>> The max_low_pfn value must be set before sparse_init() is called to
>> keep the early memblock allocations and frees balanced for kmemleak
>> initialization when sparsemem is enabled.
>>
>> This commit accomplishes that by replacing the local variables min,
>> max_low, and max_high with the global limit variables min_low_pfn,
>> max_low_pfn, and max_pfn respectively in bootmem_init(). The global
>> variables are initialized directly by find_limits() and used in the
>> remainder of the function.
>>
>> Fixes: 9099daed9c69 ("mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping")
>> Signed-off-by: Doug Berger <opendmb@gmail.com>
>> ---
>> arch/arm/mm/init.c | 20 ++++----------------
>> 1 file changed, 4 insertions(+), 16 deletions(-)
>>
>> diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
>> index 32e4845af2b6..98a733f3a5b9 100644
>> --- a/arch/arm/mm/init.c
>> +++ b/arch/arm/mm/init.c
>> @@ -302,15 +302,12 @@ void __init arm_memblock_init(const struct machine_desc *mdesc)
>>
>> void __init bootmem_init(void)
>> {
>> - unsigned long min, max_low, max_high;
>> -
>> memblock_allow_resize();
>> - max_low = max_high = 0;
>>
>> - find_limits(&min, &max_low, &max_high);
>> + find_limits(&min_low_pfn, &max_low_pfn, &max_pfn);
>>
>> - early_memtest((phys_addr_t)min << PAGE_SHIFT,
>> - (phys_addr_t)max_low << PAGE_SHIFT);
>> + early_memtest((phys_addr_t)min_low_pfn << PAGE_SHIFT,
>> + (phys_addr_t)max_low_pfn << PAGE_SHIFT);
>>
>> /*
>> * Sparsemem tries to allocate bootmem in memory_present(),
>> @@ -328,16 +325,7 @@ void __init bootmem_init(void)
>> * the sparse mem_map arrays initialized by sparse_init()
>> * for memmap_init_zone(), otherwise all PFNs are invalid.
>> */
>> - zone_sizes_init(min, max_low, max_high);
>> -
>> - /*
>> - * This doesn't seem to be used by the Linux memory manager any
>> - * more, but is used by ll_rw_block. If we can get rid of it, we
>> - * also get rid of some of the stuff above as well.
>> - */
>> - min_low_pfn = min;
>> - max_low_pfn = max_low;
>> - max_pfn = max_high;
>> + zone_sizes_init(min_low_pfn, max_low_pfn, max_pfn);
>> }
>>
>> /*
>>
>
> Any feedback on this patch?
Mike, Catalin, does this looks sensible to you? If so, should this be
thrown into Russell's patch tracking system?
Thanks
--
Florian
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: mm: initialize pfn limits with find_limits()
2019-01-21 20:48 ` Florian Fainelli
@ 2019-01-21 21:22 ` Mike Rapoport
0 siblings, 0 replies; 4+ messages in thread
From: Mike Rapoport @ 2019-01-21 21:22 UTC (permalink / raw)
To: Florian Fainelli
Cc: Nicolas Pitre, Doug Berger, Catalin Marinas, Michal Hocko,
Russell King, Steven Rostedt (VMware),
linux-kernel, Jinbum Park, Mike Rapoport, Andrew Morton,
linux-arm-kernel
On Mon, Jan 21, 2019 at 12:48:09PM -0800, Florian Fainelli wrote:
> On 1/10/19 11:07 AM, Doug Berger wrote:
> > On 12/27/18 3:47 PM, Doug Berger wrote:
> >> The max_low_pfn value must be set before sparse_init() is called to
> >> keep the early memblock allocations and frees balanced for kmemleak
> >> initialization when sparsemem is enabled.
> >>
> >> This commit accomplishes that by replacing the local variables min,
> >> max_low, and max_high with the global limit variables min_low_pfn,
> >> max_low_pfn, and max_pfn respectively in bootmem_init(). The global
> >> variables are initialized directly by find_limits() and used in the
> >> remainder of the function.
> >>
> >> Fixes: 9099daed9c69 ("mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping")
> >> Signed-off-by: Doug Berger <opendmb@gmail.com>
> >> ---
> >> arch/arm/mm/init.c | 20 ++++----------------
> >> 1 file changed, 4 insertions(+), 16 deletions(-)
> >>
> >> diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
> >> index 32e4845af2b6..98a733f3a5b9 100644
> >> --- a/arch/arm/mm/init.c
> >> +++ b/arch/arm/mm/init.c
> >> @@ -302,15 +302,12 @@ void __init arm_memblock_init(const struct machine_desc *mdesc)
> >>
> >> void __init bootmem_init(void)
> >> {
> >> - unsigned long min, max_low, max_high;
> >> -
> >> memblock_allow_resize();
> >> - max_low = max_high = 0;
> >>
> >> - find_limits(&min, &max_low, &max_high);
> >> + find_limits(&min_low_pfn, &max_low_pfn, &max_pfn);
> >>
> >> - early_memtest((phys_addr_t)min << PAGE_SHIFT,
> >> - (phys_addr_t)max_low << PAGE_SHIFT);
> >> + early_memtest((phys_addr_t)min_low_pfn << PAGE_SHIFT,
> >> + (phys_addr_t)max_low_pfn << PAGE_SHIFT);
> >>
> >> /*
> >> * Sparsemem tries to allocate bootmem in memory_present(),
> >> @@ -328,16 +325,7 @@ void __init bootmem_init(void)
> >> * the sparse mem_map arrays initialized by sparse_init()
> >> * for memmap_init_zone(), otherwise all PFNs are invalid.
> >> */
> >> - zone_sizes_init(min, max_low, max_high);
> >> -
> >> - /*
> >> - * This doesn't seem to be used by the Linux memory manager any
> >> - * more, but is used by ll_rw_block. If we can get rid of it, we
> >> - * also get rid of some of the stuff above as well.
> >> - */
> >> - min_low_pfn = min;
> >> - max_low_pfn = max_low;
> >> - max_pfn = max_high;
> >> + zone_sizes_init(min_low_pfn, max_low_pfn, max_pfn);
> >> }
> >>
> >> /*
> >>
> >
> > Any feedback on this patch?
>
> Mike, Catalin, does this looks sensible to you? If so, should this be
> thrown into Russell's patch tracking system?
Makes perfect sense to me, so
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
> Thanks
> --
> Florian
>
--
Sincerely yours,
Mike.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-01-21 21:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-27 23:47 [PATCH] ARM: mm: initialize pfn limits with find_limits() Doug Berger
2019-01-10 19:07 ` Doug Berger
2019-01-21 20:48 ` Florian Fainelli
2019-01-21 21:22 ` Mike Rapoport
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).