* [PATCH] net: sched: qfq: dont intepret cls results when asked to drop
@ 2023-09-15 14:23 Ma Ke
2023-09-15 20:45 ` Vadim Fedorenko
2023-09-16 7:22 ` kernel test robot
0 siblings, 2 replies; 5+ messages in thread
From: Ma Ke @ 2023-09-15 14:23 UTC (permalink / raw)
To: jhs, xiyou.wangcong, jiri, davem, edumazet, kuba, pabeni
Cc: netdev, linux-kernel, Ma Ke
If asked to drop a packet via TC_ACT_SHOT it is unsafe to
assume that res.class contains a valid pointer.
Signed-off-by: Ma Ke <make_ruc2021@163.com>
---
net/sched/sch_qfq.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
index 546c10adcacd..91c323eff012 100644
--- a/net/sched/sch_qfq.c
+++ b/net/sched/sch_qfq.c
@@ -696,6 +696,8 @@ static struct qfq_class *qfq_classify(struct sk_buff *skb, struct Qdisc *sch,
fl = rcu_dereference_bh(q->filter_list);
result = tcf_classify(skb, NULL, fl, &res, false);
if (result >= 0) {
+ if (result == TC_ACT_SHOT)
+ return NULL;
#ifdef CONFIG_NET_CLS_ACT
switch (result) {
case TC_ACT_QUEUED:
@@ -703,8 +705,6 @@ static struct qfq_class *qfq_classify(struct sk_buff *skb, struct Qdisc *sch,
case TC_ACT_TRAP:
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
fallthrough;
- case TC_ACT_SHOT:
- return NULL;
}
#endif
cl = (struct qfq_class *)res.class;
--
2.37.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] net: sched: qfq: dont intepret cls results when asked to drop
2023-09-15 14:23 [PATCH] net: sched: qfq: dont intepret cls results when asked to drop Ma Ke
@ 2023-09-15 20:45 ` Vadim Fedorenko
2023-09-16 7:22 ` kernel test robot
1 sibling, 0 replies; 5+ messages in thread
From: Vadim Fedorenko @ 2023-09-15 20:45 UTC (permalink / raw)
To: Ma Ke, jhs, xiyou.wangcong, jiri, davem, edumazet, kuba, pabeni
Cc: netdev, linux-kernel
On 15/09/2023 15:23, Ma Ke wrote:
> If asked to drop a packet via TC_ACT_SHOT it is unsafe to
> assume that res.class contains a valid pointer.
>
> Signed-off-by: Ma Ke <make_ruc2021@163.com>
> ---
> net/sched/sch_qfq.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
> index 546c10adcacd..91c323eff012 100644
> --- a/net/sched/sch_qfq.c
> +++ b/net/sched/sch_qfq.c
> @@ -696,6 +696,8 @@ static struct qfq_class *qfq_classify(struct sk_buff *skb, struct Qdisc *sch,
> fl = rcu_dereference_bh(q->filter_list);
> result = tcf_classify(skb, NULL, fl, &res, false);
> if (result >= 0) {
> + if (result == TC_ACT_SHOT)
> + return NULL;
The same comment again - the check is meaningless.
> #ifdef CONFIG_NET_CLS_ACT
> switch (result) {
> case TC_ACT_QUEUED:
> @@ -703,8 +705,6 @@ static struct qfq_class *qfq_classify(struct sk_buff *skb, struct Qdisc *sch,
> case TC_ACT_TRAP:
> *qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
> fallthrough;
> - case TC_ACT_SHOT:
> - return NULL;
> }
> #endif
> cl = (struct qfq_class *)res.class;
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] net: sched: qfq: dont intepret cls results when asked to drop
2023-09-15 14:23 [PATCH] net: sched: qfq: dont intepret cls results when asked to drop Ma Ke
2023-09-15 20:45 ` Vadim Fedorenko
@ 2023-09-16 7:22 ` kernel test robot
1 sibling, 0 replies; 5+ messages in thread
From: kernel test robot @ 2023-09-16 7:22 UTC (permalink / raw)
To: Ma Ke, jhs, xiyou.wangcong, jiri, davem, edumazet, kuba, pabeni
Cc: llvm, oe-kbuild-all, netdev, linux-kernel, Ma Ke
Hi Ma,
kernel test robot noticed the following build errors:
[auto build test ERROR on net-next/main]
[also build test ERROR on net/main linus/master v6.6-rc1 next-20230915]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Ma-Ke/net-sched-qfq-dont-intepret-cls-results-when-asked-to-drop/20230915-222648
base: net-next/main
patch link: https://lore.kernel.org/r/20230915142355.3411527-1-make_ruc2021%40163.com
patch subject: [PATCH] net: sched: qfq: dont intepret cls results when asked to drop
config: x86_64-rhel-8.3-rust (https://download.01.org/0day-ci/archive/20230916/202309161521.08Hs5BL9-lkp@intel.com/config)
compiler: clang version 16.0.4 (https://github.com/llvm/llvm-project.git ae42196bc493ffe877a7e3dff8be32035dea4d07)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20230916/202309161521.08Hs5BL9-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202309161521.08Hs5BL9-lkp@intel.com/
All errors (new ones prefixed by >>):
>> net/sched/sch_qfq.c:707:4: error: fallthrough annotation does not directly precede switch label
fallthrough;
^
include/linux/compiler_attributes.h:227:41: note: expanded from macro 'fallthrough'
# define fallthrough __attribute__((__fallthrough__))
^
1 error generated.
vim +707 net/sched/sch_qfq.c
0545a303777351 stephen hemminger 2011-04-04 678
0545a303777351 stephen hemminger 2011-04-04 679 static struct qfq_class *qfq_classify(struct sk_buff *skb, struct Qdisc *sch,
0545a303777351 stephen hemminger 2011-04-04 680 int *qerr)
0545a303777351 stephen hemminger 2011-04-04 681 {
0545a303777351 stephen hemminger 2011-04-04 682 struct qfq_sched *q = qdisc_priv(sch);
0545a303777351 stephen hemminger 2011-04-04 683 struct qfq_class *cl;
0545a303777351 stephen hemminger 2011-04-04 684 struct tcf_result res;
25d8c0d55f241c John Fastabend 2014-09-12 685 struct tcf_proto *fl;
0545a303777351 stephen hemminger 2011-04-04 686 int result;
0545a303777351 stephen hemminger 2011-04-04 687
0545a303777351 stephen hemminger 2011-04-04 688 if (TC_H_MAJ(skb->priority ^ sch->handle) == 0) {
0545a303777351 stephen hemminger 2011-04-04 689 pr_debug("qfq_classify: found %d\n", skb->priority);
0545a303777351 stephen hemminger 2011-04-04 690 cl = qfq_find_class(sch, skb->priority);
0545a303777351 stephen hemminger 2011-04-04 691 if (cl != NULL)
0545a303777351 stephen hemminger 2011-04-04 692 return cl;
0545a303777351 stephen hemminger 2011-04-04 693 }
0545a303777351 stephen hemminger 2011-04-04 694
0545a303777351 stephen hemminger 2011-04-04 695 *qerr = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
25d8c0d55f241c John Fastabend 2014-09-12 696 fl = rcu_dereference_bh(q->filter_list);
3aa2605594556c Davide Caratti 2021-07-28 697 result = tcf_classify(skb, NULL, fl, &res, false);
0545a303777351 stephen hemminger 2011-04-04 698 if (result >= 0) {
0698b7004e7da6 Ma Ke 2023-09-15 699 if (result == TC_ACT_SHOT)
0698b7004e7da6 Ma Ke 2023-09-15 700 return NULL;
0545a303777351 stephen hemminger 2011-04-04 701 #ifdef CONFIG_NET_CLS_ACT
0545a303777351 stephen hemminger 2011-04-04 702 switch (result) {
0545a303777351 stephen hemminger 2011-04-04 703 case TC_ACT_QUEUED:
0545a303777351 stephen hemminger 2011-04-04 704 case TC_ACT_STOLEN:
e25ea21ffa66a0 Jiri Pirko 2017-06-06 705 case TC_ACT_TRAP:
0545a303777351 stephen hemminger 2011-04-04 706 *qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
964201de695b8a Gustavo A. R. Silva 2020-07-07 @707 fallthrough;
0545a303777351 stephen hemminger 2011-04-04 708 }
0545a303777351 stephen hemminger 2011-04-04 709 #endif
0545a303777351 stephen hemminger 2011-04-04 710 cl = (struct qfq_class *)res.class;
0545a303777351 stephen hemminger 2011-04-04 711 if (cl == NULL)
0545a303777351 stephen hemminger 2011-04-04 712 cl = qfq_find_class(sch, res.classid);
0545a303777351 stephen hemminger 2011-04-04 713 return cl;
0545a303777351 stephen hemminger 2011-04-04 714 }
0545a303777351 stephen hemminger 2011-04-04 715
0545a303777351 stephen hemminger 2011-04-04 716 return NULL;
0545a303777351 stephen hemminger 2011-04-04 717 }
0545a303777351 stephen hemminger 2011-04-04 718
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] net: sched: qfq: dont intepret cls results when asked to drop
@ 2023-09-15 10:50 Ma Ke
2023-09-15 12:56 ` Eric Dumazet
0 siblings, 1 reply; 5+ messages in thread
From: Ma Ke @ 2023-09-15 10:50 UTC (permalink / raw)
To: xiyou.wangcong, jiri, davem, edumazet, kuba, pabeni
Cc: netdev, linux-kernel, Ma Ke
If asked to drop a packet via TC_ACT_SHOT it is unsafe to
assume that res.class contains a valid pointer.
Signed-off-by: Ma Ke <make_ruc2021@163.com>
---
net/sched/sch_qfq.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
index 546c10adcacd..20d52dc484b6 100644
--- a/net/sched/sch_qfq.c
+++ b/net/sched/sch_qfq.c
@@ -695,6 +695,8 @@ static struct qfq_class *qfq_classify(struct sk_buff *skb, struct Qdisc *sch,
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
fl = rcu_dereference_bh(q->filter_list);
result = tcf_classify(skb, NULL, fl, &res, false);
+ if (result == TC_ACT_SHOT)
+ return NULL;
if (result >= 0) {
#ifdef CONFIG_NET_CLS_ACT
switch (result) {
--
2.37.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] net: sched: qfq: dont intepret cls results when asked to drop
2023-09-15 10:50 Ma Ke
@ 2023-09-15 12:56 ` Eric Dumazet
0 siblings, 0 replies; 5+ messages in thread
From: Eric Dumazet @ 2023-09-15 12:56 UTC (permalink / raw)
To: Ma Ke; +Cc: xiyou.wangcong, jiri, davem, kuba, pabeni, netdev, linux-kernel
On Fri, Sep 15, 2023 at 1:08 PM Ma Ke <make_ruc2021@163.com> wrote:
>
> If asked to drop a packet via TC_ACT_SHOT it is unsafe to
> assume that res.class contains a valid pointer.
>
> Signed-off-by: Ma Ke <make_ruc2021@163.com>
> ---
> net/sched/sch_qfq.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
> index 546c10adcacd..20d52dc484b6 100644
> --- a/net/sched/sch_qfq.c
> +++ b/net/sched/sch_qfq.c
> @@ -695,6 +695,8 @@ static struct qfq_class *qfq_classify(struct sk_buff *skb, struct Qdisc *sch,
> *qerr = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
> fl = rcu_dereference_bh(q->filter_list);
> result = tcf_classify(skb, NULL, fl, &res, false);
> + if (result == TC_ACT_SHOT)
> + return NULL;
> if (result >= 0) {
> #ifdef CONFIG_NET_CLS_ACT
> switch (result) {
> --
> 2.37.2
>
Same comment, it seems already handled at line 706
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-09-16 7:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-15 14:23 [PATCH] net: sched: qfq: dont intepret cls results when asked to drop Ma Ke
2023-09-15 20:45 ` Vadim Fedorenko
2023-09-16 7:22 ` kernel test robot
-- strict thread matches above, loose matches on Subject: below --
2023-09-15 10:50 Ma Ke
2023-09-15 12:56 ` Eric Dumazet
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).