From patchwork Tue Oct 22 21:34:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Price X-Patchwork-Id: 13846208 Received: from mail-ua1-f49.google.com (mail-ua1-f49.google.com [209.85.222.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90B2D1FBC80 for ; Tue, 22 Oct 2024 21:34:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729632896; cv=none; b=F9KF36xv5AW7bGBxvFLXf3Qk/y5T+LmXU0doA7x0VYsuulTrcDmi8dMt0jrwLQN+hDldKXPMoE6gGFWWCtPirFCvuMq8RPUhLKwgJj4FgtJSXMoGeMtFWwnQkJxZyWmhVm0w22F86UkygKC1BVFHgM76qnH8iNH7CPOArDhSrqU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729632896; c=relaxed/simple; bh=72lvWaZVrGD5CN/tN9hRoU+ByQZLYWyjLH11N4oA4Bs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MOM78W+GaYHbTkpFoRqOwLmF/P9h8CdZFnKyZxsM/ca8gPLPPFDP+mzLY2hBdfa5sdPwRKwXYe2L7EW1XPXm8SFzRnJRDHH6Rawb7hCOs64x6Lzhyveey0paSfPQRdNfX+8vWNHOpFfE//O5csN1ANVPtcc/H22UDRyd5W/Ggtk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net; spf=pass smtp.mailfrom=gourry.net; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b=ekCC9UkA; arc=none smtp.client-ip=209.85.222.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gourry.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b="ekCC9UkA" Received: by mail-ua1-f49.google.com with SMTP id a1e0cc1a2514c-84fc1a5e65bso1777878241.2 for ; Tue, 22 Oct 2024 14:34:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1729632893; x=1730237693; darn=vger.kernel.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=ufKC44gX2rTxHnQ7e/iieQk2KCFejx60Yu8CtfOC82k=; b=ekCC9UkA7HGcDb+gU9nt3WT/Ko16sornmZ0xWFUuznEIUjoN4A1AK5BpvA545P8lf/ 77Z895PRVVelKrK2iWnHEEBczsACczIG0KVa7G1u5bTNO+XCXPTIpG2Yj6m9dK122VRP UBzUVaQBSinudRDDcsI85eLJsyu3DAqp0VJXn6aczdBJDbCBkT2LG99uX1zKmOPpTE0U wMqT7PtbLcEHmkl92y8kQczvUMjjY+pMuqYdpN9TojXEcm20W8HQHWPfZ8y0yq1RBmPk BBpOcfe/gKSV0EkIZauTXOG+gt/ky028pdwJa9lTO/TZ44minSYYKyAE8LajYyVWjv98 i54w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729632893; x=1730237693; 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=ufKC44gX2rTxHnQ7e/iieQk2KCFejx60Yu8CtfOC82k=; b=MqNn6EzPh/XcpEpvrpAis/AR9swae/P9/UJhL9KIyvetelyM/Eyl9VuPC0f89cazlj UnrUABlk2cnl4CFREMnyqfSLGun7kU2OSSk1cdK44aqb3sV5D/8oprhYqjs+dgF3jYCU NApak6iC0K6jlB0vOtGj3JxTRHHvCiosfrntVP1R47sTWywcS3XpjoH4UhJMCAnOJLho cDWbg+xu8tmYk7pD8qYRmLDBOylg2V0guHCkG9FnYF/jYkIYl41wU4i2BfYuoAbNvanb Bbg5EhdtNgRbtSpyn8S9M5VVZAAl7QHs7cBKwerBvk1+KnlVe03V1+v7AJ4w9w3k28KO Ge3Q== X-Forwarded-Encrypted: i=1; AJvYcCW1x/aYydoGxiZa7Qj1d7r/szF2XaiIlhHV4lEhiy9berQRoTeL/pLCPibwgDDLFMVqI5t+or9EW4Bn@vger.kernel.org X-Gm-Message-State: AOJu0YwqYuH3BoU1VTEab4W9nNuXINQIwHWx2RP8ykQZuRPSnCapA1t7 jXGMAB5NcmW2BNmcuJ9lZuA2kjr/Bf9DEps/tstm1DMeLDN2oEME0yIz8kqfONU= X-Google-Smtp-Source: AGHT+IE++oEhimUSC/n6odFHU11d3lmzvoMxQ3GR+KJvVhAk1j85ECkXjUx948Kl/hJd8+RlCzZn1g== X-Received: by 2002:a05:6102:3a07:b0:4a5:c74b:66a7 with SMTP id ada2fe7eead31-4a751c94d11mr591818137.19.1729632893322; Tue, 22 Oct 2024 14:34:53 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 14:34:52 -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 1/3] memory: implement memory_block_advise/probe_max_size Date: Tue, 22 Oct 2024 17:34:48 -0400 Message-ID: <20241022213450.15041-2-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> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hotplug memory sources may have opinions on what the memblock size should be - usually for alignment purposes. For example, CXL memory extents can be 256MB with a matching alignment. If this size/alignment is smaller than the block size, it can result in stranded capacity. Implement memory_block_advise_max_size for use prior to allocator init, for software to advise the system on the max block size. Implement memory_block_probe_max_size for use by arch init code to calculate the best block size. Use of advice is architecture defined. The probe value can never change after first probe. Calls to advise after probe will return -EBUSY to aid debugging. On systems without hotplug, always return -ENODEV and 0 respectively. Suggested-by: Ira Weiny Signed-off-by: Gregory Price --- drivers/base/memory.c | 43 ++++++++++++++++++++++++++++++++++++++++++ include/linux/memory.h | 10 ++++++++++ 2 files changed, 53 insertions(+) diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 67858eeb92ed..a0fd9e1451aa 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -110,6 +110,49 @@ static void memory_block_release(struct device *dev) kfree(mem); } +/* + * @size: suggestion for maximum block size. must be aligned on power of 2. + * + * Early boot software (pre-allocator init) may advise archs on the max block + * size.This value can only decrease after initialization, as the intent is to + * identify the largest supported alignment for all sources. + * + * Use of this value is arch dependent, as is min/max block size. + * + * Returns: 0 on success + * -EINVAL if size is 0 or not pow2 aligned + * -EBUSY if value has already been probed + */ +static size_t memory_block_advised_sz; +static bool memory_block_size_probed; +int memory_block_advise_max_size(size_t bz) +{ + if (!bz || (bz & (bz - 1)) != 0) + return -EINVAL; + + if (memory_block_size_probed) + return -EBUSY; + + if (memory_block_advised_sz) + memory_block_advised_sz = min(bz, memory_block_advised_sz); + else + memory_block_advised_sz = bz; + + return 0; +} + +/* + * memory_block_probe_max_size provides a suggested maximum memory block + * size value. After the first call, the value can never change. + * + * Returns: advised size in bytes, or 0 if never set. + */ +size_t memory_block_probe_max_size(void) +{ + memory_block_size_probed = true; + return memory_block_advised_sz; +} + unsigned long __weak memory_block_size_bytes(void) { return MIN_MEMORY_BLOCK_SIZE; diff --git a/include/linux/memory.h b/include/linux/memory.h index c0afee5d126e..47c00d6e1165 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h @@ -149,6 +149,14 @@ static inline int hotplug_memory_notifier(notifier_fn_t fn, int pri) { return 0; } +static inline int memory_block_advise_max_size(size_t size) +{ + return -ENODEV; +} +static inline size_t memory_block_probe_max_size(void) +{ + return 0; +} #else /* CONFIG_MEMORY_HOTPLUG */ extern int register_memory_notifier(struct notifier_block *nb); extern void unregister_memory_notifier(struct notifier_block *nb); @@ -181,6 +189,8 @@ int walk_dynamic_memory_groups(int nid, walk_memory_groups_func_t func, void memory_block_add_nid(struct memory_block *mem, int nid, enum meminit_context context); #endif /* CONFIG_NUMA */ +int memory_block_advise_max_size(size_t size); +size_t memory_block_probe_max_size(void); #endif /* CONFIG_MEMORY_HOTPLUG */ /* From patchwork Tue Oct 22 21:34:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Price X-Patchwork-Id: 13846210 Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C6C51CCEE7 for ; Tue, 22 Oct 2024 21:34:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729632899; cv=none; b=KfH0qsy/A9YtLEFJUPPHiUef7/naiPND3BxMIQ6cC3ZNPPFI5Xh7H3tHay5/7/ebKJHEwJm1zpa+U0LaPMXhz38r2Tc13vwwsJHWb8hdULt+03O/98gfSKl9YBrtoX/zvrpx+kgsWyusgY3D1+MEV3+KpELFcoZYvS8hVd8yWro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729632899; c=relaxed/simple; bh=W1pk87B56sY3NmTWTw0fYcdlm0GNbCNKUts7riRYlbg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OD0NmvGcKoBQ24yUYxHnq2uNO22ZrLUU1oqQ2y22PgdFZltY9jGCp5hJ7y7ITRkIdC1pL06rrI1isw0nJPqGSd66b3fSDmUEVXdfIYdicDD2QrEGItv1sY/p2TFIT4++DDkt525DaYdxbtrg1W7Wd71+QNSsu7h1gwl6+rx2nSQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net; spf=pass smtp.mailfrom=gourry.net; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b=XI0zjFlD; arc=none smtp.client-ip=209.85.160.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gourry.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b="XI0zjFlD" Received: by mail-qt1-f173.google.com with SMTP id d75a77b69052e-460b2e4c50fso29640981cf.0 for ; Tue, 22 Oct 2024 14:34:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1729632896; x=1730237696; darn=vger.kernel.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=AqCv7heAkmMbGyHort0yESB5tthHSXy3Avmci0WyUUs=; b=XI0zjFlDTySPEMo8xxPza+roQKJ7BQVdRPzHM0HsauL0+eoX5b58OZ8OeV/pwfVvJA aghuv+EkWRV3VIZ3aQxugkQTQd9c9uRXAsrpe6QhB8y7KNAEek5A2kU1Ebm7AKZxWUhp QRd+dGzfzhcrkCLozLAVvKlqKIuwYTDRr7b+rfbr344WDRFJC8zNah3r4ObwSiS1isC6 EEIlyk6VPZ6ywHOZxEFNRb5iz8PqQ436gyDHMfWJbQrlc9oMmzIEyIa37LOW4qmhuOmt uG3aTrndbUejvgcqm2vYprkao/PKi8uuQ/6nnO5y5luMDfvBBphCOhIIztedfuMMsmW+ XcWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729632896; x=1730237696; 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=AqCv7heAkmMbGyHort0yESB5tthHSXy3Avmci0WyUUs=; b=Ny79QLI8Ju2ZOODaL3xDPoFUYmR5ddZAIPyjO5ujUHIGzRItn/mK1mehcEhZez/cJ0 /vpHrTarUDe3GLKU171hN8FMU0XomMRHpePylBZR5RZpzYJaUQefcAE6nA4aTVV8onIS XEZoA9prTQQtwpRfa2buVdKXp54iM2oZ97N9bWtyReYw7+12ReJZt1daie0K3S8NKcLs +fB5gfrsAl6sVLX+/0jLr26RwGOqtV5VeDV1PIBR22JqknniTwSpSDyfkaXh9dGXicC9 pi8+gF/rFzYZwjMb8ndALxE8jUDAPFL9XpOqXtSUKDFc3qhsMYq2Ce6uhajSfkeEWaIc u/yQ== X-Forwarded-Encrypted: i=1; AJvYcCXDIBCKV9GQi61BP2yhMcrmMjk7mPGUtlHagDFBm+usJTUYmbEcZOmjW9Txc16GjipQPTbC/zBqS0nJ@vger.kernel.org X-Gm-Message-State: AOJu0YyTBpdSWd7fQHjLhMokL2Jjo3OD1Bs5YZd4r9C79FSD0q2Po9Jw dO6Ok/MlN1zSFtNNfTW1Qm47PbRChrEmPxPUidIRBgW/yIUGniGRvz0loSr0cGQ= X-Google-Smtp-Source: AGHT+IG6u8nXwqeHHa2iAZjSeQvjzXX9LlJNqnqKjo6O88p7xQbadR2zh6+g2YkgEfRojyf8qrAQmQ== X-Received: by 2002:ac8:59d4:0:b0:460:8e3b:6790 with SMTP id d75a77b69052e-4611470b2b0mr4519561cf.48.1729632896082; Tue, 22 Oct 2024 14:34:56 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 14:34:55 -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 2/3] x86: probe memory block size advisement value during mm init Date: Tue, 22 Oct 2024 17:34:49 -0400 Message-ID: <20241022213450.15041-3-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> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Systems with hotplug may provide an advisement value on what the memblock size should be. Probe this value when the rest of the configuration values are considered. The new heuristic is as follows 1) set_memory_block_size_order value if already set (cmdline param) 2) minimum block size if memory is less than large block limit 3) if no hotplug advice: Max block size if system is bare-metal, otherwise use end of memory alignment. 4) if hotplug advice: lesser of advice and end of memory alignment. Suggested-by: David Hildenbrand Signed-off-by: Gregory Price Acked-by: David Hildenbrand --- arch/x86/mm/init_64.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index ff253648706f..93d669f467f7 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1452,13 +1452,17 @@ static unsigned long probe_memory_block_size(void) } /* - * Use max block size to minimize overhead on bare metal, where - * alignment for memory hotplug isn't a concern. + * When hotplug alignment is not a concern, maximize blocksize + * to minimize overhead. Otherwise, align to the lesser of advice + * alignment and end of memory alignment. */ - if (!boot_cpu_has(X86_FEATURE_HYPERVISOR)) { + bz = memory_block_probe_max_size(); + if (!bz) { bz = MAX_BLOCK_SIZE; - goto done; - } + if (!boot_cpu_has(X86_FEATURE_HYPERVISOR)) + goto done; + } else + bz = max(min(bz, MAX_BLOCK_SIZE), MIN_MEMORY_BLOCK_SIZE); /* Find the largest allowed block size that aligns to memory end */ for (bz = MAX_BLOCK_SIZE; bz > MIN_MEMORY_BLOCK_SIZE; bz >>= 1) { 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: 13846212 Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00CC41FF7AF for ; Tue, 22 Oct 2024 21:34:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729632901; cv=none; b=iZ1KJAZ5J8thLy3mqNUIX8zzHsAWIijK/X+72jc4B4WCZotBCBdgF+d8uD4IwD1DdNy5oKNI0h31NvshppZ9tK1M+DhSAcfQw/Pi+h+aKUbLf58HEYFB7EL+7Ok5SXQhczBzhVbPBYINbXZokvHv/ZS6UlW0tDWai06uUpvrlJY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729632901; c=relaxed/simple; bh=vPwlrbEZICwJySvKEDe0ketAegKzxYlX66KxGsRhSew=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HqnyIHtMGiDzI03uNHzgbNBIF/d2E50f+t1C6/q5sI7QR3OchObKkBlABb4o3CEStzmaEUXrtgEiUfltpe3R5GiAKkiiI2vqn8vtYiHNHrpzaQAXtE2HVV+wGvfYJIJ+IbLHcOPoZNKDhHL2PVlWV6vWjfEVfnIj90oq4OGOEkc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net; spf=pass smtp.mailfrom=gourry.net; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b=I2U39Ejh; arc=none smtp.client-ip=209.85.160.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gourry.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b="I2U39Ejh" Received: by mail-qt1-f170.google.com with SMTP id d75a77b69052e-4609d75e2f8so2158861cf.1 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=vger.kernel.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=I2U39EjhyDafxvJfSnhOrjQXXMep4ooXvriCjP1wQOvHxIwk/Gde8GEXrgkeibmbiu Nhpovxx5i164KmiGQtSfraPrKpTi7EbvpyFXwCNJ21IZQxmC7RCsfdEvdM8y6efOvK0o vtZbiiwgFP3QEupseiAy8xj5xhDaku9GK7uVqskp7PZxSSYmW6wERzxi2XUoAqDxCNDX zgTREzS5lzOrwE5E94MkOQRUEu8Jq9WirAGpRpgEllq7nr5nHl7pfx0VqTqQGV7a9oqu jekphsVKehOu1btdaaWILQtuDqCZ3uBoneIGqWeGCH7x+0zg0y8yeH3qzVV4n6TH/gcO zlrw== 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=sg4n/vM8swS4v+DcX1rgZY8R+xoBcTY1wkg00IwY8FH5i3n744ReKnJKa2mqprTXa3 Rod/zi+3ZCUdRkME8EH6BNd14BJJQRN5f0aO6KzoZ2LJ1xJMHhccjcUGknu/HtVFQxzF hJB19hp1tzONXlFCqzlveNThq9jCvaP90JMO58wi8t9+b4T6CD5hpy8lJKKWRciB6e4O DNGRCoh9j+2UmxJ2cQyV+k2Ac6GWC2mLKKHoSEo2ITfxQznDD7GaeK8dDhJuCpvzglEp EK+YxiznJL7FcerpdMg+pj3mviRlMm+I1iyVZ8N2CkWi2NQO7rqjEechQRhsa1hInuY+ pv9Q== X-Forwarded-Encrypted: i=1; AJvYcCWJAXZCEivU0Y3Y9rxwJq1kRUFQ4l+6SkttiLmjdL/LmT3IfzPU0z0mQuf6vAS5zT4WC1aJlN3Pp9c6@vger.kernel.org X-Gm-Message-State: AOJu0Yw8nemBcYS8qbMqZ1Ftw047J0zgfZp1iJz2gAXnjWHuD+kn6E+e ZUHyrVcuAAQo5K/YKHjOlPngCyIRT2mkwVqX42T3Ec6iY0pQMoDS4YxVh59/QlY= 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> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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)