Merge branch 'master' into net-next

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 0f5d6f5494db85c51ac05e0c86a25230bfb08e4b..5e4d3739ab5a70228e43e184ede052507db1def2 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -92,6 +92,7 @@ enum bpf_prog_type {
        BPF_PROG_TYPE_KPROBE,
        BPF_PROG_TYPE_SCHED_CLS,
        BPF_PROG_TYPE_SCHED_ACT,
+       BPF_PROG_TYPE_TRACEPOINT,
 };
 
 #define BPF_PSEUDO_MAP_FD      1
@@ -346,6 +347,10 @@ enum bpf_func_id {
 #define BPF_F_ZERO_CSUM_TX             (1ULL << 1)
 #define BPF_F_DONT_FRAGMENT            (1ULL << 2)
 
+/* BPF_FUNC_perf_event_output flags. */
+#define BPF_F_INDEX_MASK               0xffffffffULL
+#define BPF_F_CURRENT_CPU              BPF_F_INDEX_MASK
+
 /* user accessible mirror of in-kernel sk_buff.
  * new fields can only be added to the end of this structure
  */
@@ -365,6 +370,8 @@ struct __sk_buff {
        __u32 cb[5];
        __u32 hash;
        __u32 tc_classid;
+       __u32 data;
+       __u32 data_end;
 };
 
 struct bpf_tunnel_key {

diff --git a/include/linux/devlink.h b/include/linux/devlink.h
index a96e1a0e54a6b3a07a3d153ee778c7699d5dfbfa..0e21d001f879b8e59fc3faa975c00b475a3c763f 100644 (file)
--- a/include/linux/devlink.h
+++ b/include/linux/devlink.h
@@ -33,6 +33,30 @@ enum devlink_command {
        DEVLINK_CMD_PORT_SPLIT,
        DEVLINK_CMD_PORT_UNSPLIT,
 
+       DEVLINK_CMD_SB_GET,             /* can dump */
+       DEVLINK_CMD_SB_SET,
+       DEVLINK_CMD_SB_NEW,
+       DEVLINK_CMD_SB_DEL,
+
+       DEVLINK_CMD_SB_POOL_GET,        /* can dump */
+       DEVLINK_CMD_SB_POOL_SET,
+       DEVLINK_CMD_SB_POOL_NEW,
+       DEVLINK_CMD_SB_POOL_DEL,
+
+       DEVLINK_CMD_SB_PORT_POOL_GET,   /* can dump */
+       DEVLINK_CMD_SB_PORT_POOL_SET,
+       DEVLINK_CMD_SB_PORT_POOL_NEW,
+       DEVLINK_CMD_SB_PORT_POOL_DEL,
+
+       DEVLINK_CMD_SB_TC_POOL_BIND_GET,        /* can dump */
+       DEVLINK_CMD_SB_TC_POOL_BIND_SET,
+       DEVLINK_CMD_SB_TC_POOL_BIND_NEW,
+       DEVLINK_CMD_SB_TC_POOL_BIND_DEL,
+
+       /* Shared buffer occupancy monitoring commands */
+       DEVLINK_CMD_SB_OCC_SNAPSHOT,
+       DEVLINK_CMD_SB_OCC_MAX_CLEAR,
+
        /* add new commands above here */
 
        __DEVLINK_CMD_MAX,
@@ -46,6 +70,31 @@ enum devlink_port_type {
        DEVLINK_PORT_TYPE_IB,
 };
 
+enum devlink_sb_pool_type {
+       DEVLINK_SB_POOL_TYPE_INGRESS,
+       DEVLINK_SB_POOL_TYPE_EGRESS,
+};
+
+/* static threshold - limiting the maximum number of bytes.
+ * dynamic threshold - limiting the maximum number of bytes
+ *   based on the currently available free space in the shared buffer pool.
+ *   In this mode, the maximum quota is calculated based
+ *   on the following formula:
+ *     max_quota = alpha / (1 + alpha) * Free_Buffer
+ *   While Free_Buffer is the amount of none-occupied buffer associated to
+ *   the relevant pool.
+ *   The value range which can be passed is 0-20 and serves
+ *   for computation of alpha by following formula:
+ *     alpha = 2 ^ (passed_value - 10)
+ */
+
+enum devlink_sb_threshold_type {
+       DEVLINK_SB_THRESHOLD_TYPE_STATIC,
+       DEVLINK_SB_THRESHOLD_TYPE_DYNAMIC,
+};
+
+#define DEVLINK_SB_THRESHOLD_TO_ALPHA_MAX 20
+
 enum devlink_attr {
        /* don't change the order or add anything between, this is ABI! */
        DEVLINK_ATTR_UNSPEC,
@@ -62,6 +111,20 @@ enum devlink_attr {
        DEVLINK_ATTR_PORT_IBDEV_NAME,           /* string */
        DEVLINK_ATTR_PORT_SPLIT_COUNT,          /* u32 */
        DEVLINK_ATTR_PORT_SPLIT_GROUP,          /* u32 */
+       DEVLINK_ATTR_SB_INDEX,                  /* u32 */
+       DEVLINK_ATTR_SB_SIZE,                   /* u32 */
+       DEVLINK_ATTR_SB_INGRESS_POOL_COUNT,     /* u16 */
+       DEVLINK_ATTR_SB_EGRESS_POOL_COUNT,      /* u16 */
+       DEVLINK_ATTR_SB_INGRESS_TC_COUNT,       /* u16 */
+       DEVLINK_ATTR_SB_EGRESS_TC_COUNT,        /* u16 */
+       DEVLINK_ATTR_SB_POOL_INDEX,             /* u16 */
+       DEVLINK_ATTR_SB_POOL_TYPE,              /* u8 */
+       DEVLINK_ATTR_SB_POOL_SIZE,              /* u32 */
+       DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE,    /* u8 */
+       DEVLINK_ATTR_SB_THRESHOLD,              /* u32 */
+       DEVLINK_ATTR_SB_TC_INDEX,               /* u16 */
+       DEVLINK_ATTR_SB_OCC_CUR,                /* u32 */
+       DEVLINK_ATTR_SB_OCC_MAX,                /* u32 */
 
        /* add new attributes above here, update the policy in devlink.c */
 

diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h
index 96161b8202b5d026ed39904f15a899659fc39adb..620c8a5ddc0003cb785c1dceb365586b336c763c 100644 (file)
--- a/include/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
@@ -49,6 +49,7 @@ enum {
        FRA_TABLE,      /* Extended table id */
        FRA_FWMASK,     /* mask for netfilter mark */
        FRA_OIFNAME,
+       FRA_PAD,
        __FRA_MAX
 };
 

diff --git a/include/linux/gen_stats.h b/include/linux/gen_stats.h
index 6487317ea619c41d4ea662f1162417fa6c6e947f..52deccc2128eeb955b412aeef5bdb0ed8098d5f8 100644 (file)
--- a/include/linux/gen_stats.h
+++ b/include/linux/gen_stats.h
@@ -10,6 +10,7 @@ enum {
        TCA_STATS_QUEUE,
        TCA_STATS_APP,
        TCA_STATS_RATE_EST64,
+       TCA_STATS_PAD,
        __TCA_STATS_MAX,
 };
 #define TCA_STATS_MAX (__TCA_STATS_MAX - 1)

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index 8de96b7a7dbf146281c556e76379e22c2297ed56..fc3dcfa463d03e412223c466d7fd124141243619 100644 (file)
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -134,6 +134,16 @@ struct bridge_vlan_info {
        __u16 vid;
 };
 
+struct bridge_vlan_xstats {
+       __u64 rx_bytes;
+       __u64 rx_packets;
+       __u64 tx_bytes;
+       __u64 tx_packets;
+       __u16 vid;
+       __u16 pad1;
+       __u32 pad2;
+};
+
 /* Bridge multicast database attributes
  * [MDBA_MDB] = {
  *     [MDBA_MDB_ENTRY] = {
@@ -233,4 +243,12 @@ enum {
 };
 #define MDBA_SET_ENTRY_MAX (__MDBA_SET_ENTRY_MAX - 1)
 
+/* Embedded inside LINK_XSTATS_TYPE_BRIDGE */
+enum {
+       BRIDGE_XSTATS_UNSPEC,
+       BRIDGE_XSTATS_VLAN,
+       __BRIDGE_XSTATS_MAX
+};
+#define BRIDGE_XSTATS_MAX (__BRIDGE_XSTATS_MAX - 1)
+
 #endif /* _LINUX_IF_BRIDGE_H */

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 8f3b0f40ee26f26d9b88c5b6af296d57303a4e25..c396f3179e2cce44c62e8963cc45f26237a894e7 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -92,6 +92,7 @@
 #define ETH_P_TDLS     0x890D          /* TDLS */
 #define ETH_P_FIP      0x8914          /* FCoE Initialization Protocol */
 #define ETH_P_80221    0x8917          /* IEEE 802.21 Media Independent Handover Protocol */
+#define ETH_P_HSR      0x892F          /* IEC 62439-3 HSRv1    */
 #define ETH_P_LOOPBACK 0x9000          /* Ethernet loopback packet, per IEEE 802.3 */
 #define ETH_P_QINQ1    0x9100          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_QINQ2    0x9200          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 6a688e8c6fb4f0e071402d3adb852eac6c210c28..15bbeb818f678fab68095de9e2062bfd7b3e13a3 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -155,6 +155,7 @@ enum {
        IFLA_PROTO_DOWN,
        IFLA_GSO_MAX_SEGS,
        IFLA_GSO_MAX_SIZE,
+       IFLA_PAD,
        __IFLA_MAX
 };
 
@@ -268,6 +269,8 @@ enum {
        IFLA_BR_NF_CALL_IP6TABLES,
        IFLA_BR_NF_CALL_ARPTABLES,
        IFLA_BR_VLAN_DEFAULT_PVID,
+       IFLA_BR_PAD,
+       IFLA_BR_VLAN_STATS_ENABLED,
        __IFLA_BR_MAX,
 };
 
@@ -310,6 +313,7 @@ enum {
        IFLA_BRPORT_HOLD_TIMER,
        IFLA_BRPORT_FLUSH,
        IFLA_BRPORT_MULTICAST_ROUTER,
+       IFLA_BRPORT_PAD,
        __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -429,6 +433,7 @@ enum {
        IFLA_MACSEC_SCB,
        IFLA_MACSEC_REPLAY_PROTECT,
        IFLA_MACSEC_VALIDATION,
+       IFLA_MACSEC_PAD,
        __IFLA_MACSEC_MAX,
 };
 
@@ -486,6 +491,7 @@ enum {
        IFLA_VXLAN_REMCSUM_NOPARTIAL,
        IFLA_VXLAN_COLLECT_METADATA,
        IFLA_VXLAN_LABEL,
+       IFLA_VXLAN_GPE,
        __IFLA_VXLAN_MAX
 };
 #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
@@ -513,6 +519,24 @@ enum {
 };
 #define IFLA_GENEVE_MAX        (__IFLA_GENEVE_MAX - 1)
 
+/* PPP section */
+enum {
+       IFLA_PPP_UNSPEC,
+       IFLA_PPP_DEV_FD,
+       __IFLA_PPP_MAX
+};
+#define IFLA_PPP_MAX (__IFLA_PPP_MAX - 1)
+
+/* GTP section */
+enum {
+       IFLA_GTP_UNSPEC,
+       IFLA_GTP_FD0,
+       IFLA_GTP_FD1,
+       IFLA_GTP_PDP_HASHSIZE,
+       __IFLA_GTP_MAX,
+};
+#define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1)
+
 /* Bonding section */
 
 enum {
@@ -662,6 +686,7 @@ enum {
        IFLA_VF_STATS_TX_BYTES,
        IFLA_VF_STATS_BROADCAST,
        IFLA_VF_STATS_MULTICAST,
+       IFLA_VF_STATS_PAD,
        __IFLA_VF_STATS_MAX,
 };
 
@@ -772,9 +797,46 @@ enum {
        IFLA_HSR_MULTICAST_SPEC,        /* Last byte of supervision addr */
        IFLA_HSR_SUPERVISION_ADDR,      /* Supervision frame multicast addr */
        IFLA_HSR_SEQ_NR,
+       IFLA_HSR_VERSION,               /* HSR version */
        __IFLA_HSR_MAX,
 };
 
 #define IFLA_HSR_MAX (__IFLA_HSR_MAX - 1)
 
+/* STATS section */
+
+struct if_stats_msg {
+       __u8  family;
+       __u8  pad1;
+       __u16 pad2;
+       __u32 ifindex;
+       __u32 filter_mask;
+};
+
+/* A stats attribute can be netdev specific or a global stat.
+ * For netdev stats, lets use the prefix IFLA_STATS_LINK_*
+ */
+enum {
+       IFLA_STATS_UNSPEC, /* also used as 64bit pad attribute */
+       IFLA_STATS_LINK_64,
+       IFLA_STATS_LINK_XSTATS,
+       __IFLA_STATS_MAX,
+};
+
+#define IFLA_STATS_MAX (__IFLA_STATS_MAX - 1)
+
+#define IFLA_STATS_FILTER_BIT(ATTR)    (1 << (ATTR - 1))
+
+/* These are embedded into IFLA_STATS_LINK_XSTATS:
+ * [IFLA_STATS_LINK_XSTATS]
+ * -> [LINK_XSTATS_TYPE_xxx]
+ *    -> [rtnl link type specific attributes]
+ */
+enum {
+       LINK_XSTATS_TYPE_UNSPEC,
+       LINK_XSTATS_TYPE_BRIDGE,
+       __LINK_XSTATS_TYPE_MAX
+};
+#define LINK_XSTATS_TYPE_MAX (__LINK_XSTATS_TYPE_MAX - 1)
+
 #endif /* _LINUX_IF_LINK_H */

diff --git a/include/linux/ila.h b/include/linux/ila.h
index 4f9e1deafc3da8b58c6e038ffd3221be4aa5f0c4..7e328d72c518fe5a62e10af6c55cbb9663fbbd61 100644 (file)
--- a/include/linux/ila.h
+++ b/include/linux/ila.h
@@ -14,6 +14,8 @@ enum {
        ILA_ATTR_LOCATOR_MATCH,                 /* u64 */
        ILA_ATTR_IFINDEX,                       /* s32 */
        ILA_ATTR_DIR,                           /* u32 */
+       ILA_ATTR_PAD,
+       ILA_ATTR_CSUM_MODE,                     /* u8 */
 
        __ILA_ATTR_MAX,
 };
@@ -34,4 +36,10 @@ enum {
 #define ILA_DIR_IN     (1 << 0)
 #define ILA_DIR_OUT    (1 << 1)
 
+enum {
+       ILA_CSUM_ADJUST_TRANSPORT,
+       ILA_CSUM_NEUTRAL_MAP,
+       ILA_CSUM_NO_ACTION,
+};
+
 #endif /* _LINUX_ILA_H */

diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index 1db41168810619363849814c83785b27966a0277..07e486cb2f4cc61b093065d84c60a996088b700d 100644 (file)
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -113,9 +113,13 @@ enum {
        INET_DIAG_DCTCPINFO,
        INET_DIAG_PROTOCOL,  /* response attribute only */
        INET_DIAG_SKV6ONLY,
+       INET_DIAG_LOCALS,
+       INET_DIAG_PEERS,
+       INET_DIAG_PAD,
+       __INET_DIAG_MAX,
 };
 
-#define INET_DIAG_MAX INET_DIAG_SKV6ONLY
+#define INET_DIAG_MAX (__INET_DIAG_MAX - 1)
 
 /* INET_DIAG_MEM */
 

diff --git a/include/linux/l2tp.h b/include/linux/l2tp.h
index 5b0e36d0f62b99a922da2796da56f3239a6d9c32..f00e4248b0e0b82790b4aaad7c59cb0558dbe186 100644 (file)
--- a/include/linux/l2tp.h
+++ b/include/linux/l2tp.h
@@ -124,6 +124,7 @@ enum {
        L2TP_ATTR_IP6_DADDR,            /* struct in6_addr */
        L2TP_ATTR_UDP_ZERO_CSUM6_TX,    /* u8 */
        L2TP_ATTR_UDP_ZERO_CSUM6_RX,    /* u8 */
+       L2TP_ATTR_PAD,
        __L2TP_ATTR_MAX,
 };
 
@@ -140,6 +141,7 @@ enum {
        L2TP_ATTR_RX_SEQ_DISCARDS,      /* u64 */
        L2TP_ATTR_RX_OOS_PACKETS,       /* u64 */
        L2TP_ATTR_RX_ERRORS,            /* u64 */
+       L2TP_ATTR_STATS_PAD,
        __L2TP_ATTR_STATS_MAX,
 };
 

diff --git a/include/linux/lwtunnel.h b/include/linux/lwtunnel.h
index 1d2f4f6ccda8c71a9df7ed50f26c69293e90620e..7cea3cbfa1289612f92a0f1ded578a848ecb8a52 100644 (file)
--- a/include/linux/lwtunnel.h
+++ b/include/linux/lwtunnel.h
@@ -22,6 +22,7 @@ enum lwtunnel_ip_t {
        LWTUNNEL_IP_TTL,
        LWTUNNEL_IP_TOS,
        LWTUNNEL_IP_FLAGS,
+       LWTUNNEL_IP_PAD,
        __LWTUNNEL_IP_MAX,
 };
 
@@ -35,6 +36,7 @@ enum lwtunnel_ip6_t {
        LWTUNNEL_IP6_HOPLIMIT,
        LWTUNNEL_IP6_TC,
        LWTUNNEL_IP6_FLAGS,
+       LWTUNNEL_IP6_PAD,
        __LWTUNNEL_IP6_MAX,
 };
 

diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h
index 788655bfa0f3001d549e90c8fe5dd811600e3a98..bd99a8d80f36e527094f05ceabb55c21ea004ae7 100644 (file)
--- a/include/linux/neighbour.h
+++ b/include/linux/neighbour.h
@@ -128,6 +128,7 @@ enum {
        NDTPA_LOCKTIME,                 /* u64, msecs */
        NDTPA_QUEUE_LENBYTES,           /* u32 */
        NDTPA_MCAST_REPROBES,           /* u32 */
+       NDTPA_PAD,
        __NDTPA_MAX
 };
 #define NDTPA_MAX (__NDTPA_MAX - 1)
@@ -160,6 +161,7 @@ enum {
        NDTA_PARMS,                     /* nested TLV NDTPA_* */
        NDTA_STATS,                     /* struct ndt_stats, read-only */
        NDTA_GC_INTERVAL,               /* u64, msecs */
+       NDTA_PAD,
        __NDTA_MAX
 };
 #define NDTA_MAX (__NDTA_MAX - 1)

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index b69358b4890d42238a02a94597554e5ada46dbb2..036283214a44bf7e3915286e52f649557285853f 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -12,6 +12,7 @@ enum {
        TCA_ACT_OPTIONS,
        TCA_ACT_INDEX,
        TCA_ACT_STATS,
+       TCA_ACT_PAD,
        __TCA_ACT_MAX
 };
 
@@ -119,6 +120,7 @@ enum {
        TCA_U32_PCNT,
        TCA_U32_MARK,
        TCA_U32_FLAGS,
+       TCA_U32_PAD,
        __TCA_U32_MAX
 };
 

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 8cb18b44968ea5fa49872a934093f28b128604a4..2382eed502783c23cf6f6dca8a4cca6157480d20 100644 (file)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -179,6 +179,7 @@ enum {
        TCA_TBF_PRATE64,
        TCA_TBF_BURST,
        TCA_TBF_PBURST,
+       TCA_TBF_PAD,
        __TCA_TBF_MAX,
 };
 
@@ -368,6 +369,7 @@ enum {
        TCA_HTB_DIRECT_QLEN,
        TCA_HTB_RATE64,
        TCA_HTB_CEIL64,
+       TCA_HTB_PAD,
        __TCA_HTB_MAX,
 };
 
@@ -531,6 +533,7 @@ enum {
        TCA_NETEM_RATE,
        TCA_NETEM_ECN,
        TCA_NETEM_RATE64,
+       TCA_NETEM_PAD,
        __TCA_NETEM_MAX,
 };
 
@@ -715,6 +718,8 @@ enum {
        TCA_FQ_CODEL_FLOWS,
        TCA_FQ_CODEL_QUANTUM,
        TCA_FQ_CODEL_CE_THRESHOLD,
+       TCA_FQ_CODEL_DROP_BATCH_SIZE,
+       TCA_FQ_CODEL_MEMORY_LIMIT,
        __TCA_FQ_CODEL_MAX
 };
 
@@ -739,6 +744,8 @@ struct tc_fq_codel_qd_stats {
        __u32   new_flows_len;  /* count of flows in new list */
        __u32   old_flows_len;  /* count of flows in old list */
        __u32   ce_mark;        /* packets above ce_threshold */
+       __u32   memory_usage;   /* in bytes */
+       __u32   drop_overmemory;
 };
 
 struct tc_fq_codel_cl_stats {

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 6aaa2a3e3c0a35d59b33fd8aec0de23809070494..2d2e3e6c5b81373c9f086f6c35dd523742d519fb 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -139,6 +139,11 @@ enum {
        RTM_GETNSID = 90,
 #define RTM_GETNSID RTM_GETNSID
 
+       RTM_NEWSTATS = 92,
+#define RTM_NEWSTATS RTM_NEWSTATS
+       RTM_GETSTATS = 94,
+#define RTM_GETSTATS RTM_GETSTATS
+
        __RTM_MAX,
 #define RTM_MAX                (((__RTM_MAX + 3) & ~3) - 1)
 };
@@ -312,6 +317,7 @@ enum rtattr_type_t {
        RTA_ENCAP_TYPE,
        RTA_ENCAP,
        RTA_EXPIRES,
+       RTA_PAD,
        __RTA_MAX
 };
 
@@ -536,6 +542,7 @@ enum {
        TCA_FCNT,
        TCA_STATS2,
        TCA_STAB,
+       TCA_PAD,
        __TCA_MAX
 };
 

diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
index dafcb891a5ea0fd9a2cd6f18262bbbdc325d6837..901231e64896382c879152040a5c7729df72d351 100644 (file)
--- a/include/linux/sock_diag.h
+++ b/include/linux/sock_diag.h
@@ -20,6 +20,7 @@ enum {
        SK_MEMINFO_WMEM_QUEUED,
        SK_MEMINFO_OPTMEM,
        SK_MEMINFO_BACKLOG,
+       SK_MEMINFO_DROPS,
 
        SK_MEMINFO_VARS,
 };

diff --git a/include/linux/tc_act/tc_bpf.h b/include/linux/tc_act/tc_bpf.h
index 07f17cc70bb3ee2f8ca7667221679b67f09c3cc6..063d9d465119b2519f87aa4e31961311acf026e0 100644 (file)
--- a/include/linux/tc_act/tc_bpf.h
+++ b/include/linux/tc_act/tc_bpf.h
@@ -26,6 +26,7 @@ enum {
        TCA_ACT_BPF_OPS,
        TCA_ACT_BPF_FD,
        TCA_ACT_BPF_NAME,
+       TCA_ACT_BPF_PAD,
        __TCA_ACT_BPF_MAX,
 };
 #define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)

diff --git a/include/linux/tc_act/tc_connmark.h b/include/linux/tc_act/tc_connmark.h
index 994b0971bce2102433b4675270dd77a69fbb5bb6..62a5e944c55485270820d36187adb6cb4d5c5b28 100644 (file)
--- a/include/linux/tc_act/tc_connmark.h
+++ b/include/linux/tc_act/tc_connmark.h
@@ -15,6 +15,7 @@ enum {
        TCA_CONNMARK_UNSPEC,
        TCA_CONNMARK_PARMS,
        TCA_CONNMARK_TM,
+       TCA_CONNMARK_PAD,
        __TCA_CONNMARK_MAX
 };
 #define TCA_CONNMARK_MAX (__TCA_CONNMARK_MAX - 1)

diff --git a/include/linux/tc_act/tc_csum.h b/include/linux/tc_act/tc_csum.h
index a047c49a31531e0df45d29943216689795746584..8ac8041ab5f134b74391f5470cef16f3f435ed1c 100644 (file)
--- a/include/linux/tc_act/tc_csum.h
+++ b/include/linux/tc_act/tc_csum.h
@@ -10,6 +10,7 @@ enum {
        TCA_CSUM_UNSPEC,
        TCA_CSUM_PARMS,
        TCA_CSUM_TM,
+       TCA_CSUM_PAD,
        __TCA_CSUM_MAX
 };
 #define TCA_CSUM_MAX (__TCA_CSUM_MAX - 1)

diff --git a/include/linux/tc_act/tc_defact.h b/include/linux/tc_act/tc_defact.h
index 17dddb40f74043e40ac09e36e15c925c5aa13df0..d2a3abb77aebdef99a9166e60b95a982f06a74f4 100644 (file)
--- a/include/linux/tc_act/tc_defact.h
+++ b/include/linux/tc_act/tc_defact.h
@@ -12,6 +12,7 @@ enum {
        TCA_DEF_TM,
        TCA_DEF_PARMS,
        TCA_DEF_DATA,
+       TCA_DEF_PAD,
        __TCA_DEF_MAX
 };
 #define TCA_DEF_MAX (__TCA_DEF_MAX - 1)

diff --git a/include/linux/tc_act/tc_gact.h b/include/linux/tc_act/tc_gact.h
index f7bf94eed510d47dec8355939b9fc41f5ee625f6..70b536a8f8b260746faecdb14ffa322f0db5ad1c 100644 (file)
--- a/include/linux/tc_act/tc_gact.h
+++ b/include/linux/tc_act/tc_gact.h
@@ -25,6 +25,7 @@ enum {
        TCA_GACT_TM,
        TCA_GACT_PARMS,
        TCA_GACT_PROB,
+       TCA_GACT_PAD,
        __TCA_GACT_MAX
 };
 #define TCA_GACT_MAX (__TCA_GACT_MAX - 1)

diff --git a/include/linux/tc_act/tc_ipt.h b/include/linux/tc_act/tc_ipt.h
index 130aaadf6fac9bf419c6ff13c7adae05c34f9b4c..7c6e155dd981d17a9fade88994eb82331a4309a8 100644 (file)
--- a/include/linux/tc_act/tc_ipt.h
+++ b/include/linux/tc_act/tc_ipt.h
@@ -14,6 +14,7 @@ enum {
        TCA_IPT_CNT,
        TCA_IPT_TM,
        TCA_IPT_TARG,
+       TCA_IPT_PAD,
        __TCA_IPT_MAX
 };
 #define TCA_IPT_MAX (__TCA_IPT_MAX - 1)

diff --git a/include/linux/tc_act/tc_mirred.h b/include/linux/tc_act/tc_mirred.h
index 7561750e8fd69b92e1e1a4929e25ec8709d74ce2..3d7a2b352a62c3dfeb0f077c6207a93d8834481d 100644 (file)
--- a/include/linux/tc_act/tc_mirred.h
+++ b/include/linux/tc_act/tc_mirred.h
@@ -20,6 +20,7 @@ enum {
        TCA_MIRRED_UNSPEC,
        TCA_MIRRED_TM,
        TCA_MIRRED_PARMS,
+       TCA_MIRRED_PAD,
        __TCA_MIRRED_MAX
 };
 #define TCA_MIRRED_MAX (__TCA_MIRRED_MAX - 1)

diff --git a/include/linux/tc_act/tc_nat.h b/include/linux/tc_act/tc_nat.h
index 6663aeba0b9a78fd1c76816c8540fdfa4d0ee747..923457c9ebf0caf761bc24c897ba8a20f38e8c22 100644 (file)
--- a/include/linux/tc_act/tc_nat.h
+++ b/include/linux/tc_act/tc_nat.h
@@ -10,6 +10,7 @@ enum {
        TCA_NAT_UNSPEC,
        TCA_NAT_PARMS,
        TCA_NAT_TM,
+       TCA_NAT_PAD,
        __TCA_NAT_MAX
 };
 #define TCA_NAT_MAX (__TCA_NAT_MAX - 1)

diff --git a/include/linux/tc_act/tc_pedit.h b/include/linux/tc_act/tc_pedit.h
index 716cfabcd5b2fa6064588b118b7721f29477bf30..6389959a5157cf1f43338a3742093f66b14b564e 100644 (file)
--- a/include/linux/tc_act/tc_pedit.h
+++ b/include/linux/tc_act/tc_pedit.h
@@ -10,6 +10,7 @@ enum {
        TCA_PEDIT_UNSPEC,
        TCA_PEDIT_TM,
        TCA_PEDIT_PARMS,
+       TCA_PEDIT_PAD,
        __TCA_PEDIT_MAX
 };
 #define TCA_PEDIT_MAX (__TCA_PEDIT_MAX - 1)

diff --git a/include/linux/tc_act/tc_skbedit.h b/include/linux/tc_act/tc_skbedit.h
index 7a2e910a5f0836e0ab92db331acef7780fb2029e..fecb5cc48c40667a5b75d7c06158d91443a11862 100644 (file)
--- a/include/linux/tc_act/tc_skbedit.h
+++ b/include/linux/tc_act/tc_skbedit.h
@@ -39,6 +39,7 @@ enum {
        TCA_SKBEDIT_PRIORITY,
        TCA_SKBEDIT_QUEUE_MAPPING,
        TCA_SKBEDIT_MARK,
+       TCA_SKBEDIT_PAD,
        __TCA_SKBEDIT_MAX
 };
 #define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1)

diff --git a/include/linux/tc_act/tc_vlan.h b/include/linux/tc_act/tc_vlan.h
index f7b8d448b9603f9b1154472911f5a4b8ba663a54..31151ff6264f5ca966691c4ad0008c6b09cfe71a 100644 (file)
--- a/include/linux/tc_act/tc_vlan.h
+++ b/include/linux/tc_act/tc_vlan.h
@@ -28,6 +28,7 @@ enum {
        TCA_VLAN_PARMS,
        TCA_VLAN_PUSH_VLAN_ID,
        TCA_VLAN_PUSH_VLAN_PROTOCOL,
+       TCA_VLAN_PAD,
        __TCA_VLAN_MAX,
 };
 #define TCA_VLAN_MAX (__TCA_VLAN_MAX - 1)

diff --git a/include/linux/tcp_metrics.h b/include/linux/tcp_metrics.h
index 93533926035ca8d18e08f04eac3adacfcb266d8d..80ad90d0cfc23b0a67b4c6639eaf6df1d2abca25 100644 (file)
--- a/include/linux/tcp_metrics.h
+++ b/include/linux/tcp_metrics.h
@@ -40,6 +40,7 @@ enum {
        TCP_METRICS_ATTR_FOPEN_COOKIE,          /* binary */
        TCP_METRICS_ATTR_SADDR_IPV4,            /* u32 */
        TCP_METRICS_ATTR_SADDR_IPV6,            /* binary */
+       TCP_METRICS_ATTR_PAD,
 
        __TCP_METRICS_ATTR_MAX,
 };

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index b8f54510df076f3a87bd28f0bf1690b13e72e513..d09be24e053ffcde4ce8c15deb71e858c5833831 100644 (file)
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -302,6 +302,7 @@ enum xfrm_attr_type_t {
        XFRMA_SA_EXTRA_FLAGS,   /* __u32 */
        XFRMA_PROTO,            /* __u8 */
        XFRMA_ADDRESS_FILTER,   /* struct xfrm_address_filter */
+       XFRMA_PAD,
        __XFRMA_MAX
 
 #define XFRMA_MAX (__XFRMA_MAX - 1)

diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c
index e3bbea0031df69d57a07ccddcb695a82b665b59b..49a40befa5d587b69ce7d50aa2e20a3f1bcdbcfb 100644 (file)
--- a/ip/iplink_vxlan.c
+++ b/ip/iplink_vxlan.c
@@ -31,7 +31,7 @@ static void print_explain(FILE *f)
        fprintf(f, "                 [ ageing SECONDS ] [ maxaddress NUMBER ]\n");
        fprintf(f, "                 [ [no]udpcsum ] [ [no]udp6zerocsumtx ] [ [no]udp6zerocsumrx ]\n");
        fprintf(f, "                 [ [no]remcsumtx ] [ [no]remcsumrx ]\n");
-       fprintf(f, "                 [ [no]external ] [ gbp ]\n");
+       fprintf(f, "                 [ [no]external ] [ gbp ] [ gpe ]\n");
        fprintf(f, "\n");
        fprintf(f, "Where: VNI   := 0-16777215\n");
        fprintf(f, "       ADDR  := { IP_ADDRESS | any }\n");
@@ -79,6 +79,7 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
        __u8 remcsumrx = 0;
        __u8 metadata = 0;
        __u8 gbp = 0;
+       __u8 gpe = 0;
        int dst_port_set = 0;
        struct ifla_vxlan_port_range range = { 0, 0 };
 
@@ -234,10 +235,13 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
                        remcsumrx = 0;
                } else if (!matches(*argv, "external")) {
                        metadata = 1;
+                       learning = 0;
                } else if (!matches(*argv, "noexternal")) {
                        metadata = 0;
                } else if (!matches(*argv, "gbp")) {
                        gbp = 1;
+               } else if (!matches(*argv, "gpe")) {
+                       gpe = 1;
                } else if (matches(*argv, "help") == 0) {
                        explain();
                        return -1;
@@ -266,7 +270,9 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
                return -1;
        }
 
-       if (!dst_port_set) {
+       if (!dst_port_set && gpe) {
+               dstport = 4790;
+       } else if (!dst_port_set) {
                fprintf(stderr, "vxlan: destination port not specified\n"
                        "Will use Linux kernel default (non-standard value)\n");
                fprintf(stderr,
@@ -323,6 +329,8 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
 
        if (gbp)
                addattr_l(n, 1024, IFLA_VXLAN_GBP, NULL, 0);
+       if (gpe)
+               addattr_l(n, 1024, IFLA_VXLAN_GPE, NULL, 0);
 
 
        return 0;
@@ -489,6 +497,8 @@ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 
        if (tb[IFLA_VXLAN_GBP])
                fputs("gbp ", f);
+       if (tb[IFLA_VXLAN_GPE])
+               fputs("gpe ", f);
 }
 
 static void vxlan_print_help(struct link_util *lu, int argc, char **argv,

diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
index 805511423ef2bfa0ad0e7115c27f7ab57ee81fc7..984fb2eb0d63af4bdf2854a4a90b315e285df343 100644 (file)
--- a/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@ -422,7 +422,11 @@ the following additional arguments are supported:
 ] [
 .BI maxaddress " NUMBER "
 ] [
+.RI "[no]external "
+] [
 .B gbp
+] [
+.B gpe
 ]
 
 .in +8
@@ -515,6 +519,12 @@ are entered into the VXLAN device forwarding database.
 .BI maxaddress " NUMBER"
 - specifies the maximum number of FDB entries.
 
+.sp
+.I [no]external
+- specifies whether an external control plane
+.RB "(e.g. " "ip route encap" )
+or the internal FDB should be used.
+
 .sp
 .B gbp
 - enables the Group Policy extension (VXLAN-GBP).
@@ -558,6 +568,13 @@ Example:
 
 .in -4
 
+.sp
+.B gpe
+- enables the Generic Protocol extension (VXLAN-GPE). Currently, this is
+only supported together with the
+.B external
+keyword.
+
 .in -8
 
 .TP

diff --git a/misc/ss.c b/misc/ss.c
index 5cda728a2db5a4a91dfd864b44aad6abdfdc657d..23fff19d91993b85f7c64f0109dc4f85f9f6e6e7 100644 (file)
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -1905,6 +1905,10 @@ static void print_skmeminfo(struct rtattr *tb[], int attrtype)
                (SK_MEMINFO_BACKLOG + 1) * sizeof(__u32))
                printf(",bl%u", skmeminfo[SK_MEMINFO_BACKLOG]);
 
+       if (RTA_PAYLOAD(tb[attrtype]) >=
+               (SK_MEMINFO_DROPS + 1) * sizeof(__u32))
+               printf(",d%u", skmeminfo[SK_MEMINFO_DROPS]);
+
        printf(")");
 }