| Message ID | 20220817150635.1725530-2-mkp@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c21ab2afa2c64896a7f0e3cbc6845ec63dcfad2e |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2,1/2] openvswitch: Fix double reporting of drops in dropwatch | expand |
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index ca22aa73c6e0..45f9a7b3410e 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -558,8 +558,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; }
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 --- Changes in v2: - Corrected bugzilla link --- net/openvswitch/datapath.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)