Skip to content

Z.I.A. disk open/close rework #2

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

Open
wants to merge 1 commit into
base: zia
Choose a base branch
from
Open

Z.I.A. disk open/close rework #2

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
3 changes: 2 additions & 1 deletion include/sys/zia.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ void zia_prop_warn(boolean_t val, const char *name);
int zia_init(void);
int zia_fini(void);

void *zia_get_provider(const char *name, vdev_t *vdev);
void zia_open_vdevs(vdev_t *vd);
void *zia_get_provider(const char *name);
const char *zia_get_provider_name(void *provider);
int zia_put_provider(void **provider, vdev_t *vdev);

Expand Down
64 changes: 33 additions & 31 deletions module/zfs/spa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2180,6 +2180,11 @@ spa_unload(spa_t *spa)

bpobj_close(&spa->spa_deferred_bpobj);

if (zia_get_props(spa)->provider != NULL) {
zia_put_provider(&zia_get_props(spa)->provider,
spa->spa_root_vdev);
}

spa_config_enter(spa, SCL_ALL, spa, RW_WRITER);

/*
Expand Down Expand Up @@ -2251,11 +2256,6 @@ spa_unload(spa_t *spa)
spa->spa_raidz_expand = NULL;
spa->spa_checkpoint_txg = 0;

if (zia_get_props(spa)->provider != NULL) {
zia_put_provider(&zia_get_props(spa)->provider,
spa->spa_root_vdev);
}

spa_config_exit(spa, SCL_ALL, spa);
}

Expand Down Expand Up @@ -9815,26 +9815,21 @@ spa_sync_props(void *arg, dmu_tx_t *tx)
if (zia_props->provider != NULL)
zia_put_provider(&zia_props->provider,
spa->spa_root_vdev);
zia_props->provider = zia_get_provider(strval,
spa->spa_root_vdev);
zia_props->provider = zia_get_provider(strval);
zia_props->can_offload = !!zia_props->provider;

/*
* Dirty the configuration on vdevs as above.
*/
if (tx->tx_txg != TXG_INITIAL) {
vdev_config_dirty(spa->spa_root_vdev);
spa_async_request(spa, SPA_ASYNC_CONFIG_UPDATE);
}

/*
* reopen devices so that provider is used
* copied from zfs_ioc_pool_reopen
* It is possible to enable disk_write or file_write
* without passing a provider, or swapping one
* provider with another while these flags are enabled.
* In those cases, vdevs must be opened for the new
* provider upon being passed.
* The vdevs will be closed for the older provider
* in zia_put_provider() first.
*/
spa_vdev_state_enter(spa, SCL_NONE);
vdev_close(spa->spa_root_vdev);
(void) vdev_open(spa->spa_root_vdev);
(void) spa_vdev_state_exit(spa, NULL, 0);
ASSERT3P(spa->spa_root_vdev, !=, NULL);
if (zia_props->disk_write || zia_props->file_write)
zia_open_vdevs(spa->spa_root_vdev);

spa_history_log_internal(spa, "set", tx,
"%s=%s", nvpair_name(elem), strval);
Expand Down Expand Up @@ -9924,11 +9919,16 @@ spa_sync_props(void *arg, dmu_tx_t *tx)
zia_props->file_write =
fnvpair_value_uint64(elem);

/* reopen devices so that provider is used */
spa_vdev_state_enter(spa, SCL_NONE);
vdev_close(spa->spa_root_vdev);
(void) vdev_open(spa->spa_root_vdev);
(void) spa_vdev_state_exit(spa, NULL, 0);
/*
* Only open vdevs for the provider if one
* has already been instantiated and if the
* passed value to file_write is 1, not 0
* to disable it.
*/
ASSERT3P(spa->spa_root_vdev, !=, NULL);
if (zia_props->provider && zia_props->file_write) {
zia_open_vdevs(spa->spa_root_vdev);
}

