From d3694ffbb14fdf3e4df43e2ee081898749151d6c Mon Sep 17 00:00:00 2001 From: Ioana-Ruxandra Stăncioi Date: Mon, 3 Aug 2020 14:53:01 +0000 Subject: sys/linux: add tca_flower_key_mpls_opts descritpion mpls_opts: https://elixir.bootlin.com/linux/v5.8-rc4/source/net/sched/cls_flower.c#L670 mpls_opts_lse: https://elixir.bootlin.com/linux/v5.8-rc4/source/net/sched/cls_flower.c#L731 --- sys/linux/socket_netlink_route_sched.txt | 15 ++++++++++++++- sys/linux/socket_netlink_route_sched_386.const | 10 ++++++++++ sys/linux/socket_netlink_route_sched_amd64.const | 10 ++++++++++ sys/linux/socket_netlink_route_sched_arm.const | 10 ++++++++++ sys/linux/socket_netlink_route_sched_arm64.const | 10 ++++++++++ sys/linux/socket_netlink_route_sched_mips64le.const | 10 ++++++++++ sys/linux/socket_netlink_route_sched_ppc64le.const | 10 ++++++++++ sys/linux/socket_netlink_route_sched_riscv64.const | 10 ++++++++++ sys/linux/socket_netlink_route_sched_s390x.const | 10 ++++++++++ 9 files changed, 94 insertions(+), 1 deletion(-) diff --git a/sys/linux/socket_netlink_route_sched.txt b/sys/linux/socket_netlink_route_sched.txt index 371e8c909..1bc0fe671 100644 --- a/sys/linux/socket_netlink_route_sched.txt +++ b/sys/linux/socket_netlink_route_sched.txt @@ -4,6 +4,7 @@ # AF_NETLINK/NETLINK_ROUTE SCHED support. include +include include include include @@ -764,6 +765,7 @@ fl_policy [ TCA_FLOWER_KEY_MPLS_BOS nlattr[TCA_FLOWER_KEY_MPLS_BOS, int8] TCA_FLOWER_KEY_MPLS_TC nlattr[TCA_FLOWER_KEY_MPLS_TC, int8] TCA_FLOWER_KEY_MPLS_LABEL nlattr[TCA_FLOWER_KEY_MPLS_LABEL, int32] + TCA_FLOWER_KEY_MPLS_OPTS nlnest[TCA_FLOWER_KEY_MPLS_OPTS, mpls_opts] TCA_FLOWER_KEY_TCP_FLAGS nlattr[TCA_FLOWER_KEY_TCP_FLAGS, int16] TCA_FLOWER_KEY_TCP_FLAGS_MASK nlattr[TCA_FLOWER_KEY_TCP_FLAGS_MASK, int16] TCA_FLOWER_KEY_IP_TOS nlattr[TCA_FLOWER_KEY_IP_TOS, int8] @@ -791,7 +793,6 @@ fl_policy [ TCA_FLOWER_KEY_CT_MARK_MASK nlattr[TCA_FLOWER_KEY_CT_MARK_MASK, int32] TCA_FLOWER_KEY_CT_LABELS nlattr[TCA_FLOWER_KEY_CT_LABELS, array[int8, 16]] TCA_FLOWER_KEY_CT_LABELS_MASK nlattr[TCA_FLOWER_KEY_CT_LABELS_MASK, array[int8, 16]] -# TODO: add TCA_FLOWER_KEY_MPLS_OPTS ] [varlen] enc_opts_policy [ @@ -817,6 +818,18 @@ erspan_opt_policy [ TCA_FLOWER_KEY_ENC_OPT_ERSPAN_HWID nlattr[TCA_FLOWER_KEY_ENC_OPT_ERSPAN_HWID, int8] ] [varlen] +mpls_opts [ + TCA_FLOWER_KEY_MPLS_OPTS_LSE nlattr[TCA_FLOWER_KEY_MPLS_OPTS_LSE, mpls_opts_lse] +] [varlen] + +mpls_opts_lse [ + TCA_FLOWER_KEY_MPLS_OPT_LSE_DEPTH nlattr[TCA_FLOWER_KEY_MPLS_OPT_LSE_DEPTH, int8[1:FLOW_DIS_MPLS_MAX]] + TCA_FLOWER_KEY_MPLS_OPT_LSE_TTL nlattr[TCA_FLOWER_KEY_MPLS_OPT_LSE_TTL, int8] + TCA_FLOWER_KEY_MPLS_OPT_LSE_BOS nlattr[TCA_FLOWER_KEY_MPLS_OPT_LSE_BOS, int8[0:MPLS_BOS_MASK]] + TCA_FLOWER_KEY_MPLS_OPT_LSE_TC nlattr[TCA_FLOWER_KEY_MPLS_OPT_LSE_TC, int8[0:MPLS_TC_MASK]] + TCA_FLOWER_KEY_MPLS_OPT_LSE_LABEL nlattr[TCA_FLOWER_KEY_MPLS_OPT_LSE_LABEL, mpls_label] +] [varlen] + fw_policy [ TCA_FW_CLASSID nlattr[TCA_FW_CLASSID, tcm_handle] TCA_FW_POLICE nlattr[TCA_FW_POLICE, array[police_policy]] diff --git a/sys/linux/socket_netlink_route_sched_386.const b/sys/linux/socket_netlink_route_sched_386.const index 20f10dbde..511749473 100644 --- a/sys/linux/socket_netlink_route_sched_386.const +++ b/sys/linux/socket_netlink_route_sched_386.const @@ -25,11 +25,14 @@ CLOCK_REALTIME = 0 CLOCK_TAI = 11 ETH_P_8021AD = 34984 ETH_P_8021Q = 33024 +FLOW_DIS_MPLS_MAX = 7 FLOW_MODE_HASH = 1 FLOW_MODE_MAP = 0 IFE_META_PRIO = 3 IFE_META_SKBMARK = 1 IFE_META_TCINDEX = 5 +MPLS_BOS_MASK = 1 +MPLS_TC_MASK = 7 NETEM_LOSS_GE = 2 NETEM_LOSS_GI = 1 NF_INET_FORWARD = 2 @@ -270,6 +273,13 @@ TCA_FLOWER_KEY_IP_TTL = 75 TCA_FLOWER_KEY_IP_TTL_MASK = 76 TCA_FLOWER_KEY_MPLS_BOS = 68 TCA_FLOWER_KEY_MPLS_LABEL = 70 +TCA_FLOWER_KEY_MPLS_OPTS = 99 +TCA_FLOWER_KEY_MPLS_OPTS_LSE = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_BOS = 3 +TCA_FLOWER_KEY_MPLS_OPT_LSE_DEPTH = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_LABEL = 5 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TC = 4 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TTL = 2 TCA_FLOWER_KEY_MPLS_TC = 69 TCA_FLOWER_KEY_MPLS_TTL = 67 TCA_FLOWER_KEY_PORT_DST_MAX = 90 diff --git a/sys/linux/socket_netlink_route_sched_amd64.const b/sys/linux/socket_netlink_route_sched_amd64.const index 3126be10d..67bc09155 100644 --- a/sys/linux/socket_netlink_route_sched_amd64.const +++ b/sys/linux/socket_netlink_route_sched_amd64.const @@ -25,11 +25,14 @@ CLOCK_REALTIME = 0 CLOCK_TAI = 11 ETH_P_8021AD = 34984 ETH_P_8021Q = 33024 +FLOW_DIS_MPLS_MAX = 7 FLOW_MODE_HASH = 1 FLOW_MODE_MAP = 0 IFE_META_PRIO = 3 IFE_META_SKBMARK = 1 IFE_META_TCINDEX = 5 +MPLS_BOS_MASK = 1 +MPLS_TC_MASK = 7 NETEM_LOSS_GE = 2 NETEM_LOSS_GI = 1 NF_INET_FORWARD = 2 @@ -270,6 +273,13 @@ TCA_FLOWER_KEY_IP_TTL = 75 TCA_FLOWER_KEY_IP_TTL_MASK = 76 TCA_FLOWER_KEY_MPLS_BOS = 68 TCA_FLOWER_KEY_MPLS_LABEL = 70 +TCA_FLOWER_KEY_MPLS_OPTS = 99 +TCA_FLOWER_KEY_MPLS_OPTS_LSE = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_BOS = 3 +TCA_FLOWER_KEY_MPLS_OPT_LSE_DEPTH = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_LABEL = 5 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TC = 4 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TTL = 2 TCA_FLOWER_KEY_MPLS_TC = 69 TCA_FLOWER_KEY_MPLS_TTL = 67 TCA_FLOWER_KEY_PORT_DST_MAX = 90 diff --git a/sys/linux/socket_netlink_route_sched_arm.const b/sys/linux/socket_netlink_route_sched_arm.const index d3b353e3c..c4e918e71 100644 --- a/sys/linux/socket_netlink_route_sched_arm.const +++ b/sys/linux/socket_netlink_route_sched_arm.const @@ -25,11 +25,14 @@ CLOCK_REALTIME = 0 CLOCK_TAI = 11 ETH_P_8021AD = 34984 ETH_P_8021Q = 33024 +FLOW_DIS_MPLS_MAX = 7 FLOW_MODE_HASH = 1 FLOW_MODE_MAP = 0 IFE_META_PRIO = 3 IFE_META_SKBMARK = 1 IFE_META_TCINDEX = 5 +MPLS_BOS_MASK = 1 +MPLS_TC_MASK = 7 NETEM_LOSS_GE = 2 NETEM_LOSS_GI = 1 NF_INET_FORWARD = 2 @@ -270,6 +273,13 @@ TCA_FLOWER_KEY_IP_TTL = 75 TCA_FLOWER_KEY_IP_TTL_MASK = 76 TCA_FLOWER_KEY_MPLS_BOS = 68 TCA_FLOWER_KEY_MPLS_LABEL = 70 +TCA_FLOWER_KEY_MPLS_OPTS = 99 +TCA_FLOWER_KEY_MPLS_OPTS_LSE = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_BOS = 3 +TCA_FLOWER_KEY_MPLS_OPT_LSE_DEPTH = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_LABEL = 5 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TC = 4 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TTL = 2 TCA_FLOWER_KEY_MPLS_TC = 69 TCA_FLOWER_KEY_MPLS_TTL = 67 TCA_FLOWER_KEY_PORT_DST_MAX = 90 diff --git a/sys/linux/socket_netlink_route_sched_arm64.const b/sys/linux/socket_netlink_route_sched_arm64.const index 3e5b19289..1084fbb5a 100644 --- a/sys/linux/socket_netlink_route_sched_arm64.const +++ b/sys/linux/socket_netlink_route_sched_arm64.const @@ -25,11 +25,14 @@ CLOCK_REALTIME = 0 CLOCK_TAI = 11 ETH_P_8021AD = 34984 ETH_P_8021Q = 33024 +FLOW_DIS_MPLS_MAX = 7 FLOW_MODE_HASH = 1 FLOW_MODE_MAP = 0 IFE_META_PRIO = 3 IFE_META_SKBMARK = 1 IFE_META_TCINDEX = 5 +MPLS_BOS_MASK = 1 +MPLS_TC_MASK = 7 NETEM_LOSS_GE = 2 NETEM_LOSS_GI = 1 NF_INET_FORWARD = 2 @@ -270,6 +273,13 @@ TCA_FLOWER_KEY_IP_TTL = 75 TCA_FLOWER_KEY_IP_TTL_MASK = 76 TCA_FLOWER_KEY_MPLS_BOS = 68 TCA_FLOWER_KEY_MPLS_LABEL = 70 +TCA_FLOWER_KEY_MPLS_OPTS = 99 +TCA_FLOWER_KEY_MPLS_OPTS_LSE = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_BOS = 3 +TCA_FLOWER_KEY_MPLS_OPT_LSE_DEPTH = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_LABEL = 5 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TC = 4 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TTL = 2 TCA_FLOWER_KEY_MPLS_TC = 69 TCA_FLOWER_KEY_MPLS_TTL = 67 TCA_FLOWER_KEY_PORT_DST_MAX = 90 diff --git a/sys/linux/socket_netlink_route_sched_mips64le.const b/sys/linux/socket_netlink_route_sched_mips64le.const index 94e5bfe38..e29ccf07d 100644 --- a/sys/linux/socket_netlink_route_sched_mips64le.const +++ b/sys/linux/socket_netlink_route_sched_mips64le.const @@ -25,11 +25,14 @@ CLOCK_REALTIME = 0 CLOCK_TAI = 11 ETH_P_8021AD = 34984 ETH_P_8021Q = 33024 +FLOW_DIS_MPLS_MAX = 7 FLOW_MODE_HASH = 1 FLOW_MODE_MAP = 0 IFE_META_PRIO = 3 IFE_META_SKBMARK = 1 IFE_META_TCINDEX = 5 +MPLS_BOS_MASK = 1 +MPLS_TC_MASK = 7 NETEM_LOSS_GE = 2 NETEM_LOSS_GI = 1 NF_INET_FORWARD = 2 @@ -270,6 +273,13 @@ TCA_FLOWER_KEY_IP_TTL = 75 TCA_FLOWER_KEY_IP_TTL_MASK = 76 TCA_FLOWER_KEY_MPLS_BOS = 68 TCA_FLOWER_KEY_MPLS_LABEL = 70 +TCA_FLOWER_KEY_MPLS_OPTS = 99 +TCA_FLOWER_KEY_MPLS_OPTS_LSE = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_BOS = 3 +TCA_FLOWER_KEY_MPLS_OPT_LSE_DEPTH = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_LABEL = 5 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TC = 4 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TTL = 2 TCA_FLOWER_KEY_MPLS_TC = 69 TCA_FLOWER_KEY_MPLS_TTL = 67 TCA_FLOWER_KEY_PORT_DST_MAX = 90 diff --git a/sys/linux/socket_netlink_route_sched_ppc64le.const b/sys/linux/socket_netlink_route_sched_ppc64le.const index 2d9cf85ff..7aedd5533 100644 --- a/sys/linux/socket_netlink_route_sched_ppc64le.const +++ b/sys/linux/socket_netlink_route_sched_ppc64le.const @@ -25,11 +25,14 @@ CLOCK_REALTIME = 0 CLOCK_TAI = 11 ETH_P_8021AD = 34984 ETH_P_8021Q = 33024 +FLOW_DIS_MPLS_MAX = 7 FLOW_MODE_HASH = 1 FLOW_MODE_MAP = 0 IFE_META_PRIO = 3 IFE_META_SKBMARK = 1 IFE_META_TCINDEX = 5 +MPLS_BOS_MASK = 1 +MPLS_TC_MASK = 7 NETEM_LOSS_GE = 2 NETEM_LOSS_GI = 1 NF_INET_FORWARD = 2 @@ -270,6 +273,13 @@ TCA_FLOWER_KEY_IP_TTL = 75 TCA_FLOWER_KEY_IP_TTL_MASK = 76 TCA_FLOWER_KEY_MPLS_BOS = 68 TCA_FLOWER_KEY_MPLS_LABEL = 70 +TCA_FLOWER_KEY_MPLS_OPTS = 99 +TCA_FLOWER_KEY_MPLS_OPTS_LSE = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_BOS = 3 +TCA_FLOWER_KEY_MPLS_OPT_LSE_DEPTH = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_LABEL = 5 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TC = 4 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TTL = 2 TCA_FLOWER_KEY_MPLS_TC = 69 TCA_FLOWER_KEY_MPLS_TTL = 67 TCA_FLOWER_KEY_PORT_DST_MAX = 90 diff --git a/sys/linux/socket_netlink_route_sched_riscv64.const b/sys/linux/socket_netlink_route_sched_riscv64.const index 3e5b19289..1084fbb5a 100644 --- a/sys/linux/socket_netlink_route_sched_riscv64.const +++ b/sys/linux/socket_netlink_route_sched_riscv64.const @@ -25,11 +25,14 @@ CLOCK_REALTIME = 0 CLOCK_TAI = 11 ETH_P_8021AD = 34984 ETH_P_8021Q = 33024 +FLOW_DIS_MPLS_MAX = 7 FLOW_MODE_HASH = 1 FLOW_MODE_MAP = 0 IFE_META_PRIO = 3 IFE_META_SKBMARK = 1 IFE_META_TCINDEX = 5 +MPLS_BOS_MASK = 1 +MPLS_TC_MASK = 7 NETEM_LOSS_GE = 2 NETEM_LOSS_GI = 1 NF_INET_FORWARD = 2 @@ -270,6 +273,13 @@ TCA_FLOWER_KEY_IP_TTL = 75 TCA_FLOWER_KEY_IP_TTL_MASK = 76 TCA_FLOWER_KEY_MPLS_BOS = 68 TCA_FLOWER_KEY_MPLS_LABEL = 70 +TCA_FLOWER_KEY_MPLS_OPTS = 99 +TCA_FLOWER_KEY_MPLS_OPTS_LSE = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_BOS = 3 +TCA_FLOWER_KEY_MPLS_OPT_LSE_DEPTH = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_LABEL = 5 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TC = 4 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TTL = 2 TCA_FLOWER_KEY_MPLS_TC = 69 TCA_FLOWER_KEY_MPLS_TTL = 67 TCA_FLOWER_KEY_PORT_DST_MAX = 90 diff --git a/sys/linux/socket_netlink_route_sched_s390x.const b/sys/linux/socket_netlink_route_sched_s390x.const index 20f10dbde..511749473 100644 --- a/sys/linux/socket_netlink_route_sched_s390x.const +++ b/sys/linux/socket_netlink_route_sched_s390x.const @@ -25,11 +25,14 @@ CLOCK_REALTIME = 0 CLOCK_TAI = 11 ETH_P_8021AD = 34984 ETH_P_8021Q = 33024 +FLOW_DIS_MPLS_MAX = 7 FLOW_MODE_HASH = 1 FLOW_MODE_MAP = 0 IFE_META_PRIO = 3 IFE_META_SKBMARK = 1 IFE_META_TCINDEX = 5 +MPLS_BOS_MASK = 1 +MPLS_TC_MASK = 7 NETEM_LOSS_GE = 2 NETEM_LOSS_GI = 1 NF_INET_FORWARD = 2 @@ -270,6 +273,13 @@ TCA_FLOWER_KEY_IP_TTL = 75 TCA_FLOWER_KEY_IP_TTL_MASK = 76 TCA_FLOWER_KEY_MPLS_BOS = 68 TCA_FLOWER_KEY_MPLS_LABEL = 70 +TCA_FLOWER_KEY_MPLS_OPTS = 99 +TCA_FLOWER_KEY_MPLS_OPTS_LSE = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_BOS = 3 +TCA_FLOWER_KEY_MPLS_OPT_LSE_DEPTH = 1 +TCA_FLOWER_KEY_MPLS_OPT_LSE_LABEL = 5 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TC = 4 +TCA_FLOWER_KEY_MPLS_OPT_LSE_TTL = 2 TCA_FLOWER_KEY_MPLS_TC = 69 TCA_FLOWER_KEY_MPLS_TTL = 67 TCA_FLOWER_KEY_PORT_DST_MAX = 90 -- cgit mrf-deployment