[Midnightbsd-cvs] [MidnightBSD/src] 094594: monitor: fix cb restore when monitored adapter unr...

Tue Jun 27 10:56:56 EDT 2023

  Branch: refs/heads/master
  Home:   https://github.com/MidnightBSD/src
  Commit: 0945947a0bc547b02f4797f6574eafbf3384cd4e
      https://github.com/MidnightBSD/src/commit/0945947a0bc547b02f4797f6574eafbf3384cd4e
  Author: Vincenzo Maffione <vmaffione at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/netmap/netmap_monitor.c

  Log Message:
  -----------
  monitor: fix cb restore when monitored adapter unregisters

netmap_monitor_stop() called nm_monitor_none() after the head of
the zero-copy monitors had been reset, thus thinking that there
was nothing left to do.

MFC after:	7 days

(cherry picked from commit b41818a28a6dba6d33076fbb789442308e57a124)

  Commit: 13d2e543ca103608452ff1f217e92ee036d9b5d1
      https://github.com/MidnightBSD/src/commit/13d2e543ca103608452ff1f217e92ee036d9b5d1
  Author: Vincenzo Maffione <vmaffione at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/netmap/netmap_kern.h

  Log Message:
  -----------
  debug_put_get: don't crash on null pointers

MFC after:	7 days

(cherry picked from commit 92e8b4a6301cc4ff4481e981c95c5b30b2a44506)

  Commit: 53c0e3359aedfac6b6df1dd4e030584d6e587161
      https://github.com/MidnightBSD/src/commit/53c0e3359aedfac6b6df1dd4e030584d6e587161
  Author: Vincenzo Maffione <vmaffione at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/netmap/netmap_monitor.c

  Log Message:
  -----------
  netmap: monitor: add missing netmap_adapter_put()

MFC after:	7 days

(cherry picked from commit 95fc11577d117327e7d99a589e86ba15d0599654)

  Commit: 431499d859d2f2246af6524d9d16d304d28f8045
      https://github.com/MidnightBSD/src/commit/431499d859d2f2246af6524d9d16d304d28f8045
  Author: Vincenzo Maffione <vmaffione at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M tools/tools/netmap/pkt-gen.c

  Log Message:
  -----------
  netmap: pkt-gen: fix ifname before cmp in source_hwaddr

In source_hwaddr(), the configured ifname is compared against all
interfaces. However, in main(), the string 'netmap:' is prepended to the
interface string if no explicit type is given. Therefore the ifname will
not match any system interface and the source MAC address is always
empty.

Check for the leading 'netmap:' string and skip past it to match against
system interfaces. Note that 'tap:' and 'pcap:' devices strip the type
string from the ifname in main() so no further work is needed.

MFC after:	7 days
Submitted by:	Brian Poole <brian90013 at gmail.com>

(cherry picked from commit eda82511883f540cd18f8afd2268636c7db97685)

  Commit: 4a96450e20dca0ad764a03881fcdf4c390b65e50
      https://github.com/MidnightBSD/src/commit/4a96450e20dca0ad764a03881fcdf4c390b65e50
  Author: Vincenzo Maffione <vmaffione at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/netmap/netmap_monitor.c
    M sys/net/netmap.h

  Log Message:
  -----------
  netmap: monitor: add a flag to distinguish packet direction

The netmap monitor intercepts any TX/RX packets on the monitored
port. However, before this change there was no way to tell
whether an intercepted packet was being transmitted or received
on the monitored port.
A TXMON flag in the netmap slot has been added for this purpose.

(cherry picked from commit 660a47cb991d5a7ca69cd8dd9c09a5288d49e405)

  Commit: 43ea54ee526cf680b5d2918a5ad64e170d3af416
      https://github.com/MidnightBSD/src/commit/43ea54ee526cf680b5d2918a5ad64e170d3af416
  Author: Vincenzo Maffione <vmaffione at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/netmap/netmap_vale.c

  Log Message:
  -----------
  netmap: vale: fix disabled logs

MFC after:	1 week

(cherry picked from commit 06f6997eb5fd0d91560b9eec0f842214c21856e8)

  Commit: 00b0c6903ae9d2538268e7e7685f03822a7f27b2
      https://github.com/MidnightBSD/src/commit/00b0c6903ae9d2538268e7e7685f03822a7f27b2
  Author: Vincenzo Maffione <vmaffione at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/netmap/netmap_mem2.c

  Log Message:
  -----------
  netmap: don't use linux type struct device *

Such type cannot be used in code that is in common between
FreeBSD and Linux. Use the FreeBSD type instead.

MFC after:	3 days
Reported by:	markj
Differential Revision:	https://reviews.freebsd.org/D29677

(cherry picked from commit 70275a6735df8a514f48be77418491f2f8dba817)

  Commit: 61f78320c29cd519a1ef0d7518d8d33f29a84882
      https://github.com/MidnightBSD/src/commit/61f78320c29cd519a1ef0d7518d8d33f29a84882
  Author: Vincenzo Maffione <vmaffione at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M tools/tools/netmap/pkt_hash.c

  Log Message:
  -----------
  nemtap: lb app: Validate ihl field when hashing packet

