From patchwork Thu Jul 20 07:14:24 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: 13319894 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 03236EB64DC for ; Thu, 20 Jul 2023 07:14:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DD3682800C7; Thu, 20 Jul 2023 03:14:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D855228004C; Thu, 20 Jul 2023 03:14:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BFC922800C7; Thu, 20 Jul 2023 03:14:37 -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 AD18228004C for ; Thu, 20 Jul 2023 03:14:37 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7A50414019D for ; Thu, 20 Jul 2023 07:14:37 +0000 (UTC) X-FDA: 81031127394.03.7016FF7 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by imf24.hostedemail.com (Postfix) with ESMTP id 4DA01180008 for ; Thu, 20 Jul 2023 07:14:35 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=f9BaE0uY; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf24.hostedemail.com: domain of vishal.l.verma@intel.com designates 134.134.136.31 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=1689837275; 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=2lb74J4vq0tnX93fJOShs+tqDeVLsOiO9xPRGdqXRcs=; b=qewThroB8Xr2LD1PKY3E8yWI5tVCRvKBNhN4Jcv1uWPHK9Q8ByWuEl0XcoNC+W/M0+eg5A zgOYBe8/Zvrn1/71H0DMcLqL41NRDK27aOMGneNlnhI1RYBHRycOa7d4yyVxOToVCbhO+j rqc55mqUa9QU4T5FYQgZkBev7H976EU= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=f9BaE0uY; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf24.hostedemail.com: domain of vishal.l.verma@intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=vishal.l.verma@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689837275; a=rsa-sha256; cv=none; b=vgWTrA5C24JKsAAcrbkaOrNH2MCPTI27voarQlIQco66ahX7J4TtHFwhmkI3R8jUPwi93K MikDuCD7gfsPLxdsz5TNuAwprG6O9su2/X/s+4w8M6QFBf8RNIdfkgfZSSUa7O44xxTWH8 1bMvD7FLBJo5z72GWiOBJQ/D0TX/H28= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689837275; x=1721373275; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=t5Tx1xjKMmZzJYwXq10A5dhCDPrE7RYDBM8wVBgMdO0=; b=f9BaE0uYOJBDkiY4BUzeAEL2xT6pbw3TFt7ikGHp/m2LkcqhsIPeqAb4 ECU/WwHCLuFjiBr/r8U+QzXCEQuaVDJen0T0uWEtbNNro5JMPlfI7q1p8 9zjAb8c6ZNDoAmeluztXF5WJd0gWgCmODZXnZrXeSv0++lXbrdCRc+Y7m 0EiBmNomqnYaB9HzK0ZZLp3WGC667687aK4F6ctpsGjdTRJZ72QevaQyY pV1iuPDmRZb2h0q1Vv1uWyvdIlNFXENFutv5cGVhCyw+l47s1FwG1lscr MGD2aDrUGPpowfgReIh3EUFVJHkMrbRPvHk16/7l7T090ACRE4kRxD20E w==; X-IronPort-AV: E=McAfee;i="6600,9927,10776"; a="430424020" X-IronPort-AV: E=Sophos;i="6.01,218,1684825200"; d="scan'208";a="430424020" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2023 00:14:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10776"; a="794334971" X-IronPort-AV: E=Sophos;i="6.01,218,1684825200"; d="scan'208";a="794334971" Received: from mfgalan-mobl1.amr.corp.intel.com (HELO [192.168.1.200]) ([10.213.172.204]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2023 00:14:30 -0700 From: Vishal Verma Date: Thu, 20 Jul 2023 01:14:24 -0600 Subject: [PATCH v2 3/3] dax/kmem: allow kmem to add memory with memmap_on_memory MIME-Version: 1.0 Message-Id: <20230720-vv-kmem_memmap-v2-3-88bdaab34993@intel.com> References: <20230720-vv-kmem_memmap-v2-0-88bdaab34993@intel.com> In-Reply-To: <20230720-vv-kmem_memmap-v2-0-88bdaab34993@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" , Jonathan Cameron , Jeff Moyer , Vishal Verma X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4666; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=t5Tx1xjKMmZzJYwXq10A5dhCDPrE7RYDBM8wVBgMdO0=; b=owGbwMvMwCXGf25diOft7jLG02pJDCk77l35ZGnE8/cqw/EfF2OW2vyb9m391imrjrKf35uns 3TSlR0d5zpKWRjEuBhkxRRZ/u75yHhMbns+T2CCI8wcViaQIQxcnAIwkVMJDP/U/uSYVR7RlF/V lsH2ziKjUffFKtY0pZKjzGzthpadntcY/gcnRfPsPtXH5hbMads97c9Ve8UJTBPzXX+mPOJaE5D 5hQEA X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Rspam-User: X-Stat-Signature: 9rhxx4e99wkb97ccc1hxazkgp49ju6yh X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4DA01180008 X-HE-Tag: 1689837275-241042 X-HE-Meta: U2FsdGVkX1+mdZhnXU92Pv+PmXDNOg1wihiuxNcY1pkJDuMc0ro8+TyPp9yIyK41Wr4KBJDVJoEMCZbitFWMMk0VQi8DJYpv4BDAatuqF6UXKaBM48Cbo8VurRkOarOtZBE9G+v8eoR4aWi3U/cfPRpnioOUlgUGkDKzqENxkYLKow05Mw1ER2vIZDFjPeEauMijm1oNh8QQjmdjRI2/WQ6LglxVlswGcR+geAuyvaYfZgxEQnpFpppfnzLprR7OWQ+nldoe292oY+eUCdJ2103gFiWeXjunYR5LjVEfzia5W3VK1gaKRtKL2NC8HxL/2DPonwU6TKPcWEGXdYtrYCsucW2gUq+w0BDHYTcfjIV+EsQwgAB/1Pq2RFcfPLl0+9k/h5YW8JPey1YAJDy+UoTlXGvtXInoEFa+RCagWPK8N9bQQGa8h86FufJZ8WKu78SSS+h6QrDnAX9Lm7V8GInyQ/8dpP5a2klgf56x4TrWtU9ClGVo8OeyqKZ4XHep4tfwbqgnRXKvYCuBr8lxmsR0lq6hKv2EeP3TQXw4t1D3aULokhYFdF/AYQDUQFGgoHqOcrJOGQLkoiMwIHDKdKDybLLBwk3iX7tdevhVfUbCvCVhZoRJphhTIk9xjQ4pzs3RiuXFMpmNYlBBYLJ7jCaMb8rHQnMLAiVvIs+hdQV0L/H4Yj0SVBYoCK7q3gpnIutBG7ebj3Zvxk3rJJG0OCD3U6TUYdGuTJ2pWjUAIwwEWJo533jHRpP29MHkfl6OWwOftdGcGL5KZA1Sj+1jQSuVPiVQ+s57FwL0lRgSVAeF2MYuS5RkOmf7HrPRTqpBw3eHUmAbZhUcYRje14/gU6RCpiaTZ7/PnTd4Dv4yC++IYCs33Y/+ZVJ5VlPgBXlk/9S0D+t9KWSgMSdj+KnvnGgpDcF6sefbp48rsOWULlLnW+0edqX1Q44SLnN16tDopwYrTDpf7igj0yEwXAG nVlyrmlZ NCJRpx7IIXnSJKnWnlx49AtRWaVUws2gKVZh4PTk7msSQdsgS3lQPOTZhP7Y+/25r6hans3T4xCC8mdZdJkuo1hUCxfxNtTBP5jdmcYp5ofUUVhqtJmYHNu+ThdHh9uEBKZ+LSSoMB+N6U+mxShEGR/8aNC5WxMTB8EYCz2vZAYcyUWzdHlgod40JquovIiDbo4KHUXfFx8pFRKLECYIJdqpIscjEfmFThLxDz5InvyT4BBkPshzKt06pKEZbyBUL8mQLUavweIU2MAIb8+HRVLf38Dj+ScvY8wSp4IT7QCfvkVjuHRWZNyzPWAdguVqAZXJsNQq2yE2Yj3I= 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: 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 as a default if other requirements for it are met. Add a sysfs override under the dax device to opt out of this behavior. Cc: Andrew Morton Cc: David Hildenbrand Cc: Oscar Salvador Cc: Dan Williams Cc: Dave Jiang Cc: Dave Hansen Cc: Huang Ying Signed-off-by: Vishal Verma --- drivers/dax/dax-private.h | 1 + drivers/dax/bus.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/dax/kmem.c | 7 ++++++- 3 files changed, 55 insertions(+), 1 deletion(-) 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..c8e3ea7c674d 100644 --- a/drivers/dax/bus.c +++ b/drivers/dax/bus.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2017-2018 Intel Corporation. All rights reserved. */ +#include #include +#include #include #include #include @@ -1269,6 +1271,43 @@ static ssize_t numa_node_show(struct device *dev, } static DEVICE_ATTR_RO(numa_node); +static ssize_t memmap_on_memory_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct dev_dax *dev_dax = to_dev_dax(dev); + + return sprintf(buf, "%d\n", dev_dax->memmap_on_memory); +} + +static ssize_t memmap_on_memory_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct dev_dax *dev_dax = to_dev_dax(dev); + struct dax_region *dax_region = dev_dax->region; + ssize_t rc; + bool val; + + rc = kstrtobool(buf, &val); + if (rc) + return rc; + + device_lock(dax_region->dev); + if (!dax_region->dev->driver) { + device_unlock(dax_region->dev); + return -ENXIO; + } + + if (mhp_supports_memmap_on_memory(memory_block_size_bytes())) + dev_dax->memmap_on_memory = val; + else + rc = -ENXIO; + + device_unlock(dax_region->dev); + return rc == 0 ? len : rc; +} +static DEVICE_ATTR_RW(memmap_on_memory); + static umode_t dev_dax_visible(struct kobject *kobj, struct attribute *a, int n) { struct device *dev = container_of(kobj, struct device, kobj); @@ -1295,6 +1334,7 @@ static struct attribute *dev_dax_attributes[] = { &dev_attr_align.attr, &dev_attr_resource.attr, &dev_attr_numa_node.attr, + &dev_attr_memmap_on_memory.attr, NULL, }; @@ -1400,6 +1440,14 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data) dev_dax->align = dax_region->align; ida_init(&dev_dax->ida); + /* + * If supported by memory_hotplug, allow memmap_on_memory behavior by + * default. This can be overridden via sysfs before handing the memory + * over to kmem if desired. + */ + if (mhp_supports_memmap_on_memory(memory_block_size_bytes())) + dev_dax->memmap_on_memory = true; + inode = dax_inode(dax_dev); dev->devt = inode->i_rdev; dev->bus = &dax_bus_type; diff --git a/drivers/dax/kmem.c b/drivers/dax/kmem.c index 898ca9505754..e6976a79093d 100644 --- a/drivers/dax/kmem.c +++ b/drivers/dax/kmem.c @@ -56,6 +56,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 +137,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",