lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 474/639] net/tls: fix socket wmem accounting on fallback with netem
    Date
    From: Jakub Kicinski <jakub.kicinski@netronome.com>

    [ Upstream commit 5c4b4608fe100838c62591877101128467e56c00 ]

    netem runs skb_orphan_partial() which "disconnects" the skb
    from normal TCP write memory accounting. We should not adjust
    sk->sk_wmem_alloc on the fallback path for such skbs.

    Fixes: e8f69799810c ("net/tls: Add generic NIC offload infrastructure")
    Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
    Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/tls/tls_device_fallback.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/net/tls/tls_device_fallback.c b/net/tls/tls_device_fallback.c
    index 426dd97725e4a..6cf832891b53e 100644
    --- a/net/tls/tls_device_fallback.c
    +++ b/net/tls/tls_device_fallback.c
    @@ -208,6 +208,10 @@ static void complete_skb(struct sk_buff *nskb, struct sk_buff *skb, int headln)

    update_chksum(nskb, headln);

    + /* sock_efree means skb must gone through skb_orphan_partial() */
    + if (nskb->destructor == sock_efree)
    + return;
    +
    delta = nskb->truesize - skb->truesize;
    if (likely(delta < 0))
    WARN_ON_ONCE(refcount_sub_and_test(-delta, &sk->sk_wmem_alloc));
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:40    [W:4.103 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site