From mboxrd@z Thu Jan 1 00:00:00 1970 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 F318AEB64DA for ; Fri, 16 Jun 2023 07:06:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E8FE8E0006; Fri, 16 Jun 2023 03:06:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 771388E0003; 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 5EB858E0006; Fri, 16 Jun 2023 03:06:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 446BF8E0003 for ; Fri, 16 Jun 2023 03:06:44 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 112E2B032D for ; Fri, 16 Jun 2023 07:06:44 +0000 (UTC) X-FDA: 80907728328.02.AE1ECA7 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf09.hostedemail.com (Postfix) with ESMTP id 97FDD140003 for ; Fri, 16 Jun 2023 07:06:41 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=TBhxk11G; spf=pass (imf09.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.24 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=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=N1ImL0LiDS3Sw8ZhB1FTXkgf1C45E0bfpeHiPJsXpmk=; b=IrCzVLRopJZbhxnEj1sF2+TtMW/WwRh2V940A7QAK9ljwfwIluOhWuUilygK2j/2oQjqtf ysERUX44VyF4SU0BK1mIdmis6uLAnYCDICinM87LAqb7nmkBx/9qZqA+LedV7VfCgGTQvq L0rbmAa1gVqK9yphf4Xlc+c3v64Q2tM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686899202; a=rsa-sha256; cv=none; b=nPP1McMRO2G6+bOHGyzhDbwFi88PUmm+326lXFo09ENyXruGh76T9MfF53gk1nHM8SFPpB THfq4aBKeP7pOofcHWHCv2KvYxG6yrODgH5SqV0WIczYjQY6njBDddTHxhlKK2NEnssunI BdPRY5Z+fI/cV5sqbA6tT8IhP3downk= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=TBhxk11G; spf=pass (imf09.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.24 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=1686899202; x=1718435202; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aOdlEaVHTONo9Kej4YBWg+d/l94TirHxQkRvgXaE8BA=; b=TBhxk11GfJTlchFWMJiCsS5f/78y9BDOF7f4Plb0ppAsm/Z6tLivF0w9 H2NHVoGCoQCakK5E4Ge4kgA4lYTmNBN2cqN/XaP5kBEJfHYWbWuzAq+AU 2kwBMJkq4cpGqtFWv2WEv7Zai17xISjdXXOmx639gDTpBkXotgKlHFZ9w R8wYSaOt+jhPCz5RC/40PPX2WvXBeWPBCkp7HZaXpDdyc5U72afA0ZFDx XNiRfXHjdk5E3gt1UaFk1gOVcDzJ6Y6iNy2mq0kD/QE1CDan8OF4+GUhp qkDhdVuOqvTh6niOhNrA7QE4McqZgHuDTH+5SANUOF+l42bgoo5OI7rOk g==; X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="361668862" X-IronPort-AV: E=Sophos;i="6.00,246,1681196400"; d="scan'208";a="361668862" 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:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="782783995" X-IronPort-AV: E=Sophos;i="6.00,246,1681196400"; d="scan'208";a="782783995" 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:16 -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 3/4] acpi, hmat: calculate abstract distance with HMAT Date: Fri, 16 Jun 2023 15:05:37 +0800 Message-Id: <20230616070538.190042-4-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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 97FDD140003 X-Rspam-User: X-Stat-Signature: z54zbenzz9b7qsboqfhwdptzqmt74jzr X-Rspamd-Server: rspam03 X-HE-Tag: 1686899201-220674 X-HE-Meta: U2FsdGVkX18GieYabOqPKZbf8gO+NwuDNYlcGsLZ7sZayyUvrAdy8n+nvX32lDN+OLQVtbF4sn8Y6wZXw4otuTr8YYLuewHrurMKjpFfI6TF+mXGHF1LyhQ/LZT+GASPgfn1+iGBz25PfQ7HrhB/D5X1OLkv7QNnCR4Gryrhq7j4TSMqN0FZnHWYLYLES/MHM1a34ZZ3N0uaeehiW9IPNV0xsbLeHwx1hCETsqoxirX4v1MNoWI4V3nRfvTOAPWmuxlACuAIGxAGZMzwpme6MRZNpuE4kcgBhJGsRaDVoOX2mLsEVRt9l/Y9WZ/dgRkL5VaHYnNXQHMVoZehG+qIGEUUEIQ38E6nNeyGPh5wpkqRKgseMgDdtnH/iqdsbzZrf1yNVB3nMT3Uc8r51TV9UzVH7NraBaWggNkBA0eAuiCTT+a2Ng+kXF6Ib/mbrnnteVVc+EuNsQIYMoaxeWI/cjRqFGTCoXMB3EcKWdxP97njmzLby8c8Z8Jzrrli5pUyEBf8wKhRxNrrNrLoCPQ22ElEYMz/qSQPoRe0OTILYP176kzCjqSdALIAOkUcfxkKVZUr11KoXh5dD3751yKAtsqbtCamwYz+DD1Lzx5cTOBP2pssLf2mRBNzRam+pj2S0drv5hDpxqBBqqtfMMZduHX32slEfxKHpkDr0We7ub1GZQv2TlK5QbApzaU1WyLfGStn51EaFqwtUnl4CRgxbHY1sVS6RfEgNUqdyxiu8ofKyKEcP+/v3iyWasV7ZT7ioGXbRmUsCDaxQz1e4hIx46CVVEdBi4QnUounqR0JpumH23GN8vsATaRBuByZm9ZLrBvw6N6WXJWTJ+6135u5pvFUxmk8OK45Z13wPAwyQm0Y3WEUx+mov1obGFnwHClTUlGTM9DeQqyoaQ6yedZXe59MYX3Ski6XpE34lHmFHyvsGcZRnARXZHtDPXWlxjSi1L5Imj6plMpH9xMeQXP Ngs2csqM FX/6KXc7NhvSRH4Vvr7voxMaLkkSnewgRw8kQNuhTnElM2rGVerjyLMmXS9IM2i0w+tEYlwyOiTUq7IhzOooprhxinf1WSYk3IuQxcWHmsNIl0xv6cyHvjHie5BCo+AEpOCvBbxiphhA8whO4UngErPPMXMq6cxQjK21ux9pLcOkWneI0myL1WoHL3IahEnrRP8Q/MAHZcVLj5PZ7q2NrTbv31gs2k90jIN4gkFkxWmRz3tgfcMsDJU2TqnbWTgNFwfkhW8HHZKGRv05Ezo1Ak5AG3ZL3//BA1IMvy3aziLr6DEHva6BCv3yrRu+KnTTd3uO0ykL66WpSGwBHIn42oqW17HJ8jC5TIGXOMaGp4/nULyqfl1NFMXutQ1gkIkaec7UQjOY/SHoHH/0MD5Fg5xgLDP7yXHiAM8DlRDUzzsklFycVSBRBbn+zkSokwbgwxNPVHP1x2pFz81o= 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: A memory tiering abstract distance calculation algorithm based on ACPI HMAT is implemented. The basic idea is as follows. The performance attributes of system default DRAM nodes are recorded as the base line. Whose abstract distance is MEMTIER_ADISTANCE_DRAM. Then, the ratio of the abstract distance of a memory node (target) to MEMTIER_ADISTANCE_DRAM is scaled based on the ratio of the performance attributes of the node to that of the default DRAM nodes. 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/acpi/numa/hmat.c | 124 ++++++++++++++++++++++++++++++++++- include/linux/memory-tiers.h | 2 + mm/memory-tiers.c | 2 +- 3 files changed, 126 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c index 2dee0098f1a9..21e4deb581ad 100644 --- a/drivers/acpi/numa/hmat.c +++ b/drivers/acpi/numa/hmat.c @@ -24,6 +24,7 @@ #include #include #include +#include static u8 hmat_revision; static int hmat_disable __initdata; @@ -759,6 +760,123 @@ static int hmat_callback(struct notifier_block *self, return NOTIFY_OK; } +static int hmat_adistance_disabled; +static struct node_hmem_attrs default_dram_attrs; + +static void dump_hmem_attrs(struct node_hmem_attrs *attrs) +{ + pr_cont("read_latency: %u, write_latency: %u, read_bandwidth: %u, write_bandwidth: %u\n", + attrs->read_latency, attrs->write_latency, + attrs->read_bandwidth, attrs->write_bandwidth); +} + +static void disable_hmat_adistance_algorithm(void) +{ + hmat_adistance_disabled = true; +} + +static int hmat_init_default_dram_attrs(void) +{ + struct memory_target *target; + struct node_hmem_attrs *attrs; + int nid, pxm; + int nid_dram = NUMA_NO_NODE; + + if (default_dram_attrs.read_latency + + default_dram_attrs.write_latency != 0) + return 0; + + if (!default_dram_type) + return -EIO; + + for_each_node_mask(nid, default_dram_type->nodes) { + pxm = node_to_pxm(nid); + target = find_mem_target(pxm); + if (!target) + continue; + attrs = &target->hmem_attrs[1]; + if (nid_dram == NUMA_NO_NODE) { + if (attrs->read_latency + attrs->write_latency == 0 || + attrs->read_bandwidth + attrs->write_bandwidth == 0) { + pr_info("hmat: invalid hmem attrs for default DRAM node: %d,\n", + nid); + pr_info(" "); + dump_hmem_attrs(attrs); + pr_info(" disable hmat based abstract distance algorithm.\n"); + disable_hmat_adistance_algorithm(); + return -EIO; + } + nid_dram = nid; + default_dram_attrs = *attrs; + continue; + } + if (abs(attrs->read_latency - default_dram_attrs.read_latency) * 10 > + default_dram_attrs.read_latency || + abs(attrs->write_latency - default_dram_attrs.write_latency) * 10 > + default_dram_attrs.write_latency || + abs(attrs->read_bandwidth - default_dram_attrs.read_bandwidth) * 10 > + default_dram_attrs.read_bandwidth) { + pr_info("hmat: hmem attrs for DRAM nodes mismatch.\n"); + pr_info(" node %d:", nid_dram); + dump_hmem_attrs(&default_dram_attrs); + pr_info(" node %d:", nid); + dump_hmem_attrs(attrs); + pr_info(" disable hmat based abstract distance algorithm.\n"); + disable_hmat_adistance_algorithm(); + return -EIO; + } + } + + return 0; +} + +static int hmat_calculate_adistance(struct notifier_block *self, + unsigned long nid, void *data) +{ + static DECLARE_BITMAP(p_nodes, MAX_NUMNODES); + struct memory_target *target; + struct node_hmem_attrs *attrs; + int *adist = data; + int pxm; + + if (hmat_adistance_disabled) + return NOTIFY_OK; + + pxm = node_to_pxm(nid); + target = find_mem_target(pxm); + if (!target) + return NOTIFY_OK; + + if (hmat_init_default_dram_attrs()) + return NOTIFY_OK; + + mutex_lock(&target_lock); + hmat_update_target_attrs(target, p_nodes, 1); + mutex_unlock(&target_lock); + + attrs = &target->hmem_attrs[1]; + + if (attrs->read_latency + attrs->write_latency == 0 || + attrs->read_bandwidth + attrs->write_bandwidth == 0) + return NOTIFY_OK; + + *adist = MEMTIER_ADISTANCE_DRAM * + (attrs->read_latency + attrs->write_latency) / + (default_dram_attrs.read_latency + + default_dram_attrs.write_latency) * + (default_dram_attrs.read_bandwidth + + default_dram_attrs.write_bandwidth) / + (attrs->read_bandwidth + attrs->write_bandwidth); + + return NOTIFY_STOP; +} + +static __meminitdata struct notifier_block hmat_adist_nb = +{ + .notifier_call = hmat_calculate_adistance, + .priority = 100, +}; + static __init void hmat_free_structures(void) { struct memory_target *target, *tnext; @@ -801,6 +919,7 @@ static __init int hmat_init(void) struct acpi_table_header *tbl; enum acpi_hmat_type i; acpi_status status; + int usage; if (srat_disabled() || hmat_disable) return 0; @@ -841,8 +960,11 @@ static __init int hmat_init(void) hmat_register_targets(); /* Keep the table and structures if the notifier may use them */ - if (!hotplug_memory_notifier(hmat_callback, HMAT_CALLBACK_PRI)) + usage = !hotplug_memory_notifier(hmat_callback, HMAT_CALLBACK_PRI); + usage += !register_mt_adistance_algorithm(&hmat_adist_nb); + if (usage) return 0; + out_put: hmat_free_structures(); acpi_put_table(tbl); diff --git a/include/linux/memory-tiers.h b/include/linux/memory-tiers.h index c6429e624244..9377239c8d34 100644 --- a/include/linux/memory-tiers.h +++ b/include/linux/memory-tiers.h @@ -33,6 +33,7 @@ struct memory_dev_type { #ifdef CONFIG_NUMA extern bool numa_demotion_enabled; +extern struct memory_dev_type *default_dram_type; struct memory_dev_type *alloc_memory_type(int adistance); void destroy_memory_type(struct memory_dev_type *memtype); void init_node_memory_type(int node, struct memory_dev_type *default_type); @@ -64,6 +65,7 @@ static inline bool node_is_toptier(int node) #else #define numa_demotion_enabled false +#define default_dram_type NULL /* * CONFIG_NUMA implementation returns non NULL error. */ diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c index fb5398e710cc..3aabc7240402 100644 --- a/mm/memory-tiers.c +++ b/mm/memory-tiers.c @@ -37,7 +37,7 @@ struct node_memory_type_map { static DEFINE_MUTEX(memory_tier_lock); static LIST_HEAD(memory_tiers); static struct node_memory_type_map node_memory_types[MAX_NUMNODES]; -static struct memory_dev_type *default_dram_type; +struct memory_dev_type *default_dram_type; static struct bus_type memory_tier_subsys = { .name = "memory_tiering", -- 2.39.2