| Message ID | 94bae5636d86c039a0cfee3aa4876fc7bcde2eef.1463347152.git.daniel@iogearbox.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sun, May 15, 2016 at 11:28:29PM +0200, Daniel Borkmann wrote: > Follow-up for 8a3a4c6e7b34 ("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>
From: Daniel Borkmann <daniel@iogearbox.net> Date: Sun, 15 May 2016 23:28:29 +0200 > Follow-up for 8a3a4c6e7b34 ("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> Applied.
On 16-05-15 05:28 PM, Daniel Borkmann wrote: > Follow-up for 8a3a4c6e7b34 ("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: Jamal Hadi Salim <jhs@mojatatu.com> cheers, jamal
diff --git a/net/core/dev.c b/net/core/dev.c index 12436d1..904ff43 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3186,12 +3186,12 @@ sch_handle_egress(struct sk_buff *skb, int *ret, struct net_device *dev) case TC_ACT_SHOT: qdisc_qstats_cpu_drop(cl->q); *ret = NET_XMIT_DROP; - goto drop; + kfree_skb(skb); + return NULL; case TC_ACT_STOLEN: case TC_ACT_QUEUED: *ret = NET_XMIT_SUCCESS; -drop: - kfree_skb(skb); + consume_skb(skb); return NULL; case TC_ACT_REDIRECT: /* No need to push/pop skb's mac_header here on egress! */
Follow-up for 8a3a4c6e7b34 ("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> --- net/core/dev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)