From patchwork Mon Oct 14 10:58:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13834698 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 DDAA2D1A43B for ; Mon, 14 Oct 2024 11:01:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 708C96B00BA; Mon, 14 Oct 2024 07:01:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 691346B00BB; Mon, 14 Oct 2024 07:01:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 50AA96B00BC; Mon, 14 Oct 2024 07:01:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 2F8E96B00BA for ; Mon, 14 Oct 2024 07:01:05 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4DD851A0D61 for ; Mon, 14 Oct 2024 11:00:51 +0000 (UTC) X-FDA: 82671915564.04.7156D3B Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf21.hostedemail.com (Postfix) with ESMTP id 735561C0020 for ; Mon, 14 Oct 2024 11:00:51 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf21.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728903522; 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; bh=S0gIad1IKQmWm9pceFZyemJEemJ3RuiyqEiPFLVA8hg=; b=WoXMD0xVBf8eP82PKZyNs0wm0a7PNSgTgQnj8dc/b14eAFG5G2+J9F0fHsEm1frEPAjWXm mQtHe7OXBWeLjfhr0QuuwgqtFmwLcHi1ZmGMP7d/zDFJH99oDpePTeUkHp6hWF46p8QU86 w/rqH7PJTCeyWsw5mTl9rh8zqecxTuI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728903522; a=rsa-sha256; cv=none; b=Ywq0IG46KJFQsAeX+bFmIS5Sl6dArPrcmwzRakwE8/9oqYBgra4mlkxhRaCRjPFF9FXIRa X7O3uvPgqrwQBn36DtTzXxKhJnza8ze0bl6H3wq4wEMoZ2tV+zAdepZKjG3vNbXhTKxe9y 7pBgPWottvV+DLfcx6h/7/V2R3QBJgg= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf21.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1454116F3; Mon, 14 Oct 2024 04:01:32 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EAD463F51B; Mon, 14 Oct 2024 04:00:59 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Anshuman Khandual , Ard Biesheuvel , Catalin Marinas , David Hildenbrand , Greg Marsden , Ivan Ivanov , Kalesh Singh , Marc Zyngier , Mark Rutland , Matthias Brugger , Miroslav Benes , Will Deacon , Yury Norov Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH v1 30/57] drivers/base: Remove PAGE_SIZE compile-time constant assumption Date: Mon, 14 Oct 2024 11:58:37 +0100 Message-ID: <20241014105912.3207374-30-ryan.roberts@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014105912.3207374-1-ryan.roberts@arm.com> References: <20241014105514.3206191-1-ryan.roberts@arm.com> <20241014105912.3207374-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 735561C0020 X-Stat-Signature: m9k3oz4kjoe9xaxekoe9giucdr3mnjro X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1728903651-511570 X-HE-Meta: U2FsdGVkX1/CWF1oVEcjoKRHXv7U5GNFalXPqQu27XmywtrLVSCIN87sUhv5nRfMhyJPUoRpWM5zY6n5oPePWRSNvhocqEpQsKAnWiXRXNknlzpesi2txya/A90yKygVPRSbxfJO7mU5gvK0VNJVQ3CrF3C8DlHfZoUdSAEQDRETWG+k9MLBHfN/FlcM8oL9uVYtbezf5F+ZglHBsJcbPHFGOGLRgJBNY96fGV1TH8j2wjEC+Oh0BCu75S/+qShEj5LadJd4A0W3paDqYkL2tXnH9AJxn1be1WQxpsnkn7oJDUepntM0T5yK8i4D+7VKi0L8SGK0N0OyJ8U4EDAvwDk80HSkEWV/Bouusu/FzGyB+Cji2saK9kcvjwxBVzomqI5xofQlIDqFuPH+cPYv/h/9+qFBYipLtSSHeLzrXji+meL/K9jzegqAVVm0AMJvhycGhAM1IQFvC2MHFWdFLLsR4MsIO2fu0qtPvZSqyj2FKhzsGpctUj37TE6geDmCRhwdpj6dIkQTkCs4oMDUD4SbB3yuYAHkalaJR8jENOY6+cAhtp4sih1hh7ORDWqXl1eMzyzPnkg+DHdvF4f7t8cUe4U5LLnuE3OujA+vBtqBGlfHa7QZpaiOU+Uv5C+qcr208EfuC6n/K9vhgs69ZCzj9Wh+MIlGKYDB874X3ewt9Y7W9sRCyPFR1pPhKcMTWwgnAX64kULnleaJ9IKAak+se8AcRuDJ+BARLktDHhtPlJ3pgNAbN3sE1Mba+yS97fkJduVLHpxn3iWcXVKps5I59Jt5eqS6iPsui0U/dxP2ZMfVKrJOntXzmezRYwGDa3kFgRicN98WzxVq/eE9kHb7cLakyZ8NE66WwN1WT0pSwjAVoFdCOTMQQ13KybmLXdRVSt8qATbc56pwK/l/6AhQaofqcxP51+/aQm7w2R3Yzob361UFsLT8H3qAH0KquAlbUmdns3Dn4gCN5pA 6FK1y0cx wowj+OoJ2DHNheNi15/u5jy/EVx9KNWBHb9mrHI19atc2dC2Q81FUjbPtYvCxu5mmfdU93YFxYl+N7JYXrz6C8hc9/6xhxTNu+eNl2ZYUsj8R/VVT3+n7gvGxFDeQHvVbJKVO8XzzTjJUGhc8yoZouUEgHRA/tUzQvjLgQ5b4b3xaMSaXkcEvLzgqgRaYY2U7gDVkql+MLd1SxDLnvNA0db0k2Z3iHM7RpqCgBGqAtQ/hC3ebHYHhAJ+psGy9qHsZp0uUOqUFKicugLs7MsQdXglLiUHqfYP7u/9hh2wllkylEG0= 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: To prepare for supporting boot-time page size selection, refactor code to remove assumptions about PAGE_SIZE being compile-time constant. Code intended to be equivalent when compile-time page size is active. Update BUILD_BUG_ON() to test against page size limits. CPUMAP_FILE_MAX_BYTES and CPULIST_FILE_MAX_BYTES are both defined relative to PAGE_SIZE, so when these values are assigned to global variables via BIN_ATTR_RO(), let's wrap them with DEFINE_GLOBAL_PAGE_SIZE_VAR() so that their assignment can be deferred until boot-time. Signed-off-by: Ryan Roberts --- ***NOTE*** Any confused maintainers may want to read the cover note here for context: https://lore.kernel.org/all/20241014105514.3206191-1-ryan.roberts@arm.com/ drivers/base/node.c | 6 +++--- drivers/base/topology.c | 32 ++++++++++++++++---------------- include/linux/cpumask.h | 5 +++++ 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index eb72580288e62..30e6549e4c438 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -45,7 +45,7 @@ static inline ssize_t cpumap_read(struct file *file, struct kobject *kobj, return n; } -static BIN_ATTR_RO(cpumap, CPUMAP_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(cpumap, CPUMAP_FILE_MAX_BYTES); static inline ssize_t cpulist_read(struct file *file, struct kobject *kobj, struct bin_attribute *attr, char *buf, @@ -66,7 +66,7 @@ static inline ssize_t cpulist_read(struct file *file, struct kobject *kobj, return n; } -static BIN_ATTR_RO(cpulist, CPULIST_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(cpulist, CPULIST_FILE_MAX_BYTES); /** * struct node_access_nodes - Access class device to hold user visible @@ -558,7 +558,7 @@ static ssize_t node_read_distance(struct device *dev, * buf is currently PAGE_SIZE in length and each node needs 4 chars * at the most (distance + space or newline). */ - BUILD_BUG_ON(MAX_NUMNODES * 4 > PAGE_SIZE); + BUILD_BUG_ON(MAX_NUMNODES * 4 > PAGE_SIZE_MIN); for_each_online_node(i) { len += sysfs_emit_at(buf, len, "%s%d", diff --git a/drivers/base/topology.c b/drivers/base/topology.c index 89f98be5c5b99..bdbdbefd95b15 100644 --- a/drivers/base/topology.c +++ b/drivers/base/topology.c @@ -62,47 +62,47 @@ define_id_show_func(ppin, "0x%llx"); static DEVICE_ATTR_ADMIN_RO(ppin); define_siblings_read_func(thread_siblings, sibling_cpumask); -static BIN_ATTR_RO(thread_siblings, CPUMAP_FILE_MAX_BYTES); -static BIN_ATTR_RO(thread_siblings_list, CPULIST_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(thread_siblings, CPUMAP_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(thread_siblings_list, CPULIST_FILE_MAX_BYTES); define_siblings_read_func(core_cpus, sibling_cpumask); -static BIN_ATTR_RO(core_cpus, CPUMAP_FILE_MAX_BYTES); -static BIN_ATTR_RO(core_cpus_list, CPULIST_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(core_cpus, CPUMAP_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(core_cpus_list, CPULIST_FILE_MAX_BYTES); define_siblings_read_func(core_siblings, core_cpumask); -static BIN_ATTR_RO(core_siblings, CPUMAP_FILE_MAX_BYTES); -static BIN_ATTR_RO(core_siblings_list, CPULIST_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(core_siblings, CPUMAP_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(core_siblings_list, CPULIST_FILE_MAX_BYTES); #ifdef TOPOLOGY_CLUSTER_SYSFS define_siblings_read_func(cluster_cpus, cluster_cpumask); -static BIN_ATTR_RO(cluster_cpus, CPUMAP_FILE_MAX_BYTES); -static BIN_ATTR_RO(cluster_cpus_list, CPULIST_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(cluster_cpus, CPUMAP_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(cluster_cpus_list, CPULIST_FILE_MAX_BYTES); #endif #ifdef TOPOLOGY_DIE_SYSFS define_siblings_read_func(die_cpus, die_cpumask); -static BIN_ATTR_RO(die_cpus, CPUMAP_FILE_MAX_BYTES); -static BIN_ATTR_RO(die_cpus_list, CPULIST_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(die_cpus, CPUMAP_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(die_cpus_list, CPULIST_FILE_MAX_BYTES); #endif define_siblings_read_func(package_cpus, core_cpumask); -static BIN_ATTR_RO(package_cpus, CPUMAP_FILE_MAX_BYTES); -static BIN_ATTR_RO(package_cpus_list, CPULIST_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(package_cpus, CPUMAP_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(package_cpus_list, CPULIST_FILE_MAX_BYTES); #ifdef TOPOLOGY_BOOK_SYSFS define_id_show_func(book_id, "%d"); static DEVICE_ATTR_RO(book_id); define_siblings_read_func(book_siblings, book_cpumask); -static BIN_ATTR_RO(book_siblings, CPUMAP_FILE_MAX_BYTES); -static BIN_ATTR_RO(book_siblings_list, CPULIST_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(book_siblings, CPUMAP_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(book_siblings_list, CPULIST_FILE_MAX_BYTES); #endif #ifdef TOPOLOGY_DRAWER_SYSFS define_id_show_func(drawer_id, "%d"); static DEVICE_ATTR_RO(drawer_id); define_siblings_read_func(drawer_siblings, drawer_cpumask); -static BIN_ATTR_RO(drawer_siblings, CPUMAP_FILE_MAX_BYTES); -static BIN_ATTR_RO(drawer_siblings_list, CPULIST_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(drawer_siblings, CPUMAP_FILE_MAX_BYTES); +static CPU_FILE_BIN_ATTR_RO(drawer_siblings_list, CPULIST_FILE_MAX_BYTES); #endif static struct bin_attribute *bin_attrs[] = { diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h index 53158de44b837..f654b4198abc2 100644 --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h @@ -1292,4 +1292,9 @@ cpumap_print_list_to_buf(char *buf, const struct cpumask *mask, ? (NR_CPUS * 9)/32 - 1 : PAGE_SIZE) #define CPULIST_FILE_MAX_BYTES (((NR_CPUS * 7)/2 > PAGE_SIZE) ? (NR_CPUS * 7)/2 : PAGE_SIZE) +#define CPU_FILE_BIN_ATTR_RO(_name, _size) \ + DEFINE_GLOBAL_PAGE_SIZE_VAR(struct bin_attribute, \ + bin_attr_##_name, \ + __BIN_ATTR_RO(_name, _size)) + #endif /* __LINUX_CPUMASK_H */