bnxt_en: 2 bug fixes
Michael Chan
maintainercover bnxt_en: 2 bug fixes
The first one disables aRFS/NTUPLE on an older broken firmware version. The second one adds missing memory barriers related to completion ring handling.
Michael Chan (2):
bnxt_en: Disable aRFS if running on 212 firmware
bnxt_en: Add missing DMA memory barriers
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
Signature · 1 line
2.18.1
Michael Chan
maintainerPATCH 1/2 bnxt_en: Disable aRFS if running on 212 firmware
212 firmware broke aRFS, so disable it. Traffic may stop after ntuple filters are inserted and deleted by the 212 firmware.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +3 -0
@@ -10792,6 +10792,9 @@ static bool bnxt_rfs_supported(struct bnxt *bp)return true;return false; } +/* 212 firmware is broken for aRFS */ +if (BNXT_FW_MAJ (bp) ==212 ) +return false;if (BNXT_PF (bp) && !BNXT_CHIP_TYPE_NITRO_A0 (bp))return true;if (bp->flags &BNXT_FLAG_NEW_RSS_CAP )
Signature · 1 line
2.18.1
Michael Chan
maintainerPATCH 2/2 bnxt_en: Add missing DMA memory barriers
In reply to Michael ChanEach completion ring entry has a valid bit to indicate that the entry contains a valid completion event. The driver's main poll loop __bnxt_poll_work() has the proper dma_rmb() to make sure the valid bit of the next entry has been checked before proceeding further. But when we call bnxt_rx_pkt() to process the RX event, the RX completion event consists of two completion entries and only the first entry has been checked to be valid. We need the same barrier after checking the next completion entry. Add missing dma_rmb() barriers in bnxt_rx_pkt() and other similar locations.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +12 -0
@@ -1788,6 +1788,10 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,if (!RX_CMP_VALID (rxcmp1, tmp_raw_cons))return -EBUSY ; +/* The valid test of the entry must be done first before +* reading any further. +*/ +dma_rmb (); prod = rxr->rx_prod;if (cmp_type ==CMP_TYPE_RX_L2_TPA_START_CMP ) {
@@ -2010,6 +2014,10 @@ static int bnxt_force_rx_discard(struct bnxt *bp,if (!RX_CMP_VALID (rxcmp1, tmp_raw_cons))return -EBUSY ; +/* The valid test of the entry must be done first before +* reading any further. +*/ +dma_rmb (); cmp_type =RX_CMP_TYPE (rxcmp);if (cmp_type ==CMP_TYPE_RX_L2_CMP ) { rxcmp1->rx_cmp_cfa_code_errors_v2 |=
@@ -2475,6 +2483,10 @@ static int bnxt_poll_nitroa0(struct napi_struct *napi, int budget)if (!TX_CMP_VALID (txcmp, raw_cons))break ; +/* The valid test of the entry must be done first before +* reading any further. +*/ +dma_rmb ();if ((TX_CMP_TYPE (txcmp) &0x30 ) ==0x10 ) { tmp_raw_cons =NEXT_RAW_CMP (raw_cons); cp_cons =RING_CMP (tmp_raw_cons);
Signature · 1 line
2.18.1
This series was applied to netdev/net.git (refs/heads/master):
Hello:
This series was applied to netdev/net.git (refs/heads/master):
Quoted 9 lines · On Sun, 15 Aug 2021 16:15:35 -0400 you wrote:
The first one disables aRFS/NTUPLE on an older broken firmware version. The second one adds missing memory barriers related to completion ring handling.
Michael Chan (2):
bnxt_en: Disable aRFS if running on 212 firmware
bnxt_en: Add missing DMA memory barriers[...]
Here is the summary with links:
- [net,1/2] bnxt_en: Disable aRFS if running on 212 firmware
https://git.kernel.org/netdev/net/c/976e52b718c3 - [net,2/2] bnxt_en: Add missing DMA memory barriers https://git.kernel.org/netdev/net/c/828affc27ed4
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html