Skip to content

Commit 53a2e26

Browse files
committed
Notable upstream pull request merges: #17058 -multiple Port AVX2 implementation of aes-gcm from BoringSSL #17602 077269b Fix Assert in dbuf_undirty, which triggers during usage zap shrink #17613 d151432 ZIL: Make allocations more flexible #17618 5061f95 Retire zfs_autoimport_disable kmod option #17166 d3c1d27 zdb: better handling for corrupt block pointers #17616 1ccae43 Allow vmem_alloc backed multilists #17619 e0e60d3 Better pack struct zio_prop #17620 152e348 Silence zstd large allocation warning #17622 -multiple ZIL: restore some things lost in "ZIL-crash" review #17625 -multiple zvol: cleanup & fixup zvol destruction sequence and locking #17631 885d929 Fix missed assertion update in physical rewrite patch #17642 a9410cc Make zpool_find_config() report errors #17647 30a915e zfs-send.8: mention combination of -c/-e flags and zstd_compress feature #17649 2c877e8 FreeBSD: Set st_rdev to NODEV, not 0, when not a device (already backported) Obtained from: OpenZFS OpenZFS commit: a9410cc
2 parents 7acae33 + a9410cc commit 53a2e26

File tree

55 files changed

+4519
-776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+4519
-776
lines changed

sys/conf/kern.pre.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,8 @@ ZFS_CFLAGS+= -I$S/contrib/openzfs/module/icp/include \
214214

215215
.if ${MACHINE_ARCH} == "amd64"
216216
ZFS_CFLAGS+= -D__x86_64 -DHAVE_SSE2 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 \
217-
-DHAVE_AVX -DHAVE_AVX2 -DHAVE_AVX512F -DHAVE_AVX512VL -DHAVE_AVX512BW
217+
-DHAVE_AVX -DHAVE_AVX2 -DHAVE_AVX512F -DHAVE_AVX512VL -DHAVE_AVX512BW \
218+
-DHAVE_VAES -DHAVE_VPCLMULQDQ
218219
.endif
219220

220221
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \

sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ case "$OS" in
109109
KSRC="$FREEBSD_SNAP/../amd64/$FreeBSD/src.txz"
110110
;;
111111
freebsd15-0c)
112-
FreeBSD="15.0-CURRENT"
112+
FreeBSD="15.0-PRERELEASE"
113113
OSNAME="FreeBSD $FreeBSD"
114114
OSv="freebsd14.0"
115115
URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz"

sys/contrib/openzfs/.github/workflows/scripts/qemu-4-build-vm.sh

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
#
66
# Usage:
77
#
8-
# qemu-4-build-vm.sh OS [--enable-debug][--dkms][--poweroff]
9-
# [--release][--repo][--tarball]
8+
# qemu-4-build-vm.sh OS [--enable-debug][--dkms][--patch-level NUM]
9+
# [--poweroff][--release][--repo][--tarball]
1010
#
1111
# OS: OS name like 'fedora41'
1212
# --enable-debug: Build RPMs with '--enable-debug' (for testing)
1313
# --dkms: Build DKMS RPMs as well
14+
# --patch-level NUM: Use a custom patch level number for packages.
1415
# --poweroff: Power-off the VM after building
1516
# --release Build zfs-release*.rpm as well
1617
# --repo After building everything, copy RPMs into /tmp/repo
@@ -21,6 +22,7 @@
2122

