On 01/05/2020 02:29 PM, Mike Rapoport wrote:
> Hi Anshuman,
>
> On Fri, Jan 03, 2020 at 02:11:06PM +0530, Anshuman Khandual wrote:
>> On s390 platform memblock.physmem array is being built by directly calling
>> into memblock_add_range() which is a low level function not intended to be
>> used outside of memblock. Hence lets conditionally add helper functions for
>> physmem array when HAVE_MEMBLOCK_PHYS_MAP is enabled. Also use MAX_NUMNODES
>> instead of 0 as node ID similar to memblock_add() and memblock_reserve().
>> While here replace some function name strings with (%s __func__) in various
>> memblock_dbg() call sites.
>
> I'd prefer to have memblock_dbg() updates as a separate patch.
Sure, will do.
>
>> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
>> Cc: Vasily Gorbik <gor@xxxxxxxxxxxxx>
>> Cc: Christian Borntraeger <borntraeger@xxxxxxxxxx>
>> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
>> Cc: Collin Walling <walling@xxxxxxxxxxxxx>
>> Cc: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
>> Cc: Philipp Rudo <prudo@xxxxxxxxxxxxx>
>> Cc: Mike Rapoport <rppt@xxxxxxxxxxxxx>
>> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
>> Cc: linux-s390@xxxxxxxxxxxxxxx
>> Cc: linux-kernel@xxxxxxxxxxxxxxx
>> Signed-off-by: Anshuman Khandual <anshuman.khandual@xxxxxxx>
>> ---
>> Only build tested for s390, will appreciate if some one can give it a try
>> on a real system.
>>
>> arch/s390/kernel/setup.c | 14 ++++----------
>> include/linux/memblock.h | 3 +++
>> mm/memblock.c | 20 ++++++++++++++++----
>> 3 files changed, 23 insertions(+), 14 deletions(-)
>>
>> diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
>> index 9cbf490fd162..79a7b1872e5a 100644
>> --- a/arch/s390/kernel/setup.c
>> +++ b/arch/s390/kernel/setup.c
>> @@ -761,14 +761,6 @@ static void __init free_mem_detect_info(void)
>> memblock_free(start, size);
>> }
>>
>> -static void __init memblock_physmem_add(phys_addr_t start, phys_addr_t size)
>> -{
>> - memblock_dbg("memblock_physmem_add: [%#016llx-%#016llx]\n",
>> - start, start + size - 1);
>> - memblock_add_range(&memblock.memory, start, size, 0, 0);
>> - memblock_add_range(&memblock.physmem, start, size, 0, 0);
>> -}
>> -
>> static const char * __init get_mem_info_source(void)
>> {
>> switch (mem_detect.info_source) {
>> @@ -793,8 +785,10 @@ static void __init memblock_add_mem_detect_info(void)
>> get_mem_info_source(), mem_detect.info_source);
>> /* keep memblock lists close to the kernel */
>> memblock_set_bottom_up(true);
>> - for_each_mem_detect_block(i, &start, &end)
>> - memblock_physmem_add(start, end - start);
>> + for_each_mem_detect_block(i, &start, &end) {
>> + memblock_add(start, end - start);
>> + memblock_physmem(start, end - start);
>
> Maybe memblock_physmem_add()?
Okay.
>
> And, since memblock_add_range() will actually become private, cab you
> please make it static?
Sure, will do.
>
>> + }
>> memblock_set_bottom_up(false);
>> memblock_dump_all();
>> }
>> diff --git a/include/linux/memblock.h b/include/linux/memblock.h
>> index 1510b12de031..d17e7b841cb6 100644
>> --- a/include/linux/memblock.h
>> +++ b/include/linux/memblock.h
>> @@ -115,6 +115,9 @@ int memblock_add(phys_addr_t base, phys_addr_t size);
>> int memblock_remove(phys_addr_t base, phys_addr_t size);
>> int memblock_free(phys_addr_t base, phys_addr_t size);
>> int memblock_reserve(phys_addr_t base, phys_addr_t size);
>> +#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
>> +int memblock_physmem(phys_addr_t base, phys_addr_t size);
>> +#endif
>> void memblock_trim_memory(phys_addr_t align);
>> bool memblock_overlaps_region(struct memblock_type *type,
>> phys_addr_t base, phys_addr_t size);
>> diff --git a/mm/memblock.c b/mm/memblock.c
>> index 3e20c6ba2101..f6d17a1f30e3 100644
>> --- a/mm/memblock.c
>> +++ b/mm/memblock.c
>> @@ -694,7 +694,7 @@ int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size)
>> {
>> phys_addr_t end = base + size - 1;
>>
>> - memblock_dbg("memblock_add: [%pa-%pa] %pS\n",
>> + memblock_dbg("%s: [%pa-%pa] %pS\n", __func__,
>> &base, &end, (void *)_RET_IP_);
>>
>> return memblock_add_range(&memblock.memory, base, size, MAX_NUMNODES, 0);
>> @@ -795,7 +795,7 @@ int __init_memblock memblock_remove(phys_addr_t base, phys_addr_t size)
>> {
>> phys_addr_t end = base + size - 1;
>>
>> - memblock_dbg("memblock_remove: [%pa-%pa] %pS\n",
>> + memblock_dbg("%s: [%pa-%pa] %pS\n", __func__,
>> &base, &end, (void *)_RET_IP_);
>>
>> return memblock_remove_range(&memblock.memory, base, size);
>> @@ -813,7 +813,7 @@ int __init_memblock memblock_free(phys_addr_t base, phys_addr_t size)
>> {
>> phys_addr_t end = base + size - 1;
>>
>> - memblock_dbg(" memblock_free: [%pa-%pa] %pS\n",
>> + memblock_dbg("%s: [%pa-%pa] %pS\n", __func__,
>> &base, &end, (void *)_RET_IP_);
>>
>> kmemleak_free_part_phys(base, size);
>> @@ -824,12 +824,24 @@ int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size)
>> {
>> phys_addr_t end = base + size - 1;
>>
>> - memblock_dbg("memblock_reserve: [%pa-%pa] %pS\n",
>> + memblock_dbg("%s: [%pa-%pa] %pS\n", __func__,
>> &base, &end, (void *)_RET_IP_);
>>
>> return memblock_add_range(&memblock.reserved, base, size, MAX_NUMNODES, 0);
>> }
>>
>> +#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
>> +int __init_memblock memblock_physmem(phys_addr_t base, phys_addr_t size)
>> +{
>> + phys_addr_t end = base + size - 1;
>> +
>> + memblock_dbg("%s: [%pa-%pa] %pS\n", __func__,
>> + &base, &end, (void *)_RET_IP_);
>> +
>> + return memblock_add_range(&memblock.physmem, base, size, MAX_NUMNODES, 0);
>> +}
>> +#endif
>> +
>> /**
>> * memblock_setclr_flag - set or clear flag for a memory region
>> * @base: base address of the region
>> --
>> 2.20.1
>>
>>
>
