From patchwork Tue Oct 2 15:00:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10623819 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1ED4C175A for ; Tue, 2 Oct 2018 15:00:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EBB8212DA for ; Tue, 2 Oct 2018 15:00:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 02F40212D6; Tue, 2 Oct 2018 15:00:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54C3B200DF for ; Tue, 2 Oct 2018 15:00:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6A9036B000A; Tue, 2 Oct 2018 11:00:53 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 62E9A6B000C; Tue, 2 Oct 2018 11:00:53 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 40C906B0010; Tue, 2 Oct 2018 11:00:53 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by kanga.kvack.org (Postfix) with ESMTP id C70886B000A for ; Tue, 2 Oct 2018 11:00:52 -0400 (EDT) Received: by mail-wm1-f69.google.com with SMTP id 189-v6so1992814wme.0 for ; Tue, 02 Oct 2018 08:00:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=9SeupK+KhOJ9JTSOt0AEzf3o4SV6rGMu7uHKPkHuPW8=; b=hVI1R2yTaQQAE4U2KENlBpcVuuxrnsaUw499j08o8TrhQ97aZ9iZ6PFfXnFAjIXN5a B0tamrg20bjYl1xuqWQTXqxs+fNPcPfRYRF9iet8QrEYqO8rNyIiXlEDvTOo7ef7C+hP vIGn39chTnglkxuRKS3PMHUkQXe9pBo2unS046aKWMMx74A/AOaZYUPMjC1UOZdtGKS1 BFThKZ6ojJUgdMi5AdO0VzCR/shPm1+qyn50YMpZAJ4f7kQSmwqWvS1RtCpp+lQFIQmN f5z8IbKakl+jcRzDzL5Z6m13v9M7pVWHOxKuFqFNXfATizKx6V3eqK3nO7AzEPMTG08W S2rQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com X-Gm-Message-State: ABuFfohhiDpeivXWw0x69B/9WZhP1VqGD7/KeIgD6t6iSpkjm0huARSD 4SmYyVqZX/IYtWiq4c8cAtyf+CB4vXNy7WwzACTyKlgEHgeywSZlbwdTjK2MP+bNhUovHE3MxI+ t3b0UEywMG/9jNgPYlHG4ri7dmWd3658+bxHJoUStG8z6xQTGUIEIM5RxxTkzxvwxdglMGbGDSK Wx8E3yPmi7esipSXRtWsUXMm0UhjTLFEAEC/pcGXuRJxFzBqe8BFwTgjfxNuGLkFGzFLQlEcmds Ube0rLXHncJOlN8ToTtoNjRfOrZejFR7UhOcPrW2BmEec0OZpGgHyWP46pENa+jTmyGr67HOw0N 8qLcxizObWzv4z7UMtto8jH4hOXn1QmEm2+LmfIp0r/7AJYq++PG0D4RHVDbMhOIWLj36AVUDQ= = X-Received: by 2002:a1c:14d1:: with SMTP id 200-v6mr2222476wmu.106.1538492451585; Tue, 02 Oct 2018 08:00:51 -0700 (PDT) X-Received: by 2002:a1c:14d1:: with SMTP id 200-v6mr2222325wmu.106.1538492449036; Tue, 02 Oct 2018 08:00:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538492449; cv=none; d=google.com; s=arc-20160816; b=pG09to3Pu6cNesI5SntomTl7mWAVU3CMxIkK6nB+2HksQsDwYtNlwuxsN6wVD2EjaR 0ghJi7Yu/f5l/3VDWbzumSyxaIs3oXyMX1OZ/x6H44XG2Fpjw2C0dmgbs0a67gkxhCRx vRrb0ih1tB5WnLFyj9q/bprX1HxrfwIyr/kpx5dcaGvA9jpkLxGORtImEbnw9+b8NPMJ jv+rCwk3gV5QQXoNn3QGsn1JfvncvVevrYXT5oK1c81ayvAG8g/imtOuEYROS1cUUlKa ol+oPgBJr4brgt6FyOnLiKtQulAyrxrlOzYM/iMdfx2LGRBDfvGJetzURUpfhF/ulkbt xtRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=9SeupK+KhOJ9JTSOt0AEzf3o4SV6rGMu7uHKPkHuPW8=; b=IPlYUjfbc1cZLA++SB+7JjTrezav8EpE9NV6IRqM8FMIKMYNb3gBLd7FJFR1fXML/N spGWpbb7drcrBTR7zCvmMdJ4oDU/+C7z7yL+wPTvQsnH1ONhftDDXZX/qlpNmiox2kUF ONWMwpj3aIAMfaU9nWbClPAU2tOyxIi21Zi3tfkRsKzqMDeNGunhKjIK2WK0l9jBc+Bu YIQNXpnvmj8PYXmKRF0WR4iW0WamGhA9L1qNjY9fmWbf6HVMZyG6btdKoeBfVWGNZsvv ow/U2m1nETY5M+hvGDy5cxpPSoZn+N7v8PkuYdkKxHWz2OJw5aOP6a7B0pSXMnvfSJms mToA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id b15-v6sor11433017wrf.36.2018.10.02.08.00.48 for (Google Transport Security); Tue, 02 Oct 2018 08:00:49 -0700 (PDT) Received-SPF: pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com X-Google-Smtp-Source: ACcGV60zkt5o1uNzAHLv6hE7KNYU2LEZm9OdUWFqaRjiEcyYI1/pgrPf+MRFrnk/nVw0U1B/W1zfAA== X-Received: by 2002:a5d:4706:: with SMTP id y6-v6mr10462685wrq.256.1538492448577; Tue, 02 Oct 2018 08:00:48 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id j9-v6sm14427601wrt.32.2018.10.02.08.00.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Oct 2018 08:00:47 -0700 (PDT) Received: from d104.suse.de (charybdis-ext.suse.de [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 1D7CC125729; Tue, 2 Oct 2018 17:00:47 +0200 (CEST) From: Oscar Salvador To: linux-mm@kvack.org Cc: mhocko@suse.com, dan.j.williams@intel.com, yasu.isimatu@gmail.com, rppt@linux.vnet.ibm.com, malat@debian.org, linux-kernel@vger.kernel.org, pavel.tatashin@microsoft.com, jglisse@redhat.com, Jonathan.Cameron@huawei.com, rafael@kernel.org, david@redhat.com, dave.jiang@intel.com, Oscar Salvador Subject: [RFC PATCH v3 1/5] mm/memory_hotplug: Add nid parameter to arch_remove_memory Date: Tue, 2 Oct 2018 17:00:25 +0200 Message-Id: <20181002150029.23461-2-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20181002150029.23461-1-osalvador@techadventures.net> References: <20181002150029.23461-1-osalvador@techadventures.net> 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: X-Virus-Scanned: ClamAV using ClamSMTP From: Oscar Salvador This patch is only a preparation for the following-up patches. The idea of passing the nid is that will allow us to get rid of the zone parameter in the patches that follow Signed-off-by: Oscar Salvador Reviewed-by: David Hildenbrand --- arch/ia64/mm/init.c | 2 +- arch/powerpc/mm/mem.c | 2 +- arch/s390/mm/init.c | 2 +- arch/sh/mm/init.c | 2 +- arch/x86/mm/init_32.c | 2 +- arch/x86/mm/init_64.c | 2 +- include/linux/memory_hotplug.h | 2 +- kernel/memremap.c | 4 +++- mm/memory_hotplug.c | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index d5e12ff1d73c..904fe55e10fc 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -661,7 +661,7 @@ int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, } #ifdef CONFIG_MEMORY_HOTREMOVE -int arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) +int arch_remove_memory(int nid, 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 578cbb262c01..445fce705f91 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -138,7 +138,7 @@ int __meminit arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap * } #ifdef CONFIG_MEMORY_HOTREMOVE -int __meminit arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) +int __meminit arch_remove_memory(int nid, 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 e472cd763eb3..f705da1a085f 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -239,7 +239,7 @@ int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, } #ifdef CONFIG_MEMORY_HOTREMOVE -int arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) +int arch_remove_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap) { /* * There is no hardware or firmware interface which could trigger a diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index c8c13c777162..a8e5c0e00fca 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -443,7 +443,7 @@ EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); #endif #ifdef CONFIG_MEMORY_HOTREMOVE -int arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) +int arch_remove_memory(int nid, 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 f2837e4c40b3..b2a698d87a0e 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -860,7 +860,7 @@ int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, } #ifdef CONFIG_MEMORY_HOTREMOVE -int arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) +int arch_remove_memory(int nid, 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 5fab264948c2..c754d9543ae1 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1147,7 +1147,7 @@ kernel_physical_mapping_remove(unsigned long start, unsigned long end) remove_pagetable(start, end, true, NULL); } -int __ref arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) +int __ref arch_remove_memory(int nid, 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 ffd9cd10fcf3..f9fc35819e65 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -107,7 +107,7 @@ static inline bool movable_node_is_enabled(void) } #ifdef CONFIG_MEMORY_HOTREMOVE -extern int arch_remove_memory(u64 start, u64 size, +extern int arch_remove_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap); extern int __remove_pages(struct zone *zone, unsigned long start_pfn, unsigned long nr_pages, struct vmem_altmap *altmap); diff --git a/kernel/memremap.c b/kernel/memremap.c index e3036433ce4e..fe54bba2d7e2 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -121,6 +121,7 @@ static void devm_memremap_pages_release(void *data) struct resource *res = &pgmap->res; resource_size_t align_start, align_size; unsigned long pfn; + int nid; pgmap->kill(pgmap->ref); for_each_device_pfn(pfn, pgmap) @@ -130,6 +131,7 @@ static void devm_memremap_pages_release(void *data) align_start = res->start & ~(SECTION_SIZE - 1); align_size = ALIGN(res->start + resource_size(res), SECTION_SIZE) - align_start; + nid = dev_to_node(dev); mem_hotplug_begin(); if (pgmap->type == MEMORY_DEVICE_PRIVATE) { @@ -137,7 +139,7 @@ static void devm_memremap_pages_release(void *data) __remove_pages(page_zone(pfn_to_page(pfn)), pfn, align_size >> PAGE_SHIFT, NULL); } else { - arch_remove_memory(align_start, align_size, + arch_remove_memory(nid, align_start, align_size, pgmap->altmap_valid ? &pgmap->altmap : NULL); kasan_remove_zero_shadow(__va(align_start), align_size); } diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index d4c7e42e46f3..11b7dcf83323 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1890,7 +1890,7 @@ void __ref __remove_memory(int nid, u64 start, u64 size) memblock_free(start, size); memblock_remove(start, size); - arch_remove_memory(start, size, NULL); + arch_remove_memory(nid, start, size, NULL); try_offline_node(nid);