From patchwork Fri Jul 21 01:29:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 13321217 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 F3609EB64DA for ; Fri, 21 Jul 2023 01:45:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D85428017A; Thu, 20 Jul 2023 21:45:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 888AA28004C; Thu, 20 Jul 2023 21:45:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7029428017A; Thu, 20 Jul 2023 21:45:28 -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 605D428004C for ; Thu, 20 Jul 2023 21:45:28 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 31D9B1A0309 for ; Fri, 21 Jul 2023 01:45:28 +0000 (UTC) X-FDA: 81033926736.30.6CCDCEF Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by imf07.hostedemail.com (Postfix) with ESMTP id 0208C40003 for ; Fri, 21 Jul 2023 01:45:25 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=gPNblRs0; spf=pass (imf07.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.151 as permitted sender) smtp.mailfrom=ying.huang@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=1689903926; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=QV8Teo1j0CFA6btKhSsxBE6pLS/TyY9NOfA3+UQFqbU=; b=wf1CLLteClhEEQlgyJ4d0oRFauxJ3Rg2MrE3rV4qnGitW5i2EUEI3VqvJeEYEraQrxj6Ik u2DydnfP6YcI0KTHZWsB34AtjTm6tIIoDar41hG1jsNklhRpVPkEI00QFqfCMbZIBX3o3b rEYr4X0fDqUdhc65ljxjkgVTnHbXxOw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689903926; a=rsa-sha256; cv=none; b=T6o5HUmeOyFTtq12JnOZUyTwYIqCnm2aQYmZ5s20b1c1cXactEwGDHqaGvaTIYdnGdcbPC Gj3xuQhWYCIRD0lVmKd6VykhrvVpBLvNplbf3K6vndBDrXGnXEYY0r09Rpooe9WMkqGW1g JqklCUxaHSoo79jbSiLf5pe6vbiUqrs= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=gPNblRs0; spf=pass (imf07.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.151 as permitted sender) smtp.mailfrom=ying.huang@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=1689903926; x=1721439926; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WgH5xLOkBW2Y/oZqJhHhP4ppJv8kSHk1fii5X3wpokk=; b=gPNblRs0gkZzNozH1FkZucPlT9h30GVT6nIPe87tIc9bOoZX9DvZn1IG OfirMVLeuALaBY9fYDPbejT6txNLRd1hDwah0iNA7waa4R4e/wFMzC31d NdAuLbH6C+SJ0eD/+Tiv2OG7XRfXSyZe/t7En6LYsYgBwl0I8yZIUy8MK y2+5I/fdmFkVs8D/RijbUGiCyr46GvCvzJ3Y+3MbBI+So8sfEIVhkEB4p 1qfNa9NRgKeIXxA6mq8IPAsf9usMXoBYXYyBXass/QZRYCx4+fgZ2TFWv QGk64LSV2YFleovyAA5HF9N9txWxaunKzUvHAyK/P2m370LzsiPH12FQD A==; X-IronPort-AV: E=McAfee;i="6600,9927,10777"; a="347214206" X-IronPort-AV: E=Sophos;i="6.01,220,1684825200"; d="scan'208";a="347214206" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2023 18:45:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10777"; a="724671167" X-IronPort-AV: E=Sophos;i="6.01,220,1684825200"; d="scan'208";a="724671167" Received: from yanfeng1-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.29.24]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2023 18:45:20 -0700 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-cxl@vger.kernel.org, nvdimm@lists.linux.dev, linux-acpi@vger.kernel.org, Huang Ying , "Aneesh Kumar K . V" , Wei Xu , Alistair Popple , Dan Williams , Dave Hansen , Davidlohr Bueso , Johannes Weiner , Jonathan Cameron , Michal Hocko , Yang Shi , Rafael J Wysocki Subject: [PATCH RESEND 4/4] dax, kmem: calculate abstract distance with general interface Date: Fri, 21 Jul 2023 09:29:32 +0800 Message-Id: <20230721012932.190742-5-ying.huang@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230721012932.190742-1-ying.huang@intel.com> References: <20230721012932.190742-1-ying.huang@intel.com> MIME-Version: 1.0 X-Stat-Signature: hmm5qmuubinnpb6qt949s7p7qq63prf3 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 0208C40003 X-Rspam-User: X-HE-Tag: 1689903925-467676 X-HE-Meta: U2FsdGVkX1/+U2gEqP/xcrR7PcKzw5XaExYYwxJqhr82HNK/2/UZxFEWeR8Lmoxojxuke+goSorpDCvPNeJhAnh/FnXqqU3+qpFO1S78CDUIALMtqUE6k2O2FJEMwtlmG7tEBn3vs7sIuTBk+VLyfpzaGIxEHG+2fzAjxx6WaDKLo6YVrRHZQFHBfCuEG22JislOkenCDXTgdvfnZtlM7al2JKkurIJZEPIns/UdGKMdtt523MN7bJuDQLvumVfDtw9JZREbtbm/wNHSK3E3j8kzlqfDpaIRD24pV1JEtBEFwTOTQANRziOoPSXoUi9DI+reXbUtTHOC8iJGZbM/9qmxey/zJ2wyQLHMsWZeXpuX/eXdLNPlzDh9yiGnZAaKj2G4Z4PCcGgAM+Gla+72xIiUF8E0+QgfXZkRoOR/r9FZ5uTKb9dQwgnvHf4Xbhs6LV/hb11oXS7DJQpiRypTve01WXL8pZlWdzoF8IO2ALzxAkmkFstFk5bApTd43tbBXViojjzAkK5h3no7uQt6I6/0jzRE59vjZiB7XRFPI6HdHoNRcc0qwEPd+Pxd071q4p7hRpjp6+zYNbVQjixW0voJoPWa3dEqp5GL0inLZd1qMVoYkzrvuDQ6q/3lFM0TEpSgsoWFD4fl7aga/vnIBtFSURkvJLdbS9eAz2N+FxYQIZbA9RkSHa+RUnh+uehExL1uyhMDjNB5z5alIQbGlLmkfjf9Ktojsf7qbL/7qfgSr0VzS/HYZrYLFT6I2FoBD6G8Ust+3INLKgvPzls2K5sE5GmRcVitzp3/3AkAJl2OMxye89NR8YxxQhgp7QZ9Zf/tc4nRzlslyU3CPhBw10kXL+EYBg942RKzcOId2Qu3+rOkde4S9Ki6aWEUN7A6dfwtS+NTbzwWjd41EXsrR2NvL1Y6/zS4t3GOfWGDpfmRKw+jT1OStKfibkr0U93LfQRuw8K2M7UymJAPFRF Lhnveoc8 AxVXaC1SaMF4YefcOR3AN3aZE2Ae9sn0R5WWrO0A2CkTIRDtT9PvzlNVa7y9it7/1UULLZY+KrMYv9d0oER9IEeduV/FU1CUn9yXuFSYb6ejIb4cP5zFUnb0ylIR1bBjh9zg7BiPJmC0U/2RqzmKPBhFmw31OfFC3beq0HOibKllrSRtY1KG00K8I9zmrSKTL8cWq3/olkbdsZSZLXPSYXOqn07SqMEXRABksoJNdpEMK85psZmihzc6zvb2elABVn5BDUlpNy8Srv8vvk5Z7bKKuj6Jjz6u88VPPkPp+DMn/n2kUH+3Bw7iZNi6PYL6Q9nDR/mv76h9V+gYl7YHLeuuUkrrj7n4DMbrCICkDkBvlWuyaRDurvdzzH0yBe+5l3r0ddrEY6eotKZCgEnhGOZbcaTQFSgiJbo/vMa+qiVmvIKUWnufJSM79suvTo0xbGzn7Z9gNJ1W0MGc= 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: Previously, a fixed abstract distance MEMTIER_DEFAULT_DAX_ADISTANCE is used for slow memory type in kmem driver. This limits the usage of kmem driver, for example, it cannot be used for HBM (high bandwidth memory). So, we use the general abstract distance calculation mechanism in kmem drivers to get more accurate abstract distance on systems with proper support. The original MEMTIER_DEFAULT_DAX_ADISTANCE is used as fallback only. Now, multiple memory types may be managed by kmem. These memory types are put into the "kmem_memory_types" list and protected by kmem_memory_type_lock. Signed-off-by: "Huang, Ying" Cc: Aneesh Kumar K.V Cc: Wei Xu Cc: Alistair Popple Cc: Dan Williams Cc: Dave Hansen Cc: Davidlohr Bueso Cc: Johannes Weiner Cc: Jonathan Cameron Cc: Michal Hocko Cc: Yang Shi Cc: Rafael J Wysocki --- drivers/dax/kmem.c | 54 +++++++++++++++++++++++++++--------- include/linux/memory-tiers.h | 2 ++ mm/memory-tiers.c | 2 +- 3 files changed, 44 insertions(+), 14 deletions(-) diff --git a/drivers/dax/kmem.c b/drivers/dax/kmem.c index 898ca9505754..837165037231 100644 --- a/drivers/dax/kmem.c +++ b/drivers/dax/kmem.c @@ -49,14 +49,40 @@ struct dax_kmem_data { struct resource *res[]; }; -static struct memory_dev_type *dax_slowmem_type; +static DEFINE_MUTEX(kmem_memory_type_lock); +static LIST_HEAD(kmem_memory_types); + +static struct memory_dev_type *kmem_find_alloc_memorty_type(int adist) +{ + bool found = false; + struct memory_dev_type *mtype; + + mutex_lock(&kmem_memory_type_lock); + list_for_each_entry(mtype, &kmem_memory_types, list) { + if (mtype->adistance == adist) { + found = true; + break; + } + } + if (!found) { + mtype = alloc_memory_type(adist); + if (!IS_ERR(mtype)) + list_add(&mtype->list, &kmem_memory_types); + } + mutex_unlock(&kmem_memory_type_lock); + + return mtype; +} + static int dev_dax_kmem_probe(struct dev_dax *dev_dax) { struct device *dev = &dev_dax->dev; unsigned long total_len = 0; struct dax_kmem_data *data; + struct memory_dev_type *mtype; int i, rc, mapped = 0; int numa_node; + int adist = MEMTIER_DEFAULT_DAX_ADISTANCE; /* * Ensure good NUMA information for the persistent memory. @@ -71,6 +97,11 @@ static int dev_dax_kmem_probe(struct dev_dax *dev_dax) return -EINVAL; } + mt_calc_adistance(numa_node, &adist); + mtype = kmem_find_alloc_memorty_type(adist); + if (IS_ERR(mtype)) + return PTR_ERR(mtype); + for (i = 0; i < dev_dax->nr_range; i++) { struct range range; @@ -88,7 +119,7 @@ static int dev_dax_kmem_probe(struct dev_dax *dev_dax) return -EINVAL; } - init_node_memory_type(numa_node, dax_slowmem_type); + init_node_memory_type(numa_node, mtype); rc = -ENOMEM; data = kzalloc(struct_size(data, res, dev_dax->nr_range), GFP_KERNEL); @@ -167,7 +198,7 @@ static int dev_dax_kmem_probe(struct dev_dax *dev_dax) err_res_name: kfree(data); err_dax_kmem_data: - clear_node_memory_type(numa_node, dax_slowmem_type); + clear_node_memory_type(numa_node, mtype); return rc; } @@ -219,7 +250,7 @@ static void dev_dax_kmem_remove(struct dev_dax *dev_dax) * for that. This implies this reference will be around * till next reboot. */ - clear_node_memory_type(node, dax_slowmem_type); + clear_node_memory_type(node, NULL); } } #else @@ -251,12 +282,6 @@ static int __init dax_kmem_init(void) if (!kmem_name) return -ENOMEM; - dax_slowmem_type = alloc_memory_type(MEMTIER_DEFAULT_DAX_ADISTANCE); - if (IS_ERR(dax_slowmem_type)) { - rc = PTR_ERR(dax_slowmem_type); - goto err_dax_slowmem_type; - } - rc = dax_driver_register(&device_dax_kmem_driver); if (rc) goto error_dax_driver; @@ -264,18 +289,21 @@ static int __init dax_kmem_init(void) return rc; error_dax_driver: - destroy_memory_type(dax_slowmem_type); -err_dax_slowmem_type: kfree_const(kmem_name); return rc; } static void __exit dax_kmem_exit(void) { + struct memory_dev_type *mtype, *mtn; + dax_driver_unregister(&device_dax_kmem_driver); if (!any_hotremove_failed) kfree_const(kmem_name); - destroy_memory_type(dax_slowmem_type); + list_for_each_entry_safe(mtype, mtn, &kmem_memory_types, list) { + list_del(&mtype->list); + destroy_memory_type(mtype); + } } MODULE_AUTHOR("Intel Corporation"); diff --git a/include/linux/memory-tiers.h b/include/linux/memory-tiers.h index 9377239c8d34..aca22220cb5c 100644 --- a/include/linux/memory-tiers.h +++ b/include/linux/memory-tiers.h @@ -24,6 +24,8 @@ struct memory_tier; struct memory_dev_type { /* list of memory types that are part of same tier as this type */ struct list_head tier_sibiling; + /* list of memory types that are managed by one driver */ + struct list_head list; /* abstract distance for this specific memory type */ int adistance; /* Nodes of same abstract distance */ diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c index 9a734ef2edfb..38005c60fa2d 100644 --- a/mm/memory-tiers.c +++ b/mm/memory-tiers.c @@ -581,7 +581,7 @@ EXPORT_SYMBOL_GPL(init_node_memory_type); void clear_node_memory_type(int node, struct memory_dev_type *memtype) { mutex_lock(&memory_tier_lock); - if (node_memory_types[node].memtype == memtype) + if (node_memory_types[node].memtype == memtype || !memtype) node_memory_types[node].map_count--; /* * If we umapped all the attached devices to this node,