[PATCH net 0/2] bnxt_en: 2 bug fixes.

[PATCH net 0/2] bnxt_en: 2 bug fixes.

[Michael Chan]

The first patch prevents possible driver crash if we get a bad RX index
from the hardware.  The second patch resets the device when the hardware
reports buffer error to recover from the error.

Please queue these for -stable also.  Thanks.

Michael Chan (2):
  bnxt_en: Improve RX consumer index validity check.
  bnxt_en: Reset device on RX buffer errors.

 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

-- 
2.5.1

[PATCH net 1/2] bnxt_en: Improve RX consumer index validity check.

[Michael Chan]

There is logic to check that the RX/TPA consumer index is the expected
index to work around a hardware problem.  However, the potentially bad
consumer index is first used to index into an array to reference an entry.
This can potentially crash if the bad consumer index is beyond legal
range.  Improve the logic to use the consumer index for dereferencing
after the validity check and log an error message.

Fixes: fa7e28127a5a ("bnxt_en: Add workaround to detect bad opaque in rx completion (part 2)")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 0bb9d7b..3df847b 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -1133,6 +1133,8 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,
 	tpa_info = &rxr->rx_tpa[agg_id];
 
 	if (unlikely(cons != rxr->rx_next_cons)) {
+		netdev_warn(bp->dev, "TPA cons %x != expected cons %x\n",
+			    cons, rxr->rx_next_cons);
 		bnxt_sched_reset(bp, rxr);
 		return;
 	}
@@ -1585,15 +1587,17 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,
 	}
 
 	cons = rxcmp->rx_cmp_opaque;
-	rx_buf = &rxr->rx_buf_ring[cons];
-	data = rx_buf->data;
-	data_ptr = rx_buf->data_ptr;
 	if (unlikely(cons != rxr->rx_next_cons)) {
 		int rc1 = bnxt_discard_rx(bp, cpr, raw_cons, rxcmp);
 
+		netdev_warn(bp->dev, "RX cons %x != expected cons %x\n",
+			    cons, rxr->rx_next_cons);
 		bnxt_sched_reset(bp, rxr);
 		return rc1;
 	}
+	rx_buf = &rxr->rx_buf_ring[cons];
+	data = rx_buf->data;
+	data_ptr = rx_buf->data_ptr;
 	prefetch(data_ptr);
 
 	misc = le32_to_cpu(rxcmp->rx_cmp_misc_v1);
-- 
2.5.1

[PATCH net 2/2] bnxt_en: Reset device on RX buffer errors.

[Michael Chan]

If the RX completion indicates RX buffers errors, the RX ring will be
disabled by firmware and no packets will be received on that ring from
that point on.  Recover by resetting the device.

Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 3df847b..4c586ba 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -1614,11 +1614,17 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,
 
 	rx_buf->data = NULL;
 	if (rxcmp1->rx_cmp_cfa_code_errors_v2 & RX_CMP_L2_ERRORS) {
+		u32 rx_err = le32_to_cpu(rxcmp1->rx_cmp_cfa_code_errors_v2);
+
 		bnxt_reuse_rx_data(rxr, cons, data);
 		if (agg_bufs)
 			bnxt_reuse_rx_agg_bufs(cpr, cp_cons, agg_bufs);
 
 		rc = -EIO;
+		if (rx_err & RX_CMPL_ERRORS_BUFFER_ERROR_MASK) {
+			netdev_warn(bp->dev, "RX buffer error %x\n", rx_err);
+			bnxt_sched_reset(bp, rxr);
+		}
 		goto next_rx;
 	}
 
-- 
2.5.1

Re: [PATCH net 0/2] bnxt_en: 2 bug fixes.

[David Miller]

From: Michael Chan <michael.chan@broadcom.com>
Date: Mon,  8 Apr 2019 17:39:53 -0400

> The first patch prevents possible driver crash if we get a bad RX index
> from the hardware.  The second patch resets the device when the hardware
> reports buffer error to recover from the error.
> 
> Please queue these for -stable also.  Thanks.

Series applied and queued up for -stable, thanks.

Re: [PATCH net 0/2] bnxt_en: 2 bug fixes

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net.git (main)
by David S. Miller <davem@davemloft.net>:

On Fri,  3 Mar 2023 18:43:56 -0800 you wrote:
> This series fixes 2 issues:
> 
> 1. A potential order-5 memory allocation failure during open.
> 2. Double memory free bug during shutdown.
> 
> Michael Chan (1):
>   bnxt_en: Avoid order-5 memory allocation for TPA data
> 
> [...]

Here is the summary with links:
  - [net,1/2] bnxt_en: Avoid order-5 memory allocation for TPA data
    https://git.kernel.org/netdev/net/c/accd7e23693a
  - [net,2/2] bnxt_en: Fix the double free during device removal
    https://git.kernel.org/netdev/net/c/89b59a84cb16

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

[PATCH net 0/2] bnxt_en: 2 bug fixes

[Michael Chan]

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

This series fixes 2 issues:

1. A potential order-5 memory allocation failure during open.
2. Double memory free bug during shutdown.

Michael Chan (1):
  bnxt_en: Avoid order-5 memory allocation for TPA data

Selvin Xavier (1):
  bnxt_en: Fix the double free during device removal

 drivers/net/ethernet/broadcom/bnxt/bnxt.c     | 25 +++++++++----------
 drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c |  2 ++
 2 files changed, 14 insertions(+), 13 deletions(-)

-- 
2.32.0


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4209 bytes --]

Re: [PATCH net 0/2] bnxt_en: 2 bug fixes

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net.git (refs/heads/master):

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

[PATCH net 0/2] bnxt_en: 2 bug fixes

[Michael Chan]

