sys/linux: update consts to next-20230331

10 files changed, 27 insertions, 14 deletions

diff --git a/sys/linux/dev_iommu.txt.const b/sys/linux/dev_iommu.txt.const
index 5ab58ff53..15b448d8c 100644
--- a/sys/linux/dev_iommu.txt.const
+++ b/sys/linux/dev_iommu.txt.const
@@ -23,9 +23,9 @@ IOMMU_TEST_OP_ACCESS_RW = 8
 IOMMU_TEST_OP_ADD_RESERVED = 1
 IOMMU_TEST_OP_CREATE_ACCESS = 5
 IOMMU_TEST_OP_DESTROY_ACCESS_PAGES = 6
-IOMMU_TEST_OP_MOCK_DOMAIN = 2
 IOMMU_TEST_OP_MD_CHECK_MAP = 3
 IOMMU_TEST_OP_MD_CHECK_REFS = 4
+IOMMU_TEST_OP_MOCK_DOMAIN = 2
 IOMMU_TEST_OP_SET_TEMP_MEMORY_LIMIT = 9
 IOMMU_VFIO_IOAS = 15240, mips64le:ppc64le:536886152
 IOMMU_VFIO_IOAS_CLEAR = 2
diff --git a/sys/linux/dev_snd_seq.txt.const b/sys/linux/dev_snd_seq.txt.const
index 23fba5efb..202305fb8 100644
--- a/sys/linux/dev_snd_seq.txt.const
+++ b/sys/linux/dev_snd_seq.txt.const
@@ -6,7 +6,7 @@ NO_CLIENT = 0
 SNDRV_SEQ_FILTER_BOUNCE = 4
 SNDRV_SEQ_FILTER_BROADCAST = 1
 SNDRV_SEQ_FILTER_MULTICAST = 2
-SNDRV_SEQ_FILTER_USE_EVENT = 18446744071562067968
+SNDRV_SEQ_FILTER_USE_EVENT = 2147483648
 SNDRV_SEQ_IOCTL_CLIENT_ID = 2147767041, mips64le:ppc64le:1074025217
 SNDRV_SEQ_IOCTL_CREATE_PORT = 3232256800, 386:arm:3231994656
 SNDRV_SEQ_IOCTL_CREATE_QUEUE = 3230421810
