From patchwork Fri Jun 16 07:05:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 13282161 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 788A0EB64D8 for ; Fri, 16 Jun 2023 07:06:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F16838E0007; Fri, 16 Jun 2023 03:06:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E9DE38E0003; Fri, 16 Jun 2023 03:06:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF11C8E0007; Fri, 16 Jun 2023 03:06:44 -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 B53BD8E0003 for ; Fri, 16 Jun 2023 03:06:44 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 792E740B09 for ; Fri, 16 Jun 2023 07:06:44 +0000 (UTC) X-FDA: 80907728328.27.E003372 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf28.hostedemail.com (Postfix) with ESMTP id 52BE9C0016 for ; Fri, 16 Jun 2023 07:06:42 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=RcD6kQ8+; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf28.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.24 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=1686899202; 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=5gIuz0aTjS9U0fh0qkl+B3NT7lwCN2asmsH/d+KsHDc=; b=xQrFSQM3Jth9tvRDRwf/kM2oz9BBg/uPN2fdsqF8us8xexQtDUpdNznbTRwphBQKFgwOwx qHQaCpML1vy4b+OeWVMIglZptYINHd/KEn+064h/o25pR993kmDGc5iIyLBFyKHPI65QOv FzpkMMkN9KQo6Jl+5ZoBDBy9FIuEvto= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=RcD6kQ8+; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf28.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686899202; a=rsa-sha256; cv=none; b=AB35rL2AWD017FYR1QmbiGK5V9DHEwqaF8U3yhGUfvSHcvbES8HdyxAqxnNZqWLVhpXQDH qmmhfDG7pMjuxpTTx4tv1cTSj0EmPVtToDA62423pvQTPPwOHvAZkuDux9Sj7eIlpQbyM2 pneXxfjj4MOoI1FUDc2FwQ/8o6ztO64= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686899202; x=1718435202; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RTaDfZ9VPFX57fvR1Dzfk2rQNkh7YYvcsGhFjCOwvYY=; b=RcD6kQ8+GPc0EllpS5Ixy8Gga80IhaLvpLS8N1YD3rb07bqM/88Kiwud xKWPe0mnGmTjneo3CSdlEhQ7Zvns7fnk5NVZc2e9O0nTHJYxhnPpjji4L cO29QiVVwTSiaJ960T0ZhJ2Cu+lTsiwsh5odFuj9LILprY+aFqKsV9I++ 9I0WJRDiIn1U8f+oqaGNC2EpQ9XAd9dEStztZu082jH28ftKvdLi26RQR gwgq+R95toPejViBx1ASWZYsm0dk8drskzTEtTxZle6+QFoUJTU/Kde7u WpHIfkQ4e0bqXDaNQ0u37FKDZ26b2pdJoNdKMHfMAv8dHBWJAnKA5faFd A==; X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="361668886" X-IronPort-AV: E=Sophos;i="6.00,246,1681196400"; d="scan'208";a="361668886" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2023 00:06:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="782784018" X-IronPort-AV: E=Sophos;i="6.00,246,1681196400"; d="scan'208";a="782784018" Received: from cpeng15-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.31.216]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2023 00:06:19 -0700 From: Huang Ying To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Andrew Morton , 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: [RFC 4/4] dax, kmem: calculate abstract distance with general interface Date: Fri, 16 Jun 2023 15:05:38 +0800 Message-Id: <20230616070538.190042-5-ying.huang@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230616070538.190042-1-ying.huang@intel.com> References: <20230616070538.190042-1-ying.huang@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 52BE9C0016 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: eeqc9mscoz9rhebx91frk1x91dnk1dpy X-HE-Tag: 1686899202-416481 X-HE-Meta: U2FsdGVkX19TFjUO3vqgLtQMzXx20tpmQcrpcuhmQEtc57anaaeLR66R76zTpcxQrf8tlBSMp4ERxtQRCkjbkJ1+efu6SNudUphnZ9EjbApsjy9KthQotOD6SgnqHweDkdcpGJiqYm/JuRH5r/TkthNfuKe7BRRMHp0OgJ+gX8AHbeZm9x09bO872BD8PGNx9ie9WM50VNi0uWdB46xuNqe9pKsDaIe6zNhSfSDP5oq3nayetbP9ln5ifJqAiKi3D855zocJ59u5r3L7wDMgpWEKJcsAgCCxCoTwBCLZDjMeOVFgeb2Q6tAFa9XRvnPJIC324JpO5CHoKt6TgKDSjJRS3VB0BHMVvdNwuqfMCEDk82GEwy1IJlr3W8RY1HYr2PhzPk/H2Xzli3IdjOPOweLQ2NjJQH5eX9VcMPP/iE4+GUz+jOOEL0efqxZrv0wK3weQaRtL7B8ATmoEPPbARRWn+hFscj5wCP9N8Tba0x+tINgYYzwTcq+gpzVH6TLyfkWDs3d3G4wKb27KlDcwbpZrOHOdFtRwaYFjj3eNlphnu+XUCnXQ+IMvvBgRun+jWoz9QwpNeUvxW9RlOqAxpUmRvv7HxoQ3komzZ/o1HnAK0KJGy7V0Q8Z1ZZvXceFTUGM3buzyBTj9ZN4AnZj9U/IIO8Db1Xfq6vJV4VXac5zask8T59n+aU+P9hD28Oan+5hQwcTQMrPSkco9CLWxfWbHtkPXXlpKGeCFIZiG2ksuqGOLAznvIggyTiWF9Z0KvRKxlM6zVrblfRnAlJ3bc/OVCRFWQfEokZDz7zgD1pTlIssol+OpdRoGd3uHBPzHUdroOyKJ0Z3t0FjDTg2in4Dv6Bz+3T5DHFBjkg7/okC3ghg50CDWyY3wRboVmOL4tPiwRr7ZECeYV0rBQA0IaZAxzoDznf9z2uieQmMX3RWa19bVNSFx/XVMSKrNUuZj67zsbZeig6fk+x740jT XOfT6zTQ CREtKW5hJVb0i+RwJNMCsq0b5R2sqLGy1X++3Oi+przu1qW9feQ+/b3dIKmlXlN3utjK9+MmVXL/6zvXN1cRtVXrrrCa6LJd7Do3Rrc5AwKGNC+Y+0AIeLd3+QVIsKeCNH1B6xsJKRSCbVkcCndMcR8Tp8rAdrtQFw1MxrNJOq50NYEPOWe7+bTdlt0Bn78siPLxX8kyMlNvjAcc0fOcuCIRxIaDDvRBUAQYrFtma23RMTHIv1WFbviiy8TCIC5vfiCr3EpUq22pnNJHAkCq5krL+VEzQm+TgCuYeS3rYP/L5/d/srl2+PZQHZL0e4z3hWbdVOe1PnJsCZ2uiWG0SGRkgaCAOvv+EstCgpLRdKeJzswmFSGaKlBVAuxVFRgZg1C1rGhfLqbml8ujZ3j+oSC+tyNIWC9hGzUBTWVeBMy0Zb1HApQDwgyoEUwW53BwW6WjuM75TtRK5S6s= 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 7b36db6f1cbd..079f53315562 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 3aabc7240402..8a763a765238 100644 --- a/mm/memory-tiers.c +++ b/mm/memory-tiers.c @@ -582,7 +582,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,