From patchwork Mon Oct 14 10:58:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13834870 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3C97BD1624E for ; Mon, 14 Oct 2024 12:13:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=5o+gDL2mN3xapmdN2m55fCy14ysHc8+6na6uUa6irXM=; b=gqxRvuKo5MyKQZBGnEWsfu4Qpx /KjU9U/LfPOrLWOVnQJ6P7+KVT4SP8TBtILpSBCEXU0HKnYvyqQ20OIKhh8LUmW2ykPRBm2zfdIVC n/2LiOuIZIET8BpjXnXfkPopKhlgrKRnlSn1bwT/BARfFn8s31VP2WFkPIXx0Za+1cYLQnhNHl41u blL6cemZfTIzgebuQShcOLXRZ+ZSPdw7jH98IFxsan7TaerJIf1r0qA0yZlFLD9W6QIM5bGm10frH BgILTSSTEeE20k9Q+gLE/4rTLFQuOZyb3TVv3WqTQIh544UbCzLjx2ODF91w+PJlchXx41YJoArs2 GRLSDq5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t0Jwg-000000052gc-3rvP; Mon, 14 Oct 2024 12:13:06 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t0IpC-00000004oGb-1tVf for linux-arm-kernel@lists.infradead.org; Mon, 14 Oct 2024 11:01:20 +0000 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 997AD16F8; Mon, 14 Oct 2024 04:01:47 -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 769A53F51B; Mon, 14 Oct 2024 04:01:14 -0700 (PDT) From: Ryan Roberts To: "Michael S. Tsirkin" , Andrew Morton , Anshuman Khandual , Ard Biesheuvel , Catalin Marinas , David Hildenbrand , Dominique Martinet , Eric Van Hensbergen , Greg Marsden , Ivan Ivanov , Jason Wang , Jens Axboe , Kalesh Singh , Latchesar Ionkov , Marc Zyngier , Mark Rutland , Matthias Brugger , Miroslav Benes , Will Deacon Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, v9fs@lists.linux.dev, virtualization@lists.linux.dev Subject: [RFC PATCH v1 35/57] virtio: Remove PAGE_SIZE compile-time constant assumption Date: Mon, 14 Oct 2024 11:58:42 +0100 Message-ID: <20241014105912.3207374-35-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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241014_040118_602762_E2FAE656 X-CRM114-Status: GOOD ( 15.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 multiple BUILD_BUG_ON() instances to test against page size limits. Wrap global variables that are initialized with PAGE_SIZE derived values using DEFINE_GLOBAL_PAGE_SIZE_VAR() so their initialization can be deferred for boot-time page size builds. 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/block/virtio_blk.c | 2 +- drivers/virtio/virtio_balloon.c | 10 ++++++---- net/9p/trans_virtio.c | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 194417abc1053..8a8960b609bc9 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -899,7 +899,7 @@ static ssize_t serial_show(struct device *dev, int err; /* sysfs gives us a PAGE_SIZE buffer */ - BUILD_BUG_ON(PAGE_SIZE < VIRTIO_BLK_ID_BYTES); + BUILD_BUG_ON(PAGE_SIZE_MIN < VIRTIO_BLK_ID_BYTES); buf[VIRTIO_BLK_ID_BYTES] = '\0'; err = virtblk_get_id(disk, buf); diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 54469277ca303..3818d894bd212 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -25,6 +25,7 @@ * page units. */ #define VIRTIO_BALLOON_PAGES_PER_PAGE (unsigned int)(PAGE_SIZE >> VIRTIO_BALLOON_PFN_SHIFT) +#define VIRTIO_BALLOON_PAGES_PER_PAGE_MAX (unsigned int)(PAGE_SIZE_MAX >> VIRTIO_BALLOON_PFN_SHIFT) #define VIRTIO_BALLOON_ARRAY_PFNS_MAX 256 /* Maximum number of (4k) pages to deflate on OOM notifications. */ #define VIRTIO_BALLOON_OOM_NR_PAGES 256 @@ -138,7 +139,7 @@ static u32 page_to_balloon_pfn(struct page *page) { unsigned long pfn = page_to_pfn(page); - BUILD_BUG_ON(PAGE_SHIFT < VIRTIO_BALLOON_PFN_SHIFT); + BUILD_BUG_ON(PAGE_SHIFT_MIN < VIRTIO_BALLOON_PFN_SHIFT); /* Convert pfn from Linux page size to balloon page size. */ return pfn * VIRTIO_BALLOON_PAGES_PER_PAGE; } @@ -228,7 +229,7 @@ static void set_page_pfns(struct virtio_balloon *vb, { unsigned int i; - BUILD_BUG_ON(VIRTIO_BALLOON_PAGES_PER_PAGE > VIRTIO_BALLOON_ARRAY_PFNS_MAX); + BUILD_BUG_ON(VIRTIO_BALLOON_PAGES_PER_PAGE_MAX > VIRTIO_BALLOON_ARRAY_PFNS_MAX); /* * Set balloon pfns pointing at this page. @@ -1042,8 +1043,9 @@ static int virtballoon_probe(struct virtio_device *vdev) * host's base page size. However, it needs more work to report * that value. The hard-coded order would be fine currently. */ -#if defined(CONFIG_ARM64) && defined(CONFIG_ARM64_64K_PAGES) - vb->pr_dev_info.order = 5; +#if defined(CONFIG_ARM64) + if (PAGE_SIZE == SZ_64K) + vb->pr_dev_info.order = 5; #endif err = page_reporting_register(&vb->pr_dev_info); diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 0b8086f58ad55..25b8253011cec 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -786,7 +786,7 @@ static struct virtio_driver p9_virtio_drv = { .remove = p9_virtio_remove, }; -static struct p9_trans_module p9_virtio_trans = { +static DEFINE_GLOBAL_PAGE_SIZE_VAR(struct p9_trans_module, p9_virtio_trans, { .name = "virtio", .create = p9_virtio_create, .close = p9_virtio_close, @@ -804,7 +804,7 @@ static struct p9_trans_module p9_virtio_trans = { .pooled_rbuffers = false, .def = 1, .owner = THIS_MODULE, -}; +}); /* The standard init function */ static int __init p9_virtio_init(void)