net: flower: add cfm support
Subsystems (5)
v6 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.
---v5->v6
- do not use NLA_POLICY_NESTED() for cfm_opt_policy attribute
v4->v5
- fix coding style in flow dissector
- use strict validation for flower cfm attributes
- selftest: remove unneeded parameters and configuration
- selftest: make cfm packet generation code more readable
- selftest: use the same pref for each filter
- selftest: check if all filters match
v3->v4
- use correct size in memchr_inv()
- remove md level range check and use NLA_POLICY_MAX
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 | 21 ++ include/uapi/linux/pkt_cls.h | 9 + net/core/flow_dissector.c | 30 +++ net/sched/cls_flower.c | 103 +++++++++ .../testing/selftests/net/forwarding/Makefile | 1 + .../selftests/net/forwarding/tc_flower_cfm.sh | 206 ++++++++++++++++++ 6 files changed, 370 insertions(+) create mode 100755 tools/testing/selftests/net/forwarding/tc_flower_cfm.sh
Signature · 1 line
2.41.0
PATCH v6 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 | 21 +++++++++++++++++++++ net/core/flow_dissector.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+)
include/net/flow_dissector.h +21 -0
@@ -301,6 +301,26 @@ 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) +#define FLOW_DIS_CFM_MDL_MAX 7 +enum flow_dissector_key_id {FLOW_DISSECTOR_KEY_CONTROL ,/* struct flow_dissector_key_control */ FLOW_DISSECTOR_KEY_BASIC ,/* struct flow_dissector_key_basic */
@@ -333,6 +353,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
@@ -557,6 +557,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,
@@ -1400,6 +1424,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.41.0
PATCH v6 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 | 103 +++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+)
include/uapi/linux/pkt_cls.h +9 -0
@@ -596,6 +596,8 @@ enum {TCA_FLOWER_L2_MISS ,/* u8 */ +TCA_FLOWER_KEY_CFM ,/* nested */ + __TCA_FLOWER_MAX, };
@@ -704,6 +706,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 +103 -0
157 lines not on this page · raw message
Signature · 1 line
2.41.0
Re: [PATCH net-next v6 2/3] net: flower: add support for matching cfm fields
Quoted 8 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 drop
Looks good overall. One minor comment below.
[...]
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 1687
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 ]); + key->cfm.mdl_ver =FIELD_PREP (FLOW_DIS_CFM_MDL_MASK , level); + mask->cfm.mdl_ver =FLOW_DIS_CFM_MDL_MASK ; + +return 0 ; +}
This function always returns '0' so it can be changed to return 'void' instead of 'int' like fl_set_key_cfm_opcode().
Quoted 20 lines
net/sched/cls_flower.c +20
-0+ +static void fl_set_key_cfm_opcode (struct nlattr **tb, +struct fl_flow_key *key, +struct fl_flow_key *mask, +struct netlink_ext_ack *extack) +{ +fl_set_key_val (tb, &key->cfm.opcode,TCA_FLOWER_KEY_CFM_OPCODE , + &mask->cfm.opcode,TCA_FLOWER_UNSPEC , +sizeof (key->cfm.opcode)); +} + +static int fl_set_key_cfm (struct nlattr **tb, +struct fl_flow_key *key, +struct fl_flow_key *mask, +struct netlink_ext_ack *extack) +{ +struct nlattr *nla_cfm_opt[TCA_FLOWER_KEY_CFM_OPT_MAX ]; +int err; + +if (!tb[TCA_FLOWER_KEY_CFM ])
net/sched/cls_flower.c static bool is_vlan_key(struct nlattr *tb, __be16 *ethertype, · line 1717
Quoted 10 lines
net/sched/cls_flower.c +10
-0+return 0 ; + + err =nla_parse_nested (nla_cfm_opt,TCA_FLOWER_KEY_CFM_OPT_MAX , + tb[TCA_FLOWER_KEY_CFM ], cfm_opt_policy, extack); +if (err <0 ) +return err; + +fl_set_key_cfm_opcode (nla_cfm_opt, key, mask, extack); + +return fl_set_key_cfm_md_level (nla_cfm_opt, key, mask, extack);
And here simply do 'return 0;'.
Quoted 1 line
+}
PATCH v6 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.
Example output:
# ./tc_flower_cfm.sh p1 p2 TEST: CFM opcode match test [ OK ] TEST: CFM level match test [ OK ] TEST: CFM opcode and level match test [ OK ]
--- .../testing/selftests/net/forwarding/Makefile | 1 + .../selftests/net/forwarding/tc_flower_cfm.sh | 206 ++++++++++++++++++ 2 files changed, 207 insertions(+) create mode 100755 tools/testing/selftests/net/forwarding/tc_flower_cfm.sh
tools/testing/selftests/net/forwarding/Makefile +1 -0
@@ -84,6 +84,7 @@ TEST_PROGS = bridge_igmp.sh \ tc_flower_router.sh \ tc_flower.sh \ tc_flower_l2_miss.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 +206 -0
206 lines not on this page · raw message
Signature · 1 line
2.41.0