From patchwork Fri Jun 16 07:05:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 13282159 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 DDA89EB64D8 for ; Fri, 16 Jun 2023 07:06:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 48DEC8E0005; Fri, 16 Jun 2023 03:06:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3EE838E0003; Fri, 16 Jun 2023 03:06:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2420C8E0005; Fri, 16 Jun 2023 03:06:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 07D318E0003 for ; Fri, 16 Jun 2023 03:06:42 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id C2ACE1A0B71 for ; Fri, 16 Jun 2023 07:06:41 +0000 (UTC) X-FDA: 80907728202.25.1BBE380 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf28.hostedemail.com (Postfix) with ESMTP id 3C07FC0022 for ; Fri, 16 Jun 2023 07:06:38 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=nZU8NSil; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf28.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.24 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=1686899199; 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=pgaxWf9ukEsI3Gl+i+dLDeS2CD2JHcdaWKpOtfgRxbribqY3dkbR23yzPyVCG2sXAvsnjp N8OFd90G4o4M24VH4Vv4IRuVXF+Av9rGMi/c6PMQhQsQaJ07hNDhcsxdBBLTGvqW8stKbE jRtcNxWUqc9dpX2oKxzz0rjWA3BR8z4= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=nZU8NSil; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf28.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686899199; a=rsa-sha256; cv=none; b=dsd7GlPmiIaxzGijR1PxqOJHH2JCd5J9L0duIvcfbjBEULE3IiVq48W1QWob6tUb5N0+tA 1yllzoazoLGj+KmCSXOPnppWZCivGxc456bafu14bDxcJove/XphVf4L8N/grPNucDhNRz dKURT7AwtoFrfAmoHDJYGtcWkq0FI9A= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686899199; x=1718435199; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3Hn5VMwJGt0IXFlVjJsaiQl5L2c0xHT5vclGupSQt0Q=; b=nZU8NSil0LyMc82otetNNk4qQzQkCy/Wkeu5f2peScEpvTi6m1wgfVuI 0w22zW1cJ0tsbBUT4rG+xKFfSd9FeNN7cQCEfEzB7NOZxN4U8Wm3J62W5 C8I9vgg1X2mNWHKqGHD5zpsx2HgqA8ItJTSNngn0FfwcAIOGMElVBBDqx KPPH08FvnR/8AuYkFHI+Wf9zS4x7hzb2H4Ghui/gWnT+ve8uh8KEJYoEG 7ULaet9wq4yYUUsKgTw+QN+Z4P6his5LaZkfbaiQR6EmbYUebaXcPYMt3 QFDDV4uK/ORMZLWQ6Qv7j2y5ZB+1Og/ccyhgzyeUov9JOFqiEUoPYxgi2 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="361668835" X-IronPort-AV: E=Sophos;i="6.00,246,1681196400"; d="scan'208";a="361668835" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2023 00:06:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="782783888" X-IronPort-AV: E=Sophos;i="6.00,246,1681196400"; d="scan'208";a="782783888" Received: from cpeng15-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.31.216]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2023 00:06:12 -0700 From: Huang Ying To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Andrew Morton , 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: [RFC 2/4] acpi, hmat: refactor hmat_register_target_initiators() Date: Fri, 16 Jun 2023 15:05:36 +0800 Message-Id: <20230616070538.190042-3-ying.huang@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230616070538.190042-1-ying.huang@intel.com> References: <20230616070538.190042-1-ying.huang@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 3C07FC0022 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: uf9e57y7n7aeszarfsd4jdkfpcc7xp64 X-HE-Tag: 1686899198-949175 X-HE-Meta: U2FsdGVkX1+Dmqujj+XtV/8LicrO8RUGdFAMgiP5wi3jnCMJqnlXOMVP5bKfiKnIz/NZvVDqX+GMhJSzmc3VsYWZZ7V7sR0lys2gSm7g7vt3RoWkjSFF3YY3LbOX0Lh485te0VVDndKFGnhd3w+varBN3Tftuu0ae6L06L4nYD8+sLpzeDLXzhVqFzCysJo32O0BcS0W3I0XWZrAlIjQefsJDbSvSGgVuv3QlohxTgkzJtHwSMymhIZldeg/WZn6lLfoIic8p+K3fNzgG+rd922bNbuMuw667OLVuZMOSQO/uJucKV+FcNcYcNwGbwc7mm8XDxhTx+AiwcPoHmyapq1kDT+cOXSNxiciKzBa8nyIzf0e4qAyttBhLGjLH7BEJKE6a/ESSxT9D0o/jqX7AtrNABj9ot9cAN6QPkVzRtPIaN2I2GFutjFupOsTmrTFkucXf31L6p6NCVEp/580YoJehmdhCtgFmh9lIjUDIZvlDwq3DoJH8U4rKR5lV89Q+GJaAdIET+sprrTQ3nufcAULOBncrULvJgMhN61FwwiLXqOvR+nRpCTOtEezS8UdPyPy8lX/8szSO1mnacXYXx1vgCKQXHXpM99nJaGzcJSCd4EEw9fIt7TDkvq1mkDrjiZx9RLAQuyzHPKhvYm7VPvEvVghzT8SBPT1WoWdkiDK5kSr7J2ovuI+8zP1I6REn+SDdhnB6eFrT6VUdK58QvB4MJQtZvYtaTzAVt0cU28wYQuHjQ7jbTh1i8nqo6QcVvvigoF98MuU8ceC9UT+ZcoAXwy8FR2iW5nvdD81crzNcQsvG/+Zwi7btRcRIgVGyyiv+7LBz61vpY4OomzcujF0l5IT3pJ5Ad1x2DGUhwaudekyCdXGadnLYblRS9Xc7PS8q9DV94tsnSN5yrUoIk4PCZEcTxXpGTTmoTLKmxGAIrYRFeib+3uBdIyxEhbdpOZwoewQ0/iTq2tq+Jn zCseeDus lGb3N5IZze0ACfViKJ595jGR3oDwwmBlSjNWcv80uwR+EDVkkQRbvR/hL/d/h2R4xnlBerrZBa1yJl4MVU19F75C1bTeJffd+5BFZzCpp5N8R9flprn9IlD+o2njdclAQv49QZ5JjCqu4a12H2tb0c4WWah7kNjpGCSpPi/ltNR0RsVTDXHtwqscNl0uZ7OMldc8GSjxdle8jIimxQ0Q2o4xXeIzX+IfgXj/TJNYuZoQpq3ez01gfwHuff6kQRyLp9AsvKnxA3Nqq5dLMVu9P+1pdOT78eZZZS+UaGc41d0NHgtJ5yFyQOEMWWPTymVj081A5U08Bz6Z98IdVmtQTCpl6aloVvBqG8b1Kpl4F0TJfb+kQ4ZMQwtqf5xCl31x6fC2SCs7YbH48AnTddeGJZ5H1uhoerzsDPeMbWct08JDvNaXukhGXavJDo90EdGWEAnQCtmTTtloflhaNx53QjqBVCfdCznwb/dv/tzphbcJi+88G6cCKPCvwKA== 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);