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

Merge 416ea41982 into 63253dbf4f

This commit is contained in:
George Wilson 2024-09-09 17:50:39 -07:00 committed by GitHub
parent 63253dbf4f 416ea41982
commit 2be939b300
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sys/zio.h
View File

@ -553,6 +553,8 @@ extern zio_t *zio_null(zio_t *pio, spa_t *spa, vdev_t *vd,
extern zio_t *zio_root(spa_t *spa, extern zio_t *zio_root(spa_t *spa,
zio_done_func_t *done, void *priv, zio_flag_t flags); zio_done_func_t *done, void *priv, zio_flag_t flags);
extern zio_t *zio_root_done(spa_t *spa,
zio_done_func_t *done, void *priv, zio_flag_t flags);
extern void zio_destroy(zio_t *zio); extern void zio_destroy(zio_t *zio);

2
include/sys/zio_impl.h
View File

@ -164,7 +164,7 @@ enum zio_stage {
ZIO_STAGE_DONE = 1 << 25 /* RWFCXT */ ZIO_STAGE_DONE = 1 << 25 /* RWFCXT */
}; };
#define ZIO_ROOT_PIPELINE \ #define ZIO_DONE_PIPELINE \
ZIO_STAGE_DONE ZIO_STAGE_DONE
#define ZIO_INTERLOCK_STAGES \ #define ZIO_INTERLOCK_STAGES \

4
module/zfs/spa.c
View File

@ -3966,7 +3966,7 @@ spa_ld_parse_config(spa_t *spa, spa_import_type_t type)
spa->spa_async_zio_root = kmem_alloc(max_ncpus * sizeof (void *), spa->spa_async_zio_root = kmem_alloc(max_ncpus * sizeof (void *),
KM_SLEEP); KM_SLEEP);
for (int i = 0; i < max_ncpus; i++) { for (int i = 0; i < max_ncpus; i++) {
spa->spa_async_zio_root[i] = zio_root(spa, NULL, NULL, spa->spa_async_zio_root[i] = zio_root_done(spa, NULL, NULL,
ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE | ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE |
ZIO_FLAG_GODFATHER); ZIO_FLAG_GODFATHER);
} }
@ -6492,7 +6492,7 @@ spa_create(const char *pool, nvlist_t *nvroot, nvlist_t *props,
spa->spa_async_zio_root = kmem_alloc(max_ncpus * sizeof (void *), spa->spa_async_zio_root = kmem_alloc(max_ncpus * sizeof (void *),
KM_SLEEP); KM_SLEEP);
for (int i = 0; i < max_ncpus; i++) { for (int i = 0; i < max_ncpus; i++) {
spa->spa_async_zio_root[i] = zio_root(spa, NULL, NULL, spa->spa_async_zio_root[i] = zio_root_done(spa, NULL, NULL,
ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE | ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE |
ZIO_FLAG_GODFATHER); ZIO_FLAG_GODFATHER);
} }

2
module/zfs/zil.c
View File

@ -1910,7 +1910,7 @@ zil_lwb_write_issue(zilog_t *zilog, lwb_t *lwb)
lwb->lwb_nused = lwb->lwb_nfilled; lwb->lwb_nused = lwb->lwb_nfilled;
ASSERT3U(lwb->lwb_nused, <=, lwb->lwb_nmax); ASSERT3U(lwb->lwb_nused, <=, lwb->lwb_nmax);
lwb->lwb_root_zio = zio_root(spa, zil_lwb_flush_vdevs_done, lwb, lwb->lwb_root_zio = zio_root_done(spa, zil_lwb_flush_vdevs_done, lwb,
ZIO_FLAG_CANFAIL); ZIO_FLAG_CANFAIL);
/* /*

24
module/zfs/zio.c
View File

@ -1017,19 +1017,33 @@ zio_null(zio_t *pio, spa_t *spa, vdev_t *vd, zio_done_func_t *done,
} }
/* /*
* ZIO intended to be a root of a tree. Unlike null ZIO does not have a * Root ZIO that runs through all the interlock stages. Although it does
* READY pipeline stage (is ready on creation), so it should not be used * not provide a callback, it can be used to drive functionality and
* as child of any ZIO that may need waiting for grandchildren READY stage * synchronization in the READY and DONE stages of the pipeline.
* (any other ZIO type).
*/ */
zio_t * zio_t *
zio_root(spa_t *spa, zio_done_func_t *done, void *private, zio_flag_t flags) zio_root(spa_t *spa, zio_done_func_t *done, void *private, zio_flag_t flags)
{
return (zio_null(NULL, spa, NULL, done, private, flags));
}
/*
* Optimized Root ZIO that can be used when READY stage interlocking
* is not necessary or required. Unlike a standard root ZIO, this ZIO
* is READY on creation and immediates moves to the DONE stage when
* the pipeline is invoked. Unlike a null ZIO or a root ZIO, this ZIO
* should not be used as child of any ZIO that may need waiting for
* grandchildren READY stage (any other ZIO type).
*/
zio_t *
zio_root_done(spa_t *spa, zio_done_func_t *done, void *private,
zio_flag_t flags)
{ {
zio_t *zio; zio_t *zio;
zio = zio_create(NULL, spa, 0, NULL, NULL, 0, 0, done, private, zio = zio_create(NULL, spa, 0, NULL, NULL, 0, 0, done, private,
ZIO_TYPE_NULL, ZIO_PRIORITY_NOW, flags, NULL, 0, NULL, ZIO_TYPE_NULL, ZIO_PRIORITY_NOW, flags, NULL, 0, NULL,
ZIO_STAGE_OPEN, ZIO_ROOT_PIPELINE); ZIO_STAGE_OPEN, ZIO_DONE_PIPELINE);
return (zio); return (zio);
} }