Update kernel headers from 4.14-rc8 nete-next

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index c819b2254724bc8a83ab787b8e254787cbe7efe5..153f6437b06776cf1aea6d70853e2ec2dfa647a3 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -131,6 +131,7 @@ enum bpf_prog_type {
        BPF_PROG_TYPE_LWT_XMIT,
        BPF_PROG_TYPE_SOCK_OPS,
        BPF_PROG_TYPE_SK_SKB,
+       BPF_PROG_TYPE_CGROUP_DEVICE,
 };
 
 enum bpf_attach_type {
@@ -140,6 +141,7 @@ enum bpf_attach_type {
        BPF_CGROUP_SOCK_OPS,
        BPF_SK_SKB_STREAM_PARSER,
        BPF_SK_SKB_STREAM_VERDICT,
+       BPF_CGROUP_DEVICE,
        __MAX_BPF_ATTACH_TYPE
 };
 
@@ -259,6 +261,7 @@ union bpf_attr {
                __u32           kern_version;   /* checked when prog_type=kprobe */
                __u32           prog_flags;
                char            prog_name[BPF_OBJ_NAME_LEN];
+               __u32           prog_target_ifindex;    /* ifindex of netdev to prep for */
        };
 
        struct { /* anonymous struct used by BPF_OBJ_* commands */
@@ -889,11 +892,14 @@ struct xdp_md {
 enum sk_action {
        SK_DROP = 0,
        SK_PASS,
-       SK_REDIRECT,
 };
 
 #define BPF_TAG_SIZE   8
 
+enum bpf_prog_status {
+       BPF_PROG_STATUS_DEV_BOUND       = (1 << 0),
+};
+
 struct bpf_prog_info {
        __u32 type;
        __u32 id;
@@ -907,6 +913,8 @@ struct bpf_prog_info {
        __u32 nr_map_ids;
        __aligned_u64 map_ids;
        char name[BPF_OBJ_NAME_LEN];
+       __u32 ifindex;
+       __u32 status;
 } __attribute__((aligned(8)));
 
 struct bpf_map_info {
@@ -984,4 +992,17 @@ struct bpf_perf_event_value {
        __u64 running;
 };
 
+#define BPF_DEVCG_ACC_MKNOD    (1ULL << 0)
+#define BPF_DEVCG_ACC_READ     (1ULL << 1)
+#define BPF_DEVCG_ACC_WRITE    (1ULL << 2)
+
+#define BPF_DEVCG_DEV_BLOCK    (1ULL << 0)
+#define BPF_DEVCG_DEV_CHAR     (1ULL << 1)
+
+struct bpf_cgroup_dev_ctx {
+       __u32 access_type; /* (access << 16) | type */
+       __u32 major;
+       __u32 minor;
+};
+
 #endif /* __LINUX_BPF_H__ */

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 35bc598566e00383bcc930ac202cd1ed42d3f636..2d19a4c1eaac52433506b13376d327b2ad467cd7 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -159,6 +159,7 @@ enum {
        IFLA_XDP,
        IFLA_EVENT,
        IFLA_NEW_NETNSID,
+       IFLA_IF_NETNSID,
        __IFLA_MAX
 };