netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next] net: make sch_handle_ingress() drop monitor ready
@ 2016-05-06 22:55 Eric Dumazet
  2016-05-07  0:18 ` Alexei Starovoitov
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Eric Dumazet @ 2016-05-06 22:55 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, Jamal Hadi Salim

From: Eric Dumazet <edumazet@google.com>

TC_ACT_STOLEN is used when ingress traffic is mirred/redirected
to say ifb.

Packet is not dropped, but consumed.

Only TC_ACT_SHOT is a clear indication something went wrong.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
---
 net/core/dev.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/core/dev.c b/net/core/dev.c
index e98ba63fe2800c10d4d407f12d11ca8975dc1e8e..c7490339315cc0046a2da67c00a95f079e602588 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3956,9 +3956,11 @@ sch_handle_ingress(struct sk_buff *skb, struct packet_type **pt_prev, int *ret,
 		break;
 	case TC_ACT_SHOT:
 		qdisc_qstats_cpu_drop(cl->q);
+		kfree_skb(skb);
+		return NULL;
 	case TC_ACT_STOLEN:
 	case TC_ACT_QUEUED:
-		kfree_skb(skb);
+		consume_skb(skb);
 		return NULL;
 	case TC_ACT_REDIRECT:
 		/* skb_mac_header check was done by cls/act_bpf, so

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH net-next] net: make sch_handle_ingress() drop monitor ready
  2016-05-06 22:55 [PATCH net-next] net: make sch_handle_ingress() drop monitor ready Eric Dumazet
@ 2016-05-07  0:18 ` Alexei Starovoitov
  2016-05-07 13:09 ` Jamal Hadi Salim
  2016-05-09  3:55 ` David Miller
  2 siblings, 0 replies; 4+ messages in thread
From: Alexei Starovoitov @ 2016-05-07  0:18 UTC (permalink / raw)
  To: Eric Dumazet; +Cc: David Miller, netdev, Jamal Hadi Salim

On Fri, May 06, 2016 at 03:55:50PM -0700, Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@google.com>
> 
> TC_ACT_STOLEN is used when ingress traffic is mirred/redirected
> to say ifb.
> 
> Packet is not dropped, but consumed.
> 
> Only TC_ACT_SHOT is a clear indication something went wrong.
> 
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Jamal Hadi Salim <jhs@mojatatu.com>

Acked-by: Alexei Starovoitov <ast@kernel.org>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH net-next] net: make sch_handle_ingress() drop monitor ready
  2016-05-06 22:55 [PATCH net-next] net: make sch_handle_ingress() drop monitor ready Eric Dumazet
  2016-05-07  0:18 ` Alexei Starovoitov
@ 2016-05-07 13:09 ` Jamal Hadi Salim
  2016-05-09  3:55 ` David Miller
  2 siblings, 0 replies; 4+ messages in thread
From: Jamal Hadi Salim @ 2016-05-07 13:09 UTC (permalink / raw)
  To: Eric Dumazet, David Miller; +Cc: netdev

On 16-05-06 06:55 PM, Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@google.com>
>
> TC_ACT_STOLEN is used when ingress traffic is mirred/redirected
> to say ifb.
>
> Packet is not dropped, but consumed.
>
> Only TC_ACT_SHOT is a clear indication something went wrong.
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>

Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>


cheers,
jamal

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH net-next] net: make sch_handle_ingress() drop monitor ready
  2016-05-06 22:55 [PATCH net-next] net: make sch_handle_ingress() drop monitor ready Eric Dumazet
  2016-05-07  0:18 ` Alexei Starovoitov
  2016-05-07 13:09 ` Jamal Hadi Salim
@ 2016-05-09  3:55 ` David Miller
  2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2016-05-09  3:55 UTC (permalink / raw)
  To: eric.dumazet; +Cc: netdev, jhs

From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 06 May 2016 15:55:50 -0700

> From: Eric Dumazet <edumazet@google.com>
> 
> TC_ACT_STOLEN is used when ingress traffic is mirred/redirected
> to say ifb.
> 
> Packet is not dropped, but consumed.
> 
> Only TC_ACT_SHOT is a clear indication something went wrong.
> 
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Jamal Hadi Salim <jhs@mojatatu.com>

Applied.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-05-09  3:55 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-06 22:55 [PATCH net-next] net: make sch_handle_ingress() drop monitor ready Eric Dumazet
2016-05-07  0:18 ` Alexei Starovoitov
2016-05-07 13:09 ` Jamal Hadi Salim
2016-05-09  3:55 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).