hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: also make sch_handle_egress() drop monitor ready 

Follow-up for 8a3a4c6e7b ("net: make sch_handle_ingress() drop
monitor ready") to also make the egress side drop monitor ready.

Also here only TC_ACT_SHOT is a clear indication that something
went wrong. Hence don't provide false positives to drop monitors
such as 'perf record -e skb:kfree_skb ...'.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Borkmann 2016-05-15 23:28:29 +02:00 committed by David S. Miller
parent 15db6e0dc7
commit 7e2c3aea43
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/core/dev.c
View File

@ -3186,12 +3186,12 @@ sch_handle_egress(struct sk_buff *skb, int *ret, struct net_device *dev)
case TC_ACT_SHOT: case TC_ACT_SHOT:
qdisc_qstats_cpu_drop(cl->q); qdisc_qstats_cpu_drop(cl->q);
*ret = NET_XMIT_DROP; *ret = NET_XMIT_DROP;
goto drop; kfree_skb(skb);
return NULL;
case TC_ACT_STOLEN: case TC_ACT_STOLEN:
case TC_ACT_QUEUED: case TC_ACT_QUEUED:
*ret = NET_XMIT_SUCCESS; *ret = NET_XMIT_SUCCESS;
drop: consume_skb(skb);
kfree_skb(skb);
return NULL; return NULL;
case TC_ACT_REDIRECT: case TC_ACT_REDIRECT:
/* No need to push/pop skb's mac_header here on egress! */ /* No need to push/pop skb's mac_header here on egress! */