From patchwork Wed Nov 1 22:51:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 13443102 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81F9EC4167B for ; Wed, 1 Nov 2023 22:52:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 14B9D8D006B; Wed, 1 Nov 2023 18:52:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0FBFA8D0050; Wed, 1 Nov 2023 18:52:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE0D58D006B; Wed, 1 Nov 2023 18:52:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id DA9E78D0050 for ; Wed, 1 Nov 2023 18:52:30 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B281A1201C2 for ; Wed, 1 Nov 2023 22:52:30 +0000 (UTC) X-FDA: 81410886060.17.9F35634 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by imf21.hostedemail.com (Postfix) with ESMTP id 82DAD1C0014 for ; Wed, 1 Nov 2023 22:52:27 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JuOv33mp; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf21.hostedemail.com: domain of vishal.l.verma@intel.com designates 192.198.163.7 as permitted sender) smtp.mailfrom=vishal.l.verma@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698879147; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=zzMhYvJnkemfZMH9qCM5Cd7iPomAieby6YrwPqfCLLk=; b=8jWwJWf6hbFmSoTqVxvteoq6TJ9r822ALrrSCRjCV78i5GsZATvpiwVkgx8RzCMJLGwjx0 m9tSrGZTZX9gYsQCTsUUyqyjEn0uOuL/WSngbo26ep/8yTFczfxP458afQVl7JRbFrdWEB 3UpSjWJOojeeKiNf7LRYksRYPMcfx5s= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JuOv33mp; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf21.hostedemail.com: domain of vishal.l.verma@intel.com designates 192.198.163.7 as permitted sender) smtp.mailfrom=vishal.l.verma@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698879147; a=rsa-sha256; cv=none; b=XzI24F6MyCcdDhWNOiAPY2GyVAZ3h1FEqUT2DM1mnjhAquNzMmqZXK5TFNlsdPA9Z/ioH+ C+eTQMyHcJ4eIFqIlFbLpld2SosjZdQizdgA6Haw3vxgpBqyX1UdfwWGc6yz5TwssQ4viO 3htzQ/+9zMjQWinasEsYHVpwOct43R4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698879148; x=1730415148; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=hEIpF+H2iWRMoZGPvwzbL8B1g/l212Q9ts7SomwLAKg=; b=JuOv33mp12TMEyn9LZD33kNvRy+jOKwSEQIHJY8it/LwPCqQ01K5efno 5h30Of4hUt9SlykY0s8MWpdsVy/4f1Vi4iIZD4OLJvZ/CjIW/YYQuYPlL Y17C/sbRvxlubQYR5BxZF+PVginMqTxjEnoKNapsQCDZ0PU2gKaVIZUJN CwhrW5JaJlUMugUJOK0cKWMVoRh2Gty0HifycpzbaBb3A8HKfqQ90ewSC 8o6kXiSkTedRW0rxWcpEFs3pcINz3LO0xnq0cnoG6iqhw/zrxWBLrPIf7 rx4mzhuzTWAEIM9+bsRyf2L5MUO9ajAhb+Yi3Dci0aQymlnfzSOd+UX6C Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10881"; a="10133611" X-IronPort-AV: E=Sophos;i="6.03,269,1694761200"; d="scan'208";a="10133611" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2023 15:52:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10881"; a="796033557" X-IronPort-AV: E=Sophos;i="6.03,269,1694761200"; d="scan'208";a="796033557" Received: from dgopalan-mobl.amr.corp.intel.com (HELO [192.168.1.200]) ([10.212.98.103]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2023 15:52:22 -0700 From: Vishal Verma Date: Wed, 01 Nov 2023 16:51:51 -0600 Subject: [PATCH v8 1/3] mm/memory_hotplug: replace an open-coded kmemdup() in add_memory_resource() MIME-Version: 1.0 Message-Id: <20231101-vv-kmem_memmap-v8-1-5e4a83331388@intel.com> References: <20231101-vv-kmem_memmap-v8-0-5e4a83331388@intel.com> In-Reply-To: <20231101-vv-kmem_memmap-v8-0-5e4a83331388@intel.com> To: Andrew Morton , David Hildenbrand , Oscar Salvador , Dan Williams , Dave Jiang Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, Huang Ying , Dave Hansen , "Aneesh Kumar K.V" , Michal Hocko , Jonathan Cameron , Jeff Moyer , Vishal Verma X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1362; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=hEIpF+H2iWRMoZGPvwzbL8B1g/l212Q9ts7SomwLAKg=; b=owGbwMvMwCXGf25diOft7jLG02pJDKlO15aG/1KINNWN2ie9r25S157UB9UxN8TOaWyxuKfd8 6hBxsyuo5SFQYyLQVZMkeXvno+Mx+S25/MEJjjCzGFlAhnCwMUpABNhecXwV47p9dUwJv3W+3aV IXtYrjVW8cQ+C77ucvhiidbLafbvFjEyPJQoOd3km/jN6fxxuX8PJ6VO8QkrNSvJWn/FSjhXzS6 dBQA= X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Rspamd-Queue-Id: 82DAD1C0014 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: gjmxpqhdw3by8jngigw6sx675zs9m6g9 X-HE-Tag: 1698879147-365581 X-HE-Meta: U2FsdGVkX18EC+EKxLRu58ENZLkrUtxZMdGqtHV1tymbQGpXRChke9H8dUpZw0f/OiuxmVmGKDMulKiBVHua7wKkTZI61MgZZt+fhb2ZmmCI0HdOd3te4hxdekq9RWt1rZirby1O1bm/KxF1dcDvCU500xwTE5ervnfykeHUqZhG/ZxCHV9T4VN5j+IjGCNenyGX6lFwGdOC7gy531J1gdJ/CcMfn4zQcKlQanntaU8Vt0RhR6NPdeajPZco+zO78gP010hGH1y/iIlXPQVxc1SgckF2agYW57Tn28JQxhoYno0aPLh4k4EBXi9UnPc9QvnG/FFBL01+edOC9RTSJ0Cv17Pxjm67D2TuZmQv6vKqbzl8Ac1Sep/uHIyrer9ZNo2MuInje/Ju8HUCPKeA4W0WMhrQVG/7H1U4qe/zMX9q2Ap2oMxwVhWcdajG11s0JZNroD8hco67nP8cmiOUfPCwYq5OvoBT/1iO0lcsEQbFu6dMYgRFo0n271EQubSaVViJiBi2K+K1/TVip+vSuAcN5P+T+ZmKcm7tBO1fBe0Zji/Aqw/OTy90ud2gOLaAEisTRQX7bCdcfA0bbxvOhpXbCzhXJHe6xyGjLY8tFBwKj9vE2j4WlAIM6fukwQn0bs1/sTGiLs8nxwobKPj2bhD49AkTPfjNbtJETqKo/ebStzxCpJKNl3uZwudqNiA0urvd15hxjsaWdNG3yjIIQRo6T7BHwNWXpZjMC0poimA0bw0GodFVfOOiRw5PuimRJ/hAy9L2579lxlflB3QYyuHgkmzF/PbIfD5WTT18XW+4O3B6bwi7kCfwT6Nr7dkydkf/85FJm1+03n7yguo7RvTF/Kp2h0lLzjKzrOJhYK1+9JD+9Zs9ajWpj+XFnAsSPeJZ0vQUtZLU4GAJDEzPFxGdR4+Qt1NcHiTrfWuJSQzrzAL4MQ/f2TaESBmzD8cR546nKPLipQJ1ZJ5PBWR 4I05Sjbp Iw2H1W0IrVQjj8nwvUJnCqpA/eTVOaeYJ5hrcJDL1+NjLdgGXpDvGtPHQPQ13pHoG+5aRFb9ySN6p5GNYkY9gT0mIA5uxoq0yjP34cTRs7R9h6EJioeqNoeWXpZvUsFlxuwnmHLQRJI1Bz57rIzYlxe0NL9td9KXGim3SMoCQL3iewnkokLhpnvaAur/nCTsgTqE72Ase8yMb+5AHzpblJyBWrBqNI9VRWCk/PfwJPhDyJmtovMSkDs8pkrwuTYO+5azAVKc4FIQ88SeCZICKuTzskNDVv5PGn5rIxu++KAHHNu5YhEa9ubInSs4m6lyXOJCIPmy0jImpucUc8eSuyz7FZW+c5+5wYtss 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: List-Subscribe: List-Unsubscribe: A review of the memmap_on_memory modifications to add_memory_resource() revealed an instance of an open-coded kmemdup(). Replace it with kmemdup(). Cc: Andrew Morton Cc: David Hildenbrand Cc: Michal Hocko Cc: Oscar Salvador Cc: Dan Williams Reported-by: Dan Williams Reviewed-by: David Hildenbrand Signed-off-by: Vishal Verma Reviewed-by: Fan Ni --- mm/memory_hotplug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index f8d3e7427e32..6be7de9efa55 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1439,11 +1439,11 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) if (mhp_flags & MHP_MEMMAP_ON_MEMORY) { if (mhp_supports_memmap_on_memory(size)) { mhp_altmap.free = memory_block_memmap_on_memory_pages(); - params.altmap = kmalloc(sizeof(struct vmem_altmap), GFP_KERNEL); + params.altmap = kmemdup(&mhp_altmap, + sizeof(struct vmem_altmap), + GFP_KERNEL); if (!params.altmap) goto error; - - memcpy(params.altmap, &mhp_altmap, sizeof(mhp_altmap)); } /* fallback to not using altmap */ } From patchwork Wed Nov 1 22:51:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 13443101 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17F19C4332F for ; Wed, 1 Nov 2023 22:52:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0FF5A8000A; Wed, 1 Nov 2023 18:52:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0AEC680009; Wed, 1 Nov 2023 18:52:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DCCC78000A; Wed, 1 Nov 2023 18:52:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id C7E0780009 for ; Wed, 1 Nov 2023 18:52:31 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 9FD5080D7A for ; Wed, 1 Nov 2023 22:52:31 +0000 (UTC) X-FDA: 81410886102.08.4AD0329 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by imf08.hostedemail.com (Postfix) with ESMTP id 5A075160007 for ; Wed, 1 Nov 2023 22:52:28 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=hDiybSgR; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf08.hostedemail.com: domain of vishal.l.verma@intel.com designates 192.198.163.7 as permitted sender) smtp.mailfrom=vishal.l.verma@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698879148; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Q7ESwh9rtjcoQmdVGOo+L8ufrxRXKNLq3PNBzZ/WV7A=; b=jlZkWLcCRLemB6v/wzfh5e3eTYdNBSvGXUkII6FkuxBXw5PKIckyMCiuskYAn6Ztw7wnu1 7+lZNHVCbfH53SNe8PwHxVthhHzL+2u2+uFT6y/JH9LJyqq8rqNNbR5VyuSSpbEO5nL6pE QOSGCe6WKjEFDzak+D3bZyEfKqU37ro= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=hDiybSgR; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf08.hostedemail.com: domain of vishal.l.verma@intel.com designates 192.198.163.7 as permitted sender) smtp.mailfrom=vishal.l.verma@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698879148; a=rsa-sha256; cv=none; b=MNxxVOoE5NFISq0E/BvC6GwgjihnfNJDo8Y74zdi8UfG/YYQQ49lwvp172LelQxDAzfgIm vbkhIK2IUPWU0md+ITsx7/lwcmvTTMUr+yA7X06UFxKaKHV1v9JK5fO0rZTwTqMnvNv3LF 4yhYuL+0v1QPcDxHK52loSkDWFccqqc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698879149; x=1730415149; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=BJVpsauM2TFedbmnVw8A0R+ub3n3nKsAxG13LldkcLQ=; b=hDiybSgRzcd07jrjJjKP+UD+k+46B5fjVLM2SXsRgJ7lF+7PUh6T9b0G f4arUuXaA0791uJCrfpFummf5C1HMQwFzRbEGSqgo/MqDGT77sOr02/i9 CFE5VUxxxassQUbAU3ZsgBt5JFpJnF6e8nepsRtTQHKJ7HadRePWNNlJq OLOQgrrs2nfMFHXDCMhFFa5/tYG2TW5Lf2Z2NfZWeyEdHXJKxG6cEorm8 D0/87eraPnpujznBhcdS3vjPRaeOKF72eXs0isgeFAcCdGqGq6uepXazh BiJci3wjk5Rh/gQbbm85fqR9nrghJtdUG+QgX5J6iGMeDWEWoVo9VnhWS Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10881"; a="10133621" X-IronPort-AV: E=Sophos;i="6.03,269,1694761200"; d="scan'208";a="10133621" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2023 15:52:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10881"; a="796033560" X-IronPort-AV: E=Sophos;i="6.03,269,1694761200"; d="scan'208";a="796033560" Received: from dgopalan-mobl.amr.corp.intel.com (HELO [192.168.1.200]) ([10.212.98.103]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2023 15:52:24 -0700 From: Vishal Verma Date: Wed, 01 Nov 2023 16:51:52 -0600 Subject: [PATCH v8 2/3] mm/memory_hotplug: split memmap_on_memory requests across memblocks MIME-Version: 1.0 Message-Id: <20231101-vv-kmem_memmap-v8-2-5e4a83331388@intel.com> References: <20231101-vv-kmem_memmap-v8-0-5e4a83331388@intel.com> In-Reply-To: <20231101-vv-kmem_memmap-v8-0-5e4a83331388@intel.com> To: Andrew Morton , David Hildenbrand , Oscar Salvador , Dan Williams , Dave Jiang Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, Huang Ying , Dave Hansen , "Aneesh Kumar K.V" , Michal Hocko , Jonathan Cameron , Jeff Moyer , Vishal Verma X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=9997; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=BJVpsauM2TFedbmnVw8A0R+ub3n3nKsAxG13LldkcLQ=; b=owGbwMvMwCXGf25diOft7jLG02pJDKlO15aW76v3ijU/JueX8Xdj51lPnkr2sOPGN1YzR9o3B HLZ34jrKGVhEONikBVTZPm75yPjMbnt+TyBCY4wc1iZQIYwcHEKwERydjAyHOxeY6nlMmcDX+lX b41bj8ob500vsbYtCf17gfnESV/x84wMu1XSu0oZFYTNZBd+FNl85M20/jc9cV/q9oerm7/8Wt/ EAwA= X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 5A075160007 X-Stat-Signature: ima77j4uodgsrj755gtxxd59ebg7i8c7 X-HE-Tag: 1698879148-127038 X-HE-Meta: U2FsdGVkX1/2IYh+9a5O7WnJ1+1o/ZSYNhgKdaEB9znEqinSze7j7ESH+1cUaNuwcYprgJzyMMiBkBi31yybmoeewgWE1jl1ngDmN/oHpk4lHwnT1dPf2WFPvcdp6dye9BCJq1LAJa5mwndraPMtb7WAjHODbaDrrTXHNLhYnUTYdo3VoEHA7mRgFctXhRfxv7pfW+nCb67/fhooBIIHsZW+7BaS5sC2V3QGixkBE4B/0k+bocqkIg/DljYGYNcap/uS/Qr6BqCNSuuuahNcoxCdOktTpG8ymAp9KvNDH5Fz6TMePb/0eISA6qDli/gDkjr5h0lF0vjAjbq7CbUxUkasEyy7JHU1wIHw2Vp+x1Rxl92XnAqTVs20ojDqV7iBLi/H5XsxFvw/3UmgSKV4QwoBBmO7Y0gJcbE1xfKiA1ax1OsG/hxDORfEEw97rUHqpOe8eSfsa2IGYWlRor+zeYxd7qA02R7CjdTewu6Ex7kiKdx8+dDCL4hykC4KCev38GDgzoU8HsY03E1lovKZiixwG9E6vv+MXuFQ3nOzL8ZWKpBLXSi4bGP3uYID3PA/VGlt1mNT7e/pOPq+0H3l7zJqTWeFR0OF17mB6Cy5nc4gDkfHWzIJILxfPC9W/YpbBAcSuEolQnwWveUarWHAzVhXNdNhFAovKGsQou2eMd74s2qiLiz4ee1Mo/+7S/o2zjzrn3i2p5PUY/FtbNWLigyM2a0Vv4+N79bL9lYTnByPML6gzbkf4NV2UqkDZ6wNdLwwy5qme5uWUtu2pirWn041vCfX3JX9xxXWgoqwcrVU5XjXm/K/c/7cIDV1Tk7gAzC07q5K2IPoBRKcu1RMf0INLOirxKb7P+ntmpeuVG/kuhxp8x0dSlP6KCm6DjC6zzcdLK3c8kfvI4ZOG0xe1rSrLYua2HuE4qPv82YDghTw2CoDJeb2BukaBVrQAxqflkDMzlswfNZSdsNZ84S zR1JW0fQ 9vhQ+Ab8VulPS6ED2Rwi1HCIkLtDi2yB3pnEyRB9d0qPdqngcTDvGlweXdnBGEjuGp/1nJuW+iVGTY6iDix2uCc0Eeg5a9j4itgSuIiF7VT/gWLUSv0FjHg7g5efceBGVOsbLFTtpOgsuV/Dq5lgOtvcpL5R8x8z+CsqlMw4Jf4UPl66RlMyMGroIHEQtkBGCWhP64aa2ucI94NTQFEjSh8TRNj8rNu3PEtdxFqFMJOuyPV4HWj9REnU95o5Q0nOBALWK9FfeIpdoHegxoXYIifizOFNC+xo489ZyaKdcHbA58YfAmPuyuy2Dr12RJcEVIgIK8xuWRvbYXJV7+YpXWl98nQOC9B5ldQqqZB8f7ViCuCnd61UxTSbFbM0OQimnbwHaU7snMTnLqbCdS7hOYVUEdcpol5Nkj5O1qn3AhLIvjpI= 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: List-Subscribe: List-Unsubscribe: The MHP_MEMMAP_ON_MEMORY flag for hotplugged memory is restricted to 'memblock_size' chunks of memory being added. Adding a larger span of memory precludes memmap_on_memory semantics. For users of hotplug such as kmem, large amounts of memory might get added from the CXL subsystem. In some cases, this amount may exceed the available 'main memory' to store the memmap for the memory being added. In this case, it is useful to have a way to place the memmap on the memory being added, even if it means splitting the addition into memblock-sized chunks. Change add_memory_resource() to loop over memblock-sized chunks of memory if caller requested memmap_on_memory, and if other conditions for it are met. Teach try_remove_memory() to also expect that a memory range being removed might have been split up into memblock sized chunks, and to loop through those as needed. This does preclude being able to use PUD mappings in the direct map; a proposal to how this could be optimized in the future is laid out here[1]. [1]: https://lore.kernel.org/linux-mm/b6753402-2de9-25b2-36e9-eacd49752b19@redhat.com/ Cc: Andrew Morton Cc: David Hildenbrand Cc: Michal Hocko Cc: Oscar Salvador Cc: Dan Williams Cc: Dave Jiang Cc: Dave Hansen Cc: Huang Ying Suggested-by: David Hildenbrand Reviewed-by: Dan Williams Signed-off-by: Vishal Verma Acked-by: David Hildenbrand --- mm/memory_hotplug.c | 213 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 138 insertions(+), 75 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 6be7de9efa55..d242e49d7f7b 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1380,6 +1380,84 @@ static bool mhp_supports_memmap_on_memory(unsigned long size) return arch_supports_memmap_on_memory(vmemmap_size); } +static void __ref remove_memory_blocks_and_altmaps(u64 start, u64 size) +{ + unsigned long memblock_size = memory_block_size_bytes(); + u64 cur_start; + + /* + * For memmap_on_memory, the altmaps were added on a per-memblock + * basis; we have to process each individual memory block. + */ + for (cur_start = start; cur_start < start + size; + cur_start += memblock_size) { + struct vmem_altmap *altmap = NULL; + struct memory_block *mem; + + mem = find_memory_block(pfn_to_section_nr(PFN_DOWN(cur_start))); + WARN_ON_ONCE(!mem); + if (!mem) + continue; + + altmap = mem->altmap; + mem->altmap = NULL; + + remove_memory_block_devices(cur_start, memblock_size); + + arch_remove_memory(cur_start, memblock_size, altmap); + + /* Verify that all vmemmap pages have actually been freed. */ + WARN(altmap->alloc, "Altmap not fully unmapped"); + kfree(altmap); + } +} + +static int create_altmaps_and_memory_blocks(int nid, struct memory_group *group, + u64 start, u64 size) +{ + unsigned long memblock_size = memory_block_size_bytes(); + u64 cur_start; + int ret; + + for (cur_start = start; cur_start < start + size; + cur_start += memblock_size) { + struct mhp_params params = { .pgprot = + pgprot_mhp(PAGE_KERNEL) }; + struct vmem_altmap mhp_altmap = { + .base_pfn = PHYS_PFN(cur_start), + .end_pfn = PHYS_PFN(cur_start + memblock_size - 1), + }; + + mhp_altmap.free = memory_block_memmap_on_memory_pages(); + params.altmap = kmemdup(&mhp_altmap, sizeof(struct vmem_altmap), + GFP_KERNEL); + if (!params.altmap) + return -ENOMEM; + + /* call arch's memory hotadd */ + ret = arch_add_memory(nid, cur_start, memblock_size, ¶ms); + if (ret < 0) { + kfree(params.altmap); + goto out; + } + + /* create memory block devices after memory was added */ + ret = create_memory_block_devices(cur_start, memblock_size, + params.altmap, group); + if (ret) { + arch_remove_memory(cur_start, memblock_size, NULL); + kfree(params.altmap); + goto out; + } + } + + return 0; +out: + if (ret && (cur_start != start)) + remove_memory_blocks_and_altmaps(start, cur_start - start); + return ret; +} + /* * NOTE: The caller must call lock_device_hotplug() to serialize hotplug * and online/offline operations (triggered e.g. by sysfs). @@ -1390,10 +1468,6 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) { struct mhp_params params = { .pgprot = pgprot_mhp(PAGE_KERNEL) }; enum memblock_flags memblock_flags = MEMBLOCK_NONE; - struct vmem_altmap mhp_altmap = { - .base_pfn = PHYS_PFN(res->start), - .end_pfn = PHYS_PFN(res->end), - }; struct memory_group *group = NULL; u64 start, size; bool new_node = false; @@ -1436,28 +1510,22 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) /* * Self hosted memmap array */ - if (mhp_flags & MHP_MEMMAP_ON_MEMORY) { - if (mhp_supports_memmap_on_memory(size)) { - mhp_altmap.free = memory_block_memmap_on_memory_pages(); - params.altmap = kmemdup(&mhp_altmap, - sizeof(struct vmem_altmap), - GFP_KERNEL); - if (!params.altmap) - goto error; + if ((mhp_flags & MHP_MEMMAP_ON_MEMORY) && + mhp_supports_memmap_on_memory(memory_block_size_bytes())) { + ret = create_altmaps_and_memory_blocks(nid, group, start, size); + if (ret) + goto error; + } else { + ret = arch_add_memory(nid, start, size, ¶ms); + if (ret < 0) + goto error; + + /* create memory block devices after memory was added */ + ret = create_memory_block_devices(start, size, NULL, group); + if (ret) { + arch_remove_memory(start, size, NULL); + goto error; } - /* fallback to not using altmap */ - } - - /* call arch's memory hotadd */ - ret = arch_add_memory(nid, start, size, ¶ms); - if (ret < 0) - goto error_free; - - /* create memory block devices after memory was added */ - ret = create_memory_block_devices(start, size, params.altmap, group); - if (ret) { - arch_remove_memory(start, size, NULL); - goto error_free; } if (new_node) { @@ -1494,8 +1562,6 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) walk_memory_blocks(start, size, NULL, online_memory_block); return ret; -error_free: - kfree(params.altmap); error: if (IS_ENABLED(CONFIG_ARCH_KEEP_MEMBLOCK)) memblock_remove(start, size); @@ -2062,17 +2128,13 @@ static int check_memblock_offlined_cb(struct memory_block *mem, void *arg) return 0; } -static int test_has_altmap_cb(struct memory_block *mem, void *arg) +static int count_memory_range_altmaps_cb(struct memory_block *mem, void *arg) { - struct memory_block **mem_ptr = (struct memory_block **)arg; - /* - * return the memblock if we have altmap - * and break callback. - */ - if (mem->altmap) { - *mem_ptr = mem; - return 1; - } + u64 *num_altmaps = (u64 *)arg; + + if (mem->altmap) + *num_altmaps += 1; + return 0; } @@ -2146,11 +2208,31 @@ void try_offline_node(int nid) } EXPORT_SYMBOL(try_offline_node); +static int memory_blocks_have_altmaps(u64 start, u64 size) +{ + u64 num_memblocks = size / memory_block_size_bytes(); + u64 num_altmaps = 0; + + if (!mhp_memmap_on_memory()) + return 0; + + walk_memory_blocks(start, size, &num_altmaps, + count_memory_range_altmaps_cb); + + if (num_altmaps == 0) + return 0; + + if (num_memblocks != num_altmaps) { + WARN_ONCE(1, "Not all memblocks in range have altmaps"); + return -EINVAL; + } + + return 1; +} + static int __ref try_remove_memory(u64 start, u64 size) { - struct memory_block *mem; - int rc = 0, nid = NUMA_NO_NODE; - struct vmem_altmap *altmap = NULL; + int rc, nid = NUMA_NO_NODE; BUG_ON(check_hotplug_memory_range(start, size)); @@ -2167,45 +2249,25 @@ static int __ref try_remove_memory(u64 start, u64 size) if (rc) return rc; - /* - * We only support removing memory added with MHP_MEMMAP_ON_MEMORY in - * the same granularity it was added - a single memory block. - */ - if (mhp_memmap_on_memory()) { - rc = walk_memory_blocks(start, size, &mem, test_has_altmap_cb); - if (rc) { - if (size != memory_block_size_bytes()) { - pr_warn("Refuse to remove %#llx - %#llx," - "wrong granularity\n", - start, start + size); - return -EINVAL; - } - altmap = mem->altmap; - /* - * Mark altmap NULL so that we can add a debug - * check on memblock free. - */ - mem->altmap = NULL; - } - } - /* remove memmap entry */ firmware_map_remove(start, start + size, "System RAM"); - /* - * Memory block device removal under the device_hotplug_lock is - * a barrier against racing online attempts. - */ - remove_memory_block_devices(start, size); - mem_hotplug_begin(); - arch_remove_memory(start, size, altmap); - - /* Verify that all vmemmap pages have actually been freed. */ - if (altmap) { - WARN(altmap->alloc, "Altmap not fully unmapped"); - kfree(altmap); + rc = memory_blocks_have_altmaps(start, size); + if (rc < 0) { + goto err; + } else if (rc == 0) { + /* + * Memory block device removal under the device_hotplug_lock is + * a barrier against racing online attempts. + * No altmaps present, do the removal directly + */ + remove_memory_block_devices(start, size); + arch_remove_memory(start, size, NULL); + } else { + /* all memblocks in the range have altmaps */ + remove_memory_blocks_and_altmaps(start, size); } if (IS_ENABLED(CONFIG_ARCH_KEEP_MEMBLOCK)) { @@ -2218,8 +2280,9 @@ static int __ref try_remove_memory(u64 start, u64 size) if (nid != NUMA_NO_NODE) try_offline_node(nid); +err: mem_hotplug_done(); - return 0; + return (rc < 0 ? rc : 0); } /** From patchwork Wed Nov 1 22:51:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 13443103 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C5E6C001B5 for ; Wed, 1 Nov 2023 22:52:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 655768D0050; Wed, 1 Nov 2023 18:52:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5B83380009; Wed, 1 Nov 2023 18:52:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 42FF58D0050; Wed, 1 Nov 2023 18:52:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2663880009 for ; Wed, 1 Nov 2023 18:52:31 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 015901A0D5C for ; Wed, 1 Nov 2023 22:52:30 +0000 (UTC) X-FDA: 81410886102.12.F85AC62 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by imf24.hostedemail.com (Postfix) with ESMTP id CA6D7180013 for ; Wed, 1 Nov 2023 22:52:28 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="mI/Bj4u1"; spf=pass (imf24.hostedemail.com: domain of vishal.l.verma@intel.com designates 192.198.163.7 as permitted sender) smtp.mailfrom=vishal.l.verma@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698879149; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=KeGHyyYoL/7wB5aomuH3FBPhwVo40zJJhe9gXnljsPc=; b=bmZpUHKvsMfE+U3Lc7VTOxwYvl6BRXJoYliMvsa4UR8UJqKH3n8taP6StQcIGnxjWjLrMb uQg6P/GppN58oq7eiyZSoVAdkKv8Fw4lPCWVDht8/24CveVYeCGlUNsq4GfotAm0IZqY5y v2uM61Dy11yutu4mKOceceK9FQIomRw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698879149; a=rsa-sha256; cv=none; b=5Mq61iGr8jaVfL/T3BUOFVj/hlnlgmJkOtOLe73mwxf8g6q5OQ5yskA+Yv647p6QcAPNRi CNY3ZrrLSq8GkRosTCnN0j9kczCSZ2AS5z++yoAB5vmhtUSdwa5ym3pqzVku4rO156klo0 Q1F3X6DdHlK7gAzEzpmXSiwffEgQw54= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="mI/Bj4u1"; spf=pass (imf24.hostedemail.com: domain of vishal.l.verma@intel.com designates 192.198.163.7 as permitted sender) smtp.mailfrom=vishal.l.verma@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698879149; x=1730415149; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=f/IKjiX0oUHcikJLOo2W8JK83pAYKKgmZaVVmd3uHXA=; b=mI/Bj4u12jCpMpp5e2rvrw9mb9rD0tFI94hbI5LxizZ5D6ae/NZSnJsS BzGwLkLn6XqlT7DGahB9c+uec/OyDg9llI0jxutInCTt5IY+WWMf6tgn1 hgAZ5R4Xb18eLPoBxlxRDdak+34VMn9PMnXeRxVI3dzFRB+P45UFJKOl2 85JArKN44JFGM9cGiSSXhhBh4dOSZP2cWDzuF1ATMHANZ5e4rcekf3lA5 yGwp7YTin5qE1oO0dbbYwBlC3G+TsYU/TLiWX36c0ZWWI4HJ21qQVypIK cXGsWWPG4on5BKnBb7w87fi3Ecff9qfefZYTwuKj28+jeFJ/16tLrW79/ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10881"; a="10133634" X-IronPort-AV: E=Sophos;i="6.03,269,1694761200"; d="scan'208";a="10133634" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2023 15:52:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10881"; a="796033564" X-IronPort-AV: E=Sophos;i="6.03,269,1694761200"; d="scan'208";a="796033564" Received: from dgopalan-mobl.amr.corp.intel.com (HELO [192.168.1.200]) ([10.212.98.103]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2023 15:52:25 -0700 From: Vishal Verma Date: Wed, 01 Nov 2023 16:51:53 -0600 Subject: [PATCH v8 3/3] dax/kmem: allow kmem to add memory with memmap_on_memory MIME-Version: 1.0 Message-Id: <20231101-vv-kmem_memmap-v8-3-5e4a83331388@intel.com> References: <20231101-vv-kmem_memmap-v8-0-5e4a83331388@intel.com> In-Reply-To: <20231101-vv-kmem_memmap-v8-0-5e4a83331388@intel.com> To: Andrew Morton , David Hildenbrand , Oscar Salvador , Dan Williams , Dave Jiang Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, Huang Ying , Dave Hansen , "Aneesh Kumar K.V" , Michal Hocko , Jonathan Cameron , Jeff Moyer , Vishal Verma , Jonathan Cameron X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=5021; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=f/IKjiX0oUHcikJLOo2W8JK83pAYKKgmZaVVmd3uHXA=; b=owGbwMvMwCXGf25diOft7jLG02pJDKlO15YmCtyR/i/bdfNgTbjZxNSCN4xhHx5/i61d42f4d mtvQPnUjlIWBjEuBlkxRZa/ez4yHpPbns8TmOAIM4eVCWQIAxenAEzkyH+GP3wt3llcWzV+HX7w 5D77jTl7UuyUgw3cti8xTuY93ypRx8jw3/3+lb4d9p47+takWa99VNXvxt7QdvVpj5zfn8c7v7X x8wAA X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Rspamd-Queue-Id: CA6D7180013 X-Rspam-User: X-Stat-Signature: n4ah8cdbzaiwuauyzx4kianfkkb6myfw X-Rspamd-Server: rspam03 X-HE-Tag: 1698879148-124335 X-HE-Meta: U2FsdGVkX19TIu3j3hOR9UQFMnm1yYCZ/GsXxJ5n9dgQJ8dXjDj9NQoLRT23uBCDAcgbc04ygpIpO2IhbepY0NpCocx7tqG47xoWeURSt+MvBeeHR5PMn0nku3fxvh1tUKB9Eje3fHUoUpHd+uRW0PmfLnuwKoqwJqy7sO29IvOvRejA/citzvO8W2toawu6Tzy8qsV8dSZ9MCaQDhR1Lx8+pz8ld8WC3EEjTN0KtVbcq2HSSvq2LnK08KSoeFjB1JwnOhMJT7mlaBnVxHECtng0zBmgNl2kc+zVyBjyKNSo87N2qrgJdaUzmmGoSjc0jh3cQKYQ05qlX8jla2rzi/t104e92m7PUkWChE1mTBge8L7WyYDPkafBs8f6cD5YPKMeXtZNjm7tDww1UgT4EoLVkgdvo8akUZtaJ0YJfgDegYpXZG5K0WvOB5JTi6yXIwr5t66eiaAZMDdKtTahIppZ/A/CpHMjmrSz+O7p7TOKazTDy9lTjhF3yaOKi0RPtwMBTzRwzgy+Efh/4HjuWWQfzj3OZX8tMed0yhXwkr8t2jPBVsMG3BH85p6yjiiLxeOXG5WhWA8d4jAo2ECAQS5/J3qw1PZ9THmxFJ6u7Jgp45XfO+vGwIRJ4BJIruq3swHlkEa69nHs05w5C0I5Ej+RGIKtj7zWMI7RLljbLzWjH4J5gE8ek++75NYP6ao383BXH6qqEfRfcaCX7T0tq/Osc9zeYoNDdjkU9/tBKybJmm5WdlNgnMrT6zBTpOYFn6F/Npxscto3XMnb67slbHqEY+9S6RA6xGnxUPmZYmGXeNlCdBcNi7EAoXja6yjiJ6JelD2PfsHLw96S89EomHvqPzj7V0SrNc+adaZPAVWpH/I9bmCijY9xSZlJZSGRF0Hxhq7M3mEeRZM0x1nMEEEg+n2TkA5ueq/hQopQOr/t0ZIgQUY6e3A4js+isBzL/P52plXNRUfll9+/nKW s2KARkF4 UlITb8Z/n7XuZgrXDMxgvAR+Pr+2+2YmoBGvEjfZz4NLbWI3whKQZK441ULwKjZJJCLqu8GLDSiXhCIY7+NZFYVxeVAhFBFUSK08friA3xagrkeuyt8zKawnyixuikoyXotJFUqj1iX7XW40S99P5LrY+7SXk3fxqmn1KxfkMMKySklwXlpGesYWePSiv0mvt/EMax/VJCPk7peQHfsUupDpmYWWBWzrsjEphO4vBhfDDtRFwrrt/UwJ6E1yhM1gwS2vdQP/80tIvqGP6WAAY/MvwFCETP4K8MHilm4jGiHAy6Wr0H69uXcrkqHnUpV9q+cjYdWn/p5VUdrYxEUBwU4N03MQ21rVBm+Q6bl0bCC+a9abt5Mjr+mnEPAblX7txCbZv 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: List-Subscribe: List-Unsubscribe: Large amounts of memory managed by the kmem driver may come in via CXL, and it is often desirable to have the memmap for this memory on the new memory itself. Enroll kmem-managed memory for memmap_on_memory semantics if the dax region originates via CXL. For non-CXL dax regions, retain the existing default behavior of hot adding without memmap_on_memory semantics. Cc: Andrew Morton Cc: David Hildenbrand Cc: Michal Hocko Cc: Oscar Salvador Cc: Dan Williams Cc: Dave Jiang Cc: Dave Hansen Cc: Huang Ying Reviewed-by: Jonathan Cameron Reviewed-by: David Hildenbrand Reviewed-by: Huang, Ying Signed-off-by: Vishal Verma --- drivers/dax/bus.h | 1 + drivers/dax/dax-private.h | 1 + drivers/dax/bus.c | 3 +++ drivers/dax/cxl.c | 1 + drivers/dax/hmem/hmem.c | 1 + drivers/dax/kmem.c | 8 +++++++- drivers/dax/pmem.c | 1 + 7 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/dax/bus.h b/drivers/dax/bus.h index 1ccd23360124..cbbf64443098 100644 --- a/drivers/dax/bus.h +++ b/drivers/dax/bus.h @@ -23,6 +23,7 @@ struct dev_dax_data { struct dev_pagemap *pgmap; resource_size_t size; int id; + bool memmap_on_memory; }; struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data); diff --git a/drivers/dax/dax-private.h b/drivers/dax/dax-private.h index 27cf2daaaa79..446617b73aea 100644 --- a/drivers/dax/dax-private.h +++ b/drivers/dax/dax-private.h @@ -70,6 +70,7 @@ struct dev_dax { struct ida ida; struct device dev; struct dev_pagemap *pgmap; + bool memmap_on_memory; int nr_range; struct dev_dax_range { unsigned long pgoff; diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c index 0ee96e6fc426..ad9f821b8c78 100644 --- a/drivers/dax/bus.c +++ b/drivers/dax/bus.c @@ -367,6 +367,7 @@ static ssize_t create_store(struct device *dev, struct device_attribute *attr, .dax_region = dax_region, .size = 0, .id = -1, + .memmap_on_memory = false, }; struct dev_dax *dev_dax = devm_create_dev_dax(&data); @@ -1400,6 +1401,8 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data) dev_dax->align = dax_region->align; ida_init(&dev_dax->ida); + dev_dax->memmap_on_memory = data->memmap_on_memory; + inode = dax_inode(dax_dev); dev->devt = inode->i_rdev; dev->bus = &dax_bus_type; diff --git a/drivers/dax/cxl.c b/drivers/dax/cxl.c index 8bc9d04034d6..c696837ab23c 100644 --- a/drivers/dax/cxl.c +++ b/drivers/dax/cxl.c @@ -26,6 +26,7 @@ static int cxl_dax_region_probe(struct device *dev) .dax_region = dax_region, .id = -1, .size = range_len(&cxlr_dax->hpa_range), + .memmap_on_memory = true, }; return PTR_ERR_OR_ZERO(devm_create_dev_dax(&data)); diff --git a/drivers/dax/hmem/hmem.c b/drivers/dax/hmem/hmem.c index 5d2ddef0f8f5..b9da69f92697 100644 --- a/drivers/dax/hmem/hmem.c +++ b/drivers/dax/hmem/hmem.c @@ -36,6 +36,7 @@ static int dax_hmem_probe(struct platform_device *pdev) .dax_region = dax_region, .id = -1, .size = region_idle ? 0 : range_len(&mri->range), + .memmap_on_memory = false, }; return PTR_ERR_OR_ZERO(devm_create_dev_dax(&data)); diff --git a/drivers/dax/kmem.c b/drivers/dax/kmem.c index c57acb73e3db..0aa6c45a4e5a 100644 --- a/drivers/dax/kmem.c +++ b/drivers/dax/kmem.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "dax-private.h" #include "bus.h" @@ -56,6 +57,7 @@ static int dev_dax_kmem_probe(struct dev_dax *dev_dax) unsigned long total_len = 0; struct dax_kmem_data *data; int i, rc, mapped = 0; + mhp_t mhp_flags; int numa_node; /* @@ -136,12 +138,16 @@ static int dev_dax_kmem_probe(struct dev_dax *dev_dax) */ res->flags = IORESOURCE_SYSTEM_RAM; + mhp_flags = MHP_NID_IS_MGID; + if (dev_dax->memmap_on_memory) + mhp_flags |= MHP_MEMMAP_ON_MEMORY; + /* * Ensure that future kexec'd kernels will not treat * this as RAM automatically. */ rc = add_memory_driver_managed(data->mgid, range.start, - range_len(&range), kmem_name, MHP_NID_IS_MGID); + range_len(&range), kmem_name, mhp_flags); if (rc) { dev_warn(dev, "mapping%d: %#llx-%#llx memory add failed\n", diff --git a/drivers/dax/pmem.c b/drivers/dax/pmem.c index ae0cb113a5d3..f3c6c67b8412 100644 --- a/drivers/dax/pmem.c +++ b/drivers/dax/pmem.c @@ -63,6 +63,7 @@ static struct dev_dax *__dax_pmem_probe(struct device *dev) .id = id, .pgmap = &pgmap, .size = range_len(&range), + .memmap_on_memory = false, }; return devm_create_dev_dax(&data);