From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6216AC33C99 for ; Mon, 6 Jan 2020 02:27:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 09AE621734 for ; Mon, 6 Jan 2020 02:27:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 09AE621734 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id CD6638E0005; Sun, 5 Jan 2020 21:27:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C87B88E0003; Sun, 5 Jan 2020 21:27:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BC3C58E0005; Sun, 5 Jan 2020 21:27:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0003.hostedemail.com [216.40.44.3]) by kanga.kvack.org (Postfix) with ESMTP id A5FEE8E0003 for ; Sun, 5 Jan 2020 21:27:48 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id 32D928249980 for ; Mon, 6 Jan 2020 02:27:48 +0000 (UTC) X-FDA: 76345623816.26.pump74_6127f9749c026 X-HE-Tag: pump74_6127f9749c026 X-Filterd-Recvd-Size: 7640 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf49.hostedemail.com (Postfix) with ESMTP for ; Mon, 6 Jan 2020 02:27:47 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A348631B; Sun, 5 Jan 2020 18:27:46 -0800 (PST) Received: from [10.162.41.131] (p8cg001049571a15.blr.arm.com [10.162.41.131]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id ABD163F534; Sun, 5 Jan 2020 18:27:42 -0800 (PST) Subject: Re: [RFC] mm/memblock: Define memblock_physmem() To: Mike Rapoport Cc: linux-mm@kvack.org, Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Martin Schwidefsky , Collin Walling , Gerald Schaefer , Philipp Rudo , Mike Rapoport , Andrew Morton , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org References: <1578040866-3844-1-git-send-email-anshuman.khandual@arm.com> <20200105085921.GB7261@rapoport-lnx> From: Anshuman Khandual Message-ID: <1e5e2ff2-03f9-387f-e566-38657cd9dfe2@arm.com> Date: Mon, 6 Jan 2020 07:58:54 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200105085921.GB7261@rapoport-lnx> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 >> Cc: Vasily Gorbik >> Cc: Christian Borntraeger >> Cc: Martin Schwidefsky >> Cc: Collin Walling >> Cc: Gerald Schaefer >> Cc: Philipp Rudo >> Cc: Mike Rapoport >> Cc: Andrew Morton >> Cc: linux-s390@vger.kernel.org >> Cc: linux-kernel@vger.kernel.org >> Signed-off-by: Anshuman Khandual >> --- >> 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 >> >> >