From patchwork Wed Jul 12 07:48:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 13309693 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 1D266EB64DA for ; Wed, 12 Jul 2023 07:49:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63CB38D0001; Wed, 12 Jul 2023 03:49:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5ECC96B007D; Wed, 12 Jul 2023 03:49:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4B2D48D0001; Wed, 12 Jul 2023 03:49:32 -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 3D8976B007B for ; Wed, 12 Jul 2023 03:49:32 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0DF7D1401A0 for ; Wed, 12 Jul 2023 07:49:32 +0000 (UTC) X-FDA: 81002184984.18.5905EF0 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by imf24.hostedemail.com (Postfix) with ESMTP id E3CCF180005 for ; Wed, 12 Jul 2023 07:49:29 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=hQaYVZ2v; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf24.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.20 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=1689148170; 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=zqz1imDRs/kcqAi0UmgBBxno2gXq6mp/yd4rb4WEUco=; b=yRfSm6XjCKAjw16oFAA1V/D/4VXrMUelbT9g4oPS8EwcMvA3M4AypzVmvvf1zqD61ek6zh CkjWf2pHPhaD30LhmkYBxWyWGhTmwO5Un8BPOqOHD8YpX4Ik2XHpl6W2h3P+wvsNSFYAXy Nw64xZ2VPIgsQDu77+GCmUyPHVrlSa8= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=hQaYVZ2v; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf24.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689148170; a=rsa-sha256; cv=none; b=e+RiXeq4/OCWytwvicmTUPPEul3auxmnPWbOwDLJNhAB4wDNpKkUFURFLZbM7wBA2krE1e u7GgFBh15W9YjfXdWu552mLPXNEkp3ZkGJCaAxs6VjDCAEcXicuTSPQZ/QjVMhfiNecJlN h70MnCUHdEssk3qa870CB5dUhUNQyLQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689148170; x=1720684170; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fvluWJnQxPJxRNFSQvnsXlILnnh9VajCo65nakKALGw=; b=hQaYVZ2vhxXWLq6EssSWQ1hxoTiJ9R8nvrWJZS+nCCf1SZKrzEqhLUxy cazCXec0p0z9bsm0/l7rondVqQ6nf+qqtP0prtwcmHe9SUSwt7jYzu5an WO09VHIVk38TTSwhzvwZCoOmsJx8weLR9Wz3wRmOeO6sopc1NcPfW9hnw yIuTW5ZLcZfj6EaHa1JU2IrxGZOCLPRe5zgNPo1AnF9P+9qNsVI9igSPn Jx/UBgM6O7bca6b/nZVW5dEXGPfaJ1hQnYq8A5TAr6A0CG7R8V9HTGhCL 9coJ5OS0PRiCKwhlS43pOy067x7JWM0BhzoD46rWHu4HXr9e7PDK7oL11 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="354734583" X-IronPort-AV: E=Sophos;i="6.01,199,1684825200"; d="scan'208";a="354734583" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2023 00:49:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="698744921" X-IronPort-AV: E=Sophos;i="6.01,199,1684825200"; d="scan'208";a="698744921" Received: from yhuang6-mobl2.sh.intel.com ([10.238.6.30]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2023 00:49:24 -0700 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@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 3/4] acpi, hmat: calculate abstract distance with HMAT Date: Wed, 12 Jul 2023 15:48:59 +0800 Message-Id: <20230712074900.404064-4-ying.huang@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230712074900.404064-1-ying.huang@intel.com> References: <20230712074900.404064-1-ying.huang@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: E3CCF180005 X-Stat-Signature: xmniiaq4bwh9umu45o83wnc61kk14nw3 X-Rspam-User: X-HE-Tag: 1689148169-934005 X-HE-Meta: U2FsdGVkX18LtJi5lAwl/TphCWgtI73GuDFbl+nBYUH4Ov5LVQ/FmUCx6TbwoG3EX1PQGy49g4Fp3jX1LzVy2/aYqQPoYv/Wr8HvJlMdcGfKVtMxFoGXbGlLcni2ZEFVqPoyqs5+iCCsxLHAIioGEJJbTN4ZXGLW1L+wZm94ANpEK1SQoekxCwqVRzEdphDZu4qJ09xEjhs7QrJllA/gihoCHQRRbAPzwPDtKWTiBJxy8oWYgSK5gxQq0nv3AB1MN80oiKn0Kks4VoXrCATnDEH1KRClVxY/azsQFnM4JILdajdh+5VTSUrO68+jih1QqwzJqOrNKEF+ez41kLR7ZVHapXInkxfvQQ6z4RnQGk3UjX9AASgdSlsBJEd/VDnWDEE954CuZ2IohJVxiu1vBFt1uw14ACSvnsk1gdSf1fD3uuzWt64z6NoCd4xCLWxbYMFFZcnfvb/YJhAL0rgm42jozxODnsWzwMJRzU0BYdStuVtAcjMfvkKvBdYMw67X4qzx6DM+QpC1dsG3BnnDJrHoodrjDe6CobrmC/LSBdf9rMYqob2vXlBjrRTmNUsb8OTUMYKvEYD+DTLiraO6d5+e7+SJDgvBqBt/gavrtzb41+xF86mj/KBUACGWoOZXGFp0qW83/NOfGQJA3FhtChuAI3XHVfFg/2pMznTLX90sxKcki4uScDD9B9okPcXJzY4RhbBtnHMJ2yAQRrw+Yi3w7o/Wsz0LX6DSp2ywANXTLS93JdddYSvA25Jn94FBreI+ezLljEk7+3aduSZfEY/5TJlrzd5XuEM54fLg20hrnIQSbnSKVOkWXDonXfAHYwLjk3pDP5M8y+QmsCcY6Do5ISoJ+pZnGU3k5Bpwar7w3Af636NmC6ih2kjav9mShFFA2D+/Qi2LGnjWyidb4wShZzqIoSKl904wbpvGYFBwFIoMmNVQjXnfgEbeMl3V5uRUF0fVOicSwBXU/R2 bl1aPUxC ZV8TmdUjvbxxvOE4PcRoVnJTIEWT0vUWbycwXcX0iI1ECFMIQCUPGQpR6P9dVNUC19RDWhbzZdLw66d7weniCYGPRP/fYhzmHZFZwCnAEi08xvbyjqADXTu95vhSS84Fl1nt13Nz6gtToHKU8JXm4BmtCg8AbXQHnBLmlCwSik0zomiaa2Nckpz+ETzLDXy27drjNTtiJ5M7XCTAI9yp8XFSlXDjnxQ+gWXCCIRq853XEJ9ugZoz92xfIRbOeNVKA7CltTXxQgLmU+sHlAzVujIEQsZUaao3tWVu2eIfK69MIPtK6yyoNgCv+FvqUzOFJmIDCoc6GXKSQ8E5BGQMeNzYTc8Ts1mfbBBRmgVCJMajEShJBJDlC4C7yqjq4IwIxf2SPXNfENZUIDMFx/cY5s8LcBtXBWlLFhmk5S9O+8sTOdnDPRgNMtQP6ZGNNnm6eHzc0YW04NoaRvkQ= 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 | 138 ++++++++++++++++++++++++++++++++++- include/linux/memory-tiers.h | 2 + mm/memory-tiers.c | 2 +- 3 files changed, 140 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c index 2dee0098f1a9..306a912090f0 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,137 @@ 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; + } + + /* + * The performance of all default DRAM nodes is expected + * to be same (that is, the variation is less than 10%). + * And it will be used as base to calculate the abstract + * distance of other memory nodes. + */ + 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; + + /* + * The abstract distance of a memory node is in direct + * proportion to its memory latency (read + write) and + * inversely proportional to its memory bandwidth (read + + * write). The abstract distance, memory latency, and memory + * bandwidth of the default DRAM nodes are used as the base. + */ + *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 +933,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 +974,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 1e55fbe2ad51..9a734ef2edfb 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",