From nobody Sat May 31 13:44:06 2025 X-Original-To: dev-commits-src-main@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 4b8hCq6SqWz5x49g; Sat, 31 May 2025 13:44:07 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8hCq2FbWz3R3F; Sat, 31 May 2025 13:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748699047; 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=RdrNooZxIqgaP72NnFBThb2Fr5Tb3NO0+RkK1e8RLOg=; b=XrB4/dfiz/49qAwdTNBKY7unH7ey87EW++01ylkJmad4lTC6YqFX865rdNjtPjCjlviddf 0pFe/6zg7V1mxykjWHO/5v2dBJwzYAwJx2sjlUdnnKgiVdzlE7V0CWAwPP5ouNzCWyXBWf t67qc8zhqoeB4ceHBzpRFfk3NTKH0dlBHSLgtl90WDMw+pfYECOVzJxli4gsYsIxrrhHLt d2cfoQIf9O9mQah65cbaMN/Q1H6VdhYbEVqtjilCZ9tr1n+lSkooMGU0hn1OKUCt5TZain xhZb5jgY2ETqnndZemUJ+bhqmFbkMemo+2cu/15Nxc2K9Lf6bienzoS+Y0nXzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748699047; 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=RdrNooZxIqgaP72NnFBThb2Fr5Tb3NO0+RkK1e8RLOg=; b=usmoFGtHFcGoLsLzEzRqfptMjEbuhAq9fTJVD5Pl6RXNCYpmKCn+vbrJGEJ2FRwsnGs9KC tLoY1pegNv7N+apife7uJrKkaqlJ9L8RbD1IRqS52csgt1IpSrI7qdF06TAWdecOvrROou /mvSFtDfpSOAH/Qcyh+xnLIdfH839tNNhOMWLAGiDuP//mAAdNWRIAEF/Zj01wdlHbXygF WlUEJFdBEYiH1HDL+znOHSDHkZHvPGenIIzFOfJ9vhLMXUyHqyUYkpBYwdDQiGEoiyhrl0 erwFE0XtaLGGGE9zecCmuSt8TLAvrYQHYfkNg4unsKFa8cZLsQmGmAeSjUJhbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748699047; a=rsa-sha256; cv=none; b=sZ3QQJdeYlkmmoN4iiAUeHBkMnIjSIFX5kw+DuO40N6cA14fBmuT214lkUfK+hK9Uh6uZG oVVw8uKmrYXEODavH5fKwsV4OUTxz340Je+dTgIbKa5+7jkA9+dBcjNjhVFpi9NUi9jqq7 tYZquEnI4o+jLofDAwsUF4f/Qg1mrFIewvWL9oRncmoQ8u5yMyeqfm1X6w3WeKlizaobPt BnuP5KEBIS9+aGM9KfM5RraM71IUv7xcqy3XIfBMaey4+pFt4q+dkRgcNC64OhgBYOOkQW OCg5T0eoSS0U83zrsxHIWa+4byokHo75Bm6wfD90YgGaJvVEjV9xnAKMVkbrYQ== 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 4b8hCq1W05zgn2; Sat, 31 May 2025 13:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54VDi71T034996; Sat, 31 May 2025 13:44:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VDi6Wt034993; Sat, 31 May 2025 13:44:06 GMT (envelope-from git) Date: Sat, 31 May 2025 13:44:06 GMT Message-Id: <202505311344.54VDi6Wt034993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 3747329b7864 - main - zfs: merge openzfs/zfs@e8e602d98 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3747329b7864d0f98a0e34dda0113804ab3a2dce Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=3747329b7864d0f98a0e34dda0113804ab3a2dce commit 3747329b7864d0f98a0e34dda0113804ab3a2dce Merge: d00a98d639ca e8e602d987b0 Author: Martin Matuska AuthorDate: 2025-05-31 15:41:12 +0000 Commit: Martin Matuska CommitDate: 2025-05-31 15:41:12 +0000 zfs: merge openzfs/zfs@e8e602d98 Notable upstream pull request merges: #17381 44e326689 events: include zio type in IO error reports #17395 008c9666e Set spa_final_txg in spa_unload() #17394 1bd225ed8 abd_os: move headers from libzpool to libspl #17399 5764e218b vdev_disk: remove classic IO submission #17400 b3b3cd1e4 vdev: skip faulting disks pending removal #17406 a38376b37 Rename zvol kernel module parameters sysctls on FreeBSD side #17407 2d33c8edb Make rewrite use Uncached I/O Obtained from: OpenZFS OpenZFS commit: e8e602d987b01e7940f698d5fa2b00754609c74b .../.github/workflows/scripts/qemu-2-start.sh | 15 +- .../.github/workflows/scripts/qemu-3-deps-vm.sh | 6 +- .../.github/workflows/scripts/qemu-4-build-vm.sh | 2 +- .../.github/workflows/scripts/qemu-6-tests.sh | 7 + .../.github/workflows/zfs-qemu-packages.yml | 2 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 8 +- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 12 +- sys/contrib/openzfs/config/Rules.am | 3 +- sys/contrib/openzfs/include/sys/fm/fs/zfs.h | 1 + sys/contrib/openzfs/include/sys/zio.h | 1 - sys/contrib/openzfs/include/zfs_valstr.h | 1 + sys/contrib/openzfs/lib/libspl/include/Makefile.am | 2 + .../{libzpool => libspl}/include/sys/abd_impl_os.h | 0 .../lib/{libzpool => libspl}/include/sys/abd_os.h | 0 sys/contrib/openzfs/lib/libzfs/libzfs.abi | 7 + sys/contrib/openzfs/lib/libzpool/Makefile.am | 2 - .../openzfs/lib/libzpool/include/Makefile.am | 4 - sys/contrib/openzfs/man/man4/zfs.4 | 18 +- sys/contrib/openzfs/man/man8/zpool-events.8 | 59 ++++- .../openzfs/module/os/linux/zfs/vdev_disk.c | 281 +-------------------- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 6 +- sys/contrib/openzfs/module/zcommon/zfs_valstr.c | 11 + sys/contrib/openzfs/module/zfs/spa.c | 6 + sys/contrib/openzfs/module/zfs/vdev.c | 5 +- sys/contrib/openzfs/module/zfs/zfs_fm.c | 2 + sys/contrib/openzfs/module/zfs/zfs_vnops.c | 2 +- sys/contrib/openzfs/module/zfs/zio.c | 52 ++-- sys/contrib/openzfs/module/zfs/zvol.c | 6 +- sys/contrib/openzfs/tests/zfs-tests/cmd/ereports.c | 1 + .../openzfs/tests/zfs-tests/include/tunables.cfg | 2 +- .../functional/direct/dio_async_fio_ioengines.ksh | 25 +- .../zfs-tests/tests/functional/io/io_uring.ksh | 7 - 32 files changed, 156 insertions(+), 400 deletions(-)