* [PATCH net-next] bnxt_en: Fix allocation of zero statistics block size regression.
@ 2019-08-23 5:51 Michael Chan
2019-08-23 14:24 ` Jonathan Lemon
2019-08-24 23:35 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Michael Chan @ 2019-08-23 5:51 UTC (permalink / raw)
To: davem; +Cc: jonathan.lemon, netdev
Recent commit added logic to determine the appropriate statistics block
size to allocate and the size is stored in bp->hw_ring_stats_size. But
if the firmware spec is older than 1.6.0, it is 0 and not initialized.
This causes the allocation to fail with size 0 and bnxt_open() to
abort. Fix it by always initializing bp->hw_ring_stats_size to the
legacy default size value.
Fixes: 4e7485066373 ("bnxt_en: Allocate the larger per-ring statistics block for 57500 chips.")
Reported-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 4c790ff..b9ad43d 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -4985,6 +4985,7 @@ static int bnxt_hwrm_vnic_qcaps(struct bnxt *bp)
struct hwrm_vnic_qcaps_input req = {0};
int rc;
+ bp->hw_ring_stats_size = sizeof(struct ctx_hw_stats);
if (bp->hwrm_spec_code < 0x10600)
return 0;
@@ -5004,8 +5005,6 @@ static int bnxt_hwrm_vnic_qcaps(struct bnxt *bp)
if (bp->max_tpa_v2)
bp->hw_ring_stats_size =
sizeof(struct ctx_hw_stats_ext);
- else
- bp->hw_ring_stats_size = sizeof(struct ctx_hw_stats);
}
mutex_unlock(&bp->hwrm_cmd_lock);
return rc;
--
2.5.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] bnxt_en: Fix allocation of zero statistics block size regression.
2019-08-23 5:51 [PATCH net-next] bnxt_en: Fix allocation of zero statistics block size regression Michael Chan
@ 2019-08-23 14:24 ` Jonathan Lemon
2019-08-24 23:35 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Jonathan Lemon @ 2019-08-23 14:24 UTC (permalink / raw)
To: Michael Chan; +Cc: davem, netdev, kernel-team
On 22 Aug 2019, at 22:51, Michael Chan wrote:
> Recent commit added logic to determine the appropriate statistics
> block
> size to allocate and the size is stored in bp->hw_ring_stats_size.
> But
> if the firmware spec is older than 1.6.0, it is 0 and not initialized.
> This causes the allocation to fail with size 0 and bnxt_open() to
> abort. Fix it by always initializing bp->hw_ring_stats_size to the
> legacy default size value.
>
> Fixes: 4e7485066373 ("bnxt_en: Allocate the larger per-ring statistics
> block for 57500 chips.")
> Reported-by: Jonathan Lemon <jonathan.lemon@gmail.com>
> Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Tested-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Acked-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Thanks, Michael!
--
Jonathan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] bnxt_en: Fix allocation of zero statistics block size regression.
2019-08-23 5:51 [PATCH net-next] bnxt_en: Fix allocation of zero statistics block size regression Michael Chan
2019-08-23 14:24 ` Jonathan Lemon
@ 2019-08-24 23:35 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2019-08-24 23:35 UTC (permalink / raw)
To: michael.chan; +Cc: jonathan.lemon, netdev
From: Michael Chan <michael.chan@broadcom.com>
Date: Fri, 23 Aug 2019 01:51:41 -0400
> Recent commit added logic to determine the appropriate statistics block
> size to allocate and the size is stored in bp->hw_ring_stats_size. But
> if the firmware spec is older than 1.6.0, it is 0 and not initialized.
> This causes the allocation to fail with size 0 and bnxt_open() to
> abort. Fix it by always initializing bp->hw_ring_stats_size to the
> legacy default size value.
>
> Fixes: 4e7485066373 ("bnxt_en: Allocate the larger per-ring statistics block for 57500 chips.")
> Reported-by: Jonathan Lemon <jonathan.lemon@gmail.com>
> Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-24 23:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-23 5:51 [PATCH net-next] bnxt_en: Fix allocation of zero statistics block size regression Michael Chan
2019-08-23 14:24 ` Jonathan Lemon
2019-08-24 23:35 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).