From patchwork Wed Nov 16 23:37:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 21341 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp118923wrr; Wed, 16 Nov 2022 15:44:13 -0800 (PST) X-Google-Smtp-Source: AA0mqf7EZXV9Y7LLDiJwjVNzQcUopcnd+8dsHxiS7YJO3vLk/pFv0q4QvcRlo+/y93DxLXyd9VNF X-Received: by 2002:a65:588c:0:b0:434:b8ef:1ec6 with SMTP id d12-20020a65588c000000b00434b8ef1ec6mr22558749pgu.246.1668642253211; Wed, 16 Nov 2022 15:44:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668642253; cv=none; d=google.com; s=arc-20160816; b=o1ExcGIw8FDqwqBWfOG2Zgd6w93TcBTnyCLBLXTLMAUqxoXTUztdF8eyvz9ecORMb3 Q8oveNpVJBEE8txmocywArnbLhoXS/DHCQXZWoVot4Sfl30bXwaujAlqHYa5J8BPWpjA OFPcnoObktOY+jt5QvJR74uQQAKS2K8Vni/lIaY6iEdJ8SRldW+Waw2YPBRoBB9fnAqa i04feSXrc6VukgORe9nV5kND1giNbrcuwxfy4GNwrf5Dq/zi7K+fnSHL5/bnTe+3qJQ0 8NHZbPiy2l569oEjDxjfL5+P4dxTmx8oWM19GWjpzxTmWu5sdVyEzQstyCRxCHKbm+Q4 MHJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=+EvN9wevUdMZ+FZZz3+fIRZqeF5JBwrJDREn1CeNdFE=; b=dY8WwV3A5iEbtEPbIFIBiiUkWmgJEXu+oSmFKr7d8dZyWBH5ACZIyM65zGK8oC35OV IoRiY6i9/COxMbtJWHrmnWbdP+aJ0tNWI+z/2RFZM14EytG7gH0M/nzzGYJnvatP6GLZ tzXPJOLLFCTWr5RsAeBrfNK4Q1WBAn9+myG+SkXaGD30T5VlqdnIfyvrm+pEvxq+akBS WOwY7asp0gY7lt913ACOeNzT23+HRcY/g2s/jEIa3Gq4KrSAF1R7M3pKu6yM+LiVFC6t swBKzxZ01WfrFhbZ9SksXg5XRSGkhRVIDo8AkEw4r3Gb6qUiMdWaOkTw1WSyVKdfUNlz tG6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=XJ11pM1J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qb12-20020a17090b280c00b001fe4eebefe5si2947978pjb.135.2022.11.16.15.44.00; Wed, 16 Nov 2022 15:44:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=XJ11pM1J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233888AbiKPXmy (ORCPT + 99 others); Wed, 16 Nov 2022 18:42:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238951AbiKPXmf (ORCPT ); Wed, 16 Nov 2022 18:42:35 -0500 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E943B70194; Wed, 16 Nov 2022 15:41:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668642088; x=1700178088; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to; bh=51lOlSScMtNXt0xN1+cfGR14o3FY+CtRO0z+BQRrxHI=; b=XJ11pM1JlWWKR41KpZXdg1sA7VIYNoxlZWl8/310qe8E8ttspsIf6R0L +um1SY9khbPNOx+leRn5fKvWpjHW3a9pOUvw05n5J+lFpKdG9KDWpayny JMFiQQq7eYm8ZyQWWNSgGXu0DQk2pjyvSzwgzLAAJlatD1qVmKg+N+xXT c4zRhJWTPwXkuKAOY+Vvl2x/WWWa8en5bFOiarpPkexFQ84Pyqp8OOwam zf6MoEVowldhTduAZflqBAqVOKy9E+PjYlfCLpz95UIUM0yR3viYTOIge NLgnLNWHJVk9Jawck8NOt9wqe0VCHH84KY8Eky2lXB/3zOcflaEP0T08h w==; X-IronPort-AV: E=McAfee;i="6500,9779,10533"; a="292405779" X-IronPort-AV: E=Sophos;i="5.96,169,1665471600"; d="scan'208";a="292405779" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2022 15:41:28 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10533"; a="641848521" X-IronPort-AV: E=Sophos;i="5.96,169,1665471600"; d="scan'208";a="641848521" Received: from jjeyaram-mobl1.amr.corp.intel.com (HELO [192.168.1.28]) ([10.212.1.223]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2022 15:41:27 -0800 From: Vishal Verma Date: Wed, 16 Nov 2022 16:37:36 -0700 Subject: [PATCH v2 1/2] ACPI: HMAT: remove unnecessary variable initialization MIME-Version: 1.0 Message-Id: <20221116-acpi_hmat_fix-v2-1-3712569be691@intel.com> References: <20221116-acpi_hmat_fix-v2-0-3712569be691@intel.com> In-Reply-To: <20221116-acpi_hmat_fix-v2-0-3712569be691@intel.com> To: "Rafael J. Wysocki" , Vishal Verma , linux-kernel@vger.kernel.org, Chris Piper , nvdimm@lists.linux.dev, linux-acpi@vger.kernel.org, "Rafael J. Wysocki" , "Kirill A. Shutemov" , Dan Williams , Liu Shixin , stable@vger.kernel.org X-Mailer: b4 0.11.0-dev-d1636 X-Developer-Signature: v=1; a=openpgp-sha256; l=1117; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=51lOlSScMtNXt0xN1+cfGR14o3FY+CtRO0z+BQRrxHI=; b=owGbwMvMwCXGf25diOft7jLG02pJDMmlpeqV387XKDrnL1W5XHjGteB445I/szYv821ZPCW64y+D 3t3pHaUsDGJcDLJiiix/93xkPCa3PZ8nMMERZg4rE8gQBi5OAZjIsXhGhvNT0uw5Flzl3fGsPfR98d 4lAjamAdlH/XOymz5N+mwr+pWRYUHWnfP5Dnasz87t9dx0IzyqtjtEKoFrn0t7++qta44KcgIA X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749698219290115767?= X-GMAIL-MSGID: =?utf-8?q?1749698219290115767?= In hmat_register_target_initiators(), the variable 'best' gets initialized in the outer per-locality-type for loop. The initialization just before setting up 'Access 1' targets was unnecessary. Remove it. Cc: Rafael J. Wysocki Cc: Liu Shixin Cc: Dan Williams Acked-by: Kirill A. Shutemov Acked-by: Rafael J. Wysocki Signed-off-by: Vishal Verma --- drivers/acpi/numa/hmat.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c index 23f49a2f4d14..144a84f429ed 100644 --- a/drivers/acpi/numa/hmat.c +++ b/drivers/acpi/numa/hmat.c @@ -644,7 +644,6 @@ static void hmat_register_target_initiators(struct memory_target *target) /* Access 1 ignores Generic Initiators */ bitmap_zero(p_nodes, MAX_NUMNODES); list_sort(p_nodes, &initiators, initiator_cmp); - best = 0; for (i = WRITE_LATENCY; i <= READ_BANDWIDTH; i++) { loc = localities_types[i]; if (!loc) From patchwork Wed Nov 16 23:37:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 21342 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp118954wrr; Wed, 16 Nov 2022 15:44:18 -0800 (PST) X-Google-Smtp-Source: AA0mqf6VaSSalia8dWM479EtzhF8OBypMRQCK/jzhf2NN5VC9JH0rFkFc3VD8Skbu/r3+NHAjGOE X-Received: by 2002:a17:906:124d:b0:7ad:b822:d2e4 with SMTP id u13-20020a170906124d00b007adb822d2e4mr137392eja.35.1668642258732; Wed, 16 Nov 2022 15:44:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668642258; cv=none; d=google.com; s=arc-20160816; b=L4kVbyRHPNORMq+Zmbt4b/daV1OY+gAxbOCd2VnGS1wkt73PQEpEf+RSznoMsFC9sn p45rt/ROwXt4Vq1kf2sFpb3NfUDuHO6p0wQ9VZD5lQZYvjd4sLXRiqM3y1mkT0k/VG78 ToPf+QEhB7lWUH58sYrYdmTaohad9LOoa/onrieIFd9PZvdtyDrT0jizwm/FS0WxImdm 5XDY3fG891zhHnPhfM6dCi5DXuvYgr0xPa6VSvEIXewTOWY4bxfX0MTFoGmPS/nlW3Qc iRUeRLjMWjNtJ60fwaUyqWKQqIttFqBLCkApNEK3rfpj/r712c2XL09UUy8z/duv0iHI GDzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=OUJLSR/0XZxIDTJCnMb9mYDEtLB2nZCcgYGIKopcuu8=; b=TDNm+ALI/H/4gHeb+KU8BeBVlFcApCOtXfclzpiNPxesN7ubXUVtlNHlsT+YOd6hxc VJYfto1kfCDU1jize7d5XCDzezE+6EoWL3Pprq6OQcEjy4r8v+JavXFNxmaPatPwA0+5 xOu5sgQJkMAN+wUU5W8Ynp9oklZ0UIpTr9ft192iuQqrqKt5yCa42JCpo99exk7+bvS6 BJprHhd+bOb76yDnToxq21Ze9HLjUzUpeP3DgvG0pLMiz9kiOBvMG+MDShyGYCt7ys0c 5sfmRsnlMCOdAHlb9ALi/0/LsAqlt9cdWwgSCCVxLKzV6S1OxdE48COI/J5Rzy2Rs5ML xm7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OKZRT9+I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id di13-20020a170906730d00b007b273d1f664si5309644ejc.128.2022.11.16.15.43.55; Wed, 16 Nov 2022 15:44:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OKZRT9+I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238704AbiKPXnC (ORCPT + 99 others); Wed, 16 Nov 2022 18:43:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238970AbiKPXmf (ORCPT ); Wed, 16 Nov 2022 18:42:35 -0500 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 902C56DCC5; Wed, 16 Nov 2022 15:41:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668642089; x=1700178089; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to; bh=453B5mw51T7IX+AXE0lYBsFPvcN1QxhgkLQ4Y5mYFRM=; b=OKZRT9+IUlLsVXavPhIOWtmaZl6HZv+qd3K0K9ReCmJ0sMzHtHW/kwHU zXgMUe8dRQPDOmGWLeZcLNpD0MSrgXzW45ysdOUGnLTy7BI+Mn9lj7dsg lZrH7lBreqGz7L6WYTW2Bn5ElW/x2K5R2iEf6hmNvduKQ3sv2P8LKIgdr nrBomr0NSl9RkXr38lcdbpWNe3GVgKyrIvf+twK9SqBuOkvZ537m+EAhE eOn9W4JhUReQrX+JR4cUob6WVqCugTgPJ82HXd5bDg+t8vlaNGYklxhBQ mgCRxHx/LY6tb5+6esejV4rdc9AVhr811HJ5BYo/c6GLhxAIYZ0sVZirT g==; X-IronPort-AV: E=McAfee;i="6500,9779,10533"; a="292405781" X-IronPort-AV: E=Sophos;i="5.96,169,1665471600"; d="scan'208";a="292405781" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2022 15:41:28 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10533"; a="641848525" X-IronPort-AV: E=Sophos;i="5.96,169,1665471600"; d="scan'208";a="641848525" Received: from jjeyaram-mobl1.amr.corp.intel.com (HELO [192.168.1.28]) ([10.212.1.223]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2022 15:41:28 -0800 From: Vishal Verma Date: Wed, 16 Nov 2022 16:37:37 -0700 Subject: [PATCH v2 2/2] ACPI: HMAT: Fix initiator registration for single-initiator systems MIME-Version: 1.0 Message-Id: <20221116-acpi_hmat_fix-v2-2-3712569be691@intel.com> References: <20221116-acpi_hmat_fix-v2-0-3712569be691@intel.com> In-Reply-To: <20221116-acpi_hmat_fix-v2-0-3712569be691@intel.com> To: "Rafael J. Wysocki" , Vishal Verma , linux-kernel@vger.kernel.org, Chris Piper , nvdimm@lists.linux.dev, linux-acpi@vger.kernel.org, "Rafael J. Wysocki" , "Kirill A. Shutemov" , Dan Williams , Liu Shixin , stable@vger.kernel.org X-Mailer: b4 0.11.0-dev-d1636 X-Developer-Signature: v=1; a=openpgp-sha256; l=3352; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=453B5mw51T7IX+AXE0lYBsFPvcN1QxhgkLQ4Y5mYFRM=; b=owGbwMvMwCXGf25diOft7jLG02pJDMmlpeqsYdp2c6xeZyWxh7anfNhvw1H+WbRO+Ayz2zwZr7Sk i787SlkYxLgYZMUUWf7u+ch4TG57Pk9ggiPMHFYmkCEMXJwCMJFb0gz/U172aH6qFWVgmvjmX+DGCo 6b/u//7ddaqnris2xwmIJqOcM/s9eXn8WKzOXZu3v/G7uVJ4siwiUDNFq8lde3/XYJcs7nBgA= X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749698225297504418?= X-GMAIL-MSGID: =?utf-8?q?1749698225297504418?= In a system with a single initiator node, and one or more memory-only 'target' nodes, the memory-only node(s) would fail to register their initiator node correctly. i.e. in sysfs: # ls /sys/devices/system/node/node0/access0/targets/ node0 Where as the correct behavior should be: # ls /sys/devices/system/node/node0/access0/targets/ node0 node1 This happened because hmat_register_target_initiators() uses list_sort() to sort the initiator list, but the sort comparision function (initiator_cmp()) is overloaded to also set the node mask's bits. In a system with a single initiator, the list is singular, and list_sort elides the comparision helper call. Thus the node mask never gets set, and the subsequent search for the best initiator comes up empty. Add a new helper to consume the sorted initiator list, and generate the nodemask, decoupling it from the overloaded initiator_cmp() comparision callback. This prevents the singular list corner case naturally, and makes the code easier to follow as well. Cc: Cc: Rafael J. Wysocki Cc: Liu Shixin Cc: Dan Williams Cc: Kirill A. Shutemov Reported-by: Chris Piper Signed-off-by: Vishal Verma Acked-by: Kirill A. Shutemov Acked-by: Rafael J. Wysocki --- drivers/acpi/numa/hmat.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c index 144a84f429ed..6cceca64a6bc 100644 --- a/drivers/acpi/numa/hmat.c +++ b/drivers/acpi/numa/hmat.c @@ -562,17 +562,26 @@ static int initiator_cmp(void *priv, const struct list_head *a, { struct memory_initiator *ia; struct memory_initiator *ib; - unsigned long *p_nodes = priv; ia = list_entry(a, struct memory_initiator, node); ib = list_entry(b, struct memory_initiator, node); - set_bit(ia->processor_pxm, p_nodes); - set_bit(ib->processor_pxm, p_nodes); - return ia->processor_pxm - ib->processor_pxm; } +static int initiators_to_nodemask(unsigned long *p_nodes) +{ + struct memory_initiator *initiator; + + if (list_empty(&initiators)) + return -ENXIO; + + list_for_each_entry(initiator, &initiators, node) + set_bit(initiator->processor_pxm, p_nodes); + + return 0; +} + static void hmat_register_target_initiators(struct memory_target *target) { static DECLARE_BITMAP(p_nodes, MAX_NUMNODES); @@ -609,7 +618,10 @@ static void hmat_register_target_initiators(struct memory_target *target) * initiators. */ bitmap_zero(p_nodes, MAX_NUMNODES); - list_sort(p_nodes, &initiators, initiator_cmp); + 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]; @@ -643,7 +655,9 @@ static void hmat_register_target_initiators(struct memory_target *target) /* Access 1 ignores Generic Initiators */ bitmap_zero(p_nodes, MAX_NUMNODES); - list_sort(p_nodes, &initiators, initiator_cmp); + if (initiators_to_nodemask(p_nodes) < 0) + return; + for (i = WRITE_LATENCY; i <= READ_BANDWIDTH; i++) { loc = localities_types[i]; if (!loc)