lkml.org 
[lkml]   [2017]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 206/370] gro: Enter slow-path if there is no tailroom
    3.16.42-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Herbert Xu <herbert@gondor.apana.org.au>

    commit 1272ce87fa017ca4cf32920764d879656b7a005a upstream.

    The GRO path has a fast-path where we avoid calling pskb_may_pull
    and pskb_expand by directly accessing frag0. However, this should
    only be done if we have enough tailroom in the skb as otherwise
    we'll have to expand it later anyway.

    This patch adds the check by capping frag0_len with the skb tailroom.

    Fixes: cb18978cbf45 ("gro: Open-code final pskb_may_pull")
    Reported-by: Slava Shwartsman <slavash@mellanox.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    net/core/dev.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/net/core/dev.c
    +++ b/net/core/dev.c
    @@ -3920,7 +3920,8 @@ static void skb_gro_reset_offset(struct
    pinfo->nr_frags &&
    !PageHighMem(skb_frag_page(frag0))) {
    NAPI_GRO_CB(skb)->frag0 = skb_frag_address(frag0);
    - NAPI_GRO_CB(skb)->frag0_len = skb_frag_size(frag0);
    + NAPI_GRO_CB(skb)->frag0_len = min(skb_frag_size(frag0),
    + skb->end - skb->tail);
    }
    }

    \
     
     \ /
      Last update: 2017-03-10 14:56    [W:4.062 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site