reenable scatterlist offloading

hpc · Jul 17, 2024 · 429e80c · 429e80c
1 parent 917c443
commit 429e80c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/include/os/linux/kernel/linux/kmap_compat.h b/include/os/linux/kernel/linux/kmap_compat.h
@@ -30,8 +30,6 @@
 #include <linux/uaccess.h>
 
 /* 2.6.37 API change */
-#define	zfs_kmap_atomic(page)	kmap_atomic(page)
-#define	zfs_kunmap_atomic(addr)	kunmap_atomic(addr)
 #define	zfs_kmap(page)		kmap(page)
 #define	zfs_kunmap(page)	kunmap(page)
 

diff --git a/module/os/linux/zfs/abd_os.c b/module/os/linux/zfs/abd_os.c
@@ -534,10 +534,8 @@ abd_alloc_zero_scatter(void)
 #define	PAGE_SHIFT (highbit64(PAGESIZE)-1)
 #endif
 
-#define	zfs_kmap_atomic(chunk)		((void *)chunk)
-#define	zfs_kunmap_atomic(addr)		do { (void)(addr); } while (0)
 #define	zfs_kmap(chunk)			((void *)chunk)
-#define	zfs_kunmap(chunk)		((void *)chunk)
+#define	zfs_kunmap(addr)		do { (void)(addr); } while (0)
 #define	zfs_kmap_local(chunk)		((void *)chunk)
 #define	zfs_kunmap_local(addr)		do { (void)(addr); } while (0)
 #define	local_irq_save(flags)		do { (void)(flags); } while (0)
@@ -1063,7 +1061,7 @@ abd_iter_map(struct abd_iter *aiter)
 		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));
+		paddr = zfs_kmap(sg_page(aiter->iter_sg));
 	}
 
 	aiter->iter_mapaddr = (char *)paddr + offset;

diff --git a/module/zfs/zia.c b/module/zfs/zia.c
@@ -655,6 +655,13 @@ zia_offload_abd_offset(void *provider, abd_t *abd,
 		ret = dpusm->copy.from.generic(&mv,
 		    ABD_LINEAR_BUF(abd), size);
 		ret = dpusm_to_ret(ret);
+	}
+	else if (abd_is_from_pages(abd) == B_TRUE) {
+		ret = dpusm->copy.from.scatterlist(&mv,
+		    ABD_SCATTER(abd).abd_sgl,
+		    ABD_SCATTER(abd).abd_nents,
+		    size);
+		ret = dpusm_to_ret(ret);
 	} else {
 		ret = abd_iterate_func(abd, offset, size,
 		    zia_offload_generic_cb, &mv);