MFC after:	1 week

(cherry picked from commit f7cef43aa9a357582a703c75dafa4a44c1b2f28c)

  Commit: 9c4603c4223812c8f42c3376206c88544ad10b10
      https://github.com/MidnightBSD/src/commit/9c4603c4223812c8f42c3376206c88544ad10b10
  Author: Vincenzo Maffione <vmaffione at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M lib/libnetmap/nmreq.c

  Log Message:
  -----------
  libnetmap: reset errno in nmreq_register_decode()

The reset is necessary at the beginning of the function, because of
the errno logic in the error path (set errno to EINVAL if not set).
If errno is already set when calling the function, and the function
fails, the previous errno value will be inherited.

(cherry picked from commit ab639bb2873034786cd2ec4d2d9c4489fbf6f424)

  Commit: 8cd7a63d31a823c81350b6ad141ad6f4836e1c4a
      https://github.com/MidnightBSD/src/commit/8cd7a63d31a823c81350b6ad141ad6f4836e1c4a
  Author: Cy Schubert <cy at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M libexec/rc/network.subr

  Log Message:
  -----------
  network.subr: Add missing brace

PR:		268378
Submitted by:	jyoung15 at gmail.com
Reported by:	jyoung15 at gmail.com

(cherry picked from commit 87061d3bffd1becd643b0ba9dc6f0a7699efbb39)

  Commit: 7923037aebfd9a4f341e4238616b6c856572c40b
      https://github.com/MidnightBSD/src/commit/7923037aebfd9a4f341e4238616b6c856572c40b
  Author: Eugene Grosbein <eugen at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M lib/libc/gen/syslog.c

  Log Message:
  -----------
  syslog: fix PID of forking process

Do not cache PID for a process that does not fabricate it,
calls openlog() before forking and does not call exec() thereafter.

PR:		268666
Fixes:		e9ae9fa93745669b7dd0341d333257ad6cfe8e37
Tested by:	kp

(cherry picked from commit 2ce3ef55035093cac7839e71e9ff91f5562ebc29)

  Commit: c2b0732d6796298f942dde94416de65d8a787346
      https://github.com/MidnightBSD/src/commit/c2b0732d6796298f942dde94416de65d8a787346
  Author: Zhenlei Huang <zlei.huang at gmail.com>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sbin/ifconfig/ifconfig.8
    M sys/net/if_vxlan.c

  Log Message:
  -----------
  vxlan: Add support for socket ioctls SIOC[SG]TUNFIB

Submitted by: Luiz Amaral <email at luiz.eng.br>
PR:	244004
Reviewed by:	gbe (manpages), melifaro, pauamma (manpages)
Approved by:	kp (mentor)
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D32820

(cherry picked from commit 7f7a804ae077a0c43d8c3f1444f90bdfb841c6b1)
(cherry picked from commit 8819353dd0dfddb9bcd156a2773efc3770d09eff)

  Commit: f9aab811492d7d90a50a4ac436941dd8abc06bb1
      https://github.com/MidnightBSD/src/commit/f9aab811492d7d90a50a4ac436941dd8abc06bb1
  Author: Zhenlei Huang <zlei.huang at gmail.com>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/net/if_vxlan.c

  Log Message:
  -----------
  if_vxlan(4): Add missing statistic for input packets

Event:		Aberdeen hackathon 2022
Reviewed by:	bryanv, kp
Approved by:	kp (mentor)
Differential Revision:	https://reviews.freebsd.org/D36841

(cherry picked from commit 1fc839f48921919dea386966e0ce4f20c26dcecf)
(cherry picked from commit 00399a54c561e625e6674ecf3b12e794aa712d30)

  Commit: fff8f853c879df51abface4062449959d9675043
      https://github.com/MidnightBSD/src/commit/fff8f853c879df51abface4062449959d9675043
  Author: Zhenlei Huang <zlei.huang at gmail.com>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/net/if_vxlan.c

  Log Message:
  -----------
  if_vxlan(4): Correct the statistic for output bytes

The vxlan interface encapsulates the Ethernet frame by prepending IP/UDP
and vxlan headers. For statistics, only the payload, i.e. the
encapsulated (inner) frame should be counted.

Event:		Aberdeen Hackathon 2022
Reviewed by:	kp
Approved by:	kp (mentor)
Differential Revision:	https://reviews.freebsd.org/D36855

(cherry picked from commit de1ea2d5171ec53acd69f93821b9507267ee44b7)
(cherry picked from commit faa7d6c2f94aee09cdc92142d51a0b2eb12b3239)

  Commit: f177678451562f957329bf1622a2310a5ac0cfda
      https://github.com/MidnightBSD/src/commit/f177678451562f957329bf1622a2310a5ac0cfda
  Author: Zhenlei Huang <zlei.huang at gmail.com>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/kern/kern_jail.c
    M sys/net/if_me.c
    M sys/sys/priv.h

  Log Message:
  -----------
  if_me: Use dedicated network privilege

Separate if_me privileges from if_gif.

Reviewed by:	kp
Approved by:	kp (mentor)
Differential Revision:	https://reviews.freebsd.org/D36691

(cherry picked from commit 43f8c763cdeea29f95b6f0eebce3ad80dd210c7a)
(cherry picked from commit 310f6f2448ed5baf0d74fba7660468df84dce184)

  Commit: 3bf3075f755ba04108febf58d53de42463868b43
      https://github.com/MidnightBSD/src/commit/3bf3075f755ba04108febf58d53de42463868b43
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/mrsas/mrsas_cam.c

  Log Message:
  -----------
  mrsas(4): Fix a typo in a source code comment

- s/reqest/request/

(cherry picked from commit e018483b10e7cf2cd852406648ccaf1f159ecb8d)

  Commit: 5bdcb9918264720919a62ad3eeb5d3d1aa52ad76
      https://github.com/MidnightBSD/src/commit/5bdcb9918264720919a62ad3eeb5d3d1aa52ad76
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/isci/scil/scic_sds_remote_device.h
    M sys/dev/isci/scil/scif_sas_remote_device.c

  Log Message:
  -----------
  isci(4): Fix common typos in source code comments

- s/reuqest/request/
- s/requst/request/

(cherry picked from commit be51810f8d68937ec4e2ce05e89938bda34d8364)

  Commit: b48459aefd746d6f45e3c24df6763c33581f7ec3
      https://github.com/MidnightBSD/src/commit/b48459aefd746d6f45e3c24df6763c33581f7ec3
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/sys/tty.h

  Log Message:
  -----------
  tty(4): Fix a typo in a source code comment

- s/charaters/characters/

(cherry picked from commit a74be23c6ed766dcb1bfeeea2f18c0d176e487c0)

  Commit: 54826e02fe0a6a82dc4161ea1a935181da6c8213
      https://github.com/MidnightBSD/src/commit/54826e02fe0a6a82dc4161ea1a935181da6c8213
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M lib/libthr/thread/thr_autoinit.c

  Log Message:
  -----------
  libthr(3): Fix a typo in a source code comment

- s/extentions/extensions/

(cherry picked from commit 085a77a677b1265407456eaaf440350af8e8fd15)

  Commit: 6fbd44335f6e96de2815a16ab254ae2c386565fd
      https://github.com/MidnightBSD/src/commit/6fbd44335f6e96de2815a16ab254ae2c386565fd
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/vr/if_vr.c

  Log Message:
  -----------
  vr(4): Fix a typo in a source code comment

- s/reuqest/request/

(cherry picked from commit 70182a0cfb4bed3515cb7bcb2c5cde75bb61d069)

  Commit: 49206b5049f3884ee6047cb0bc416b700c05ecc1
      https://github.com/MidnightBSD/src/commit/49206b5049f3884ee6047cb0bc416b700c05ecc1
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/ice/if_ice_iflib.c

  Log Message:
  -----------
  ice: Fix a typo in a source code comment

- s/reqest/requests/

(cherry picked from commit b6f9c6aadc686cf5a890afe16e26a0082fa25c87)

  Commit: 7b63d923febbe1bd4d0de2e089d17e78d84ac0ad
      https://github.com/MidnightBSD/src/commit/7b63d923febbe1bd4d0de2e089d17e78d84ac0ad
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/i386/i386/in_cksum.c

  Log Message:
  -----------
  i386: Fix a typo in a source code comment

- s/betwen/between/

(cherry picked from commit 77a863b6c217f3c143e1a8514a0fe409d5936c0f)

  Commit: cd65f71afa9d6803cadd25ba2ad435bdb27e1eb8
      https://github.com/MidnightBSD/src/commit/cd65f71afa9d6803cadd25ba2ad435bdb27e1eb8
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/netinet/tcp_hpts.c

  Log Message:
  -----------
  tcp_hpts: Fix a typo in a source code comment

- s/subract/subtract/

(cherry picked from commit d68f15420528e11f69a7bda365608581bfc34e64)

  Commit: 0fc78e2e4985f0f12fd5fcd5a7ee7b918e39f217
      https://github.com/MidnightBSD/src/commit/0fc78e2e4985f0f12fd5fcd5a7ee7b918e39f217
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/ahci/ahci.c

  Log Message:
  -----------
  ahci(4): Fix a typo in a source code comment

- s/reqests/requests/

(cherry picked from commit bc9228749c2ab31192a17ef01cfb363480144cdc)

  Commit: 7fc0b104a3a48dc104869e0e59fb571e4a3e1d66
      https://github.com/MidnightBSD/src/commit/7fc0b104a3a48dc104869e0e59fb571e4a3e1d66
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/cxgbe/cudbg/cudbg_wtp.c

  Log Message:
  -----------
  cxgbe(4): Fix a few common typos in source code comments

- s/Reqests/Requests/

(cherry picked from commit f273b4561386b8df7d4ea7b7b176bf9df298e1d7)

  Commit: df93a0865440c1d7057459feda977533608a9d4c
      https://github.com/MidnightBSD/src/commit/df93a0865440c1d7057459feda977533608a9d4c
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/mvs/mvs.c

  Log Message:
  -----------
  mvs(4): Fix a typo in a source code comment

- s/reqests/requests/

(cherry picked from commit f272a059a40aee4eda44294bc5dfdf0bd7e5c02d)

  Commit: 12520230f13b021b7ca4198649d7f1e7d3bcafea
      https://github.com/MidnightBSD/src/commit/12520230f13b021b7ca4198649d7f1e7d3bcafea
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M usr.sbin/ctld/keys.c

  Log Message:
  -----------
  libiscsiutil: Fix a typo in a source code comment

- s/sesion/session/

(cherry picked from commit 29b36af9981e7f194abe68b0359448846c021cd6)

  Commit: b680e0d9315fcc455af1aa24f86e74d73b0fec70
      https://github.com/MidnightBSD/src/commit/b680e0d9315fcc455af1aa24f86e74d73b0fec70
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M usr.sbin/bluetooth/iwmbtfw/main.c

  Log Message:
  -----------
  iwmbtfw(8): Fix a typo in a kernel message

- s/succesful/successful/

(cherry picked from commit 40bb52c89b87c1417be5ded6808bd674d512900e)

  Commit: cc8dcb94ce3a8dc4956f062330dfcc89caf1b462
      https://github.com/MidnightBSD/src/commit/cc8dcb94ce3a8dc4956f062330dfcc89caf1b462
  Author: Brooks Davis <brooks at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M lib/libc/xdr/xdr.c
    M sys/xdr/xdr.c

  Log Message:
  -----------
  xdr: store chars consistently

Cast char's through unsigned char before storing as an integer in
xdr_char(), this ensures that the encoded form is consistently not
sign-extended following Open Solaris's example.

Prior to this change, platforms with signed chars would sign extend
values with the high bit set but ones with unsigned chars would not
so 0xff would be stored as 0x000000ff on unsigned char platforms and
0xffffffff on signed char platforms.  Decoding has the same
result for either form so this is a largely cosmetic change, but it
seems best to produce consistent output.

For more discussion, see https://github.com/openzfs/zfs/issues/14173

Reviewed by:	mav, imp
Differential Revision:	https://reviews.freebsd.org/D37992

(cherry picked from commit a872c37054172f3f7a03aef263ca5886a749771f)

  Commit: de2784e6e5987f794037659148f837242b0300e5
      https://github.com/MidnightBSD/src/commit/de2784e6e5987f794037659148f837242b0300e5
  Author: Zhenlei Huang <zlei.huang at gmail.com>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sbin/devfs/devfs.rules

  Log Message:
  -----------
  devfs.rules: Do not expose "log" in the default devfs rules

/etc/rc.d/jail no longer creates /dev/log as a symbolic link since
commit 84b354cb9ab61224713c159b1484e8f070fd37be.

PR:		228351
Reviewed by:	jamie, markj
Differential Revision:	https://reviews.freebsd.org/D34563

(cherry picked from commit 2670ea8a075ea29a0eee9d227c4cdf585a7b3b55)
(cherry picked from commit 02fe4484379c1e67c22ad6abbeea10c8a20d10eb)

  Commit: bd70663b9f8841fdd74eac822334765d49077fac
      https://github.com/MidnightBSD/src/commit/bd70663b9f8841fdd74eac822334765d49077fac
  Author: Zhenlei Huang <zlei.huang at gmail.com>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/liquidio/lio_bsd.h

  Log Message:
  -----------
  lio: Remove unneeded include

Reviewed by:		adiran, imp
Differential Revision:	https://reviews.freebsd.org/D36501

(cherry picked from commit d819ddba9aa458f6e91df059426d9a2f1ac0b92d)
(cherry picked from commit 0d44c5ae3735fb8285fce7662adc86a21ce05768)

  Commit: 5eb331b8202fe358f30665a1ee6312146df8a00f
      https://github.com/MidnightBSD/src/commit/5eb331b8202fe358f30665a1ee6312146df8a00f
  Author: Chuck Tuffli <chuck at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M usr.sbin/bhyve/pci_nvme.c

  Log Message:
  -----------
  bhyve nvme: Fix uninitialized pointer

The Dataset Management code could free an uninitialized pointer if the
device doesn't support the Dataset Management command.

PR:		264548
Reported by:	Robert Morris <rtm at lcs.mit.edu>

(cherry picked from commit 7376c08cc67e65ee660d51873129e34745ef5dd4)
(cherry picked from commit c84ec3076e7de10d7475fd9694ad64603e264d88)

  Commit: 6a21884dbe4de9d29d00539a2fb370c56f162b8d
      https://github.com/MidnightBSD/src/commit/6a21884dbe4de9d29d00539a2fb370c56f162b8d
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/netinet/ip_gre.c
    M sys/netinet6/ip6_gre.c

  Log Message:
  -----------
  ip_gre: Fix a common typo in source code comments

- s/addres/address/

(cherry picked from commit fa7de6dcb9b7314d4736f1fc21b3fdceefe34173)

  Commit: d8a85f13d63e1e6bbf674b0aeee4cf6e9cdc98f6
      https://github.com/MidnightBSD/src/commit/d8a85f13d63e1e6bbf674b0aeee4cf6e9cdc98f6
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M usr.sbin/rpc.lockd/lockd.c
    M usr.sbin/rpc.statd/statd.c

  Log Message:
  -----------
  nfs: Fix a common typo in source code comments

