mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-26 12:26:11 +00:00
Code Issues Releases Wiki Activity

net: sched: Add initial TC error skb drop reasons

Browse source 
Continue expanding Daniel's patch by adding new skb drop reasons that
are idiosyncratic to TC.

More specifically:

- SKB_DROP_REASON_TC_COOKIE_ERROR: An error occurred whilst
  processing a tc ext cookie.

- SKB_DROP_REASON_TC_CHAIN_NOTFOUND: tc chain lookup failed.

- SKB_DROP_REASON_TC_RECLASSIFY_LOOP: tc exceeded max reclassify loop
  iterations

Signed-off-by: Victor Nogueira <victor@mojatatu.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Victor Nogueira 2023-12-16 17:44:36 -03:00 committed by David S. Miller
parent b6a3c6066a
commit 4cf24dc893
3 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/net/dropreason-core.h
View file

@ -85,8 +85,10 @@
FN(IPV6_NDISC_BAD_OPTIONS) \
FN(IPV6_NDISC_NS_OTHERHOST) \
FN(QUEUE_PURGE) \
FN(TC_ERROR) \
FN(TC_COOKIE_ERROR) \
FN(PACKET_SOCK_ERROR) \
FN(TC_CHAIN_NOTFOUND) \
FN(TC_RECLASSIFY_LOOP) \
FNe(MAX)
/**
@ -377,13 +379,23 @@ enum skb_drop_reason {
SKB_DROP_REASON_IPV6_NDISC_NS_OTHERHOST,
/** @SKB_DROP_REASON_QUEUE_PURGE: bulk free. */
SKB_DROP_REASON_QUEUE_PURGE,
/** @SKB_DROP_REASON_TC_ERROR: generic internal tc error. */
SKB_DROP_REASON_TC_ERROR,
/**
* @SKB_DROP_REASON_TC_COOKIE_ERROR: An error occurred whilst
* processing a tc ext cookie.
*/
SKB_DROP_REASON_TC_COOKIE_ERROR,
/**
* @SKB_DROP_REASON_PACKET_SOCK_ERROR: generic packet socket errors
* after its filter matches an incoming packet.
*/
SKB_DROP_REASON_PACKET_SOCK_ERROR,
/** @SKB_DROP_REASON_TC_CHAIN_NOTFOUND: tc chain lookup failed. */
SKB_DROP_REASON_TC_CHAIN_NOTFOUND,
/**
* @SKB_DROP_REASON_TC_RECLASSIFY_LOOP: tc exceeded max reclassify loop
* iterations.
*/
SKB_DROP_REASON_TC_RECLASSIFY_LOOP,
/**
* @SKB_DROP_REASON_MAX: the maximum of core drop reasons, which
* shouldn't be used as a real 'reason' - only for tracing code gen

3
net/sched/act_api.c
View file

@ -1119,7 +1119,8 @@ int tcf_action_exec(struct sk_buff *skb, struct tc_action **actions,
}
} else if (TC_ACT_EXT_CMP(ret, TC_ACT_GOTO_CHAIN)) {
if (unlikely(!rcu_access_pointer(a->goto_chain))) {
tcf_set_drop_reason(skb, SKB_DROP_REASON_TC_ERROR);
tcf_set_drop_reason(skb,
SKB_DROP_REASON_TC_CHAIN_NOTFOUND);
return TC_ACT_SHOT;
}
tcf_action_goto_chain_exec(a, res);

22
net/sched/cls_api.c
View file

@ -1681,13 +1681,15 @@ static inline int __tcf_classify(struct sk_buff *skb,
*/
if (unlikely(n->tp != tp || n->tp->chain != n->chain ||
!tp->ops->get_exts)) {
tcf_set_drop_reason(skb, SKB_DROP_REASON_TC_ERROR);
tcf_set_drop_reason(skb,
SKB_DROP_REASON_TC_COOKIE_ERROR);
return TC_ACT_SHOT;
}
exts = tp->ops->get_exts(tp, n->handle);
if (unlikely(!exts || n->exts != exts)) {
tcf_set_drop_reason(skb, SKB_DROP_REASON_TC_ERROR);
tcf_set_drop_reason(skb,
SKB_DROP_REASON_TC_COOKIE_ERROR);
return TC_ACT_SHOT;
}
@ -1716,7 +1718,8 @@ static inline int __tcf_classify(struct sk_buff *skb,
}
if (unlikely(n)) {
tcf_set_drop_reason(skb, SKB_DROP_REASON_TC_ERROR);
tcf_set_drop_reason(skb,
SKB_DROP_REASON_TC_COOKIE_ERROR);
return TC_ACT_SHOT;
}
@ -1728,7 +1731,8 @@ static inline int __tcf_classify(struct sk_buff *skb,
tp->chain->block->index,
tp->prio & 0xffff,
ntohs(tp->protocol));
tcf_set_drop_reason(skb, SKB_DROP_REASON_TC_ERROR);
tcf_set_drop_reason(skb,
SKB_DROP_REASON_TC_RECLASSIFY_LOOP);
return TC_ACT_SHOT;
}
@ -1766,7 +1770,8 @@ int tcf_classify(struct sk_buff *skb,
n = tcf_exts_miss_cookie_lookup(ext->act_miss_cookie,
&act_index);
if (!n) {
tcf_set_drop_reason(skb, SKB_DROP_REASON_TC_ERROR);
tcf_set_drop_reason(skb,
SKB_DROP_REASON_TC_COOKIE_ERROR);
return TC_ACT_SHOT;
}
@ -1777,7 +1782,9 @@ int tcf_classify(struct sk_buff *skb,
fchain = tcf_chain_lookup_rcu(block, chain);
if (!fchain) {
tcf_set_drop_reason(skb, SKB_DROP_REASON_TC_ERROR);
tcf_set_drop_reason(skb,
SKB_DROP_REASON_TC_CHAIN_NOTFOUND);
return TC_ACT_SHOT;
}
@ -1799,10 +1806,9 @@ int tcf_classify(struct sk_buff *skb,
ext = tc_skb_ext_alloc(skb);
if (WARN_ON_ONCE(!ext)) {
tcf_set_drop_reason(skb, SKB_DROP_REASON_TC_ERROR);
tcf_set_drop_reason(skb, SKB_DROP_REASON_NOMEM);
return TC_ACT_SHOT;
}
ext->chain = last_executed_chain;
ext->mru = cb->mru;
ext->post_ct = cb->post_ct;