zfs: Fix an improperly resolved merge conflict

Approved by: so
Fixes: 8838c650cb59 ("Fix use-after-free in btree code")

Fix use-after-free in btree code

Coverty static analysis found these.

Reviewed-by: Alexander Motin <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Neal Gompa <ng

Fix use-after-free in btree code

Coverty static analysis found these.

Reviewed-by: Alexander Motin <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Neal Gompa <[email protected]>
Signed-off-by: Richard Yao <[email protected]>
Closes #10989
Closes #13861

Approved by: so
Security: FreeBSD-EN-22:21.zfs

(cherry picked from commit 8131a96544fd19411c23424af85140e91e41c001)

show more ...

zfs: Fix a pair of bugs in zfs_fhtovp()

This cherry-picks upstream ed566bf1cd0bdbf85e8c63c1c119e3d2ef5db1f6

- Add a zfs_exit() call in an error path, otherwise a lock is
leaked.
- Rem

zfs: Fix a pair of bugs in zfs_fhtovp()

This cherry-picks upstream ed566bf1cd0bdbf85e8c63c1c119e3d2ef5db1f6

- Add a zfs_exit() call in an error path, otherwise a lock is
leaked.
- Remove the fid_gen > 1 check. That appears to be Linux-specific:
zfsctl_snapdir_fid() sets fid_gen to 0 or 1 depending on whether
the snapshot directory is mounted. On FreeBSD it fails, making
snapshot dirs inaccessible via NFS.

Approved by: so
PR: 266236
Security: FreeBSD-EN-22:24.zfs

(cherry picked from commit 6fe0a6c80a1aff14236924eb33e4013aa8c14f91)
(cherry picked from commit 562c9ac58c7678b13f52b0bfe63148e40d7bf63d)

show more ...

zlib: Fix a bug when getting a gzip header extra field with inflate().

If the extra field was larger than the space the user provided with
inflateGetHeader(), and if multiple calls of inflate() deli

zlib: Fix a bug when getting a gzip header extra field with inflate().

If the extra field was larger than the space the user provided with
inflateGetHeader(), and if multiple calls of inflate() delivered
the extra header data, then there could be a buffer overflow of the
provided space. This commit assures that provided space is not
exceeded.

(cherry picked from zlib commit eff308af425b67093bab25f80f1ae950166bece1)
(cherry picked from zlib commit 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d)

(cherry picked from commit dc3509f1aafcd966f3dd9226115cf94b691ff3c7)
(cherry picked from commit 2969066f73fc67a614144ac09b9f3f5291937fed)
(cherry picked from commit 10cc2bf5f7a592981ee00d22eb13e100beed1e64)

Approved by: so
Security: CVE-2022-37434

show more ...

sys/contrib/zlib: Always define Z_U8 and Z_U4

This is a temporary hack for zlib to make sure that the library
still builds when building with Z_SOLO (used in kernel and loader),
as zlib is depending

sys/contrib/zlib: Always define Z_U8 and Z_U4

This is a temporary hack for zlib to make sure that the library
still builds when building with Z_SOLO (used in kernel and loader),
as zlib is depending on limits.h which is only available in STDC
case.

PR: kern/262977
MFC after: 3 days

(cherry picked from commit 0a21252adf11f7e839eabeb530e75cd1f9cd5386)

Approved by: re (gjb, early MFC)

(cherry picked from commit 9587a10b420f9ef243f578b6938662ff6b558e86)

Approved by: re (gjb)

show more ...

MFV 7b495a2a7abf (zlib): Correct incorrect inputs provided to the CRC
functions.

MFC after: 3 days

