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=-11.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 57A6AC433E0 for ; Thu, 30 Jul 2020 01:55:52 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2008620829 for ; Thu, 30 Jul 2020 01:55:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="p0iRgRI1"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WPEioIaU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2008620829 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rXqE2/LZL7TZ0E4EtFeRlb0ZhUAaKypDMKe+hnedc0M=; b=p0iRgRI1sBkIu9dxOnhE+J1ta f42RGVNkbANMnsOh6MK+D3qYBu/IRYxsXED0wJIxE90v5Nb454m472xW6cTma7FbzOYo3WsvroHqX o8zPYdMw4/rOXFzhpmSA/vN8NUtK3JyK1OH/k97l8WQsuLLItz11GYMC53REnCX1e4ALfrDOV31iN 3yoYRFuqNHv+axj4kUJPYPtOJsvLQ90XP7qBn73W3+dpr+WfYkUITX7+mqKlSaHV9wR6FnEw6vU0p rv9jWUACfjPQv0aZpbWQf5AYXM3FsdTvkw+TLFeKGMFLDErnhkTPRZVTfUgWM4I6sMlXB1Trga1Al SyM7THWgA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0xmO-00073f-Qy; Thu, 30 Jul 2020 01:54:45 +0000 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120] helo=us-smtp-1.mimecast.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0xmG-000710-Hw for linux-arm-kernel@lists.infradead.org; Thu, 30 Jul 2020 01:54:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596074076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=RRu2DjMF0v0Jv3loZnZu2suQTSJCldR+3yWZSkhX+qw=; b=WPEioIaUVuT+NXE+mbDAAoYgyszkhwTBNFKCjBxYVVL9b5eej71Tz/jno9YwO9mYf/jKLr xF5DiZFUAsSSwVLtMqCL3P/zxV5aYd+ScBHlGrJoXztQWM4yXS7CeatxRxpszbLrghhZ04 kNLbRDYZUPxM1ZI6kYeq783wR9lAHrQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-251-MKISxg0TPU6a-4FvLzbZhQ-1; Wed, 29 Jul 2020 21:54:32 -0400 X-MC-Unique: MKISxg0TPU6a-4FvLzbZhQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6832D1005510; Thu, 30 Jul 2020 01:54:27 +0000 (UTC) Received: from localhost (ovpn-12-125.pek2.redhat.com [10.72.12.125]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 56EE9619B5; Thu, 30 Jul 2020 01:54:26 +0000 (UTC) Date: Thu, 30 Jul 2020 09:54:24 +0800 From: Baoquan He To: Mike Rapoport Subject: Re: [PATCH 10/15] memblock: make memblock_debug and related functionality private Message-ID: <20200730015424.GJ14854@MiWiFi-R3L-srv> References: <20200728051153.1590-1-rppt@kernel.org> <20200728051153.1590-11-rppt@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200728051153.1590-11-rppt@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200729_215436_843423_CE8F88D4 X-CRM114-Status: GOOD ( 26.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-sh@vger.kernel.org, Peter Zijlstra , Benjamin Herrenschmidt , Dave Hansen , linux-mips@vger.kernel.org, Max Filippov , Paul Mackerras , sparclinux@vger.kernel.org, linux-riscv@lists.infradead.org, Will Deacon , Stafford Horne , Marek Szyprowski , linux-s390@vger.kernel.org, linux-c6x-dev@linux-c6x.org, Yoshinori Sato , Michael Ellerman , x86@kernel.org, Russell King , Mike Rapoport , clang-built-linux@googlegroups.com, Ingo Molnar , Catalin Marinas , uclinux-h8-devel@lists.sourceforge.jp, linux-xtensa@linux-xtensa.org, openrisc@lists.librecores.org, Borislav Petkov , Andy Lutomirski , Paul Walmsley , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Michal Simek , linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Palmer Dabbelt , Andrew Morton , Christoph Hellwig Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 07/28/20 at 08:11am, Mike Rapoport wrote: > From: Mike Rapoport > > The only user of memblock_dbg() outside memblock was s390 setup code and it > is converted to use pr_debug() instead. > This allows to stop exposing memblock_debug and memblock_dbg() to the rest > of the kernel. > > Signed-off-by: Mike Rapoport > --- > arch/s390/kernel/setup.c | 4 ++-- > include/linux/memblock.h | 12 +----------- > mm/memblock.c | 13 +++++++++++-- > 3 files changed, 14 insertions(+), 15 deletions(-) Nice clean up. Reviewed-by: Baoquan He > > diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c > index 07aa15ba43b3..8b284cf6e199 100644 > --- a/arch/s390/kernel/setup.c > +++ b/arch/s390/kernel/setup.c > @@ -776,8 +776,8 @@ static void __init memblock_add_mem_detect_info(void) > unsigned long start, end; > int i; > > - memblock_dbg("physmem info source: %s (%hhd)\n", > - get_mem_info_source(), mem_detect.info_source); > + pr_debug("physmem info source: %s (%hhd)\n", > + 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) { > diff --git a/include/linux/memblock.h b/include/linux/memblock.h > index 220b5f0dad42..e6a23b3db696 100644 > --- a/include/linux/memblock.h > +++ b/include/linux/memblock.h > @@ -90,7 +90,6 @@ struct memblock { > }; > > extern struct memblock memblock; > -extern int memblock_debug; > > #ifndef CONFIG_ARCH_KEEP_MEMBLOCK > #define __init_memblock __meminit > @@ -102,9 +101,6 @@ void memblock_discard(void); > static inline void memblock_discard(void) {} > #endif > > -#define memblock_dbg(fmt, ...) \ > - if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) > - > phys_addr_t memblock_find_in_range(phys_addr_t start, phys_addr_t end, > phys_addr_t size, phys_addr_t align); > void memblock_allow_resize(void); > @@ -456,13 +452,7 @@ bool memblock_is_region_memory(phys_addr_t base, phys_addr_t size); > bool memblock_is_reserved(phys_addr_t addr); > bool memblock_is_region_reserved(phys_addr_t base, phys_addr_t size); > > -extern void __memblock_dump_all(void); > - > -static inline void memblock_dump_all(void) > -{ > - if (memblock_debug) > - __memblock_dump_all(); > -} > +void memblock_dump_all(void); > > /** > * memblock_set_current_limit - Set the current allocation limit to allow > diff --git a/mm/memblock.c b/mm/memblock.c > index a5b9b3df81fc..824938849f6d 100644 > --- a/mm/memblock.c > +++ b/mm/memblock.c > @@ -134,7 +134,10 @@ struct memblock memblock __initdata_memblock = { > i < memblock_type->cnt; \ > i++, rgn = &memblock_type->regions[i]) > > -int memblock_debug __initdata_memblock; > +#define memblock_dbg(fmt, ...) \ > + if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) > + > +static int memblock_debug __initdata_memblock; > static bool system_has_some_mirror __initdata_memblock = false; > static int memblock_can_resize __initdata_memblock; > static int memblock_memory_in_slab __initdata_memblock = 0; > @@ -1919,7 +1922,7 @@ static void __init_memblock memblock_dump(struct memblock_type *type) > } > } > > -void __init_memblock __memblock_dump_all(void) > +static void __init_memblock __memblock_dump_all(void) > { > pr_info("MEMBLOCK configuration:\n"); > pr_info(" memory size = %pa reserved size = %pa\n", > @@ -1933,6 +1936,12 @@ void __init_memblock __memblock_dump_all(void) > #endif > } > > +void __init_memblock memblock_dump_all(void) > +{ > + if (memblock_debug) > + __memblock_dump_all(); > +} > + > void __init memblock_allow_resize(void) > { > memblock_can_resize = 1; > -- > 2.26.2 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel