11 files changed, 103 insertions, 30 deletions

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 ae366b87426a..7f14d4a66c28 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -716,6 +716,8 @@
  * the situation described above.
  */
 #define REL_RESERVED            0x0a
+#define REL_WHEEL_HI_RES        0x0b
+#define REL_HWHEEL_HI_RES       0x0c
 #define REL_MAX                 0x0f
 #define REL_CNT                 (REL_MAX+1)
 
diff --git a/include/uapi/linux/keyctl.h b/include/uapi/linux/keyctl.h
index 0f3cb13db8e9..f45ee0f69c0c 100644
--- a/include/uapi/linux/keyctl.h
+++ b/include/uapi/linux/keyctl.h
@@ -61,6 +61,11 @@
 #define KEYCTL_INVALIDATE               21      /* invalidate a key */
 #define KEYCTL_GET_PERSISTENT           22      /* get a user's persistent keyring */
 #define KEYCTL_DH_COMPUTE               23      /* Compute Diffie-Hellman values */
+#define KEYCTL_PKEY_QUERY               24      /* Query public key parameters */
+#define KEYCTL_PKEY_ENCRYPT             25      /* Encrypt a blob using a public key */
+#define KEYCTL_PKEY_DECRYPT             26      /* Decrypt a blob using a public key */
+#define KEYCTL_PKEY_SIGN                27      /* Create a public key signature */
+#define KEYCTL_PKEY_VERIFY              28      /* Verify a public key signature */
 #define KEYCTL_RESTRICT_KEYRING         29      /* Restrict keys allowed to link to a keyring */
 
 /* keyctl structures */
@@ -82,4 +87,29 @@ struct keyctl_kdf_params {
         __u32 __spare[8];
 };
 
+#define KEYCTL_SUPPORTS_ENCRYPT         0x01
+#define KEYCTL_SUPPORTS_DECRYPT         0x02
+#define KEYCTL_SUPPORTS_SIGN            0x04
+#define KEYCTL_SUPPORTS_VERIFY          0x08
+
+struct keyctl_pkey_query {
+        __u32           supported_ops;  /* Which ops are supported */
+        __u32           key_size;       /* Size of the key in bits */
+        __u16           max_data_size;  /* Maximum size of raw data to sign in bytes */
+        __u16           max_sig_size;   /* Maximum size of signature in bytes */
+        __u16           max_enc_size;   /* Maximum size of encrypted blob in bytes */
+        __u16           max_dec_size;   /* Maximum size of decrypted blob in bytes */
+        __u32           __spare[10];
+};
+
+struct keyctl_pkey_params {
+        __s32           key_id;         /* Serial no. of public key to use */
+        __u32           in_len;         /* Input data size */
+        union {
+                __u32           out_len;        /* Output buffer size (encrypt/decrypt/sign) */
+                __u32           in2_len;        /* 2nd input data size (verify) */
+        };
+        __u32           __spare[7];
+};
+
 #endif /*  _LINUX_KEYCTL_H */
diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
index f5ff8a76e208..b01eb502d49c 100644
--- a/include/uapi/linux/kfd_ioctl.h
+++ b/include/uapi/linux/kfd_ioctl.h
@@ -83,11 +83,11 @@ struct kfd_ioctl_set_cu_mask_args {
 };
 
 struct kfd_ioctl_get_queue_wave_state_args {
-        uint64_t ctl_stack_address;     /* to KFD */
-        uint32_t ctl_stack_used_size;   /* from KFD */
-        uint32_t save_area_used_size;   /* from KFD */
-        uint32_t queue_id;              /* to KFD */
-        uint32_t pad;
+        __u64 ctl_stack_address;        /* to KFD */
+        __u32 ctl_stack_used_size;      /* from KFD */
+        __u32 save_area_used_size;      /* from KFD */
+        __u32 queue_id;                 /* to KFD */
+        __u32 pad;
 };
 
 /* For kfd_ioctl_set_memory_policy_args.default_policy and alternate_policy */
