octeontx2-pf: Add additional check for MCAM rules
PATCH v4 1/1 octeontx2-pf: Add additional check for MCAM rules
Due to hardware limitation, MCAM drop rule withether_type == 802.1Q and vlan_id == 0 is not supported. Hence rejecting such rules.
---
Changes since v3:
- moved assignment of vlan_etype before the if check
.../net/ethernet/marvell/octeontx2/nic/otx2_flows.c | 8 ++++++++ .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 13 +++++++++++++ 2 files changed, 21 insertions(+)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c +8 -0
@@ -872,6 +872,14 @@ static int otx2_prepare_flow_request(struct ethtool_rx_flow_spec *fsp,return -EINVAL ; vlan_etype =be16_to_cpu (fsp->h_ext.vlan_etype); + +/* Drop rule with vlan_etype == 802.1Q +* and vlan_id == 0 is not supported +*/ +if (vlan_etype ==ETH_P_8021Q && !fsp->m_ext.vlan_tci && + fsp->ring_cookie ==RX_CLS_FLOW_DISC ) +return -EINVAL ; +/* Only ETH_P_8021Q and ETH_P_802AD types supported */ if (vlan_etype !=ETH_P_8021Q && vlan_etype !=ETH_P_8021AD )
drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c +13 -0
@@ -604,6 +604,19 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic, struct otx2_tc_flow *node,return -EOPNOTSUPP ; } +if (!match.mask->vlan_id) { +struct flow_action_entry *act; +int i; + +flow_action_for_each (i, act, &rule->action) { +if (act->id ==FLOW_ACTION_DROP ) { +netdev_err (nic->netdev,"vlan tpid 0x%x with vlan_id %d is not supported for DROP rule.\n" , +ntohs (match.key->vlan_tpid), match.key->vlan_id); +return -EOPNOTSUPP ; + } + } + } +if (match.mask->vlan_id || match.mask->vlan_dei || match.mask->vlan_priority) {
Signature · 1 line
2.25.1
Quoted 6 lines · Suman Ghosh
Due to hardware limitation, MCAM drop rule with
ether_type== 802.1Q andvlan_id== 0 is not supported. Hence rejecting such rules.Fixes dce677da57c0 ("octeontx2-pf: Add vlan-etype to ntuple filters")Signed-off-by Suman Ghosh <[email protected]>
(...)
Quoted 5 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c +0
-0@@ -604,6 +604,19 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic, struct otx2_tc_flow *node,return -EOPNOTSUPP ; }
drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c static int otx2_tc_prepare_flow(struct otx2_nic *nic, struct otx2_tc_flow *node, · line 615
Quoted 10 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c +9
-0+if (!match.mask->vlan_id) { +struct flow_action_entry *act; +int i; + +flow_action_for_each (i, act, &rule->action) { +if (act->id ==FLOW_ACTION_DROP ) { +netdev_err (nic->netdev,"vlan tpid 0x%x with vlan_id %d is not supported for DROP rule.\n" , +ntohs (match.key->vlan_tpid), match.key->vlan_id); +return -EOPNOTSUPP ;
The code got very nested here.
Please consider moving the above check to a separate helper function, or at least reformatting the error log to fix the checkpatch warning about 80 chars, for example:
flow_action_for_each(i, act, &rule->action) {
if (act->id == FLOW_ACTION_DROP) {
netdev_err(nic->netdev,
"vlan tpid 0x%x with vlan_id %d is not supported for DROP rule.\n",
ntohs(match.key->vlan_tpid),
match.key->vlan_id);
return -EOPNOTSUPP;
}Thanks,
Michal
Quoted 26 lines
----------------------------------------------------------------------
Quoted 5 lines · Suman Ghosh
Due to hardware limitation, MCAM drop rule with
ether_type== 802.1Q andvlan_id== 0 is not supported. Hence rejecting such rules.Fixes dce677da57c0 ("octeontx2-pf: Add vlan-etype to ntuple filters")Signed-off-by Suman Ghosh <[email protected]>(...)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c static int otx2_tc_prepare_flow(struct otx2_nic
Quoted 3 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c +0
-0@@ -604,6 +604,19 @@ static int otx2_tc_prepare_flow(struct otx2_nic*nic, struct
otx2_tc_flow*node,drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c static int otx2_tc_prepare_flow(struct otx2_nic *nic, struct otx2_tc_flow *node,
Quoted 10 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c +7
-0return -EOPNOTSUPP ; } +if (!match.mask->vlan_id) { +struct flow_action_entry *act; +int i; + +flow_action_for_each (i, act, &rule->action) { +if (act->id ==FLOW_ACTION_DROP ) { + netdev_err(nic->netdev, "vlan tpid 0x%x with
vlan_id%d is not supported for DROP rule.\n",
Quoted 8 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c static int otx2_tc_prepare_flow(struct otx2_nic · line 616
Quoted 3 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c +2
-0+ntohs (match.key->vlan_tpid), match.key- vlan_id); +return -EOPNOTSUPP ;The code got very nested here.
Please consider moving the above check to a separate helper function, or at least reformatting the error log to fix the checkpatch warning about 80 chars, for example:
[Suman] Will do the suggested reformatting in next version.
Quoted 13 lines
flow_action_for_each(i, act, &rule->action) { if (act->id == FLOW_ACTION_DROP) { netdev_err(nic->netdev, "vlan tpid 0x%x with vlan_id %d is not supported for DROP rule.\n", ntohs(match.key->vlan_tpid), match.key->vlan_id); return -EOPNOTSUPP; }Thanks,
Michal