From patchwork Mon Jul 10 20:02:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 118053 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp44954vqm; Mon, 10 Jul 2023 13:07:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlHmXtDxSBD7TaM9WEOoeaH++XbF2ErrgorEZ2/LZ3Wttl6n5YgYd6fsJlyw81krGX5RS3TC X-Received: by 2002:a17:906:c3a4:b0:988:fa98:2e7f with SMTP id t36-20020a170906c3a400b00988fa982e7fmr9722844ejz.38.1689019652469; Mon, 10 Jul 2023 13:07:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689019652; cv=none; d=google.com; s=arc-20160816; b=Jv9sdf9neGxatLDqsjxsCkL1CN/orGdPuoA/PfdqxI8Lq+L1iUHwH+Cv3le6H958Dk 3xTbNGh4l0y9I6SwoOjCr+WHlonFAmcNlO+GtF7cxY3Ezp/2pjLA0JdF91umepCkMCPI aTpDN6cdRQS9oVktzf6mxzwE1UeulpO/QvudZ6vKs8OyC+JH8h58njUtXqirqEsHKuig Vvspj0aeVP2uu8k3v8Ail1q500Pql5aAiCo2qQM9wxgzOkjLtmgnDsNAkg8LZQta2bjR IkqnWtEYS6JaZsje3uQoZ8hNnZ3qjdJimnshonwAqYekoukaCltFTujvIiu+34vKTipu Kw2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eRcPKcCGOv2lPegigF657elurWR0D8xp6O3sZX/gg68=; fh=2qe3N7DDtqyYBsCdd7MW49sdK3GHWS0XcQKfhTLp98U=; b=Pr5MFdnkrHyEEXq+lx3DgMWWOlNNgzYTuKh4MtNhe0UOhXk7Yi2XhtvKaIZ+Ojuogu pteDB0qLUNxmwAlDtCPnh++ltewQ+sNcznhVfafLeB2MPSyvJqFWv4FgQVuSy88HcDJS KyMIEiwi97FGc/tGdm1t8pcjBHq79edGJHGintqh0TZVzdB17d6i/1BEDJYnlzPYPeL+ VsFJJffrPNRvIOwtRKw9z5oBQ76hdsnUUbDh23ad6fGlrUHpPGB169HIYzHHPNmY48qX LUW06iqINsHWOvNUlI9myYGLoW9/JeSbZDnBKZ8+hIQuTHLbnDFp1eVKPfbwQRaoDsSF hGqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=iEGdRBBB; 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 b18-20020a170906709200b009934728f33bsi318281ejk.533.2023.07.10.13.07.09; Mon, 10 Jul 2023 13:07:32 -0700 (PDT) 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=iEGdRBBB; 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 S231344AbjGJUDQ (ORCPT + 99 others); Mon, 10 Jul 2023 16:03:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230344AbjGJUDF (ORCPT ); Mon, 10 Jul 2023 16:03:05 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 840E4133; Mon, 10 Jul 2023 13:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689019384; x=1720555384; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pExp2WMXGyNpxCyGDYOXewD2SNqta6zQBIAwkyT6MEY=; b=iEGdRBBBKct/8vbUN5DV9bIQlxrdxPbbFuQmu5al7PtEgtpaWaD4zKza NzsDzCY/56m20Ws7yc22sFtUnHWKgbdtxdZRJ7gb8rqVDIezhfIKAnHxN r7hYa2NBGzEkluOMfSaWscJgoKeKg+ikCVER4TTbyAu2OwH51ZIkVnsmh K0RG0XkDBiVTjr7B9SZq/AujnNFKD5WhxZsFaBBVYoRGaTWFThczaPwc3 3APuWymlFaqcTUZFJeCMSrZz2StvABVHtzfEymnWieUCKp9VLdWB7wuS8 JHH/INNi7a4kYehWJuujwkSc2BAnTw9PBfTQKiaw7jGPondCFgzR6w2mh w==; X-IronPort-AV: E=McAfee;i="6600,9927,10767"; a="344764078" X-IronPort-AV: E=Sophos;i="6.01,195,1684825200"; d="scan'208";a="344764078" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2023 13:03:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10767"; a="714903601" X-IronPort-AV: E=Sophos;i="6.01,195,1684825200"; d="scan'208";a="714903601" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.209.93.201]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2023 13:03:02 -0700 From: alison.schofield@intel.com To: "Rafael J. Wysocki" , Len Brown , Dan Williams , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Andrew Morton , Jonathan Cameron , Dave Jiang , Mike Rapoport Cc: Alison Schofield , x86@kernel.org, linux-cxl@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Derick Marks Subject: [PATCH v4 2/2] ACPI: NUMA: Apply SRAT proximity domain to entire CFMWS window Date: Mon, 10 Jul 2023 13:02:59 -0700 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1771065470869461329 X-GMAIL-MSGID: 1771065470869461329 From: Alison Schofield Commit fd49f99c1809 ("ACPI: NUMA: Add a node and memblk for each CFMWS not in SRAT") did not account for the case where the BIOS only partially describes a CFMWS Window in the SRAT. That means the omitted address ranges, of a partially described CFMWS Window, do not get assigned to a NUMA node. Replace the call to phys_to_target_node() with numa_add_memblks(). Numa_add_memblks() searches an HPA range for existing memblk(s) and extends those memblk(s) to fill the entire CFMWS Window. Extending the existing memblks is a simple strategy that reuses SRAT defined proximity domains from part of a window to fill out the entire window, based on the knowledge* that all of a CFMWS window is of a similar performance class. *Note that this heuristic will evolve when CFMWS Windows present a wider range of characteristics. The extension of the proximity domain, implemented here, is likely a step in developing a more sophisticated performance profile in the future. There is no change in behavior when the SRAT does not describe the CFMWS Window at all. In that case, a new NUMA node with a single memblk covering the entire CFMWS Window is created. Fixes: fd49f99c1809 ("ACPI: NUMA: Add a node and memblk for each CFMWS not in SRAT") Reported-by: Derick Marks Suggested-by: Dan Williams Signed-off-by: Alison Schofield Tested-by: Derick Marks Reviewed-by: Dan Williams --- drivers/acpi/numa/srat.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c index 1f4fc5f8a819..12f330b0eac0 100644 --- a/drivers/acpi/numa/srat.c +++ b/drivers/acpi/numa/srat.c @@ -310,11 +310,16 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, start = cfmws->base_hpa; end = cfmws->base_hpa + cfmws->window_size; - /* Skip if the SRAT already described the NUMA details for this HPA */ - node = phys_to_target_node(start); - if (node != NUMA_NO_NODE) + /* + * The SRAT may have already described NUMA details for all, + * or a portion of, this CFMWS HPA range. Extend the memblks + * found for any portion of the window to cover the entire + * window. + */ + if (!numa_fill_memblks(start, end)) return 0; + /* No SRAT description. Create a new node. */ node = acpi_map_pxm_to_node(*fake_pxm); if (node == NUMA_NO_NODE) {