mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 15:47:36 +00:00
openvswitch: Fix double reporting of drops in dropwatch
[ Upstream commit 1100248a5c
]
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
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
6f16b32feb
commit
e892180cb0
1 changed files with 10 additions and 3 deletions
|
@ -252,10 +252,17 @@ void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key)
|
||||||
|
|
||||||
upcall.mru = OVS_CB(skb)->mru;
|
upcall.mru = OVS_CB(skb)->mru;
|
||||||
error = ovs_dp_upcall(dp, skb, key, &upcall, 0);
|
error = ovs_dp_upcall(dp, skb, key, &upcall, 0);
|
||||||
if (unlikely(error))
|
switch (error) {
|
||||||
kfree_skb(skb);
|
case 0:
|
||||||
else
|
case -EAGAIN:
|
||||||
|
case -ERESTARTSYS:
|
||||||
|
case -EINTR:
|
||||||
consume_skb(skb);
|
consume_skb(skb);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
kfree_skb(skb);
|
||||||
|
break;
|
||||||
|
}
|
||||||
stats_counter = &stats->n_missed;
|
stats_counter = &stats->n_missed;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue