summaryrefslogtreecommitdiff
path: root/net/openvswitch
diff options
context:
space:
mode:
authorMike Pattrick <mkp@redhat.com>2022-08-17 11:06:35 -0400
committerDavid S. Miller <davem@davemloft.net>2022-08-22 13:54:50 +0100
commitc21ab2afa2c64896a7f0e3cbc6845ec63dcfad2e (patch)
treeac9612439233c67d401eb6b20a646d21dce246c8 /net/openvswitch
parent1100248a5c5ccd57059eb8d02ec077e839a23826 (diff)
downloadlinux-c21ab2afa2c64896a7f0e3cbc6845ec63dcfad2e.tar.gz
openvswitch: Fix overreporting of drops in dropwatch
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>
Diffstat (limited to 'net/openvswitch')
-rw-r--r--net/openvswitch/datapath.c5
1 files changed, 3 insertions, 2 deletions
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;
}