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

SSV-24185: Fix the number of zvol I/O threads to align with 50% of th… #99

Merged
merged 1 commit into from
Nov 4, 2024
Merged

SSV-24185: Fix the number of zvol I/O threads to align with 50% of th… #99

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
2 changes: 2 additions & 0 deletions include/os/windows/zfs/sys/kstat_windows.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ typedef struct windows_kstat {
kstat_named_t zfs_total_memory_limit;
kstat_named_t zfs_removal_suspend_progress;
kstat_named_t cpu_avx_supported;
kstat_named_t zvol_io_threads;
} windows_kstat_t;


Expand Down Expand Up @@ -259,6 +260,7 @@ extern uint64_t zfs_initialize_value;
extern int zfs_autoimport_disable;
extern int zfs_removal_suspend_progress;
extern int cpu_avx_supported;
extern int zvol_threads;

int kstat_windows_init(void *);
void kstat_windows_fini(void);
Expand Down
2 changes: 2 additions & 0 deletions module/os/windows/zfs/arc_os.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,7 @@ arc_kstat_update_windows(kstat_t *ksp, int rw)
zfs_arc_p_min_shift = ks->arc_zfs_arc_p_min_shift.value.ui64;
zfs_arc_average_blocksize =
ks->arc_zfs_arc_average_blocksize.value.ui64;
zvol_threads = ks->zvol_io_threads.value.ui32;

#ifdef _KERNEL
if (ks->zfs_total_memory_limit.value.ui64 > total_memory &&
Expand Down Expand Up @@ -729,6 +730,7 @@ arc_kstat_update_windows(kstat_t *ksp, int rw)
ks->arc_zfs_arc_p_min_shift.value.ui64 = zfs_arc_p_min_shift;
ks->arc_zfs_arc_average_blocksize.value.ui64 =
zfs_arc_average_blocksize;
ks->zvol_io_threads.value.ui32 = zvol_threads;

#ifdef _KERNEL
ks->zfs_total_memory_limit.value.ui64 = total_memory;
Expand Down
6 changes: 4 additions & 2 deletions module/os/windows/zfs/zfs_kstat_windows.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,8 @@ windows_kstat_t windows_kstat = {
{ "zfs_autoimport_disable", KSTAT_DATA_UINT64 },
{ "zfs_total_memory_limit", KSTAT_DATA_UINT64 },
{ "zfs_removal_suspend_progress", KSTAT_DATA_INT32 },
{ "cpu_avx_supported", KSTAT_DATA_UINT32 }
{ "cpu_avx_supported", KSTAT_DATA_UINT32 },
{ "zvol_io_threads", KSTAT_DATA_UINT32 }
};


Expand Down Expand Up @@ -382,7 +383,6 @@ windows_kstat_update(kstat_t *ksp, int rw)
ks->zfs_removal_suspend_progress.value.i32;
cpu_avx_supported =
ks->cpu_avx_supported.value.ui32;

} else {

/* kstat READ */
Expand Down Expand Up @@ -571,6 +571,8 @@ windows_kstat_update(kstat_t *ksp, int rw)
zfs_removal_suspend_progress;
ks->cpu_avx_supported.value.ui32 =
cpu_avx_supported;
ks->zvol_io_threads.value.ui32 =
zvol_threads;
}
arc_kstat_update_windows(ksp, rw);
return (0);
Expand Down
11 changes: 9 additions & 2 deletions module/os/windows/zfs/zvol_os.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static uint32_t zvol_major = ZVOL_MAJOR;
unsigned int zvol_request_sync = 0;
unsigned int zvol_prefetch_bytes = (128 * 1024);
unsigned long zvol_max_discard_blocks = 16384;
unsigned int zvol_threads = 32;
int zvol_threads = 0;

taskq_t *zvol_taskq;

