151 lines
4.6 KiB
Diff
151 lines
4.6 KiB
Diff
From 4dfaa0a3e4ea077d95d7355e73a8069b1c8af97b Mon Sep 17 00:00:00 2001
|
|
From: Andrea Claudi <aclaudi@redhat.com>
|
|
Date: Thu, 4 Jun 2020 19:26:50 +0200
|
|
Subject: [PATCH] Update kernel headers
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1812207
|
|
Upstream Status: unknown commit ce9191ffee31d
|
|
Conflicts: several unrelated missing changes in uapi
|
|
|
|
commit ce9191ffee31d440591bf49ef530b80ee9975dfb
|
|
Author: David Ahern <dsahern@gmail.com>
|
|
Date: Tue Mar 31 23:23:28 2020 +0000
|
|
|
|
Update kernel headers
|
|
|
|
Update kernel headers to commit:
|
|
7f80ccfe9968 ("net: ipv6: rpl_iptunnel: Fix potential memory leak in rpl_do_srh_inline")
|
|
|
|
Signed-off-by: David Ahern <dsahern@gmail.com>
|
|
---
|
|
include/uapi/linux/bpf.h | 20 +++++++++++++++++++-
|
|
include/uapi/linux/devlink.h | 6 ++++++
|
|
include/uapi/linux/if_link.h | 5 ++++-
|
|
include/uapi/linux/inet_diag.h | 1 +
|
|
include/uapi/linux/lwtunnel.h | 1 +
|
|
5 files changed, 31 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
|
|
index 6d55239a4cc0f..94aa5a1d38215 100644
|
|
--- a/include/uapi/linux/bpf.h
|
|
+++ b/include/uapi/linux/bpf.h
|
|
@@ -483,7 +483,7 @@ union bpf_attr {
|
|
__u32 prog_cnt;
|
|
} query;
|
|
|
|
- struct {
|
|
+ struct { /* anonymous struct used by BPF_RAW_TRACEPOINT_OPEN command */
|
|
__u64 name;
|
|
__u32 prog_fd;
|
|
} raw_tracepoint;
|
|
@@ -511,6 +511,24 @@ union bpf_attr {
|
|
__u64 probe_offset; /* output: probe_offset */
|
|
__u64 probe_addr; /* output: probe_addr */
|
|
} task_fd_query;
|
|
+
|
|
+ struct { /* struct used by BPF_LINK_CREATE command */
|
|
+ __u32 prog_fd; /* eBPF program to attach */
|
|
+ __u32 target_fd; /* object to attach to */
|
|
+ __u32 attach_type; /* attach type */
|
|
+ __u32 flags; /* extra flags */
|
|
+ } link_create;
|
|
+
|
|
+ struct { /* struct used by BPF_LINK_UPDATE command */
|
|
+ __u32 link_fd; /* link fd */
|
|
+ /* new program fd to update link with */
|
|
+ __u32 new_prog_fd;
|
|
+ __u32 flags; /* extra flags */
|
|
+ /* expected link's program fd; is specified only if
|
|
+ * BPF_F_REPLACE flag is set in flags */
|
|
+ __u32 old_prog_fd;
|
|
+ } link_update;
|
|
+
|
|
} __attribute__((aligned(8)));
|
|
|
|
/* The description below is an attempt at providing documentation to eBPF
|
|
diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
|
|
index 79e1405db67cc..e63aeab76bcb8 100644
|
|
--- a/include/uapi/linux/devlink.h
|
|
+++ b/include/uapi/linux/devlink.h
|
|
@@ -117,6 +117,11 @@ enum devlink_command {
|
|
DEVLINK_CMD_TRAP_GROUP_NEW,
|
|
DEVLINK_CMD_TRAP_GROUP_DEL,
|
|
|
|
+ DEVLINK_CMD_TRAP_POLICER_GET, /* can dump */
|
|
+ DEVLINK_CMD_TRAP_POLICER_SET,
|
|
+ DEVLINK_CMD_TRAP_POLICER_NEW,
|
|
+ DEVLINK_CMD_TRAP_POLICER_DEL,
|
|
+
|
|
/* add new commands above here */
|
|
__DEVLINK_CMD_MAX,
|
|
DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
|
|
@@ -216,6 +221,7 @@ enum devlink_param_reset_dev_on_drv_probe_value {
|
|
enum {
|
|
DEVLINK_ATTR_STATS_RX_PACKETS, /* u64 */
|
|
DEVLINK_ATTR_STATS_RX_BYTES, /* u64 */
|
|
+ DEVLINK_ATTR_STATS_RX_DROPPED, /* u64 */
|
|
|
|
__DEVLINK_ATTR_STATS_MAX,
|
|
DEVLINK_ATTR_STATS_MAX = __DEVLINK_ATTR_STATS_MAX - 1
|
|
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
|
|
index 4da0768d7a5a3..5d69479b8052d 100644
|
|
--- a/include/uapi/linux/if_link.h
|
|
+++ b/include/uapi/linux/if_link.h
|
|
@@ -459,6 +459,7 @@ enum {
|
|
IFLA_MACSEC_REPLAY_PROTECT,
|
|
IFLA_MACSEC_VALIDATION,
|
|
IFLA_MACSEC_PAD,
|
|
+ IFLA_MACSEC_OFFLOAD,
|
|
__IFLA_MACSEC_MAX,
|
|
};
|
|
|
|
@@ -949,11 +950,12 @@ enum {
|
|
#define XDP_FLAGS_SKB_MODE (1U << 1)
|
|
#define XDP_FLAGS_DRV_MODE (1U << 2)
|
|
#define XDP_FLAGS_HW_MODE (1U << 3)
|
|
+#define XDP_FLAGS_REPLACE (1U << 4)
|
|
#define XDP_FLAGS_MODES (XDP_FLAGS_SKB_MODE | \
|
|
XDP_FLAGS_DRV_MODE | \
|
|
XDP_FLAGS_HW_MODE)
|
|
#define XDP_FLAGS_MASK (XDP_FLAGS_UPDATE_IF_NOEXIST | \
|
|
- XDP_FLAGS_MODES)
|
|
+ XDP_FLAGS_MODES | XDP_FLAGS_REPLACE)
|
|
|
|
/* These are stored into IFLA_XDP_ATTACHED on dump. */
|
|
enum {
|
|
@@ -973,6 +975,7 @@ enum {
|
|
IFLA_XDP_DRV_PROG_ID,
|
|
IFLA_XDP_SKB_PROG_ID,
|
|
IFLA_XDP_HW_PROG_ID,
|
|
+ IFLA_XDP_EXPECTED_FD,
|
|
__IFLA_XDP_MAX,
|
|
};
|
|
|
|
diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h
|
|
index 3dff6841486a4..db45fc664a5fd 100644
|
|
--- a/include/uapi/linux/inet_diag.h
|
|
+++ b/include/uapi/linux/inet_diag.h
|
|
@@ -163,6 +163,7 @@ enum {
|
|
INET_ULP_INFO_UNSPEC,
|
|
INET_ULP_INFO_NAME,
|
|
INET_ULP_INFO_TLS,
|
|
+ INET_ULP_INFO_MPTCP,
|
|
__INET_ULP_INFO_MAX,
|
|
};
|
|
#define INET_ULP_INFO_MAX (__INET_ULP_INFO_MAX - 1)
|
|
diff --git a/include/uapi/linux/lwtunnel.h b/include/uapi/linux/lwtunnel.h
|
|
index 3f3fe6f30df0b..0ba94063c1809 100644
|
|
--- a/include/uapi/linux/lwtunnel.h
|
|
+++ b/include/uapi/linux/lwtunnel.h
|
|
@@ -13,6 +13,7 @@ enum lwtunnel_encap_types {
|
|
LWTUNNEL_ENCAP_SEG6,
|
|
LWTUNNEL_ENCAP_BPF,
|
|
LWTUNNEL_ENCAP_SEG6_LOCAL,
|
|
+ LWTUNNEL_ENCAP_RPL,
|
|
__LWTUNNEL_ENCAP_MAX,
|
|
};
|
|
|
|
--
|
|
2.26.2
|
|
|