- s/ingore/ignore/

(cherry picked from commit 72e709040f3691911c7b58d5a14b4d19b276f478)

  Commit: f77461326ab63f7e4f2ef54e572dbfe5286bcb14
      https://github.com/MidnightBSD/src/commit/f77461326ab63f7e4f2ef54e572dbfe5286bcb14
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1

  Log Message:
  -----------
  bsnmpget.1: Fix a typo in the man page

- s/ingore/ignore/

(cherry picked from commit 7a184a41c6a31a1dcf82c2e35446f96dde78dbce)

  Commit: 72f49c6d4c2372b2057ad7d4fae32fc6a78d3014
      https://github.com/MidnightBSD/src/commit/72f49c6d4c2372b2057ad7d4fae32fc6a78d3014
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M usr.sbin/mountd/mountd.c

  Log Message:
  -----------
  mountd(8): Fix a typo in a source code comment

- s/ingore/ignore/

(cherry picked from commit afc55510b1178ba94d2bdcef0eb666b10abcfc42)

  Commit: ffa66ef85c7f8f646153e3a219e97269a310633b
      https://github.com/MidnightBSD/src/commit/ffa66ef85c7f8f646153e3a219e97269a310633b
  Author: Yoshihiro Takahashi <nyan at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M usr.bin/unzip/unzip.1
    M usr.bin/unzip/unzip.c

  Log Message:
  -----------
  unzip: Document optional member list

Submitted by:	Pat Maddox (man page)
PR:		267426

(cherry picked from commit a1f28ec729f7491da8607e8eeaee1b0f547c60d0)

  Commit: 98555ac341ef26944dbeb31283b9139bc975ce30
      https://github.com/MidnightBSD/src/commit/98555ac341ef26944dbeb31283b9139bc975ce30
  Author: Kajetan Staszkiewicz <vegeta at tuxpowered.net>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M tests/sys/common/vnet.subr
    M tests/sys/netpfil/pf/pfsync.sh

  Log Message:
  -----------
  pf tests: properly destroy renamed interfaces

The pfsync:pbr tests leaves  lot of interfaces when they finish, making
other tests slower due to long time of loading scapy from pft_ping.py
when more interfaces are present. When both sides of epair are assigned
to jails, they are both removed from created_interfaces.lst and thus
won't be removed during cleanup from this file. An interface assigned to
jail is stored in created_jails.lst but if it is renamed, it won't be
cleaned up either. Furthermore this test uses identical names for
multiple interfaces across multiple jails which after destroying those
jails adds to overall confusion.

To address this issue a new function is provided for renaming interfaces
in jails and storing their new names in created_jails.lst for deletion
during cleanup.

MFC after:	1 week
Sponsored by:	InnoGames GmbH
Differential Revision:	https://reviews.freebsd.org/D38024

(cherry picked from commit ddcdb534b7669f186184baf164e7647d544f7bd6)

  Commit: 8f2929fd8104ca4954c4d808a5f7ea2b777519ea
      https://github.com/MidnightBSD/src/commit/8f2929fd8104ca4954c4d808a5f7ea2b777519ea
  Author: Mark Johnston <markj at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/vm/vm_object.c

  Log Message:
  -----------
  vm_object: Fix a kernel memory disclosure via the vm_object list sysctl

Reported by:	Chris J-D <chris at accessvector.net>
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation

(cherry picked from commit b050ee6c97e7f5b6f1e3adec69775fa41afc948f)

  Commit: 8bb3402fa6fe030f23f1891de027bd2c191f973a
      https://github.com/MidnightBSD/src/commit/8bb3402fa6fe030f23f1891de027bd2c191f973a
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M libexec/rc/rc.initdiskless

  Log Message:
  -----------
  rc.initdiskless: Fix a typo in a comment

- s/attemping/attempting/

(cherry picked from commit 30985d19b00da3ea3ba808b57e5a46ce6403b8d7)

  Commit: 758944c9751de10e8f37b2b9e70e6a30c28f90a0
      https://github.com/MidnightBSD/src/commit/758944c9751de10e8f37b2b9e70e6a30c28f90a0
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M usr.sbin/cxgbetool/tcbinfot4.c
    M usr.sbin/cxgbetool/tcbinfot5.c
    M usr.sbin/cxgbetool/tcbinfot6.c

  Log Message:
  -----------
  cxgbetool(8): Fix common typos in sysctl descriptions

- s/addres/address/

(cherry picked from commit 74d2a3c16d74376f594162ee622ba470d631b386)

  Commit: b16aa8a3cb5e2067e1425e6b45ce1500a9afde0f
      https://github.com/MidnightBSD/src/commit/b16aa8a3cb5e2067e1425e6b45ce1500a9afde0f
  Author: Rick Macklem <rmacklem at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/kgssapi/gss_impl.c

  Log Message:
  -----------
  kgssapi: Increase timeout for kernel to gssd(8) upcalls

