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.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 48C4EC433E0 for ; Thu, 30 Jul 2020 01:54:43 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 1D0DC2083E for ; Thu, 30 Jul 2020 01:54:43 +0000 (UTC) Authentication-Results: mail.kernel.org; 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 1D0DC2083E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 03C92869BA; Thu, 30 Jul 2020 01:54:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wrzPq4qCnB3g; Thu, 30 Jul 2020 01:54:40 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 0482D8831C; Thu, 30 Jul 2020 01:54:39 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C5753C0050; Thu, 30 Jul 2020 01:54:39 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 931CBC004D for ; Thu, 30 Jul 2020 01:54:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 819DD88326 for ; Thu, 30 Jul 2020 01:54:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U103CYXOelsO for ; Thu, 30 Jul 2020 01:54:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by whitealder.osuosl.org (Postfix) with ESMTPS id 896428831C for ; Thu, 30 Jul 2020 01:54:37 +0000 (UTC) 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 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 , 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 X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" 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 > > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu 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.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham 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 1B820C433DF for ; Thu, 30 Jul 2020 01:54:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED07821744 for ; Thu, 30 Jul 2020 01:54:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WPEioIaU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728309AbgG3Byi (ORCPT ); Wed, 29 Jul 2020 21:54:38 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:23015 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726342AbgG3Byi (ORCPT ); Wed, 29 Jul 2020 21:54:38 -0400 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 Cc: Andrew Morton , Andy Lutomirski , Benjamin Herrenschmidt , Borislav Petkov , Catalin Marinas , Christoph Hellwig , Dave Hansen , Ingo Molnar , Marek Szyprowski , Max Filippov , Michael Ellerman , Michal Simek , Mike Rapoport , Palmer Dabbelt , Paul Mackerras , Paul Walmsley , Peter Zijlstra , Russell King , Stafford Horne , Thomas Gleixner , Will Deacon , Yoshinori Sato , clang-built-linux@googlegroups.com, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-xtensa@linux-xtensa.org, linuxppc-dev@lists.ozlabs.org, openrisc@lists.librecores.org, sparclinux@vger.kernel.org, uclinux-h8-devel@lists.sourceforge.jp, x86@kernel.org 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-Type: text/plain; charset=us-ascii 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 Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.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 > > 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 52ABEC433E0 for ; Thu, 30 Jul 2020 01:54:54 +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 1EF052074B for ; Thu, 30 Jul 2020 01:54:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="x0NZnciU"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZUoHFUFe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1EF052074B 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-riscv-bounces+linux-riscv=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=kbuKKvdIuPa+WaXygvIhQXkfY7+InduKvLL98krJUXM=; b=x0NZnciUfj2+n//hUll4Fa9qc GcwJ3LvccftAolzqYIGYjkayGw338k30DFjhskgkbKxBvZKY3F44TFcl0JgpMyn+RhsSkQ6ygsCBJ Zv4nH8BhJEJjqLYz5Ct9ETn8zsqAn63RXYZPorKvfUpCUrrt7/3KwwPq06ppFS81QYpIvHPuctHtU wW5KNNS5DYdNnrO0q851P4SsudmNceATAAQptn4VEzwUf4MDpnGfaOWYfcpdzxpY0xxmqg4EshV7A vq3cVb/OyX9ncfvyBXXtQ63EfFggyd2fzdvP5x7fgsJEhnRhhCY2LLban/bujbeTCPcjjMfGicU1B mTKZxCTUw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0xmJ-00072c-02; Thu, 30 Jul 2020 01:54:39 +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 1k0xmE-0006zi-Qc for linux-riscv@lists.infradead.org; Thu, 30 Jul 2020 01:54:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596074074; 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=ZUoHFUFe+7GtUdAa/2lyjOXlWkd0pKVIoEDqWjaycK60pUjowupVXMhDtxHKJggGtIO5iB olTqgzvQxkKFQuJ2KKt2btCM9XkkkQO+zavRP+1Ykd+PPIW0GHssRL0xGKUwOoFtUNwoUZ /TVtjcrQUiQ1xE3zIe4MEOC505ukKL4= 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_215434_961567_1E3D298A X-CRM114-Status: GOOD ( 25.16 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=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-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv From mboxrd@z Thu Jan 1 00:00:00 1970 From: Baoquan He Date: Thu, 30 Jul 2020 01:54:24 +0000 Subject: Re: [PATCH 10/15] memblock: make memblock_debug and related functionality private Message-Id: <20200730015424.GJ14854@MiWiFi-R3L-srv> List-Id: References: <20200728051153.1590-1-rppt@kernel.org> <20200728051153.1590-11-rppt@kernel.org> In-Reply-To: <20200728051153.1590-11-rppt@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Mike Rapoport 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 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 > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Baoquan He Date: Thu, 30 Jul 2020 01:54:38 -0000 Subject: [OpenRISC] [PATCH 10/15] memblock: make memblock_debug and related functionality private In-Reply-To: <20200728051153.1590-11-rppt@kernel.org> References: <20200728051153.1590-1-rppt@kernel.org> <20200728051153.1590-11-rppt@kernel.org> Message-ID: <20200730015424.GJ14854@MiWiFi-R3L-srv> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: openrisc@lists.librecores.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 > > 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.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 952C7C433DF for ; Thu, 30 Jul 2020 01:57:34 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (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 4499E20829 for ; Thu, 30 Jul 2020 01:57:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AYqM5GDS"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AYqM5GDS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4499E20829 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4BHD7b5pbbzDqtR for ; Thu, 30 Jul 2020 11:57:31 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=redhat.com (client-ip=207.211.31.120; helo=us-smtp-1.mimecast.com; envelope-from=bhe@redhat.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=AYqM5GDS; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=AYqM5GDS; dkim-atps=neutral Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4BHD4J3VlYzDq5k for ; Thu, 30 Jul 2020 11:54:40 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596074077; 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=AYqM5GDSmYWUCfea408qdF9cDGhPVi2H5jWj8QxQcbnMO8FJqf8XIcgP0v41uQTx4zaftM kzZ/c9ZBLzIUIpUHlxF7QVuSDXg3gMxyrLOjkS+rpH4KhAqJrxEKeQ2S0oQwp4Aup5QsVi xcsQmMJ7sEgbJDFjnD9LfajSSZE3cEM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596074077; 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=AYqM5GDSmYWUCfea408qdF9cDGhPVi2H5jWj8QxQcbnMO8FJqf8XIcgP0v41uQTx4zaftM kzZ/c9ZBLzIUIpUHlxF7QVuSDXg3gMxyrLOjkS+rpH4KhAqJrxEKeQ2S0oQwp4Aup5QsVi xcsQmMJ7sEgbJDFjnD9LfajSSZE3cEM= 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-Type: text/plain; charset=us-ascii 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-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-sh@vger.kernel.org, Peter Zijlstra , 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 , 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 Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 > > 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