lkml.org 
[lkml]   [2020]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 109/158] bpf, sockmap: Use truesize with sk_rmem_schedule()
    Date
    From: John Fastabend <john.fastabend@gmail.com>

    [ Upstream commit 70796fb751f1d34cc650e640572a174faf009cd4 ]

    We use skb->size with sk_rmem_scheduled() which is not correct. Instead
    use truesize to align with socket and tcp stack usage of sk_rmem_schedule.

    Suggested-by: Daniel Borkman <daniel@iogearbox.net>
    Signed-off-by: John Fastabend <john.fastabend@gmail.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
    Link: https://lore.kernel.org/bpf/160556570616.73229.17003722112077507863.stgit@john-XPS-13-9370
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/core/skmsg.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/core/skmsg.c b/net/core/skmsg.c
    index 4fad59ee3df0b..ddb1b7d94c998 100644
    --- a/net/core/skmsg.c
    +++ b/net/core/skmsg.c
    @@ -411,7 +411,7 @@ static int sk_psock_skb_ingress(struct sk_psock *psock, struct sk_buff *skb)
    msg = kzalloc(sizeof(*msg), __GFP_NOWARN | GFP_ATOMIC);
    if (unlikely(!msg))
    return -EAGAIN;
    - if (!sk_rmem_schedule(sk, skb, skb->len)) {
    + if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
    kfree(msg);
    return -EAGAIN;
    }
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-11-23 14:41    [W:5.601 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site