From patchwork Thu Apr 16 22:54:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 11493931 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 E314414DD for ; Thu, 16 Apr 2020 22:54:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B0AD4221F9 for ; Thu, 16 Apr 2020 22:54:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B0AD4221F9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E0EC88E00F4; Thu, 16 Apr 2020 18:54:43 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DBF798E00E7; Thu, 16 Apr 2020 18:54:43 -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 CAE5B8E00F4; Thu, 16 Apr 2020 18:54:43 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0200.hostedemail.com [216.40.44.200]) by kanga.kvack.org (Postfix) with ESMTP id AE9878E00E7 for ; Thu, 16 Apr 2020 18:54:43 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 6FEA61277 for ; Thu, 16 Apr 2020 22:54:43 +0000 (UTC) X-FDA: 76715224446.29.head05_635dca366162c X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,vishal.l.verma@intel.com,,RULES_HIT:30003:30012:30029:30054:30056:30064:30070,0,RBL:192.55.52.88:@intel.com:.lbl8.mailshell.net-62.18.0.100 64.95.201.95,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: head05_635dca366162c X-Filterd-Recvd-Size: 5017 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by imf43.hostedemail.com (Postfix) with ESMTP for ; Thu, 16 Apr 2020 22:54:42 +0000 (UTC) IronPort-SDR: ueCjjeC0hJVUmcvHG/FgiZ0UO54YHkPww9pnWYkj1yTNKlOBi6X7XvJjh0PsRYqo00nMCW9Gil 7r6MduiLh6dA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2020 15:54:41 -0700 IronPort-SDR: +5kXiz2fPl3LokzDvHEi3ihwnQQPNlZ/0wTkEWY/SN4j2cZW5WvllhUK0yzrqa67s9misek07z mSp4JtacKsCw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,392,1580803200"; d="scan'208";a="299441379" Received: from vverma7-mobl4.lm.intel.com ([10.254.27.78]) by FMSMGA003.fm.intel.com with ESMTP; 16 Apr 2020 15:54:40 -0700 From: Vishal Verma To: Cc: , Vishal Verma , Michal Hocko , David Hildenbrand , Dan Williams , Dave Hansen Subject: [PATCH v5] mm/memory_hotplug: refrain from adding memory into an impossible node Date: Thu, 16 Apr 2020 16:54:38 -0600 Message-Id: <20200416225438.15208-1-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.21.1 MIME-Version: 1.0 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: A misbehaving qemu created a situation where the ACPI SRAT table advertised one fewer proximity domains than intended. The NFIT table did describe all the expected proximity domains. This caused the device dax driver to assign an impossible target_node to the device, and when hotplugged as system memory, this would fail with the following signature: [ +0.001627] BUG: kernel NULL pointer dereference, address: 0000000000000088 [ +0.001331] #PF: supervisor read access in kernel mode [ +0.000975] #PF: error_code(0x0000) - not-present page [ +0.000976] PGD 80000001767d4067 P4D 80000001767d4067 PUD 10e0c4067 PMD 0 [ +0.001338] Oops: 0000 [#1] SMP PTI [ +0.000676] CPU: 4 PID: 22737 Comm: kswapd3 Tainted: G O 5.6.0-rc5 #9 [ +0.001457] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014 [ +0.001990] RIP: 0010:prepare_kswapd_sleep+0x7c/0xc0 [ +0.000780] Code: 89 df e8 87 fd ff ff 89 c2 31 c0 84 d2 74 e6 0f 1f 44 00 00 48 8b 05 fb af 7a 01 48 63 93 88 1d 01 00 48 8b 84 d0 20 0f 00 00 <48> 3b 98 88 00 00 00 75 28 f0 80 a0 80 00 00 00 fe f0 80 a3 38 20 [ +0.002877] RSP: 0018:ffffc900017a3e78 EFLAGS: 00010202 [ +0.000805] RAX: 0000000000000000 RBX: ffff8881209e0000 RCX: 0000000000000000 [ +0.001115] RDX: 0000000000000003 RSI: 0000000000000000 RDI: ffff8881209e0e80 [ +0.001098] RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000008000 [ +0.001092] R10: 0000000000000000 R11: 0000000000000003 R12: 0000000000000003 [ +0.001092] R13: 0000000000000003 R14: 0000000000000000 R15: ffffc900017a3ec8 [ +0.001091] FS: 0000000000000000(0000) GS:ffff888318c00000(0000) knlGS:0000000000000000 [ +0.001275] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ +0.000882] CR2: 0000000000000088 CR3: 0000000120b50002 CR4: 00000000001606e0 [ +0.001095] Call Trace: [ +0.000388] kswapd+0x103/0x520 [ +0.000494] ? finish_wait+0x80/0x80 [ +0.000547] ? balance_pgdat+0x5a0/0x5a0 [ +0.000607] kthread+0x120/0x140 [ +0.000508] ? kthread_create_on_node+0x60/0x60 [ +0.000706] ret_from_fork+0x3a/0x50 Add a check in the add_memory path to fail if the node to which we are adding memory is in the node_possible_map Cc: Michal Hocko Cc: David Hildenbrand Cc: Dan Williams Cc: Dave Hansen Acked-by: David Hildenbrand Signed-off-by: Vishal Verma Acked-by: Michal Hocko --- mm/memory_hotplug.c | 5 +++++ 1 file changed, 5 insertions(+) v2: - Centralize the check in the add_memory path (David) - Instead of failing, add the memory to a nearby node, while warning (and tainting) to call out attention to the firmware bug (Dan) v3: - Fix the CONFIG_NUMA=n case, and use node 0 as the final fallback (Dan) v4: - Error out instead of being smart about picking a node that wasn't asked for (Michal) v5: - Change the return code to -EINVAL (David) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 0a54ffac8c68..e07b80d149db 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1005,6 +1005,11 @@ int __ref add_memory_resource(int nid, struct resource *res) if (ret) return ret; + if (!node_possible(nid)) { + WARN(1, "node %d was absent from the node_possible_map\n", nid); + return -EINVAL; + } + mem_hotplug_begin(); /*