6 files changed, 44 insertions, 89 deletions

diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
index 538546edbfbd..c7f3321fbe43 100644
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@ -760,8 +760,10 @@ __SYSCALL(__NR_rseq, sys_rseq)
 #define __NR_ftruncate __NR3264_ftruncate
 #define __NR_lseek __NR3264_lseek
 #define __NR_sendfile __NR3264_sendfile
+#if defined(__ARCH_WANT_NEW_STAT) || defined(__ARCH_WANT_STAT64)
 #define __NR_newfstatat __NR3264_fstatat
 #define __NR_fstat __NR3264_fstat
+#endif
 #define __NR_mmap __NR3264_mmap
 #define __NR_fadvise64 __NR3264_fadvise64
 #ifdef __NR3264_stat
@@ -776,8 +778,10 @@ __SYSCALL(__NR_rseq, sys_rseq)
 #define __NR_ftruncate64 __NR3264_ftruncate
 #define __NR_llseek __NR3264_lseek
 #define __NR_sendfile64 __NR3264_sendfile
+#if defined(__ARCH_WANT_NEW_STAT) || defined(__ARCH_WANT_STAT64)
 #define __NR_fstatat64 __NR3264_fstatat
 #define __NR_fstat64 __NR3264_fstat
+#endif
 #define __NR_mmap2 __NR3264_mmap
 #define __NR_fadvise64_64 __NR3264_fadvise64
 #ifdef __NR3264_stat
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 852dc17ab47a..72c453a8bf50 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -2170,7 +2170,7 @@ union bpf_attr {
  *      Return
  *              0 on success, or a negative error in case of failure.
  *
- * struct bpf_sock *bpf_sk_lookup_tcp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u32 netns, u64 flags)
+ * struct bpf_sock *bpf_sk_lookup_tcp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u64 netns, u64 flags)
  *      Description
  *              Look for TCP socket matching *tuple*, optionally in a child
  *              network namespace *netns*. The return value must be checked,
@@ -2187,12 +2187,14 @@ union bpf_attr {
  *              **sizeof**\ (*tuple*\ **->ipv6**)
  *                      Look for an IPv6 socket.
  *
- *              If the *netns* is zero, then the socket lookup table in the
- *              netns associated with the *ctx* will be used. For the TC hooks,
- *              this in the netns of the device in the skb. For socket hooks,
- *              this in the netns of the socket. If *netns* is non-zero, then
- *              it specifies the ID of the netns relative to the netns
- *              associated with the *ctx*.
+ *              If the *netns* is a negative signed 32-bit integer, then the
+ *              socket lookup table in the netns associated with the *ctx* will
+ *              will be used. For the TC hooks, this is the netns of the device
+ *              in the skb. For socket hooks, this is the netns of the socket.
+ *              If *netns* is any other signed 32-bit value greater than or
+ *              equal to zero then it specifies the ID of the netns relative to
+ *              the netns associated with the *ctx*. *netns* values beyond the
+ *              range of 32-bit integers are reserved for future use.
  *
  *              All values for *flags* are reserved for future usage, and must
  *              be left at zero.
@@ -2201,8 +2203,10 @@ union bpf_attr {
  *              **CONFIG_NET** configuration option.
  *      Return
  *              Pointer to *struct bpf_sock*, or NULL in case of failure.
+ *              For sockets with reuseport option, the *struct bpf_sock*
+ *              result is from reuse->socks[] using the hash of the tuple.
  *
- * struct bpf_sock *bpf_sk_lookup_udp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u32 netns, u64 flags)
+ * struct bpf_sock *bpf_sk_lookup_udp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u64 netns, u64 flags)
  *      Description
  *              Look for UDP socket matching *tuple*, optionally in a child
  *              network namespace *netns*. The return value must be checked,
