net: flower: add cfm support
Subsystems (5)
v3 cover net: flower: add cfm support
From: Zahari Doychev <[email protected]>
The first patch adds cfm support to the flow dissector. The second adds the flower classifier support.
The third adds a selftest for the flower cfm functionality.
iproute2 changes will come in follow up patches.
---v2->v3
- split the flow dissector and flower changes in separate patches
- use bit field macros
- copy separately each cfm key field
v1->v2:
- add missing comments
- improve cfm packet dissection
- move defines to header file
- fix code formatting
- remove unneeded attribute defines
rfc->v1:
- add selftest to the makefile TEST_PROGS.
Zahari Doychev (3):
net: flow_dissector: add support for cfm packets
net: flower: add support for matching cfm fields
selftests: net: add tc flower cfm test
include/net/flow_dissector.h | 20 ++ include/uapi/linux/pkt_cls.h | 9 + net/core/flow_dissector.c | 30 +++ net/sched/cls_flower.c | 109 ++++++++++- .../testing/selftests/net/forwarding/Makefile | 1 + .../selftests/net/forwarding/tc_flower_cfm.sh | 175 ++++++++++++++++++ 6 files changed, 343 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/net/forwarding/tc_flower_cfm.sh
Signature · 1 line
2.40.0
PATCH v3 1/3 net: flow_dissector: add support for cfm packets
From: Zahari Doychev <[email protected]>
Add support for dissecting cfm packets. The cfm packet header fields maintenance domain level and opcode can be dissected.
--- include/net/flow_dissector.h | 20 ++++++++++++++++++++ net/core/flow_dissector.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+)
include/net/flow_dissector.h +20 -0
@@ -297,6 +297,25 @@ struct flow_dissector_key_l2tpv3 {__be32 session_id; }; +/** +* struct flow_dissector_key_cfm +* @mdl_ver: maintenance domain level(mdl) and cfm protocol version +* @opcode: code specifying a type of cfm protocol packet +* +* See 802.1ag, ITU-T G.8013/Y.1731 +* 1 2 +* |7 6 5 4 3 2 1 0|7 6 5 4 3 2 1 0| +* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +* | mdl | version | opcode | +* +-----+---------+-+-+-+-+-+-+-+-+ +*/ +struct flow_dissector_key_cfm { +u8 mdl_ver; +u8 opcode; +}; + +#define FLOW_DIS_CFM_MDL_MASK GENMASK(7, 5) +enum flow_dissector_key_id {FLOW_DISSECTOR_KEY_CONTROL ,/* struct flow_dissector_key_control */ FLOW_DISSECTOR_KEY_BASIC ,/* struct flow_dissector_key_basic */
@@ -329,6 +348,7 @@ enum flow_dissector_key_id {FLOW_DISSECTOR_KEY_NUM_OF_VLANS ,/* struct flow_dissector_key_num_of_vlans */ FLOW_DISSECTOR_KEY_PPPOE ,/* struct flow_dissector_key_pppoe */ FLOW_DISSECTOR_KEY_L2TPV3 ,/* struct flow_dissector_key_l2tpv3 */ +FLOW_DISSECTOR_KEY_CFM ,/* struct flow_dissector_key_cfm */ FLOW_DISSECTOR_KEY_MAX, };
net/core/flow_dissector.c +30 -0
@@ -547,6 +547,30 @@ __skb_flow_dissect_arp(const struct sk_buff *skb,return FLOW_DISSECT_RET_OUT_GOOD ; } +static enum flow_dissect_ret +__skb_flow_dissect_cfm (const struct sk_buff *skb, +struct flow_dissector *flow_dissector, +void *target_container,const void *data, +int nhoff,int hlen) +{ +struct flow_dissector_key_cfm *key, *hdr, _hdr; + +if (!dissector_uses_key (flow_dissector,FLOW_DISSECTOR_KEY_CFM )) +return FLOW_DISSECT_RET_OUT_GOOD ; + + hdr =__skb_header_pointer (skb, nhoff,sizeof (*key), data, hlen, &_hdr); +if (!hdr) +return FLOW_DISSECT_RET_OUT_BAD ; + + key =skb_flow_dissector_target (flow_dissector,FLOW_DISSECTOR_KEY_CFM , + target_container); + + key->mdl_ver = hdr->mdl_ver; + key->opcode = hdr->opcode; + +return FLOW_DISSECT_RET_OUT_GOOD ; +} + static enum flow_dissect_ret __skb_flow_dissect_gre(const struct sk_buff *skb, struct flow_dissector_key_control *key_control,
@@ -1390,6 +1414,12 @@ bool __skb_flow_dissect(const struct net *net,break ; } +case htons (ETH_P_CFM ): { + fdret =__skb_flow_dissect_cfm (skb, flow_dissector, + target_container, data, + nhoff, hlen); +break ; + }default : fdret =FLOW_DISSECT_RET_OUT_BAD ;break ;
Signature · 1 line
2.40.0
Re: [PATCH net-next v3 1/3] net: flow_dissector: add support for cfm packets
Quoted 6 lines · Zahari Doychev
From: Zahari Doychev <[email protected]>
Add support for dissecting cfm packets. The cfm packet header fields maintenance domain level and opcode can be dissected.
Signed-off-by Zahari Doychev <[email protected]>
PATCH v3 2/3 net: flower: add support for matching cfm fields
In reply to Zahari DoychevFrom: Zahari Doychev <[email protected]>
Add support to the tc flower classifier to match based on fields in CFM information elements like level and opcode.
tc filter add dev ens6 ingress protocol 802.1q \
flower vlan_id 698 vlan_ethtype 0x8902 cfm mdl 5 op 46 \ action drop
--- include/uapi/linux/pkt_cls.h | 9 +++ net/sched/cls_flower.c | 109 ++++++++++++++++++++++++++++++++++- 2 files changed, 117 insertions(+), 1 deletion(-)
include/uapi/linux/pkt_cls.h +9 -0
@@ -594,6 +594,8 @@ enum {TCA_FLOWER_KEY_L2TPV3_SID ,/* be32 */ +TCA_FLOWER_KEY_CFM ,/* nested */ + __TCA_FLOWER_MAX, };
@@ -702,6 +704,13 @@ enum { TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST = (1 << 1), }; +enum { +TCA_FLOWER_KEY_CFM_OPT_UNSPEC , +TCA_FLOWER_KEY_CFM_MD_LEVEL , +TCA_FLOWER_KEY_CFM_OPCODE , +TCA_FLOWER_KEY_CFM_OPT_MAX , +}; +#define TCA_FLOWER_MASK_FLAGS_RANGE (1 << 0)/* Range-based match */ /* Match-all classifier */
net/sched/cls_flower.c +108 -1
163 lines not on this page · raw message
Signature · 1 line
2.40.0
Re: [PATCH net-next v3 2/3] net: flower: add support for matching cfm fields
Quoted 10 lines · Zahari Doychev
From: Zahari Doychev <[email protected]>
Add support to the tc flower classifier to match based on fields in CFM information elements like level and opcode.
tc filter add dev ens6 ingress protocol 802.1q \
flower vlan_id 698 vlan_ethtype 0x8902 cfm mdl 5 op 46 \ action dropSigned-off-by Zahari Doychev <[email protected]>
...
net/sched/cls_flower.c static int fl_dump_key_ct(struct sk_buff *skb, · line 3082
Quoted 9 lines
net/sched/cls_flower.c +9
-0+static int fl_dump_key_cfm (struct sk_buff *skb, +struct flow_dissector_key_cfm *key, +struct flow_dissector_key_cfm *mask) +{ +struct nlattr *opts; +int err; +u8 mdl; + +if (!memchr_inv (mask,0 ,sizeof (mask)))
Perhaps this should be sizeof(*mask)
With that fixed feel free to add,
Quoted 27 lines
net/sched/cls_flower.c +27
-0+return 0 ; + + opts =nla_nest_start (skb,TCA_FLOWER_KEY_CFM ); +if (!opts) +return -EMSGSIZE ; + +if (FIELD_GET (FLOW_DIS_CFM_MDL_MASK , mask->mdl_ver)) { + mdl =FIELD_GET (FLOW_DIS_CFM_MDL_MASK , key->mdl_ver); + err =nla_put_u8 (skb,TCA_FLOWER_KEY_CFM_MD_LEVEL , mdl); +if (err) + goto err_cfm_opts; + } + +if (mask->opcode) { + err =nla_put_u8 (skb,TCA_FLOWER_KEY_CFM_OPCODE , key->opcode); +if (err) + goto err_cfm_opts; + } + +nla_nest_end (skb, opts); + +return 0 ; + +err_cfm_opts: +nla_nest_cancel (skb, opts); +return err; +}
...
Re: [PATCH net-next v3 2/3] net: flower: add support for matching cfm fields
Quoted 26 lines · Simon Horman
Quoted 10 lines · Zahari Doychev
From: Zahari Doychev <[email protected]>
Add support to the tc flower classifier to match based on fields in CFM information elements like level and opcode.
tc filter add dev ens6 ingress protocol 802.1q \
flower vlan_id 698 vlan_ethtype 0x8902 cfm mdl 5 op 46 \ action dropSigned-off-by Zahari Doychev <[email protected]>...
net/sched/cls_flower.c static int fl_dump_key_ct(struct sk_buff *skb, · line 3082
Quoted 9 lines
net/sched/cls_flower.c +9
-0+static int fl_dump_key_cfm (struct sk_buff *skb, +struct flow_dissector_key_cfm *key, +struct flow_dissector_key_cfm *mask) +{ +struct nlattr *opts; +int err; +u8 mdl; + +if (!memchr_inv (mask,0 ,sizeof (mask)))Perhaps this should be
sizeof(*mask)
Quoted 4 lines
With that fixed feel free to add,
Reviewed-by Simon Horman <[email protected]>
Thanks, will do and resend.
...
Re: [PATCH net-next v3 2/3] net: flower: add support for matching cfm fields
In reply to Zahari DoychevQuoted 4 lines · Zahari Doychev
net/sched/cls_flower.c +4
-0+static const struct nla_policy cfm_opt_policy[TCA_FLOWER_KEY_CFM_OPT_MAX ] = { + [TCA_FLOWER_KEY_CFM_MD_LEVEL ] = { .type =NLA_U8 }, + [TCA_FLOWER_KEY_CFM_OPCODE ] = { .type =NLA_U8 }, +};
[...]
Quoted 6 lines
net/sched/cls_flower.c +6
-0+static int fl_set_key_cfm_md_level (struct nlattr **tb, +struct fl_flow_key *key, +struct fl_flow_key *mask, +struct netlink_ext_ack *extack) +{ +u8 level;
net/sched/cls_flower.c static bool is_vlan_key(struct nlattr *tb, __be16 *ethertype, · line 1678
Quoted 10 lines
net/sched/cls_flower.c +10
-0+ +if (!tb[TCA_FLOWER_KEY_CFM_MD_LEVEL ]) +return 0 ; + + level =nla_get_u8 (tb[TCA_FLOWER_KEY_CFM_MD_LEVEL ]); +if (level & ~FIELD_MAX (FLOW_DIS_CFM_MDL_MASK )) { +NL_SET_ERR_MSG_ATTR (extack, tb[TCA_FLOWER_KEY_CFM_MD_LEVEL ], +"cfm md level must be in [0, 7]" ); +return -EINVAL ; + }
You should be able to replace this with NLA_POLICY_MAX()
Quoted 6 lines
net/sched/cls_flower.c +6
-0+ + key->cfm.mdl_ver =FIELD_PREP (FLOW_DIS_CFM_MDL_MASK , level); + mask->cfm.mdl_ver =FLOW_DIS_CFM_MDL_MASK ; + +return 0 ; +}
Re: [PATCH net-next v3 2/3] net: flower: add support for matching cfm fields
Quoted 18 lines · Ido Schimmel
Quoted 4 lines · Zahari Doychev
net/sched/cls_flower.c +4
-0+static const struct nla_policy cfm_opt_policy[TCA_FLOWER_KEY_CFM_OPT_MAX ] = { + [TCA_FLOWER_KEY_CFM_MD_LEVEL ] = { .type =NLA_U8 }, + [TCA_FLOWER_KEY_CFM_OPCODE ] = { .type =NLA_U8 }, +};[...]
Quoted 10 lines
net/sched/cls_flower.c +10
-0+static int fl_set_key_cfm_md_level (struct nlattr **tb, +struct fl_flow_key *key, +struct fl_flow_key *mask, +struct netlink_ext_ack *extack) +{ +u8 level; + +if (!tb[TCA_FLOWER_KEY_CFM_MD_LEVEL ]) +return 0 ; +
Quoted 8 lines
net/sched/cls_flower.c static bool is_vlan_key(struct nlattr *tb, __be16 *ethertype, · line 1678
Quoted 6 lines
net/sched/cls_flower.c +6
-0+ level =nla_get_u8 (tb[TCA_FLOWER_KEY_CFM_MD_LEVEL ]); +if (level & ~FIELD_MAX (FLOW_DIS_CFM_MDL_MASK )) { +NL_SET_ERR_MSG_ATTR (extack, tb[TCA_FLOWER_KEY_CFM_MD_LEVEL ], +"cfm md level must be in [0, 7]" ); +return -EINVAL ; + }You should be able to replace this with
NLA_POLICY_MAX()
ok, I will change it in the next version.
thanks
Zahari
Quoted 7 lines
Quoted 7 lines
net/sched/cls_flower.c +6
-0+ + key->cfm.mdl_ver =FIELD_PREP (FLOW_DIS_CFM_MDL_MASK , level); + mask->cfm.mdl_ver =FLOW_DIS_CFM_MDL_MASK ; + +return 0 ; +}
PATCH v3 3/3 selftests: net: add tc flower cfm test
In reply to Zahari DoychevFrom: Zahari Doychev <[email protected]>
New cfm flower test case is added to the net forwarding selfttests.
--- .../testing/selftests/net/forwarding/Makefile | 1 + .../selftests/net/forwarding/tc_flower_cfm.sh | 175 ++++++++++++++++++ 2 files changed, 176 insertions(+) create mode 100755 tools/testing/selftests/net/forwarding/tc_flower_cfm.sh
tools/testing/selftests/net/forwarding/Makefile +1 -0
@@ -82,6 +82,7 @@ TEST_PROGS = bridge_igmp.sh \ tc_chains.sh \ tc_flower_router.sh \ tc_flower.sh \ + tc_flower_cfm.sh \ tc_mpls_l2vpn.sh \ tc_police.sh \ tc_shblocks.sh \
tools/testing/selftests/net/forwarding/tc_flower_cfm.sh new file +175 -0
175 lines not on this page · raw message
Signature · 1 line
2.40.0