From nobody Sun Oct 08 07:54:41 2023 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 4S3Dw73bHLz4wysx; Sun, 8 Oct 2023 07:54:47 +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 4S3Dw72r2Yz3Csk; Sun, 8 Oct 2023 07:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696751687; 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=xb1HFZIKVMVWz6QfxxDj/2+trxjCGD9+wyQ2kmMj8/s=; b=b86nZiJF3+Ukl8fbn/GSeCifAlvF8atYkRZKOSe0piSpB2wt7y7utwM4HikLbzay0uo15o FFduyr4cB0VMmakTF/ZZVRpZU1fqx3++N1jeVXrfAybaATw7aBhplHvKD8ZK0xfa7YbMjg YrlnihXn0jQaGDSkYT3Xl9YoBYnM9Y0A5TansgkKluvqQuBzEIPt5+rNa2XjX05wReM+kO jjlRmMQ2nSf3nXke9UPfvtHw9r9+NWkUO9CloOLMlsCzzXX0mcPBBdTCdG82mU9MnckONV CTOTvrur+cjkGCXLCLBY06nDtyRNKRZpVV0LHqUERnHWIK4SMK43y7alJvwp0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696751687; a=rsa-sha256; cv=none; b=Up3ZZt3XSjV6t8zwYzSsVEUGxsHA/u3JU8vprGtEmUUdq/4d8lRUvDELQy6BcE10RBz796 V54OF6rcwW6dm7vbE8F8vsvlaT51r/9/SR4ypUptej2QqonP0Ig1zv8YQCdrqOBknNgODU fmTrhUqHeCiw7zFlNI5+v7hDZJd4p2yuOKA8JKDv5146adrSunLo0qdg2jfr35J8ep1/yh MgWsBGXo8bLMtn3IKzJZlljMGiU8m94KIDW2+HcsTA/5HYM3W9b0NHx2XrPNTmiyk+6yXk Y3AHBiv6NQigmN65/iEfhGwQaseMmzreYC0qZLI8D9SfQCR9F9VVTcDDypTpkg== 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=1696751687; 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=xb1HFZIKVMVWz6QfxxDj/2+trxjCGD9+wyQ2kmMj8/s=; b=TU1JXqyYcjI5r5HmiABfJni+9LUktQIuarG7nVZUaGDCvE228iGwULTQ/IyyQ74S3TVnfE Mhjdjefw1GEcAd/OnXZ49ceriUwcYK7v1toRJ2LUJcPNuJ42XbvdJjNL7k7bhaz5+8Ohpd IX2RQO6kMouFLmf6uhNnzlanAS3FRulBBtus3WsyJi4NIVkmrxblhWttZWi3anjbEowW88 DkY8vNL1MKJtjWUBGA3qeuxJUppp+038T96565D7V9ackNIud1eQO7YmfGZfB38nOMlsGe lSvNQtal8+146ZGUbRdXtq0jzfqwTAA489frwd6MZpPPc4D4T5zUCtE6xT2SRA== 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 4S3Dw71mmTz14Qk; Sun, 8 Oct 2023 07:54:47 +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 3987slUk035195; Sun, 8 Oct 2023 07:54:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3987sfTe035183; Sun, 8 Oct 2023 07:54:41 GMT (envelope-from git) Date: Sun, 8 Oct 2023 07:54:41 GMT Message-Id: <202310080754.3987sfTe035183@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: b2526e8bfe51 - main - zfs: merge openzfs/zfs@66b81b349 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: b2526e8bfe513b7d11f4aa0b7a581a17be74374e Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b2526e8bfe513b7d11f4aa0b7a581a17be74374e commit b2526e8bfe513b7d11f4aa0b7a581a17be74374e Merge: 2821a7498f65 66b81b349749 Author: Martin Matuska AuthorDate: 2023-10-08 07:43:15 +0000 Commit: Martin Matuska CommitDate: 2023-10-08 07:43:15 +0000 zfs: merge openzfs/zfs@66b81b349 Notable upstream pull request merges: #15290 54b1b1d89 import: require force when cachefile hostid doesn't match on-disk #15319 342357cd9 Reduce number of metaslab preload taskq threads #15340 2a6c62109 ARC: Remove b_cv from struct l1arc_buf_hdr #15347 75a2eb7fa ARC: Drop different size headers for crypto #15350 96b9cf42e ARC: Remove b_bufcnt/b_ebufcnt from ARC headers #15353 66b81b349 ZIL: Reduce maximum size of WR_COPIED to 7.5K #15362 5b8688e62 zfsconcepts: add description of block cloning Obtained from: OpenZFS OpenZFS commit: 66b81b349749bc1ba11fa277bee860be03315429 sys/contrib/openzfs/.cirrus.yml | 21 ++ sys/contrib/openzfs/.gitignore | 2 +- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 23 +- sys/contrib/openzfs/config/zfs-build.m4 | 3 + .../openzfs/include/os/linux/zfs/sys/trace_arc.h | 12 +- sys/contrib/openzfs/include/sys/arc_impl.h | 10 +- sys/contrib/openzfs/include/sys/metaslab_impl.h | 1 - sys/contrib/openzfs/include/sys/spa_impl.h | 4 +- sys/contrib/openzfs/man/man4/zfs.4 | 11 + sys/contrib/openzfs/man/man7/zfsconcepts.7 | 40 ++- .../openzfs/module/os/freebsd/zfs/sysctl_os.c | 22 -- sys/contrib/openzfs/module/zfs/arc.c | 322 +++++---------------- sys/contrib/openzfs/module/zfs/metaslab.c | 23 +- sys/contrib/openzfs/module/zfs/spa.c | 46 ++- sys/contrib/openzfs/module/zfs/zil.c | 17 +- sys/contrib/openzfs/rpm/generic/zfs.spec.in | 2 +- sys/contrib/openzfs/tests/runfiles/common.run | 4 + .../openzfs/tests/zfs-tests/tests/Makefile.am | 4 + ...ock_cloning_copyfilerange_fallback_same_txg.ksh | 2 + .../cli_root/zpool_import/zpool_import.cfg | 5 + .../cli_root/zpool_import/zpool_import.kshlib | 1 + .../zpool_import/zpool_import_hostid_changed.ksh | 59 ++++ .../zpool_import_hostid_changed_cachefile.ksh | 65 +++++ ...ort_hostid_changed_cachefile_unclean_export.ksh | 75 +++++ .../zpool_import_hostid_changed_unclean_export.ksh | 70 +++++ 25 files changed, 512 insertions(+), 332 deletions(-) diff --cc sys/contrib/openzfs/.cirrus.yml index 000000000000,000000000000..18b292289e20 new file mode 100644 --- /dev/null +++ b/sys/contrib/openzfs/.cirrus.yml @@@ -1,0 -1,0 +1,21 @@@ ++env: ++ CIRRUS_CLONE_DEPTH: 1 ++ ARCH: amd64 ++ ++build_task: ++ matrix: ++ freebsd_instance: ++ image_family: freebsd-12-4 ++ freebsd_instance: ++ image_family: freebsd-13-2 ++ freebsd_instance: ++ image_family: freebsd-14-0-snap ++ prepare_script: ++ - pkg install -y autoconf automake libtool gettext-runtime gmake ksh93 py39-packaging py39-cffi py39-sysctl ++ configure_script: ++ - env MAKE=gmake ./autogen.sh ++ - env MAKE=gmake ./configure --with-config="user" --with-python=3.9 ++ build_script: ++ - gmake -j `sysctl -n kern.smp.cpus` ++ install_script: ++ - gmake install diff --cc sys/contrib/openzfs/.gitignore index 8d91dd9466c5,000000000000..1ef47d921c28 mode 100644,000000..100644 --- a/sys/contrib/openzfs/.gitignore +++ b/sys/contrib/openzfs/.gitignore @@@ -1,88 -1,0 +1,88 @@@ +# +# This is the top-level .gitignore file: +# ignore everything except a list of allowed files. +# +# This is not the place for entries that are specific to +# a subdirectory. Instead add those files to the +# .gitignore file in that subdirectory. +# +# N.B. +# Please use 'git ls-files -i --exclude-standard' +# command after changing this file, to see if there are +# any tracked files which get ignored after the change. + +* + +!.github +!cmd +!config +!contrib +!etc +!include +!lib +!man +!module +!rpm +!scripts +!tests +!udev + +!.github/** +!cmd/** +!config/** +!contrib/** +!etc/** +!include/** +!lib/** +!man/** +!module/** +!rpm/** +!scripts/** +!tests/** +!udev/** + +!.editorconfig ++!.cirrus.yml +!.gitignore +!.gitmodules +!AUTHORS +!autogen.sh +!CODE_OF_CONDUCT.md +!configure.ac +!copy-builtin +!COPYRIGHT +!LICENSE +!Makefile.am +!META +!NEWS +!NOTICE +!README.md +!RELEASES.md +!TEST +!zfs.release.in + - +# +# Normal rules +# +*.[oa] +*.o.ur-safe +*.lo +*.la +*.mod.c +*~ +*.swp +*.gcno +*.gcda +*.pyc +*.pyo +.deps +.libs +.dirstamp +.DS_Store +modules.order +Makefile +Makefile.in +*.patch +*.orig +*.tmp +*.log diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed.ksh index 000000000000,bc82b7cc1ee8..bc82b7cc1ee8 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile.ksh index 000000000000,07c43482d68f..07c43482d68f mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh index 000000000000,dcb1ac1ab69f..dcb1ac1ab69f mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_unclean_export.ksh index 000000000000,ad8cca642dbc..ad8cca642dbc mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_unclean_export.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_unclean_export.ksh