Skip to contentSkip to conversation

bnxt_en: ntuple filter fixes

PATCH Applied Michael Chan 3 participants 8 messages Jan 5, 2024 – Jan 9, 2024

Subsystems (3)
lore
Share & tools
lore

Michael Chan

author maintainer
#0 lore raw

cover bnxt_en: ntuple filter fixes

The first patch is to remove an unneeded variable. The next 2 patches are to release RCU lock correctly after accesing the RCU protected filter structure. Patch 2 also re-arranges the code to look cleaner.

Michael Chan (3):
bnxt_en: Remove unneeded variable in bnxt_hwrm_clear_vnic_filter()
bnxt_en: Fix RCU locking for ntuple filters in bnxt_srxclsrldel()
bnxt_en: Fix RCU locking for ntuple filters in bnxt_rx_flow_steer()

 drivers/net/ethernet/broadcom/bnxt/bnxt.c     |  7 ++-----
 .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 21 ++++++++++---------
 2 files changed, 13 insertions(+), 15 deletions(-)
Signature · 1 line
2.30.1
author maintainer
#1 lore raw

PATCH 1/3 bnxt_en: Remove unneeded variable in bnxt_hwrm_clear_vnic_filter()

After recent refactoring, this function doesn't return error any more. Remove the unneeded rc variable and change the function to void. The caller is not checking for the return value.

Fixes 96c9bedc755e ("bnxt_en: Refactor L2 filter alloc/free firmware commands.")
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -4
index b70ddd33e9ed..fb5af8a34c8f 100644
@@ -5752,10 +5752,9 @@ static int bnxt_hwrm_set_vnic_filter(struct bnxt *bp, u16 vnic_id, u16 idx,
 	return rc;
 }
 
-static int bnxt_hwrm_clear_vnic_filter(struct bnxt *bp)
+static void bnxt_hwrm_clear_vnic_filter(struct bnxt *bp)
 {
 	u16 i, j, num_of_vnics = 1; /* only vnic 0 supported */
-	int rc = 0;
 
 	/* Any associated ntuple filters will also be cleared by firmware. */
 	for (i = 0; i < num_of_vnics; i++) {
@@ -5769,8 +5768,6 @@ static int bnxt_hwrm_clear_vnic_filter(struct bnxt *bp)
 		}
 		vnic->uc_filter_count = 0;
 	}
-
-	return rc;
 }
 
 #define BNXT_DFLT_TUNL_TPA_BMAP				\
Signature · 1 line
2.30.1
reviewer Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH net-next 1/3] bnxt_en: Remove unneeded variable in bnxt_hwrm_clear_vnic_filter()

Quoted 8 lines · Michael Chan

After recent refactoring, this function doesn't return error any more. Remove the unneeded rc variable and change the function to void. The caller is not checking for the return value.

Fixes 96c9bedc755e ("bnxt_en: Refactor L2 filter alloc/free firmware commands.")

Hi Michael,

I'm not sure this is a bug fix, so I might have cited the commit using something like "Introduced by commit ..." rather than a Fixes tag.

But the fix isn't going to propagate very far anyway, as the cited commit is currently only in net-next. So perhaps it is fine as is.

In any case, I agree that this is a nice update to the code.

author maintainer
#3 lore raw

PATCH 2/3 bnxt_en: Fix RCU locking for ntuple filters in bnxt_srxclsrldel()

In reply to Michael Chan

After looking up an ntuple filter from a RCU hash list, the rcu_read_unlock() call should be made after reading the structure, or after determining that the filter cannot age out (by aRFS). The existing code was calling rcu_read_unlock() too early in bnxt_srxclsrldel().

As suggested by Simon Horman, change the code to handle the error case of fltr_base not found in the if condition. The code looks cleaner this way.

Fixes 8d7ba028aa9a ("bnxt_en: Add support for ntuple filter deletion by ethtool.")
---
 .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +11 -10
index 5629ba9f4b2e..27b983c0a8a9 100644
@@ -1345,25 +1345,26 @@ static int bnxt_srxclsrldel(struct bnxt *bp, struct ethtool_rxnfc *cmd)
 {
 	struct ethtool_rx_flow_spec *fs = &cmd->fs;
 	struct bnxt_filter_base *fltr_base;
+	struct bnxt_ntuple_filter *fltr;
 
 	rcu_read_lock();
 	fltr_base = bnxt_get_one_fltr_rcu(bp, bp->ntp_fltr_hash_tbl,
 					  BNXT_NTP_FLTR_HASH_SIZE,
 					  fs->location);
-	if (fltr_base) {
-		struct bnxt_ntuple_filter *fltr;
-
-		fltr = container_of(fltr_base, struct bnxt_ntuple_filter, base);
+	if (!fltr_base) {
 		rcu_read_unlock();
-		if (!(fltr->base.flags & BNXT_ACT_NO_AGING))
-			return -EINVAL;
-		bnxt_hwrm_cfa_ntuple_filter_free(bp, fltr);
-		bnxt_del_ntp_filter(bp, fltr);
-		return 0;
+		return -ENOENT;
 	}
 
+	fltr = container_of(fltr_base, struct bnxt_ntuple_filter, base);
+	if (!(fltr->base.flags & BNXT_ACT_NO_AGING)) {
+		rcu_read_unlock();
+		return -EINVAL;
+	}
 	rcu_read_unlock();
-	return -ENOENT;
+	bnxt_hwrm_cfa_ntuple_filter_free(bp, fltr);
+	bnxt_del_ntp_filter(bp, fltr);
+	return 0;
 }
 
 static u64 get_ethtool_ipv4_rss(struct bnxt *bp)
Signature · 1 line
2.30.1
reviewer Reviewed-by on v1 2/3
#4 lore raw

Re: [PATCH net-next 2/3] bnxt_en: Fix RCU locking for ntuple filters in bnxt_srxclsrldel()

Quoted 10 lines · Michael Chan

After looking up an ntuple filter from a RCU hash list, the rcu_read_unlock() call should be made after reading the structure, or after determining that the filter cannot age out (by aRFS). The existing code was calling rcu_read_unlock() too early in bnxt_srxclsrldel().

As suggested by Simon Horman, change the code to handle the error case of fltr_base not found in the if condition. The code looks cleaner this way.

Quoted 5 lines
Fixes 8d7ba028aa9a ("bnxt_en: Add support for ntuple filter deletion by ethtool.")

Thanks Michael,

I agree that this addresses the issue flagged at the Link above. That it is a bug-fix, and should have a Fixes tag.
And that as the cited commit has not propagated beyond net-next it is appropriate to target this patch at net-next.

FWIIW, I might have separated the bug fix from the code re-arrangement that I suggested. But perhaps that is over doing things as the patch is for net-next anyway.

author maintainer
#5 lore raw

PATCH 3/3 bnxt_en: Fix RCU locking for ntuple filters in bnxt_rx_flow_steer()

In reply to Michael Chan

Similar to the previous patch, RCU locking was released too early in bnxt_rx_flow_steer(). Fix it to unlock after reading fltr->base.sw_id to guarantee that fltr won't be freed while we are still reading it.

Fixes cb5bdd292dc0 ("bnxt_en: Add bnxt_lookup_ntp_filter_from_idx() function")
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -1
index fb5af8a34c8f..0aacd3c6ed5c 100644
@@ -14020,8 +14020,8 @@ static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
 	rcu_read_lock();
 	fltr = bnxt_lookup_ntp_filter_from_idx(bp, new_fltr, idx);
 	if (fltr) {
-		rcu_read_unlock();
 		rc = fltr->base.sw_id;
+		rcu_read_unlock();
 		goto err_free;
 	}
 	rcu_read_unlock();
Signature · 1 line
2.30.1
reviewer Reviewed-by on v1 3/3
#6 lore raw

Re: [PATCH net-next 3/3] bnxt_en: Fix RCU locking for ntuple filters in bnxt_rx_flow_steer()

Quoted 8 lines · Michael Chan

Similar to the previous patch, RCU locking was released too early in bnxt_rx_flow_steer(). Fix it to unlock after reading fltr->base.sw_id to guarantee that fltr won't be freed while we are still reading it.

Fixes cb5bdd292dc0 ("bnxt_en: Add bnxt_lookup_ntp_filter_from_idx() function")

Thanks Michael,

I agree that this addresses the issue flagged at the Link above. That it is a bug-fix, and should have a Fixes tag.
And that as the cited commit has not propagated beyond net-next it is appropriate to target this patch at net-next.

#7 lore raw
In reply to Michael Chan
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 10 lines · On Fri, 5 Jan 2024 15:54:36 -0800 you wrote:

The first patch is to remove an unneeded variable. The next 2 patches are to release RCU lock correctly after accesing the RCU protected filter structure. Patch 2 also re-arranges the code to look cleaner.

Michael Chan (3):
bnxt_en: Remove unneeded variable in bnxt_hwrm_clear_vnic_filter()
bnxt_en: Fix RCU locking for ntuple filters in bnxt_srxclsrldel()
bnxt_en: Fix RCU locking for ntuple filters in bnxt_rx_flow_steer()

[...]

Here is the summary with links:
- [net-next,1/3] bnxt_en: Remove unneeded variable in bnxt_hwrm_clear_vnic_filter()
https://git.kernel.org/netdev/net-next/c/1ef4cacaae2f
- [net-next,2/3] bnxt_en: Fix RCU locking for ntuple filters in bnxt_srxclsrldel()

    https://git.kernel.org/netdev/net-next/c/fd7769798de8
  - [net-next,3/3] bnxt_en: Fix RCU locking for ntuple filters in bnxt_rx_flow_steer()
    https://git.kernel.org/netdev/net-next/c/d8214d0f0135

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html