mirror of
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git
synced 2024-11-15 05:55:11 +08:00
Update kernel headers
Update kernel headers to commit: 237bb5f7f7f5 ("cxgb4: unnecessary check for 0 in the free_sge_txq_uld() function") Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
parent
a9fce55334
commit
8b3b71898d
@ -42,6 +42,7 @@
|
||||
#define BPF_JSGE 0x70 /* SGE is signed '>=', GE in x86 */
|
||||
#define BPF_JSLT 0xc0 /* SLT is signed, '<' */
|
||||
#define BPF_JSLE 0xd0 /* SLE is signed, '<=' */
|
||||
#define BPF_JCOND 0xe0 /* conditional pseudo jumps: may_goto, goto_or_nop */
|
||||
#define BPF_CALL 0x80 /* function call */
|
||||
#define BPF_EXIT 0x90 /* function return */
|
||||
|
||||
@ -50,6 +51,10 @@
|
||||
#define BPF_XCHG (0xe0 | BPF_FETCH) /* atomic exchange */
|
||||
#define BPF_CMPXCHG (0xf0 | BPF_FETCH) /* atomic compare-and-write */
|
||||
|
||||
enum bpf_cond_pseudo_jmp {
|
||||
BPF_MAY_GOTO = 0,
|
||||
};
|
||||
|
||||
/* Register numbers */
|
||||
enum {
|
||||
BPF_REG_0 = 0,
|
||||
@ -1004,6 +1009,7 @@ enum bpf_map_type {
|
||||
BPF_MAP_TYPE_BLOOM_FILTER,
|
||||
BPF_MAP_TYPE_USER_RINGBUF,
|
||||
BPF_MAP_TYPE_CGRP_STORAGE,
|
||||
BPF_MAP_TYPE_ARENA,
|
||||
__MAX_BPF_MAP_TYPE
|
||||
};
|
||||
|
||||
@ -1333,6 +1339,10 @@ enum {
|
||||
*/
|
||||
#define BPF_PSEUDO_KFUNC_CALL 2
|
||||
|
||||
enum bpf_addr_space_cast {
|
||||
BPF_ADDR_SPACE_CAST = 1,
|
||||
};
|
||||
|
||||
/* flags for BPF_MAP_UPDATE_ELEM command */
|
||||
enum {
|
||||
BPF_ANY = 0, /* create new element or update existing */
|
||||
@ -1391,6 +1401,12 @@ enum {
|
||||
|
||||
/* BPF token FD is passed in a corresponding command's token_fd field */
|
||||
BPF_F_TOKEN_FD = (1U << 16),
|
||||
|
||||
/* When user space page faults in bpf_arena send SIGSEGV instead of inserting new page */
|
||||
BPF_F_SEGV_ON_FAULT = (1U << 17),
|
||||
|
||||
/* Do not translate kernel bpf_arena pointers to user pointers */
|
||||
BPF_F_NO_USER_CONV = (1U << 18),
|
||||
};
|
||||
|
||||
/* Flags for BPF_PROG_QUERY. */
|
||||
@ -1462,6 +1478,9 @@ union bpf_attr {
|
||||
* BPF_MAP_TYPE_BLOOM_FILTER - the lowest 4 bits indicate the
|
||||
* number of hash functions (if 0, the bloom filter will default
|
||||
* to using 5 hash functions).
|
||||
*
|
||||
* BPF_MAP_TYPE_ARENA - contains the address where user space
|
||||
* is going to mmap() the arena. It has to be page aligned.
|
||||
*/
|
||||
__u64 map_extra;
|
||||
|
||||
|
@ -614,7 +614,10 @@ enum devlink_attr {
|
||||
|
||||
DEVLINK_ATTR_REGION_DIRECT, /* flag */
|
||||
|
||||
/* add new attributes above here, update the policy in devlink.c */
|
||||
/* Add new attributes above here, update the spec in
|
||||
* Documentation/netlink/specs/devlink.yaml and re-generate
|
||||
* net/devlink/netlink_gen.c.
|
||||
*/
|
||||
|
||||
__DEVLINK_ATTR_MAX,
|
||||
DEVLINK_ATTR_MAX = __DEVLINK_ATTR_MAX - 1
|
||||
|
@ -101,5 +101,6 @@
|
||||
#define DMA_BUF_MAGIC 0x444d4142 /* "DMAB" */
|
||||
#define DEVMEM_MAGIC 0x454d444d /* "DMEM" */
|
||||
#define SECRETMEM_MAGIC 0x5345434d /* "SECM" */
|
||||
#define PID_FS_MAGIC 0x50494446 /* "PIDF" */
|
||||
|
||||
#endif /* __LINUX_MAGIC_H__ */
|
||||
|
@ -30,6 +30,9 @@ enum {
|
||||
|
||||
#define NEXTHOP_GRP_TYPE_MAX (__NEXTHOP_GRP_TYPE_MAX - 1)
|
||||
|
||||
#define NHA_OP_FLAG_DUMP_STATS BIT(0)
|
||||
#define NHA_OP_FLAG_DUMP_HW_STATS BIT(1)
|
||||
|
||||
enum {
|
||||
NHA_UNSPEC,
|
||||
NHA_ID, /* u32; id for nexthop. id == 0 means auto-assign */
|
||||
@ -60,6 +63,18 @@ enum {
|
||||
/* nested; nexthop bucket attributes */
|
||||
NHA_RES_BUCKET,
|
||||
|
||||
/* u32; operation-specific flags */
|
||||
NHA_OP_FLAGS,
|
||||
|
||||
/* nested; nexthop group stats */
|
||||
NHA_GROUP_STATS,
|
||||
|
||||
/* u32; nexthop hardware stats enable */
|
||||
NHA_HW_STATS_ENABLE,
|
||||
|
||||
/* u32; read-only; whether any driver collects HW stats */
|
||||
NHA_HW_STATS_USED,
|
||||
|
||||
__NHA_MAX,
|
||||
};
|
||||
|
||||
@ -101,4 +116,34 @@ enum {
|
||||
|
||||
#define NHA_RES_BUCKET_MAX (__NHA_RES_BUCKET_MAX - 1)
|
||||
|
||||
enum {
|
||||
NHA_GROUP_STATS_UNSPEC,
|
||||
|
||||
/* nested; nexthop group entry stats */
|
||||
NHA_GROUP_STATS_ENTRY,
|
||||
|
||||
__NHA_GROUP_STATS_MAX,
|
||||
};
|
||||
|
||||
#define NHA_GROUP_STATS_MAX (__NHA_GROUP_STATS_MAX - 1)
|
||||
|
||||
enum {
|
||||
NHA_GROUP_STATS_ENTRY_UNSPEC,
|
||||
|
||||
/* u32; nexthop id of the nexthop group entry */
|
||||
NHA_GROUP_STATS_ENTRY_ID,
|
||||
|
||||
/* uint; number of packets forwarded via the nexthop group entry */
|
||||
NHA_GROUP_STATS_ENTRY_PACKETS,
|
||||
|
||||
/* uint; number of packets forwarded via the nexthop group entry in
|
||||
* hardware
|
||||
*/
|
||||
NHA_GROUP_STATS_ENTRY_PACKETS_HW,
|
||||
|
||||
__NHA_GROUP_STATS_ENTRY_MAX,
|
||||
};
|
||||
|
||||
#define NHA_GROUP_STATS_ENTRY_MAX (__NHA_GROUP_STATS_ENTRY_MAX - 1)
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user