From nobody Thu May 23 17:45:40 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 4VlbDh37cpz5Ky4Z; Thu, 23 May 2024 17:45:40 +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 4VlbDh2bwsz4rpC; Thu, 23 May 2024 17:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716486340; 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=zdcerXvjMvNzTp3aTHPHmknrAfZBH8kondIICJh2F9U=; b=CtaAGzuoq2UcEX4yCxZdu0l+gEE9r7hp/GKcR9FUHJYXImnPytsbXoeXLuJcKe7scCJ+FW BFyYJgHE3iAgqrF8EkZgMI3z6e+saTrmw4uHM7sdvIW/ArSiNGiCsg5Ogsrb/G4q44SL8h WdXrs/fDkaeeuUcBLBgi3aO9N/Saonpyf2EWKwlYh+LxkUpqjaJeUmM7KpgCog+v9UGosP ZMiDrNF+yBD7UITlqQup4m9JGAR7mdEaF9Q7IVnWXBvrkl/Nm/f3UUy7/QIZW6cDCCyMME ahmD4y9I02NKiLJlKgCqpUpZ9h3VTzc1WVb+cedXxmqJ494uWz4D32eM8vwfCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716486340; a=rsa-sha256; cv=none; b=LBc7F6ybLOVXBsqmCw2Tt2Us1lvyYADqPJVKX2O/btT7ByaJK8P5fh1PEh2uhsoMS9+Kty bvyafaaOShZXLGZH639kZ3/9NbeGs6ou4dA8nfYlrg7PgAzJ4iBSy85RL8JVlImQ735Vo4 FGK8R+gX0hNFK8z8yLFw+KIYpQfIWo4EWVA0ZBJk/Q7NoY7RNWcw/rH7S1ZX2RNKrzun1x 0CeZMnMPDT0Oqcc+dwPruhrHhhKSHdbHz8dpYuS3ca3c81g2ohMXLsdc30lIlYkiwuYx26 OSYQ/1vyU9Concq5cIp1TJYZygZQo/Wzo0xgegEXtPIm0Y3FZo6uusQ+K+aBjQ== 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=1716486340; 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=zdcerXvjMvNzTp3aTHPHmknrAfZBH8kondIICJh2F9U=; b=T35l6wuLGrWIop0DXHXjmxGCTFMAvtsfbSNUF3cauZp+Ufjs3OYBTN2QX65nLgWD+5Va9P MOcdcBnBwu2Q0XGpJGdpTXWPVdl59v9OZG//DyetV2cbugSjloKh/PFWY1lG7QSYstD0v8 oZ3jqVOGn7qELW/pbNobggjAGUm6a7Ztf+CkMiCz4NCkn7/JIr7PrBYBYReJONYYYcK7H5 e5EkS9z/bpl/k118LdHrhGfLFqe5X3+eVAFIYecyK5rV4K2VvD8CQYD6qaZShTrEl6nhTo x9QlZlZKzPE35JYDtQVBCSoZgRxiinU78OEt/2ap65PV+rvl02ABBAdLCf+7xA== 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 4VlbDh25FHzyrf; Thu, 23 May 2024 17:45:40 +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 44NHjeer082154; Thu, 23 May 2024 17:45:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44NHjej8082151; Thu, 23 May 2024 17:45:40 GMT (envelope-from git) Date: Thu, 23 May 2024 17:45:40 GMT Message-Id: <202405231745.44NHjej8082151@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: 9898f936aa69 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 9898f936aa69d1b67bcd83d189acb6013f76bd43 Auto-Submitted: auto-generated The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=9898f936aa69d1b67bcd83d189acb6013f76bd43 commit 9898f936aa69d1b67bcd83d189acb6013f76bd43 Author: Alexander Motin AuthorDate: 2024-05-23 16:20:37 +0000 Commit: Alexander Motin CommitDate: 2024-05-23 17:43:02 +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 (cherry picked from commit 49086aa35d987b78dbc3c9ec94814fe338e07164) --- 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 d716510f879d..f2647a936c94 100644 --- a/sys/contrib/openzfs/include/sys/dsl_scan.h +++ b/sys/contrib/openzfs/include/sys/dsl_scan.h @@ -155,6 +155,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 */ } dsl_scan_t; diff --git a/sys/contrib/openzfs/module/zfs/dsl_scan.c b/sys/contrib/openzfs/module/zfs/dsl_scan.c index f0a851ff53a9..6979f08cc9ff 100644 --- a/sys/contrib/openzfs/module/zfs/dsl_scan.c +++ b/sys/contrib/openzfs/module/zfs/dsl_scan.c @@ -469,6 +469,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)); @@ -611,6 +612,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); @@ -2402,8 +2404,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); } @@ -2593,8 +2597,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); }