commit: 875f1e20701b509e95b6474cb4794409f20136d5 parent d636969d7e0566444c0b8c6f3171da9b7a918ce8 Author: Michael Forney <mforney@mforney.org> Date: Fri, 7 Jul 2023 12:16:24 -0700 linux-headers: Update to 6.4Diffstat:
12 files changed, 129 insertions(+), 180 deletions(-)diff --git a/pkg/linux-headers/.gitignore b/pkg/linux-headers/.gitignore@@ -1,3 +1,3 @@ -/linux-6.1.tar.xz +/linux-6.4.tar.xz /src /tools.ninjadiff --git a/pkg/linux-headers/base.lua b/pkg/linux-headers/base.lua@@ -45,24 +45,21 @@ return { 'drm/drm_sarea.h', 'drm/etnaviv_drm.h', 'drm/exynos_drm.h', - 'drm/i810_drm.h', + 'drm/habanalabs_accel.h', 'drm/i915_drm.h', + 'drm/ivpu_accel.h', 'drm/lima_drm.h', - 'drm/mga_drm.h', 'drm/msm_drm.h', 'drm/nouveau_drm.h', 'drm/omap_drm.h', 'drm/panfrost_drm.h', + 'drm/qaic_accel.h', 'drm/qxl_drm.h', - 'drm/r128_drm.h', 'drm/radeon_drm.h', - 'drm/savage_drm.h', - 'drm/sis_drm.h', 'drm/tegra_drm.h', 'drm/v3d_drm.h', 'drm/vc4_drm.h', 'drm/vgem_drm.h', - 'drm/via_drm.h', 'drm/virtgpu_drm.h', 'drm/vmwgfx_drm.h', 'linux/a.out.h', @@ -82,6 +79,7 @@ return { 'linux/arm_sdei.h', 'linux/aspeed-lpc-ctrl.h', 'linux/aspeed-p2a-ctrl.h', + 'linux/aspeed-video.h', 'linux/atalk.h', 'linux/atm.h', 'linux/atm_eni.h', @@ -154,7 +152,6 @@ return { 'linux/cifs/cifs_mount.h', 'linux/cifs/cifs_netlink.h', 'linux/close_range.h', - 'linux/cm4000_cs.h', 'linux/cn_proc.h', 'linux/coda.h', 'linux/coff.h', @@ -174,7 +171,6 @@ return { 'linux/devlink.h', 'linux/dlm.h', 'linux/dlm_device.h', - 'linux/dlm_netlink.h', 'linux/dlm_plock.h', 'linux/dlmconstants.h', 'linux/dm-ioctl.h', @@ -203,6 +199,7 @@ return { 'linux/ethtool.h', 'linux/ethtool_netlink.h', 'linux/eventpoll.h', + 'linux/ext4.h', 'linux/f2fs.h', 'linux/fadvise.h', 'linux/falloc.h', @@ -235,6 +232,7 @@ return { 'linux/gpio.h', 'linux/gsmmux.h', 'linux/gtp.h', + 'linux/handshake.h', 'linux/hash_info.h', 'linux/hdlc.h', 'linux/hdlc/ioctl.h', @@ -306,6 +304,7 @@ return { 'linux/ioam6_iptunnel.h', 'linux/ioctl.h', 'linux/iommu.h', + 'linux/iommufd.h', 'linux/ioprio.h', 'linux/ip.h', 'linux/ip6_tunnel.h', @@ -314,6 +313,7 @@ return { 'linux/ipmi.h', 'linux/ipmi_bmc.h', 'linux/ipmi_msgdefs.h', + 'linux/ipmi_ssif_bmc.h', 'linux/ipsec.h', 'linux/ipv6.h', 'linux/ipv6_route.h', @@ -361,10 +361,10 @@ return { 'linux/media-bus-format.h', 'linux/media.h', 'linux/mei.h', + 'linux/mei_uuid.h', 'linux/membarrier.h', 'linux/memfd.h', 'linux/mempolicy.h', - 'linux/meye.h', 'linux/mii.h', 'linux/minix_fs.h', 'linux/misc/bcm_vk.h', @@ -393,6 +393,7 @@ return { 'linux/net_namespace.h', 'linux/net_tstamp.h', 'linux/netconf.h', + 'linux/netdev.h', 'linux/netdevice.h', 'linux/netfilter.h', 'linux/netfilter/ipset/ip_set.h', @@ -710,6 +711,7 @@ return { 'linux/tc_ematch/tc_em_text.h', 'linux/tcp.h', 'linux/tcp_metrics.h', + 'linux/tdx-guest.h', 'linux/tee.h', 'linux/termios.h', 'linux/thermal.h', @@ -757,6 +759,7 @@ return { 'linux/usb/video.h', 'linux/usbdevice_fs.h', 'linux/usbip.h', + 'linux/user_events.h', 'linux/userfaultfd.h', 'linux/userio.h', 'linux/utime.h', @@ -829,7 +832,6 @@ return { 'linux/zorro_ids.h', 'misc/cxl.h', 'misc/fastrpc.h', - 'misc/habanalabs.h', 'misc/ocxl.h', 'misc/pvpanic.h', 'misc/uacce/hisi_qm.h', @@ -853,6 +855,7 @@ return { 'rdma/ib_user_sa.h', 'rdma/ib_user_verbs.h', 'rdma/irdma-abi.h', + 'rdma/mana-abi.h', 'rdma/mlx4-abi.h', 'rdma/mlx5-abi.h', 'rdma/mlx5_user_ioctl_cmds.h',diff --git a/pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch b/pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch@@ -1,4 +1,4 @@ -From 0fc94dce04b2699087f4b2472c7bcc44d24c0cff Mon Sep 17 00:00:00 2001 +From e373a645de1b2e57878dc17420dad3d0464694e6 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Tue, 2 Jun 2020 03:56:03 -0700 Subject: [PATCH] Revert change of BPF_F_* to enum constants @@ -8,10 +8,10 @@ Subject: [PATCH] Revert change of BPF_F_* to enum constants 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h -index 51b9aa640ad2..ae026feb4c5b 100644 +index c994ff5b157c..ed8261560f2b 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h -@@ -5717,12 +5717,10 @@ enum { +@@ -5850,12 +5850,10 @@ enum { /* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and * BPF_FUNC_perf_event_read_value flags. */diff --git a/pkg/linux-headers/patch/0003-Prevent-zero-length-array-members-in-asound.h.patch b/pkg/linux-headers/patch/0003-Prevent-zero-length-array-members-in-asound.h.patch@@ -0,0 +1,77 @@ +From 4d7aad2421c783cf57f359638197f0ad2a32a287 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Mon, 30 Aug 2021 19:26:32 -0700 +Subject: [PATCH] Prevent zero-length array members in asound.h + +--- + include/uapi/sound/asound.h | 31 +++++++++++++++++++++---------- + 1 file changed, 21 insertions(+), 10 deletions(-) + +diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h +index 0aa955aa8246..2e7ca9236c7a 100644 +--- a/include/uapi/sound/asound.h ++++ b/include/uapi/sound/asound.h +@@ -550,22 +550,30 @@ struct __snd_pcm_sync_ptr { + } c; + }; + ++#if __BITS_PER_LONG == 32 + #if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN) +-typedef char __pad_before_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)]; +-typedef char __pad_after_uframe[0]; ++#define __PAD_BEFORE_UFRAME(x) char x[sizeof(__u64) - sizeof(snd_pcm_uframes_t)]; + #endif + + #if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) +-typedef char __pad_before_uframe[0]; +-typedef char __pad_after_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)]; ++#define __PAD_AFTER_UFRAME(x) char x[sizeof(__u64) - sizeof(snd_pcm_uframes_t)]; ++#endif ++#endif ++ ++#ifndef __PAD_BEFORE_UFRAME ++#define __PAD_BEFORE_UFRAME(x) ++#endif ++ ++#ifndef __PAD_AFTER_UFRAME ++#define __PAD_AFTER_UFRAME(x) + #endif + + struct __snd_pcm_mmap_status64 { + snd_pcm_state_t state; /* RO: state - SNDRV_PCM_STATE_XXXX */ + __u32 pad1; /* Needed for 64 bit alignment */ +- __pad_before_uframe __pad1; ++ __PAD_BEFORE_UFRAME(__pad1) + snd_pcm_uframes_t hw_ptr; /* RO: hw ptr (0...boundary-1) */ +- __pad_after_uframe __pad2; ++ __PAD_AFTER_UFRAME(__pad2) + struct __snd_timespec64 tstamp; /* Timestamp */ + snd_pcm_state_t suspended_state;/* RO: suspended stream state */ + __u32 pad3; /* Needed for 64 bit alignment */ +@@ -573,16 +581,19 @@ struct __snd_pcm_mmap_status64 { + }; + + struct __snd_pcm_mmap_control64 { +- __pad_before_uframe __pad1; ++ __PAD_BEFORE_UFRAME(__pad1) + snd_pcm_uframes_t appl_ptr; /* RW: appl ptr (0...boundary-1) */ +- __pad_before_uframe __pad2; // This should be __pad_after_uframe, but binary ++ __PAD_BEFORE_UFRAME(__pad2) // This should be __pad_after_uframe, but binary + // backwards compatibility constraints prevent a fix. + +- __pad_before_uframe __pad3; ++ __PAD_BEFORE_UFRAME(__pad3) + snd_pcm_uframes_t avail_min; /* RW: min available frames for wakeup */ +- __pad_after_uframe __pad4; ++ __PAD_AFTER_UFRAME(__pad4) + }; + ++#undef __PAD_BEFORE_UFRAME ++#undef __PAD_AFTER_UFRAME ++ + struct __snd_pcm_sync_ptr64 { + __u32 flags; + __u32 pad1; +-- +2.37.3 +diff --git a/pkg/linux-headers/patch/0003-include-uapi-linux-swab-Fix-potentially-missing-__al.patch b/pkg/linux-headers/patch/0003-include-uapi-linux-swab-Fix-potentially-missing-__al.patch@@ -1,55 +0,0 @@ -From f9d4ca2669a3f5b5f47de1bc31129fa2dd6f1597 Mon Sep 17 00:00:00 2001 -From: Matt Redfearn <matt.redfearn@mips.com> -Date: Thu, 29 Apr 2021 01:14:38 -0700 -Subject: [PATCH] include/uapi/linux/swab: Fix potentially missing - __always_inline -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit bc27fb68aaad ("include/uapi/linux/byteorder, swab: force inlining -of some byteswap operations") added __always_inline to swab functions -and commit 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to -userspace headers") added a definition of __always_inline for use in -exported headers when the kernel's compiler.h is not available. - -However, since swab.h does not include stddef.h, if the header soup does -not indirectly include it, the definition of __always_inline is missing, -resulting in a compilation failure, which was observed compiling the -perf tool using exported headers containing this commit: - -In file included from /usr/include/linux/byteorder/little_endian.h:12:0, - from /usr/include/asm/byteorder.h:14, - from tools/include/uapi/linux/perf_event.h:20, - from perf.h:8, - from builtin-bench.c:18: -/usr/include/linux/swab.h:160:8: error: unknown type name ‘__always_inline’ - static __always_inline __u16 __swab16p(const __u16 *p) - -Fix this by replacing the inclusion of linux/compiler.h with -linux/stddef.h to ensure that we pick up that definition if required, -without relying on it's indirect inclusion. compiler.h is then included -indirectly, via stddef.h. - -Fixes: 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to userspace headers") -Signed-off-by: Matt Redfearn <matt.redfearn@mips.com> ---- - include/uapi/linux/swab.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h -index 7272f85d6d6a..3736f2fe1541 100644 ---- a/include/uapi/linux/swab.h -+++ b/include/uapi/linux/swab.h -@@ -3,7 +3,7 @@ - #define _UAPI_LINUX_SWAB_H - - #include <linux/types.h> --#include <linux/compiler.h> -+#include <linux/stddef.h> - #include <asm/bitsperlong.h> - #include <asm/swab.h> - --- -2.31.1 -diff --git a/pkg/linux-headers/patch/0004-Make-struct-bpf_timer-include-a-named-member.patch b/pkg/linux-headers/patch/0004-Make-struct-bpf_timer-include-a-named-member.patch@@ -0,0 +1,32 @@ +From 3685e3c0cb5029b4e17eee6a53d2214190738c24 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Thu, 2 Dec 2021 14:49:08 -0800 +Subject: [PATCH] Make struct bpf_timer include a named member + +A struct without any named members is undefined behavior by C11 +6.7.2.1p8. + +Signed-off-by: Michael Forney <mforney@mforney.org> +--- + include/uapi/linux/bpf.h | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h +index ed8261560f2b..fb60bc7bb305 100644 +--- a/include/uapi/linux/bpf.h ++++ b/include/uapi/linux/bpf.h +@@ -6968,9 +6968,8 @@ struct bpf_spin_lock { + }; + + struct bpf_timer { +- __u64 :64; +- __u64 :64; +-} __attribute__((aligned(8))); ++ __u64 reserved[2]; ++}; + + struct bpf_dynptr { + __u64 :64; +-- +2.37.3 +diff --git a/pkg/linux-headers/patch/0004-Prevent-zero-length-array-members-in-asound.h.patch b/pkg/linux-headers/patch/0004-Prevent-zero-length-array-members-in-asound.h.patch@@ -1,76 +0,0 @@ -From d3ae5dd27d8158e810c093b85dc4c7df88f01c5d Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Mon, 30 Aug 2021 19:26:32 -0700 -Subject: [PATCH] Prevent zero-length array members in asound.h - ---- - include/uapi/sound/asound.h | 31 +++++++++++++++++++++---------- - 1 file changed, 21 insertions(+), 10 deletions(-) - -diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h -index de6810e94abe..a57304e141ff 100644 ---- a/include/uapi/sound/asound.h -+++ b/include/uapi/sound/asound.h -@@ -545,22 +545,30 @@ struct __snd_pcm_sync_ptr { - } c; - }; - -+#if __BITS_PER_LONG == 32 - #if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN) --typedef char __pad_before_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)]; --typedef char __pad_after_uframe[0]; -+#define __PAD_BEFORE_UFRAME(x) char x[sizeof(__u64) - sizeof(snd_pcm_uframes_t)]; - #endif - - #if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) --typedef char __pad_before_uframe[0]; --typedef char __pad_after_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)]; -+#define __PAD_AFTER_UFRAME(x) char x[sizeof(__u64) - sizeof(snd_pcm_uframes_t)]; -+#endif -+#endif -+ -+#ifndef __PAD_BEFORE_UFRAME -+#define __PAD_BEFORE_UFRAME(x) -+#endif -+ -+#ifndef __PAD_AFTER_UFRAME -+#define __PAD_AFTER_UFRAME(x) - #endif - - struct __snd_pcm_mmap_status64 { - snd_pcm_state_t state; /* RO: state - SNDRV_PCM_STATE_XXXX */ - __u32 pad1; /* Needed for 64 bit alignment */ -- __pad_before_uframe __pad1; -+ __PAD_BEFORE_UFRAME(__pad1) - snd_pcm_uframes_t hw_ptr; /* RO: hw ptr (0...boundary-1) */ -- __pad_after_uframe __pad2; -+ __PAD_AFTER_UFRAME(__pad2) - struct __snd_timespec64 tstamp; /* Timestamp */ - snd_pcm_state_t suspended_state;/* RO: suspended stream state */ - __u32 pad3; /* Needed for 64 bit alignment */ -@@ -568,15 +576,18 @@ struct __snd_pcm_mmap_status64 { - }; - - struct __snd_pcm_mmap_control64 { -- __pad_before_uframe __pad1; -+ __PAD_BEFORE_UFRAME(__pad1) - snd_pcm_uframes_t appl_ptr; /* RW: appl ptr (0...boundary-1) */ -- __pad_before_uframe __pad2; -+ __PAD_BEFORE_UFRAME(__pad2) - -- __pad_before_uframe __pad3; -+ __PAD_BEFORE_UFRAME(__pad3) - snd_pcm_uframes_t avail_min; /* RW: min available frames for wakeup */ -- __pad_after_uframe __pad4; -+ __PAD_AFTER_UFRAME(__pad4) - }; - -+#undef __PAD_BEFORE_UFRAME -+#undef __PAD_AFTER_UFRAME -+ - struct __snd_pcm_sync_ptr64 { - __u32 flags; - __u32 pad1; --- -2.37.3 -diff --git a/pkg/linux-headers/patch/0005-Make-struct-bpf_timer-include-a-named-member.patch b/pkg/linux-headers/patch/0005-Make-struct-bpf_timer-include-a-named-member.patch@@ -1,32 +0,0 @@ -From c57c6e0abe79f908eaac16deac7cdb51a58dc2c4 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Thu, 2 Dec 2021 14:49:08 -0800 -Subject: [PATCH] Make struct bpf_timer include a named member - -A struct without any named members is undefined behavior by C11 -6.7.2.1p8. - -Signed-off-by: Michael Forney <mforney@mforney.org> ---- - include/uapi/linux/bpf.h | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h -index ae026feb4c5b..a41109d08558 100644 ---- a/include/uapi/linux/bpf.h -+++ b/include/uapi/linux/bpf.h -@@ -6822,9 +6822,8 @@ struct bpf_spin_lock { - }; - - struct bpf_timer { -- __u64 :64; -- __u64 :64; --} __attribute__((aligned(8))); -+ __u64 reserved[2]; -+}; - - struct bpf_dynptr { - __u64 :64; --- -2.37.3 -diff --git a/pkg/linux-headers/patch/0006-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch b/pkg/linux-headers/patch/0005-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patchdiff --git a/pkg/linux-headers/sha256 b/pkg/linux-headers/sha256@@ -1 +1 @@ -2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb linux-6.1.tar.xz +8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3 linux-6.4.tar.xzdiff --git a/pkg/linux-headers/url b/pkg/linux-headers/url@@ -1 +1 @@ -url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz" +url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.xz"diff --git a/pkg/linux-headers/ver b/pkg/linux-headers/ver@@ -1 +1 @@ -6.1 r0 +6.4 r0