From patchwork Tue Oct 2 15:00:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10623825 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 60C9B175A for ; Tue, 2 Oct 2018 15:01:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 516D7205E9 for ; Tue, 2 Oct 2018 15:01:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 45BAE20881; Tue, 2 Oct 2018 15:01:12 +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 0EF4B21E5A for ; Tue, 2 Oct 2018 15:01:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BABB16B0010; Tue, 2 Oct 2018 11:00:55 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B5EEA6B0266; Tue, 2 Oct 2018 11:00:55 -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 A277F6B0269; Tue, 2 Oct 2018 11:00:55 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by kanga.kvack.org (Postfix) with ESMTP id 44F7C6B0010 for ; Tue, 2 Oct 2018 11:00:55 -0400 (EDT) Received: by mail-wm1-f70.google.com with SMTP id y199-v6so1836788wmc.6 for ; Tue, 02 Oct 2018 08:00:55 -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=PhCT3TBAUk3AvVLhiqqr/i+tBqrnuE7S7sAJRx6RsvU=; b=jCOGz7cMulCfCYCZPdW3cNuDKW93ITKkTpogSbkr7v20mjTNcPhXTVgIga2fS7JHh6 m8sTpe1G1pgOntNP9vcNBpQh7OfIaeh4O0WafybLD2E66+hv3juk1S9DX8EdTHjPNC+d SfBA7rk0XyeMeZtiizFFZgxT0OE+Obck5td1IL1gnRIW7hPOavYaonGnH11wuCKg1vd7 Gc8iGZxJRfZRLYsymZ7cyfebnDsXjZQioSW1XaWwLDgnYJCzzpw/tlbjWORKT5WtJ4Yi 2tmQjHbYZ71NZ5XkKkR7RsRy0yD8A+4KK1SUrLonUCQdNw71rgt1+rc09+CWaYj/ZX4u 7s2A== 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: ABuFfoho4WusukSxn9pA9cRhnOsE3ftY/6DugidKNIup/x27ExxqHyQg dcGuIhpZrR1v0MXT5uRRiKw7l16q52VsS/IY3Zor0X8agrsTgo1njCJmqFLOD+C90QuI+AdO6z3 7EKAsDyBybQcJO09jxS6cRGDlKMxBXFZETUa+c3NqXH2mRF5wlIyN0Sr6ZYAVwZ8t5kzmxmjj+N mu6v5Mwl2+rM/ar8MGJpoI/O24AreZcMU5IEP3+znAgY0w+zsqCLpszqjQFj8//5xLuy169U1qw v5EhfBMbkiiMnCojXmnXYgMiwhrlgf7mas0J5m03gCCMauJUKC0ehyY9RInQT4xUw2KK75/+HN4 fjsZqIuiIFq69fB12tOpHrJlsseSnTemOI0MFvqhvUA2bXKaREICyPjiSbNpuxmlbHvHwHOf5g= = X-Received: by 2002:adf:8382:: with SMTP id 2-v6mr2680783wre.13.1538492454434; Tue, 02 Oct 2018 08:00:54 -0700 (PDT) X-Received: by 2002:adf:8382:: with SMTP id 2-v6mr2680565wre.13.1538492451680; Tue, 02 Oct 2018 08:00:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538492451; cv=none; d=google.com; s=arc-20160816; b=SC/XDCtXwIEjSQXu1tUKJhJnRLiU5JdYnlvgyoNE/65L8EZTeUcSXxtRxM/jDMHk9G qn+KrA4KdpnPk7Z9DjzJWiHHw/2OQCWzvxo8XhQ2Y3nM6Sfp54sUHQFM/nTLVQlJzqex CF+3teC0eA0JvzN2st/7fHxcCpNbHqDRrqYTHXtXUkv4uZxK2yviQ3AUxBJq6kyEXXk5 ctPqEh4M4iSRDxAIsmTOiYR5k94PRP1wKYHbEnrjeYkNdAhDuM9x3VBtJp37lM2yLOZi BycidIk+wyzpNbpYgeigBy3ZcIe6hBH9qHRh0OosRX0NIfq0WK8lFJrptlRSNzu90Y70 qMEQ== 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=PhCT3TBAUk3AvVLhiqqr/i+tBqrnuE7S7sAJRx6RsvU=; b=vdDPMT9zPv3Gla1+QbSkxRVzqPJ7uZS1r2FmrNxJu7/NUnlgE3RIaUX3QVQfG1xvVE yr4jCvHXxcd6RHMcJ7iyKN/w2bgPoGuQKWERkjJ9oKelbh8ogtcOhdfWd7R0nKfsdiXr SY3JRPc6bA1uMA6OaOB7UCxA9cJtIp9yB/BBz1VajWThJijIdqlZK9qDBHOmq7DdnsIx wIQ2MI2tFEN+hObf5DN/c+eR9z4EdR1sOe8xnnl6CXBEWiK81zxpWkZVYHJXiTNsqWgf MYRmnrmQRuWm7ROnruomggg5miQC6/wdpL1HI7fl5/55b+ov+rW2Yv+iAslD31fjhw1M nGAw== 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 v3-v6sor3241442wrw.43.2018.10.02.08.00.51 for (Google Transport Security); Tue, 02 Oct 2018 08:00:51 -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: ACcGV62GC8tXsIt/wBzYRBj5U9Ujpuc1DEAM6x8ZaIfds4Yu9bzQsN3D+oR0SbAJPePtnFPKBG1bkw== X-Received: by 2002:adf:9c12:: with SMTP id f18-v6mr11165017wrc.93.1538492451294; Tue, 02 Oct 2018 08:00:51 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id q200-v6sm14232186wmd.2.2018.10.02.08.00.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Oct 2018 08:00:50 -0700 (PDT) Received: from d104.suse.de (charybdis-ext.suse.de [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 444CE12572C; Tue, 2 Oct 2018 17:00:48 +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 5/5] mm/memory-hotplug: Rework unregister_mem_sect_under_nodes Date: Tue, 2 Oct 2018 17:00:29 +0200 Message-Id: <20181002150029.23461-6-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 tries to address another issue about accessing unitiliazed pages. Jonathan reported a problem [1] where we can access steal pages in case we hot-remove memory without onlining it first. This time is in unregister_mem_sect_under_nodes. This function tries to get the nid from the pfn and then tries to remove the symlink between mem_blk <-> nid and vice versa. Since we already know the nid in remove_memory(), we can pass it down the chain to unregister_mem_sect_under_nodes. There we can just remove the symlinks without the need to look into the pages. [1] https://www.spinics.net/lists/linux-mm/msg161316.html Signed-off-by: Oscar Salvador --- drivers/base/memory.c | 9 ++++----- drivers/base/node.c | 38 +++++++------------------------------- include/linux/memory.h | 2 +- include/linux/node.h | 7 ++----- mm/memory_hotplug.c | 2 +- 5 files changed, 15 insertions(+), 43 deletions(-) diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 0e5985682642..3d8c65d84bea 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -744,8 +744,7 @@ unregister_memory(struct memory_block *memory) device_unregister(&memory->dev); } -static int remove_memory_section(unsigned long node_id, - struct mem_section *section, int phys_device) +static int remove_memory_section(unsigned long nid, struct mem_section *section) { struct memory_block *mem; @@ -759,7 +758,7 @@ static int remove_memory_section(unsigned long node_id, if (!mem) goto out_unlock; - unregister_mem_sect_under_nodes(mem, __section_nr(section)); + unregister_mem_sect_under_nodes(nid, mem); mem->section_count--; if (mem->section_count == 0) @@ -772,12 +771,12 @@ static int remove_memory_section(unsigned long node_id, return 0; } -int unregister_memory_section(struct mem_section *section) +int unregister_memory_section(int nid, struct mem_section *section) { if (!present_section(section)) return -EINVAL; - return remove_memory_section(0, section, 0); + return remove_memory_section(nid, section); } #endif /* CONFIG_MEMORY_HOTREMOVE */ diff --git a/drivers/base/node.c b/drivers/base/node.c index 86d6cd92ce3d..65bc5920bd3d 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -453,40 +453,16 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, void *arg) return 0; } -/* unregister memory section under all nodes that it spans */ -int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, - unsigned long phys_index) +/* + * This mem_blk is going to be removed, so let us remove the link + * to the node and vice versa + */ +void unregister_mem_sect_under_nodes(int nid, struct memory_block *mem_blk) { - NODEMASK_ALLOC(nodemask_t, unlinked_nodes, GFP_KERNEL); - unsigned long pfn, sect_start_pfn, sect_end_pfn; - - if (!mem_blk) { - NODEMASK_FREE(unlinked_nodes); - return -EFAULT; - } - if (!unlinked_nodes) - return -ENOMEM; - nodes_clear(*unlinked_nodes); - - sect_start_pfn = section_nr_to_pfn(phys_index); - sect_end_pfn = sect_start_pfn + PAGES_PER_SECTION - 1; - for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) { - int nid; - - nid = get_nid_for_pfn(pfn); - if (nid < 0) - continue; - if (!node_online(nid)) - continue; - if (node_test_and_set(nid, *unlinked_nodes)) - continue; - sysfs_remove_link(&node_devices[nid]->dev.kobj, + sysfs_remove_link(&node_devices[nid]->dev.kobj, kobject_name(&mem_blk->dev.kobj)); - sysfs_remove_link(&mem_blk->dev.kobj, + sysfs_remove_link(&mem_blk->dev.kobj, kobject_name(&node_devices[nid]->dev.kobj)); - } - NODEMASK_FREE(unlinked_nodes); - return 0; } int link_mem_sections(int nid, unsigned long start_pfn, unsigned long end_pfn) diff --git a/include/linux/memory.h b/include/linux/memory.h index a6ddefc60517..d75ec88ca09d 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h @@ -113,7 +113,7 @@ extern int register_memory_isolate_notifier(struct notifier_block *nb); extern void unregister_memory_isolate_notifier(struct notifier_block *nb); int hotplug_memory_register(int nid, struct mem_section *section); #ifdef CONFIG_MEMORY_HOTREMOVE -extern int unregister_memory_section(struct mem_section *); +extern int unregister_memory_section(int nid, struct mem_section *); #endif extern int memory_dev_init(void); extern int memory_notify(unsigned long val, void *v); diff --git a/include/linux/node.h b/include/linux/node.h index 257bb3d6d014..e8aa9e6d95f9 100644 --- a/include/linux/node.h +++ b/include/linux/node.h @@ -72,8 +72,7 @@ extern int register_cpu_under_node(unsigned int cpu, unsigned int nid); extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid); extern int register_mem_sect_under_node(struct memory_block *mem_blk, void *arg); -extern int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, - unsigned long phys_index); +extern void unregister_mem_sect_under_nodes(int nid, struct memory_block *mem_blk); #ifdef CONFIG_HUGETLBFS extern void register_hugetlbfs_with_node(node_registration_func_t doregister, @@ -105,10 +104,8 @@ static inline int register_mem_sect_under_node(struct memory_block *mem_blk, { return 0; } -static inline int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, - unsigned long phys_index) +static inline void unregister_mem_sect_under_nodes(int nid, struct memory_block *mem_blk) { - return 0; } static inline void register_hugetlbfs_with_node(node_registration_func_t reg, diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 1f71aebd598b..e7a38471fdc2 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -528,7 +528,7 @@ static int __remove_section(int nid, struct mem_section *ms, if (!valid_section(ms)) return ret; - ret = unregister_memory_section(ms); + ret = unregister_memory_section(nid, ms); if (ret) return ret;