[-- Attachment #1: Type: text/plain, Size: 378 bytes --]

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(+)

-- 
2.18.1


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4209 bytes --]

Re: [PATCH net 0/2] bnxt_en: 2 bug fixes.

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net.git (refs/heads/master):

On Sat, 15 May 2021 03:25:17 -0400 you wrote:
> The first one fixes a bug to properly identify some recently added HyperV
> device IDs.  The second one fixes device context memory set up on systems
> with 64K page size.
> 
> Please queue these for -stable as well.  Thanks.
> 
> Andy Gospodarek (1):
>   bnxt_en: Include new P5 HV definition in VF check.
> 
> [...]

Here is the summary with links:
  - [net,1/2] bnxt_en: Include new P5 HV definition in VF check.
    https://git.kernel.org/netdev/net/c/ab21494be9dc
  - [net,2/2] bnxt_en: Fix context memory setup for 64K page size.
    https://git.kernel.org/netdev/net/c/702279d2ce46

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

[PATCH net 0/2] bnxt_en: 2 bug fixes.

[Michael Chan]

The first one fixes a bug to properly identify some recently added HyperV
device IDs.  The second one fixes device context memory set up on systems
with 64K page size.

Please queue these for -stable as well.  Thanks.

Andy Gospodarek (1):
  bnxt_en: Include new P5 HV definition in VF check.

Michael Chan (1):
  bnxt_en: Fix context memory setup for 64K page size.

 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 12 +++---------
 drivers/net/ethernet/broadcom/bnxt/bnxt.h | 10 ++++++++++
 2 files changed, 13 insertions(+), 9 deletions(-)

-- 
2.18.1

Re: [PATCH net 0/2] bnxt_en: 2 bug fixes.

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net.git (refs/heads/master):

On Thu, 11 Feb 2021 02:24:22 -0500 you wrote:
> Two unrelated fixes.  The first one fixes intermittent false TX timeouts
> during ring reconfigurations.  The second one fixes a formatting
> discrepancy between the stored and the running FW versions.
> 
> Please also queue these for -stable.  Thanks.
> 
> Edwin Peer (1):
>   bnxt_en: reverse order of TX disable and carrier off
> 
> [...]

Here is the summary with links:
  - [net,1/2] bnxt_en: reverse order of TX disable and carrier off
    https://git.kernel.org/netdev/net/c/132e0b65dc2b
  - [net,2/2] bnxt_en: Fix devlink info's stored fw.psid version format.
    https://git.kernel.org/netdev/net/c/db28b6c77f40

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

[PATCH net 0/2] bnxt_en: 2 bug fixes.

[Michael Chan]

Two unrelated fixes.  The first one fixes intermittent false TX timeouts
during ring reconfigurations.  The second one fixes a formatting
discrepancy between the stored and the running FW versions.

Please also queue these for -stable.  Thanks.

Edwin Peer (1):
  bnxt_en: reverse order of TX disable and carrier off

Vasundhara Volam (1):
  bnxt_en: Fix devlink info's stored fw.psid version format.

 drivers/net/ethernet/broadcom/bnxt/bnxt.c         | 3 ++-
 drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

-- 
2.18.1

Re: [PATCH net 0/2] bnxt_en: 2 bug fixes.

[David Miller]

From: Michael Chan <michael.chan@broadcom.com>
Date: Sun,  1 Mar 2020 22:07:16 -0500

> This first patch fixes a rare but possible crash in pci_disable_msix()
> when the MTU is changed.  The 2nd patch fixes a regression in error
> code handling when flashing a file to NVRAM.

Applied.

> Please also queue these for -stable.  Thanks.

Queued up, thanks Michael.

[PATCH net 0/2] bnxt_en: 2 bug fixes.

[Michael Chan]

This first patch fixes a rare but possible crash in pci_disable_msix()
when the MTU is changed.  The 2nd patch fixes a regression in error
code handling when flashing a file to NVRAM.

Please also queue these for -stable.  Thanks.

Edwin Peer (1):
  bnxt_en: fix error handling when flashing from file

Vasundhara Volam (1):
  bnxt_en: reinitialize IRQs when MTU is modified

 drivers/net/ethernet/broadcom/bnxt/bnxt.c         |  4 ++--
 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 24 +++++++++++------------
 2 files changed, 13 insertions(+), 15 deletions(-)

-- 
2.5.1

Re: [PATCH net 0/2] bnxt_en: 2 bug fixes.

[David Miller]

From: Michael Chan <michael.chan@broadcom.com>
Date: Fri, 11 Nov 2016 00:11:41 -0500

> Bug fixes in bnxt_setup_tc() and VF vitual link state.

Series applied, thanks Michael.

[PATCH net 0/2] bnxt_en: 2 bug fixes.

[Michael Chan]

Bug fixes in bnxt_setup_tc() and VF vitual link state.

Michael Chan (2):
  bnxt_en: Fix ring arithmetic in bnxt_setup_tc().
  bnxt_en: Fix VF virtual link state.

 drivers/net/ethernet/broadcom/bnxt/bnxt.c       | 11 ++++++-----
 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

-- 
1.8.3.1

Re: [PATCH net 0/2] bnxt_en: 2 bug fixes.

[David Miller]

From: Michael Chan <michael.chan@broadcom.com>
Date: Wed,  4 May 2016 16:56:42 -0400

> Fix crash on ppc64 due to missing memory barrier and restore multicast
> after reset.

Looks good, series applied, thanks.

[PATCH net 0/2] bnxt_en: 2 bug fixes.

[Michael Chan]

Fix crash on ppc64 due to missing memory barrier and restore multicast
after reset.

Michael Chan (2):
  bnxt_en: Need memory barrier when processing the completion ring.
  bnxt_en: Setup multicast properly after resetting device.

 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

-- 
1.8.3.1