On Mon, Sep 30, 2024 at 11:55:00AM -0700, Omar Sandoval wrote:
> From: Omar Sandoval <osandov@xxxxxx>
>
> iter_folioq_get_pages() decides to advance to the next folioq slot when
> it has reached the end of the current folio. However, it is checking
> offset, which is the beginning of the current part, instead of
> iov_offset, which is adjusted to the end of the current part, so it
> doesn't advance the slot when it's supposed to. As a result, on the next
> iteration, we'll use the same folio with an out-of-bounds offset and
> return an unrelated page.
>
> This manifested as various crashes and other failures in 9pfs in drgn's
> VM testing setup and BPF CI.
>
> Fixes: db0aa2e9566f ("mm: Define struct folio_queue and ITER_FOLIOQ to handle a sequence of folios")
> Link: https://lore.kernel.org/linux-fsdevel/20240923183432.1876750-1-chantr4@xxxxxxxxx/
> Tested-by: Manu Bretelle <chantr4@xxxxxxxxx>
> Signed-off-by: Omar Sandoval <osandov@xxxxxx>
> ---
> lib/iov_iter.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/iov_iter.c b/lib/iov_iter.c
> index 97003155bfac..1abb32c0da50 100644
> --- a/lib/iov_iter.c
> +++ b/lib/iov_iter.c
> @@ -1033,7 +1033,7 @@ static ssize_t iter_folioq_get_pages(struct iov_iter *iter,
> if (maxpages == 0 || extracted >= maxsize)
> break;
>
> - if (offset >= fsize) {
> + if (iov_offset >= fsize) {
> iov_offset = 0;
> slot++;
> if (slot == folioq_nr_slots(folioq) && folioq->next) {
This fixes booting for me with my 9pfs rootfs. Tested on next-20241001+this patch.
Tested-by: Joey Gouly <joey.gouly@xxxxxxx>
Thanks!
