Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

zio: expose trace node alloc/free/compare 

Meant for external callers to be able to build trace trees that can
later be submitted back to zio for work. Its hardly necessary, but saves
needing to double up on kmem cache and comparison function.

Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
This commit is contained in:
Rob Norris 2023-08-29 22:02:00 +10:00 committed by Geoff Amey
parent efeeeec2a4
commit 4b07fb9a98
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sys/zio.h
View File

@ -633,6 +633,10 @@ extern void zio_vdev_io_bypass(zio_t *zio);
extern void zio_vdev_io_reissue(zio_t *zio);
extern void zio_vdev_io_redone(zio_t *zio);
extern zio_vdev_trace_t * zio_vdev_trace_alloc(void);
extern void zio_vdev_trace_free(zio_vdev_trace_t *zvt);
extern int zio_vdev_trace_compare(const void *x1, const void *x2);
extern void zio_change_priority(zio_t *pio, zio_priority_t priority);
extern void zio_checksum_verified(zio_t *zio);

26
module/zfs/zio.c
View File

@ -756,8 +756,7 @@ zio_notify_parent(zio_t *pio, zio_t *zio, enum zio_wait_type wait,
if (zio->io_error == 0) {
zvt_search.zvt_guid = zio->io_vd->vdev_guid;
if (avl_find(t, &zvt_search, &where) == NULL) {
zvt = kmem_cache_alloc(zio_vdev_trace_cache,
KM_SLEEP);
zvt = zio_vdev_trace_alloc();
zvt->zvt_guid = zio->io_vd->vdev_guid;
avl_insert(t, zvt, where);
}
@ -774,8 +773,7 @@ zio_notify_parent(zio_t *pio, zio_t *zio, enum zio_wait_type wait,
for (czvt = avl_first(ct); czvt != NULL;
czvt = AVL_NEXT(ct, czvt)) {
if (avl_find(t, czvt, &where) == NULL) {
zvt = kmem_cache_alloc(
zio_vdev_trace_cache, KM_SLEEP);
zvt = zio_vdev_trace_alloc();
zvt->zvt_guid = czvt->zvt_guid;
avl_insert(t, zvt, where);
}
@ -864,7 +862,23 @@ zio_bookmark_compare(const void *x1, const void *x2)
return (0);
}
static int
/*
* vdev tracing support. These are exposed so that tracing clients can build
* their own trees compatible with functions that operate on a trace tree.
*/
zio_vdev_trace_t *
zio_vdev_trace_alloc(void)
{
return (kmem_cache_alloc(zio_vdev_trace_cache, KM_SLEEP));
}
void
zio_vdev_trace_free(zio_vdev_trace_t *zvt)
{
kmem_cache_free(zio_vdev_trace_cache, zvt);
}
int
zio_vdev_trace_compare(const void *x1, const void *x2)
{
const uint64_t v1 = ((zio_vdev_trace_t *)x1)->zvt_guid;
@ -981,7 +995,7 @@ zio_destroy(zio_t *zio)
zio_vdev_trace_t *zvt;
void *cookie = NULL;
while ((zvt = avl_destroy_nodes(t, &cookie)) != NULL)
kmem_cache_free(zio_vdev_trace_cache, zvt);
zio_vdev_trace_free(zvt);
avl_destroy(t);
}
metaslab_trace_fini(&zio->io_alloc_list);