From patchwork Mon Sep 16 05:47:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 11146361 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 075791745 for ; Mon, 16 Sep 2019 05:47:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D2DC520890 for ; Mon, 16 Sep 2019 05:47:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2DC520890 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6FFD06B0005; Mon, 16 Sep 2019 01:47:45 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 688756B0006; Mon, 16 Sep 2019 01:47:45 -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 54FEE6B0007; Mon, 16 Sep 2019 01:47:45 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0146.hostedemail.com [216.40.44.146]) by kanga.kvack.org (Postfix) with ESMTP id 2DCDA6B0005 for ; Mon, 16 Sep 2019 01:47:45 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id C35341F10 for ; Mon, 16 Sep 2019 05:47:44 +0000 (UTC) X-FDA: 75939702048.18.pan28_7d81a262ecc28 X-Spam-Summary: 2,0,0,07b0bbfa7509c29e,d41d8cd98f00b204,anshuman.khandual@arm.com,::akpm@linux-foundation.org:linux-kernel@vger.kernel.org:anshuman.khandual@arm.com:osalvador@suse.de:mhocko@suse.com:david@redhat.com:pasha.tatashin@soleen.com:dan.j.williams@intel.com,RULES_HIT:41:355:379:541:560:800:960:965:966:967:968:973:988:989:1260:1261:1345:1431:1437:1534:1541:1711:1730:1747:1777:1792:1963:2196:2198:2199:2200:2380:2393:2525:2559:2564:2682:2685:2731:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3352:3865:3867:3868:3870:3871:3872:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4385:4390:4395:5007:6261:8603:8634:8985:9025:9389:10004:11026:11232:11658:11914:12043:12297:12438:12555:12895:12986:13069:13141:13161:13229:13230:13255:13311:13357:13972:14096:14181:14384:14394:14721:21080:21212:21451:21627:21740:21788:30054:30064,0,RBL:error,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:neutral, Custom_r X-HE-Tag: pan28_7d81a262ecc28 X-Filterd-Recvd-Size: 3167 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Mon, 16 Sep 2019 05:47:42 +0000 (UTC) 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 5E2D4337; Sun, 15 Sep 2019 22:47:41 -0700 (PDT) Received: from p8cg001049571a15.blr.arm.com (p8cg001049571a15.blr.arm.com [10.162.43.143]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 6DF843F67D; Sun, 15 Sep 2019 22:50:08 -0700 (PDT) From: Anshuman Khandual To: linux-mm@kvack.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org Cc: Anshuman Khandual , Oscar Salvador , Michal Hocko , David Hildenbrand , Pavel Tatashin , Dan Williams Subject: [PATCH] mm/hotplug: Reorder memblock_[free|remove]() calls in try_remove_memory() Date: Mon, 16 Sep 2019 11:17:37 +0530 Message-Id: <1568612857-10395-1-git-send-email-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.7.4 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: In add_memory_resource() the memory range to be hot added first gets into the memblock via memblock_add() before arch_add_memory() is called on it. Reverse sequence should be followed during memory hot removal which already is being followed in add_memory_resource() error path. This now ensures required re-order between memblock_[free|remove]() and arch_remove_memory() during memory hot-remove. Cc: Andrew Morton Cc: Oscar Salvador Cc: Michal Hocko Cc: David Hildenbrand Cc: Pavel Tatashin Cc: Dan Williams Signed-off-by: Anshuman Khandual --- Original patch https://lkml.org/lkml/2019/9/3/327 Memory hot remove now works on arm64 without this because a recent commit 60bb462fc7ad ("drivers/base/node.c: simplify unregister_memory_block_under_nodes()"). David mentioned that re-ordering should still make sense for consistency purpose (removing stuff in the reverse order they were added). This patch is now detached from arm64 hot-remove series. https://lkml.org/lkml/2019/9/3/326 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 c73f09913165..355c466e0621 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1770,13 +1770,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);