Commit 1100248a authored by Mike Pattrick's avatar Mike Pattrick Committed by David S. Miller

openvswitch: Fix double reporting of drops in dropwatch

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: default avatarMike Pattrick <mkp@redhat.com>
Link: https://bugzilla.redhat.com/show_bug.cgi?id=2109946Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b247d93
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment