Skip to content

Bugfix/downstream oss mem fixes #17973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sempervictus wants to merge 5 commits into from
+31 −13
Closed

Bugfix/downstream oss mem fixes #17973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16549e3
Fix interaction of abd_iter_map()/abd_iter_unmap() with HIGHMEM
bspengler-oss Nov 18, 2025
7b17cc5
Preserve LIFO ordering of kmap ops in abd_raidz_gen_iterate()
bspengler-oss Nov 18, 2025
166c635
Fix HIGHMEM/kmap API violation in zfs_uiomove_bvec_impl()
bspengler-oss Nov 18, 2025
e7dd1b2
Fix cstyle per behlendorf
Dec 7, 2025
91e899b
~PAGE_MASK != PAGE_SIZE - 1 on FreeBSD
Dec 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions module/os/linux/zfs/abd_os.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,11 +911,20 @@ abd_iter_map(struct abd_iter *aiter)
aiter->iter_mapsize = aiter->iter_abd->abd_size - offset;
paddr = ABD_LINEAR_BUF(aiter->iter_abd);
} else {
struct page *page;

offset = aiter->iter_offset;
aiter->iter_mapsize = MIN(aiter->iter_sg->length - offset,
aiter->iter_abd->abd_size - aiter->iter_pos);

paddr = zfs_kmap_local(sg_page(aiter->iter_sg));
page = sg_page(aiter->iter_sg);
if (PageHighMem(page)) {
page = nth_page(page, offset / PAGE_SIZE);
offset &= PAGE_SIZE - 1;
aiter->iter_mapsize = MIN(aiter->iter_mapsize,
PAGE_SIZE - offset);
}
paddr = zfs_kmap_local(page);
}

aiter->iter_mapaddr = (char *)paddr + offset;
Expand All @@ -933,8 +942,15 @@ abd_iter_unmap(struct abd_iter *aiter)
return;

if (!abd_is_linear(aiter->iter_abd)) {
struct page *page;
size_t offset = aiter->iter_offset;

page = sg_page(aiter->iter_sg);
if (PageHighMem(page))
offset &= PAGE_SIZE - 1;

/* LINTED E_FUNC_SET_NOT_USED */
zfs_kunmap_local(aiter->iter_mapaddr - aiter->iter_offset);
zfs_kunmap_local(aiter->iter_mapaddr - offset);
}

ASSERT3P(aiter->iter_mapaddr, !=, NULL);
Expand Down
10 changes: 6 additions & 4 deletions module/os/linux/zfs/zfs_uio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,17 @@ zfs_uiomove_bvec_impl(void *p, size_t n, zfs_uio_rw_t rw, zfs_uio_t *uio)

while (n && uio->uio_resid) {
void *paddr;
cnt = MIN(bv->bv_len - skip, n);
size_t offset = bv->bv_offset + skip;
cnt = MIN(PAGE_SIZE - (offset & ~PAGE_MASK),
MIN(bv->bv_len - skip, n));

paddr = zfs_kmap_local(bv->bv_page);
paddr = zfs_kmap_local(bv->bv_page + (offset >> PAGE_SHIFT));
if (rw == UIO_READ) {
/* Copy from buffer 'p' to the bvec data */
memcpy(paddr + bv->bv_offset + skip, p, cnt);
memcpy(paddr + (offset & ~PAGE_MASK), p, cnt);
} else {
/* Copy from bvec data to buffer 'p' */
memcpy(p, paddr + bv->bv_offset + skip, cnt);
memcpy(p, paddr + (offset & ~PAGE_MASK), cnt);
}
zfs_kunmap_local(paddr);

Expand Down
14 changes: 7 additions & 7 deletions module/zfs/abd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,13 +1111,6 @@ abd_raidz_gen_iterate(abd_t **cabds, abd_t *dabd, size_t off,

func_raidz_gen(caddrs, daddr, len, dlen);

for (i = parity-1; i >= 0; i--) {
abd_iter_unmap(&caiters[i]);
c_cabds[i] =
abd_advance_abd_iter(cabds[i], c_cabds[i],
&caiters[i], len);
}

if (dsize > 0) {
abd_iter_unmap(&daiter);
c_dabd =
Expand All @@ -1126,6 +1119,13 @@ abd_raidz_gen_iterate(abd_t **cabds, abd_t *dabd, size_t off,
dsize -= dlen;
}

for (i = parity-1; i >= 0; i--) {
abd_iter_unmap(&caiters[i]);
c_cabds[i] =
abd_advance_abd_iter(cabds[i], c_cabds[i],
&caiters[i], len);
}

csize -= len;
}
abd_exit_critical(flags);
Expand Down
Loading