From: Jason Wang <jasowang@redhat.com>
To: mst@redhat.com, jasowang@redhat.com
Cc: virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net 3/4] virtio-net: reset num_buf to 1 after linearizing packet
Date: Mon, 21 May 2018 16:35:05 +0800 [thread overview]
Message-ID: <1526891706-18516-4-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1526891706-18516-1-git-send-email-jasowang@redhat.com>
If we successfully linearize the packets, num_buf were set to zero
which was wrong since we now have only 1 buffer to be used for e.g in
the error path of receive_mergeable(). Zero num_buf will lead the code
try to pop the buffers of next packet and drop it. Fixing this by set
num_buf to 1 if we successfully linearize the packet.
Fixes: 4941d472bf95 ("virtio-net: do not reset during XDP set")
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/net/virtio_net.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 6260d65..165a922 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -722,6 +722,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
&len);
if (!xdp_page)
goto err_xdp;
+ num_buf = 1;
offset = VIRTIO_XDP_HEADROOM;
} else {
xdp_page = page;
--
2.7.4
next prev parent reply other threads:[~2018-05-21 8:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-21 8:35 [PATCH net 0/4] Fix several issues of virtio-net mergeable XDP Jason Wang
2018-05-21 8:35 ` [PATCH net 1/4] virtio-net: correctly redirect linearized packet Jason Wang
2018-05-21 15:03 ` Michael S. Tsirkin
2018-05-21 8:35 ` [PATCH net 2/4] virtio-net: correctly transmit XDP buff after linearizing Jason Wang
2018-05-21 15:03 ` Michael S. Tsirkin
2018-05-21 8:35 ` Jason Wang [this message]
2018-05-21 14:59 ` [PATCH net 3/4] virtio-net: reset num_buf to 1 after linearizing packet Michael S. Tsirkin
2018-05-22 3:36 ` Jason Wang
2018-05-21 8:35 ` [PATCH net 4/4] virito-net: fix leaking page for gso packet during mergeable XDP Jason Wang
2018-05-21 15:01 ` Michael S. Tsirkin
2018-05-22 3:37 ` Jason Wang
2018-05-21 15:04 ` [PATCH net 0/4] Fix several issues of virtio-net " Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1526891706-18516-4-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).