On Mon, Jul 10, 2023 at 02:02:45PM +0100, Matthew Wilcox (Oracle) wrote:
> copy_page_from_iter_atomic() already handles !highmem compound
> pages correctly, but if we are passed a highmem compound page,
> each base page needs to be mapped & unmapped individually.
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Yikes. Does this want a fixes tag?
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> ---
> lib/iov_iter.c | 43 ++++++++++++++++++++++++++++---------------
> 1 file changed, 28 insertions(+), 15 deletions(-)
>
> diff --git a/lib/iov_iter.c b/lib/iov_iter.c
> index b667b1e2f688..c728b6e4fb18 100644
> --- a/lib/iov_iter.c
> +++ b/lib/iov_iter.c
> @@ -566,24 +566,37 @@ size_t iov_iter_zero(size_t bytes, struct iov_iter *i)
> }
> EXPORT_SYMBOL(iov_iter_zero);
>
> -size_t copy_page_from_iter_atomic(struct page *page, unsigned offset, size_t bytes,
> - struct iov_iter *i)
> +size_t copy_page_from_iter_atomic(struct page *page, unsigned offset,
> + size_t bytes, struct iov_iter *i)
> {
> - char *kaddr = kmap_atomic(page), *p = kaddr + offset;
> - if (!page_copy_sane(page, offset, bytes)) {
> - kunmap_atomic(kaddr);
> + size_t n, copied = 0;
> +
> + if (!page_copy_sane(page, offset, bytes))
> return 0;
> - }
> - if (WARN_ON_ONCE(!i->data_source)) {
> - kunmap_atomic(kaddr);
> + if (WARN_ON_ONCE(!i->data_source))
> return 0;
> - }
> - iterate_and_advance(i, bytes, base, len, off,
> - copyin(p + off, base, len),
> - memcpy_from_iter(i, p + off, base, len)
> - )
> - kunmap_atomic(kaddr);
> - return bytes;
> +
> + do {
> + char *p;
> +
> + n = bytes - copied;
> + if (PageHighMem(page)) {
> + page += offset / PAGE_SIZE;
> + offset %= PAGE_SIZE;
> + n = min_t(size_t, n, PAGE_SIZE - offset);
> + }
> +
> + p = kmap_atomic(page) + offset;
> + iterate_and_advance(i, n, base, len, off,
> + copyin(p + off, base, len),
> + memcpy_from_iter(i, p + off, base, len)
> + )
> + kunmap_atomic(p);
> + copied += n;
> + offset += n;
> + } while (PageHighMem(page) && copied != bytes && n > 0);
> +
> + return copied;
> }
> EXPORT_SYMBOL(copy_page_from_iter_atomic);
>
> --
> 2.39.2
>
