]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mlx4: add missed recycle opportunity for XDP_TX on TX failure
authorJesper Dangaard Brouer <brouer@redhat.com>
Mon, 19 Sep 2016 15:46:38 +0000 (17:46 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 20 Sep 2016 08:58:17 +0000 (04:58 -0400)
Correct drop handling for XDP_TX on TX failure, were recently added in
commit 95357907ae73 ("mlx4: fix XDP_TX is acting like XDP_PASS on TX
ring full").

The change missed an opportunity for recycling the RX page, instead of
going through the page allocator, like the regular XDP_DROP action does.
This patch cease the opportunity, by going through the XDP_DROP case.

Fixes: 95357907ae73 ("mlx4: fix XDP_TX is acting like XDP_PASS on TX ring full")
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx4/en_rx.c

index c80073e4947f2f673c72835c554d70b6d0db3506..c46355bce613f46a1c14366d9463528616b7ed57 100644 (file)
@@ -906,11 +906,12 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
                                                        length, tx_index,
                                                        &doorbell_pending))
                                        goto consumed;
-                               goto next; /* Drop on xmit failure */
+                               goto xdp_drop; /* Drop on xmit failure */
                        default:
                                bpf_warn_invalid_xdp_action(act);
                        case XDP_ABORTED:
                        case XDP_DROP:
+xdp_drop:
                                if (mlx4_en_rx_recycle(ring, frags))
                                        goto consumed;
                                goto next;