Merge tag 'v4.18-rc6' into HEAD

Pull bug fixes into the KVM development tree to avoid nasty conflicts.

7 files changed, 93 insertions, 109 deletions

diff --git a/include/uapi/linux/aio_abi.h b/include/uapi/linux/aio_abi.h
index d00221345c19..d4593a6062ef 100644
--- a/include/uapi/linux/aio_abi.h
+++ b/include/uapi/linux/aio_abi.h
@@ -29,7 +29,6 @@
 
 #include <linux/types.h>
 #include <linux/fs.h>
-#include <linux/signal.h>
 #include <asm/byteorder.h>
 
 typedef __kernel_ulong_t aio_context_t;
@@ -39,8 +38,10 @@ enum {
         IOCB_CMD_PWRITE = 1,
         IOCB_CMD_FSYNC = 2,
         IOCB_CMD_FDSYNC = 3,
-        /* 4 was the experimental IOCB_CMD_PREADX */
-        IOCB_CMD_POLL = 5,
+        /* These two are experimental.
+         * IOCB_CMD_PREADX = 4,
+         * IOCB_CMD_POLL = 5,
+         */
         IOCB_CMD_NOOP = 6,
         IOCB_CMD_PREADV = 7,
         IOCB_CMD_PWRITEV = 8,
@@ -108,10 +109,5 @@ struct iocb {
 #undef IFBIG
 #undef IFLITTLE
 
-struct __aio_sigset {
-        const sigset_t __user   *sigmask;
-        size_t          sigsetsize;
-};
-
 #endif /* __LINUX__AIO_ABI_H */
 
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 59b19b6a40d7..b7db3261c62d 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1857,7 +1857,8 @@ union bpf_attr {
  *              is resolved), the nexthop address is returned in ipv4_dst
  *              or ipv6_dst based on family, smac is set to mac address of
  *              egress device, dmac is set to nexthop mac address, rt_metric
- *              is set to metric from route (IPv4/IPv6 only).
+ *              is set to metric from route (IPv4/IPv6 only), and ifindex
+ *              is set to the device index of the nexthop from the FIB lookup.
  *
  *             *plen* argument is the size of the passed in struct.
  *             *flags* argument can be a combination of one or more of the
@@ -1873,9 +1874,10 @@ union bpf_attr {
  *             *ctx* is either **struct xdp_md** for XDP programs or
  *             **struct sk_buff** tc cls_act programs.
  *     Return
- *             Egress device index on success, 0 if packet needs to continue
- *             up the stack for further processing or a negative error in case
- *             of failure.
+ *              * < 0 if any input argument is invalid
+ *              *   0 on success (packet is forwarded, nexthop neighbor exists)
+ *              * > 0 one of **BPF_FIB_LKUP_RET_** codes explaining why the
+ *              *     packet is not forwarded or needs assist from full stack
  *
  * int bpf_sock_hash_update(struct bpf_sock_ops_kern *skops, struct bpf_map *map, void *key, u64 flags)
  *      Description
@@ -2612,6 +2614,18 @@ struct bpf_raw_tracepoint_args {
 #define BPF_FIB_LOOKUP_DIRECT  BIT(0)
 #define BPF_FIB_LOOKUP_OUTPUT  BIT(1)
 
+enum {
+        BPF_FIB_LKUP_RET_SUCCESS,      /* lookup successful */
+        BPF_FIB_LKUP_RET_BLACKHOLE,    /* dest is blackholed; can be dropped */
+        BPF_FIB_LKUP_RET_UNREACHABLE,  /* dest is unreachable; can be dropped */
+        BPF_FIB_LKUP_RET_PROHIBIT,     /* dest not allowed; can be dropped */
+        BPF_FIB_LKUP_RET_NOT_FWDED,    /* packet is not forwarded */
+        BPF_FIB_LKUP_RET_FWD_DISABLED, /* fwding is not enabled on ingress */
+        BPF_FIB_LKUP_RET_UNSUPP_LWT,   /* fwd requires encapsulation */
+        BPF_FIB_LKUP_RET_NO_NEIGH,     /* no neighbor entry for nh */
+        BPF_FIB_LKUP_RET_FRAG_NEEDED,  /* fragmentation required to fwd */
+};
+
 struct bpf_fib_lookup {
         /* input:  network family for lookup (AF_INET, AF_INET6)
          * output: network family of egress nexthop
@@ -2625,7 +2639,11 @@ struct bpf_fib_lookup {
 
         /* total length of packet from network header - used for MTU check */
         __u16   tot_len;
-        __u32   ifindex;  /* L3 device index for lookup */
+
+        /* input: L3 device index for lookup
+         * output: device index from FIB lookup
+         */
+        __u32   ifindex;
 
         union {
                 /* inputs to lookup */
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 4ca65b56084f..7363f18e65a5 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -226,7 +226,7 @@ enum tunable_id {
         ETHTOOL_TX_COPYBREAK,
         ETHTOOL_PFC_PREVENTION_TOUT, /* timeout in msecs */
         /*
-         * Add your fresh new tubale attribute above and remember to update
+         * Add your fresh new tunable attribute above and remember to update
          * tunable_strings[] in net/core/ethtool.c
          */
         __ETHTOOL_TUNABLE_COUNT,
diff --git a/include/uapi/linux/rseq.h b/include/uapi/linux/rseq.h
index d620fa43756c..9a402fdb60e9 100644
--- a/include/uapi/linux/rseq.h
+++ b/include/uapi/linux/rseq.h
@@ -10,13 +10,8 @@
  * Copyright (c) 2015-2018 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#ifdef __KERNEL__
-# include <linux/types.h>
-#else
-# include <stdint.h>
-#endif
-
-#include <linux/types_32_64.h>
+#include <linux/types.h>
+#include <asm/byteorder.h>
 
 enum rseq_cpu_id_state {
         RSEQ_CPU_ID_UNINITIALIZED               = -1,
@@ -52,10 +47,10 @@ struct rseq_cs {
         __u32 version;
         /* enum rseq_cs_flags */
         __u32 flags;
-        LINUX_FIELD_u32_u64(start_ip);
+        __u64 start_ip;
         /* Offset from start_ip. */
-        LINUX_FIELD_u32_u64(post_commit_offset);
-        LINUX_FIELD_u32_u64(abort_ip);
+        __u64 post_commit_offset;
+        __u64 abort_ip;
 } __attribute__((aligned(4 * sizeof(__u64))));
 
 /*
@@ -67,28 +62,30 @@ struct rseq_cs {
 struct rseq {
         /*
          * Restartable sequences cpu_id_start field. Updated by the
-         * kernel, and read by user-space with single-copy atomicity
-         * semantics. Aligned on 32-bit. Always contains a value in the
-         * range of possible CPUs, although the value may not be the
-         * actual current CPU (e.g. if rseq is not initialized). This
-         * CPU number value should always be compared against the value
-         * of the cpu_id field before performing a rseq commit or
-         * returning a value read from a data structure indexed using
-         * the cpu_id_start value.
+         * kernel. Read by user-space with single-copy atomicity
+         * semantics. This field should only be read by the thread which
+         * registered this data structure. Aligned on 32-bit. Always
+         * contains a value in the range of possible CPUs, although the
+         * value may not be the actual current CPU (e.g. if rseq is not
+         * initialized). This CPU number value should always be compared
+         * against the value of the cpu_id field before performing a rseq
+         * commit or returning a value read from a data structure indexed
+         * using the cpu_id_start value.
          */
         __u32 cpu_id_start;
         /*
-         * Restartable sequences cpu_id field. Updated by the kernel,
-         * and read by user-space with single-copy atomicity semantics.
-         * Aligned on 32-bit. Values RSEQ_CPU_ID_UNINITIALIZED and
-         * RSEQ_CPU_ID_REGISTRATION_FAILED have a special semantic: the
-         * former means "rseq uninitialized", and latter means "rseq
-         * initialization failed". This value is meant to be read within
-         * rseq critical sections and compared with the cpu_id_start
-         * value previously read, before performing the commit instruction,
-         * or read and compared with the cpu_id_start value before returning
-         * a value loaded from a data structure indexed using the
-         * cpu_id_start value.
+         * Restartable sequences cpu_id field. Updated by the kernel.
+         * Read by user-space with single-copy atomicity semantics. This
+         * field should only be read by the thread which registered this
+         * data structure. Aligned on 32-bit. Values
+         * RSEQ_CPU_ID_UNINITIALIZED and RSEQ_CPU_ID_REGISTRATION_FAILED
+         * have a special semantic: the former means "rseq uninitialized",
+         * and latter means "rseq initialization failed". This value is
+         * meant to be read within rseq critical sections and compared
+         * with the cpu_id_start value previously read, before performing
+         * the commit instruction, or read and compared with the
+         * cpu_id_start value before returning a value loaded from a data
+         * structure indexed using the cpu_id_start value.
          */
         __u32 cpu_id;
         /*
@@ -105,27 +102,44 @@ struct rseq {
          * targeted by the rseq_cs. Also needs to be set to NULL by user-space
          * before reclaiming memory that contains the targeted struct rseq_cs.
          *
-         * Read and set by the kernel with single-copy atomicity semantics.
-         * Set by user-space with single-copy atomicity semantics. Aligned
-         * on 64-bit.
+         * Read and set by the kernel. Set by user-space with single-copy
+         * atomicity semantics. This field should only be updated by the
+         * thread which registered this data structure. Aligned on 64-bit.
          */
-        LINUX_FIELD_u32_u64(rseq_cs);
+        union {
+                __u64 ptr64;
+#ifdef __LP64__
+                __u64 ptr;
+#else
+                struct {
+#if (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN)) || defined(__BIG_ENDIAN)
+                        __u32 padding;          /* Initialized to zero. */
+                        __u32 ptr32;
+#else /* LITTLE */
+                        __u32 ptr32;
+                        __u32 padding;          /* Initialized to zero. */
+#endif /* ENDIAN */
+                } ptr;
+#endif
+        } rseq_cs;
+
         /*
-         * - RSEQ_DISABLE flag:
+         * Restartable sequences flags field.
+         *
+         * This field should only be updated by the thread which
+         * registered this data structure. Read by the kernel.
+         * Mainly used for single-stepping through rseq critical sections
+         * with debuggers.
          *
-         * Fallback fast-track flag for single-stepping.
-         * Set by user-space if lack of progress is detected.
-         * Cleared by user-space after rseq finish.
-         * Read by the kernel.
          * - RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT
-         *     Inhibit instruction sequence block restart and event
-         *     counter increment on preemption for this thread.
+         *     Inhibit instruction sequence block restart on preemption
+         *     for this thread.
          * - RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL
-         *     Inhibit instruction sequence block restart and event
-         *     counter increment on signal delivery for this thread.
+         *     Inhibit instruction sequence block restart on signal
+         *     delivery for this thread.
          * - RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE
-         *     Inhibit instruction sequence block restart and event
-         *     counter increment on migration for this thread.
+         *     Inhibit instruction sequence block restart on migration for
+         *     this thread.
          */
         __u32 flags;
 } __attribute__((aligned(4 * sizeof(__u64))));
diff --git a/include/uapi/linux/target_core_user.h b/include/uapi/linux/target_core_user.h
index 6e299349b158..b7b57967d90f 100644
--- a/include/uapi/linux/target_core_user.h
+++ b/include/uapi/linux/target_core_user.h
@@ -44,6 +44,7 @@
 #define TCMU_MAILBOX_VERSION 2
 #define ALIGN_SIZE 64 /* Should be enough for most CPUs */
 #define TCMU_MAILBOX_FLAG_CAP_OOOC (1 << 0) /* Out-of-order completions */
+#define TCMU_MAILBOX_FLAG_CAP_READ_LEN (1 << 1) /* Read data length */
 
 struct tcmu_mailbox {
         __u16 version;
@@ -71,6 +72,7 @@ struct tcmu_cmd_entry_hdr {
         __u16 cmd_id;
         __u8 kflags;
 #define TCMU_UFLAG_UNKNOWN_OP 0x1
+#define TCMU_UFLAG_READ_LEN   0x2
         __u8 uflags;
 
 } __packed;
@@ -119,7 +121,7 @@ struct tcmu_cmd_entry {
                         __u8 scsi_status;
                         __u8 __pad1;
                         __u16 __pad2;
-                        __u32 __pad3;
+                        __u32 read_len;
                         char sense_buffer[TCMU_SENSE_BUFFERSIZE];
                 } rsp;
         };
diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index 29eb659aa77a..e3f6ed8a7064 100644
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -127,6 +127,10 @@ enum {
 
 #define TCP_CM_INQ              TCP_INQ
 
+#define TCP_REPAIR_ON           1
+#define TCP_REPAIR_OFF          0
+#define TCP_REPAIR_OFF_NO_WP    -1      /* Turn off without window probes */
+
 struct tcp_repair_opt {
         __u32   opt_code;
         __u32   opt_val;
diff --git a/include/uapi/linux/types_32_64.h b/include/uapi/linux/types_32_64.h
deleted file mode 100644
index 0a87ace34a57..000000000000
--- a/include/uapi/linux/types_32_64.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
-#ifndef _UAPI_LINUX_TYPES_32_64_H
-#define _UAPI_LINUX_TYPES_32_64_H
-
-/*
- * linux/types_32_64.h
- *
- * Integer type declaration for pointers across 32-bit and 64-bit systems.
- *
- * Copyright (c) 2015-2018 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifdef __KERNEL__
-# include <linux/types.h>
-#else
-# include <stdint.h>
-#endif
-
-#include <asm/byteorder.h>
-
-#ifdef __BYTE_ORDER
-# if (__BYTE_ORDER == __BIG_ENDIAN)
-#  define LINUX_BYTE_ORDER_BIG_ENDIAN
-# else
-#  define LINUX_BYTE_ORDER_LITTLE_ENDIAN
-# endif
-#else
-# ifdef __BIG_ENDIAN
-#  define LINUX_BYTE_ORDER_BIG_ENDIAN
-# else
-#  define LINUX_BYTE_ORDER_LITTLE_ENDIAN
-# endif
-#endif
-
-#ifdef __LP64__
-# define LINUX_FIELD_u32_u64(field)                     __u64 field
-# define LINUX_FIELD_u32_u64_INIT_ONSTACK(field, v)     field = (intptr_t)v
-#else
-# ifdef LINUX_BYTE_ORDER_BIG_ENDIAN
-#  define LINUX_FIELD_u32_u64(field)    __u32 field ## _padding, field
-#  define LINUX_FIELD_u32_u64_INIT_ONSTACK(field, v)    \
-        field ## _padding = 0, field = (intptr_t)v
-# else
-#  define LINUX_FIELD_u32_u64(field)    __u32 field, field ## _padding
-#  define LINUX_FIELD_u32_u64_INIT_ONSTACK(field, v)    \
-        field = (intptr_t)v, field ## _padding = 0
-# endif
-#endif
-
-#endif /* _UAPI_LINUX_TYPES_32_64_H */