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);