zia_prop_warn(zia_props->file_write,
"File Write");
Expand All @@ -9937,11 +9937,13 @@ spa_sync_props(void *arg, dmu_tx_t *tx)
zia_props->disk_write =
fnvpair_value_uint64(elem);

/* reopen devices so that provider is used */
spa_vdev_state_enter(spa, SCL_NONE);
vdev_close(spa->spa_root_vdev);
(void) vdev_open(spa->spa_root_vdev);
(void) spa_vdev_state_exit(spa, NULL, 0);
/*
* Check for the same reason as file_write.
*/
ASSERT3P(spa->spa_root_vdev, !=, NULL);
if (zia_props->provider && zia_props->disk_write) {
zia_open_vdevs(spa->spa_root_vdev);
}

zia_prop_warn(zia_props->disk_write,
"Disk Write");
Expand Down
37 changes: 24 additions & 13 deletions module/zfs/zia.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ zia_fini(void)

#ifdef ZIA
/* recursively find all leaf vdevs and open them */
static void zia_open_vdevs(vdev_t *vd) {
static void zia_open_vdevs_impl(vdev_t *vd) {
vdev_ops_t *ops = vd->vdev_ops;
if (ops->vdev_op_leaf) {
ASSERT(!vd->vdev_zia_handle);
Expand All @@ -307,23 +307,34 @@ static void zia_open_vdevs(vdev_t *vd) {
}
#ifdef _KERNEL
else if (memcmp(ops->vdev_op_type, "disk", 4) == 0) {
/* first member is struct block_device * */
void *disk = vd->vdev_tsd;
zia_disk_open(vd, vd->vdev_path, disk);
zia_disk_open(vd, vd->vdev_path,
get_bdev(vd->vdev_tsd));
}
#endif
}
} else {
for (uint64_t i = 0; i < vd->vdev_children; i++) {
vdev_t *child = vd->vdev_child[i];
zia_open_vdevs(child);
zia_open_vdevs_impl(child);
}
}
}
#endif

void zia_open_vdevs(vdev_t *vd) {
#ifdef ZIA
if (!vd)
return;

spa_vdev_state_enter(vd->vdev_spa, SCL_NONE);
zia_open_vdevs_impl(vd);
(void) spa_vdev_state_exit(vd->vdev_spa, NULL, 0);
#endif
(void) vd;
}

void *
zia_get_provider(const char *name, vdev_t *vdev)
zia_get_provider(const char *name)
{
#ifdef ZIA
if (!dpusm) {
Expand All @@ -337,13 +348,9 @@ zia_get_provider(const char *name, vdev_t *vdev)
name, provider);
#endif

/* set up Z.I.A. for existing vdevs */
if (vdev) {
zia_open_vdevs(vdev);
}
return (provider);
#else
(void) name; (void) vdev;
(void) name;

#ifdef _KERNEL
printk("Z.I.A. not available. Cannot obtain handle to providers.\n");
Expand Down Expand Up @@ -405,7 +412,9 @@ zia_put_provider(void **provider, vdev_t *vdev)
* make sure the vdevs don't keep pointing to the invalid provider
*/
if (vdev) {
spa_vdev_state_enter(vdev->vdev_spa, SCL_NONE);
zia_close_vdevs(vdev);
(void) spa_vdev_state_exit(vdev->vdev_spa, NULL, 0);
}

#ifdef _KERNEL
Expand Down Expand Up @@ -1638,8 +1647,10 @@ zia_disk_open(vdev_t *vdev, const char *path,
return (ZIA_ERROR);
}

void *provider = zia_get_props(vdev->vdev_spa)->provider;
if (!dpusm || !provider) {
zia_props_t *props = zia_get_props(vdev->vdev_spa);
void *provider = props->provider;

if (!dpusm || !provider || props->disk_write != 1) {
return (ZIA_FALLBACK);
}

Expand Down
Loading