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,
John Fastabend <john.fastabend@gmail.com>
Subject: [PATCH net 4/4] virito-net: fix leaking page for gso packet during mergeable XDP
Date: Mon, 21 May 2018 16:35:06 +0800 [thread overview]
Message-ID: <1526891706-18516-5-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1526891706-18516-1-git-send-email-jasowang@redhat.com>
We need to drop refcnt to xdp_page if we see a gso packet. Otherwise
it will be leaked. Fixing this by moving the check of gso packet above
the linearizing logic.
Cc: John Fastabend <john.fastabend@gmail.com>
Fixes: 72979a6c3590 ("virtio_net: xdp, add slowpath case for non contiguous buffers")
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/net/virtio_net.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 165a922..f8db809 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -707,6 +707,14 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
void *data;
u32 act;
+ /* Transient failure which in theory could occur if
+ * in-flight packets from before XDP was enabled reach
+ * the receive path after XDP is loaded. In practice I
+ * was not able to create this condition.
+ */
+ if (unlikely(hdr->hdr.gso_type))
+ goto err_xdp;
+
/* This happens when rx buffer size is underestimated
* or headroom is not enough because of the buffer
* was refilled before XDP is set. This should only
@@ -728,14 +736,6 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
xdp_page = page;
}
- /* Transient failure which in theory could occur if
- * in-flight packets from before XDP was enabled reach
- * the receive path after XDP is loaded. In practice I
- * was not able to create this condition.
- */
- if (unlikely(hdr->hdr.gso_type))
- goto err_xdp;
-
/* Allow consuming headroom but reserve enough space to push
* the descriptor on if we get an XDP_TX return code.
*/
--
2.7.4
next prev parent reply other threads:[~2018-05-21 8:35 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 ` [PATCH net 3/4] virtio-net: reset num_buf to 1 after linearizing packet Jason Wang
2018-05-21 14:59 ` Michael S. Tsirkin
2018-05-22 3:36 ` Jason Wang
2018-05-21 8:35 ` Jason Wang [this message]
2018-05-21 15:01 ` [PATCH net 4/4] virito-net: fix leaking page for gso packet during mergeable XDP 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-5-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=john.fastabend@gmail.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).