From patchwork Fri Jul 21 01:29:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 13321215 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 0807FC001DF for ; Fri, 21 Jul 2023 01:45:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 97416280178; Thu, 20 Jul 2023 21:45:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 924B528004C; Thu, 20 Jul 2023 21:45:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7ECD2280178; Thu, 20 Jul 2023 21:45:17 -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 6EE1828004C for ; Thu, 20 Jul 2023 21:45:17 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3F2F28033B for ; Fri, 21 Jul 2023 01:45:17 +0000 (UTC) X-FDA: 81033926274.18.E2C1D68 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by imf04.hostedemail.com (Postfix) with ESMTP id 0F0A140003 for ; Fri, 21 Jul 2023 01:45:14 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="Ac4YGZ/K"; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf04.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.151 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689903915; a=rsa-sha256; cv=none; b=n06Z9HSWUCseaOiUkiteFa1bm7eIkfuKyVvRfwJhq/5bweYKRlbnA23OzO0CFXED5ZoxVH QJz3f1zIMvRE3MzwOqip0a2nEnj1xesqv1ekPYGDbiAZAHW3erW5h2z64Lj1st8pJgPz8e kOjOOtnaGaVbO/5uGUVym5O+8qARD7s= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="Ac4YGZ/K"; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf04.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.151 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=1689903915; 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=n/059tWDwb6h9OFYl+aaQLrJGxJ5mzyXZfhJtkSs3UjjjIe8meFimJ/5Bgd2LtWqvZhvsS bv2kyfnFWjUl9URGRNHFhYFQaao+r2XQLvrcu1LEmFERSyuIYDJc3COuvbn9TJdXorsBi7 8Y/6c4uUrvPai1gSSqHAaA0jvtL5vZY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689903915; x=1721439915; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3Hn5VMwJGt0IXFlVjJsaiQl5L2c0xHT5vclGupSQt0Q=; b=Ac4YGZ/Kq+NYgS5BjFmjKY0YuO/Yh2aK3dLPLO4lb4F4mDwYWg5PS1dr hyJFPXFPa++55P3cOfg47A/1BYni3LobNkyLhAXJV0JrcJpg9/vXRsa5j RGSM5VTNWs8M1yMgRc1fPWEOu5unokPUZQOXq1U9aPUel/og4cBaGpHRM RSx99wALsb7OcQaBYtUTkxIXXshO0qRB4201QrnOo81Ifzk+nGciJVzdk KiICKdJGBcLeB6KtK/G0yJoTBFXHwGsRyyeuSsPDPHwqDb9nj6irkH2k0 HNaCdiaTL9CW2soXKyaRaiKZ7FlK4djdX43lq/hVduQ4fkwxoWhy0FiTI w==; X-IronPort-AV: E=McAfee;i="6600,9927,10777"; a="347214164" X-IronPort-AV: E=Sophos;i="6.01,220,1684825200"; d="scan'208";a="347214164" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2023 18:45:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10777"; a="724671020" X-IronPort-AV: E=Sophos;i="6.01,220,1684825200"; d="scan'208";a="724671020" Received: from yanfeng1-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.29.24]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2023 18:45:09 -0700 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-cxl@vger.kernel.org, nvdimm@lists.linux.dev, linux-acpi@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 RESEND 2/4] acpi, hmat: refactor hmat_register_target_initiators() Date: Fri, 21 Jul 2023 09:29:30 +0800 Message-Id: <20230721012932.190742-3-ying.huang@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230721012932.190742-1-ying.huang@intel.com> References: <20230721012932.190742-1-ying.huang@intel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 0F0A140003 X-Stat-Signature: fc1g3zck1n787mnwzpbgi3dwsg1kzzoh X-HE-Tag: 1689903914-158934 X-HE-Meta: U2FsdGVkX18WEMdRFyAz3qK5bFRUyMY769zv3udG0O13UvUQRBWt5SpAFnccg+AYbwl4hzvsiVgTQ/KMOE6W0DQpSRjECKCZMJafUuipLqfcgy+A2qdDZ+XPzsx9i/CAy74EE7hww1SmIAQiCYB0SmIlu2SL2WX4vMTlWU2DixJ83blMH3cTt0jkBXMAL75rsdeMu+Tni3/UmaebGGqz1qYy39c5uoWKo/mLW3ik+IROK7akWyzENrC0Iqf/o0Ru6pIqPzMobsr7d6eJ7YRFvjdcGlhyNt92EeCRxhmatR7q34WWkllcC8qQ9EwC/Rz1Y2rvaJjRYYCRMkVK+fBYUzpqAA/2CE8VqXdDj2fVnMqO7EdBkqZv8bQhUnzKdOryNSIGKzFTI+DOfULX0MdPp+JD8Kx7yDzq6MicKx4YPkq6WfBpYxKEQ01KL/uNfNo8AsASX1YZ1wuYSpL8BtM2x92Q3HgHph9IyEgn3VeZ5dUT1WU40/NOnwe4XUbbvfRa+CRZvUgQBYLdKYDUumHOp2TWMR+4A5MCFuI5isnwd94+oD3bSS0HLoW3Z+Q7OuuQ7Xu8ER1FqGC77KXqaWJaYLRXgQuAGyLmBkC9nzhB/05lxqPBOVI6OIEtJmrgpxT7SYuG1hrc0ky2dOvrGuslmM8VgVVDit82EnqCcrJu84048kEqj05yf+gdUlXRlTjaXNeGbkmrfBlNH5RkpdW+yFO6BkJWvZGy38hwyHVfM2Kp7q4lmopNA+3EWwJygCpCNg8qDxePN0fEPgZBEJ3mEBDBGvSrvwFjjdRaBzohQ4wdT6koAK9/QsLd97UKBW7DH4JV+a+xhaK2X/P6VmKoQshvDMUS2JGsmZqohcVqPuApqC3xYZWLELNiit9AyZwJxAnXGVCOvx0uBig7wOXIq35FspPSQmQGnL1NX5w5AEZFptG2S/4FdrNv0IK1nTJCk5E6o50vDCR3Xdrt0wk eZD6eBxN G1lGsawhm4jHRW45Wb0Ve+DaN3cPFfZPAmhrqkjbcIws9afBfrmLPiRlGLB4iBAvFv+uzIrhEE/pIkB7LHrFuW99YthiSceishAo3olpCMy1dKrAWki89wmnCZSRz2RvLss0TuQWvMD5HQ/gWEBZK8SE5pa1KMi2XTFnCkkOBMMO7TQY1h+IvrGnzK7ZkCfW67bnZ4z7UNcC0rakm3zXgUnymuJXKC3UDwDdj1yxWVdZL0znS3luELCl/C7TNrW/jqMxMfdyAYbU9FFf6i3UFq2xBBEOA23oZzFbsxv6W9klY18U+mqD1MjfaD0cFVbmzGoD7jvE7d922ecPIlUL0W8PxnSs0xFmT6XKV8WfJKrQUzebYMba3nGciiQryqjBtZb3eZtbtViVEA35jISidNZKG2ZNlEe8iJ6qy5gmWdMN3TnzmNIdxun0S2+9zzFOb42sB7BRc8kFChOyRwoCFtE1o7V0jI6CsVgoNxT8eVBmaZxodBz/nYTdt6w== 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 Reviewed-by: Alistair Popple Tested-by: Alistair Popple --- 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);