It turns out that the underlying problem that caused
a Kerberized NFS mount with the "gssname" option to
fail was that the kernel upcall to the gssd(8) daemon
would time out prematurely after 25 seconds.  The
gss_acquire_cred() GSSAPI library call
takes about 27 seconds for the case where a desired_name
argument is specified.  A similarly long delay occurs
when the gss_init_sec_context() call is made and the
user principal's TGT has expired.

Once the upcall timed out, the kernel code assumed that
the gssd(8) daemon had died and closed the socket.
Ironically, closing the socket did cause the gssd(8)
daemon to terminate via a SIGPIPE signal.

This patch increases the timeout to 5 minutes.  Since
a timeout should only occur when the gssd(8) daemon
has died, a long timeout should be ok and seems to fix this
problem.

I still think that commit c33509d49a should remain in the
system, since it allows the mount to complete quickly
and not take nearly 30 seconds.

PR:	268823

(cherry picked from commit e3c26ce5cb410e4e58e131dfea7054e0bf11e3ca)

  Commit: 6f6a3ff574107f0397a0c273dc44ec45e1e306a8
      https://github.com/MidnightBSD/src/commit/6f6a3ff574107f0397a0c273dc44ec45e1e306a8
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/ath/if_ath_sysctl.c
    M sys/dev/ath/if_ath_tx_ht.c

  Log Message:
  -----------
  ath(4): Fix a sysctl description and a typo in a comment

- s/delimeter/delimiter/

(cherry picked from commit e4b7980c5ca9c701242f3c395a042360db0ad7a7)

  Commit: 3f058a7c17c5210599bb0c772229a05bc4eddb0c
      https://github.com/MidnightBSD/src/commit/3f058a7c17c5210599bb0c772229a05bc4eddb0c
  Author: Kristof Provost <kp at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/netpfil/pf/if_pfsync.c

  Log Message:
  -----------
  pf: fix panic on deferred packets

The pfsync_defer_tmo() callout needs to set the correct vnet before it
can transmit packets. It used the rcvif in the mbuf to get this vnet,
but that doesn't work for locally originated traffic. In that case the
rcvif pointer is NULL, and the dereference leads to a panic.

Instead use the sc_sync_if, which is always set (if pfsync is enabled,
at least).

PR:		268246
MFC after:	2 weeks

(cherry picked from commit fd02192c3acaefeb62db11e0c10ab36240b79ba2)

  Commit: c945b3e03b3bc3b86a088b782e5cbd4c4cdfec90
      https://github.com/MidnightBSD/src/commit/c945b3e03b3bc3b86a088b782e5cbd4c4cdfec90
  Author: Kristof Provost <kp at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/net/pfvar.h
    M sys/netpfil/pf/pf.c
    M sys/netpfil/pf/pf_syncookies.c

  Log Message:
  -----------
  pf: fix syncookies in conjunction with tcp fast port reuse

Basic scenario: we have a closed connection (In TCPS_FIN_WAIT_2), and
get a new connection (i.e. SYN) re-using the tuple.

Without syncookies we look at the SYN, and completely unlink the old,
closed state on the SYN.
With syncookies we send a generated SYN|ACK back, and drop the SYN,
never looking at the state table.

So when the ACK (i.e. the third step in the three way handshake for
connection setup) turns up, we’ve not actually removed the old state, so
we find it, and don’t do the syncookie dance, or allow the new
connection to get set up.

Explicitly check for this in pf_test_state_tcp(). If we find a state in
TCPS_FIN_WAIT_2 and the syncookie is valid we delete the existing state
so we can set up the new state.
Note that when we verify the syncookie in pf_test_state_tcp() we don't
decrement the number of half-open connections to avoid an incorrect
double decrement.

MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D37919

(cherry picked from commit 9c041b450d5e604c3e35b5799b60a2c53795feef)

  Commit: b3be16845a713b4b1217803762bb3d22fc7488f9
      https://github.com/MidnightBSD/src/commit/b3be16845a713b4b1217803762bb3d22fc7488f9
  Author: Kristof Provost <kp at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M tests/sys/netpfil/pf/syncookie.sh

  Log Message:
  -----------
  pf tests: test fast port re-use with syncookies

When a src/dst ip/port tuple is re-used before the pf state fully
expires we clean up the state and create a new one, unless syncookies
are enabled.

Test this, by running two back-to-back nc sessions, with a fixed source
port. Move the interface and IP to a different (vnet) jail, to trick the
network stack into letting us do this.

MFC after:      2 weeks
Event:          Aberdeen hackathon 2022
Differential Revision:  https://reviews.freebsd.org/D36886

(cherry picked from commit dc698b2cd59ebc08b05a261dbba8ee5707450d28)

  Commit: 6a2750fee035a26568c1ab0248cd1a097608cda5
      https://github.com/MidnightBSD/src/commit/6a2750fee035a26568c1ab0248cd1a097608cda5
  Author: Kajetan Staszkiewicz <vegeta at tuxpowered.net>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M tests/sys/net/pcp.py
    M tests/sys/net/stp.py
    M tests/sys/netpfil/common/pft_icmp_check.py
    M tests/sys/netpfil/common/pft_ping.py
    M tests/sys/netpfil/common/sniffer.py
    M tests/sys/netpfil/pf/CVE-2019-5598.py

  Log Message:
  -----------
  netpfil tests: improve sniffer.py

