aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Karlsson <magnus.karlsson@intel.com>2018-07-11 10:12:52 +0200
committerDaniel Borkmann <daniel@iogearbox.net>2018-07-13 15:34:31 +0200
commit09210c4bcc065d9d91ef3c051902ad18252cd3c0 (patch)
treea6f5887720b2047a63fd37546b6bcc946d35a960
parentxsk: always return ENOBUFS from sendmsg if there is no TX queue (diff)
downloadlinux-dev-09210c4bcc065d9d91ef3c051902ad18252cd3c0.tar.xz
linux-dev-09210c4bcc065d9d91ef3c051902ad18252cd3c0.zip
xsk: do not return EMSGSIZE in copy mode for packets larger than MTU
This patch stops returning EMSGSIZE from sendmsg in copy mode when the size of the packet is larger than the MTU. Just send it to the device so that it will drop it as in zero-copy mode. This makes the error reporting consistent between copy mode and zero-copy mode. Fixes: 35fcde7f8deb ("xsk: support for Tx") Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-rw-r--r--net/xdp/xsk.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index 9c784307f7b0..72335c2e8108 100644
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -233,15 +233,10 @@ static int xsk_generic_xmit(struct sock *sk, struct msghdr *m,
if (xskq_reserve_addr(xs->umem->cq))
goto out;
- len = desc.len;
- if (unlikely(len > xs->dev->mtu)) {
- err = -EMSGSIZE;
- goto out;
- }
-
if (xs->queue_id >= xs->dev->real_num_tx_queues)
goto out;
+ len = desc.len;
skb = sock_alloc_send_skb(sk, len, 1, &err);
if (unlikely(!skb)) {
err = -EAGAIN;