net: stmmac: Filtering fixes
Subsystems (4)
cover net: stmmac: Filtering fixes
Two single fixes for the L3 and L4 filtering in stmmac.
1) Updates the internal status of RSS when disabling it in order to keep internal driver status consistent.
2) Do not lets user add a filter if RSS is enabled because the filter will not work correctly as RSS bypasses this mechanism.
---
Cc: Giuseppe Cavallaro <[email protected]>
Cc: Alexandre Torgue <[email protected]>
Cc: Jose Abreu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
Jose Abreu (2):
net: stmmac: selftests: Update status when disabling RSS
net: stmmac: tc: Do not setup flower filtering if RSS is enabled
.../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 20 ++++++++++++++------ drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 4 ++++ 2 files changed, 18 insertions(+), 6 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/2 net: stmmac: selftests: Update status when disabling RSS
We are disabling RSS on HW but not updating the internal private status to the 'disabled' state. This is needed for next tc commit that will check if RSS is disabled before trying to apply filters.
---
Cc: Giuseppe Cavallaro <[email protected]>
Cc: Alexandre Torgue <[email protected]>
Cc: Jose Abreu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c +14 -6
@@ -1323,16 +1323,19 @@ static int __stmmac_test_l3filt(struct stmmac_priv *priv, u32 dst, u32 src,struct stmmac_packet_attrs attr = { };struct flow_dissector *dissector;struct flow_cls_offload *cls; +int ret, old_enable =0 ;struct flow_rule *rule; -int ret;if (!tc_can_offload (priv->dev))return -EOPNOTSUPP ;if (!priv->dma_cap.l3l4fnum)return -EOPNOTSUPP ; -if (priv->rss.enable) +if (priv->rss.enable) { + old_enable = priv->rss.enable; + priv->rss.enable = false;stmmac_rss_configure (priv, priv->hw,NULL , priv->plat->rx_queues_to_use); + } dissector =kzalloc (sizeof (*dissector),GFP_KERNEL );if (!dissector) {
@@ -1399,7 +1402,8 @@ static int __stmmac_test_l3filt(struct stmmac_priv *priv, u32 dst, u32 src, cleanup_dissector:kfree (dissector); cleanup_rss: -if (priv->rss.enable) { +if (old_enable) { + priv->rss.enable = old_enable;stmmac_rss_configure (priv, priv->hw, &priv->rss, priv->plat->rx_queues_to_use); }
@@ -1444,16 +1448,19 @@ static int __stmmac_test_l4filt(struct stmmac_priv *priv, u32 dst, u32 src,struct stmmac_packet_attrs attr = { };struct flow_dissector *dissector;struct flow_cls_offload *cls; +int ret, old_enable =0 ;struct flow_rule *rule; -int ret;if (!tc_can_offload (priv->dev))return -EOPNOTSUPP ;if (!priv->dma_cap.l3l4fnum)return -EOPNOTSUPP ; -if (priv->rss.enable) +if (priv->rss.enable) { + old_enable = priv->rss.enable; + priv->rss.enable = false;stmmac_rss_configure (priv, priv->hw,NULL , priv->plat->rx_queues_to_use); + } dissector =kzalloc (sizeof (*dissector),GFP_KERNEL );if (!dissector) {
@@ -1525,7 +1532,8 @@ static int __stmmac_test_l4filt(struct stmmac_priv *priv, u32 dst, u32 src, cleanup_dissector:kfree (dissector); cleanup_rss: -if (priv->rss.enable) { +if (old_enable) { + priv->rss.enable = old_enable;stmmac_rss_configure (priv, priv->hw, &priv->rss, priv->plat->rx_queues_to_use); }
Signature · 1 line
2.7.4
PATCH 2/2 net: stmmac: tc: Do not setup flower filtering if RSS is enabled
In reply to Jose AbreuRSS, when enabled, will bypass the L3 and L4 filtering causing it not to work. Add a check before trying to setup the filters.
---
Cc: Giuseppe Cavallaro <[email protected]>
Cc: Alexandre Torgue <[email protected]>
Cc: Jose Abreu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +4 -0
@@ -577,6 +577,10 @@ static int tc_setup_cls(struct stmmac_priv *priv, {int ret =0 ; +/* When RSS is enabled, the filtering will be bypassed */ +if (priv->rss.enable) +return -EBUSY ; +switch (cls->command) {case FLOW_CLS_REPLACE : ret =tc_add_flow (priv, cls);
Signature · 1 line
2.7.4
David Miller
maintainerFrom: Jose Abreu <[email protected]>
Date: Fri, 10 Jan 2020 16:23:51 +0100
Quoted 7 lines
Two single fixes for the L3 and L4 filtering in stmmac.
1) Updates the internal status of RSS when disabling it in order to keep internal driver status consistent.
2) Do not lets user add a filter if RSS is enabled because the filter will not work correctly as RSS bypasses this mechanism.
Series applied and queued up for v5.4 -stable, thanks.