From patchwork Mon Aug 13 15:46:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10564467 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 B4D7E13B4 for ; Mon, 13 Aug 2018 15:47:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A443F29501 for ; Mon, 13 Aug 2018 15:47:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 975F429509; Mon, 13 Aug 2018 15:47:02 +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 17BC329501 for ; Mon, 13 Aug 2018 15:47:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D22726B0008; Mon, 13 Aug 2018 11:46:53 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CD3B96B000A; Mon, 13 Aug 2018 11:46: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 B48B56B000C; Mon, 13 Aug 2018 11:46:53 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by kanga.kvack.org (Postfix) with ESMTP id 573CF6B0008 for ; Mon, 13 Aug 2018 11:46:53 -0400 (EDT) Received: by mail-wr1-f72.google.com with SMTP id k15-v6so13354984wrq.1 for ; Mon, 13 Aug 2018 08:46:53 -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=IB5W08PwRnoqD1j6A2k+r5VZM221mRLqKiPSCZVq6fA=; b=SEH3ncJlb+5fyKlagboD4wP0p0iNYpcHbBmReO5QkEzWJ3+C4WWvB8Nad2hqAJpHGQ +hgtqux5i3Hbs2vUCkYbUbqNbIsV2Y99e7TEoQUP3MvSlaKuvPD5+YwoAcQHhuroz71P RsDQt6ALTfDsZNm+F/FbB/HTKQSFiZwSWviJn/mvyKYqN9QGbDxEuUlhdlROnRMgdFh0 k+Pl8OGQvDqy0+DzKKyXsjJic2V4AOqqeiTQlHSQ9fOTV1qzwqs4vwAMrs1oBoU8BuH/ y+5u7G6qtk6arWncY72g4ufO4aGq0BTIUaudXEsvUz1pCmiY6I0/aANmumoUT0rARzVe EBPA== 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: AOUpUlGM6J6vF7DeIwvNl3htnN95rHNptmAVzaZazhXQvreYJ8Hqk5AC QxBGqFa9W5BG/Epp1K716Ac0cpvWf3JlM5JPIRCoZElD5FkpkS/ld6yGtvtwjYoqJvfjUNnv5wa FH1mprfXhovVVYuh9FqEyb1oiAMdgy53ebeADo7nz6f4mmyUQy5sHHM9BuQFCzKhTQKZwyG0ZgV zySEj/OSrLTEHcwj45IQlau3+TGdYg3DsfgyrgMD1+biUJC55wj+JEcuqN53FHvPo1YQoCFgeJH /Dbj+NE7JB/xaTipfE2ctKCmfB1pgdLdgKXXikHb2A2alk+MiqBrbPpf85jjM7gR5jdEA9oiOgy Ku2IGlXIFbo3ctM91CjOhxQ9ztCgYLvVyvsF3mY2J6RZtrUDbPy4+Pys/s7QwQif0kvYfo4U3Q= = X-Received: by 2002:a1c:20cb:: with SMTP id g194-v6mr8957835wmg.102.1534175212898; Mon, 13 Aug 2018 08:46:52 -0700 (PDT) X-Received: by 2002:a1c:20cb:: with SMTP id g194-v6mr8957808wmg.102.1534175212047; Mon, 13 Aug 2018 08:46:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534175212; cv=none; d=google.com; s=arc-20160816; b=PhHsIh+INgqQlKqv+/R+lHSynZyOzET2Abqnm3QSrfDvHgOlsDR830Oqwth9hAPBJZ pmhxfb9PAadL0QXOXFl//bt7D64y/fUB2pcsq8g6MxBCgQdbE9PoOR+4KAVE0nOgNSAw 5RWepzA5NHZvAcZRJvKODX0vGnUKXgH5OR9aXq9frF6qAc18tEqXQIIFsnLMyJSxQR2y 3mf2HyxNQASsECpnbTSVVtacLOZf9HnHYBV+0m4r8HUSJzgjSnHB1NGfLbEVUUAANxTJ w2Vl0MAreHIc8NdqlhchhDhNmLmdWPDUcAa/LRwWkh+az8z8YJ3/oyiG3NPd01DHI7Wt DDVg== 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 :arc-authentication-results; bh=IB5W08PwRnoqD1j6A2k+r5VZM221mRLqKiPSCZVq6fA=; b=aXq4+ta4GJeAr2DOtE3bdYtlWhMNSRuSGlX+MhKVT3ZyETmw6iFnL9qidiU/1A7YxK eHbuDpAGglqKC3IC7TMP7py6/G8ECV4VuuYeEzILBZWeI7F4pFvFa2QE0ERQGOq4M3ld RJGZ87VzDg58AGSJVHM7jrzxDFqc2BbQ88B0PSurl25o4o4kp++lxQFz9wE1+1bNNrZV 7Ab3mZWiyK2ADVmljMbiyw5/rKZm7kJLAAdWCYQyxd7Y5AO6NE0Y6Cl+y9rdU9eyN5xd QYa5Bvu0RcT7LpJeljIDfXbU8wog11gD8EvM3Yz+2OywFC0XJQBfNBu69daeROd/m+DA K1Gw== 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 l128-v6sor2305576wmb.53.2018.08.13.08.46.51 for (Google Transport Security); Mon, 13 Aug 2018 08:46:52 -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: AA+uWPzMA2PvUY8i1r5SW2wkOyWuIfKfLLL95ZgemXZAAnKsGp68R673Wz3lCcQ2K36YkaElSEfQ4Q== X-Received: by 2002:a1c:be13:: with SMTP id o19-v6mr7927383wmf.1.1534175211653; Mon, 13 Aug 2018 08:46:51 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id t6-v6sm11123934wmf.8.2018.08.13.08.46.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Aug 2018 08:46:50 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 0165412485F; Mon, 13 Aug 2018 17:46:48 +0200 (CEST) From: osalvador@techadventures.net To: akpm@linux-foundation.org Cc: mhocko@suse.com, dan.j.williams@intel.com, jglisse@redhat.com, rafael@kernel.org, david@redhat.com, yasu.isimatu@gmail.com, logang@deltatee.com, dave.jiang@intel.com, Jonathan.Cameron@huawei.com, vbabka@suse.cz, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Oscar Salvador Subject: [PATCH v2 3/3] mm/memory_hotplug: Refactor unregister_mem_sect_under_nodes Date: Mon, 13 Aug 2018 17:46:39 +0200 Message-Id: <20180813154639.19454-4-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180813154639.19454-1-osalvador@techadventures.net> References: <20180813154639.19454-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 unregister_mem_sect_under_nodes() tries to allocate a nodemask_t in order to check whithin the loop which nodes have already been unlinked, so we do not repeat the operation on them. NODEMASK_ALLOC calls kmalloc() if NODES_SHIFT > 8, otherwise it just declares a nodemask_t variable whithin the stack. Since kamlloc() can fail, we actually check whether NODEMASK_ALLOC failed or not, and we return -ENOMEM accordingly. remove_memory_section() does not check for the return value though. The problem with this is that if we return -ENOMEM, it means that unregister_mem_sect_under_nodes will not be able to remove the symlinks, but since we do not check the return value, we go ahead and we call unregister_memory(), which will remove all the mem_blks directories. This will leave us with dangled symlinks. The easiest way to overcome this is to fallback by calling sysfs_remove_link() unconditionally in case NODEMASK_ALLOC failed. This means that we will call sysfs_remove_link on nodes that have been already unlinked, but nothing wrong happens as sysfs_remove_link() backs off somewhere down the chain in case the link has already been removed. I think that this is better than a) dangled symlinks b) having to recovery from such error in remove_memory_section Since from now on we will not need to take care about return values, we can make the function void. While at it, we can also drop the node_online() check, as a node can only be offline if all the memory/cpus associated with it have been removed. As we have a safe fallback, one thing that could also be done is to add __GFP_NORETRY in the flags when calling NODEMASK_ALLOC, so we do not retry. Signed-off-by: Oscar Salvador --- drivers/base/node.c | 26 +++++++++++++++----------- include/linux/node.h | 5 ++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index dd3bdab230b2..0a3ca62687ea 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -449,35 +449,39 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, void *arg) } /* unregister memory section under all nodes that it spans */ -int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, +void unregister_mem_sect_under_nodes(struct memory_block *mem_blk, unsigned long phys_index) { NODEMASK_ALLOC(nodemask_t, unlinked_nodes, GFP_KERNEL); unsigned long pfn, sect_start_pfn, sect_end_pfn; - if (!unlinked_nodes) - return -ENOMEM; - nodes_clear(*unlinked_nodes); + if (unlinked_nodes) + 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; + int nid = get_nid_for_pfn(pfn);; - nid = get_nid_for_pfn(pfn); if (nid < 0) continue; - if (!node_online(nid)) - continue; - if (node_test_and_set(nid, *unlinked_nodes)) + /* + * It is possible that NODEMASK_ALLOC fails due to memory pressure. + * If that happens, we fallback to call sysfs_remove_link unconditionally. + * Nothing wrong will happen as sysfs_remove_link will back off + * somewhere down the chain in case the link has already been removed. + */ + if (unlinked_nodes && node_test_and_set(nid, *unlinked_nodes)) continue; + sysfs_remove_link(&node_devices[nid]->dev.kobj, kobject_name(&mem_blk->dev.kobj)); sysfs_remove_link(&mem_blk->dev.kobj, kobject_name(&node_devices[nid]->dev.kobj)); } - NODEMASK_FREE(unlinked_nodes); - return 0; + + if (unlinked_nodes) + NODEMASK_FREE(unlinked_nodes); } int link_mem_sections(int nid, unsigned long start_pfn, unsigned long end_pfn) diff --git a/include/linux/node.h b/include/linux/node.h index 257bb3d6d014..1203378e596a 100644 --- a/include/linux/node.h +++ b/include/linux/node.h @@ -72,7 +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, +extern void unregister_mem_sect_under_nodes(struct memory_block *mem_blk, unsigned long phys_index); #ifdef CONFIG_HUGETLBFS @@ -105,10 +105,9 @@ 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, +static inline void unregister_mem_sect_under_nodes(struct memory_block *mem_blk, unsigned long phys_index) { - return 0; } static inline void register_hugetlbfs_with_node(node_registration_func_t reg,