matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uapi: update kernel headers 

pre-rc1 version of Linux kernel headers.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2020-08-11 13:18:41 -07:00
parent e8e8f16ed1
commit 52d767aff8
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/uapi/linux/bpf.h
View File

@ -117,6 +117,7 @@ enum bpf_cmd {
BPF_LINK_GET_NEXT_ID, BPF_LINK_GET_NEXT_ID,
BPF_ENABLE_STATS, BPF_ENABLE_STATS,
BPF_ITER_CREATE, BPF_ITER_CREATE,
BPF_LINK_DETACH,
}; };
enum bpf_map_type { enum bpf_map_type {
@ -230,6 +231,7 @@ enum bpf_attach_type {
BPF_CGROUP_INET_SOCK_RELEASE, BPF_CGROUP_INET_SOCK_RELEASE,
BPF_XDP_CPUMAP, BPF_XDP_CPUMAP,
BPF_SK_LOOKUP, BPF_SK_LOOKUP,
BPF_XDP,
__MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE
}; };
@ -242,10 +244,18 @@ enum bpf_link_type {
BPF_LINK_TYPE_CGROUP = 3, BPF_LINK_TYPE_CGROUP = 3,
BPF_LINK_TYPE_ITER = 4, BPF_LINK_TYPE_ITER = 4,
BPF_LINK_TYPE_NETNS = 5, BPF_LINK_TYPE_NETNS = 5,
BPF_LINK_TYPE_XDP = 6,
MAX_BPF_LINK_TYPE, MAX_BPF_LINK_TYPE,
}; };
enum bpf_iter_link_info {
BPF_ITER_LINK_UNSPEC = 0,
BPF_ITER_LINK_MAP_FD = 1,
MAX_BPF_ITER_LINK_INFO,
};
/* cgroup-bpf attach flags used in BPF_PROG_ATTACH command /* cgroup-bpf attach flags used in BPF_PROG_ATTACH command
* *
* NONE(default): No further bpf programs allowed in the subtree. * NONE(default): No further bpf programs allowed in the subtree.
@ -607,7 +617,10 @@ union bpf_attr {
struct { /* struct used by BPF_LINK_CREATE command */ struct { /* struct used by BPF_LINK_CREATE command */
__u32 prog_fd; /* eBPF program to attach */ __u32 prog_fd; /* eBPF program to attach */
__u32 target_fd; /* object to attach to */ union {
__u32 target_fd; /* object to attach to */
__u32 target_ifindex; /* target ifindex */
};
__u32 attach_type; /* attach type */ __u32 attach_type; /* attach type */
__u32 flags; /* extra flags */ __u32 flags; /* extra flags */
} link_create; } link_create;
@ -622,6 +635,10 @@ union bpf_attr {
__u32 old_prog_fd; __u32 old_prog_fd;
} link_update; } link_update;
struct {
__u32 link_fd;
} link_detach;
struct { /* struct used by BPF_ENABLE_STATS command */ struct { /* struct used by BPF_ENABLE_STATS command */
__u32 type; __u32 type;
} enable_stats; } enable_stats;
@ -3229,7 +3246,7 @@ union bpf_attr {
* Return * Return
* The id is returned or 0 in case the id could not be retrieved. * The id is returned or 0 in case the id could not be retrieved.
* *
* int bpf_ringbuf_output(void *ringbuf, void *data, u64 size, u64 flags) * long bpf_ringbuf_output(void *ringbuf, void *data, u64 size, u64 flags)
* Description * Description
* Copy *size* bytes from *data* into a ring buffer *ringbuf*. * Copy *size* bytes from *data* into a ring buffer *ringbuf*.
* If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification * If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
@ -4057,6 +4074,9 @@ struct bpf_link_info {
__u32 netns_ino; __u32 netns_ino;
__u32 attach_type; __u32 attach_type;
} netns; } netns;
struct {
__u32 ifindex;
} xdp;
}; };
} __attribute__((aligned(8))); } __attribute__((aligned(8)));

1
include/uapi/linux/seg6_iptunnel.h
View File

@ -37,5 +37,4 @@ enum {
SEG6_IPTUN_MODE_L2ENCAP, SEG6_IPTUN_MODE_L2ENCAP,
}; };
#endif #endif