From nobody Wed Jul 29 17:50:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4h9KcM15fdz6mb83 for ; Wed, 29 Jul 2026 17:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h9KcL4Cdyz3mRV for ; Wed, 29 Jul 2026 17:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785347426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eu3/DvFHKk0sDTwGhvN+Y5zC5imLC2QwGvdxxGTK7Ww=; b=kQXp4jOFpbTrB4vL8CQPBNbibsMJujx/sWDu+Jp9xgTkPDUkurh+n/EwWGLgwSML9SAv4Q Jyh/t/LM036I4O5w/5OQx/zR1A7phiZ46zTz3btp4rYwqUZHw8PT8gcn8ClyiZ06akHMRr jfAeFKZUoElEP7z2Q0zILZ8iyhJCnLhHq1n1byI4ZI/ZorCz4zWYTAnsUMizXxReDfkxSK by1AQs7LX7bYd7VNWh1YeOH2FPRWyXCyMkrJnEJ+BYVeAbC8zyUbyg3iunEOFaeh0TLYQ9 KY1M5xFrynZVNeQhdq7GoRsrWyU4eIQuU/xVIq3juDubGkSyaBpEid9EHSQxoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785347426; a=rsa-sha256; cv=none; b=D2HLRqDxWpx4Y7a5xlI6p+SJnI0kZ0LNVVVKN8/RiYyOu+xCfXJSaSSFHEQgAcB5LQHvo3 HdA5sF3/CieGlnidv/S31QZTzUMQnI3he8KKP10W4X01y6QDYuF0DgcK4WrqtYJAXfI9Xa CMKhNlbKAgIwcWfXp/swEb90EP1n031NWANXkEkMpX2+Nwp+XjHpJ4vBEctscvyturAIz3 Wqnr2S/D4e4cXecuNELApH5G4fS1D/ou2WwnCyDeqDqISB6khOGVx0r9sygiZDkYz+Y1LY LCxaJMN6ApURyTw3KxAvlAA9R7H+u+1HGqZw7cwj7rkgKuR1IsZ2hflCski5+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785347426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eu3/DvFHKk0sDTwGhvN+Y5zC5imLC2QwGvdxxGTK7Ww=; b=oyzlWLszTOKl3uYvtudyjRP1D1WWktyzntaqdEO95AkYW1uKMvxZ02g1/yjz0orW78xGjg fA+8PG+wHFEJrxlc5/TOcPAq3Shv/AWoSRLKCO65qyU8Ltllz37htJl3F+l4r3UryL4lzU XpN0wlVwdHPQR9LGpIo53CcnY4GzzsWHe58miJeW5zgzFpbhQS3CAndLYgWkJejGJFey5C y4NFRtMAiqSoULRrs3yU9AFP0qV2Vuz2toCEIPU9WVnTYuEOpL2GvxxYNl15EdS9eXGc5f a46XmSy2Up3/HmJ9GCiXuPiEC8F2FrAPNqNLlB35FEgeVrAluwvP6UufN1MatA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9KcL33m1zcJh for ; Wed, 29 Jul 2026 17:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bf10 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 17:50:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 15ce5ce04aa0 - releng/15.1 - Make zvol_set_common() block until the operation has completed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 15ce5ce04aa057f10a5d7ced359edbe3014bf53c Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 17:50:26 +0000 Message-Id: <6a6a3d62.3bf10.6eabe9d4@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=15ce5ce04aa057f10a5d7ced359edbe3014bf53c commit 15ce5ce04aa057f10a5d7ced359edbe3014bf53c Author: Mark Johnston AuthorDate: 2026-02-02 01:55:04 +0000 Commit: Mark Johnston CommitDate: 2026-07-28 15:15:39 +0000 Make zvol_set_common() block until the operation has completed This is motivated by a FreeBSD AIO test case which create a zvol with -o volmode=dev, then immediately tries to open the zvol device file. The open occasionally fails with ENOENT. When a zvol is created without the volmode setting, zvol_create_minors() blocks until the task is finished, at which point OS-dependent code will have created a device file. However, zvol_set_common() may cause the device file to be destroyed and re-created, at least on FreeBSD, if the voltype switches from GEOM to DEV. In this case, we do not block waiting for the operation to finish, causing the test failure. Fix the problem by making zvol_set_common() block until the operation has finished. In FreeBSD zvol code, use g_waitidle() to block until asynchronous GEOM operations are done. This fixes a secondary race where zvol_os_remove_minor() does not block until the zvol device file is removed, and the subsequent zvol_os_create_minor() fails because the (to-be-destroyed) device file already exists. Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: Mark Johnston Closes #18191 Approved by: so Security: FreeBSD-EN-26:19.zfs (cherry picked from commit d736868672cb3df197d2ddcfef29ac14edf4ee20) (cherry picked from commit f6745503ded7cc938a52d6916277da12c5b31d4f) --- .../openzfs/module/os/freebsd/zfs/zvol_os.c | 4 +- sys/contrib/openzfs/module/zfs/zvol.c | 46 ++++++++++++++++++++-- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c index fca99c42f73c..2bc85e9bd972 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c @@ -919,7 +919,7 @@ retry: return (SET_ERROR(ENXIO)); mutex_enter(&zv->zv_state_lock); - if (zv->zv_zso->zso_dying || zv->zv_flags & ZVOL_REMOVING) { + if (zv->zv_flags & ZVOL_REMOVING || zv->zv_zso->zso_dying) { err = SET_ERROR(ENXIO); goto out_locked; } @@ -1426,6 +1426,7 @@ zvol_os_remove_minor(zvol_state_t *zv) pp->private = NULL; g_wither_geom(pp->geom, ENXIO); g_topology_unlock(); + g_waitidle(curthread); } else if (zv->zv_volmode == ZFS_VOLMODE_DEV) { struct zvol_state_dev *zsd = &zso->zso_dev; struct cdev *dev = zsd->zsd_cdev; @@ -1555,6 +1556,7 @@ out_dmu_objset_disown: g_error_provider(zv->zv_zso->zso_geom.zsg_provider, 0); /* geom was locked inside zvol_alloc() function */ g_topology_unlock(); + g_waitidle(curthread); } out_doi: kmem_free(doi, sizeof (dmu_object_info_t)); diff --git a/sys/contrib/openzfs/module/zfs/zvol.c b/sys/contrib/openzfs/module/zfs/zvol.c index 407758641580..b6d6f9db2597 100644 --- a/sys/contrib/openzfs/module/zfs/zvol.c +++ b/sys/contrib/openzfs/module/zfs/zvol.c @@ -1936,6 +1936,10 @@ typedef struct zvol_set_prop_int_arg { uint64_t zsda_value; zprop_source_t zsda_source; zfs_prop_t zsda_prop; + taskqid_t zsda_taskqid; + boolean_t zsda_dispatched; + kmutex_t zsda_lock; + kcondvar_t zsda_cv; } zvol_set_prop_int_arg_t; /* @@ -1966,6 +1970,7 @@ zvol_set_common_sync_cb(dsl_pool_t *dp, dsl_dataset_t *ds, void *arg) char dsname[ZFS_MAX_DATASET_NAME_LEN]; zvol_task_t *task; uint64_t prop; + taskqid_t id; const char *prop_name = zfs_prop_to_name(zsda->zsda_prop); dsl_dataset_name(ds, dsname); @@ -1984,8 +1989,12 @@ zvol_set_common_sync_cb(dsl_pool_t *dp, dsl_dataset_t *ds, void *arg) } task->zt_value = prop; strlcpy(task->zt_name1, dsname, sizeof (task->zt_name1)); - (void) taskq_dispatch(dp->dp_spa->spa_zvol_taskq, zvol_task_cb, - task, TQ_SLEEP); + id = taskq_dispatch(dp->dp_spa->spa_zvol_taskq, zvol_task_cb, task, + TQ_SLEEP); + mutex_enter(&zsda->zsda_lock); + if (id != TASKQID_INVALID && id > zsda->zsda_taskqid) + zsda->zsda_taskqid = id; + mutex_exit(&zsda->zsda_lock); return (0); } @@ -2018,6 +2027,11 @@ zvol_set_common_sync(void *arg, dmu_tx_t *tx) dmu_objset_find_dp(dp, dd->dd_object, zvol_set_common_sync_cb, zsda, DS_FIND_CHILDREN); + mutex_enter(&zsda->zsda_lock); + zsda->zsda_dispatched = TRUE; + cv_broadcast(&zsda->zsda_cv); + mutex_exit(&zsda->zsda_lock); + dsl_dir_rele(dd, FTAG); } @@ -2026,14 +2040,38 @@ zvol_set_common(const char *ddname, zfs_prop_t prop, zprop_source_t source, uint64_t val) { zvol_set_prop_int_arg_t zsda; + spa_t *spa; + int error; zsda.zsda_name = ddname; zsda.zsda_source = source; zsda.zsda_value = val; zsda.zsda_prop = prop; + zsda.zsda_taskqid = TASKQID_INVALID; + zsda.zsda_dispatched = FALSE; + mutex_init(&zsda.zsda_lock, NULL, MUTEX_DEFAULT, NULL); + cv_init(&zsda.zsda_cv, NULL, CV_DEFAULT, NULL); - return (dsl_sync_task(ddname, zvol_set_common_check, - zvol_set_common_sync, &zsda, 0, ZFS_SPACE_CHECK_NONE)); + error = spa_open(ddname, &spa, FTAG); + if (error != 0) + goto out; + error = dsl_sync_task(ddname, zvol_set_common_check, + zvol_set_common_sync, &zsda, 0, ZFS_SPACE_CHECK_NONE); + if (error == 0) { + mutex_enter(&zsda.zsda_lock); + while (!zsda.zsda_dispatched) + cv_wait(&zsda.zsda_cv, &zsda.zsda_lock); + mutex_exit(&zsda.zsda_lock); + + if (zsda.zsda_taskqid != TASKQID_INVALID) + taskq_wait_outstanding(spa->spa_zvol_taskq, + zsda.zsda_taskqid); + } + spa_close(spa, FTAG); +out: + cv_destroy(&zsda.zsda_cv); + mutex_destroy(&zsda.zsda_lock); + return (error); } void