Multiple improvements to sniffer.py:

* Remove ambiguity of configuring recvif, it must be now explicitly specified.
* Don't catch exceptions around creating the sniffer, let it properly
  fail and display the whole stack trace.
* Count correct packets so that duplicates can be found.

MFC after:	1 week
Sponsored by:	InnoGames GmbH
Differential Revision:	https://reviews.freebsd.org/D38120

(cherry picked from commit a39dedeb31052ec74b0cd394d56f8d7cc8534645)

  Commit: d3d21e772a1d368f755be4f7fb628598cf22404b
      https://github.com/MidnightBSD/src/commit/d3d21e772a1d368f755be4f7fb628598cf22404b
  Author: Kajetan Staszkiewicz <vegeta at tuxpowered.net>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M tests/sys/netpfil/pf/pfsync.sh
    M tests/sys/netpfil/pf/pfsync_defer.py

  Log Message:
  -----------
  netpfil tests: improve pfsync_defer.py

Return different exit code depending on which failure was encountered.
The pfsync test expect a very particular failure, not just any.

MFC after:	1 week
Sponsored by:	InnoGames GmbH
Differential Revision:	https://reviews.freebsd.org/D38123

(cherry picked from commit 06012728beff45e94d58410eae7cda2ea980ef77)

  Commit: ac4b6a2d914c41e536b891cebe3b6efefc6b93ec
      https://github.com/MidnightBSD/src/commit/ac4b6a2d914c41e536b891cebe3b6efefc6b93ec
  Author: Mark Johnston <markj at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/kvm_clock/kvm_clock.c

  Log Message:
  -----------
  kvmclock: Fix initialization when EARLY_AP_STARTUP is not defined

To attach to the hypervisor, kvmclock needs to write a per-CPU MSR.
When EARLY_AP_STARTUP is not defined, device attach happens too early:
APs are not yet spun up, so smp_rendezvous only runs the callback on the
local CPU.  As a result, the timecounter only gets initialized on the
BSP, and then timekeeping is broken on SMP systems.

Implement handling for !EARLY_AP_STARTUP kernels: keep track of the CPU
on which device attach ran, and then use a SI_SUB_SMP SYSINIT to
register the rest of the CPUs with the hypervisor.

Reported by:	Shrikanth R Kamath <kshrikanth at juniper.net>
Reviewed by:	kib, jhb (earlier versions)
Sponsored by:	Klara, Inc.
Sponsored by:	Juniper Networks, Inc.
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D37705

(cherry picked from commit 568f552b0410f4f72db9ce710f7803acca23f79f)

  Commit: 68febc53199932431e83084a2f34b55920c24528
      https://github.com/MidnightBSD/src/commit/68febc53199932431e83084a2f34b55920c24528
  Author: Kristof Provost <kp at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sbin/pfctl/pfctl.c

  Log Message:
  -----------
  pfctl: rule.label is a two-dimensional array

Fix checking for a non-empty first string.

PR:		269075
MFC after:	1 week
Reported by:	nreilly at blackberry.com

(cherry picked from commit cd80c52cade3e38d273eecec6f9b0a7cba23bcc8)

  Commit: 56faa45f57b8c8349772df9538c0c94cb2a481f2
      https://github.com/MidnightBSD/src/commit/56faa45f57b8c8349772df9538c0c94cb2a481f2
  Author: John Baldwin <jhb at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/ena/ena_netmap.c

  Log Message:
  -----------
  ena: Remove unused variable.

(cherry picked from commit 4dab99b936920cf0c8f3fcf63754985906714a40)

  Commit: f923762664acfc2801059ff0cc097a3ba59b2002
      https://github.com/MidnightBSD/src/commit/f923762664acfc2801059ff0cc097a3ba59b2002
  Author: Warner Losh <imp at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/ena/ena_sysctl.c

  Log Message:
  -----------
  ena: Remove write only variables

Sponsored by:		Netflix

(cherry picked from commit 094b2a2379c1c92f134fac22be78517c71470ca6)

  Commit: b8727ca1308ad75925bb9161dece4a3e22eef511
      https://github.com/MidnightBSD/src/commit/b8727ca1308ad75925bb9161dece4a3e22eef511
  Author: Arthur Kiyanovski <akiyano at amazon.com>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/ena/ena.c

  Log Message:
  -----------
  ena: Re-Enable per-packet missing tx completion print

Commit [1] first added the ena_tx_buffer.print_once member,
so that a message about a missing tx completion is printed only
once per packet (and not every second when the watchdog runs).
In this commit print_once is initialized to true, and is set back
to false after detecting a missing tx completion and printing
a warning about it to dmesg.

Commit [2] incorrectly reverses the values assigned to print_once.
The variable is initialized to be true but is checked to be false
when a missing tx completion is detected. This is never true, and
therefore the warning print for each missing tx completion is never
printed since this commit.

