From patchwork Wed Jun 19 04:17:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 11003309 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 28700924 for ; Wed, 19 Jun 2019 04:17:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17F4D28A9D for ; Wed, 19 Jun 2019 04:17:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C45E28AB1; Wed, 19 Jun 2019 04:17:44 +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 60EA428A9D for ; Wed, 19 Jun 2019 04:17:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 786E16B0005; Wed, 19 Jun 2019 00:17:42 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 737F48E0002; Wed, 19 Jun 2019 00:17:42 -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 64FE28E0001; Wed, 19 Jun 2019 00:17:42 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by kanga.kvack.org (Postfix) with ESMTP id 191816B0005 for ; Wed, 19 Jun 2019 00:17:42 -0400 (EDT) Received: by mail-ed1-f69.google.com with SMTP id o13so24285487edt.4 for ; Tue, 18 Jun 2019 21:17:42 -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=mk7z2bflQrQ5U619V8n7hxrKZ5DzGqpWnNox93l8SO4=; b=evKFKArCpohg9iJ3tMW4zfmgyS2ZAe8C6f22kExqTXECHlU1cV3N3g83HZjS+Tagik B20bF3bu4ZV5nFNE/hSVVvz5xPsQbCIb3GG2UvWog6IJG1LNnofAeqLGh+RBl8aTrCST dqo0seV0AbSJKKUbTrrhHkpPGTt5eVqGdV+PjK8CGKKTd5ukWzlxfm6fdkCF4sWB5y5E JZW2M+mVqMgJk1p6YOiuiNWPkB0+xpcuRuQ42WVuB7cczVxe0q6q4qRv3sP9+HztYGh+ nWY++YEupZpG5tB+zkYnY55gCPKUSBe3fIkWnWZxGYtJBx961SIIaH2mKZ2yoJb4OZBU ww8A== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com X-Gm-Message-State: APjAAAVGEcJBPhzh1docrYxqhdlVvvf6OPQKTvQRX5jBCjSMdHjBdABo aDeVhMT68lvkVGzWFKa0vbqbfhJf4VkWaZ4KQl1vicvth9SVQh5BhFM9ENbMJkni1kInYvjrUbH GaIUQc1CPqS33ieGp0Ufy8RnpiFNPsu/FNrpv3hyeIjM1/J7C7+B2ahKURUF8NB1AYg== X-Received: by 2002:aa7:ca41:: with SMTP id j1mr75412148edt.149.1560917861596; Tue, 18 Jun 2019 21:17:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqyA3vJaOgl4sba0+ZNjzE9BfZtRqBN++AKwmxlZ/PN2cuNh1oecE4Vddv0fvUIAbtHwcB87 X-Received: by 2002:aa7:ca41:: with SMTP id j1mr75412063edt.149.1560917860185; Tue, 18 Jun 2019 21:17:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560917860; cv=none; d=google.com; s=arc-20160816; b=EgdK0lHKOJOP5W60RMscv4KVtaidJyGclx8F8/nPGxzXZOtYqFgIxvNw8wesVJKMmL Cm3wY9iLTgHFLzCAlFQ2vNp3+AKNcGSkQI2uA0ae8n9gkjRXY7WclK07G+fnYzIITYm6 NG7pOH9Jny/tavZZOU3ebymff6aLMpDr4FHbaauB9quGio8sBZVWfs4etKp1s44eew/a AzhfFpPAVrMU8v/mw1Gs5hIJzTWAdNnubY6geV1PFyZmpxskr/tIWeRmvjvo4mr5tBSv K/ByQMMbC3NaTsp7jMSeMdv4W32/SBm/rWKLE+TYT/RZlu/i/5EIsMn5V6MvjQuqqMhk 0alQ== 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=mk7z2bflQrQ5U619V8n7hxrKZ5DzGqpWnNox93l8SO4=; b=bXOC98TVxohU2HFmjUcLmhdSPjnBX7uC9vU8enc5EME+tHeEZeTjwCimro4wgi4+3O Ty8YySAa84XGfodKu9WYdLC9QKmSwbsqI+EONc4ubT7Mrg47KGsVLhf1HiBtiwptbAGz Evr6X3SLwN7iMXMLM8t/eYvGGwbdAfpNDxAa9rAFEUyotZH/7zo1shLw4NIZb7K7rpCo xUulFyYEomF1u/IkFHh/fmHFcbhoz2eD08oukmSX5Qvc0YjnuaShr/jeWaET6INBZJGb aMcHUDTk1xkvyHOPo5jRRc85S+o5a0xS15i0glqjLNtjNMSBN+Zsa5zHvvlTXfJ2sS/y sl1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com Received: from foss.arm.com (foss.arm.com. [217.140.110.172]) by mx.google.com with ESMTP id e28si13195245edb.265.2019.06.18.21.17.39 for ; Tue, 18 Jun 2019 21:17:40 -0700 (PDT) Received-SPF: pass (google.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) client-ip=217.140.110.172; Authentication-Results: mx.google.com; spf=pass (google.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3BF37360; Tue, 18 Jun 2019 21:17:39 -0700 (PDT) Received: from p8cg001049571a15.blr.arm.com (p8cg001049571a15.blr.arm.com [10.162.43.130]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 72C793F718; Tue, 18 Jun 2019 21:17:32 -0700 (PDT) From: Anshuman Khandual To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, akpm@linux-foundation.org, catalin.marinas@arm.com, will.deacon@arm.com Cc: mark.rutland@arm.com, mhocko@suse.com, ira.weiny@intel.com, david@redhat.com, cai@lca.pw, logang@deltatee.com, james.morse@arm.com, cpandya@codeaurora.org, arunks@codeaurora.org, dan.j.williams@intel.com, mgorman@techsingularity.net, osalvador@suse.de, ard.biesheuvel@arm.com, steve.capper@arm.com Subject: [PATCH V6 1/3] mm/hotplug: Reorder memblock_[free|remove]() calls in try_remove_memory() Date: Wed, 19 Jun 2019 09:47:38 +0530 Message-Id: <1560917860-26169-2-git-send-email-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1560917860-26169-1-git-send-email-anshuman.khandual@arm.com> References: <1560917860-26169-1-git-send-email-anshuman.khandual@arm.com> 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 Memory hot remove uses get_nid_for_pfn() while tearing down linked sysfs entries between memory block and node. It first checks pfn validity with pfn_valid_within() before fetching nid. With CONFIG_HOLES_IN_ZONE config (arm64 has this enabled) pfn_valid_within() calls pfn_valid(). pfn_valid() is an arch implementation on arm64 (CONFIG_HAVE_ARCH_PFN_VALID) which scans all mapped memblock regions with memblock_is_map_memory(). This creates a problem in memory hot remove path which has already removed given memory range from memory block with memblock_[remove|free] before arriving at unregister_mem_sect_under_nodes(). Hence get_nid_for_pfn() returns -1 skipping subsequent sysfs_remove_link() calls leaving node <-> memory block sysfs entries as is. Subsequent memory add operation hits BUG_ON() because of existing sysfs entries. [ 62.007176] NUMA: Unknown node for memory at 0x680000000, assuming node 0 [ 62.052517] ------------[ cut here ]------------ [ 62.053211] kernel BUG at mm/memory_hotplug.c:1143! [ 62.053868] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP [ 62.054589] Modules linked in: [ 62.054999] CPU: 19 PID: 3275 Comm: bash Not tainted 5.1.0-rc2-00004-g28cea40b2683 #41 [ 62.056274] Hardware name: linux,dummy-virt (DT) [ 62.057166] pstate: 40400005 (nZcv daif +PAN -UAO) [ 62.058083] pc : add_memory_resource+0x1cc/0x1d8 [ 62.058961] lr : add_memory_resource+0x10c/0x1d8 [ 62.059842] sp : ffff0000168b3ce0 [ 62.060477] x29: ffff0000168b3ce0 x28: ffff8005db546c00 [ 62.061501] x27: 0000000000000000 x26: 0000000000000000 [ 62.062509] x25: ffff0000111ef000 x24: ffff0000111ef5d0 [ 62.063520] x23: 0000000000000000 x22: 00000006bfffffff [ 62.064540] x21: 00000000ffffffef x20: 00000000006c0000 [ 62.065558] x19: 0000000000680000 x18: 0000000000000024 [ 62.066566] x17: 0000000000000000 x16: 0000000000000000 [ 62.067579] x15: ffffffffffffffff x14: ffff8005e412e890 [ 62.068588] x13: ffff8005d6b105d8 x12: 0000000000000000 [ 62.069610] x11: ffff8005d6b10490 x10: 0000000000000040 [ 62.070615] x9 : ffff8005e412e898 x8 : ffff8005e412e890 [ 62.071631] x7 : ffff8005d6b105d8 x6 : ffff8005db546c00 [ 62.072640] x5 : 0000000000000001 x4 : 0000000000000002 [ 62.073654] x3 : ffff8005d7049480 x2 : 0000000000000002 [ 62.074666] x1 : 0000000000000003 x0 : 00000000ffffffef [ 62.075685] Process bash (pid: 3275, stack limit = 0x00000000d754280f) [ 62.076930] Call trace: [ 62.077411] add_memory_resource+0x1cc/0x1d8 [ 62.078227] __add_memory+0x70/0xa8 [ 62.078901] probe_store+0xa4/0xc8 [ 62.079561] dev_attr_store+0x18/0x28 [ 62.080270] sysfs_kf_write+0x40/0x58 [ 62.080992] kernfs_fop_write+0xcc/0x1d8 [ 62.081744] __vfs_write+0x18/0x40 [ 62.082400] vfs_write+0xa4/0x1b0 [ 62.083037] ksys_write+0x5c/0xc0 [ 62.083681] __arm64_sys_write+0x18/0x20 [ 62.084432] el0_svc_handler+0x88/0x100 [ 62.085177] el0_svc+0x8/0xc Re-ordering memblock_[free|remove]() with arch_remove_memory() solves the problem on arm64 as pfn_valid() behaves correctly and returns positive as memblock for the address range still exists. arch_remove_memory() removes applicable memory sections from zone with __remove_pages() and tears down kernel linear mapping. Removing memblock regions afterwards is safe because there is no other memblock (bootmem) allocator user that late. So nobody is going to allocate from the removed range just to blow up later. Also nobody should be using the bootmem allocated range else we wouldn't allow to remove it. So reordering is indeed safe. Reviewed-by: David Hildenbrand Reviewed-by: Oscar Salvador Acked-by: Mark Rutland Acked-by: Michal Hocko Signed-off-by: Anshuman Khandual --- mm/memory_hotplug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index a88c5f3..cfa5fac 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1831,13 +1831,13 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size) /* remove memmap entry */ firmware_map_remove(start, start + size, "System RAM"); - memblock_free(start, size); - memblock_remove(start, size); /* remove memory block devices before removing memory */ remove_memory_block_devices(start, size); arch_remove_memory(nid, start, size, NULL); + memblock_free(start, size); + memblock_remove(start, size); __release_memory_resource(start, size); try_offline_node(nid);