From mboxrd@z Thu Jan 1 00:00:00 1970 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 B3863D2A524 for ; Wed, 16 Oct 2024 14:45:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4B4A46B0092; Wed, 16 Oct 2024 10:45:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 465306B0095; Wed, 16 Oct 2024 10:45:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 32C776B0098; Wed, 16 Oct 2024 10:45:56 -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 143FB6B0092 for ; Wed, 16 Oct 2024 10:45:56 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id AEC08160557 for ; Wed, 16 Oct 2024 14:45:44 +0000 (UTC) X-FDA: 82679739702.15.48BB889 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf28.hostedemail.com (Postfix) with ESMTP id 638EEC001A for ; Wed, 16 Oct 2024 14:45:45 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729089906; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EO0cQYBenHuCUfIpT1u5tFVRihtYh3ieVjpIszhyTo4=; b=0TBZXg848aSmF+xSRWwiq6QJcNNuz3kbILDXYUnZ6ftzCS87LOA76EhAlWrZEAyW5U8k6E /R1kjdlAWgqg6yBRgxeIMofHTC4GTMAd2USWQC4Lbgij6voi+f/DUIh8ebr91X5cb6elHS oDy+7dV/eK6xHl5+O81DU6xNGSFYLo4= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729089906; a=rsa-sha256; cv=none; b=cbmhS5i9C/3eyW8rv+cAra3yt7pHx9ZXVt6u8+Xz69VfAJ5o7jtjx2rKQysSgqItTnmKDH ami45ZzQHlpaOHH7z+ofHvvMDcEgfdWbJ6u+9jCA0cYQ549eb1UgveWFIfd1LMZdiFjIDY CpJJ6ROEgxnzEIargqsuBcfYnY3sJuo= 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 BA8C21007; Wed, 16 Oct 2024 07:46:22 -0700 (PDT) Received: from [10.1.28.177] (XHFQ2J9959.cambridge.arm.com [10.1.28.177]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 464683F71E; Wed, 16 Oct 2024 07:45:50 -0700 (PDT) Message-ID: <43395dc5-51e1-417b-8a0a-7b8482a24411@arm.com> Date: Wed, 16 Oct 2024 15:45:48 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [RFC PATCH v1 30/57] drivers/base: Remove PAGE_SIZE compile-time constant assumption Content-Language: en-GB 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 , Greg Kroah-Hartman Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20241014105514.3206191-1-ryan.roberts@arm.com> <20241014105912.3207374-1-ryan.roberts@arm.com> <20241014105912.3207374-30-ryan.roberts@arm.com> From: Ryan Roberts In-Reply-To: <20241014105912.3207374-30-ryan.roberts@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Stat-Signature: opcej1o9b6z6cnkgyzcfwq7q5jmu3zqu X-Rspamd-Queue-Id: 638EEC001A X-Rspamd-Server: rspam11 X-HE-Tag: 1729089945-801947 X-HE-Meta: U2FsdGVkX1/QWZmC4++pSPayxYA8oswIK5zm0Ltz8JSQ5W26SBYaNfExErmYvue64u8RTvFizg4i6ffS99yLiKk0ugpp2K1lATxRPkLgAAk7UWJ8+ikYLPdb2TNO8HL7ZpaBhio3T6cDf2xz3NZ1SPzjHL37sb8HHQnqJ9ZSaBMM3ssVRLH3zAUViYBiSnfkHM5rGGeNGS1z910Zam9FjvBvhhH1TdM6z1XDyHy1WY8tKRJkwpkDDbYg9gcmFC9ZmvIyvWe8pdQ9pdfoyjjmxJ301EgWMg4DnRlNCHcYJGgWx3bZXJnubxif82cG6eUygLwOgo2YuJtd0VJ/aVwCdC5eKTW11Uw6E6MfNUh15tqhk5kMEbyFZXW6gvqXkCXoNib55/c2JaCyNTcgONqOz7ExzOTAXnVseBJ57HTvaJ87R6lFaQdF8oJPG1caHj7s1PuzmahevE5dwMfKYlBjvPgPo6S3TXUobqDmucA65MpyFa0THNrBH5N65GTfe0hsVgmRnAfm607mIWY8dcai6f/mNHilNRPpDjFwusltdUmmykSFgCMO2F8n6GQ3P3OFYH5aIMaiXWJYaD+hvsX51D6+hBvJTQ/exkLISgsgqmz9QL4QDHe6HnFT4vx3Fo4z3Bh5zbI4JJ4eGOvNPHtSDhrvGVg331aicy7t+D96/rwAj1cQBDDYd8CzsjLEIgHboAiZCvipswc/BoIg6+EQEGtOYw9/FEVBy7lUJ+CeiGeDbgI4xX5bkqCZP9LkvtiqBztTR62Fol6nOfA5UE8mIYl8TtpYazuSjWw648rweqJoeuVZq7w/HJePxUTJFUWqPqsw+7dEyrlHHHba2SzKPVF0Y/xT4WJDSoDXu9v2DBwZmg5LWI5bZjgiJJlEEudEiH6Syec8aX1NF7wxYmX4XKP7OFwTPwgkcsR3cXDc99ijF03+B4KiX8qEnUP2+2F5h1G3xEw/V4L/MJx61+H r7KxxnU5 Q0/YDpLPSkrbiQjVVeKmWEViITe1uWKkVf0QH86IzyiSdc4rD0Iang47Z8p8PQRlN1pTdezeBlobveaWnhtSxW6Awa/7NwYIUhZo762cpIIaBHz9p8bUNpmaHa3e8Rk48JW8Ey8PZw1oBooI0/7L/s2P0ybgqpUnNhoHMtrakt0nmQQalk8z+72wejrExF9KtqIxyb1rE+BlLYvq+3NX5QG5z1B4eIhyko7/Bjet4YhaC99wVxYi6NIb0DRRx5Z49QheLU9OT7LtPmUDRgI7VGsBexn7Y83yQcetJODnPHCZAMhEQ4tAaRvjYeX2kDnGNVo62nfkl0Ruxf2l5SR2B2ba4nw== 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: + Greg Kroah-Hartman This was a rather tricky series to get the recipients correct for and my script did not realize that "supporter" was a pseudonym for "maintainer" so you were missed off the original post. Appologies! More context in cover letter: https://lore.kernel.org/all/20241014105514.3206191-1-ryan.roberts@arm.com/ On 14/10/2024 11:58, Ryan Roberts wrote: > 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 */