[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <c8d63b04-b8d4-4fb3-b2d1-f48d1004ba9e@lucifer.local>
Date: Thu, 28 Aug 2025 18:53:06 +0100
From: Lorenzo Stoakes <lorenzo.stoakes@...cle.com>
To: David Hildenbrand <david@...hat.com>
Cc: linux-kernel@...r.kernel.org, Marek Szyprowski <m.szyprowski@...sung.com>,
Alexander Potapenko <glider@...gle.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Brendan Jackman <jackmanb@...gle.com>,
Christoph Lameter <cl@...two.org>, Dennis Zhou <dennis@...nel.org>,
Dmitry Vyukov <dvyukov@...gle.com>, dri-devel@...ts.freedesktop.org,
intel-gfx@...ts.freedesktop.org, iommu@...ts.linux.dev,
io-uring@...r.kernel.org, Jason Gunthorpe <jgg@...dia.com>,
Jens Axboe <axboe@...nel.dk>, Johannes Weiner <hannes@...xchg.org>,
John Hubbard <jhubbard@...dia.com>, kasan-dev@...glegroups.com,
kvm@...r.kernel.org, "Liam R. Howlett" <Liam.Howlett@...cle.com>,
Linus Torvalds <torvalds@...ux-foundation.org>,
linux-arm-kernel@...s.com, linux-arm-kernel@...ts.infradead.org,
linux-crypto@...r.kernel.org, linux-ide@...r.kernel.org,
linux-kselftest@...r.kernel.org, linux-mips@...r.kernel.org,
linux-mmc@...r.kernel.org, linux-mm@...ck.org,
linux-riscv@...ts.infradead.org, linux-s390@...r.kernel.org,
linux-scsi@...r.kernel.org, Marco Elver <elver@...gle.com>,
Michal Hocko <mhocko@...e.com>, Mike Rapoport <rppt@...nel.org>,
Muchun Song <muchun.song@...ux.dev>, netdev@...r.kernel.org,
Oscar Salvador <osalvador@...e.de>, Peter Xu <peterx@...hat.com>,
Robin Murphy <robin.murphy@....com>,
Suren Baghdasaryan <surenb@...gle.com>, Tejun Heo <tj@...nel.org>,
virtualization@...ts.linux.dev, Vlastimil Babka <vbabka@...e.cz>,
wireguard@...ts.zx2c4.com, x86@...nel.org, Zi Yan <ziy@...dia.com>
Subject: Re: [PATCH v1 23/36] scatterlist: disallow non-contigous page ranges
in a single SG entry
On Thu, Aug 28, 2025 at 12:01:27AM +0200, David Hildenbrand wrote:
> The expectation is that there is currently no user that would pass in
> non-contigous page ranges: no allocator, not even VMA, will hand these
> out.
>
> The only problematic part would be if someone would provide a range
> obtained directly from memblock, or manually merge problematic ranges.
> If we find such cases, we should fix them to create separate
> SG entries.
>
> Let's check in sg_set_page() that this is really the case. No need to
> check in sg_set_folio(), as pages in a folio are guaranteed to be
> contiguous. As sg_set_page() gets inlined into modules, we have to
> export the page_range_contiguous() helper -- use EXPORT_SYMBOL, there is
> nothing special about this helper such that we would want to enforce
> GPL-only modules.
Ah you mention this here (I wrote end of this first :)
>
> We can now drop the nth_page() usage in sg_page_iter_page().
>
> Acked-by: Marek Szyprowski <m.szyprowski@...sung.com>
> Signed-off-by: David Hildenbrand <david@...hat.com>
All LGTM, so:
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@...cle.com>
> ---
> include/linux/scatterlist.h | 3 ++-
> mm/util.c | 1 +
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
> index 6f8a4965f9b98..29f6ceb98d74b 100644
> --- a/include/linux/scatterlist.h
> +++ b/include/linux/scatterlist.h
> @@ -158,6 +158,7 @@ static inline void sg_assign_page(struct scatterlist *sg, struct page *page)
> static inline void sg_set_page(struct scatterlist *sg, struct page *page,
> unsigned int len, unsigned int offset)
> {
> + VM_WARN_ON_ONCE(!page_range_contiguous(page, ALIGN(len + offset, PAGE_SIZE) / PAGE_SIZE));
This is pretty horrible as one statement, but I guess we can't really do better,
I had a quick look around for some helper that could work but nothing is clearly
suitable.
So this should be fine.
> sg_assign_page(sg, page);
> sg->offset = offset;
> sg->length = len;
> @@ -600,7 +601,7 @@ void __sg_page_iter_start(struct sg_page_iter *piter,
> */
> static inline struct page *sg_page_iter_page(struct sg_page_iter *piter)
> {
> - return nth_page(sg_page(piter->sg), piter->sg_pgoffset);
> + return sg_page(piter->sg) + piter->sg_pgoffset;
> }
>
> /**
> diff --git a/mm/util.c b/mm/util.c
> index 0bf349b19b652..e8b9da6b13230 100644
> --- a/mm/util.c
> +++ b/mm/util.c
> @@ -1312,5 +1312,6 @@ bool page_range_contiguous(const struct page *page, unsigned long nr_pages)
> return false;
> return true;
> }
> +EXPORT_SYMBOL(page_range_contiguous);
Kinda sad that we're doing this as EXPORT_SYMBOL() rather than
EXPORT_SYMBOL_GPL() :( but I guess necessary to stay consistent...
> #endif
> #endif /* CONFIG_MMU */
> --
> 2.50.1
>
Powered by blists - more mailing lists