@@ -2219,12 +2223,14 @@ union bpf_attr {
  *              **sizeof**\ (*tuple*\ **->ipv6**)
  *                      Look for an IPv6 socket.
  *
- *              If the *netns* is zero, then the socket lookup table in the
- *              netns associated with the *ctx* will be used. For the TC hooks,
- *              this in the netns of the device in the skb. For socket hooks,
- *              this in the netns of the socket. If *netns* is non-zero, then
- *              it specifies the ID of the netns relative to the netns
- *              associated with the *ctx*.
+ *              If the *netns* is a negative signed 32-bit integer, then the
+ *              socket lookup table in the netns associated with the *ctx* will
+ *              will be used. For the TC hooks, this is the netns of the device
+ *              in the skb. For socket hooks, this is the netns of the socket.
+ *              If *netns* is any other signed 32-bit value greater than or
+ *              equal to zero then it specifies the ID of the netns relative to
+ *              the netns associated with the *ctx*. *netns* values beyond the
+ *              range of 32-bit integers are reserved for future use.
  *
  *              All values for *flags* are reserved for future usage, and must
  *              be left at zero.
@@ -2233,6 +2239,8 @@ union bpf_attr {
  *              **CONFIG_NET** configuration option.
  *      Return
  *              Pointer to *struct bpf_sock*, or NULL in case of failure.
+ *              For sockets with reuseport option, the *struct bpf_sock*
+ *              result is from reuse->socks[] using the hash of the tuple.
  *
  * int bpf_sk_release(struct bpf_sock *sk)
  *      Description
@@ -2405,6 +2413,9 @@ enum bpf_func_id {
 /* BPF_FUNC_perf_event_output for sk_buff input context. */
 #define BPF_F_CTXLEN_MASK               (0xfffffULL << 32)
 
+/* Current network namespace */
+#define BPF_F_CURRENT_NETNS             (-1L)
+
 /* Mode for BPF_FUNC_skb_adjust_room helper. */
 enum bpf_adj_room_mode {
         BPF_ADJ_ROOM_NET,
@@ -2422,6 +2433,12 @@ enum bpf_lwt_encap_mode {
         BPF_LWT_ENCAP_SEG6_INLINE
 };
 
+#define __bpf_md_ptr(type, name)        \
+union {                                 \
+        type name;                      \
+        __u64 :64;                      \
+} __attribute__((aligned(8)))
+
 /* user accessible mirror of in-kernel sk_buff.
  * new fields can only be added to the end of this structure
  */
@@ -2456,7 +2473,7 @@ struct __sk_buff {
         /* ... here. */
 
         __u32 data_meta;
-        struct bpf_flow_keys *flow_keys;
+        __bpf_md_ptr(struct bpf_flow_keys *, flow_keys);
 };
 
 struct bpf_tunnel_key {
@@ -2572,8 +2589,8 @@ enum sk_action {
  * be added to the end of this structure
  */
 struct sk_msg_md {
-        void *data;
-        void *data_end;
+        __bpf_md_ptr(void *, data);
+        __bpf_md_ptr(void *, data_end);
 
         __u32 family;
         __u32 remote_ip4;       /* Stored in network byte order */
@@ -2589,8 +2606,9 @@ struct sk_reuseport_md {
          * Start of directly accessible data. It begins from
          * the tcp/udp header.
          */
-        void *data;
-        void *data_end;         /* End of directly accessible data */
+        __bpf_md_ptr(void *, data);
+        /* End of directly accessible data */
+        __bpf_md_ptr(void *, data_end);
         /*
          * Total length of packet (starting from the tcp/udp header).
          * Note that the directly accessible bytes (data_end - data)
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index 6d180cc60a5d..ae366b87426a 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -716,7 +716,6 @@
  * the situation described above.
  */
 #define REL_RESERVED            0x0a
-#define REL_WHEEL_HI_RES        0x0b
 #define REL_MAX                 0x0f
 #define REL_CNT                 (REL_MAX+1)
 
diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h
index c0d7ea0bf5b6..b17201edfa09 100644
--- a/include/uapi/linux/prctl.h
+++ b/include/uapi/linux/prctl.h
@@ -212,6 +212,7 @@ struct prctl_mm_map {
 #define PR_SET_SPECULATION_CTRL         53
 /* Speculation control variants */
 # define PR_SPEC_STORE_BYPASS           0
+# define PR_SPEC_INDIRECT_BRANCH        1
 /* Return and control values for PR_SET/GET_SPECULATION_CTRL */
 # define PR_SPEC_NOT_AFFECTED           0
 # define PR_SPEC_PRCTL                  (1UL << 0)
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 51b095898f4b..3dcfc6148f99 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -50,6 +50,8 @@
 #ifndef __LINUX_V4L2_CONTROLS_H
 #define __LINUX_V4L2_CONTROLS_H
 
+#include <linux/types.h>
+
 /* Control classes */
 #define V4L2_CTRL_CLASS_USER            0x00980000      /* Old-style 'user' controls */
 #define V4L2_CTRL_CLASS_MPEG            0x00990000      /* MPEG-compression controls */
@@ -402,9 +404,6 @@ enum v4l2_mpeg_video_multi_slice_mode {
 #define V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE           (V4L2_CID_MPEG_BASE+228)
 #define V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME             (V4L2_CID_MPEG_BASE+229)
 
-#define V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS          (V4L2_CID_MPEG_BASE+250)
-#define V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION          (V4L2_CID_MPEG_BASE+251)
-
 #define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP             (V4L2_CID_MPEG_BASE+300)
 #define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP             (V4L2_CID_MPEG_BASE+301)
 #define V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP             (V4L2_CID_MPEG_BASE+302)
@@ -1095,66 +1094,4 @@ enum v4l2_detect_md_mode {
 #define V4L2_CID_DETECT_MD_THRESHOLD_GRID       (V4L2_CID_DETECT_CLASS_BASE + 3)
 #define V4L2_CID_DETECT_MD_REGION_GRID          (V4L2_CID_DETECT_CLASS_BASE + 4)
 
-#define V4L2_MPEG2_PICTURE_CODING_TYPE_I        1
-#define V4L2_MPEG2_PICTURE_CODING_TYPE_P        2
-#define V4L2_MPEG2_PICTURE_CODING_TYPE_B        3
-#define V4L2_MPEG2_PICTURE_CODING_TYPE_D        4
-
-struct v4l2_mpeg2_sequence {
-        /* ISO/IEC 13818-2, ITU-T Rec. H.262: Sequence header */
-        __u16   horizontal_size;
-        __u16   vertical_size;
-        __u32   vbv_buffer_size;
-
-        /* ISO/IEC 13818-2, ITU-T Rec. H.262: Sequence extension */
-        __u8    profile_and_level_indication;
-        __u8    progressive_sequence;
-        __u8    chroma_format;
-};
-
-struct v4l2_mpeg2_picture {
-        /* ISO/IEC 13818-2, ITU-T Rec. H.262: Picture header */
-        __u8    picture_coding_type;
-
-        /* ISO/IEC 13818-2, ITU-T Rec. H.262: Picture coding extension */
-        __u8    f_code[2][2];
-        __u8    intra_dc_precision;
-        __u8    picture_structure;
-        __u8    top_field_first;
-        __u8    frame_pred_frame_dct;
-        __u8    concealment_motion_vectors;
-        __u8    q_scale_type;
-        __u8    intra_vlc_format;
-        __u8    alternate_scan;
-        __u8    repeat_first_field;
-        __u8    progressive_frame;
-};
-
-struct v4l2_ctrl_mpeg2_slice_params {
-        __u32   bit_size;
-        __u32   data_bit_offset;
-
-        struct v4l2_mpeg2_sequence sequence;
-        struct v4l2_mpeg2_picture picture;
-
-        /* ISO/IEC 13818-2, ITU-T Rec. H.262: Slice */
-        __u8    quantiser_scale_code;
-
-        __u8    backward_ref_index;
-        __u8    forward_ref_index;
-};
-
-struct v4l2_ctrl_mpeg2_quantization {
-        /* ISO/IEC 13818-2, ITU-T Rec. H.262: Quant matrix extension */
-        __u8    load_intra_quantiser_matrix;
-        __u8    load_non_intra_quantiser_matrix;
-        __u8    load_chroma_intra_quantiser_matrix;
-        __u8    load_chroma_non_intra_quantiser_matrix;
-
-        __u8    intra_quantiser_matrix[64];
-        __u8    non_intra_quantiser_matrix[64];
-        __u8    chroma_intra_quantiser_matrix[64];
-        __u8    chroma_non_intra_quantiser_matrix[64];
-};
-
 #endif
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index c8e8ff810190..2ba2ad0e23fb 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -1622,8 +1622,6 @@ struct v4l2_ext_control {
                 __u8 __user *p_u8;
                 __u16 __user *p_u16;
                 __u32 __user *p_u32;
-                struct v4l2_ctrl_mpeg2_slice_params __user *p_mpeg2_slice_params;
-                struct v4l2_ctrl_mpeg2_quantization __user *p_mpeg2_quantization;
                 void __user *ptr;
         };
 } __attribute__ ((packed));
@@ -1669,8 +1667,6 @@ enum v4l2_ctrl_type {
         V4L2_CTRL_TYPE_U8            = 0x0100,
         V4L2_CTRL_TYPE_U16           = 0x0101,
         V4L2_CTRL_TYPE_U32           = 0x0102,
-        V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS = 0x0103,
-        V4L2_CTRL_TYPE_MPEG2_QUANTIZATION = 0x0104,
 };
 
 /*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */