1 files changed, 18 insertions, 11 deletions

diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
index a9cd5c93dd2b..77908311ec98 100644
--- a/kernel/bpf/devmap.c
+++ b/kernel/bpf/devmap.c
@@ -232,24 +232,31 @@ static int bq_xmit_all(struct bpf_dtab_netdev *obj,
                 prefetch(xdpf);
         }
 
-        for (i = 0; i < bq->count; i++) {
-                struct xdp_frame *xdpf = bq->q[i];
-                int err;
-
-                err = dev->netdev_ops->ndo_xdp_xmit(dev, xdpf);
-                if (err) {
-                        drops++;
-                        xdp_return_frame_rx_napi(xdpf);
-                } else {
-                        sent++;
-                }
+        sent = dev->netdev_ops->ndo_xdp_xmit(dev, bq->count, bq->q);
+        if (sent < 0) {
+                sent = 0;
+                goto error;
         }
+        drops = bq->count - sent;
+out:
         bq->count = 0;
 
         trace_xdp_devmap_xmit(&obj->dtab->map, obj->bit,
                               sent, drops, bq->dev_rx, dev);
         bq->dev_rx = NULL;
         return 0;
+error:
+        /* If ndo_xdp_xmit fails with an errno, no frames have been
+         * xmit'ed and it's our responsibility to them free all.
+         */
+        for (i = 0; i < bq->count; i++) {
+                struct xdp_frame *xdpf = bq->q[i];
+
+                /* RX path under NAPI protection, can return frames faster */
+                xdp_return_frame_rx_napi(xdpf);
+                drops++;
+        }
+        goto out;
 }
 
 /* __dev_map_flush is called from xdp_do_flush_map() which _must_ be signaled