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