From nobody Thu Aug 10 03:33:40 2023 X-Original-To: current@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 4RLswM6dd1z4pxyy for ; Thu, 10 Aug 2023 03:33:55 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLswL6wZLz3PXK for ; Thu, 10 Aug 2023 03:33:54 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Authentication-Results: mx1.freebsd.org; dkim=none ("invalid DKIM record") header.d=kev009.com header.s=google header.b=R3aeZGee; spf=pass (mx1.freebsd.org: domain of kevin.bowling@kev009.com designates 2607:f8b0:4864:20::102e as permitted sender) smtp.mailfrom=kevin.bowling@kev009.com; dmarc=none Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-268bc714ce0so1191905a91.0 for ; Wed, 09 Aug 2023 20:33:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; t=1691638433; x=1692243233; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=qZqtzteohYtrAAnE6jqgjB7NZIgqjuZmSULYY0gwWnM=; b=R3aeZGee1l3rO/wC11YVgdsoNCe/auUazIU6vbIAGmIwzGDFt1b0HGZlc90XRQiRip leguo01GEq2RYMhnWhDw2pPssFLEle9eTgY9SxMkzADya/oemRDEL0Z49rxCoWIIobMx B0ab4ddS1xuu8ngrtWYkx5APE4A2W6YFLLeTQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691638433; x=1692243233; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qZqtzteohYtrAAnE6jqgjB7NZIgqjuZmSULYY0gwWnM=; b=Ti2zGcUTZNt7SdqqynWcCBn2yO0Ue7hbar3Pl9MO8+mO3yBaI6offQLctjm61N5gxx BaAVckJ2rIr/wsGHt7HGybGn2Hq1VpSjb1M7vF+JWbNscfqj9JEkehuFGeBqHXC8mLlK hwliZQ6Y6O+jyTMwLVf7EERYMJB9M+NnlngCbLZe1UPtINnmauyJYDlFU5+EqpTAIl9d /EN50QuOhdr7dCZghna1ibqF2DVRMygUoaBXNMmLjSvRHUhG/FYpaF3BP6UaR7J7Av65 DBzKcVxd3QUvOvDW6YOItaO67j+2pwaWH6RFz4Riz+bIGXAedHoUc6TI/ZR3+UcGmtdK Hmbg== X-Gm-Message-State: AOJu0YzDWAjFObNA/r8phU73dG7i6XudN2NqwLfLicv85a0KNA2Wf4x/ KZ/KetzzT4UVOPsFmthjLh/n3L+gLRxBtFIRxP2G+6zvn3zO56ScRLRvpg== X-Google-Smtp-Source: AGHT+IFA0Piah2D3mmVwjiScmbf9Oe5LvFMwv83w9FfVuyde4lLsFNmL244+jDGg5qbI7BLc1GwCkcbM8MxNbERoWdo= X-Received: by 2002:a17:90a:51c5:b0:268:b54:7c13 with SMTP id u63-20020a17090a51c500b002680b547c13mr1138751pjh.9.1691638432887; Wed, 09 Aug 2023 20:33:52 -0700 (PDT) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 References: <86leeltqcb.fsf@ltc.des.no> In-Reply-To: <86leeltqcb.fsf@ltc.des.no> From: Kevin Bowling Date: Wed, 9 Aug 2023 20:33:40 -0700 Message-ID: Subject: Re: ZFS deadlock in 14 To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= Cc: current@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-3.04 / 15.00]; NEURAL_HAM_SHORT(-1.00)[-0.998]; NEURAL_HAM_MEDIUM(-0.90)[-0.900]; NEURAL_HAM_LONG(-0.84)[-0.842]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.10)[text/plain]; R_DKIM_PERMFAIL(0.00)[kev009.com:s=google]; MLMMJ_DEST(0.00)[current@freebsd.org]; RCVD_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; BLOCKLISTDE_FAIL(0.00)[2607:f8b0:4864:20::102e:server fail]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::102e:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[kev009.com:~]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; PREVIOUSLY_DELIVERED(0.00)[current@freebsd.org]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[kev009.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Spamd-Bar: --- X-Rspamd-Queue-Id: 4RLswL6wZLz3PXK Possibly https://github.com/openzfs/zfs/commit/2cb992a99ccadb78d97049b40bd4= 42eb4fdc549d On Tue, Aug 8, 2023 at 10:08=E2=80=AFAM Dag-Erling Sm=C3=B8rgrav wrote: > > At some point between 42d088299c (4 May) and f0c9703301 (26 June), a > deadlock was introduced in ZFS. It is still present as of 9c2823bae9 (4 > August) and is 100% reproducable just by starting poudriere bulk in a > 16-core VM and waiting a few hours until deadlkres kicks in. In the > latest instance, deadlkres complained about a bash process: > > #0 sched_switch (td=3Dtd@entry=3D0xfffffe02fb1d8000, flags=3Dflags@e= ntry=3D259) at /usr/src/sys/kern/sched_ule.c:2299 > #1 0xffffffff80b5a0a3 in mi_switch (flags=3Dflags@entry=3D259) at /u= sr/src/sys/kern/kern_synch.c:550 > #2 0xffffffff80babcb4 in sleepq_switch (wchan=3D0xfffff818543a9e70, = pri=3D64) at /usr/src/sys/kern/subr_sleepqueue.c:609 > #3 0xffffffff80babb8c in sleepq_wait (wchan=3D, pri=3D<= unavailable>) at /usr/src/sys/kern/subr_sleepqueue.c:660 > #4 0xffffffff80b1c1b0 in sleeplk (lk=3Dlk@entry=3D0xfffff818543a9e70= , flags=3Dflags@entry=3D2121728, ilk=3Dilk@entry=3D0x0, wmesg=3Dwmesg@entry= =3D0xffffffff8222a054 "zfs", pri=3D, pri@entry=3D64, timo=3D= timo@entry=3D6, queue=3D1) at /usr/src/sys/kern/kern_lock.c:310 > #5 0xffffffff80b1a23f in lockmgr_slock_hard (lk=3D0xfffff818543a9e70= , flags=3D2121728, ilk=3D, file=3D0xffffffff812544fb "/usr/s= rc/sys/kern/vfs_subr.c", line=3D3057, lwa=3D0x0) at /usr/src/sys/kern/kern_= lock.c:705 > #6 0xffffffff80c59ec3 in VOP_LOCK1 (vp=3D0xfffff818543a9e00, flags= =3D2105344, file=3D0xffffffff812544fb "/usr/src/sys/kern/vfs_subr.c", line= =3D3057) at ./vnode_if.h:1120 > #7 _vn_lock (vp=3Dvp@entry=3D0xfffff818543a9e00, flags=3D2105344, fi= le=3D, line=3D, line@entry=3D3057) at /usr/src/sy= s/kern/vfs_vnops.c:1815 > #8 0xffffffff80c4173d in vget_finish (vp=3D0xfffff818543a9e00, flags= =3D, vs=3Dvs@entry=3DVGET_USECOUNT) at /usr/src/sys/kern/vfs_s= ubr.c:3057 > #9 0xffffffff80c1c9b7 in cache_lookup (dvp=3Ddvp@entry=3D0xfffff802c= d02ac40, vpp=3Dvpp@entry=3D0xfffffe046b20ac30, cnp=3Dcnp@entry=3D0xfffffe04= 6b20ac58, tsp=3Dtsp@entry=3D0x0, ticksp=3Dticksp@entry=3D0x0) at /usr/src/s= ys/kern/vfs_cache.c:2086 > #10 0xffffffff80c2150c in vfs_cache_lookup (ap=3D) at = /usr/src/sys/kern/vfs_cache.c:3068 > #11 0xffffffff80c32c37 in VOP_LOOKUP (dvp=3D0xfffff802cd02ac40, vpp= =3D0xfffffe046b20ac30, cnp=3D0xfffffe046b20ac58) at ./vnode_if.h:69 > #12 vfs_lookup (ndp=3Dndp@entry=3D0xfffffe046b20abd8) at /usr/src/sys= /kern/vfs_lookup.c:1266 > #13 0xffffffff80c31ce1 in namei (ndp=3Dndp@entry=3D0xfffffe046b20abd8= ) at /usr/src/sys/kern/vfs_lookup.c:689 > #14 0xffffffff80c52090 in kern_statat (td=3D0xfffffe02fb1d8000, flag= =3D, fd=3D-100, path=3D0xa75b480e070 , pathseg=3Dpathseg@entry=3DUIO_USERSPACE, s= bp=3Dsbp@entry=3D0xfffffe046b20ad18) > at /usr/src/sys/kern/vfs_syscalls.c:2441 > #15 0xffffffff80c52797 in sys_fstatat (td=3D, uap=3D0xff= fffe02fb1d8400) at /usr/src/sys/kern/vfs_syscalls.c:2419 > #16 0xffffffff81049398 in syscallenter (td=3D) at /usr= /src/sys/amd64/amd64/../../kern/subr_syscall.c:190 > #17 amd64_syscall (td=3D0xfffffe02fb1d8000, traced=3D0) at /usr/src/s= ys/amd64/amd64/trap.c:1199 > #18 > > The lock it is trying to acquire in frame 5 belongs to another bash > process which is in the process of creating a fifo: > > #0 sched_switch (td=3Dtd@entry=3D0xfffffe046acd8e40, flags=3Dflags@e= ntry=3D259) at /usr/src/sys/kern/sched_ule.c:2299 > #1 0xffffffff80b5a0a3 in mi_switch (flags=3Dflags@entry=3D259) at /u= sr/src/sys/kern/kern_synch.c:550 > #2 0xffffffff80babcb4 in sleepq_switch (wchan=3D0xfffff8018acbf154, = pri=3D87) at /usr/src/sys/kern/subr_sleepqueue.c:609 > #3 0xffffffff80babb8c in sleepq_wait (wchan=3D, pri=3D<= unavailable>) at /usr/src/sys/kern/subr_sleepqueue.c:660 > #4 0xffffffff80b59606 in _sleep (ident=3Dident@entry=3D0xfffff8018ac= bf154, lock=3Dlock@entry=3D0xfffff8018acbf120, priority=3Dpriority@entry=3D= 87, wmesg=3D0xffffffff8223af0e "zfs teardown inactive", sbt=3Dsbt@entry=3D0= , pr=3Dpr@entry=3D0, flags=3D256) > at /usr/src/sys/kern/kern_synch.c:225 > #5 0xffffffff80b45dc0 in rms_rlock_fallback (rms=3D0xfffff8018acbf12= 0) at /usr/src/sys/kern/kern_rmlock.c:1015 > #6 0xffffffff80b45c93 in rms_rlock (rms=3D, rms@entry= =3D0xfffff8018acbf120) at /usr/src/sys/kern/kern_rmlock.c:1036 > #7 0xffffffff81fb147b in zfs_freebsd_reclaim (ap=3D) = at /usr/src/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c:5164 > #8 0xffffffff8111d245 in VOP_RECLAIM_APV (vop=3D0xffffffff822e71a0 <= zfs_vnodeops>, a=3Da@entry=3D0xfffffe0410f1c9c8) at vnode_if.c:2180 > #9 0xffffffff80c43569 in VOP_RECLAIM (vp=3D0xfffff802cdbaca80) at ./= vnode_if.h:1084 > #10 vgonel (vp=3Dvp@entry=3D0xfffff802cdbaca80) at /usr/src/sys/kern/= vfs_subr.c:4143 > #11 0xffffffff80c3ef61 in vtryrecycle (vp=3D0xfffff802cdbaca80) at /u= sr/src/sys/kern/vfs_subr.c:1693 > #12 vnlru_free_impl (count=3Dcount@entry=3D1, mnt_op=3Dmnt_op@entry= =3D0x0, mvp=3D0xfffff8010864da00) at /usr/src/sys/kern/vfs_subr.c:1344 > #13 0xffffffff80c49553 in vnlru_free_locked (count=3D1) at /usr/src/s= ys/kern/vfs_subr.c:1357 > #14 vn_alloc_hard (mp=3Dmp@entry=3D0x0) at /usr/src/sys/kern/vfs_subr= .c:1744 > #15 0xffffffff80c3f6f0 in vn_alloc (mp=3D0x0) at /usr/src/sys/amd64/i= nclude/atomic.h:375 > #16 getnewvnode_reserve () at /usr/src/sys/kern/vfs_subr.c:1888 > #17 0xffffffff81faa072 in zfs_create (dzp=3D0xfffff812200261d0, name= =3D0xfffff8011b8ac805 "sh-np.yPbxoo", vap=3D0xfffffe0410f1cc20, excl=3D, mode=3D, zpp=3Dzpp@entry=3D0xfffffe0410f1cbc8, = cr=3D0xfffff80140fb1100, flag=3D, vsecp=3D0x0, mnt_ns=3D0x0) > at /usr/src/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_o= s.c:1146 > #18 0xffffffff81faea57 in zfs_freebsd_create (ap=3D0xfffffe0410f1cda0= ) at /usr/src/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c:4618 > #19 0xffffffff8111aa9a in VOP_MKNOD_APV (vop=3D0xffffffff822e71a0 , a=3Da@entry=3D0xfffffe0410f1cda0) at vnode_if.c:372 > #20 0xffffffff80c50207 in VOP_MKNOD (dvp=3D, cnp=3D0xfff= ffe0410f1cd50, vap=3D0xfffffe0410f1cc20, vpp=3D) at ./vnode_= if.h:188 > #21 kern_mkfifoat (td=3D0xfffffe046acd8e40, fd=3D-100, path=3D0x12772= f073500 , pathseg=3D= UIO_USERSPACE, mode=3D) at /usr/src/sys/kern/vfs_syscalls.c:= 1492 > #22 0xffffffff81049398 in syscallenter (td=3D) at /usr= /src/sys/amd64/amd64/../../kern/subr_syscall.c:190 > #23 amd64_syscall (td=3D0xfffffe046acd8e40, traced=3D0) at /usr/src/s= ys/amd64/amd64/trap.c:1199 > #24 > > Frame 7 is trying to acquire the ZFS teardown inactive lock, which is > held by a process which is performing a ZFS rollback and is waiting for > the transaction to sync: > > #0 sched_switch (td=3Dtd@entry=3D0xfffffe0422ef8560, flags=3Dflags@e= ntry=3D259) at /usr/src/sys/kern/sched_ule.c:2299 > #1 0xffffffff80b5a0a3 in mi_switch (flags=3Dflags@entry=3D259) at /u= sr/src/sys/kern/kern_synch.c:550 > #2 0xffffffff80babcb4 in sleepq_switch (wchan=3D0xfffff8011b83d540, = pri=3D0) at /usr/src/sys/kern/subr_sleepqueue.c:609 > #3 0xffffffff80babb8c in sleepq_wait (wchan=3D, wchan@e= ntry=3D0xfffff8011b83d540, pri=3D, pri@entry=3D0) at /usr/src/= sys/kern/subr_sleepqueue.c:660 > #4 0xffffffff80ad7f75 in _cv_wait (cvp=3Dcvp@entry=3D0xfffff8011b83d= 540, lock=3Dlock@entry=3D0xfffff8011b83d4d0) at /usr/src/sys/kern/kern_cond= var.c:146 > #5 0xffffffff820b42fb in txg_wait_synced_impl (dp=3Ddp@entry=3D0xfff= ff8011b83d000, txg=3D8585097, wait_sig=3Dwait_sig@entry=3D0) at /usr/src/sy= s/contrib/openzfs/module/zfs/txg.c:726 > #6 0xffffffff820b3cab in txg_wait_synced (dp=3D, dp@ent= ry=3D0xfffff8011b83d000, txg=3D) at /usr/src/sys/contrib/openz= fs/module/zfs/txg.c:736 > #7 0xffffffff8206d5b5 in dsl_sync_task_common (pool=3Dpool@entry=3D0= xfffffe0401d15000 "zroot/poudriere/jails/13amd64-default-ref/15", checkfunc= =3D, syncfunc=3D0xffffffff8203fbc0 , sigfunc=3Dsigfunc@entry=3D0x0, arg=3Darg@entry=3D0xfffffe02fb827a90, > blocks_modified=3Dblocks_modified@entry=3D1, space_check=3DZFS_SP= ACE_CHECK_RESERVED, early=3D0) at /usr/src/sys/contrib/openzfs/module/zfs/d= sl_synctask.c:93 > #8 0xffffffff8206d3c7 in dsl_sync_task (pool=3D, pool@e= ntry=3D0xfffffe0401d15000 "zroot/poudriere/jails/13amd64-default-ref/15", c= heckfunc=3D, syncfunc=3D, arg=3D, ar= g@entry=3D0xfffffe02fb827a90, blocks_modified=3D, > blocks_modified@entry=3D1, space_check=3D, space_che= ck@entry=3DZFS_SPACE_CHECK_RESERVED) at /usr/src/sys/contrib/openzfs/module= /zfs/dsl_synctask.c:132 > #9 0xffffffff8204075b in dsl_dataset_rollback (fsname=3D, fsname@entry=3D0xfffffe0401d15000 "zroot/poudriere/jails/13amd64-default= -ref/15", tosnap=3D, owner=3D, result=3Dresul= t@entry=3D0xfffff81c826a9ea0) > at /usr/src/sys/contrib/openzfs/module/zfs/dsl_dataset.c:3261 > #10 0xffffffff82168dd9 in zfs_ioc_rollback (fsname=3D0xfffffe0401d150= 00 "zroot/poudriere/jails/13amd64-default-ref/15", fsname@entry=3D, innvl=3D, innvl@entry= =3D, > outnvl=3D0xfffff81c826a9ea0, outnvl@entry=3D) at /usr/src/sys/contrib/openzfs/module/zfs/zfs= _ioctl.c:4405 > #11 0xffffffff82164522 in zfsdev_ioctl_common (vecnum=3Dvecnum@entry= =3D25, zc=3Dzc@entry=3D0xfffffe0401d15000, flag=3Dflag@entry=3D0) at /usr/s= rc/sys/contrib/openzfs/module/zfs/zfs_ioctl.c:7798 > #12 0xffffffff81f97fca in zfsdev_ioctl (dev=3D, zcmd= =3D, zcmd@entry=3D, arg=3D0xfffffe02fb827d50 "\017", arg@entry=3D, flag=3D, td=3D) > at /usr/src/sys/contrib/openzfs/module/os/freebsd/zfs/kmod_core.c= :168 > #13 0xffffffff809d6212 in devfs_ioctl (ap=3D0xfffffe02fb827c50) at /u= sr/src/sys/fs/devfs/devfs_vnops.c:935 > #14 0xffffffff80c585f2 in vn_ioctl (fp=3D0xfffff8052cdd80f0, com=3D, data=3D0xfffffe02fb827d50, active_cred=3D0xfffff80122ab1e00,= td=3D) at /usr/src/sys/kern/vfs_vnops.c:1704 > #15 0xffffffff809d68ee in devfs_ioctl_f (fp=3D, fp@entry= =3D, com=3D, c= om@entry=3D, data=3D, data@entry=3D, > cred=3D, cred@entry=3D, td=3D, td@entry=3D) at /usr/src/sys/fs/devfs/devfs_vnops.c:866 > #16 0xffffffff80bc57e6 in fo_ioctl (fp=3D0xfffff8052cdd80f0, com=3D32= 22821401, data=3D, active_cred=3D, td=3D0xfffffe0= 422ef8560) at /usr/src/sys/sys/file.h:367 > #17 kern_ioctl (td=3Dtd@entry=3D0xfffffe0422ef8560, fd=3D4, com=3Dcom= @entry=3D3222821401, data=3D, data@entry=3D0xfffffe02fb827d50 = "\017") at /usr/src/sys/kern/sys_generic.c:807 > #18 0xffffffff80bc54f2 in sys_ioctl (td=3D0xfffffe0422ef8560, uap=3D0= xfffffe0422ef8960) at /usr/src/sys/kern/sys_generic.c:715 > #19 0xffffffff81049398 in syscallenter (td=3D) at /usr= /src/sys/amd64/amd64/../../kern/subr_syscall.c:190 > #20 amd64_syscall (td=3D0xfffffe0422ef8560, traced=3D0) at /usr/src/s= ys/amd64/amd64/trap.c:1199 > #21 > > OpenZFS commits in the relevant range: > > commit e639e0d27cc863ba1b8de20e861e6b5d9b922a8e > Merge: 92c23f6d9c20 e61076683850 > Author: Martin Matuska > AuthorDate: Fri May 12 13:12:59 2023 +0200 > Commit: Martin Matuska > CommitDate: Fri May 12 13:13:33 2023 +0200 > > zfs: merge openzfs/zfs@e61076683 > > Notable upstream pull request merges: > #14744 Optimize check_filesystem() and process_error_log() > #14773 Allow zhack label repair to restore detached devices > #14794 zpool import -m also removing spare and cache when log d= evice > is missing > #14805 Simplify and optimize random_int_between() > #14813 Enable the head_errlog feature to remove errors > #14816 Fix two abd_gang_add_gang() issues > #14817 Verify block pointers before writing them out > #14819 Add dmu_tx_hold_append() interface > #14823 Remove single parent assertion from zio_nowait() > #14824 Plug memory leak in zfsdev_state > #14825 Block cloning dbuf fixes > #14828 Remove duplicate code in l2arc_evict() > #14837 Fixes in head_errlog feature with encryption > #14839 Prevent panic during concurrent snapshot rollback and zv= ol read > #14853 zil: Don't expect zio_shrink() to succeed > > Obtained from: OpenZFS > OpenZFS commit: e6107668385044718b0a73330ed6423650806473 > > commit 4d846d260e2b9a3d4d0a701462568268cbfe7a5b > Author: Warner Losh > AuthorDate: Wed May 10 09:40:58 2023 -0600 > Commit: Warner Losh > CommitDate: Fri May 12 10:44:03 2023 -0600 > > spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -Free= BSD > > The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier= . Catch > up to that fact and revert to their recommended match of BSD-2-Cl= ause. > > Discussed with: pfg > MFC After: 3 days > Sponsored by: Netflix > > commit c0a83fe074a375c66ca669bfe1f128fe12b9f377 > Merge: 634a770a5e16 ad0a554614b0 > Author: Martin Matuska > AuthorDate: Tue May 23 11:50:17 2023 +0200 > Commit: Martin Matuska > CommitDate: Tue May 23 11:51:52 2023 +0200 > > zfs: merge openzfs/zfs@ad0a55461 > > Notable upstream pull request merges: > #12355 Teach zpool scrub to scrub only blocks in error log > #14811 Refine special_small_blocks property validation > #14854 zil: Some micro-optimizations > #14855 zil: Free lwb_buf after write completion > #14860 Fixes for issues identified by recent Coverity defect re= ports > #14861 Probe vdevs before marking removed > #14873 Add the ability to uninitialize a zpool > #14875 Hold db_mtx when updating db_state > > Obtained from: OpenZFS > OpenZFS commit: ad0a554614b096698d9969340c4c593690042d5b > > commit 48f52d9179d5920750cef0c5d921db63de4d767d > Author: John Baldwin > AuthorDate: Thu May 25 07:11:38 2023 -0700 > Commit: John Baldwin > CommitDate: Thu May 25 07:11:38 2023 -0700 > > zfs: Fix build on 32-bit platforms after most recent import. > > unsigned long is not a uint64_t on 32-bit platforms. The zfs.4 > manpage documents this variable as a uint, and it is only compare= d > with other variables of type int, so uint_t makes more sense than > unsigned long. > > (I also wasn't sure if ULONG would work as a ZFS_MODULE_PARAM typ= e > on other OS's) > > commit 4e8d558c9d1cf3e7e424e3fb123b01979c3d57f2 > Merge: 5ca7f0294694 feff9dfed3df > Author: Martin Matuska > AuthorDate: Sat Jun 10 19:31:17 2023 +0200 > Commit: Martin Matuska > CommitDate: Sat Jun 10 19:31:17 2023 +0200 > > zfs: merge openzfs/zfs@feff9dfed > > Notable upstream pull request merges: > #14833 Update compatibility.d files > #14841 ZIL: Reduce scope of per-dataset zl_issuer_lock > #14863 zil: Add some more statistics > #14866 btree: Implement faster binary search algorithm > #14894 Fix inconsistent definition of zfs_scrub_error_blocks_pe= r_txg > #14892 Fix concurrent resilvers initiated at same time > #14903 Fix NULL pointer dereference when doing concurrent 'send= ' operations > #14910 ZIL: Allow to replay blocks of any size > #14939 Fix the L2ARC write size calculating logic > #14934 Introduce zfs_refcount_(add|remove)_few() > #14946 Improve l2arc reporting in arc_summary > #14953 Finally drop long disabled vdev cache > #14954 Fix the L2ARC write size calculating logic (2) > #14955 Use list_remove_head() where possible > #14959 ZIL: Fix race introduced by f63811f0721 > > Obtained from: OpenZFS > OpenZFS commit: feff9dfed3df1bbae5dd74959a6ad87d11f27ffb > > commit b7198dcfc03967cba191a373d99df47ee52d6e2a > Merge: 2c7279bae776 10e36e17612b > Author: Martin Matuska > AuthorDate: Fri Jun 16 23:12:27 2023 +0200 > Commit: Martin Matuska > CommitDate: Fri Jun 16 23:13:05 2023 +0200 > > zfs: merge openzfs/zfs@10e36e176 > > Notable upstream pull request merges: > #14948 Remove ARC/ZIO physdone callbacks > #14963 Store the L2ARC device ashift in the vdev label > #14970 Switch refcount tracking from lists to AVL-trees > #14981 Shorten arcstat_quiescence sleep time > > Obtained from: OpenZFS > OpenZFS commit: 10e36e17612ba9c634b140ae76847bb62b5be68f > > commit f190c36b5d45cbfadc922a69d79628c43cdda22f > Merge: 229d643c4dd5 8e8acabdcaeb > Author: Martin Matuska > AuthorDate: Sun Jun 25 10:31:19 2023 +0200 > Commit: Martin Matuska > CommitDate: Sun Jun 25 10:32:42 2023 +0200 > > zfs: merge openzfs/zfs@8e8acabdc > > Notable upstream pull request merges: > #14987 Fix memory leak in zil_parse() > > Obtained from: OpenZFS > OpenZFS commit: 8e8acabdcaeb831c777f71361722f4235b698a8d > > We can't ship 14.0 with this deadlock. > > DES > -- > Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org >