Skip to content
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

Jump to bottom

SSV-22756: Revert to Kmem cache for ABD chunks #88

Draft
wants to merge 1 commit into
base: rel-10psp16
Choose a base branch
from
Draft

SSV-22756: Revert to Kmem cache for ABD chunks #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion module/os/windows/spl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ wdk_add_library(splkern
spl-vnode.c
spl-windows.c
spl-xdr.c
spl-lookasidelist.c
${TMH_FILE_LIST}
)

Expand Down
20 changes: 10 additions & 10 deletions module/os/windows/zfs/abd_os.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <sys/zio.h>
#include <sys/zfs_context.h>
#include <sys/zfs_znode.h>
#include <sys/lookasidelist.h>


typedef struct abd_stats {
Expand Down Expand Up @@ -90,7 +89,7 @@ struct {
*/
size_t zfs_abd_chunk_size = 4096;

lookasidelist_cache_t *abd_chunk_cache;
kmem_cache_t *abd_chunk_cache;
static kstat_t *abd_ksp;


Expand All @@ -106,7 +105,7 @@ static char *abd_zero_buf = NULL;
static void
abd_free_chunk(void *c)
{
lookasidelist_cache_free(abd_chunk_cache, c);
kmem_cache_free(abd_chunk_cache, c);
}

static size_t
Expand Down Expand Up @@ -183,7 +182,7 @@ abd_alloc_chunks(abd_t *abd, size_t size)
{
size_t n = abd_chunkcnt_for_bytes(size);
for (int i = 0; i < n; i++) {
void *c = lookasidelist_cache_alloc(abd_chunk_cache);
void *c = kmem_cache_alloc(abd_chunk_cache, KM_SLEEP);
ABD_SCATTER(abd).abd_chunks[i] = c;
}
ABD_SCATTER(abd).abd_chunk_size = zfs_abd_chunk_size;
Expand Down Expand Up @@ -237,7 +236,7 @@ static void
abd_alloc_zero_scatter(void)
{
size_t n = abd_chunkcnt_for_bytes(SPA_MAXBLOCKSIZE);
abd_zero_buf = lookasidelist_cache_alloc(abd_chunk_cache);
abd_zero_buf = kmem_cache_alloc(abd_chunk_cache, KM_SLEEP);
bzero(abd_zero_buf, zfs_abd_chunk_size);
abd_zero_scatter = abd_alloc_struct(SPA_MAXBLOCKSIZE);

Expand Down Expand Up @@ -265,14 +264,15 @@ abd_free_zero_scatter(void)

abd_free_struct(abd_zero_scatter);
abd_zero_scatter = NULL;
lookasidelist_cache_free(abd_chunk_cache, abd_zero_buf);
kmem_cache_free(abd_chunk_cache, abd_zero_buf);
}

void
abd_init(void)
{
abd_chunk_cache = lookasidelist_cache_create("abd_chunk",
zfs_abd_chunk_size);
abd_chunk_cache = kmem_cache_create("abd_chunk", zfs_abd_chunk_size,
MIN(PAGE_SIZE, 4096),
NULL, NULL, NULL, NULL, abd_arena, KMC_NOTOUCH);

abd_ksp = kstat_create("zfs", 0, "abdstats", "misc", KSTAT_TYPE_NAMED,
sizeof (abd_stats) / sizeof (kstat_named_t), KSTAT_FLAG_VIRTUAL);
Expand All @@ -294,7 +294,7 @@ abd_fini(void)
abd_ksp = NULL;
}

lookasidelist_cache_destroy(abd_chunk_cache);
kmem_cache_destroy(abd_chunk_cache);
abd_chunk_cache = NULL;
}

Expand Down Expand Up @@ -487,5 +487,5 @@ abd_iter_unmap(struct abd_iter *aiter)
void
abd_cache_reap_now(void)
{
// do nothing
kmem_cache_reap_now(abd_chunk_cache);
}
3 changes: 2 additions & 1 deletion module/os/windows/zfs/arc_os.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ arc_reclaim_thread(void *unused)
* it is worth reaping the abd_chunk_cache
*/
if (d_adj >= 64LL*1024LL*1024LL) {
abd_cache_reap_now();
extern kmem_cache_t *abd_chunk_cache;
kmem_cache_reap_now(abd_chunk_cache);
}

free_memory = post_adjust_free_memory;
Expand Down
Loading