Commit [3] added time passed since last TX cleanup to the missing
tx completions per-packet print. However, due to the issue in commit
[2], this time is never printed.

This commit reverses back the values assigned to ena_tx_buffer.print_once
erroneously by commit [2], bringing back to life the missing tx
completion per-packet print.

Also add a space after "." in the missing tx completion print.

[1] - 9b8d05b8ac78 ("Add support for Amazon Elastic Network Adapter (ENA) NIC")
[2] - 74dba3ad7851 ("Split function checking for missing TX completion in ENA driver")
[3] - d8aba82b5ca7 ("ena: Store ticks of last Tx cleanup")

Fixes: 74dba3ad7851 ("Split function checking for missing TX completion in ENA driver")
Fixes: d8aba82b5ca7 ("ena: Store ticks of last Tx cleanup")
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit f01b2cd98e93ef5ac3698b97bbaa45ac9c50fe5d)

  Commit: 4e4f228671aa805ca5c1748fa3a84f722b84285c
      https://github.com/MidnightBSD/src/commit/4e4f228671aa805ca5c1748fa3a84f722b84285c
  Author: David Arinzon <darinzon at amazon.com>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/ena/ena.c

  Log Message:
  -----------
  ena: Remove timer service re-arm on ena_restore_device failure

In case the reset sequence fails (ena_destroy_device() followed by
ena_restore_device() calls) during ena_restore_device(), the driver
resources are being freed. After the clean-up, the timer service is
re-armed in order to try and re-initialize the driver state.
But, such an attempt would fail given that the resources are freed.
Moreover, this would actually cause either the system to fail or a
panic.
When the driver fails in ena_restore_device() procedure, the only
recovery is either unloading and loading the driver or instance
reboot.

This change removes the timer service re-arm in case of failure
in ena_restore_device().

MFC after: 2 weeks
Sponsored by: Amazon, Inc.
Fixes: 78554d0c707c ("ena: start timer service on attach")

(cherry picked from commit c4a85b8d684d3db9dc4d3d01d966130e21390529)

  Commit: 3cbe7c30366b42d9f74b484d30497bbbf7f07c91
      https://github.com/MidnightBSD/src/commit/3cbe7c30366b42d9f74b484d30497bbbf7f07c91
  Author: Arthur Kiyanovski <akiyano at amazon.com>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M share/man/man4/ena.4

  Log Message:
  -----------
  ena: Switch driver owners from semihalf to amazon in man file

1. Update ena.4 manual file to include amazon owner emails.
2. State that the driver is developed by amazon but leave
that it was originally written by Semihalf, similarly to other
drivers in the /share/man/ directory of the FreeBSD source code.
3. Advance year in copyright notice to 2022.

MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit fb47286c38a5315bdd93389b0547b8ccccdc7327)

  Commit: 7c68a937448a66c9c718444236888778ba9a487d
      https://github.com/MidnightBSD/src/commit/7c68a937448a66c9c718444236888778ba9a487d
  Author: Arthur Kiyanovski <akiyano at amazon.com>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/ena/ena.h

  Log Message:
  -----------
  ena: Update driver version to v2.6.2

Bug Fixes:
* Remove timer service re-arm on ena_restore_device failure.
* Re-Enable per-packet missing tx completion print

Minor Changes:
* Switch driver owners from Semihalf to Amazon in man file.

MFC after: 2 weeks
Sponsored by: Amazon, Inc.
Pull Request: https://github.com/freebsd/freebsd-src/pull/637

(cherry picked from commit e5de1d8dad25308f3a332f9386e05b851a36c507)

  Commit: 48b1ca5523655abdc98ddf752da5aebcfb90fb12
      https://github.com/MidnightBSD/src/commit/48b1ca5523655abdc98ddf752da5aebcfb90fb12
  Author: Cy Schubert <cy at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M libexec/rc/network.subr

  Log Message:
  -----------
  network.subr: Replace "\ " with "[[:space:]]"

"[[:space:]]" is easier to read than "\ " and is conisitent with
clone_up().

Reported by:	eugen
Differential Revision:	https://reviews.freebsd.org/D37748

(cherry picked from commit fef0e429f190d396d5b3228166a012e85dd912f2)

  Commit: b3187457f1f6eff39fcb34ba7ebc259ba2c0bf2d
      https://github.com/MidnightBSD/src/commit/b3187457f1f6eff39fcb34ba7ebc259ba2c0bf2d
  Author: Cy Schubert <cy at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M libexec/rc/network.subr

  Log Message:
  -----------
  network.subr: Fix infinite loop

When setting up carp tunnel, using a password consisting of only the
characters used as hexadecimal characters, i.e. abc-def, there will be
an infinite loop in the shell function ifalias_af_common_handler().
To circumvent this we test for " pass ".

PR:		268378
Reported by:	jyoung15 at gmail.com
Differential Revision:	https://reviews.freebsd.org/D37748

(cherry picked from commit e3e57edf4aac05d041ca55ff2f008c6109ef88d5)

Compare: https://github.com/MidnightBSD/src/compare/491ee8bae964...b3187457f1f6