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 0E1DFEB64D9 for ; Wed, 12 Jul 2023 07:49:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9E3D96B0078; Wed, 12 Jul 2023 03:49:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 993ED8D0001; Wed, 12 Jul 2023 03:49:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 85C566B007D; Wed, 12 Jul 2023 03:49:27 -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 787AF6B0078 for ; Wed, 12 Jul 2023 03:49:27 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 56F7DA01A8 for ; Wed, 12 Jul 2023 07:49:27 +0000 (UTC) X-FDA: 81002184774.03.9DA527F Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by imf22.hostedemail.com (Postfix) with ESMTP id 259ADC0019 for ; Wed, 12 Jul 2023 07:49:24 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=iZDGd3wN; spf=pass (imf22.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.20 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=1689148165; 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=57j5bkDByog/ext/hXgYlpRrsqAj6GMku5TIZq1E3C8=; b=yD+oBUmD36ErKbQf6FKkSOw0Z+sVIuji3cuOQxcMre/xIpM1F55iNSoP8OSn5nQ/lkMxk2 Oig+92zoYJ5sS2uyjzroCPswFE6UKnt61+zi7b9NiDqqJfe0upT7Kg/C8NUL5TqiYjsxh7 bhXS3JdOdNNRJZ2vWvt0QJrT2kOJQsA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689148165; a=rsa-sha256; cv=none; b=ws6EJeaJfat1DnbCEzxpgXoYf5qnKLbwgTRqbJvsctg5oUv2/AWAiWgVtzmuLzukzF0tED MEafy1fkb5r94aGm3ZEs8OoaiOXF5fTJH4F55/RdBdxpMJWpMlfhF5bmMfMu/AsUGB5zAL bYClaJ9AFIv22e17bfhCuTrhCsUgVdU= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=iZDGd3wN; spf=pass (imf22.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.20 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=1689148165; x=1720684165; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3Hn5VMwJGt0IXFlVjJsaiQl5L2c0xHT5vclGupSQt0Q=; b=iZDGd3wNTqK+XRLuqdhq+Y7bRe0FxpYlKs8uFcNStDcf+7xdS3DZbVyc PUEARMMYjQgQBUq3uikpO5Xk83y0xZOceT5GkXk1vS037WrnqyyrH7dMW 514cLMqzP+ZPvbzVPRh1RDuB6eRpfqSfRSwncKGgs7flTE91d+G+sG0dC dRMlaXovVz61VJjhjIlCXZN1z2ssGT3E0LfVUFIUwY1VJ8gUlvrU9BbPl unB4nD5h6JixxOSwCkPb+1jjACyu3sOYQkfOv/RPwk3CnQCgHLbsjOWMh xDnBCgUEmKXXMg6i8utUg0aY0n4tZlxC1fLiRn2AuZ3SfGpM1zNQcqD5L A==; X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="354734552" X-IronPort-AV: E=Sophos;i="6.01,199,1684825200"; d="scan'208";a="354734552" 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:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="698744883" X-IronPort-AV: E=Sophos;i="6.01,199,1684825200"; d="scan'208";a="698744883" 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:20 -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 2/4] acpi, hmat: refactor hmat_register_target_initiators() Date: Wed, 12 Jul 2023 15:48:58 +0800 Message-Id: <20230712074900.404064-3-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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 259ADC0019 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: pc6o1fy81w6i8yq95afmbcpf7fneqagh X-HE-Tag: 1689148164-117260 X-HE-Meta: U2FsdGVkX18voyu0QFeyp+0ARdE2ZYCpXbhSkCs7FwxWiX+gXNqcHOA8Xs2sruZ3PyNk+O5NkMYrqU+xz6quSWNP0JQDDNOYEPUOh/RfOGkFu21PfobnwDrmLc14NsW8xS8nyU3RX66VIMgrZZ6MkyjlkNdvWX3XWzDOw0W2uq3sZfImI4k7shQuRJqGtOAxr0SOdWxLqs0NUwXnUWnyli4N/5xl9zUNfkzvcD/8O1FmuobPkQTOt/q8U5OYYhz0acm5mD0pLIzxiO6grINvknZBw09tse3Jjfcyafbteih0z+AUJDQXSuIVzbzQqVtC/FWVzBYpbHTkioB0hBDdyNL62rmKMdIH7K4AJv8lblY3iqMTKYo26J73s5rK0ELW0KfY/pkJBM9EheRiWrWygZOXzz0hvXM4JznRcBRGE9dzrwuRaKOY4KAeEsau1i/TmHq3/OdjkZYbsSf0Cef/X/QkRaJfqOgelOJSbRcmgoM9AvuzVL38aT9u2dk8+8XF20TTo+7GMw6OQU7N0Yw+/J/SryWIW6QqMmckZIfoVDQF++Vg60b6DZkN8oc0FbHNcSKFPVYz5MjvHeuhad3SLgm0rJ6WFGH8Q5JtzSDwQJ8okUM0cXmfu4tumVMOqbR6FNITrAI3qMl0wJoGWeBx1irnVewT6JRKm5ZslzOSah/VoBJO5r78u1mKF7u21fUewwWkZpuRMfjUd+wXG24QbqIAfRF6pGnRPZhwO8qtvThi+lwmzPj36rtAunrneeSaRXkdExDqFJAKj3HyJIGT0a/m91KrlO8w6H/EIEkpz7x80NX8M4IiPqf/blyvTCAG7O4YljkDL0qsouWTnafIec0Gu27il7OubuDSMmIbIXJdDV1R2kvRuNbIIhsFXM+PQNDxvsvQaH4VSmOVlen/8odAUL2NqXfIZhttL969f3OVK8V2qGecqLa01GDALR3WeUhyG3k40jlY1TDtSla NDa4Ozli NS4RaIs2Ye2LzBa6mmFrG3Pq/LtabqeP5NbSfbVKOfFlJ4upg403Kx53NaicmpHuKVjVowzihwXWcCRMYKHOcL0uDjo4Fm4g79usV2j18PONtIxi1o2zjmC4CkPIbiy1sNw9qcmyg3gBcR7Kx4ByErKrhys7a57a2/747xZfBvgXitU0XHn1erB2SP6CEN+gmYMpHmut9ASkJzQsz2xq8O348h03fXLUtHCrSqwzDlAJol+ADcUx3JNfRJJao0AcVPwamyNmHqzY2aqsbdiyYi2gmwOFF+BwkxUs5Ccqi+/v9OIWc8cOqAMRArxYpmiw6h8pE1c6LF3SXZHZ41ifYdqsf4/Ti/2zEsiy9yuiip6Y3h9uKDsOv0+J+H/Dy63FBUUs2ZExEX0IzX/9SXCMWRz7c4pFcuzQbKkEyX4PoeUY5m2eqKAXWmihxDifsn053t3SUc823Bz8WVQtlcuCQYyAi2ObEuvY00JTj7KGdOUryKPt7YMEMUAypKg== 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" 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 | 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); -- 2.39.2