From patchwork Wed Aug 16 08:00:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 13354647 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 4C41CC04A94 for ; Wed, 16 Aug 2023 08:01:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D84E7280012; Wed, 16 Aug 2023 04:01:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D2EAA8D0021; Wed, 16 Aug 2023 04:01:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA932280012; Wed, 16 Aug 2023 04:01:00 -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 A674A8D0021 for ; Wed, 16 Aug 2023 04:01:00 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 7ED181A0E63 for ; Wed, 16 Aug 2023 08:01:00 +0000 (UTC) X-FDA: 81129221880.15.216A35F Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by imf25.hostedemail.com (Postfix) with ESMTP id 59CCBA0009 for ; Wed, 16 Aug 2023 08:00:58 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=NWuvSm3E; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf25.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692172858; 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=/J3xowAfE1zGd7AEaFhJaYn9P3duTkBb5prcu6rPmAk=; b=KN0Nryr5QrMbYnDY2BP7sqsmqg55u44TFM0nljBw1oBYZI52HfRWYR1B6SJNk3recNC2TK ARm4IHZJqohMODjKErvM3yx1B6tmfrIOKAjAoKwabM/IRqdBQV6Y/rUuuMwHit5we8ryFq v72A5MuMQOTmUo1gY8Ot9ab+ylxl69c= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=NWuvSm3E; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf25.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692172858; a=rsa-sha256; cv=none; b=mYWWKSOZhXgTnBOKxdfQoCLwFoW9saNKvrcL6hD8DQON95QvfDfkLA9NU8NQZ+6KNsFz8C UG+q3zWUL4b/oQW7T1FGHbXn9B1MBIk70P8o2xja6qakM53rvRLMlX9xeXg7QvIEJJ3NKf H05KV0M8TgcUJc5zzF+Jg1T8UM0Woxs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692172858; x=1723708858; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6ryYu1foaYe++UHjqS2s7U2JfNL/iOIOHf6dTzEUvXM=; b=NWuvSm3E1zXm1pdJGJQ/XHm1hmzBxrWN7Rp+uNjtgd93CgNMTASAy4sJ k3Hn50fUXqSPJOgOqZhplvZU9RhWG2laT6QBW4EQW0v7reTTnzzo5IVMk UtKUspGuWZhFv2LOMyAPIP4bgvJR3CiHFCue59WmBQX1dtPhOd16DZN59 Y3rnYgzuhdi9Cz01TOnrSYyI6j3itp8bDNeM6gqTayZTn6bBWj65b5YT0 GRA00cCe8OgHGxpjG7G1m4izoXjScYiIY7GSF+OXkipRGQV49H37/buP0 xrPVWTpMCdTr0Ck49EJUvhXS13l79rrpz21XkYOAdXA5dy0UyRTQlX8eD g==; X-IronPort-AV: E=McAfee;i="6600,9927,10803"; a="352058222" X-IronPort-AV: E=Sophos;i="6.01,176,1684825200"; d="scan'208";a="352058222" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Aug 2023 01:00:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10803"; a="804112811" X-IronPort-AV: E=Sophos;i="6.01,176,1684825200"; d="scan'208";a="804112811" Received: from yhuang6-mobl2.sh.intel.com ([10.238.6.30]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Aug 2023 01:00:53 -0700 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Bharata B Rao , "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 -V2 4/4] dax, kmem: calculate abstract distance with general interface Date: Wed, 16 Aug 2023 16:00:24 +0800 Message-Id: <20230816080024.105554-5-ying.huang@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230816080024.105554-1-ying.huang@intel.com> References: <20230816080024.105554-1-ying.huang@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 59CCBA0009 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: txfzo35sydgam5hgaes81qjcmfainhef X-HE-Tag: 1692172858-149007 X-HE-Meta: U2FsdGVkX1+qdOwHT4X5VSMev59i8NuS0tD8ewISrnbJ7/5flPXUa2XadT6IzXxAOMR/7NvT+2DtA2OHUitLZGCzcefxRUm/rgFouV72dx7efd9iBfNG03lf1uK7VmCqfEDnOA+GFPrnT4hWeSEQmxjh8XEjFafdwyjZYX254EdtzAU3RKXVYrPUxcenrT68myPgU0wt4gnMtDnxC7Lru5+TQQcT1RQWy8katedO380OwVB/qaw1PxCzWIkKkTan41yOr4qWW02OMtjeyHgv+OsYcabAnnOJxE+VPIu5xYV9aGhyjR4580BkaH41mBFk9xrTxPGj9msHOOTjzJvT2zn37Fs331dpMvUaNDk/7/bkF/VIJbGfmjSP3TM/fjPu41Ni21DSc1EKiaTfzDSlqUBqcPu19/8pZJfmkGca7SP3bgVMQ06jksHgz8Y3h/2rX2j+rmktRRBaWiFFjmKgRb2enFFqORMBS5xIXCAY60ygKiKzOgGQjc640vSb6QYJL1lihZGaeIiz+SVj5XF7aBcbaTxjZ5hykWUc1vDtSyw/s2MwUT7p35LgS2rjLMz+i4BDZY5Wpe6Z5omnCq2ZM7f5IyAIkoppHLJaIZthpQygVMU8LIb0Hcnv4Rw5DCusIS+st9/63PTGxK0CixEKlD1xciqDikdK9HIs+6pw8Y5wljtpk9n2Zev39VaPiuxKIzdvNBfVo7UDbkdoftpwZ3PffuLcaalTVPX/GLswUIJasa46Dlmh8NQiXFia+GPMk00aw3IT+JwvGm4CZQBPJo741oSxxftof2i17+OLoqpCCnkMbpLizdgoqQOBI72T7wrS82CAJrgLrMkcOdJF7sICLqa1kAQHS92fa2kUw48XDhFn0N4pm10iEDRrdMohZLrndcM4PtVz8aOfAoh20vThqG6WO7ZF/aleP8v/DcbDiXOyrac2yX0mznmvr2FsLeiyYG2vy6WL5ty/dTe kDLl+tYm 222rAzVOjNK5e4tobhBDJa2V4d8OkuGgyP81vlLTqq7lKqsGdZ58F15c2fw7bE8gE71BXiemO81uzaaY6Hq3v7Kx/E5mWT/sJ8lxIUcYd68/raeH267NIcDbW4Lx+3jEOEgxNggNMFawrAElldmqJyj8YdjFqlismUHlaWJfIrW8XegWhAPXqqH0MzBqyozVCcqrOaLXKfdPiti9UddJxx9gy7Dr4cBdB83eQGIUZXZucwJlW1z+Jk2954kp6OZAtGOnhQBe/Kk4wTa7zmgmNWGG1JpYPbwBEPnHcEha85cEYE4zGtFAZXa9XmJMhXY+UsvYFhxVtNLy6AI0CcAUUJ2nRD/5z3nbqsEVQrG2SLx7sy+VkDPYNsOSGQVzWspzo3XF3u3eW7RBKuqD1J2bSF/W829Tpb0t8Mv7mSVxc8fJ9Y+Q8tshLlsvFp73KjxkIsPjYwlsXPwhlBNykOHtLCdhyKTiRjyej2gJ5 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" Tested-by: Bharata B Rao 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..4961f30679fd 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_memory_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_memory_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,