From patchwork Tue Sep 12 08:20: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: 13381037 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 1355FCA0EC3 for ; Tue, 12 Sep 2023 08:21:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A4BC46B00C8; Tue, 12 Sep 2023 04:21:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9FB6B6B00C9; Tue, 12 Sep 2023 04:21:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89C946B00CA; Tue, 12 Sep 2023 04:21:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 742666B00C8 for ; Tue, 12 Sep 2023 04:21:42 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 42DC6160D58 for ; Tue, 12 Sep 2023 08:21:42 +0000 (UTC) X-FDA: 81227251644.02.E0DD118 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by imf06.hostedemail.com (Postfix) with ESMTP id 27492180005 for ; Tue, 12 Sep 2023 08:21:39 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=CfIynwp2; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf06.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.31 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=1694506900; 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=4Fz4vk3QHijuZxzVETRChGkk6iO78maGqNxNvgVL9CY=; b=3PfSZDLXH4Dqv/XUoT3wNefaNekh1JqAO2ed25QnRotW2Z0jLNE2sxLOOR/cxxdJofpalh E4LG8l5MT8TUie9zLRm7yw+H+I/9lSrt1A/9YmxN+GcmRE3yFk2xU3vvZUNXaYbd7B1eHV adMOFM/0jsMbM0tBg+fLjkQ/OwgaiDQ= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=CfIynwp2; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf06.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694506900; a=rsa-sha256; cv=none; b=6ZX2VppK4ukhwTnXzhMj8YhzfBdlc4sILIt2pcCpMRJMBJupdGU3Tim+7hPdkLMHEJ15hc UhXPLx89f3PFExlZLJzPjRPJvvTU2WmX3P+djg1LS1exMqdkENCSz28MDwvqMoc12YsFoJ faJWclHE5OsyF+lbVXHY1xMJ8pZ14pE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694506900; x=1726042900; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3k4HDKCDGdHFd+DzNOtZ0O6HlG4Fjz1fR7N6rjdBsuw=; b=CfIynwp2eq6AEW6Lqx9a8BKp+vncalC3ZejgmI80MDKTE59rXmXK5tU6 9MSWHRmr/Q5Deb++cZF4vqXm/X8owt7NQOyNpBEBwZYpBsiwSKyq4aC4A Ox/o4QfbIJwmWSsu2yELVbcIVCu7nkMYZYjif2NM10lI8VPs2C1DtB6ii 4zPcyGKkllP+AyrEF3Fjm9l62la2UqFRagbzKV+Bgf7Hntxxu2hsV3Lb9 pwoRrXsgu9g9v2Fq/qYbeiKqRD5u8D76v9cLmryseYrGxFUlD4g+y36Ck YRszNuLTl6CTq9YPHPBqFo+drxUXRSTQLlo1O9K0BU95zRGu3nUkgwtH3 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10830"; a="442323025" X-IronPort-AV: E=Sophos;i="6.02,245,1688454000"; d="scan'208";a="442323025" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 01:21:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10830"; a="746787634" X-IronPort-AV: E=Sophos;i="6.02,245,1688454000"; d="scan'208";a="746787634" Received: from shicha9x-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.28.213]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 01:21:29 -0700 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Alistair Popple , Bharata B Rao , "Aneesh Kumar K . V" , Wei Xu , Dan Williams , Dave Hansen , Davidlohr Bueso , Johannes Weiner , Jonathan Cameron , Michal Hocko , Yang Shi , Dave Jiang , Rafael J Wysocki Subject: [PATCH -V3 2/4] acpi, hmat: refactor hmat_register_target_initiators() Date: Tue, 12 Sep 2023 16:20:59 +0800 Message-Id: <20230912082101.342002-3-ying.huang@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230912082101.342002-1-ying.huang@intel.com> References: <20230912082101.342002-1-ying.huang@intel.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: 768r41rymc1uo7sbf9pg1ejsetr57ifb X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 27492180005 X-HE-Tag: 1694506899-240970 X-HE-Meta: U2FsdGVkX19TNst3w1HXlRopwUlScvqeHSBfEPnWZog/OMBqHJ5M5Y5x4CelRJC0G+qiFfTR0Z/LzI6coxFdzyGm9FVMBSyz8EZLPdF1INcG4vTMQbCOW6/cwzHNKD//Y1euNLtqXcFh5pFMm96W7WuM0JBA6WJ6OarL6dFceI/vVXCUeekSkAQVvRxpepcvreDsX9G1w6shVFDNRI2Dy4OM+7tl5L0x/eLGu0+4miV3AZ6WQ01hRoO7YWNC704up+zGQRs6buN9XWbIjHDaowhleSk28gXO/kMULSKI64km7FMAs9+hKcoNCo4bAoXinVJUUrrIEREBvq6c6azWAIQ9ZKlSGYZFRUq5GI0mOimGr9M3nBYIMGctLnq+f1yKA59YvctamyteHvzz6nfJwe7HvVnpEDxqWSw3X1Gf/xyFWg79Tau+dliikD/6sd83/PYyjRCTLxtzwSHj8q372ejFc9rKjcX4A2ZgEHQdMJAjor+VplKRJgdkJEA/UlFZ/gMljwVFUmgITNyepmFkgmgVOia2XooZ3A+cm5oGEnHDNtphDKgDNx8dYp5hH2qtooecGHVFX7CYRHoXYYXuaAfwh38MXP3An4NcVtfHMH8xBOomPQ4ransGCTmA62xjhHBVUEk7KFK9IafStoWRRv3pI888dWAiguJMflsod1j2dZ7ox0pG7d7b/baVPERCvHwTi/e9zpHaLKuWCcFSbBsNxiXdM8cUNi/zM55vHhIiu6/FxxmDYE/vTHhpvo81Zegr9V/ahUGt5N/pXOknlNpYWqojVCrsqrDhBSstm+KjMvkGUYLVJEQdkpDl6uaj91J0/WMqG5VBvtmC8L3zWgh1klPkuG4WyB0z4zdEapXe+OHenVoM2b5i0g3iFhgKAd8bkKq26DdGSD0TxWtKqr0Aipdqq4b1aCKZzBYfx4PrzfQ209ceA6UWZ6f0ham5pOLoGIGJK4Y7r3HwY2e pb8Syjn9 ooI+iQv5pzWEH+//fvt/id6IM/fgxp2ChGMjosWpMBU7AKFtYVjoXW1yL1WbytlUyS7qwM5vfQsBDzUvvwOjE77nWRAxBvqqzbv5FF78t1D/9e5znfecbqBNaGh1HhEuHnw69MtdUk52X3ysx7T0dO8pSTpYAH161aAhK5lDD7ZZ2jguQSOPhu1/aHjeCr6qSriLT1zuX5eYiiXRMgBateZvQxAKcsY815cWT9D5oJRjuN/a6FBoWh94mv0ZpsDl8PvWQjw7auMmuGhONaXoRWwbwbd/RAQ9KujwneR2VcHGOINtj8KfndV3DWbrWCqNEc/8vJknbEdpriIhFoSMa1Rc50Snil0C83CyKcfWX7zDUaGoUR6K/Z46y+RORf/iU+uGYDsBtAbZt2b1mIGBH/gEMIwafBGqQOvq+IR3EGDUUeiZzPH4H6kDTJ/TpL/8Hgo+dHXKmqdWSasFAMUbo0JIs/vexJEEXXqhAWJFvpYhYIUmTzKGiOgf0G7QA5Q6/+gEAcYzej7zw0Xx1IiLeqGqx0g== 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, in hmat_register_target_initiators(), the performance attributes are calculated and the corresponding sysfs links and files are created too. Which is called during memory onlining. But now, to calculate the abstract distance of a memory target before memory onlining, we need to calculate the performance attributes for a memory target without creating sysfs links and files. To do that, hmat_register_target_initiators() is refactored to make it possible to calculate performance attributes separately. Signed-off-by: "Huang, Ying" Reviewed-by: Alistair Popple Tested-by: Alistair Popple Tested-by: Bharata B Rao Cc: Aneesh Kumar K.V Cc: Wei Xu Cc: Dan Williams Cc: Dave Hansen Cc: Davidlohr Bueso Cc: Johannes Weiner Cc: Jonathan Cameron Cc: Michal Hocko Cc: Yang Shi Cc: Dave Jiang Cc: Rafael J Wysocki Reviewed-by: Dave Jiang --- drivers/acpi/numa/hmat.c | 81 +++++++++++++++------------------------- 1 file changed, 30 insertions(+), 51 deletions(-) diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c index bba268ecd802..2dee0098f1a9 100644 --- a/drivers/acpi/numa/hmat.c +++ b/drivers/acpi/numa/hmat.c @@ -582,28 +582,25 @@ static int initiators_to_nodemask(unsigned long *p_nodes) return 0; } -static void hmat_register_target_initiators(struct memory_target *target) +static void hmat_update_target_attrs(struct memory_target *target, + unsigned long *p_nodes, int access) { - static DECLARE_BITMAP(p_nodes, MAX_NUMNODES); struct memory_initiator *initiator; - unsigned int mem_nid, cpu_nid; + unsigned int cpu_nid; struct memory_locality *loc = NULL; u32 best = 0; - bool access0done = false; int i; - mem_nid = pxm_to_node(target->memory_pxm); + bitmap_zero(p_nodes, MAX_NUMNODES); /* - * If the Address Range Structure provides a local processor pxm, link + * If the Address Range Structure provides a local processor pxm, set * only that one. Otherwise, find the best performance attributes and - * register all initiators that match. + * collect all initiators that match. */ if (target->processor_pxm != PXM_INVAL) { cpu_nid = pxm_to_node(target->processor_pxm); - register_memory_node_under_compute_node(mem_nid, cpu_nid, 0); - access0done = true; - if (node_state(cpu_nid, N_CPU)) { - register_memory_node_under_compute_node(mem_nid, cpu_nid, 1); + if (access == 0 || node_state(cpu_nid, N_CPU)) { + set_bit(target->processor_pxm, p_nodes); return; } } @@ -617,47 +614,10 @@ static void hmat_register_target_initiators(struct memory_target *target) * We'll also use the sorting to prime the candidate nodes with known * initiators. */ - bitmap_zero(p_nodes, MAX_NUMNODES); list_sort(NULL, &initiators, initiator_cmp); if (initiators_to_nodemask(p_nodes) < 0) return; - if (!access0done) { - for (i = WRITE_LATENCY; i <= READ_BANDWIDTH; i++) { - loc = localities_types[i]; - if (!loc) - continue; - - best = 0; - list_for_each_entry(initiator, &initiators, node) { - u32 value; - - if (!test_bit(initiator->processor_pxm, p_nodes)) - continue; - - value = hmat_initiator_perf(target, initiator, - loc->hmat_loc); - if (hmat_update_best(loc->hmat_loc->data_type, value, &best)) - bitmap_clear(p_nodes, 0, initiator->processor_pxm); - if (value != best) - clear_bit(initiator->processor_pxm, p_nodes); - } - if (best) - hmat_update_target_access(target, loc->hmat_loc->data_type, - best, 0); - } - - for_each_set_bit(i, p_nodes, MAX_NUMNODES) { - cpu_nid = pxm_to_node(i); - register_memory_node_under_compute_node(mem_nid, cpu_nid, 0); - } - } - - /* Access 1 ignores Generic Initiators */ - bitmap_zero(p_nodes, MAX_NUMNODES); - if (initiators_to_nodemask(p_nodes) < 0) - return; - for (i = WRITE_LATENCY; i <= READ_BANDWIDTH; i++) { loc = localities_types[i]; if (!loc) @@ -667,7 +627,7 @@ static void hmat_register_target_initiators(struct memory_target *target) list_for_each_entry(initiator, &initiators, node) { u32 value; - if (!initiator->has_cpu) { + if (access == 1 && !initiator->has_cpu) { clear_bit(initiator->processor_pxm, p_nodes); continue; } @@ -681,14 +641,33 @@ static void hmat_register_target_initiators(struct memory_target *target) clear_bit(initiator->processor_pxm, p_nodes); } if (best) - hmat_update_target_access(target, loc->hmat_loc->data_type, best, 1); + hmat_update_target_access(target, loc->hmat_loc->data_type, best, access); } +} + +static void __hmat_register_target_initiators(struct memory_target *target, + unsigned long *p_nodes, + int access) +{ + unsigned int mem_nid, cpu_nid; + int i; + + mem_nid = pxm_to_node(target->memory_pxm); + hmat_update_target_attrs(target, p_nodes, access); for_each_set_bit(i, p_nodes, MAX_NUMNODES) { cpu_nid = pxm_to_node(i); - register_memory_node_under_compute_node(mem_nid, cpu_nid, 1); + register_memory_node_under_compute_node(mem_nid, cpu_nid, access); } } +static void hmat_register_target_initiators(struct memory_target *target) +{ + static DECLARE_BITMAP(p_nodes, MAX_NUMNODES); + + __hmat_register_target_initiators(target, p_nodes, 0); + __hmat_register_target_initiators(target, p_nodes, 1); +} + static void hmat_register_target_cache(struct memory_target *target) { unsigned mem_nid = pxm_to_node(target->memory_pxm);