Expand Down Expand Up @@ -1028,14 +1028,21 @@ const static zvol_platform_ops_t zvol_windows_ops = {
int
zvol_init(void)
{
int threads = MIN(MAX(zvol_threads, 1), 1024);
int logical_ncpu_to_use = boot_ncpus / 2; // boot_ncpus is derived from KeQueryActiveProcessorCountEx(ALL_PROCESSOR_GROUPS)

int threads = MIN(MAX((zvol_threads ? zvol_threads: logical_ncpu_to_use), 1), 1024);

KdPrintEx((DPFLTR_IHVDRIVER_ID, DPFLTR_ERROR_LEVEL,
"%s: number of zvol taskq threads to be created: %d, registry value: %d ncpus: %d\n",
__func__, threads, zvol_threads, boot_ncpus));
zvol_taskq = taskq_create(ZVOL_DRIVER, threads, maxclsyspri,
threads * 2, INT_MAX, TASKQ_PREPOPULATE | TASKQ_DYNAMIC);
if (zvol_taskq == NULL) {
return (-ENOMEM);
}

zvol_threads = threads; // Update it so that kstat gets the current value

zvol_init_impl();
zvol_register_ops(&zvol_windows_ops);
return (0);
Expand Down
8 changes: 4 additions & 4 deletions module/zfs/dbuf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1461,8 +1461,8 @@ dbuf_read_verify_dnode_crypt(dmu_buf_impl_t *db, uint32_t flags)

DB_DNODE_EXIT(db);

TraceEvent(err > 0 ? 2:8, "%s:%d: Returning %d\n",
__func__, __LINE__, err);
// TraceEvent(err > 0 ? 2:8, "%s:%d: Returning %d\n",
// __func__, __LINE__, err);

return (err);
}
Expand Down Expand Up @@ -1565,8 +1565,8 @@ dbuf_read_impl(dmu_buf_impl_t *db, zio_t *zio, uint32_t flags,
mutex_exit(&db->db_mtx);
dmu_buf_unlock_parent(db, dblt, tag);

TraceEvent(err > 0 ? 2 : 8, "%s:%d: Returning %d\n",
__func__, __LINE__, err);
//TraceEvent(err > 0 ? 2 : 8, "%s:%d: Returning %d\n",
// __func__, __LINE__, err);

return (err);
}
Expand Down
4 changes: 2 additions & 2 deletions module/zfs/dsl_crypt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,8 @@ spa_keystore_wkey_hold_dd(spa_t *spa, dsl_dir_t *dd, void *tag,
rw_exit(&spa->spa_keystore.sk_wkeys_lock);

*wkey_out = NULL;
TraceEvent(ret > 0 ? 2 : 8, "%s:%d: Returning %d\n",
__func__, __LINE__, ret);
//TraceEvent(ret > 0 ? 2 : 8, "%s:%d: Returning %d\n",
// __func__, __LINE__, ret);

return (ret);
}
Expand Down
4 changes: 2 additions & 2 deletions module/zfs/space_map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ space_map_iterate(space_map_t *sm, uint64_t end, sm_cb_t callback, void *arg)
dmu_buf_rele(db, FTAG);
}

TraceEvent(error > 0 ? 2 : 8, "%s:%d: Returning %d\n",
__func__, __LINE__, error);
//TraceEvent(error > 0 ? 2 : 8, "%s:%d: Returning %d\n",
// __func__, __LINE__, error);
return (error);
}

Expand Down
4 changes: 2 additions & 2 deletions module/zfs/zap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,8 +640,8 @@ zap_deref_leaf(zap_t *zap, uint64_t h, dmu_tx_t *tx, krw_t lt, zap_leaf_t **lp)
ZAP_HASH_IDX(h, zap_leaf_phys(*lp)->l_hdr.lh_prefix_len) ==
zap_leaf_phys(*lp)->l_hdr.lh_prefix);

TraceEvent(err > 0 ? 2 : 8, "%s:%d: Returning %d\n",
__func__, __LINE__, err);
// TraceEvent(err > 0 ? 2 : 8, "%s:%d: Returning %d\n",
// __func__, __LINE__, err);
return (err);
}

Expand Down
4 changes: 2 additions & 2 deletions module/zfs/zap_micro.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,8 +611,8 @@ zap_lockdir_by_dnode(dnode_t *dn, dmu_tx_t *tx,
dmu_buf_rele(db, tag);
}

TraceEvent(err > 0 ? 2 : 8, "%s:%d: Returning %d\n",
__func__, __LINE__, err);
//TraceEvent(err > 0 ? 2 : 8, "%s:%d: Returning %d\n",
// __func__, __LINE__, err);
return (err);
}

Expand Down
4 changes: 2 additions & 2 deletions module/zfs/zfs_ioctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7494,8 +7494,8 @@ pool_status_check(const char *name, zfs_ioc_namecheck_t type,
spa_close(spa, FTAG);
}

TraceEvent(error > 0 ? 2 : 8, "%s:%d: Returning with error %d\n",
__func__, __LINE__, error);
//TraceEvent(error > 0 ? 2 : 8, "%s:%d: Returning with error %d\n",
// __func__, __LINE__, error);
return (error);
}

Expand Down
Loading