@@ -255,10 +255,10 @@ struct kfd_hsa_memory_exception_data {
 
 /* hw exception data */
 struct kfd_hsa_hw_exception_data {
-        uint32_t reset_type;
-        uint32_t reset_cause;
-        uint32_t memory_lost;
-        uint32_t gpu_id;
+        __u32 reset_type;
+        __u32 reset_cause;
+        __u32 memory_lost;
+        __u32 gpu_id;
 };
 
 /* Event data */
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
index 579974b0bf0d..7de4f1bdaf06 100644
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@ -1635,8 +1635,8 @@ enum nft_ng_attributes {
         NFTA_NG_MODULUS,
         NFTA_NG_TYPE,
         NFTA_NG_OFFSET,
-        NFTA_NG_SET_NAME,
-        NFTA_NG_SET_ID,
+        NFTA_NG_SET_NAME,       /* deprecated */
+        NFTA_NG_SET_ID,         /* deprecated */
         __NFTA_NG_MAX
 };
 #define NFTA_NG_MAX     (__NFTA_NG_MAX - 1)
diff --git a/include/uapi/linux/netfilter_bridge.h b/include/uapi/linux/netfilter_bridge.h
index 156ccd089df1..1610fdbab98d 100644
--- a/include/uapi/linux/netfilter_bridge.h
+++ b/include/uapi/linux/netfilter_bridge.h
@@ -11,6 +11,10 @@
 #include <linux/if_vlan.h>
 #include <linux/if_pppox.h>
 
+#ifndef __KERNEL__
+#include <limits.h> /* for INT_MIN, INT_MAX */
+#endif
+
 /* Bridge Hooks */
 /* After promisc drops, checksum checks. */
 #define NF_BR_PRE_ROUTING       0
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index f35eb72739c0..9de8780ac8d9 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -646,10 +646,12 @@ struct perf_event_mmap_page {
  *
  *   PERF_RECORD_MISC_MMAP_DATA  - PERF_RECORD_MMAP* events
  *   PERF_RECORD_MISC_COMM_EXEC  - PERF_RECORD_COMM event
+ *   PERF_RECORD_MISC_FORK_EXEC  - PERF_RECORD_FORK event (perf internal)
  *   PERF_RECORD_MISC_SWITCH_OUT - PERF_RECORD_SWITCH* events
  */
 #define PERF_RECORD_MISC_MMAP_DATA              (1 << 13)
 #define PERF_RECORD_MISC_COMM_EXEC              (1 << 13)
+#define PERF_RECORD_MISC_FORK_EXEC              (1 << 13)
 #define PERF_RECORD_MISC_SWITCH_OUT             (1 << 13)
 /*
  * These PERF_RECORD_MISC_* flags below are safely reused
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/sctp.h b/include/uapi/linux/sctp.h
index 34dd3d497f2c..c81feb373d3e 100644
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
@@ -568,6 +568,8 @@ struct sctp_assoc_reset_event {
 
 #define SCTP_ASSOC_CHANGE_DENIED        0x0004
 #define SCTP_ASSOC_CHANGE_FAILED        0x0008
+#define SCTP_STREAM_CHANGE_DENIED       SCTP_ASSOC_CHANGE_DENIED
+#define SCTP_STREAM_CHANGE_FAILED       SCTP_ASSOC_CHANGE_FAILED
 struct sctp_stream_change_event {
         __u16 strchange_type;
         __u16 strchange_flags;
@@ -1151,6 +1153,7 @@ struct sctp_add_streams {
 /* SCTP Stream schedulers */
 enum sctp_sched_type {
         SCTP_SS_FCFS,
+        SCTP_SS_DEFAULT = SCTP_SS_FCFS,
         SCTP_SS_PRIO,
         SCTP_SS_RR,
         SCTP_SS_MAX = SCTP_SS_RR
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 51b095898f4b..998983a6e6b7 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 */
@@ -1110,6 +1112,7 @@ struct v4l2_mpeg2_sequence {
         __u8    profile_and_level_indication;
         __u8    progressive_sequence;
         __u8    chroma_format;
+        __u8    pad;
 };
 
 struct v4l2_mpeg2_picture {
@@ -1128,6 +1131,7 @@ struct v4l2_mpeg2_picture {
         __u8    alternate_scan;
         __u8    repeat_first_field;
         __u8    progressive_frame;
+        __u8    pad;
 };
 
 struct v4l2_ctrl_mpeg2_slice_params {
@@ -1142,6 +1146,7 @@ struct v4l2_ctrl_mpeg2_slice_params {
 
         __u8    backward_ref_index;
         __u8    forward_ref_index;
+        __u8    pad;
 };
 
 struct v4l2_ctrl_mpeg2_quantization {
diff --git a/include/uapi/linux/virtio_balloon.h b/include/uapi/linux/virtio_balloon.h
index 13b8cb563892..a1966cd7b677 100644
--- a/include/uapi/linux/virtio_balloon.h
+++ b/include/uapi/linux/virtio_balloon.h
@@ -34,15 +34,23 @@
 #define VIRTIO_BALLOON_F_MUST_TELL_HOST 0 /* Tell before reclaiming pages */
 #define VIRTIO_BALLOON_F_STATS_VQ       1 /* Memory Stats virtqueue */
 #define VIRTIO_BALLOON_F_DEFLATE_ON_OOM 2 /* Deflate balloon on OOM */
+#define VIRTIO_BALLOON_F_FREE_PAGE_HINT 3 /* VQ to report free pages */
+#define VIRTIO_BALLOON_F_PAGE_POISON    4 /* Guest is using page poisoning */
 
 /* Size of a PFN in the balloon interface. */
 #define VIRTIO_BALLOON_PFN_SHIFT 12
 
+#define VIRTIO_BALLOON_CMD_ID_STOP      0
+#define VIRTIO_BALLOON_CMD_ID_DONE      1
 struct virtio_balloon_config {
         /* Number of pages host wants Guest to give up. */
         __u32 num_pages;
         /* Number of pages we've actually got in balloon. */
         __u32 actual;
+        /* Free page report command id, readonly by guest */
+        __u32 free_page_report_cmd_id;
+        /* Stores PAGE_POISON if page poisoning is in use */
+        __u32 poison_val;
 };
 
 #define VIRTIO_BALLOON_S_SWAP_IN  0   /* Amount of memory swapped in */