From patchwork Wed Oct 25 22:44:33 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: 13436900 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 2CC4BC25B6B for ; Wed, 25 Oct 2023 22:45:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 43EF58D001A; Wed, 25 Oct 2023 18:45:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C9308D0001; Wed, 25 Oct 2023 18:45:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 21A868D001A; Wed, 25 Oct 2023 18:45:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 108EF8D0001 for ; Wed, 25 Oct 2023 18:45:02 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D3C44C0ADF for ; Wed, 25 Oct 2023 22:45:01 +0000 (UTC) X-FDA: 81385465602.27.4F55285 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by imf08.hostedemail.com (Postfix) with ESMTP id 917FC160002 for ; Wed, 25 Oct 2023 22:44:57 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=DvzSdQsS; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf08.hostedemail.com: domain of vishal.l.verma@intel.com designates 192.55.52.43 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=1698273898; 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=a2enqsYJVCWNWE4iRYXEfyr6VVQ1Bpa82iMSkb0e7UnUxjrpjt7aKAw7AAOcM92brg17Dx TlxhW0KPRtilxbFKbr1fr1/WpCBTtH2tXMZ1JmAq1dGWjoW/VSErQQC3Jx87JZUydDe2WU iz4KM3qqGN0qDm8WrafVBL+rNe8J5Ms= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=DvzSdQsS; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf08.hostedemail.com: domain of vishal.l.verma@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=vishal.l.verma@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698273898; a=rsa-sha256; cv=none; b=Vzf2s9l7nW0m5+2fkJ+grw0WeKSVjDUQxVsfaD2iC6oHVDmG3N0u/GYolJV0teJIgASEFn +IlpmLALUmn9TB32xQc2tzFLooG2lKHvlY//d973nOhYti6Pk2I9ci6Vs7kckaAU9ZyKY8 MTXU1SrPFiFQAfN8xozw6BYKju1BkFQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698273898; x=1729809898; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=hEIpF+H2iWRMoZGPvwzbL8B1g/l212Q9ts7SomwLAKg=; b=DvzSdQsSkKdbNpsBoIi1ZKuZ995Iov82BJgNBkWgTeM5sFvPyf/NJeE9 MuqQkns76sDndTBN3trvbLOYVMbrMeBFj416m8l5StbdgyL2MKS72nMMv iQ5YE6WEYza0kI+4N9ZS4k8y/+Ej/YCMSwudZ1Zc2dM7tyfPgoqyGFZEw ugfxzxD0+L2S7ErEIvhmrjDQ2TqhpSjC1LU7xtbjpDiOLf2VtzUplN1BI eRhJ9fa+y7u10/zVixq7TNHh2nYeEyvP4OlIcKopSTo2brTRwK2iJIiRz j9J26kFYHpLwXGERDwYUe+oYRuRrsA02xoHEjtRUS5BNOjZRrj1VhvR+w A==; X-IronPort-AV: E=McAfee;i="6600,9927,10874"; a="473650441" X-IronPort-AV: E=Sophos;i="6.03,252,1694761200"; d="scan'208";a="473650441" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2023 15:44:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10874"; a="708846721" X-IronPort-AV: E=Sophos;i="6.03,252,1694761200"; d="scan'208";a="708846721" Received: from nmckubrx-mobl.amr.corp.intel.com (HELO [192.168.1.200]) ([10.212.68.190]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2023 15:44:50 -0700 From: Vishal Verma Date: Wed, 25 Oct 2023 16:44:33 -0600 Subject: [PATCH v7 1/3] mm/memory_hotplug: replace an open-coded kmemdup() in add_memory_resource() MIME-Version: 1.0 Message-Id: <20231025-vv-kmem_memmap-v7-1-4a76d7652df5@intel.com> References: <20231025-vv-kmem_memmap-v7-0-4a76d7652df5@intel.com> In-Reply-To: <20231025-vv-kmem_memmap-v7-0-4a76d7652df5@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=owGbwMvMwCXGf25diOft7jLG02pJDKmWsxJWmYp2Tak1DxJWVlQW1jWL/jDzy6c113tEP+XOW HL4TWZMRykLgxgXg6yYIsvfPR8Zj8ltz+cJTHCEmcPKBDKEgYtTACZy/Scjwx6zeNcOMf0D/k92 FS0SOXguPq7sz44vulelEq7dPf/3RxIjw4ZdJntVZnX5FnH6XT+YkMdUWZv4zkbC44169ozqlvo cbgA= X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Rspamd-Queue-Id: 917FC160002 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: xsppbyicxongap77wb67teowgcwfrixh X-HE-Tag: 1698273897-443902 X-HE-Meta: U2FsdGVkX19WA2Qjwx/xqVT4OJVWpLj1Wi8+kR4+HN2nPKt68zNW8SCJCnJsBj3aXe8Y+6RsT+rngvdrqO7paGDfaVoCeyFOjOIXHZTFEKZV9KU6GtMSVbuHt/+HZ0UYppLDavu44FmKehnI/gB2jRpKHuTNyv+Tg0j5Qgm1np2LztDhtjwRB12B2asS30HaOU/OflEZVY8SYcs3D6lAJCBhg7XlzRIAb9PYf6Gw9hwKJ+vi2aIKl5VymmvVlr4wse2l/Y//WAtxRvdlSkyRamN+R5SLPHrWPWEe+yCBIonr/pBcxq6ot4xG3dekh0UJJVEf80Rc06k1hLOmPsnSi+zC6oicyb01hEmOhjCBqeIlmvMKhTzhL2ssCcCGpMHw4NG4YAL3r+nr10vG/Ea0b3Vmzul5VDOhzNaSjL41ONeGwxoyLfS/efYTu1hsXGz2V3gUwZDdGmZpbLk5WO6uGeaBN6Bn1zr36JJTPYwf1nNqtxF8f4CMsS82qDQPOYEqrNsjhks0ynu7xBE4X2y3Xse+FlytCKfcRPzR0VjYOh6UO6oHDMLQiz47S/VqHOzgkyO7h2JMhFyEBufmoXd/FHJSVTNJSCafaVc2xvNttzVY7NJ38njLNMeSwA+RDUL/5V1SJaRQHMTqaZuSgoO8fiRL848OmspbY9p38xwjiVzymvdF8h/D9Uyay8hR1XVcs40zIf4MJ86px/BaGn0kq6u2EAaqG9CEadqL2Qb5ap04gy4t+ChU5olXcDCtDrLqaU3GMdyxywQzcgQvjtByTsgSiuodgGNfoiIWLA+awAc7bzcfgl6tDzQgo99wsAR8QIsZ/CU/82RcUo10OPL1zXbXVSGq4bI4M+qqlwCP2xYzf1xCYKfMVzuPuvjD54Nk01eBTGakM1pd5ZRMCy2chhsQUlK3U9eSL2AEIj5LOs4xLq/AX/rhn5TcCxItRPMyaYwFogr/Ef/pYVMYgl5 qqSSAeXh g5zhuFkJ0q9SSh6UJB/wlZzAsx2bkjJj8mHYuEQJI+8fqqR9/QCHHONyCR9N1kShC2XzBoeGtm8ioxN4H5VwPmBUJAUYlp0/TEis4WV8IVGLXNBdqqZIPIDOEHy4K18U2NgZxkXllW551/nm6velmSOj+Fng/kp17zOQOqDLdWzCCFbsIkfxIBXwq9iZnF+0WdetNkesdS0c19GVtGXxjspvir6ucB43kyplWXmY3JN21FfgjFZv3f5zb0gNgHkVTviBDOXGqXDlqh+m6T6ddo5wFI1Eg6MsoanrF5UAvQPwDM414ZCRn3caR6RIRo79akn2nNJzr4kMGsqRPEV23tJOLoUVIjKZ4czjZ 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 --- 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 Oct 25 22:44:34 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: 13436901 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 E8BD7C25B70 for ; Wed, 25 Oct 2023 22:45:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 552B38D001B; Wed, 25 Oct 2023 18:45:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4D95B8D0001; Wed, 25 Oct 2023 18:45:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 32C3E8D001B; Wed, 25 Oct 2023 18:45:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 1381E8D0001 for ; Wed, 25 Oct 2023 18:45:03 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id BB270B5336 for ; Wed, 25 Oct 2023 22:45:02 +0000 (UTC) X-FDA: 81385465644.21.036E511 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by imf15.hostedemail.com (Postfix) with ESMTP id 9E6D6A000E for ; Wed, 25 Oct 2023 22:44:59 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=atsoDYt9; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf15.hostedemail.com: domain of vishal.l.verma@intel.com designates 192.55.52.43 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=1698273900; 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=pho2UjNSfDwctiP/LVeQgoP4xsPcM0ban7Xat+sHSSs=; b=E4We3vXldeRKaxmmaUDRLqJ3B76KJK/bLjzcj8L64GbiY8rX4IUVV4TRZIbDvk6bkWe6a7 Q8UmimYGIPml4PcVLFSeFiom25+ZLXKSBTMsmFJ/Dz3gS5Q9XHbNJ6Lxg/+npuPZP2E7+b ws3PIMzHtdDLziL6OJ9NEZxf0aQ4BBQ= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=atsoDYt9; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf15.hostedemail.com: domain of vishal.l.verma@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=vishal.l.verma@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698273900; a=rsa-sha256; cv=none; b=FYFLz9E7esn10gPiXneFEOh+GxNOlNETEVdHHjTako1bkc9jRlleQBBQ5h7SWnuzLlhBGB ngUXsd+VWat6j9Ee4P/TWyCH/eArYuRcvr8nE0adhEiTwMJa5pzcPdLBBFASex57BiJH3b hmbwBc5eITwIczbNJiNBRrDYyTTAYw8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698273900; x=1729809900; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=ndMaEWGdwlBZiUCGL9AFKr6E35jyc9m/F17PjjwLe7E=; b=atsoDYt9KwzLcltjqa1ryQO7jqXRHZTnjvKkK3g0LOMtpvMNzZq9Gdqu 37JfzqnKdhdCMWC8ZYmBr6w3tCXRwLQWj50vXuH7pMOCE+vwaPBLFiu2S nuZK9D0oK42uQkBJ9k+KTFYtYMjgaH3rFklI42MOeSRB5kd79hiHb02UC Lf2rO7hOXntMHJLucsT1FGu5+3GCNNptk37j0UYpTTx9J16ApGloUHcFO FNN2PXoDNCm8VNVhSqvFE3Dzo0aurF/KLisBtu4cS5fQuvv/zFSm2R96w 4oLaVu5nTySWS7YDlbcn/Y/avE8Dl0AX4NtfLSK4fQ8yFSuaY+4JGTnHJ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10874"; a="473650453" X-IronPort-AV: E=Sophos;i="6.03,252,1694761200"; d="scan'208";a="473650453" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2023 15:44:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10874"; a="708846731" X-IronPort-AV: E=Sophos;i="6.03,252,1694761200"; d="scan'208";a="708846731" Received: from nmckubrx-mobl.amr.corp.intel.com (HELO [192.168.1.200]) ([10.212.68.190]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2023 15:44:51 -0700 From: Vishal Verma Date: Wed, 25 Oct 2023 16:44:34 -0600 Subject: [PATCH v7 2/3] mm/memory_hotplug: split memmap_on_memory requests across memblocks MIME-Version: 1.0 Message-Id: <20231025-vv-kmem_memmap-v7-2-4a76d7652df5@intel.com> References: <20231025-vv-kmem_memmap-v7-0-4a76d7652df5@intel.com> In-Reply-To: <20231025-vv-kmem_memmap-v7-0-4a76d7652df5@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=9833; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=ndMaEWGdwlBZiUCGL9AFKr6E35jyc9m/F17PjjwLe7E=; b=owGbwMvMwCXGf25diOft7jLG02pJDKmWsxLWHPj5TybkrKyIeqN7o9Hrz15xByfurLrud3X9E /0Lx9Pmd5SyMIhxMciKKbL83fOR8Zjc9nyewARHmDmsTCBDGLg4BWAiXxsZGe7Ef6hS3VIin7Gu +v/N/Y9sWHbZzC55tXGf+OP5niaPZEoZGXbed9175P/nkz4vFk59HatW5WHsEXqCpWVya59FX8V MHR4A X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Rspamd-Queue-Id: 9E6D6A000E X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: njse3uutjmphnjjtwpdtpqr5pyabspoo X-HE-Tag: 1698273899-284056 X-HE-Meta: U2FsdGVkX18Lfj1x7yzUykwdfd70Fwqum1NJ/fru1ilJ+VrVjf9OrsSm4Y1+Za2bEK0Kx0Nealgw2nfKOJ5eVANwhchdiDC8jO0auUJRsJ/1SbLCuFF4wqw0Hwh/oUvamGOVcLoGJn0jQOSWrY1k1GHqBl3L3qEsuNcJVDmLnqKpjg7hhNKm9k296yI8aw7aEY4omxia7EAY7WcKf1WD8AJsEt17BJ9kYP5UllO+c/QLRAg6l0Txak1J/dnxVG/QjV807qG6PTmfrWs+wD7+rcQQdLypFgFeki6u1sONkuD84lJ4QQzJdpcofjlOcEmxbbJqxqpCmwQZhUv2iu1Wo8UMBxoa5rI6TL+G5jU5gqAKyyBidEChSPsGQ2x+WlX1YJHpW6fds1vOLQI5rWEe1KHruTd+uzKizh/GbGFc8ZtqAri+l2N8e7rxIpQFvPQjaOd+f78h72b4Du64NA1lbUF8XmQ530tsz88xTs4gaTQotTp+alw1sU5vYOe+yeyh8Cxgtz6t+zfbTF9kYr/ZGTRcmKN8dxQK3wnnjDSe+c53JIr4Uch4vBPD0WIqKTzA9CrIqrn66h/wcFjt6M8umnWLWohwxGoUIEnuxE9LKs3DsYNKytnmFAJAC6GuZyOIeQ2pqlicIV0iTWN06UDlEZTMxrzB8WObmpi0pOpffoy8s+vE82HMY73Gq4m0mnlaaOlYK2L8bhs8k1yLPjCEtepy0gKuN7JgvUhQ1nGnVwW4zSIDm5y5nstSfg1+BkSxvZ/+JbDfbypicmyV8Lg3G+0yvfQN51hPd/a3Hy3Xgrux/3LGpuWTY6EhvyBW6aJux0IXThNZFuNNqsZXFGf/6Lv3I/BivCZNjyC6REt5t95+2QgvEvif8OBqlZAFC53hAs0oqdlM7fwWAQgLMGXXX+y558PQgs6Q+P/H0PtwSEncAbyUQwtBYiATL/ILngff0LvK3RhF8GbQMFbGaXg 7nnGcviV L5XV3akI/TbOHFmvs8hpMjVfr1a6jmYZKdJMfvvvS7Y3P7di6lHMZHbD2ZO1I6hxoM8RuSFxZdrbGyXr3FEv+zb6NQfqNy02GyG2DVIOqeumxn7RXmBrgCptWPFPwXH5jweo2Ysi0fA6OGG2IJ/yF7r73UMFbCk+kviO1s0A7SPgpAbYwjImTK8TDNu+jDuSlfvq4Uc+Tp+M12ck53vtw/cNd3qakPyG5iU6hrut5ptrRxYMBGEJUIgpcnASe2gFE+3LIAZdA1h1wigS41wX2gc5eT0d4MiDf04Xbw9u8WcB6QSFqBxkpjTxICR+VtovE2rE//j9GV57aNwClroarGjBGGY8bYCqi0oiE6wtMYvTbRbSPkfuXyEwAVdIO8T9vTzd7pt4mlT4l+zLSRyp4qj+6LF/K16FMxgef 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 --- mm/memory_hotplug.c | 209 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 144 insertions(+), 65 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 6be7de9efa55..b97035193090 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1380,6 +1380,48 @@ static bool mhp_supports_memmap_on_memory(unsigned long size) return arch_supports_memmap_on_memory(vmemmap_size); } +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); + return ret; + } + + /* 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); + return ret; + } + } + + return 0; +} + /* * NOTE: The caller must call lock_device_hotplug() to serialize hotplug * and online/offline operations (triggered e.g. by sysfs). @@ -1390,10 +1432,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 +1474,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 +1526,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); @@ -2076,6 +2106,16 @@ static int test_has_altmap_cb(struct memory_block *mem, void *arg) return 0; } +static int count_memory_range_altmaps_cb(struct memory_block *mem, void *arg) +{ + u64 *num_altmaps = (u64 *)arg; + + if (mem->altmap) + *num_altmaps += 1; + + return 0; +} + static int check_cpu_on_node(int nid) { int cpu; @@ -2146,11 +2186,69 @@ void try_offline_node(int nid) } EXPORT_SYMBOL(try_offline_node); -static int __ref try_remove_memory(u64 start, u64 size) +static void __ref remove_memory_blocks_and_altmaps(u64 start, u64 size) { - struct memory_block *mem; - int rc = 0, nid = NUMA_NO_NODE; + unsigned long memblock_size = memory_block_size_bytes(); struct vmem_altmap *altmap = NULL; + struct memory_block *mem; + u64 cur_start; + int rc; + + /* + * For memmap_on_memory, the altmaps could have been added on + * a per-memblock basis. Loop through the entire range if so, + * and remove each memblock and its altmap. + */ + for (cur_start = start; cur_start < start + size; + cur_start += memblock_size) { + rc = walk_memory_blocks(cur_start, memblock_size, &mem, + test_has_altmap_cb); + if (rc) { + altmap = mem->altmap; + /* + * Mark altmap NULL so that we can add a debug + * check on memblock free. + */ + 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. */ + if (altmap) { + WARN(altmap->alloc, "Altmap not fully unmapped"); + kfree(altmap); + } + } +} + +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) +{ + int rc, nid = NUMA_NO_NODE; BUG_ON(check_hotplug_memory_range(start, size)); @@ -2167,45 +2265,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 +2296,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 Oct 25 22:44:35 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: 13436902 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 83E45C25B6B for ; Wed, 25 Oct 2023 22:45:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA0318D001C; Wed, 25 Oct 2023 18:45:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E01A68D0001; Wed, 25 Oct 2023 18:45:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CEF958D001C; Wed, 25 Oct 2023 18:45:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id BE9A38D0001 for ; Wed, 25 Oct 2023 18:45:03 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 8DA5A40B37 for ; Wed, 25 Oct 2023 22:45:03 +0000 (UTC) X-FDA: 81385465686.19.7C0D797 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by imf07.hostedemail.com (Postfix) with ESMTP id 538CC40004 for ; Wed, 25 Oct 2023 22:45:01 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=G6H04nDF; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf07.hostedemail.com: domain of vishal.l.verma@intel.com designates 192.55.52.43 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=1698273901; 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=veuv5HqD7AFEWi54guoE5dRp2blStvCKXb9PZntf1Gk=; b=FfSzSNXpt+QazybysQzUWl93IordL9fQSnt8la9jc7NU+FYSnBM/KBRP6YTD8t6RTjYrHQ sD7V+qGFI72awaz3xyf8YQCoNAh1C2z83qi4DMyBn6eCcyCWtbSIPzlRuRB4hO9f2aj6v1 52LPrmRHn0CmMXouFDOvywWHt03QCoQ= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=G6H04nDF; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf07.hostedemail.com: domain of vishal.l.verma@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=vishal.l.verma@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698273901; a=rsa-sha256; cv=none; b=BaEWam1V7Gnd4IM71mwhzdahxlS9giiNuhCgEJuM2o2oWItnqhZvZHzI/7B15nIbdWAzjU nrkfO0tJm47C/RdYyk297b38p7hoT6LzQnxNT0NO5MdFtOHptGh3DRJQ28w9fxw8iUXkQf 52Ah7nHlAr4VIQe5wUI2GhXJ6vJhZbM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698273901; x=1729809901; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=mEPqGi0w6uK1G2oMRp9GXgOlOlinp7OhMTBnsnQmtwo=; b=G6H04nDFtWSr9PgAWtPq0ymwD78gQJR1g4TCtU1kcNqzB7cp5MpI/aAu Eb29HGHXJ7oHA/gmAIZpz+2esLP8u1Akt+UPnQLxdnxV9jjk6xUojCzRg Bpf1XujM0DF67GFqKKOuFD3l1vPsk4e5J2Q+9dQIRf5Qtw7A+gZLu9tlp a2Zv/kJYm9dGr5trpnHr4Zfh/uFMiPgMA2D6qg5sUEaA/f3GVKugPHxXj A34HtWacrKb7cXjazpIe6nVM4NiqM62WwM6KGy9lPbIN8fJWWkn7tgrQM cXPHYiJAQl2wFkYEdZhsAg5lMBydwMxNBIlmKkAYGsQVtreu0BZ8v9h6e A==; X-IronPort-AV: E=McAfee;i="6600,9927,10874"; a="473650463" X-IronPort-AV: E=Sophos;i="6.03,252,1694761200"; d="scan'208";a="473650463" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2023 15:44:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10874"; a="708846737" X-IronPort-AV: E=Sophos;i="6.03,252,1694761200"; d="scan'208";a="708846737" Received: from nmckubrx-mobl.amr.corp.intel.com (HELO [192.168.1.200]) ([10.212.68.190]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2023 15:44:52 -0700 From: Vishal Verma Date: Wed, 25 Oct 2023 16:44:35 -0600 Subject: [PATCH v7 3/3] dax/kmem: allow kmem to add memory with memmap_on_memory MIME-Version: 1.0 Message-Id: <20231025-vv-kmem_memmap-v7-3-4a76d7652df5@intel.com> References: <20231025-vv-kmem_memmap-v7-0-4a76d7652df5@intel.com> In-Reply-To: <20231025-vv-kmem_memmap-v7-0-4a76d7652df5@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=4972; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=mEPqGi0w6uK1G2oMRp9GXgOlOlinp7OhMTBnsnQmtwo=; b=owGbwMvMwCXGf25diOft7jLG02pJDKmWsxIm2j5sMK2Rlc/4flfo6tdP+y3Fvfnip/y6583My PQqmLm0o5SFQYyLQVZMkeXvno+Mx+S25/MEJjjCzGFlAhnCwMUpABN538jIcNtXk1Ei4sPciT8Y LYvUskIPurWm5kSdye9leXj+wCOBOYwM/w6Hvpz8dcnkvCrVy6s4L4swFRSxfiq3f7N6Z9PPzOQ 4BgA= X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Rspamd-Queue-Id: 538CC40004 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: ua53knj9mp8tkzu7r5h333unfc61u4dy X-HE-Tag: 1698273901-322658 X-HE-Meta: U2FsdGVkX1+Dh6vWQpc1v14QufVq8grc/EQhvSLj7dtqf/18QwSVVzFptUv63U17/FSMXZ7BBc9uzE0Zn2ahsqWsBIaRVyQWhD3nPbTz2lAT67qcagsGzXIsEdA9vs17QZ9esIOy1xeI/IrCQoG4eRcgtqJBquEF9lLxEdwi+mdqWLPMZWLSRDd2JkydshZaDecu0YTAZqwK6Z1YBiWkV6XcyIstdUgl6OR3+khVhCsrNapa7AyPll3sMu6/fGEREAlRzUOucjjKlTyHnf0lTAjeb1aNvpTpsQud834R8fRNTs+SfLY3+ZmUbUJyB/qg0xdNJUnSP2GU4jDnMhHbZZQ4Uqk5JRB39NJwn1N+YWDepjC/MyaKAP+CFq+7msp7N1oExow5x/OQMick+aaxZmDqVpQu74nocBX9n8hVvbYBt6N/VPOGjII/eXLfW7aVEMJPicnaAmWZ6HXzAokvdC9AKoUKNtZ1l6a6v0qGCkZqHrrnGYEonZ0F5N0sPCNuBDbtAsZsrQAbyq3yx1Bh9dI16wZ0HCp0LjKPfCynyFFDLA4BypVoeI6P7qUVgDvWgixtHoOnjtPEObF8OWcv9nJF3CnUbWKJ49H0VEIQ6uvCoVicfzpb0M0XipkP9fscT8RStxRkOuXyudrSzbaNYdUUpcK21V3gvY31BydQwByUBeKvowfwAzR3qYdotU/UD+BNBkIpcRhC7inhRClVLa8fmj4wVzkIA/VHYzAr1VAvxlQBbKn7AGuO6Sl2/QbjaCrYtHoo9Sbojc9H/bltTP1yJIhCunLbf9HCz2xovCvjq2VXEDMYuPYI+NN8ik6cDjwACJ1hrLa6mCQJ0xUuIScZETVNDY0jTrpECz3rjaEUsnYjlQUJz2+MKNkOOWyeuWRrJ94fnvGfnOXWV+8SY5pKqPu8MZi9+OkWYzSmZ9N1HqJPl+BWUFETbMzKEv7wcz3vp6yNnrwAYOvE2Y+ 4zvqz8dm WI3Qv7Q6C/jEJFlaydYqZFOaYlCfvJgx4y/iku/XS46o6SiuhIPoStH/lGGuGfZ0foukQyKNuTfCh+rzT1Rs399uV3mPrWBoxbWgB2dQmVoxfcaLkKoc4nOSky9snXEcZEoD7XVX5GiCwV/VhiH90URLPE8fP54AvWkrlXJk7ErRd7vM+AgNuhgLInNFj+uZnBQapaZWOAtBeXS4Cow4tZ1n2NHR/YceW1BT/kEKrLOA1G9pSBuVpp7qG0vk2BtZtA25F/zH8fwJS5QvQJrgp6/Zp0xDHf8Y9k51FFyVwoww62oscJ1eb0k1Js2lHSclXC6SOVEP3M0GhOtxDiZu3u54QA6FruIcN8F1Sqi7wDK3cpwUpckeK3rmmA8B29T84pU5+ 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 Signed-off-by: Vishal Verma Reviewed-by: "Huang, Ying" --- 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);