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 15DC0C001B0 for ; Wed, 16 Aug 2023 08:00:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9FCDC280010; Wed, 16 Aug 2023 04:00:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9ACBC8D0021; Wed, 16 Aug 2023 04:00:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7FF42280010; Wed, 16 Aug 2023 04:00:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6D31F8D0021 for ; Wed, 16 Aug 2023 04:00:56 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 333F680E54 for ; Wed, 16 Aug 2023 08:00:56 +0000 (UTC) X-FDA: 81129221712.29.E367E34 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by imf25.hostedemail.com (Postfix) with ESMTP id D642FA0024 for ; Wed, 16 Aug 2023 08:00:53 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=QIRehXCx; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf25.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.136 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=1692172854; 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=ple2qLF/9v262kzXhtyYsZdZGNZwi86M+XBmt7iXJls=; b=jPqRE1rxd95pbj70yZfNGdg+i0PUrwxA2+pyqXVp/+6GnNKuAxqjKIWmRVNvyjC8CeSc9D HM1SyTuLvtD9mYwBZ7+2w4CbG8+k8IkyUpjeRQkjiGJ/waolJl3ekGuXR1gzqE92nkeaFe IhbnlVaCQsYhlZ/FGH1esifbi+rY6JY= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=QIRehXCx; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf25.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692172854; a=rsa-sha256; cv=none; b=C8WNC1thxjxHBE35hzdNfJ2XU63qAd8U6u86aPFfEobCjSf+eez0riWosNXcFE2ew7viNS bXaYrkRX6SZifGy/GQ+kjErsJvlzCmy6rnLAzNe3aTDkOypOtcDy8EQSEFKE4V/FjJNklE 0h24aXMRAvXTZ1vnki53mfngW5EdQuA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692172853; x=1723708853; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+UQwwd17z7WFVjrXjNbRVmdJdagQCRgAkM7c4A6D7Rs=; b=QIRehXCx+/GfPIBqWW+LWSOerucPpmd4FDPuymQLnRb12zJz36Qhw69K yr5628K7aCpxV5MHmWtJWaps3D7EIyr/gWLJzOfSb2a+/Dx/S6heywow4 dtFA3sGnQ9dRwkFQYTBQTZRAHdcwDm7D2M7sNkxA/JVbfn+vSUmk+Sz79 thYeRMU/M8avqIvo/RUJ7iPPjnMi1PTPYLetZRLGthk7JfZjVjBhxt4Wk dynpu3sDL7AJIJsdfi1icpCBZJXd7wCvLzVFqcB4BPvOR53X1d2YAsNva CDhS2a3K5ypoBnfQU970ryPkCl0KURXIYHZtWAfwoCMeVyu03upzjlCze w==; X-IronPort-AV: E=McAfee;i="6600,9927,10803"; a="352058170" X-IronPort-AV: E=Sophos;i="6.01,176,1684825200"; d="scan'208";a="352058170" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Aug 2023 01:00:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10803"; a="804112799" X-IronPort-AV: E=Sophos;i="6.01,176,1684825200"; d="scan'208";a="804112799" Received: from yhuang6-mobl2.sh.intel.com ([10.238.6.30]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Aug 2023 01:00:46 -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 , Rafael J Wysocki Subject: [PATCH -V2 2/4] acpi, hmat: refactor hmat_register_target_initiators() Date: Wed, 16 Aug 2023 16:00:22 +0800 Message-Id: <20230816080024.105554-3-ying.huang@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230816080024.105554-1-ying.huang@intel.com> References: <20230816080024.105554-1-ying.huang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D642FA0024 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: ey38hwqu5c53s31aki79xgsjuk65hadq X-HE-Tag: 1692172853-350022 X-HE-Meta: U2FsdGVkX1/4h3nQJIgJVgyLb+65OMRS6WFYnqBxNfCds3xGaHQdbVjJSFIwLuPlaSau/2Q75Hr9QfYQnI1GOpMLWXGF6gzYTmHFH46gSq2XP9ByCHSHtX0ZxdHexFjRdTbtSgQYTaTGz1M4FLqjqfaGffv4O2FtE1yq3LiRNuYSZiSruO2AhmkYX/XH4GiaTvF7meWESRgmWeLYDeS7q5o1I2JFmRspFtevG9f3gBaRMnx9ay9GxZb6+yeuuh3EBkXllc1XmZGIKsICJdBdaKAgN7+o0+prNf3uA7ugQl0pxY/J4TeF8FdhA1WDIVLqAXgRIOgsMd+Auh2zMtd/aWr1t+SekOps8UzKd9tUBHPdjgZtJMf56YSR61+HOO4sSrEBqhQhkwXCrgVuSY5Gnh6cktWpuBN6g1Mnnu1neTh4keE8Gzq9eGtwcjdNxahaj9eax/oTmpTPkQB4E1ozPSUD/C4h6OJZGmDbrVDiYvUmF4zNJ/Riih6U38bFEN8lGzFESawKoaDN0vIde8cGVyunAhsJSsszpM1YFxPBwrpYiKdhwX01gWYORMQfd78D2r4SeC3Yq0pzaTc7D4n733NZjerSy/WZuml/6yvHo6sEJ6AOTHKelVPnPHdW9glwhehJS0w2tFR0HDDz1qOJGrDRQbe1yO2xls9hYX1tFinBxv1oEFma+ML52kPFyIJ5a4sl5Jqh6blxDnnpyFEA1bW4Tjp69yW8hARhWQys/amDyvFZFPfA2pPMJla0yMXzJ4Z2SBhE9aJOiPbOv6YYylZtK6UgbAcLGVXBK47GmRLJzPoyOERdOdFjwLUDvs1OskpBOTXVuZbO6U0fGWHUj3DsQgzRrHP1cdRoc2RV3YcYp2yGL9hHmxJH89m/tADLHQdatJI8lwbar2wj8c4ipUlY5IaatMxReSFLUapXTUtgYADcnwKuN3om2npSL56OCLZksquOpigH+Nl6wMJ b0GrKKrZ P3n7b//XW9a2ls2S1y/DHJwsb4deKkOp/6qdmhRUTJ29FN23APa3Npn5MvRtTAoGrxUlUQTVqbWoz3uUyksYccfrxgImQC/1SbpfC1x1rzfyHoSzwx/twyxMbTLuJ9IrY8w9iEaRsQeQRBtsTyXYq93fKlo2FNVLgWLlyWP9tWgzKmKifh/O9jKDbXn4fzAoQ8j6jXHkplazhdOqRzpwTO309OxJOh0hoG5xkopkSWsk919olthg9fMbjXT+NY7UkwD01QdyOTZBCXGTOqykZC1XiZ59es1OlwKNWlEggbujbsHG8AfuCSbqJmZr38+PTIPUIma/zlvyDaxKsZajKUzsn4e3DY7s4QBqsGxIGZECdt2fN6LMZRuQccNvGqjavTINSJOVodFnDN6qE9lHk0hakO2eFAifKiv4LxmYzJubZUgdXMHjtJehOy63Oa+LDE/DvhWjNa+Uip5ga4Q5kqlkPpr6XfqHLF/lnHIGKGLuKcyCSNBWW0ZFQV7uMqM90+iW0wsHOs//t4fQ= 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: 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