diff --git a/sys/linux/io_uring.txt b/sys/linux/io_uring.txt
index 2dcd9e12e..efd8723b0 100644
--- a/sys/linux/io_uring.txt
+++ b/sys/linux/io_uring.txt
@@ -64,7 +64,7 @@ mmap$IORING_OFF_CQ_RING(addr vma, len len[addr], prot flags[mmap_prot], flags fl
 mmap$IORING_OFF_SQES(addr vma, len len[addr], prot flags[mmap_prot], flags flags[mmap_flags], fd fd_io_uring, offset const[IORING_OFF_SQES]) sqes_ptr
 
 # If no flags are specified(0), the io_uring instance is setup for interrupt driven IO.
-io_uring_setup_flags = 0, IORING_SETUP_IOPOLL, IORING_SETUP_SQPOLL, IORING_SETUP_SQ_AFF, IORING_SETUP_CQSIZE, IORING_SETUP_CLAMP, IORING_SETUP_ATTACH_WQ, IORING_FEAT_NODROP, IORING_FEAT_SUBMIT_STABLE, IORING_FEAT_RW_CUR_POS, IORING_FEAT_FAST_POLL, IORING_FEAT_POLL_32BITS, IORING_SETUP_R_DISABLED, IORING_FEAT_SQPOLL_NONFIXED, IORING_FEAT_ENTER_EXT_ARG, IORING_FEAT_NATIVE_WORKERS, IORING_FEAT_RSRC_TAGS, IORING_FEAT_CQE_SKIP, IORING_SETUP_SUBMIT_ALL, IORING_SETUP_COOP_TASKRUN, IORING_SETUP_TASKRUN_FLAG, IORING_SETUP_SQE128, IORING_SETUP_CQE32
+io_uring_setup_flags = 0, IORING_SETUP_IOPOLL, IORING_SETUP_SQPOLL, IORING_SETUP_SQ_AFF, IORING_SETUP_CQSIZE, IORING_SETUP_CLAMP, IORING_SETUP_ATTACH_WQ, IORING_FEAT_NODROP, IORING_FEAT_SUBMIT_STABLE, IORING_FEAT_RW_CUR_POS, IORING_FEAT_FAST_POLL, IORING_FEAT_POLL_32BITS, IORING_SETUP_R_DISABLED, IORING_FEAT_SQPOLL_NONFIXED, IORING_FEAT_NATIVE_WORKERS, IORING_FEAT_RSRC_TAGS, IORING_FEAT_CQE_SKIP, IORING_SETUP_SUBMIT_ALL, IORING_SETUP_COOP_TASKRUN, IORING_SETUP_TASKRUN_FLAG, IORING_SETUP_SQE128, IORING_SETUP_CQE32
 # watch out the being tested kernel version
 # IORING_FEAT_SINGLE_MMAP >= 5.4
 # IORING_FEAT_NODROP, IORING_FEAT_SUBMIT_STABLE >= 5.5
diff --git a/sys/linux/io_uring.txt.const b/sys/linux/io_uring.txt.const
index 346fbc73f..79f7f89d5 100644
--- a/sys/linux/io_uring.txt.const
+++ b/sys/linux/io_uring.txt.const
@@ -15,7 +15,6 @@ IORING_ENTER_REGISTERED_RING = 16
 IORING_ENTER_SQ_WAIT = 4
 IORING_ENTER_SQ_WAKEUP = 2
 IORING_FEAT_CQE_SKIP = 2048
-IORING_FEAT_ENTER_EXT_ARG = ???
 IORING_FEAT_FAST_POLL = 32
 IORING_FEAT_NATIVE_WORKERS = 512
 IORING_FEAT_NODROP = 2
diff --git a/sys/linux/netfilter_ipv4.txt b/sys/linux/netfilter_ipv4.txt
index 1ecd8896f..b4e3bf5b9 100644
--- a/sys/linux/netfilter_ipv4.txt
+++ b/sys/linux/netfilter_ipv4.txt
@@ -204,6 +204,8 @@ ipt_targets [
 	unspec		xt_unspec_targets
 	inet		xt_inet_targets
 	SET		xt_target_t["SET", xt_set_info_target_v0, 0]
+# TODO: remove CLUSTERIP once removed from relevant LTS.
+# Removed from kernel in 9db5d918e2c07fa09.
 	CLUSTERIP	xt_target_t["CLUSTERIP", ipt_clusterip_tgt_info, 0]
 ] [varlen]
 
diff --git a/sys/linux/socket_ieee802154.txt.const b/sys/linux/socket_ieee802154.txt.const
index 8bb91ed62..6dc0d8610 100644
--- a/sys/linux/socket_ieee802154.txt.const
+++ b/sys/linux/socket_ieee802154.txt.const
@@ -103,14 +103,14 @@ NL802154_ATTR_NETNS_FD = 29
 NL802154_ATTR_PAGE = 7
 NL802154_ATTR_PAN_ID = 9
 NL802154_ATTR_PID = 28
-NL802154_ATTR_SEC_DEVICE = 35
-NL802154_ATTR_SEC_DEVKEY = 36
-NL802154_ATTR_SEC_ENABLED = 30
-NL802154_ATTR_SEC_FRAME_COUNTER = 33
-NL802154_ATTR_SEC_KEY = 37
-NL802154_ATTR_SEC_LEVEL = 34
-NL802154_ATTR_SEC_OUT_KEY_ID = 32
-NL802154_ATTR_SEC_OUT_LEVEL = 31
+NL802154_ATTR_SEC_DEVICE = 44
+NL802154_ATTR_SEC_DEVKEY = 45
+NL802154_ATTR_SEC_ENABLED = 39
+NL802154_ATTR_SEC_FRAME_COUNTER = 42
+NL802154_ATTR_SEC_KEY = 46
+NL802154_ATTR_SEC_LEVEL = 43
+NL802154_ATTR_SEC_OUT_KEY_ID = 41
+NL802154_ATTR_SEC_OUT_LEVEL = 40
 NL802154_ATTR_SHORT_ADDR = 10
 NL802154_ATTR_TX_POWER = 11
 NL802154_ATTR_WPAN_DEV = 6
diff --git a/sys/linux/socket_inet_sctp.txt b/sys/linux/socket_inet_sctp.txt
index 19817504e..2e150adf2 100644
--- a/sys/linux/socket_inet_sctp.txt
+++ b/sys/linux/socket_inet_sctp.txt
@@ -4,6 +4,7 @@
 # AF_INET and AF_INET6: SCTP support
 
 include <linux/sctp.h>
+include <linux/net.h>
 include <asm/ioctls.h>
 
 resource sock_sctp[sock_in]
diff --git a/sys/linux/socket_netlink_route_sched.txt b/sys/linux/socket_netlink_route_sched.txt
index bab2630be..68bef0c5c 100644
--- a/sys/linux/socket_netlink_route_sched.txt
+++ b/sys/linux/socket_netlink_route_sched.txt
@@ -656,6 +656,16 @@ tc_htb_opt {
 }
 
 # ------------------------------ tc filter ------------------------------
+
+# TODO: remove the following filters that were removed from the kernel
+# once they are removed from relevant LTS kernels:
+#
+# 265b4da82dbf5 net/sched: Retire rsvp classifier
+# 8c710f75256bb net/sched: Retire tcindex classifier
+# bbe77c14ee618 net/sched: Retire dsmark qdisc
+# fb38306ceb9e7 net/sched: Retire ATM qdisc
+# 051d442098421 net/sched: Retire CBQ qdisc
+
 filter_kind_options [
 	f_basic		tca_kind_options_t["basic", array[basic_policy]]
 	f_bpf		tca_kind_options_t["bpf", array[bpf_policy]]
diff --git a/sys/linux/sys.txt b/sys/linux/sys.txt
index f6db0ab4f..ee1eab832 100644
--- a/sys/linux/sys.txt
+++ b/sys/linux/sys.txt
@@ -44,6 +44,7 @@ include <linux/kcmp.h>
 include <linux/nfs.h>
 include <linux/syslog.h>
 include <linux/exportfs.h>
+include <linux/splice.h>
 include <fs/overlayfs/overlayfs.h>
 include <uapi/linux/memfd.h>
 include <uapi/linux/module.h>
diff --git a/sys/linux/sys.txt.const b/sys/linux/sys.txt.const
index 501c165ac..5e2fbd90e 100644
--- a/sys/linux/sys.txt.const
+++ b/sys/linux/sys.txt.const
@@ -417,8 +417,8 @@ PTRACE_SETREGSET = 16901
 PTRACE_SETSIGINFO = 16899
 PTRACE_SINGLESTEP = 9
 PTRACE_SYSCALL = 24
-PTRACE_SYSEMU = 31, arm:mips64le:riscv64:???, ppc64le:29
-PTRACE_SYSEMU_SINGLESTEP = 32, arm:mips64le:riscv64:???, ppc64le:30
+PTRACE_SYSEMU = 31, arm:mips64le:???, ppc64le:29
+PTRACE_SYSEMU_SINGLESTEP = 32, arm:mips64le:???, ppc64le:30
 PTRACE_TRACEME = 0
 P_ALL = 0
 P_PGID = 2