From nobody Thu May 23 18:12:12 2024 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 4VlbqK0wBrz5L173; Thu, 23 May 2024 18:12:13 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VlbqK07d0z4tfM; Thu, 23 May 2024 18:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716487933; 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=Qn5cuBY+WmkGM1sguhHLHkvuRUpmyw6zZPKUOauyujw=; b=EWEWEGAgiM9MeuIvGXxJEY/P/WVc+5m6D5hqzRogo4S4SXsv+T6NjbiZx6/9q9ZS6041fq vgECp8ehZrKLSMu4+PB86UiMbA8MbcoSltPqUbq9oaeiGFHo4na4iVbsk0o/+YkhnNbKLC GOWht2eHn5fnGxI+XUj/gQ5lTkDoqokzDahiYJUPUlfPUy1FFDxFH4pxdEzoUlrhlFCYfF gxQjWp8csSery6P3vDueaFi9JXGAE/cdcze+1yTYj1ScBmcLLPwayWVIcYSyyzx9oHQ9y3 74V+uvbd/DNlaCIhl4LgKW1zweVflz/t/5t+aJrxS2TL4ljjPGnHVl3Pdp5IYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716487933; a=rsa-sha256; cv=none; b=Y+dJhSrPVotk/67YAdbPQJkxbnCWVIjraSUoj6FzrgqwdtLrSz7isSpiiEUOZiDrZ/fG9B 9IvSnkItJdd5px+18zQLYRn/+0iAD4V/YLVy5bIZJw9SbmkZjxdfBue0d0BXPEu+U2VtX4 InTJ+Tp3trnNEruTHDkUAgFbNuxqEWPaaT8yQ9l3pH9riyHGxgruj/XiamzJGduOALoJyN +oczLCLrKcdI5By2yuQSodNfJ3vgswfyxheyHO15t9QkoTIUSODNNxdOofKyQtTJMe/jri 2Cl1MUczRc4nUSeOp8xVzlfk9gkd90j2FdeK24B3PvZ4Wk3+uVFfKALwjXmRoQ== 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=1716487933; 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=Qn5cuBY+WmkGM1sguhHLHkvuRUpmyw6zZPKUOauyujw=; b=s7a7ZajsimcZHWUCzDl/Ru1e2xsI2yjUjqA0NQKaG2aN0FVHKFIrPR0YEgFAmKfqg+fWXX KmzteAtchWEmArXWBNxAL1XCkCv1KjJbMj93P0GHWHgka2NlCnnZ2FoSbRrozJ/5ASzMzL KEuuN05CfkWfmwF5/F4OXewbyH2mde4B8NeoX4MZdGHhxoNLwAC6cvAiANF0oA2cfZ4otE R6MBCQ9aSp2EuFELlG4sYh1z1GucFBzdBenbXTWHsKu7k/UqJZTtMG1jGqpZF22NGwyJor s2bF2ET4qUF52AIrc8KeWO2cjNnKSsTDs33GdJxdkxurZzdCgv5ChvTEhOFgmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VlbqJ6rdnz10V6; Thu, 23 May 2024 18:12:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44NICCKV033051; Thu, 23 May 2024 18:12:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44NICCwQ033048; Thu, 23 May 2024 18:12:12 GMT (envelope-from git) Date: Thu, 23 May 2024 18:12:12 GMT Message-Id: <202405231812.44NICCwQ033048@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 856d35337225 - releng/14.1 - Fix scn_queue races on very old pools 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 856d35337225d77948b43ee5d479baa2588963ec Auto-Submitted: auto-generated The branch releng/14.1 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=856d35337225d77948b43ee5d479baa2588963ec commit 856d35337225d77948b43ee5d479baa2588963ec Author: Alexander Motin AuthorDate: 2024-05-23 16:20:37 +0000 Commit: Alexander Motin CommitDate: 2024-05-23 18:11:36 +0000 Fix scn_queue races on very old pools Code for pools before version 11 uses dmu_objset_find_dp() to scan for children datasets/clones. It calls enqueue_clones_cb() and enqueue_cb() callbacks in parallel from multiple taskq threads. It ends up bad for scan_ds_queue_insert(), corrupting scn_queue AVL-tree. Fix it by introducing a mutex to protect those two scan_ds_queue_insert() calls. All other calls are done from the sync thread and so serialized. Reviewed-by: Brian Behlendorf Reviewed-by: Brian Atkinson Signed-off-by: Alexander Motin Sponsored by: iXsystems, Inc. Closes #16162 PR: 278414 Approved by: re (cperciva) (cherry picked from commit 49086aa35d987b78dbc3c9ec94814fe338e07164) (cherry picked from commit 455ce1729353f2ffce9713ccc3574e73186a22f0) --- sys/contrib/openzfs/include/sys/dsl_scan.h | 1 + sys/contrib/openzfs/module/zfs/dsl_scan.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/sys/contrib/openzfs/include/sys/dsl_scan.h b/sys/contrib/openzfs/include/sys/dsl_scan.h index 2e3452e5ebaa..f32f59a2bedf 100644 --- a/sys/contrib/openzfs/include/sys/dsl_scan.h +++ b/sys/contrib/openzfs/include/sys/dsl_scan.h @@ -173,6 +173,7 @@ typedef struct dsl_scan { dsl_scan_phys_t scn_phys; /* on disk representation of scan */ dsl_scan_phys_t scn_phys_cached; avl_tree_t scn_queue; /* queue of datasets to scan */ + kmutex_t scn_queue_lock; /* serializes scn_queue inserts */ uint64_t scn_queues_pending; /* outstanding data to issue */ /* members needed for syncing error scrub status to disk */ dsl_errorscrub_phys_t errorscrub_phys; diff --git a/sys/contrib/openzfs/module/zfs/dsl_scan.c b/sys/contrib/openzfs/module/zfs/dsl_scan.c index 34012db82dee..c509f402c44a 100644 --- a/sys/contrib/openzfs/module/zfs/dsl_scan.c +++ b/sys/contrib/openzfs/module/zfs/dsl_scan.c @@ -491,6 +491,7 @@ dsl_scan_init(dsl_pool_t *dp, uint64_t txg) avl_create(&scn->scn_queue, scan_ds_queue_compare, sizeof (scan_ds_t), offsetof(scan_ds_t, sds_node)); + mutex_init(&scn->scn_queue_lock, NULL, MUTEX_DEFAULT, NULL); avl_create(&scn->scn_prefetch_queue, scan_prefetch_queue_compare, sizeof (scan_prefetch_issue_ctx_t), offsetof(scan_prefetch_issue_ctx_t, spic_avl_node)); @@ -646,6 +647,7 @@ dsl_scan_fini(dsl_pool_t *dp) scan_ds_queue_clear(scn); avl_destroy(&scn->scn_queue); + mutex_destroy(&scn->scn_queue_lock); scan_ds_prefetch_queue_clear(scn); avl_destroy(&scn->scn_prefetch_queue); @@ -2727,8 +2729,10 @@ enqueue_clones_cb(dsl_pool_t *dp, dsl_dataset_t *hds, void *arg) return (err); ds = prev; } + mutex_enter(&scn->scn_queue_lock); scan_ds_queue_insert(scn, ds->ds_object, dsl_dataset_phys(ds)->ds_prev_snap_txg); + mutex_exit(&scn->scn_queue_lock); dsl_dataset_rele(ds, FTAG); return (0); } @@ -2919,8 +2923,10 @@ enqueue_cb(dsl_pool_t *dp, dsl_dataset_t *hds, void *arg) ds = prev; } + mutex_enter(&scn->scn_queue_lock); scan_ds_queue_insert(scn, ds->ds_object, dsl_dataset_phys(ds)->ds_prev_snap_txg); + mutex_exit(&scn->scn_queue_lock); dsl_dataset_rele(ds, FTAG); return (0); }