diff options
| author |   Michael Chan <michael.chan@broadcom.com> | 2019-05-22 19:12:54 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-05-22 18:02:14 -0700 |
| commit | 296d5b54163964b7ae536b8b57dfbd21d4e868e1 (patch) | |
| tree | 9a0e5b263c6339371405b36b14af2fcce63e2734 /drivers/net/ethernet/broadcom/bnxt/bnxt.c | |
| parent | ipv6: Fix redirect with VRF (diff) | |
| download | linux-dev-296d5b54163964b7ae536b8b57dfbd21d4e868e1.tar.xz linux-dev-296d5b54163964b7ae536b8b57dfbd21d4e868e1.zip | |
bnxt_en: Fix aggregation buffer leak under OOM condition.
For every RX packet, the driver replenishes all buffers used for that
packet and puts them back into the RX ring and RX aggregation ring.
In one code path where the RX packet has one RX buffer and one or more
aggregation buffers, we missed recycling the aggregation buffer(s) if
we are unable to allocate a new SKB buffer. This leads to the
aggregation ring slowly running out of buffers over time. Fix it
by properly recycling the aggregation buffers.
Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.")
Reported-by: Rakesh Hemnani <rhemnani@fb.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 8314c00d7537..21f682610e6a 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -1642,6 +1642,8 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, skb = bnxt_copy_skb(bnapi, data_ptr, len, dma_addr); bnxt_reuse_rx_data(rxr, cons, data); if (!skb) { + if (agg_bufs) + bnxt_reuse_rx_agg_bufs(cpr, cp_cons, agg_bufs); rc = -ENOMEM; goto next_rx; } |