Add abd_cache_reap_now for abd_chunk_cache users

Apparently missed in the initial port integration was the need to reap the abd_chunk_cache on FreeBSD. This change addresses that oversight. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Signed-off-by: Matt Macy <[email protected]> Closes #10474
openzfsonosx · Jun 18, 2020 · 7564073 · 7564073
1 parent 4458157
commit 7564073
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/include/sys/abd.h b/include/sys/abd.h
@@ -59,6 +59,7 @@ abd_t *abd_get_offset(abd_t *, size_t);
 abd_t *abd_get_offset_size(abd_t *, size_t, size_t);
 abd_t *abd_get_zeros(size_t);
 abd_t *abd_get_from_buf(void *, size_t);
+void abd_cache_reap_now(void);
 
 /*
  * Conversion to and from a normal buffer

diff --git a/module/os/freebsd/zfs/abd_os.c b/module/os/freebsd/zfs/abd_os.c
@@ -488,3 +488,9 @@ abd_iter_unmap(struct abd_iter *aiter)
 	aiter->iter_mapaddr = NULL;
 	aiter->iter_mapsize = 0;
 }
+
+void
+abd_cache_reap_now(void)
+{
+	kmem_cache_reap_soon(abd_chunk_cache);
+}
diff --git a/module/os/linux/zfs/abd_os.c b/module/os/linux/zfs/abd_os.c
@@ -920,6 +920,11 @@ abd_iter_unmap(struct abd_iter *aiter)
 	aiter->iter_mapsize = 0;
 }
 
+void
+abd_cache_reap_now(void)
+{
+}
+
 #if defined(_KERNEL)
 /*
  * bio_nr_pages for ABD.

diff --git a/module/zfs/arc.c b/module/zfs/arc.c
@@ -4678,6 +4678,7 @@ arc_kmem_reap_soon(void)
 	kmem_cache_reap_now(hdr_full_cache);
 	kmem_cache_reap_now(hdr_l2only_cache);
 	kmem_cache_reap_now(zfs_btree_leaf_cache);
+	abd_cache_reap_now();
 
 	if (zio_arena != NULL) {
 		/*