From patchwork Tue Oct 17 05:44:57 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: 153916 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3917504vqb; Mon, 16 Oct 2023 22:46:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFleGi54axBiOS9rnFkJQLMdIJMllCt1p3n5j2eMyITzN5+WOhjvbZG1Dl2F3VdoJG59foe X-Received: by 2002:a05:6830:26dd:b0:6b9:b987:1337 with SMTP id m29-20020a05683026dd00b006b9b9871337mr1312009otu.1.1697521565921; Mon, 16 Oct 2023 22:46:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697521565; cv=none; d=google.com; s=arc-20160816; b=KiLMy3OglO0tT6t1kF0SVGMv61e54CI5MU9iBy5IWcBnVJ22giHWJ5O7O6dCWDePGK rBs0owoRBluIzLeia+CHa439uTVj8TAR/iXg2b7e7sjmUIQrQefS/kcS4mP+r+KFCEQR R4/CGQTEvCx6SdkfzL1NSJViIP7iogfxdOXYCCCz0hhiBhq8WZpPgVFXOmVTftRqNflE TBR98oTOv9eW1EVUOXaHvWo2pGu48tSivzTL+vUK9l9FPz2XBXrPmHnQbzVAKSsOwHcm 4HYJwI+euC0PkKKRr/4wM1mF3svXWrfqwcVHe0QYaVGMdiM+F1EPpe/94UJeNYmcv/Q4 Vzrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=veuv5HqD7AFEWi54guoE5dRp2blStvCKXb9PZntf1Gk=; fh=K6XmanfW69WIGlI+l+O18lb+dFEsDiql6DFppOVA05M=; b=dzBoSXJML6rnXdruPJT+8CQbif5xpGwpVVYq4Emjz5/YMAPMmLnEJJsvkTZ55LqmEh GgFGH7Vwmhai4eW6xyYM0bhxl4qB9H2m7kxdFkJZIqxG0nVz8YdpzxqjLjWMtw38ppkW YbuS0MMhfpitmx5/YJ3nyWNyc6T2rLzUp5vGLFsmQWfh+s1VH4KXGzPJbwMIav/ngz0E Qlhor3+WfMgGMiFUNtcT7TmGWp7opuTJGXWIpLaXGjfSorUE/LzHShD+Jhf5XNXI7Ag0 to26S0n82xIOulPCkiTlnMuiF6b/zQ5inAIKJlqUEc4vRapzJcseD284iIYe+BCTAJj0 Jmsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UK98nJdB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id o19-20020a056a0015d300b0068fb5ca50cdsi937704pfu.126.2023.10.16.22.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 22:46:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UK98nJdB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id AEEBC809D455; Mon, 16 Oct 2023 22:46:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234486AbjJQFpS (ORCPT + 19 others); Tue, 17 Oct 2023 01:45:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234465AbjJQFpK (ORCPT ); Tue, 17 Oct 2023 01:45:10 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 950FBF1; Mon, 16 Oct 2023 22:45:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697521508; x=1729057508; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=mEPqGi0w6uK1G2oMRp9GXgOlOlinp7OhMTBnsnQmtwo=; b=UK98nJdBbbrgH0DT6Gk1VC3o8rrh7FwHbAwKUndOQ+JFb/LSD6z4Wpqv 5kQ3pUO6tyJTqqG6WvRKaDfIE1o4FXR30NJpzztFtCwCSiuG6fxT50gMJ CnfZdTmynmP+tgdM165FWNsQA0B4R6yEaqMPpPF0HAf4vlMrBhUpYcpJ4 D9IFA6TZ8ARMqTqNPdLsiTvf5czPr9VSDDp4sWwxUSUdSU53xzCCNEJtz qUo+j3g3bBVYVEOak2PWp+HYe9z8pU2JIVTu3YLKr/tmrHs9m0+2qGi8R M0eXjfDVminr5hSokRdZpYJSA8JYgu10ue0o06ktCQVIhIvyIRWegDyz4 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="384580770" X-IronPort-AV: E=Sophos;i="6.03,231,1694761200"; d="scan'208";a="384580770" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 22:45:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="879694030" X-IronPort-AV: E=Sophos;i="6.03,231,1694761200"; d="scan'208";a="879694030" Received: from mjwirth-mobl.amr.corp.intel.com (HELO [192.168.1.200]) ([10.209.151.162]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 22:45:04 -0700 From: Vishal Verma Date: Mon, 16 Oct 2023 23:44:57 -0600 Subject: [PATCH v6 3/3] dax/kmem: allow kmem to add memory with memmap_on_memory MIME-Version: 1.0 Message-Id: <20231016-vv-kmem_memmap-v6-3-078f0d3c0371@intel.com> References: <20231016-vv-kmem_memmap-v6-0-078f0d3c0371@intel.com> In-Reply-To: <20231016-vv-kmem_memmap-v6-0-078f0d3c0371@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.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4972; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=mEPqGi0w6uK1G2oMRp9GXgOlOlinp7OhMTBnsnQmtwo=; b=owGbwMvMwCXGf25diOft7jLG02pJDKl68jEzt8d3qO3/2R3M0dv+gfv651PmOwQzOZilr5kzn l/89seZjlIWBjEuBlkxRZa/ez4yHpPbns8TmOAIM4eVCWQIAxenAEwkbgkjw7E7Lm+Z2b88qLgv Enox7OdGbbO9nLmXTvo+nsDxxX1WbCDD/7RVxdElk1n/SNmXxwW82D9HtfDNb3vGQlunA9vfr31 +mQcA X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 16 Oct 2023 22:46:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779980373597791054 X-GMAIL-MSGID: 1779980373597791054 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 --- 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);