From patchwork Tue Aug 18 14:24:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 247895 Delivered-To: patch@linaro.org Received: by 2002:a54:3b12:0:0:0:0:0 with SMTP id j18csp3178771ect; Tue, 18 Aug 2020 07:27:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOOdtuOug3ZQjxWo8s4y2nJ5Fbkl2tTaON9kTa7gWY7FPQzuUCJ15wdHB5x0Rbf7bBV8Rn X-Received: by 2002:a17:906:5ad8:: with SMTP id x24mr19513848ejs.329.1597760860339; Tue, 18 Aug 2020 07:27:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597760860; cv=none; d=google.com; s=arc-20160816; b=u1EWFSmiOJLnU9AAJaMsp43Sh9toPwsDu7n4xS8l4b4IXFLsWGyV/UHUlnZ9B8JxwD RIiAefUx0A1MUVBoq/WJM4M2hwaR3Zn/5e+d72qjEFRIrpP1I+b7kzHCuPbh5U/ZWfQS MmrGfzCS+VpD9x2NNwUmi9Ca/iYeYZsL3BKFy49gHGWRVzcO9plNwhKlAqrMdij5AAB4 FmHY3TbPtO54XzCVEr4UjpnhBtxSb1sm7bCEAr1ai1XfOOejkJHqo9FrukinBoKXaRlV i77sebw50DUgDa5AZM/1JzjMM4IdBjSDiXssCpBs8+aRbKyxCLAXhX1yJwxciQK/miE+ CJOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=7nwlFLLZmX874SgDqLUCOBl4TN83PVMhh6CUaw50TM0=; b=BK7DCuUggpRacd/hI8qdTBDEjhF7xG+Yw6XOePNaT00KVHOi45n8t0YKdznZpmpn6Y WCeD07dxUhruunSqP5bZdL6B6+e8CEoye88pNtvN0Pzt8EFcjBO9CAYYsfbhWNeaEKEt Kz4+OUkamI9ui+CMyu5GxS+yJz1iyQ1yyEF1WZOMa19rKQy3IY1kkAy/bb0uQuHb1E68 +TxBlpc2Fl+D4MhPW/RyrFC89NNOWkBl43DV5av0sQ4pnPEImpBFB3OiUUpYmWcq1Im2 ZvmOJWsVMJr2DREA4nG2bv7woyYmeBfg6A0VREYl2GxMa6/OqqXQthk8+ZnGWLUEIzkC 223g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h7si13339651ejx.254.2020.08.18.07.27.40; Tue, 18 Aug 2020 07:27:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726879AbgHRO1j (ORCPT + 7 others); Tue, 18 Aug 2020 10:27:39 -0400 Received: from lhrrgout.huawei.com ([185.176.76.210]:2621 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726660AbgHRO1j (ORCPT ); Tue, 18 Aug 2020 10:27:39 -0400 Received: from lhreml710-chm.china.huawei.com (unknown [172.18.7.108]) by Forcepoint Email with ESMTP id BF20978A59E9C59D0C87; Tue, 18 Aug 2020 15:27:37 +0100 (IST) Received: from lhrphicprd00229.huawei.com (10.123.41.22) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1913.5; Tue, 18 Aug 2020 15:27:37 +0100 From: Jonathan Cameron To: , , , CC: Lorenzo Pieralisi , Bjorn Helgaas , , , Ingo Molnar , , Tony Luck , Fenghua Yu , Thomas Gleixner , , Dan Williams , Song Bao Hua , Jonathan Cameron Subject: [PATCH v3 5/6] ACPI: Remove side effect of partly creating a node in acpi_get_node Date: Tue, 18 Aug 2020 22:24:29 +0800 Message-ID: <20200818142430.1156547-6-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20200818142430.1156547-1-Jonathan.Cameron@huawei.com> References: <20200818142430.1156547-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.123.41.22] X-ClientProxiedBy: lhreml710-chm.china.huawei.com (10.201.108.61) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org acpi_get_node calls acpi_get_pxm to evaluate the _PXM AML method for entries found in DSDT/SSDT. ACPI 6.3 sec 6.2.14 states "_PXM evaluates to an integer that identifies a device as belonging to a Proximity Domain defined in the System Resource Affinity Table (SRAT)." Hence a _PXM method should not result in creation of a new NUMA node. Before this patch, _PXM could result in partial instantiation of NUMA node, missing elements such as zone lists. A call to devm_kzalloc for example results in a null pointer dereference. This patch therefore replaces the acpi_map_pxm_to_node with a call to pxm_to_node. Signed-off-by: Jonathan Cameron Reviewed-by: Hanjun Guo Reviewed-by: Barry Song --- drivers/acpi/numa/srat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.19.1 diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c index 1fb486f46ee2..2c9a66c203ff 100644 --- a/drivers/acpi/numa/srat.c +++ b/drivers/acpi/numa/srat.c @@ -436,6 +436,6 @@ int acpi_get_node(acpi_handle handle) pxm = acpi_get_pxm(handle); - return acpi_map_pxm_to_node(pxm); + return pxm_to_node(pxm); } EXPORT_SYMBOL(acpi_get_node);