From patchwork Fri Nov 1 13:47:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Price X-Patchwork-Id: 13859407 Received: from mail-oo1-f45.google.com (mail-oo1-f45.google.com [209.85.161.45]) (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 2E201175D2D for ; Fri, 1 Nov 2024 13:47:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730468837; cv=none; b=WNP9E1R9MkitLHZYidMimDIVrvsRIN+lv7Tm5HCPxywq+MVE1pjdj7ngP5NTHklottD4ZelaD1JnsI7y6P9lpCN0i0au9B3fIOaSg+y0icGOFaPkrZXg+1NvcwmhOgA7GVC6eken10NAe+0ta+UKLepsgVtMviIOxuIc85HzhuA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730468837; c=relaxed/simple; bh=9QuDdEZObFLdVCdi41vb2/DdOJlzTAuOMJoNWdOngAw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jp76Tooo3CXMWmMleEq6/RYhAw7nfazZdl/XCV9buYEO3P3TGriEuiBbdhpbuS8qObHQxmHEhzvx34kXaREdWZwyqKq//t5oD+PbgDYnNkDoyML5AtQVhym04Xx03Bmqn2HnGT6RvQih/ufIolohPmQHejoX4iHsUE06SAwGQfs= 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=b2vUwJDp; arc=none smtp.client-ip=209.85.161.45 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="b2vUwJDp" Received: by mail-oo1-f45.google.com with SMTP id 006d021491bc7-5ebbed44918so1245886eaf.0 for ; Fri, 01 Nov 2024 06:47:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1730468834; x=1731073634; 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=958SxrMmW3i4D+ZplSVQbEZWrtI+ztOMZMWNYttFV2M=; b=b2vUwJDpBdmmhSmacJahUb93YQXKLLZZLex1e6GV5mveutQtUVijI9XlD/FbFHpx25 tmkkjwk2X8upxMoWF6Yd7rYiy7WHrCcaFmAucpK3mLt6GN5JogOBtBqT9/P62v3Whw1l rvgoF/BaEORUF/C/d27UiYqp4fKvLTgGP7lPmNm+XgEkyni8GY95q2XT2gZ/AonZSG4+ deeq3a/TPGWnHpFaXvPrO+scFwEvVNZTCLT8NW0HmwrDVLGGdlG2mkJrF4UGgwCZWNUQ SxNFMExH5iZQYq7Aj+N7VORcXzOho/DyJctzMQfa+wvQTODmEvzxxKtjfE5blmNq1WyH ZL0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730468834; x=1731073634; 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=958SxrMmW3i4D+ZplSVQbEZWrtI+ztOMZMWNYttFV2M=; b=vYUTyC8nAeiCYgkzNGl5Ul20OVKsKPRcDQUT0yqUIMRbHwE/nxEtHdPfvchzBZNSpl 5Q+PGCOAjCCCkQ+Se0GiQ+f27FvfbBTueB7eYk7dKDFLjDmEz4U7JDvfk/SAth5bZXKL eNTEnd7s36J3UYMt21KhPnGF5zjmjveAneGw7qPe9M6BaiWUCMvG+0/PLWNjM32Jn7E2 Bs8GF90RUa9beyicFSNPIgBIgG7I1wQRFuluc8rTRi681RkXbaS05tel3JGmqKk2j97D WPKZ8AEkxbKgHI/Ger/JjufG7ZuHcqBlkkd4iX0UorwaxSQrdEjwOvXLjvKbjbF9ntcV WeSQ== X-Gm-Message-State: AOJu0Yw2V5SqGF3fKEKxir1urHP2GP3AM7HaTLAGm7aLHOcLquPMrKnx lblPvEFaF+B+5+0XVbiyHkYsxdjQ83HXX3G4E6VUsvwJQMAQYGNGm8QUOlp8p/Y= X-Google-Smtp-Source: AGHT+IG2zNy5gFfziJXkBV7+Rtit8XCDlH0hFpywbEzbxKc71T+qTweXHMmo2vX3g3z1Usqutl9fyg== X-Received: by 2002:a05:6358:248c:b0:1c3:9144:fde4 with SMTP id e5c5f4694b2df-1c5e32cc4c9mr790146855d.9.1730468834126; Fri, 01 Nov 2024 06:47:14 -0700 (PDT) Received: from PC2K9PVX.TheFacebook.com ([50.193.156.113]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-462ad0cac07sm18840631cf.48.2024.11.01.06.47.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 06:47:13 -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@vger.kernel.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 v5 1/3] memory: implement memory_block_advise/probe_max_size Date: Fri, 1 Nov 2024 09:47:03 -0400 Message-ID: <20241101134706.1185-2-gourry@gourry.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241101134706.1185-1-gourry@gourry.net> References: <20241101134706.1185-1-gourry@gourry.net> Precedence: bulk X-Mailing-List: linux-cxl@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 Acked-by: David Hildenbrand Acked-by: Mike Rapoport (Microsoft) --- drivers/base/memory.c | 53 ++++++++++++++++++++++++++++++++++++++++++ include/linux/memory.h | 10 ++++++++ 2 files changed, 63 insertions(+) diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 67858eeb92ed..835793150b41 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -110,6 +110,59 @@ static void memory_block_release(struct device *dev) kfree(mem); } + +/* Max block size to be set by memory_block_advise_max_size */ +static unsigned long memory_block_advised_size; +static bool memory_block_advised_size_queried; + +/** + * memory_block_advise_max_size() - advise memory hotplug on the max suggested + * block size, usually for alignment. + * @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-defined, as is min/max block size. + * + * Return: 0 on success + * -EINVAL if size is 0 or not pow2 aligned + * -EBUSY if value has already been probed + */ +int __init memory_block_advise_max_size(unsigned long size) +{ + if (!size || !is_power_of_2(size)) + return -EINVAL; + + if (memory_block_advised_size_queried) + return -EBUSY; + + if (memory_block_advised_size) { + memory_block_advised_size = min(memory_block_advised_size, + size); + } else { + memory_block_advised_size = size; + } + + return 0; +} + +/** + * memory_block_advised_max_size() - query advised max hotplug block size. + * + * After the first call, the value can never change. Callers looking for the + * actual block size should use memory_block_size_bytes. This interface is + * intended for use by arch-init when initializing the hotplug block size. + * + * Return: advised size in bytes, or 0 if never set. + */ +unsigned long memory_block_advised_max_size(void) +{ + memory_block_advised_size_queried = true; + return memory_block_advised_size; +} + 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..8202d0efbf46 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(unsigned long size) +{ + return -ENODEV; +} +static inline unsigned long memory_block_advised_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(unsigned long size); +unsigned long memory_block_advised_max_size(void); #endif /* CONFIG_MEMORY_HOTPLUG */ /* From patchwork Fri Nov 1 13:47:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Price X-Patchwork-Id: 13859408 Received: from mail-yb1-f173.google.com (mail-yb1-f173.google.com [209.85.219.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 86C6D1A2574 for ; Fri, 1 Nov 2024 13:47:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730468840; cv=none; b=XyVunPZfUJjb4LnHdjKyFt0/7Yqqr0h8mQqX9MzePpc5wD1LB5qLP1UO/hI8RG86XNJSAal5VM5n2pfPWb/bLVqv6kLcQTmAgxII1oSc2WCBBSq8Jqay/J/M3RjI/K9qa3yrYpX7AnU/FHygGOH2nfyxkCeU7QyWxgGA+qat3C4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730468840; c=relaxed/simple; bh=N0XPOmy3aARI7v9y/OYZfrAo+KC130k3/XQolnRqYXs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FPnJhNazjceWF+PVJR+lQAf5NQfKkmHJwAYZfoKGiFxXaYIm6DxtBOX6A8pfT8MQ6QMTDTRvRap2XJUHTpEtLr7ZY9d2e3xYVFGVOFNHzE5hzOtb464gx4D3kYvGTLFG8/sz8rWauA8QRRICfsmFT1ppXnkVjYgKjU4MITwM3oA= 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=AXWIq9IN; arc=none smtp.client-ip=209.85.219.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="AXWIq9IN" Received: by mail-yb1-f173.google.com with SMTP id 3f1490d57ef6-e3314fc5aacso55185276.3 for ; Fri, 01 Nov 2024 06:47:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1730468836; x=1731073636; 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=fqBWIQFF5FQxg66rq7hDVwvrkSgx0UrsiyD8ZLE5CIc=; b=AXWIq9INy2KD4MeakrhKW5WlAPb2H5dMjc4Lx3WARI5PzgmlA8XcrfR3qsNYpQlwRi iOQByHwq00Nw1ChbAVPBI9oGEwwxfjNQYRdXrwpPgoJmcO150RRm37xAqmQKZcpjLO7l b5k8MEn7JXLLI7Wgkv6r19YMt2JceBhDjB6uGRPWyKCw2PfzFuNzvRXJo7KnM9Xfxzor yT3r7OrFve8JTOQlpl0Ki/YWg7ShWW5A1OOGkvwhyVVTZ7DRWfamsbuU4WS3QCYDgIgP DutLUtss43CdiiBT8OwnVoSUYRT2QTp7QmiaA1xuVMhXDuhTYMuI5VVPiLSejanJAQrS YnEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730468836; x=1731073636; 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=fqBWIQFF5FQxg66rq7hDVwvrkSgx0UrsiyD8ZLE5CIc=; b=GWI/CnDZnZbxtkeWGBuEbPww0Zdduh2RqRh8qBdjp4TuRUGStWQgeKX3erqpfSvsaN oDXIf/g4mLmCLFPx1ODGlu20MW7cTQZM6R/9eMUoxamYLbZNKcCae1T2fBftz+8OGXcy 9wxqqyg8cyadaEtnuti4JVBrigCnz6/CvZdyCI/SLXetiwybs3rI/oHNHyLZ7bIciCbY qDPXbCGMyUKCJYnTbor7L0tZIMQQV37NxdvbuQdSdwSjo3f0zGYwKmh7I0M3TI6DGW8z vLGr8DMod5PedHaEyZhby02ameUanTGG7dJqJCMjwtTiCCDJssH1XJVYEhiIDj5HDszC e9TQ== X-Gm-Message-State: AOJu0YzIR0jqlhSkSNB214SuBBMQU8CYdX6EbQdavpvoNHApq2Awx94m gbza99iZBf3+PQ1aCKrnJANWHY/XH0AeZRAnwXJSB2KO5VWeE+w5ae9ScSq2hGg= X-Google-Smtp-Source: AGHT+IHc7ueHoeZ78qtsNy3gd8c/oEoo2nOnDyxntt3wb0tJLgWmBDNYSZb05h7Av17dwgQfREUg1g== X-Received: by 2002:a05:6902:b01:b0:e33:14fa:2273 with SMTP id 3f1490d57ef6-e3314fa232amr169232276.5.1730468836506; Fri, 01 Nov 2024 06:47:16 -0700 (PDT) Received: from PC2K9PVX.TheFacebook.com ([50.193.156.113]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-462ad0cac07sm18840631cf.48.2024.11.01.06.47.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 06:47:16 -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@vger.kernel.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 v5 2/3] x86: probe memory block size advisement value during mm init Date: Fri, 1 Nov 2024 09:47:04 -0400 Message-ID: <20241101134706.1185-3-gourry@gourry.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241101134706.1185-1-gourry@gourry.net> References: <20241101134706.1185-1-gourry@gourry.net> Precedence: bulk X-Mailing-List: linux-cxl@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 Acked-by: Dave Hansen Acked-by: Mike Rapoport (Microsoft) --- arch/x86/mm/init_64.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index ff253648706f..f1a495e998ce 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1452,16 +1452,21 @@ 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_advised_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) { + for (; bz > MIN_MEMORY_BLOCK_SIZE; bz >>= 1) { if (IS_ALIGNED(boot_mem_end, bz)) break; } From patchwork Fri Nov 1 13:47:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Price X-Patchwork-Id: 13859409 Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (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 54D2E1A2C32 for ; Fri, 1 Nov 2024 13:47:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730468843; cv=none; b=DPwZ2juEN+fycB+HpXeiXgs5zhT5nDJGGA3gXsoK/yl5PtePzMOUT6WEJnP0g6qZYvweOOV5Z6baPtbbDTgE1squT8dxNzNRHTuuKEAH5GuGe8ZWeNxyT6Dg5w7Mak0OIPCbw5x4PIVQbATTG0UA8Ioew64+sUSkzTUvs4xORlk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730468843; c=relaxed/simple; bh=w/E90TDRcavpiLD6UuAlqK6J3Z+bDO28CswOLV8SvO4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W4ZJy3xfltZa2/UJWkDw9dQhEh9yKkW55Y6b9BM2TOUF2Q0qLAStnpbOPAIkea7yTPO2PNcvsv9dq9NGgtD4VoCfvYVL7lwyfSJUCM936UVx8odETceJ4k05wCBaeSqlxO4TPH6SeoCMeSU15kPDRSUCRzd35aic0+k7OpRgZ8s= 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=lQF5mFq+; arc=none smtp.client-ip=209.85.160.175 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="lQF5mFq+" Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-4609beb631aso13305411cf.2 for ; Fri, 01 Nov 2024 06:47:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1730468840; x=1731073640; 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=Y+zdKugU7xiryBghEkTtjHu3m1t20HIVG0keEZ55skE=; b=lQF5mFq+8i6gXEumXeFamDXeFhH+8jUdL4ewTWNI3J5bSG7CC0UWTCmxSmbtcRBxom 16yoSe4ScQeZI+60P1gTQw799L3nRcF64Wjcsy5+COKycAYcr0Za4RVvIRgNTaMitXM/ DEBlRmrMMKX+X831rjZEW7/57B8sHXIGDPzPZsSUsyxCJ2qTTFpOoql3mZkJ/B/REXb2 eNhwrTM/0YXgv9xi1+utA+5jIghu6t6CrqIghaO0P/cDtQE9UzQh9BsBEqtW72T1P+X3 bp2TPU2EfUYBwv8ZEyEPGeLGlemC7YEGoZVG31vBV3TQcs2zalzO+6AyJdQsfIXSMYb8 +Xqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730468840; x=1731073640; 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=Y+zdKugU7xiryBghEkTtjHu3m1t20HIVG0keEZ55skE=; b=hQLO0mecOWpmcO3fGnNwQ2GgYe+DVtB6DLsOU96u+V5Ftzu2GSkPp9MCyUg1VISkNY oDYqK1YV95SfAtPoFm3yDimahsSGeE0W5v7fmL+ptSBZ1/0xVRhC2cyOuTTS0O2Cu5+l im268XaiTLrFz/KjW62swlcW/KPPfHRJ+6A175aJP2jRagzxLafloBtBydwYt8154DMe 3HcG75t/SksvwhebI1mcWHkqGu55mnCtCZieK5H+ZJNS1h7UJfektLx/GJc6q3m3pC/L H3kNcCdAz8Dt6joDxFRGVETaWJIdPHvav/LqGezWSiYI0U774shr7RALMNuh2lnDz/Yp +NWg== X-Gm-Message-State: AOJu0YysxkUKi9t7IQn4lLDHO19le7nUgoTdPFYiviRCSKfwTLXyA1e8 kCwtIbIZZKr9NnRyFMH7F/emKFg4WMmhMjYaFqtSV0FZyOAUfxmf7btkj+OkIno= X-Google-Smtp-Source: AGHT+IEqYRg/5UZkjuUahc1kZYI/R3+uQRVmb1D8Hw7IJxtfAawWOive+EatrYV0MOKL9iMFUrnP5A== X-Received: by 2002:ac8:5acc:0:b0:461:15a1:7889 with SMTP id d75a77b69052e-462b8680102mr46144121cf.16.1730468840141; Fri, 01 Nov 2024 06:47:20 -0700 (PDT) Received: from PC2K9PVX.TheFacebook.com ([50.193.156.113]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-462ad0cac07sm18840631cf.48.2024.11.01.06.47.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 06:47:19 -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@vger.kernel.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 v5 3/3] acpi,srat: give memory block size advice based on CFMWS alignment Date: Fri, 1 Nov 2024 09:47:05 -0400 Message-ID: <20241101134706.1185-4-gourry@gourry.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241101134706.1185-1-gourry@gourry.net> References: <20241101134706.1185-1-gourry@gourry.net> Precedence: bulk X-Mailing-List: linux-cxl@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. Suggested-by: Dan Williams Signed-off-by: Gregory Price Acked-by: Mike Rapoport (Microsoft) Acked-by: David Hildenbrand --- drivers/acpi/numa/srat.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c index 44f91f2c6c5d..34b6993e7d6c 100644 --- a/drivers/acpi/numa/srat.c +++ b/drivers/acpi/numa/srat.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -338,13 +339,22 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, { struct acpi_cedt_cfmws *cfmws; int *fake_pxm = arg; - u64 start, end; + u64 start, end, align; int node; cfmws = (struct acpi_cedt_cfmws *)header; start = cfmws->base_hpa; end = cfmws->base_hpa + cfmws->window_size; + /* Align memblock size to CFMW regions if possible */ + align = 1UL << __ffs(start | end); + if (align >= SZ_256M) { + if (memory_block_advise_max_size(align) < 0) + pr_warn("CFMWS: memblock size advise failed\n"); + } else { + pr_err("CFMWS: [BIOS BUG] base/size alignment violates spec\n"); + } + /* * The SRAT may have already described NUMA details for all, * or a portion of, this CFMWS HPA range. Extend the memblks