lkml.org 
[lkml]   [2022]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 025/121] net: gro: move skb_gro_receive_list to udp_offload.c
    Date
    From: Eric Dumazet <edumazet@google.com>

    [ Upstream commit 0b935d7f8c07bf0a192712bdbf76dbf45ef8b115 ]

    This helper is used once, no need to keep it in fat net/core/skbuff.c

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/linux/netdevice.h | 1 -
    net/core/skbuff.c | 26 --------------------------
    net/ipv4/udp_offload.c | 27 +++++++++++++++++++++++++++
    3 files changed, 27 insertions(+), 27 deletions(-)

    diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
    index 049858c671ef..7500ac08c9ba 100644
    --- a/include/linux/netdevice.h
    +++ b/include/linux/netdevice.h
    @@ -3007,7 +3007,6 @@ struct net_device *dev_get_by_napi_id(unsigned int napi_id);
    int netdev_get_name(struct net *net, char *name, int ifindex);
    int dev_restart(struct net_device *dev);
    int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb);
    -int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb);

    static inline unsigned int skb_gro_offset(const struct sk_buff *skb)
    {
    diff --git a/net/core/skbuff.c b/net/core/skbuff.c
    index 56e23333e708..f1e3d70e8987 100644
    --- a/net/core/skbuff.c
    +++ b/net/core/skbuff.c
    @@ -3919,32 +3919,6 @@ struct sk_buff *skb_segment_list(struct sk_buff *skb,
    }
    EXPORT_SYMBOL_GPL(skb_segment_list);

    -int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb)
    -{
    - if (unlikely(p->len + skb->len >= 65536))
    - return -E2BIG;
    -
    - if (NAPI_GRO_CB(p)->last == p)
    - skb_shinfo(p)->frag_list = skb;
    - else
    - NAPI_GRO_CB(p)->last->next = skb;
    -
    - skb_pull(skb, skb_gro_offset(skb));
    -
    - NAPI_GRO_CB(p)->last = skb;
    - NAPI_GRO_CB(p)->count++;
    - p->data_len += skb->len;
    -
    - /* sk owenrship - if any - completely transferred to the aggregated packet */
    - skb->destructor = NULL;
    - p->truesize += skb->truesize;
    - p->len += skb->len;
    -
    - NAPI_GRO_CB(skb)->same_flow = 1;
    -
    - return 0;
    -}
    -
    /**
    * skb_segment - Perform protocol segmentation on skb.
    * @head_skb: buffer to segment
    diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
    index 86d32a1e62ac..c2398f9e46f0 100644
    --- a/net/ipv4/udp_offload.c
    +++ b/net/ipv4/udp_offload.c
    @@ -424,6 +424,33 @@ static struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb,
    return segs;
    }

    +static int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb)
    +{
    + if (unlikely(p->len + skb->len >= 65536))
    + return -E2BIG;
    +
    + if (NAPI_GRO_CB(p)->last == p)
    + skb_shinfo(p)->frag_list = skb;
    + else
    + NAPI_GRO_CB(p)->last->next = skb;
    +
    + skb_pull(skb, skb_gro_offset(skb));
    +
    + NAPI_GRO_CB(p)->last = skb;
    + NAPI_GRO_CB(p)->count++;
    + p->data_len += skb->len;
    +
    + /* sk owenrship - if any - completely transferred to the aggregated packet */
    + skb->destructor = NULL;
    + p->truesize += skb->truesize;
    + p->len += skb->len;
    +
    + NAPI_GRO_CB(skb)->same_flow = 1;
    +
    + return 0;
    +}
    +
    +
    #define UDP_GRO_CNT_MAX 64
    static struct sk_buff *udp_gro_receive_segment(struct list_head *head,
    struct sk_buff *skb)
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-03-14 13:37    [W:4.134 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site