(cherry picked from commit c61bc1110c90cb67a60cb08c4f3bc24f75d0b385)
(cherry picked from commit 6b

MFV 7b495a2a7abf (zlib): Correct incorrect inputs provided to the CRC
functions.

MFC after: 3 days

(cherry picked from commit c61bc1110c90cb67a60cb08c4f3bc24f75d0b385)
(cherry picked from commit 6b0e0c9e9534149d932fc8b71d1d21a09fe31ffc)

Approved by: re (gjb)

show more ...

MFV c144cc54795d: zlib 1.2.12.

MFC after: 3 days
Relnotes: yes

(cherry picked from commit cd8822075a38d0734e74b1735e4b5dbef9789170)
(cherry picked from commit 6349675deca1fbe704086287bdd94194041079

MFV c144cc54795d: zlib 1.2.12.

MFC after: 3 days
Relnotes: yes

(cherry picked from commit cd8822075a38d0734e74b1735e4b5dbef9789170)
(cherry picked from commit 6349675deca1fbe704086287bdd941940410799c)

Approved by: re (gjb)

show more ...

iwlwifi: adjust the LinuxKPI pci return for now

Rather than having LinuxKPI return BUS_PROBE_DEFAULT, return
"one less" so that on conflict of IDs others would be preferred.

This means that iwm(4)

iwlwifi: adjust the LinuxKPI pci return for now

Rather than having LinuxKPI return BUS_PROBE_DEFAULT, return
"one less" so that on conflict of IDs others would be preferred.

This means that iwm(4) will attach instead of iwlwifi(4) for the
chipsets iwm(4) supports and iwlwifi(4) only for the other--in iwm(4)
unsupported--chipsets. This is done so that we can enable auto-loading
of drivers but for the upcoming 13.1-Release people with working iwm(4)
will not yet be affected by iwlwifi(4).

Sponsored by: The FreeBSD Foundation
Approved by: re (gjb)

(cherry picked from commit 3d248a914d923b444f72fb27ba621c0ab2ef464e)
(cherry picked from commit fd2c8fe44cfae7ced0ae3d142038dc71e537dbd4)

show more ...

zfs: merge openzfs/zfs@52bad4f23 (zfs-2.1-release) into stable/13

OpenZFS release 2.1.4

Notable upstream pull request merges:
#13219 FreeBSD: add missing replay check to an assert in zfs_xvattr_s

zfs: merge openzfs/zfs@52bad4f23 (zfs-2.1-release) into stable/13

OpenZFS release 2.1.4

Notable upstream pull request merges:
#13219 FreeBSD: add missing replay check to an assert in zfs_xvattr_set
#13220 module: freebsd: avoid a taking a destroyed lock in zfs_zevent bits
#13221 Fix ACL checks for NFS kernel server

Obtained from: OpenZFS
OpenZFS tag: zfs-2.1.4
OpenZFS commit: 52bad4f23daaa5f827f802c8d05785a27b80275d
Relnotes: yes
Approved by: re (gjb)

(cherry picked from commit c088e4d539e4cc947896a3b156646b831d932539)

show more ...

zfs: merge openzfs/zfs@ef83e07db (zfs-2.1-release) into releng/13.1

OpenZFS release 2.1.3

Notable upstream pull request merges:
#12569 FreeBSD: Really zero the zero page
#12828 FreeBSD: Add vop

zfs: merge openzfs/zfs@ef83e07db (zfs-2.1-release) into releng/13.1

OpenZFS release 2.1.3

Notable upstream pull request merges:
#12569 FreeBSD: Really zero the zero page
#12828 FreeBSD: Add vop_standard_writecount_nomsyn
#12828 zfs: Fix a deadlock between page busy and the teardown lock
#12828 FreeBSD: Catch up with more VFS changes
#12851 FreeBSD: Provide correct file generation number
#12857 Verify dRAID empty sectors
#12874 FreeBSD: Update argument types for VOP_READDIR
#12896 Reduce number of arc_prune threads
#12934 FreeBSD: Fix zvol_*_open() locking
#12961 FreeBSD: Fix leaked strings in libspl mnttab
#12964 Fix handling of errors from dmu_write_uio_dbuf() on FreeBSD
#12981 Introduce a flag to skip comparing the local mac when
raw sending
#12985 Avoid memory allocations in the ARC eviction thread
#13014 Report dnodes with faulty bonuslen
#13016 FreeBSD: Fix zvol_cdev_open locking
#13027 Fix clearing set-uid and set-gid bits on a file when
replying a write
#13031 Add enumerated vdev names to 'zpool iostat -v' and
'zpool list -v'
#13074 Enable encrypted raw sending to pools with greater ashift
#13076 Receive checks should allow unencrypted child datasets
#13098 Avoid dirtying the final TXGs when exporting a pool
#13172 Fix ENOSPC when unlinking multiple files from full pool

Obtained from: OpenZFS
OpenZFS commit: ef83e07db53e5d1017d3afbf376f4dbb2f6feada
OpenZFS tag: zfs-2.1.3
Relnotes: yes

(cherry picked from commit bd2e56ef47d5a2c69f6f8e092abfd27a4d469d1e)

Approved by: re (delphij)

show more ...

ice_ddp: Update to 1.3.27.0

This is intended to be used with forthcoming ice(4) driver version 1.34.2.

Signed-off-by: Eric Joyner <[email protected]>

Sponsored by: Intel Corporation

(cherry picked

ice_ddp: Update to 1.3.27.0

This is intended to be used with forthcoming ice(4) driver version 1.34.2.

Signed-off-by: Eric Joyner <[email protected]>

Sponsored by: Intel Corporation

(cherry picked from commit e438f0a97538bf5cf6f3ff70a65c4d1f96b766aa)

show more ...

ice_ddp: Update to 1.3.24.0

This version is intended to be used with the 0.29.4 version of the
ice(4) driver, which will be be committed afterwards.

Signed-off-by: Eric Joyner <[email protected]>

Re

ice_ddp: Update to 1.3.24.0

This version is intended to be used with the 0.29.4 version of the
ice(4) driver, which will be be committed afterwards.

Signed-off-by: Eric Joyner <[email protected]>

Reviewed by: stallamr_netapp.com
Sponsored by: Intel Corporation
Differential Revision: https://reviews.freebsd.org/D30887

(cherry picked from commit 538ef055b7ea11326ba22197537e617587a0d677)
(cherry picked from commit 070f7812da16b692d4e65fdfd418654fdb42729d)

show more ...

iwlwifi: update firmware

Update to the latest firmware based on
linux-firmware at c53073d4e1485ac9f7cb065db466793c495aead7
and update firmware module Makefiles accordingly.

Sponsored by: The FreeBS

iwlwifi: update firmware

Update to the latest firmware based on
linux-firmware at c53073d4e1485ac9f7cb065db466793c495aead7
and update firmware module Makefiles accordingly.

Sponsored by: The FreeBSD Foundation

(cherry picked from commit 062103fc93c308dec65a183c51dc7f53b8c76e6d)

show more ...

iwlwifi: enhance debug information

Add a string of the debug type to the output of the debug message so it
is easier to search for specific events in a trace with lots of debugging
on. While here r

iwlwifi: enhance debug information

Add a string of the debug type to the output of the debug message so it
is easier to search for specific events in a trace with lots of debugging
on. While here remove superflous ().

Sponsored by: The FreeBSD Foundation

(cherry picked from commit 51152e5e6150746ad5514f169c8fd1d04b010b35)

show more ...

iwlwifi: update from iwlwifi-next

Import new code from iwlwifi-next at cb0a1fb7fd86b0062692b5056ca8552906509512
(matching tag: iwlwifi-next-for-kalle-2022-02-18).

Also add files not previously impo

iwlwifi: update from iwlwifi-next

Import new code from iwlwifi-next at cb0a1fb7fd86b0062692b5056ca8552906509512
(matching tag: iwlwifi-next-for-kalle-2022-02-18).

Also add files not previously imported because we are not yet compiling
them to ease updating and having them when needed.

This adds MEI (Management Engine) support upstream which we cannot import
(currently GPL-only) so we have stub functions for the missing bits.

This also reduces the diff to upstream. Changes submitted to avoid
problems with const and with void * arithmetics were merged.

In the module build Makefile disable CONFIG_IWLWIFI_OPMODE_MODULAR
as we are building iwlwifi as a single module.

Sponsored by: The FreeBSD Foundation

(cherry picked from commit d9836fb4b9380e2ed1c38455fb31a3832b452671)

show more ...

LinuxKPI: update 802.11 headers

Add new defines, struct members, and (stub) functions needed for an
updated iwlwifi. Most of the defines are for rfkill or HE.

Pull in a case statement from the upc

LinuxKPI: update 802.11 headers

Add new defines, struct members, and (stub) functions needed for an
updated iwlwifi. Most of the defines are for rfkill or HE.

Pull in a case statement from the upcoming iwlwifi update to
not break the build.

Sponsored by: The FreeBSD Foundation

(cherry picked from commit d875aa1587ce7d1651cabe395ed991f2384795cd)
(cherry picked from commit 9ad210c15933e5a49c51fba134e77d84cfdba94f)

show more ...

ena: merge ena-com v2.5.0 upgrade

Merge commit '2530eb1fa01bf28fbcfcdda58bd41e055dcb2e4a'

Adjust the driver to the upgraded ena-com part twofold:

First update is related to the driver's NUMA aware

ena: merge ena-com v2.5.0 upgrade

Merge commit '2530eb1fa01bf28fbcfcdda58bd41e055dcb2e4a'

Adjust the driver to the upgraded ena-com part twofold:

First update is related to the driver's NUMA awareness.

Allocate I/O queue memory in NUMA domain local to the CPU bound to the
given queue, improving data access time. Since this can result in
performance hit for unaware users, this is done only when RSS
option is enabled, for other cases the driver relies on kernel to
allocate memory by itself.

Information about first CPU bound is saved in adapter structure, so
the binding persists after bringing the interface down and up again.

If there are more buckets than interface queues, the driver will try to
bind different interfaces to different CPUs using round-robin algorithm
(but it will not bind queues to CPUs which do not have any RSS buckets
associated with them). This is done to better utilize hardware
resources by spreading the load.

Add (read-only) per-queue sysctls in order to provide the following
information:
- queueN.domain: NUMA domain associated with the queue
- queueN.cpu: CPU affinity of the queue

The second change is for the CSUM_OFFLOAD constant, as ENA platform
file has removed its definition. To align to that change, it has been
added to the ena_datapath.h file.

Submitted by: Artur Rojek <[email protected]>
Submitted by: Dawid Gorecki <[email protected]>
Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit eb4c4f4a2e18659b67a6bf1ea5f473c7ed8c854f)

show more ...

Fix handling of errors from dmu_write_uio_dbuf() on FreeBSD

FreeBSD's implementation of zfs_uio_fault_move() returns EFAULT when a
page fault occurs while copying data in or out of user buffers. Th

Fix handling of errors from dmu_write_uio_dbuf() on FreeBSD

FreeBSD's implementation of zfs_uio_fault_move() returns EFAULT when a
page fault occurs while copying data in or out of user buffers. The VFS
treats such errors specially and will retry the I/O operation (which may
have made some partial progress).

When the FreeBSD and Linux implementations of zfs_write() were merged,
the handling of errors from dmu_write_uio_dbuf() changed such that
EFAULT is not handled as a partial write. For example, when appending
to a file, the z_size field of the znode is not updated after a partial
write resulting in EFAULT.

Restore the old handling of errors from dmu_write_uio_dbuf() to fix
this. This should have no impact on Linux, which has special handling
for EFAULT already.

Reviewed-by: Andriy Gapon <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Signed-off-by: Mark Johnston <[email protected]>
Closes #12964
(cherry picked from commit 063daa8350d4a78f96d1ee6550910363fd3756fb)

show more ...

Avoid memory allocations in the ARC eviction thread

When the eviction thread goes to shrink an ARC state, it allocates a set
of marker buffers used to hold its place in the state's sublists.

This c

Avoid memory allocations in the ARC eviction thread

When the eviction thread goes to shrink an ARC state, it allocates a set
of marker buffers used to hold its place in the state's sublists.

This can be problematic in low memory conditions, since
1) the allocation can be substantial, as we allocate NCPU markers;
2) on at least FreeBSD, page reclamation can block in
arc_wait_for_eviction()

In particular, in stress tests it's possible to hit a deadlock on
FreeBSD when the number of free pages is very low, wherein the system is
waiting for the page daemon to reclaim memory, the page daemon is
waiting for the ARC eviction thread to finish, and the ARC eviction
thread is blocked waiting for more memory.

Try to reduce the likelihood of such deadlocks by pre-allocating markers
for the eviction thread at ARC initialization time. When evicting
buffers from an ARC state, check to see if the current thread is the ARC
eviction thread, and use the pre-allocated markers for that purpose
rather than dynamically allocating them.

Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Alexander Motin <[email protected]>
Reviewed-by: George Amanakis <[email protected]>
Signed-off-by: Mark Johnston <[email protected]>
Closes #12985
(cherry picked from commit 6e2a59181e286a397d260fa9f140b58688d60c58)

show more ...

ngatm: remove one of doubled semicolons

Discussed with: harti

(cherry picked from commit 0637070b5bca4691bf54c5985a74f4d7888050dc)