| Message ID | 20220817150635.1725530-1-mkp@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1100248a5c5ccd57059eb8d02ec077e839a23826 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2,1/2] openvswitch: Fix double reporting of drops in dropwatch | expand |
Hello: This series was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Wed, 17 Aug 2022 11:06:34 -0400 you wrote: > Frames sent to userspace can be reported as dropped in > ovs_dp_process_packet, however, if they are dropped in the netlink code > then netlink_attachskb will report the same frame as dropped. > > This patch checks for error codes which indicate that the frame has > already been freed. > > [...] Here is the summary with links: - [net-next,v2,1/2] openvswitch: Fix double reporting of drops in dropwatch https://git.kernel.org/netdev/net-next/c/1100248a5c5c - [net-next,v2,2/2] openvswitch: Fix overreporting of drops in dropwatch https://git.kernel.org/netdev/net-next/c/c21ab2afa2c6 You are awesome, thank you!
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 7e8a39a35627..ca22aa73c6e0 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -252,10 +252,17 @@ void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key) upcall.mru = OVS_CB(skb)->mru; error = ovs_dp_upcall(dp, skb, key, &upcall, 0); - if (unlikely(error)) - kfree_skb(skb); - else + switch (error) { + case 0: + case -EAGAIN: + case -ERESTARTSYS: + case -EINTR: consume_skb(skb); + break; + default: + kfree_skb(skb); + break; + } stats_counter = &stats->n_missed; goto out; }
Frames sent to userspace can be reported as dropped in ovs_dp_process_packet, however, if they are dropped in the netlink code then netlink_attachskb will report the same frame as dropped. This patch checks for error codes which indicate that the frame has already been freed. Signed-off-by: Mike Pattrick <mkp@redhat.com> Link: https://bugzilla.redhat.com/show_bug.cgi?id=2109946 --- Changes in v2: - Corrected bugzilla link --- net/openvswitch/datapath.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)