lkml.org 
[lkml]   [2021]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 319/323] batman-adv: Dont always reallocate the fragmentation skb head
    Date
    From: Sven Eckelmann <sven@narfation.org>

    commit 992b03b88e36254e26e9a4977ab948683e21bd9f upstream.

    When a packet is fragmented by batman-adv, the original batman-adv header
    is not modified. Only a new fragmentation is inserted between the original
    one and the ethernet header. The code must therefore make sure that it has
    a writable region of this size in the skbuff head.

    But it is not useful to always reallocate the skbuff by this size even when
    there would be more than enough headroom still in the skb. The reallocation
    is just to costly during in this codepath.

    Fixes: ee75ed88879a ("batman-adv: Fragment and send skbs larger than mtu")
    Signed-off-by: Sven Eckelmann <sven@narfation.org>
    Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
    Signed-off-by: Sven Eckelmann <sven@narfation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/batman-adv/fragmentation.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    --- a/net/batman-adv/fragmentation.c
    +++ b/net/batman-adv/fragmentation.c
    @@ -539,13 +539,14 @@ int batadv_frag_send_packet(struct sk_bu
    frag_header.no++;
    }

    - /* Make room for the fragment header. */
    - if (batadv_skb_head_push(skb, header_size) < 0 ||
    - pskb_expand_head(skb, header_size + ETH_HLEN, 0, GFP_ATOMIC) < 0) {
    - ret = -ENOMEM;
    + /* make sure that there is at least enough head for the fragmentation
    + * and ethernet headers
    + */
    + ret = skb_cow_head(skb, ETH_HLEN + header_size);
    + if (ret < 0)
    goto put_primary_if;
    - }

    + skb_push(skb, header_size);
    memcpy(skb->data, &frag_header, header_size);

    /* Send the last fragment */

    \
     
     \ /
      Last update: 2021-11-24 14:18    [W:2.556 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site