2223
ENABLE_DEBUG=""
2324
DKMS=""
25+
PATCH_LEVEL=""
2426
POWEROFF=""
2527
RELEASE=""
2628
REPO=""
@@ -35,6 +37,11 @@ while [[ $# -gt 0 ]]; do
3537
DKMS=1
3638
shift
3739
;;
40+
--patch-level)
41+
PATCH_LEVEL=$2
42+
shift
43+
shift
44+
;;
3845
--poweroff)
3946
POWEROFF=1
4047
shift
@@ -215,6 +222,10 @@ function rpm_build_and_install() {
215222
run ./autogen.sh
216223
echo "##[endgroup]"
217224

225+
if [ -n "$PATCH_LEVEL" ] ; then
226+
sed -i -E 's/(Release:\s+)1/\1'$PATCH_LEVEL'/g' META
227+
fi
228+
218229
echo "##[group]Configure"
219230
run ./configure --enable-debuginfo $extra
220231
echo "##[endgroup]"
@@ -328,7 +339,13 @@ fi
328339
# almalinux9.5
329340
# fedora42
330341
source /etc/os-release
331-
sudo hostname "$ID$VERSION_ID"
342+
if which hostnamectl &> /dev/null ; then
343+
# Fedora 42+ use hostnamectl
344+
sudo hostnamectl set-hostname "$ID$VERSION_ID"
345+
sudo hostnamectl set-hostname --pretty "$ID$VERSION_ID"
346+
else
347+
sudo hostname "$ID$VERSION_ID"
348+
fi
332349

333350
# save some sysinfo
334351
uname -a > /var/tmp/uname.txt

sys/contrib/openzfs/.github/workflows/zfs-qemu-packages.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ on:
3232
options:
3333
- "Build RPMs"
3434
- "Test repo"
35+
patch_level:
36+
type: string
37+
required: false
38+
default: ""
39+
description: "(optional) patch level number"
3540
repo_url:
3641
type: string
3742
required: false
@@ -78,7 +83,13 @@ jobs:
7883
mkdir -p /tmp/repo
7984
ssh zfs@vm0 '$HOME/zfs/.github/workflows/scripts/qemu-test-repo-vm.sh' ${{ github.event.inputs.repo_url }}
8085
else
81-
.github/workflows/scripts/qemu-4-build.sh --repo --release --dkms --tarball ${{ matrix.os }}
86+
EXTRA=""
87+
if [ -n "${{ github.event.inputs.patch_level }}" ] ; then
88+
EXTRA="--patch-level ${{ github.event.inputs.patch_level }}"
89+
fi
90+
91+
.github/workflows/scripts/qemu-4-build.sh $EXTRA \
92+
--repo --release --dkms --tarball ${{ matrix.os }}
8293
fi
8394
8495
- name: Prepare artifacts

sys/contrib/openzfs/.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
# These maps are making names consistent where they have varied but the email
2424
# address has never changed. In most cases, the full name is in the
2525
# Signed-off-by of a commit with a matching author.
26+
Achill Gilgenast <[email protected]>
2627
Ahelenia Ziemiańska <[email protected]>
2728
Ahelenia Ziemiańska <[email protected]>
2829
Alex John <[email protected]>
@@ -37,6 +38,7 @@ Crag Wang <[email protected]>
3738
Damian Szuberski <[email protected]>
3839
Daniel Kolesa <[email protected]>
3940
Debabrata Banerjee <[email protected]>
41+
Diwakar Kristappagari <[email protected]>
4042
Finix Yan <[email protected]>
4143
Gaurav Kumar <[email protected]>
4244
Gionatan Danti <[email protected]>
@@ -145,6 +147,7 @@ Gaurav Kumar <[email protected]> <[email protected]>
145147
146148
147149
150+
148151
Gian-Carlo DeFazio <[email protected]> <[email protected]>
149152
Giuseppe Di Natale <[email protected]> <[email protected]>
150153
@@ -164,6 +167,7 @@ John Ramsden <[email protected]> <[email protected]>
164167
Jonathon Fernyhough <[email protected]> <[email protected]>
165168
166169
170+
167171
168172
169173

sys/contrib/openzfs/AUTHORS

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ PAST MAINTAINERS:
1010
CONTRIBUTORS:
1111

1212
Aaron Fineman <[email protected]>
13+
Achill Gilgenast <[email protected]>
1314
Adam D. Moss <[email protected]>
1415
Adam Leventhal <[email protected]>
1516
Adam Stevko <[email protected]>
@@ -59,6 +60,7 @@ CONTRIBUTORS:
5960
Andreas Buschmann <[email protected]>
6061
Andreas Dilger <[email protected]>
6162
Andreas Vögele <[email protected]>
63+
6264
Andrew Barnes <[email protected]>
6365
Andrew Hamilton <[email protected]>
6466
Andrew Innes <[email protected]>
@@ -72,6 +74,7 @@ CONTRIBUTORS:
7274
Andrey Prokopenko <[email protected]>
7375
Andrey Vesnovaty <[email protected]>
7476
Andriy Gapon <[email protected]>
77+
Andriy Tkachuk <[email protected]>
7578
Andy Bakun <[email protected]>
7679
Andy Fiddaman <[email protected]>
7780
Aniruddha Shankar <[email protected]>
@@ -120,6 +123,7 @@ CONTRIBUTORS:
120123
Caleb James DeLisle <[email protected]>
121124
Cameron Harr <[email protected]>
122125
Cao Xuewen <[email protected]>
126+
Carl George <[email protected]>
123127
Carlo Landmeter <[email protected]>
124128
Carlos Alberto Lopez Perez <[email protected]>
125129
Cedric Maunoury <[email protected]>
@@ -200,6 +204,7 @@ CONTRIBUTORS:
200204
Dimitri John Ledkov <[email protected]>
201205
Dimitry Andric <[email protected]>
202206
Dirkjan Bussink <[email protected]>
207+
Diwakar Kristappagari <[email protected]>
203208
Dmitry Khasanov <[email protected]>
204209
Dominic Pearson <[email protected]>
205210
Dominik Hassler <[email protected]>
@@ -250,6 +255,7 @@ CONTRIBUTORS:
250255
George Wilson <[email protected]>
251256
Georgy Yakovlev <[email protected]>
252257
Gerardwx <[email protected]>
258+
Germano Massullo <[email protected]>
253259
Gian-Carlo DeFazio <[email protected]>
254260
Gionatan Danti <[email protected]>
255261
Giuseppe Di Natale <[email protected]>
@@ -287,6 +293,7 @@ CONTRIBUTORS:
287293
288294
Igor Kozhukhov <[email protected]>
289295
Igor Lvovsky <[email protected]>
296+
Igor Ostapenko <[email protected]>
290297
ilbsmart <[email protected]>
291298
Ilkka Sovanto <[email protected]>
292299
illiliti <[email protected]>
@@ -326,6 +333,7 @@ CONTRIBUTORS:
326333
Jinshan Xiong <[email protected]>
327334
Jitendra Patidar <[email protected]>
328335
JK Dingwall <[email protected]>
336+
Joel Low <[email protected]>
329337
Joe Stein <[email protected]>
330338
John-Mark Gurney <[email protected]>
331339
John Albietz <[email protected]>
@@ -374,6 +382,7 @@ CONTRIBUTORS:
374382
Kevin Jin <[email protected]>
375383
Kevin P. Fleming <[email protected]>
376384
Kevin Tanguy <[email protected]>
385+
khoang98 <[email protected]>
377386
KireinaHoro <[email protected]>
378387
Kjeld Schouten-Lebbing <[email protected]>
379388
Kleber Tarcísio <[email protected]>
@@ -447,6 +456,7 @@ CONTRIBUTORS:
447456
Max Zettlmeißl <[email protected]>
448457
Md Islam <[email protected]>
449458
459+
Meriel Luna Mittelbach <[email protected]>
450460
Michael D Labriola <[email protected]>
451461
Michael Franzl <[email protected]>
452462
Michael Gebetsroither <[email protected]>
@@ -494,6 +504,7 @@ CONTRIBUTORS:
494504
Orivej Desh <[email protected]>
495505
Pablo Correa Gómez <[email protected]>
496506
Palash Gandhi <[email protected]>
507+
Patrick Fasano <[email protected]>
497508
Patrick Mooney <[email protected]>
498509
Patrik Greco <[email protected]>
499510
Paul B. Henson <[email protected]>
@@ -535,6 +546,7 @@ CONTRIBUTORS:
535546
Remy Blank <[email protected]>
536547
renelson <[email protected]>
537548
Reno Reckling <[email protected]>
549+
René Wirnata <[email protected]>
538550
Ricardo M. Correia <[email protected]>
539551
Riccardo Schirone <[email protected]>
540552
Richard Allen <[email protected]>
@@ -640,6 +652,7 @@ CONTRIBUTORS:
640652
tleydxdy <[email protected]>
641653
Tobin Harding <[email protected]>
642654
Todd Seidelmann <[email protected]>
655+
Todd Zullinger <[email protected]>
643656
Tom Caputi <[email protected]>
644657
Tom Matthews <[email protected]>
645658
Tomohiro Kusumi <[email protected]>

sys/contrib/openzfs/META

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ Release: 1
66
Release-Tags: relext
77
License: CDDL
88
Author: OpenZFS
9-
Linux-Maximum: 6.15
9+
Linux-Maximum: 6.16
1010
Linux-Minimum: 4.18

0 commit comments

Comments
 (0)