From patchwork Sat Jun 24 23:42:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 112503 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6662549vqr; Sat, 24 Jun 2023 17:26:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7ZVnk/19f58ItpxSxYcu+FKUe6gf2Pl7jCOWAL7wBlWuHKn8KpoLuNxwwe9FXNgFXHtpCx X-Received: by 2002:a05:6e02:10d:b0:33b:dcbf:e711 with SMTP id t13-20020a056e02010d00b0033bdcbfe711mr23508969ilm.8.1687652805554; Sat, 24 Jun 2023 17:26:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687652805; cv=none; d=google.com; s=arc-20160816; b=lUt3Me941bTW2N1K++4QzEpfkZukfZv/p8em2uFYOZk8+nslFOzXG2vXoB+RuHbgY2 65SD9/wvwbGThnkiSYOiZA9dfh5x1eiUQCZ5drBU4E7+NqocF04WvA4WpVqRMpoA9I5T HkeqS7vsh9Nh9jdfy9DZVQAr+tJC/0cdrMd5RcWZxvJ07tbRBkCshdy7yYKUo6BeTcDU qri39L0AkVfIboPewKrHTEIeTqlXNtOpoVriiNk9eUbAFfd/q11ame54664NR0IiWATr DzmtJQWc3sOIhD3S6Qbd0fC3cJ65lWmSEU2Hio/mEZhu8SQjnOjObN2v42r2cUFpcOsv yFrA== 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=+0ihZFCCl1EFSpCzVgFmjtH0qRrjZ9thHtG0koMMOuw=; b=QlBgIDLuc4G8JJngVa4qETjJ0Z4RK+1QoVcDsLtf1uZYCpdP2KBap0wC+ZtlqwVSHc JdoPWPWIO45Ud5Bs1kCL8jgTjsSBhddeYbZ5qqWdDX7BojgNtmoLGRvOsPeHDRQirUMl xeq9Xswl89VI9vP5uJVx6iTKDbUBAqPktTUl0jV0gq6zMCmyLw9rF9VfOqY1jbDrPJma zAQ2E3TN0yPBOFX7EhSgh7CMQ0DQ3MIW0vBQHLvrLCwnt3PwFVZSzNh4zlC4zshNpUv7 negil1KNs46En2VJYKzrTrQc2jA/KuG3Taz0QSkLTWEHmy+iCu9sXucmQAtCflkkNFGx J8QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=doSItpwr; 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 f6-20020a631f06000000b0054fcdcbf4a3si2535018pgf.142.2023.06.24.17.26.33; Sat, 24 Jun 2023 17:26:45 -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=doSItpwr; 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 S230397AbjFXXme (ORCPT + 99 others); Sat, 24 Jun 2023 19:42:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230320AbjFXXma (ORCPT ); Sat, 24 Jun 2023 19:42:30 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 527F410F4; Sat, 24 Jun 2023 16:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687650149; x=1719186149; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pExp2WMXGyNpxCyGDYOXewD2SNqta6zQBIAwkyT6MEY=; b=doSItpwr7Zbw0ZO15POJpg475rPZNhJuT0L2TXPLvEirU2ajHhTT5Qkj febdvReYSJxXhsVy7YaFgE2glg5TvGRpBtAc2w6PjbJyKNB6ytE0PceiK RiE94cOvYOjkUFU5JVQssoBFlwe2eyHPUK5sl8RPTFQoGhQRWtVnHU9rx mJ6ZCMpXZAIhg/mZB+8PsDCWt6pGgqqYoj1tAo2fHafJWMkzNy2sqrO8O vGkN4wieGZDEgFBL+kigkjbveQfbKnkq++nbc59YxIGFhgK8E+u6cLJaM nHRKjf81iaQD96Kms16oZKdR3hjKP2DPgPd2LaEfFfFIlxqLMllo0Xz5n A==; X-IronPort-AV: E=McAfee;i="6600,9927,10751"; a="391123107" X-IronPort-AV: E=Sophos;i="6.01,156,1684825200"; d="scan'208";a="391123107" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jun 2023 16:42:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10751"; a="839839598" X-IronPort-AV: E=Sophos;i="6.01,156,1684825200"; d="scan'208";a="839839598" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.209.113.117]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jun 2023 16:42:28 -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 v3 2/2] ACPI: NUMA: Apply SRAT proximity domain to entire CFMWS window Date: Sat, 24 Jun 2023 16:42:24 -0700 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1769632228216553489?= X-GMAIL-MSGID: =?utf-8?q?1769632228216553489?= 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 --- 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) {