lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 308/390] openvswitch: Fix overreporting of drops in dropwatch
    Date
    From: Mike Pattrick <mkp@redhat.com>

    [ Upstream commit c21ab2afa2c64896a7f0e3cbc6845ec63dcfad2e ]

    Currently queue_userspace_packet will call kfree_skb for all frames,
    whether or not an error occurred. This can result in a single dropped
    frame being reported as multiple drops in dropwatch. This functions
    caller may also call kfree_skb in case of an error. This patch will
    consume the skbs instead and allow caller's to use kfree_skb.

    Signed-off-by: Mike Pattrick <mkp@redhat.com>
    Link: https://bugzilla.redhat.com/show_bug.cgi?id=2109957
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/openvswitch/datapath.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
    index 4d2d91d6f990..6b5c0abf7f1b 100644
    --- a/net/openvswitch/datapath.c
    +++ b/net/openvswitch/datapath.c
    @@ -544,8 +544,9 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
    out:
    if (err)
    skb_tx_error(skb);
    - kfree_skb(user_skb);
    - kfree_skb(nskb);
    + consume_skb(user_skb);
    + consume_skb(nskb);
    +
    return err;
    }

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 18:01    [W:2.838 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site