lkml.org 
[lkml]   [2018]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 38/41] virtio-net: fix leaking page for gso packet during mergeable XDP
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jason Wang <jasowang@redhat.com>

    [ Upstream commit 3d62b2a0db505bbf9ed0755f254e45d775f9807f ]

    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. While at it, remove useless comment as well.

    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>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/virtio_net.c | 15 +++++++--------
    1 file changed, 7 insertions(+), 8 deletions(-)

    --- a/drivers/net/virtio_net.c
    +++ b/drivers/net/virtio_net.c
    @@ -632,6 +632,13 @@ static struct sk_buff *receive_mergeable
    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.
    + */
    + if (unlikely(hdr->hdr.gso_type))
    + goto err_xdp;
    +
    /* This happens when rx buffer size is underestimated */
    if (unlikely(num_buf > 1 ||
    headroom < virtnet_get_headroom(vi))) {
    @@ -647,14 +654,6 @@ static struct sk_buff *receive_mergeable
    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.
    */

    \
     
     \ /
      Last update: 2018-06-09 17:37    [W:5.777 / U:1.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site