From patchwork Wed Aug 12 01:32:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 11709959 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 521311392 for ; Wed, 12 Aug 2020 01:32:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1FE2C207DA for ; Wed, 12 Aug 2020 01:32:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="LAwYKXOa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1FE2C207DA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0DCFB8D0012; Tue, 11 Aug 2020 21:32:24 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0669B8D0001; Tue, 11 Aug 2020 21:32:24 -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 EC1598D0012; Tue, 11 Aug 2020 21:32:23 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0156.hostedemail.com [216.40.44.156]) by kanga.kvack.org (Postfix) with ESMTP id D368F8D0001 for ; Tue, 11 Aug 2020 21:32:23 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 993BB1F1B for ; Wed, 12 Aug 2020 01:32:23 +0000 (UTC) X-FDA: 77140191366.06.bag18_4405ea426fe7 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin06.hostedemail.com (Postfix) with ESMTP id 6F765100A00FF for ; Wed, 12 Aug 2020 01:32:23 +0000 (UTC) X-Spam-Summary: 1,0,0,ca4a330e24bdd66f,d41d8cd98f00b204,akpm@linux-foundation.org,,RULES_HIT:41:355:379:800:960:967:968:973:988:989:1260:1263:1345:1359:1381:1431:1437:1534:1542:1711:1730:1747:1777:1792:2194:2199:2393:2525:2559:2563:2682:2685:2693:2741:2859:2902:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3167:3353:3865:3870:3871:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4043:4321:5007:6261:6653:6737:6738:7514:7576:8599:8603:8660:9025:9545:10004:10913:11026:11658:11914:12043:12048:12114:12297:12438:12517:12519:12533:12555:12679:12783:12986:13148:13161:13229:13230:13846:13972:14181:14721:14849:21080:21451:21627:21939:21987:21990:30054:30064,0,RBL:198.145.29.99:@linux-foundation.org:.lbl8.mailshell.net-64.100.201.201 62.2.0.100;04y8u3h7kqbx9wgp8czt4sjsx1trgycttx5en5s6fa1spk5dpgymg5pite4gcnr.619fjxby1pw961fwnipkssohtdfzej57z94ce8wasdkf1odjdwdonskoeq4cnj3.e-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,Dom ainCache X-HE-Tag: bag18_4405ea426fe7 X-Filterd-Recvd-Size: 4753 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf48.hostedemail.com (Postfix) with ESMTP for ; Wed, 12 Aug 2020 01:32:22 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D77882177B; Wed, 12 Aug 2020 01:32:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597195942; bh=boL723HFlKPeQUmyInhTe/1F3d+p26Pcj7VRVBZ7a/Q=; h=Date:From:To:Subject:In-Reply-To:From; b=LAwYKXOacluYMmVMRif/sbL0GW4PD50wBxwM2cxuCnmFO/PGmpSJ5e1qtotAinq6F 48BIIjgGfVu1Qd1ubnhEegwvwH9VFv6JLqJGR7n4mF0cMNbbNr+FaI2L7ssW5FR4Yk SUKEwTLjcWedmQIvrUBfJsXk9+pTiga/vGtUWKhE= Date: Tue, 11 Aug 2020 18:32:20 -0700 From: Andrew Morton To: akpm@linux-foundation.org, bhe@redhat.com, bp@alien8.de, catalin.marinas@arm.com, dalias@libc.org, dan.j.williams@intel.com, dave.hansen@linux.intel.com, dave.jiang@intel.com, david@redhat.com, fenghua.yu@intel.com, hpa@zytor.com, hslester96@gmail.com, Jonathan.Cameron@Huawei.com, justin.he@arm.com, Kaly.Xin@arm.com, linux-mm@kvack.org, logang@deltatee.com, luto@kernel.org, masahiroy@kernel.org, mhocko@suse.com, mingo@redhat.com, mm-commits@vger.kernel.org, peterz@infradead.org, rppt@linux.ibm.com, stable@vger.kernel.org, tglx@linutronix.de, tony.luck@intel.com, torvalds@linux-foundation.org, vishal.l.verma@intel.com, will@kernel.org, ysato@users.sourceforge.jp Subject: [patch 039/165] mm/memory_hotplug: fix unpaired mem_hotplug_begin/done Message-ID: <20200812013220.FYpr8nClh%akpm@linux-foundation.org> In-Reply-To: <20200811182949.e12ae9a472e3b5e27e16ad6c@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Queue-Id: 6F765100A00FF X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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: From: Jia He Subject: mm/memory_hotplug: fix unpaired mem_hotplug_begin/done When check_memblock_offlined_cb() returns failed rc(e.g. the memblock is online at that time), mem_hotplug_begin/done is unpaired in such case. Therefore a warning: Call Trace: percpu_up_write+0x33/0x40 try_remove_memory+0x66/0x120 ? _cond_resched+0x19/0x30 remove_memory+0x2b/0x40 dev_dax_kmem_remove+0x36/0x72 [kmem] device_release_driver_internal+0xf0/0x1c0 device_release_driver+0x12/0x20 bus_remove_device+0xe1/0x150 device_del+0x17b/0x3e0 unregister_dev_dax+0x29/0x60 devm_action_release+0x15/0x20 release_nodes+0x19a/0x1e0 devres_release_all+0x3f/0x50 device_release_driver_internal+0x100/0x1c0 driver_detach+0x4c/0x8f bus_remove_driver+0x5c/0xd0 driver_unregister+0x31/0x50 dax_pmem_exit+0x10/0xfe0 [dax_pmem] Link: http://lkml.kernel.org/r/20200710031619.18762-3-justin.he@arm.com Fixes: f1037ec0cc8a ("mm/memory_hotplug: fix remove_memory() lockdep splat") Signed-off-by: Jia He Reviewed-by: David Hildenbrand Acked-by: Michal Hocko Acked-by: Dan Williams Cc: [5.6+] Cc: Andy Lutomirski Cc: Baoquan He Cc: Borislav Petkov Cc: Catalin Marinas Cc: Chuhong Yuan Cc: Dave Hansen Cc: Dave Jiang Cc: Fenghua Yu Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Jonathan Cameron Cc: Kaly Xin Cc: Logan Gunthorpe Cc: Masahiro Yamada Cc: Mike Rapoport Cc: Peter Zijlstra Cc: Rich Felker Cc: Thomas Gleixner Cc: Tony Luck Cc: Vishal Verma Cc: Will Deacon Cc: Yoshinori Sato Signed-off-by: Andrew Morton --- mm/memory_hotplug.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/mm/memory_hotplug.c~mm-memory_hotplug-fix-unpaired-mem_hotplug_begin-done +++ a/mm/memory_hotplug.c @@ -1757,7 +1757,7 @@ static int __ref try_remove_memory(int n */ rc = walk_memory_blocks(start, size, NULL, check_memblock_offlined_cb); if (rc) - goto done; + return rc; /* remove memmap entry */ firmware_map_remove(start, start + size, "System RAM"); @@ -1781,9 +1781,8 @@ static int __ref try_remove_memory(int n try_offline_node(nid); -done: mem_hotplug_done(); - return rc; + return 0; } /**