From patchwork Tue Oct 22 21:34:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Price X-Patchwork-Id: 13846188 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 BE6C9CDD0EA for ; Tue, 22 Oct 2024 21:35:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4DCF86B00B5; Tue, 22 Oct 2024 17:35:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4B3C46B00B6; Tue, 22 Oct 2024 17:35:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2B9B46B00B7; Tue, 22 Oct 2024 17:35:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id F3BDC6B00B5 for ; Tue, 22 Oct 2024 17:35:01 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 283961405A3 for ; Tue, 22 Oct 2024 21:34:44 +0000 (UTC) X-FDA: 82702543434.14.39677FA Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by imf05.hostedemail.com (Postfix) with ESMTP id 9B8B610000D for ; Tue, 22 Oct 2024 21:34:28 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gourry.net header.s=google header.b=heTnrYEx; spf=pass (imf05.hostedemail.com: domain of gourry@gourry.net designates 209.85.160.169 as permitted sender) smtp.mailfrom=gourry@gourry.net; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729632748; 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=2Y78ubexqEa4jb5hMLl30/Xq5Y9Xokfp+mSha683Q8I=; b=zzIt6Y4llL5M014oXnXtUHPVxYGj9y5qvZfbxFQy+iLEN8dDb+OhzBi1vkq01KCE9bVn5d 8ytK85Tm0iajgZmSxI9D0itfLwmWdfMkK67tTDXmN8AH5FHzPcLgRxyQZW5LsBr0wwUBzi wDaskHmAY7cTO1sXUkjEdzzfulahQBw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729632748; a=rsa-sha256; cv=none; b=CgV8JHpeB2w25/7cH0KVXLj5JP+4/1vyYJuyBOAm6zpqGeHAr4ZzSasTB21wtEknPairHq xMl/8/BXaIUfGIuf1h0yNBYM1bR8TlwuIXo0yLx0dakUiOofyDIn2suQoV6zXh/bMpB0r1 JdqMHpIvJvothIz2WbNNGT5wOiCC7Ho= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=gourry.net header.s=google header.b=heTnrYEx; spf=pass (imf05.hostedemail.com: domain of gourry@gourry.net designates 209.85.160.169 as permitted sender) smtp.mailfrom=gourry@gourry.net; dmarc=none Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-460a23ad00eso2412001cf.0 for ; Tue, 22 Oct 2024 14:34:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1729632899; x=1730237699; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2Y78ubexqEa4jb5hMLl30/Xq5Y9Xokfp+mSha683Q8I=; b=heTnrYEx+A+Aw67+3TRHXJACqYd9QYw/mmLBohxgE0j/5NI4fj1i5ltIjMEtDaZKZS +7ETw4FVx7aa4IA8JSABtyAvh6YHBM+STlUT05wfXoA8xeX2t2EnNoX6SKIRlfUDP3hQ d8SjLNGlZrbYoJCSknfQRPXrE3UX/7nQN229XzgV7UqgzFKUoJoXJdOwc8CEYDFUSb2q xsD0d1Vtv+8ycbl4y3rs8JE+3IUf9i5C/9cmcJWGL8uPxoi1l/+sx+Ay40fyP94/gPYH naBzwHEwNSXhg8opWle5V/UXi6u2dnIedtFQp5+RWq2h2p4sd7LhuHoHi2tb6Hdh6aLk xvyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729632899; x=1730237699; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2Y78ubexqEa4jb5hMLl30/Xq5Y9Xokfp+mSha683Q8I=; b=NOM/erYW7jBsrm80B32yejhXYjLuZ+3pIDSFn19hXbL8Jt3VPdHkJdZpdDFLeKcihf rvFod6sMphAGLcH823N60zkcQo9BeKTRn/TX7/PoSBloJqYgV9ShnrrUli1zXR6j8ur3 s5T0ohxozSnMLCfVREim8NaYJVbUVUC3t9J495Zmk7EmjyfQxI6q1J1GF0K7YT5owQeZ Yj9XyaN32nPhvXed38QInBrBP5D+4+1FozBmt8ka/e2Zhzrq12LPog/ZWT7pXlT+T/Dk LlCH2Qjho25CY6od7BIMMzIkSPhT+1ygfkcOtxGV9mQ3Qz6TOjiWCEakCeJzCrAve85J NziA== X-Forwarded-Encrypted: i=1; AJvYcCV7EN/0jGaUxiYAPZj5j6GX9Aq6FePa+K/bUq4VX35tA0dWhH9eWGmej4jDlWmZ/FwQaeuQWHvR/w==@kvack.org X-Gm-Message-State: AOJu0Yw5EvcOSdZZqKt+Zmtk5jRg/6Po1Cm19Z9IjeKmQ7NZhen2JB1y yWk+tLk4q038aX2QiC1yZnMb7PVNM71DED6bOjWpCkkHb34C3PUw3f7bGCf4m1A= X-Google-Smtp-Source: AGHT+IH7eGA0cnfOQp14jPD3sIr1Ycw9daRo5ztpuW4QPmIXbYkKfaWizk6DGwzl4TxDDXn1JCZDPg== X-Received: by 2002:ac8:7d04:0:b0:459:a824:a1c2 with SMTP id d75a77b69052e-46114102e22mr12146281cf.22.1729632898984; Tue, 22 Oct 2024 14:34:58 -0700 (PDT) Received: from PC2K9PVX.TheFacebook.com (pool-173-79-56-208.washdc.fios.verizon.net. [173.79.56.208]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-460d3c62f4dsm33845841cf.28.2024.10.22.14.34.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 14:34:58 -0700 (PDT) From: Gregory Price To: x86@kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-mm@kvack.org Cc: linux-cxl@kvack.org, Jonathan.Cameron@huawei.com, dan.j.williams@intel.com, rrichter@amd.com, Terry.Bowman@amd.com, dave.jiang@intel.com, ira.weiny@intel.com, alison.schofield@intel.com, gourry@gourry.net, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, rafael@kernel.org, lenb@kernel.org, david@redhat.com, osalvador@suse.de, gregkh@linuxfoundation.org, akpm@linux-foundation.org, rppt@kernel.org Subject: [PATCH v3 3/3] acpi,srat: give memory block size advice based on CFMWS alignment Date: Tue, 22 Oct 2024 17:34:50 -0400 Message-ID: <20241022213450.15041-4-gourry@gourry.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241022213450.15041-1-gourry@gourry.net> References: <20241022213450.15041-1-gourry@gourry.net> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 9B8B610000D X-Stat-Signature: r3fsyj3e9bqdcc7nccrj8ygpwpeydnrp X-HE-Tag: 1729632868-285178 X-HE-Meta: U2FsdGVkX1++wqobIlcjM2gg19hbrPFGM1JAL5OCSbz+3UKQu8d6cHOVGHcnDTYGAcWqvcPSCPzNXCCcVORD1rM8rOfIJ6LueIabIHzbslDCFRLuOq/J9UgwTWnclaKtNMxSDHdR/qYPaRJPw5pHzStLdZdH61f+nmHJ2BGNS0xVuUWzJSOUKWhzCJy7ZQAwawrnf/HEUfngXT2pAn6VFpMGTolnDhCEsoE9P6clBtzV6w8V3JcaYsN2wYcvLXb5y3BOsAiuXZ/KurYSmKR0ouZfPOT5MbKPHQSfjabg4gzeoDYuU075Ne61U4QuygbLmJkg7/LMLyYf2tticzwkyIfczMIfnvia7MiL7pWD8nMFxP9TzcdBoG81RrONQ5ShRUe96Xz/tLcW34LnsVyso1/grrh8na5G6FYs4dx0Fe5pk0ZIzOXXUC3aNtaO/24ZYE2oXNNYW9yIWH/DmU85flwq1VpT+QxjX76a5OUlGQRLgYMAt4vvq4uDWX6CvPmzIXl0PfJ4jEwqUtNV2FltgWKwhgFtpSVNl1ei3dEAjQSUr3RcSNXZGQ6rdpe/PKWzAAsjGQkgbbyUy3wCitYVhVBr3FZpxgdF/TxuwJymAmLFuJNioPTas7O690OD5m8r1DLNoswRa+EIOFrkD2J7EjUeTdz7D7ql6HiUih4ygXmexMHvNf02V0O2QdlznaR4P3Qu1v7cmVJLZPLpT/KWU0/eRiHOhkHKGuWJ/pyGBNJQhr7/kOzzGATm9WGtFNHjM0zDgAKuGfl22YYEn719ohcW7HQI614w1sEaqsY4hGdakG9EeJh++qWyOCqLSRUe3OEBtgqXe0WIwlj8a8RDJv0noHNfvvL1+bljB6HQaGW1YIifKfG2YBT4Zw8ZkMEdZzv2+19sYY1CdmQ2ouF2PHZU86Rt1PKmOu27h//hYmgUO0EZABbTw+KnwsVxrD7jzXaAT3oDRiQtfYrqJvi MOO0Xm07 6FLNyMaZ+avaUGOAq5P1mDUHTpeFQZ+pbxzn4Qi2u9CGY6JNd5rodtB92L0aEnlko8ZwgY5+oATZpJz+e0P66Wu2RWXK5wTZ3SA6F8FZ+HY9+PR/9Gv4AQ7vuXuEAkMJLMOQI1TCpnGQTpkR0EMsb2rmAQoljIcrt5GkrMoK2ys9EN3GjavfhWGCCog6XDNPBrTJaFvXMMUk2CQYtDP0kN1kCGXfoah0Ud1QYpUetMICmbWZPEGV9HI2L9VCzuuPauO3LqVRGYPcSbzBFFV7BzjlccH1N43gbyg9Yg1n60yFi3vG43JxxCWvmFAMA7+Qx4gbo8LAVZk6Fuak= 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: List-Subscribe: List-Unsubscribe: Capacity is stranded when CFMWS regions are not aligned to block size. On x86, block size increases with capacity (2G blocks @ 64G capacity). Use CFMWS base/size to report memory block size alignment advice. After the alignment, the acpi code begins populating numa nodes with memblocks, so probe the value just prior to lock it in. All future callers should be providing advice prior to this point. Suggested-by: Dan Williams Signed-off-by: Gregory Price --- drivers/acpi/numa/srat.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c index 44f91f2c6c5d..35e6f7c17f60 100644 --- a/drivers/acpi/numa/srat.c +++ b/drivers/acpi/numa/srat.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -333,6 +334,29 @@ acpi_parse_memory_affinity(union acpi_subtable_headers *header, return 0; } +/* Advise memblock on maximum block size to avoid stranded capacity. */ +static int __init acpi_align_cfmws(union acpi_subtable_headers *header, + void *arg, const unsigned long table_end) +{ + struct acpi_cedt_cfmws *cfmws = (struct acpi_cedt_cfmws *)header; + u64 start = cfmws->base_hpa; + u64 size = cfmws->window_size; + unsigned long bz; + + for (bz = SZ_64T; bz >= SZ_256M; bz >>= 1) { + if (IS_ALIGNED(start, bz) && IS_ALIGNED(size, bz)) + break; + } + + if (bz >= SZ_256M) { + if (memory_block_advise_max_size(bz) < 0) + pr_warn("CFMWS: memblock size advise failed\n"); + } else + pr_err("CFMWS: [BIOS BUG] base/size alignment violates spec\n"); + + return 0; +} + static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, void *arg, const unsigned long table_end) { @@ -545,6 +569,15 @@ int __init acpi_numa_init(void) * Initialize a fake_pxm as the first available PXM to emulate. */ + /* Align memblock size to CFMW regions if possible */ + acpi_table_parse_cedt(ACPI_CEDT_TYPE_CFMWS, acpi_align_cfmws, NULL); + + /* + * Nodes start populating with blocks after this, so probe the max + * block size to prevent it from changing in the future. + */ + memory_block_probe_max_size(); + /* fake_pxm is the next unused PXM value after SRAT parsing */ for (i = 0, fake_pxm = -1; i < MAX_NUMNODES; i++) { if (node_to_pxm_map[i] > fake_pxm)