From patchwork Mon Oct 14 10:58:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13834689 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 3778FD1A43B for ; Mon, 14 Oct 2024 11:00:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B9D966B0093; Mon, 14 Oct 2024 07:00:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B49D26B00A8; Mon, 14 Oct 2024 07:00:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9EAA66B00A9; Mon, 14 Oct 2024 07:00:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7D9A66B0093 for ; Mon, 14 Oct 2024 07:00:34 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A70471A0D54 for ; Mon, 14 Oct 2024 11:00:20 +0000 (UTC) X-FDA: 82671914220.16.71BA532 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf13.hostedemail.com (Postfix) with ESMTP id 266892001F for ; Mon, 14 Oct 2024 11:00:25 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; spf=pass (imf13.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=1728903560; a=rsa-sha256; cv=none; b=7e0pRIR/TcKOueGYpO+hhqHO8s5MO+egmnOZpIy7SvR25WLxF1ztn7VyLKL5LxgFiKW0U5 5PiCtqSftsQK3eUle7toBa2qNn6OyBHshMIIIIj2ETULshcZALX2/22uBnHpd7BaH7FOAN euJE4me0nG16lkJvCPefCqtIlz7w5EQ= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; spf=pass (imf13.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=1728903560; 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=WjYxq47rZAOyOAKetOXqZvgmx001+cTD5LxEFEwtYek=; b=FOMvGz1OLfx7PqnkLOE8Uu+DxsWWSGTCvfYWag3asXJzbXW15OSQgYNIBtiTgZyv86qItc j2Vp9p2tnJxHOeCmXKp5tFvZJDGZQYhLjzKGBt+vWyXVF2NPP3OK4FIH1Je6QYuY6qrkGz NaAPKuEnJ9thC2uEpElpiCIWlzOK5pI= 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 6EB86168F; Mon, 14 Oct 2024 04:01:01 -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 1323A3F51B; Mon, 14 Oct 2024 04:00:28 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Anna Schumaker , Anshuman Khandual , Ard Biesheuvel , Catalin Marinas , David Hildenbrand , Greg Marsden , Ivan Ivanov , Kalesh Singh , Marc Zyngier , Mark Rutland , Matthias Brugger , Miroslav Benes , Trond Myklebust , Will Deacon Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org Subject: [RFC PATCH v1 21/57] sunrpc: Remove PAGE_SIZE compile-time constant assumption Date: Mon, 14 Oct 2024 11:58:28 +0100 Message-ID: <20241014105912.3207374-21-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-Stat-Signature: 5ip81b63igciixhg9gnwsfdyeyadpj38 X-Rspamd-Queue-Id: 266892001F X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1728903625-51287 X-HE-Meta: U2FsdGVkX1/1ZO0gnEN7NcRC6mg2g4PEt+IcsdXBSxKF5QDJK1o8/NvXTjbY4W+uQqqL+hRNBS+U6N+6yAoE1IR9DPXqOsWCkwLM8N89GZ0vXMAkPeIHztzol6vnEvbL4de7rbKh0cxN5EMhWRaBYXslVOBcvC0RvPq6dAjZR9COfCmTaI9Q9D0duHQw7c7m/dD8ywBdfcIAfej+H1AGEciIeJ1cLqO0z9B3QUN972GrsRZzXNcmYxm5mGqHl+TkQjaWhaRKGfLnRdxJZJmNXmUqibYEnqGzqCOWzKWxOU3qtgYfUZYpTOEzXotTJLKIzu/496wBYaDXY25sb3brMV70JwF0UYNFlRLA9ivwabJqCezNVjb3FZIjNk2NI1T3ztgXAd/nsUE1JBPEukQha8upbVynrb0PJQU2KtnY39944Gkg4JoXQ5Izaz2zMtIJjQQ8eB450WPrImlkLZRtNIDetcwrrVXo2gpGWdCRYY9dPImrcps+Y1dJ2g4hkfvOTfpAsiFRP0W7Z8M3FgK+Xi5mXjdsIuXAcbtDxs4xBTWDhNrrcTedQsKoCmaN20IZaRVGst3yQvosS6QWizVRt2Xl/nKjkoJdbhTfS7hEpQtUCbQRoQ+rblNjNRNpT+rNf6BNW/bJyEAOvbn0O8MYrsWjEi+1PskOome1Lg0LG8PWN9D85Se7H9s4KYKSUeui7mZuMAAwZ903RMg+HJBMxWCdgRQkedtDyJgWSR54Bd0YNMGYc7MYth6ffckvGBK22kgQ+V5BC81vW2LTH6do0rdOuJz2NzltuZX+wDY44H5GnJIMDQTEu/JSj/MHMjVqiXG//DgW+f4Dco8yjlxJcset6CcLD7K9h923Gu9UV8kv6NenCrfjavhG4MXpLj5kXh++I3TEecJn2KKua2h2er2dZdGElBBAVK4ulkPoAU0IY3B9vc+WjoyD96s5iguhgOl5e76mjCoJOMVM6/k 1DZPFT9B nbt4CUbMFC0x9OSkc1/xeJtsevhy2nrwl8hNKf0/6YVWFCuo3j9TvX7r+KlB9M5J+HV70KM/dnUBiV3tsDbNIbw3tdLxCLfk8qzEhkM/AZeOn7IQS+D9FpIq7IQnRFPG372cCBlXBNDGtyxX+bN8dtcvff49X3AozbSI4GbgZIdSwEDHHvve/oUXKnkpHQf4Z1JKnKfpZ/Yits6MGtesfTCZWrm4wRUQ/Vfxd 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. Updated array sizes in various structs to contain enough entries for the smallest supported page size. 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/ include/linux/sunrpc/svc.h | 8 +++++--- include/linux/sunrpc/svc_rdma.h | 4 ++-- include/linux/sunrpc/svcsock.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h index a7d0406b9ef59..dda44018b8f36 100644 --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h @@ -160,6 +160,8 @@ extern u32 svc_max_payload(const struct svc_rqst *rqstp); */ #define RPCSVC_MAXPAGES ((RPCSVC_MAXPAYLOAD+PAGE_SIZE-1)/PAGE_SIZE \ + 2 + 1) +#define RPCSVC_MAXPAGES_MAX ((RPCSVC_MAXPAYLOAD+PAGE_SIZE_MIN-1)/PAGE_SIZE_MIN \ + + 2 + 1) /* * The context of a single thread, including the request currently being @@ -190,14 +192,14 @@ struct svc_rqst { struct xdr_stream rq_res_stream; struct page *rq_scratch_page; struct xdr_buf rq_res; - struct page *rq_pages[RPCSVC_MAXPAGES + 1]; + struct page *rq_pages[RPCSVC_MAXPAGES_MAX + 1]; struct page * *rq_respages; /* points into rq_pages */ struct page * *rq_next_page; /* next reply page to use */ struct page * *rq_page_end; /* one past the last page */ struct folio_batch rq_fbatch; - struct kvec rq_vec[RPCSVC_MAXPAGES]; /* generally useful.. */ - struct bio_vec rq_bvec[RPCSVC_MAXPAGES]; + struct kvec rq_vec[RPCSVC_MAXPAGES_MAX]; /* generally useful.. */ + struct bio_vec rq_bvec[RPCSVC_MAXPAGES_MAX]; __be32 rq_xid; /* transmission id */ u32 rq_prog; /* program number */ diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h index d33bab33099ab..7c6441e8d6f7a 100644 --- a/include/linux/sunrpc/svc_rdma.h +++ b/include/linux/sunrpc/svc_rdma.h @@ -200,7 +200,7 @@ struct svc_rdma_recv_ctxt { struct svc_rdma_pcl rc_reply_pcl; unsigned int rc_page_count; - struct page *rc_pages[RPCSVC_MAXPAGES]; + struct page *rc_pages[RPCSVC_MAXPAGES_MAX]; }; /* @@ -242,7 +242,7 @@ struct svc_rdma_send_ctxt { void *sc_xprt_buf; int sc_page_count; int sc_cur_sge_no; - struct page *sc_pages[RPCSVC_MAXPAGES]; + struct page *sc_pages[RPCSVC_MAXPAGES_MAX]; struct ib_sge sc_sges[]; }; diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h index 7c78ec6356b92..6c6bcc82685a3 100644 --- a/include/linux/sunrpc/svcsock.h +++ b/include/linux/sunrpc/svcsock.h @@ -40,7 +40,7 @@ struct svc_sock { struct completion sk_handshake_done; - struct page * sk_pages[RPCSVC_MAXPAGES]; /* received data */ + struct page * sk_pages[RPCSVC_MAXPAGES_MAX]; /* received data */ }; static inline u32 svc_sock_reclen(struct svc_sock *svsk)