Commit fe588685 authored by Magnus Karlsson's avatar Magnus Karlsson Committed by Alexei Starovoitov

xsk: frame could be completed more than once in SKB path

Fixed a bug in which a frame could be completed more than once
when an error was returned from dev_direct_xmit(). The code
erroneously retried sending the message leading to multiple
calls to the SKB destructor and therefore multiple completions
of the same buffer to user space.

The error code in this case has been changed from EAGAIN to EBUSY
in order to tell user space that the sending of the packet failed
and the buffer has been return to user space through the completion
queue.

Fixes: 35fcde7f ("xsk: support for Tx")
Signed-off-by: default avatarMagnus Karlsson <magnus.karlsson@intel.com>
Reported-by: default avatarPavel Odintsov <pavel@fastnetmon.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 20b52a75
...@@ -268,15 +268,15 @@ static int xsk_generic_xmit(struct sock *sk, struct msghdr *m, ...@@ -268,15 +268,15 @@ static int xsk_generic_xmit(struct sock *sk, struct msghdr *m,
skb->destructor = xsk_destruct_skb; skb->destructor = xsk_destruct_skb;
err = dev_direct_xmit(skb, xs->queue_id); err = dev_direct_xmit(skb, xs->queue_id);
xskq_discard_desc(xs->tx);
/* Ignore NET_XMIT_CN as packet might have been sent */ /* Ignore NET_XMIT_CN as packet might have been sent */
if (err == NET_XMIT_DROP || err == NETDEV_TX_BUSY) { if (err == NET_XMIT_DROP || err == NETDEV_TX_BUSY) {
err = -EAGAIN; /* SKB completed but not sent */
/* SKB consumed by dev_direct_xmit() */ err = -EBUSY;
goto out; goto out;
} }
sent_frame = true; sent_frame = true;
xskq_discard_desc(xs->tx);
} }
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment