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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 CA37BC47E4D for ; Wed, 14 Jul 2021 20:47:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 51437613BF for ; Wed, 14 Jul 2021 20:47:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 51437613BF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9887D6B0083; Wed, 14 Jul 2021 16:47:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 95F676B0085; Wed, 14 Jul 2021 16:47:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B2D56B0088; Wed, 14 Jul 2021 16:47:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0069.hostedemail.com [216.40.44.69]) by kanga.kvack.org (Postfix) with ESMTP id 537836B0083 for ; Wed, 14 Jul 2021 16:47:51 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 3FD6A8248076 for ; Wed, 14 Jul 2021 20:47:50 +0000 (UTC) X-FDA: 78362379900.25.01E6FC2 Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) by imf17.hostedemail.com (Postfix) with ESMTP id F3547F00039D for ; Wed, 14 Jul 2021 20:47:49 +0000 (UTC) Received: by mail-il1-f181.google.com with SMTP id p3so2922934ilg.8 for ; Wed, 14 Jul 2021 13:47:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=hvhFUaJpsKWtTEeD2+NVxurp5yWKuTzZW3b3jtSmo5Y=; b=UUnwQaua/H8rwEJ46wBGu21VE3YZ4bJWf1X9TiXDo9vh0gjpsjTI69qTz8pUIOeQmZ 87sYgU7NQ2/IywPIyzuJgPagS9NB5ilUObP1yaPA/AaIMC2BENX2XW8OmvNHcjIZzcqQ lCJKYYFk7pgPjzvPFxoMU8RBALA3Hs5cTmm/buog1pLIyQXWBKa5ks+NtYkm7Xs9p1/4 9bfr6Tuk3tiShJOZYSkFcJbqC1a6xfK4TJacBP5OeWgIBt7iJpXiEuB2Btyl4Pu/1mqs QL/3W25VvEP2vW3CnG/H9MMRVuhf6MAjCdkOTJ68fiKoyj5Vp4y4pfExBy7Ej62pduDV nCew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=hvhFUaJpsKWtTEeD2+NVxurp5yWKuTzZW3b3jtSmo5Y=; b=TTpPmdHEi/Uumm25LL0QurkscrPbhGC3s8KbH6rmvx4LkgI6xRS5dPLMdXt0O5Alsg Na2tCBkPTo1FKRfUJj+XtzcTVgQ0ps3yPRaWTluYyWHlOGdo9HxQNCAi3cPiBb/iXdPP UZwwR6v1hqg6xCM7sCRVB0KDtJm7LHgvJqBDeuZb3z7ovlQ+xVs3SE1/TMJ2hZxDmOSg CdXsrXmHl+z/l5mSpoH5XsCL5yEdDy3x7LhpmRT//lkG+Fr8H+oB6ULcgkkxLRThD6PN OALo8RRP4Kfv4PxaU6qnGZS+paXAUTOS/MWMudLjUSEVi2B9qJFuWTTmHcsCJ2rNVnvY umPg== X-Gm-Message-State: AOAM531aY3nTBtm7azlCmtEjp4/dAURhjGthAMRzXe4VH/7sD/TLY3Yr 5wvAYnbBBxNTy5kUhfCKBnHT2AlRt4G/WDUuHgc= X-Google-Smtp-Source: ABdhPJzWAUEodW2mYSrVgx/aVrQIoBL1nE+ROg1S3BgzAtNQwXY0vhRs5znC0NaRsIBHIP11yL7l0nkY7pQ1qsdr6E4= X-Received: by 2002:a92:a005:: with SMTP id e5mr7715143ili.22.1626295669171; Wed, 14 Jul 2021 13:47:49 -0700 (PDT) MIME-Version: 1.0 References: <20210712124052.26491-1-david@redhat.com> <20210712124052.26491-3-david@redhat.com> In-Reply-To: <20210712124052.26491-3-david@redhat.com> From: Pankaj Gupta Date: Wed, 14 Jul 2021 22:47:38 +0200 Message-ID: Subject: Re: [PATCH v1 2/4] mm/memory_hotplug: remove nid parameter from arch_remove_memory() To: David Hildenbrand Cc: LKML , Linux MM , Andrew Morton , Vitaly Kuznetsov , "Michael S. Tsirkin" , Jason Wang , Wei Yang , Oscar Salvador , Michal Hocko , Dan Williams , Anshuman Khandual , Dave Hansen , Vlastimil Babka , Mike Rapoport , "Rafael J. Wysocki" , Len Brown , Pavel Tatashin , Heiko Carstens , Michael Ellerman , Catalin Marinas , virtualization@lists.linux-foundation.org, linux-acpi@vger.kernel.org, Andy Lutomirski , "Aneesh Kumar K.V" , Anton Blanchard , Ard Biesheuvel , Baoquan He , Benjamin Herrenschmidt , Borislav Petkov , Christian Borntraeger , Christophe Leroy , Dave Jiang , "H. Peter Anvin" , Ingo Molnar , Jia He , Joe Perches , Kefeng Wang , Laurent Dufour , Michel Lespinasse , Nathan Lynch , Nicholas Piggin , Paul Mackerras , Peter Zijlstra , Pierre Morel , "Rafael J. Wysocki" , Rich Felker , Scott Cheloha , Sergei Trofimovich , Thiago Jung Bauermann , Thomas Gleixner , Vasily Gorbik , Vishal Verma , Will Deacon , Yoshinori Sato , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=UUnwQaua; spf=pass (imf17.hostedemail.com: domain of pankajguptalinux@gmail.com designates 209.85.166.181 as permitted sender) smtp.mailfrom=pankajguptalinux@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam02 X-Stat-Signature: xj4iqj9smy55w3bhjdx7hizu9fkaenpf X-Rspamd-Queue-Id: F3547F00039D X-HE-Tag: 1626295669-103487 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: > The parameter is unused, let's remove it. > > Acked-by: Catalin Marinas > Acked-by: Michael Ellerman (powerpc) > Acked-by: Heiko Carstens (s390) > Cc: Catalin Marinas > Cc: Will Deacon > Cc: Michael Ellerman > Cc: Benjamin Herrenschmidt > Cc: Paul Mackerras > Cc: Heiko Carstens > Cc: Vasily Gorbik > Cc: Christian Borntraeger > Cc: Yoshinori Sato > Cc: Rich Felker > Cc: Dave Hansen > Cc: Andy Lutomirski > Cc: Peter Zijlstra > Cc: Thomas Gleixner > Cc: Ingo Molnar > Cc: Borislav Petkov > Cc: x86@kernel.org > Cc: "H. Peter Anvin" > Cc: Andrew Morton > Cc: Anshuman Khandual > Cc: Ard Biesheuvel > Cc: Mike Rapoport > Cc: Nicholas Piggin > Cc: Pavel Tatashin > Cc: Baoquan He > Cc: Laurent Dufour > Cc: Sergei Trofimovich > Cc: Kefeng Wang > Cc: Michel Lespinasse > Cc: Christophe Leroy > Cc: "Aneesh Kumar K.V" > Cc: Thiago Jung Bauermann > Cc: Joe Perches > Cc: Pierre Morel > Cc: Jia He > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-ia64@vger.kernel.org > Cc: linuxppc-dev@lists.ozlabs.org > Cc: linux-s390@vger.kernel.org > Cc: linux-sh@vger.kernel.org > Signed-off-by: David Hildenbrand > --- > arch/arm64/mm/mmu.c | 3 +-- > arch/ia64/mm/init.c | 3 +-- > arch/powerpc/mm/mem.c | 3 +-- > arch/s390/mm/init.c | 3 +-- > arch/sh/mm/init.c | 3 +-- > arch/x86/mm/init_32.c | 3 +-- > arch/x86/mm/init_64.c | 3 +-- > include/linux/memory_hotplug.h | 3 +-- > mm/memory_hotplug.c | 4 ++-- > mm/memremap.c | 5 +---- > 10 files changed, 11 insertions(+), 22 deletions(-) > > diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c > index d74586508448..af8ab553a268 100644 > --- a/arch/arm64/mm/mmu.c > +++ b/arch/arm64/mm/mmu.c > @@ -1506,8 +1506,7 @@ int arch_add_memory(int nid, u64 start, u64 size, > return ret; > } > > -void arch_remove_memory(int nid, u64 start, u64 size, > - struct vmem_altmap *altmap) > +void arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) > { > unsigned long start_pfn = start >> PAGE_SHIFT; > unsigned long nr_pages = size >> PAGE_SHIFT; > diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c > index 064a967a7b6e..5c6da8d83c1a 100644 > --- a/arch/ia64/mm/init.c > +++ b/arch/ia64/mm/init.c > @@ -484,8 +484,7 @@ int arch_add_memory(int nid, u64 start, u64 size, > return ret; > } > > -void arch_remove_memory(int nid, u64 start, u64 size, > - struct vmem_altmap *altmap) > +void arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) > { > unsigned long start_pfn = start >> PAGE_SHIFT; > unsigned long nr_pages = size >> PAGE_SHIFT; > diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c > index ad198b439222..c3c4e31462ec 100644 > --- a/arch/powerpc/mm/mem.c > +++ b/arch/powerpc/mm/mem.c > @@ -119,8 +119,7 @@ int __ref arch_add_memory(int nid, u64 start, u64 size, > return rc; > } > > -void __ref arch_remove_memory(int nid, u64 start, u64 size, > - struct vmem_altmap *altmap) > +void __ref arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) > { > unsigned long start_pfn = start >> PAGE_SHIFT; > unsigned long nr_pages = size >> PAGE_SHIFT; > diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c > index 8ac710de1ab1..d85bd7f5d8dc 100644 > --- a/arch/s390/mm/init.c > +++ b/arch/s390/mm/init.c > @@ -306,8 +306,7 @@ int arch_add_memory(int nid, u64 start, u64 size, > return rc; > } > > -void arch_remove_memory(int nid, u64 start, u64 size, > - struct vmem_altmap *altmap) > +void arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) > { > unsigned long start_pfn = start >> PAGE_SHIFT; > unsigned long nr_pages = size >> PAGE_SHIFT; > diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c > index ce26c7f8950a..506784702430 100644 > --- a/arch/sh/mm/init.c > +++ b/arch/sh/mm/init.c > @@ -414,8 +414,7 @@ int arch_add_memory(int nid, u64 start, u64 size, > return ret; > } > > -void arch_remove_memory(int nid, u64 start, u64 size, > - struct vmem_altmap *altmap) > +void arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) > { > unsigned long start_pfn = PFN_DOWN(start); > unsigned long nr_pages = size >> PAGE_SHIFT; > diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c > index 74b78840182d..bd90b8fe81e4 100644 > --- a/arch/x86/mm/init_32.c > +++ b/arch/x86/mm/init_32.c > @@ -801,8 +801,7 @@ int arch_add_memory(int nid, u64 start, u64 size, > return __add_pages(nid, start_pfn, nr_pages, params); > } > > -void arch_remove_memory(int nid, u64 start, u64 size, > - struct vmem_altmap *altmap) > +void arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) > { > unsigned long start_pfn = start >> PAGE_SHIFT; > unsigned long nr_pages = size >> PAGE_SHIFT; > diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c > index ddeaba947eb3..a6e11763763f 100644 > --- a/arch/x86/mm/init_64.c > +++ b/arch/x86/mm/init_64.c > @@ -1255,8 +1255,7 @@ kernel_physical_mapping_remove(unsigned long start, unsigned long end) > remove_pagetable(start, end, true, NULL); > } > > -void __ref arch_remove_memory(int nid, u64 start, u64 size, > - struct vmem_altmap *altmap) > +void __ref arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) > { > unsigned long start_pfn = start >> PAGE_SHIFT; > unsigned long nr_pages = size >> PAGE_SHIFT; > diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h > index d01b504ce06f..010a192298b5 100644 > --- a/include/linux/memory_hotplug.h > +++ b/include/linux/memory_hotplug.h > @@ -130,8 +130,7 @@ static inline bool movable_node_is_enabled(void) > return movable_node_enabled; > } > > -extern void arch_remove_memory(int nid, u64 start, u64 size, > - struct vmem_altmap *altmap); > +extern void arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap); > extern void __remove_pages(unsigned long start_pfn, unsigned long nr_pages, > struct vmem_altmap *altmap); > > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > index 93b3abaf9828..f2a9af3af184 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -1106,7 +1106,7 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) > /* create memory block devices after memory was added */ > ret = create_memory_block_devices(start, size, mhp_altmap.alloc); > if (ret) { > - arch_remove_memory(nid, start, size, NULL); > + arch_remove_memory(start, size, NULL); > goto error; > } > > @@ -1892,7 +1892,7 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size) > > mem_hotplug_begin(); > > - arch_remove_memory(nid, start, size, altmap); > + arch_remove_memory(start, size, altmap); > > if (IS_ENABLED(CONFIG_ARCH_KEEP_MEMBLOCK)) { > memblock_free(start, size); > diff --git a/mm/memremap.c b/mm/memremap.c > index 15a074ffb8d7..ed593bf87109 100644 > --- a/mm/memremap.c > +++ b/mm/memremap.c > @@ -140,14 +140,11 @@ static void pageunmap_range(struct dev_pagemap *pgmap, int range_id) > { > struct range *range = &pgmap->ranges[range_id]; > struct page *first_page; > - int nid; > > /* make sure to access a memmap that was actually initialized */ > first_page = pfn_to_page(pfn_first(pgmap, range_id)); > > /* pages are dead and unused, undo the arch mapping */ > - nid = page_to_nid(first_page); > - > mem_hotplug_begin(); > remove_pfn_range_from_zone(page_zone(first_page), PHYS_PFN(range->start), > PHYS_PFN(range_len(range))); > @@ -155,7 +152,7 @@ static void pageunmap_range(struct dev_pagemap *pgmap, int range_id) > __remove_pages(PHYS_PFN(range->start), > PHYS_PFN(range_len(range)), NULL); > } else { > - arch_remove_memory(nid, range->start, range_len(range), > + arch_remove_memory(range->start, range_len(range), > pgmap_altmap(pgmap)); > kasan_remove_zero_shadow(__va(range->start), range_len(range)); > } Reviewed-by: Pankaj Gupta