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 A4F29D2E008 for ; Wed, 23 Oct 2024 01:23:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0C9926B00A7; Tue, 22 Oct 2024 21:23:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 079196B00AA; Tue, 22 Oct 2024 21:23:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E36636B00AB; Tue, 22 Oct 2024 21:23:50 -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 C0ABD6B00A7 for ; Tue, 22 Oct 2024 21:23:50 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D6EE312062E for ; Wed, 23 Oct 2024 01:23:34 +0000 (UTC) X-FDA: 82703119674.26.DF47494 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf08.hostedemail.com (Postfix) with ESMTP id 2B4F0160007 for ; Wed, 23 Oct 2024 01:23:37 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=A3cY+EIz; spf=pass (imf08.hostedemail.com: domain of sstabellini@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sstabellini@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729646577; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=NLv2G2S5hB4qtyUd0fiDf881Kb+kviTQbZWmMFVUqnk=; b=GWMZAh3cpxD45hw4lPW38xqA8MZ0Hmm/FMMrXa09DAZYWOgr7KtPref0iGmp6q0NuZidbn 7/0q/s/oD6WTJ30VtfUn3h7FNLrHX31NJ39zd/AJ+cKcM678OPgbhJxhOXYQBQeRxo8UE9 74DaVWzJ4YcXhowwhI40hthdRHD1ajo= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=A3cY+EIz; spf=pass (imf08.hostedemail.com: domain of sstabellini@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sstabellini@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729646577; a=rsa-sha256; cv=none; b=wXYWja+onjkYn0IT1xe1y6R/XB8X12UBvz5XBte6H0BwF+VYawn3N8fi7WJCS81oL5x0yJ JwTAuzft7qf7McYRivwgzUbqPhCLIgYJbq1fbhpasBIWJhhh06efFVytjzCTr40/9SWxy3 A/QsrJzuld6SYvIKo5fHaOsdccHmKnM= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id B0C2B5C5C10; Wed, 23 Oct 2024 01:23:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6CAC3C4CEC3; Wed, 23 Oct 2024 01:23:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729646627; bh=uz1jW+5+Ofi9FJaMXj4JSfMBRXP2E1lFAcoWjioSfg8=; h=Date:From:To:cc:Subject:In-Reply-To:References:From; b=A3cY+EIz3qSx+Fyzyo0FIaKQYLpmUQZNafKqqLlnAra/uKRudTI+wocv8iWHRb7HN eSKfproxm/eVjOwAJXtfyxqD70imuoMnD/ZZyrkc93fZWisUJ9O4MxOafzBw9YE2QH P+QQ1+1uim1Zt3YoBwSmI4jrcChnB54omc/TMSznH+uUlqpTTvWMVdRe/VTif08ilp DtI5rpaTldK+8okOsy2Q9wzuk+d1m8I7XAXybINzK4Ih31jIVWpCCtaAEaYvrf5aEm a6mTKp5n29/oi0UHkvy6md4TFkCdpkHmNwG+KUHAYW41rjOs53ZbFrndqAkCX2eYHh DEVRaFvG4TO8g== Date: Tue, 22 Oct 2024 18:23:42 -0700 (PDT) From: Stefano Stabellini X-X-Sender: sstabellini@ubuntu-linux-20-04-desktop To: Ryan Roberts cc: 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 , Juergen Gross , Stefano Stabellini , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, xen-devel@lists.xenproject.org, julien@xen.org Subject: Re: [RFC PATCH v1 36/57] xen: Remove PAGE_SIZE compile-time constant assumption In-Reply-To: <829b5662-13c0-4728-894c-b2d578681b11@arm.com> Message-ID: References: <20241014105514.3206191-1-ryan.roberts@arm.com> <20241014105912.3207374-1-ryan.roberts@arm.com> <20241014105912.3207374-36-ryan.roberts@arm.com> <829b5662-13c0-4728-894c-b2d578681b11@arm.com> User-Agent: Alpine 2.22 (DEB 394 2020-01-19) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Rspam-User: X-Stat-Signature: zswxg58ha4hbhianmmkqmhzunmribubn X-Rspamd-Queue-Id: 2B4F0160007 X-Rspamd-Server: rspam11 X-HE-Tag: 1729646617-812217 X-HE-Meta: U2FsdGVkX18C9jOYbsLVRZ9EXalYNMQAV+/ctGQwe7p7WYqWDDQLeWwqRF3Rufcv48vE6PvdERn7dXRXzdCXzCXe0wRh2Fv+vtJO6rM+rJHAGp8/e/DS7kagGR962cCWURCFczJc3MvvWHaJ4fqFpLUEmPnk+p+t1Dq5WxwjOCnYdNb0eD7sZ1xZ1WhEOkjbEW7NF+QbuJe6IYCSpmxVYH/+Ar7t3wicy9KQcmP1jE0AF6VOtyh1cc9ApLXEhITTJsFqgX48HSog13CGDUO5K92bXDsjdmliKDy7DLHtOS6icJBQiVUv5337EFxZscx8Wr2sb/iGJcgW4zvqzr7UYx1SClDrbGnMN7lxkoMhMGV8LTpXW+D2840Iydh3sqHBeo5fPmfY8E6w+5WjEwDhXfVbZgGUAxd6uKGJwU4bpLIqMlOyzmgkAyMvCMC0487CDadgdczn/zI2rdnbY0zrKadKrYBxvew2LthhUl2YJ3hPivhGi1o/LXbfg6Lr/1XDNggVvtj6HdC1n4GSto8qyWDiSP6DS4bkbSK3cINtU77ckh8nMRAuA3AjZuY+tNcYBCuylXDHM5DiKtB7Gd5u7urS1TCvWkquhNSe0v87anAC6bBK5gGAd2iU/YAB7KCkhKJPorWSfFtpSugy4VVkou+6nTNHDZRVZP7m8G9sKJwQr8Xjip8gQvjRkjNh/uPHPaRqix9bijnD3cPCitzIDEqgCTDaFfPKgWqcI59goDUqkePORY/kFUWcF9PT6YfxmAMm5i9helsU9p+TaeaYg9lB7FBwdcSuGqBy1BstNV7zKUGbsc+30oHsGkUeopFE+Ir10my+lpaXnKyyjZQDDlgi2ki/xDm3wImatvFsoRJVOq7ulydPVbvoXMQ7pxCF7s33++H3QUVQickWsAPU8P9a6Qi7c74XaOjZ3wpeyMLQ880gG/o8xmhsdxEPX3qhuSMJK5XZi7+fvHIB3QV JNCY1HpI N6FdSvmUxY1ZdFhJOUqrij5frENfyfaUI/qkSpXCDMS80tXCbeLMGLwMLOub2T/+AAmF9l91gVZw00qBN+kXcL52qsH78qUprDYQeHrGl1G4I/25SJvJCPz33HI50K+Mlyst9DHF83wecPVD1RDJ8aaLB2zne+SidtjMWqnDKufDU8AvOJ06x0c/1aJaanjbKwfrgExa7BnjVhOxxhu1IEmc1QIuy/A4EMwp7W3ltC4t893YwulSN+b9M+519yxthFXrKucbNLOFE1JKWmEd8kyo/XNogsEfbd627BVxsjDA2FzN2WDdYdWY1moOAQuLfhf1GVnPLvr1V5MTDjldJhz0TT5Qpt1muawMr 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: +Julien On Wed, 16 Oct 2024, Ryan Roberts wrote: > + Juergen Gross, Stefano Stabellini > > 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. > > > > Allocate enough "frame_list" static storage in the balloon driver for > > the maximum supported page size. Although continue to use only the first > > PAGE_SIZE of the buffer at run-time to maintain existing behaviour. > > > > Refactor xen_biovec_phys_mergeable() to convert ifdeffery to c if/else. > > For compile-time page size, the compiler will choose one branch and > > strip the dead one. For boot-time, it can be evaluated at run time. > > > > Refactor a BUILD_BUG_ON to evaluate the limit (when the minimum > > supported page size is selected at boot-time). > > > > Reserve enough storage for max page size in "struct remap_data" and > > "struct xenbus_map_node". > > > > 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/xen/balloon.c | 11 ++++++----- > > drivers/xen/biomerge.c | 12 ++++++------ > > drivers/xen/privcmd.c | 2 +- > > drivers/xen/xenbus/xenbus_client.c | 5 +++-- > > drivers/xen/xlate_mmu.c | 6 +++--- > > include/xen/page.h | 2 ++ > > 6 files changed, 21 insertions(+), 17 deletions(-) > > > > diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c > > index 528395133b4f8..0ed5f6453af0e 100644 > > --- a/drivers/xen/balloon.c > > +++ b/drivers/xen/balloon.c > > @@ -131,7 +131,8 @@ struct balloon_stats balloon_stats; > > EXPORT_SYMBOL_GPL(balloon_stats); > > > > /* We increase/decrease in batches which fit in a page */ > > -static xen_pfn_t frame_list[PAGE_SIZE / sizeof(xen_pfn_t)]; > > +static xen_pfn_t frame_list[PAGE_SIZE_MAX / sizeof(xen_pfn_t)]; > > +#define FRAME_LIST_NR_ENTRIES (PAGE_SIZE / sizeof(xen_pfn_t)) > > > > > > /* List of ballooned pages, threaded through the mem_map array. */ > > @@ -389,8 +390,8 @@ static enum bp_state increase_reservation(unsigned long nr_pages) > > unsigned long i; > > struct page *page; > > > > - if (nr_pages > ARRAY_SIZE(frame_list)) > > - nr_pages = ARRAY_SIZE(frame_list); > > + if (nr_pages > FRAME_LIST_NR_ENTRIES) > > + nr_pages = FRAME_LIST_NR_ENTRIES; > > > > page = list_first_entry_or_null(&ballooned_pages, struct page, lru); > > for (i = 0; i < nr_pages; i++) { > > @@ -434,8 +435,8 @@ static enum bp_state decrease_reservation(unsigned long nr_pages, gfp_t gfp) > > int ret; > > LIST_HEAD(pages); > > > > - if (nr_pages > ARRAY_SIZE(frame_list)) > > - nr_pages = ARRAY_SIZE(frame_list); > > + if (nr_pages > FRAME_LIST_NR_ENTRIES) > > + nr_pages = FRAME_LIST_NR_ENTRIES; > > > > for (i = 0; i < nr_pages; i++) { > > page = alloc_page(gfp); > > diff --git a/drivers/xen/biomerge.c b/drivers/xen/biomerge.c > > index 05a286d24f148..28f0887e40026 100644 > > --- a/drivers/xen/biomerge.c > > +++ b/drivers/xen/biomerge.c > > @@ -8,16 +8,16 @@ > > bool xen_biovec_phys_mergeable(const struct bio_vec *vec1, > > const struct page *page) > > { > > -#if XEN_PAGE_SIZE == PAGE_SIZE > > - unsigned long bfn1 = pfn_to_bfn(page_to_pfn(vec1->bv_page)); > > - unsigned long bfn2 = pfn_to_bfn(page_to_pfn(page)); > > + if (XEN_PAGE_SIZE == PAGE_SIZE) { > > + unsigned long bfn1 = pfn_to_bfn(page_to_pfn(vec1->bv_page)); > > + unsigned long bfn2 = pfn_to_bfn(page_to_pfn(page)); > > + > > + return bfn1 + PFN_DOWN(vec1->bv_offset + vec1->bv_len) == bfn2; > > + } > > > > - return bfn1 + PFN_DOWN(vec1->bv_offset + vec1->bv_len) == bfn2; > > -#else > > /* > > * XXX: Add support for merging bio_vec when using different page > > * size in Xen and Linux. > > */ > > return false; > > -#endif > > } > > diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c > > index 9563650dfbafc..847f7b806caf7 100644 > > --- a/drivers/xen/privcmd.c > > +++ b/drivers/xen/privcmd.c > > @@ -557,7 +557,7 @@ static long privcmd_ioctl_mmap_batch( > > state.global_error = 0; > > state.version = version; > > > > - BUILD_BUG_ON(((PAGE_SIZE / sizeof(xen_pfn_t)) % XEN_PFN_PER_PAGE) != 0); > > + BUILD_BUG_ON(((PAGE_SIZE_MIN / sizeof(xen_pfn_t)) % XEN_PFN_PER_PAGE_MAX) != 0); Is there any value in keep this test? And if so, what should it look like? I think we should turn it into a WARN_ON: WARN_ON(((PAGE_SIZE / sizeof(xen_pfn_t)) % XEN_PFN_PER_PAGE) != 0); It doesn't make much sense having a BUILD_BUG_ON on a variable that can change? > > /* mmap_batch_fn guarantees ret == 0 */ > > BUG_ON(traverse_pages_block(m.num, sizeof(xen_pfn_t), > > &pagelist, mmap_batch_fn, &state)); > > diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c > > index 51b3124b0d56c..99bde836c10c4 100644 > > --- a/drivers/xen/xenbus/xenbus_client.c > > +++ b/drivers/xen/xenbus/xenbus_client.c > > @@ -49,9 +49,10 @@ > > > > #include "xenbus.h" > > > > -#define XENBUS_PAGES(_grants) (DIV_ROUND_UP(_grants, XEN_PFN_PER_PAGE)) > > +#define XENBUS_PAGES(_grants) (DIV_ROUND_UP(_grants, XEN_PFN_PER_PAGE)) > > +#define XENBUS_PAGES_MAX(_grants) (DIV_ROUND_UP(_grants, XEN_PFN_PER_PAGE_MIN)) > > > > -#define XENBUS_MAX_RING_PAGES (XENBUS_PAGES(XENBUS_MAX_RING_GRANTS)) > > +#define XENBUS_MAX_RING_PAGES (XENBUS_PAGES_MAX(XENBUS_MAX_RING_GRANTS)) > > > > struct xenbus_map_node { > > struct list_head next; > > diff --git a/drivers/xen/xlate_mmu.c b/drivers/xen/xlate_mmu.c > > index f17c4c03db30c..a757c801a7542 100644 > > --- a/drivers/xen/xlate_mmu.c > > +++ b/drivers/xen/xlate_mmu.c > > @@ -74,9 +74,9 @@ struct remap_data { > > int mapped; > > > > /* Hypercall parameters */ > > - int h_errs[XEN_PFN_PER_PAGE]; > > - xen_ulong_t h_idxs[XEN_PFN_PER_PAGE]; > > - xen_pfn_t h_gpfns[XEN_PFN_PER_PAGE]; > > + int h_errs[XEN_PFN_PER_PAGE_MAX]; > > + xen_ulong_t h_idxs[XEN_PFN_PER_PAGE_MAX]; > > + xen_pfn_t h_gpfns[XEN_PFN_PER_PAGE_MAX]; > > > > int h_iter; /* Iterator */ > > }; > > diff --git a/include/xen/page.h b/include/xen/page.h > > index 285677b42943a..86683a30038a3 100644 > > --- a/include/xen/page.h > > +++ b/include/xen/page.h > > @@ -21,6 +21,8 @@ > > ((page_to_pfn(page)) << (PAGE_SHIFT - XEN_PAGE_SHIFT)) > > > > #define XEN_PFN_PER_PAGE (PAGE_SIZE / XEN_PAGE_SIZE) > > +#define XEN_PFN_PER_PAGE_MIN (PAGE_SIZE_MIN / XEN_PAGE_SIZE) > > +#define XEN_PFN_PER_PAGE_MAX (PAGE_SIZE_MAX / XEN_PAGE_SIZE) > > > > #define XEN_PFN_DOWN(x) ((x) >> XEN_PAGE_SHIFT) > > #define XEN_PFN_UP(x) (((x) + XEN_PAGE_SIZE-1) >> XEN_PAGE_SHIFT) >