2023-05-24 01:29:48

by Peilin Ye

Subject: [PATCH v5 net 2/6] net/sched: sch_clsact: Only create under TC_H_CLSACT

From: Peilin Ye <[email protected]>

clsact Qdiscs are only supposed to be created under TC_H_CLSACT (which
equals TC_H_INGRESS). Return -EOPNOTSUPP if 'parent' is not
TC_H_CLSACT.

Fixes: 1f211a1b929c ("net, sched: add clsact qdisc")
Signed-off-by: Peilin Ye <[email protected]>
---
change in v5:
- avoid underflowing @egress_needed_key in ->destroy(), reported by
Pedro

change in v3, v4:
- add in-body From: tag

net/sched/sch_ingress.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index f9ef6deb2770..35963929e117 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -225,6 +225,9 @@ static int clsact_init(struct Qdisc *sch, struct nlattr *opt,
struct net_device *dev = qdisc_dev(sch);
int err;

+ if (sch->parent != TC_H_CLSACT)
+ return -EOPNOTSUPP;
+
net_inc_ingress_queue();
net_inc_egress_queue();

@@ -254,6 +257,9 @@ static void clsact_destroy(struct Qdisc *sch)
{
struct clsact_sched_data *q = qdisc_priv(sch);

+ if (sch->parent != TC_H_CLSACT)
+ return;
+
tcf_block_put_ext(q->egress_block, sch, &q->egress_block_info);
tcf_block_put_ext(q->ingress_block, sch, &q->ingress_block_info);

--
2.20.1

2023-05-24 15:55:11

by Pedro Tammela

Subject: Re: [PATCH v5 net 2/6] net/sched: sch_clsact: Only create under TC_H_CLSACT

On 23/05/2023 22:18, Peilin Ye wrote:
> From: Peilin Ye <[email protected]>
>
> clsact Qdiscs are only supposed to be created under TC_H_CLSACT (which
> equals TC_H_INGRESS). Return -EOPNOTSUPP if 'parent' is not
> TC_H_CLSACT.
>
> Fixes: 1f211a1b929c ("net, sched: add clsact qdisc")
> Signed-off-by: Peilin Ye <[email protected]>

Tested-by: Pedro Tammela <[email protected]>

> ---
> change in v5:
> - avoid underflowing @egress_needed_key in ->destroy(), reported by
> Pedro
>
> change in v3, v4:
> - add in-body From: tag
>
> net/sched/sch_ingress.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
> index f9ef6deb2770..35963929e117 100644
> --- a/net/sched/sch_ingress.c
> +++ b/net/sched/sch_ingress.c
> @@ -225,6 +225,9 @@ static int clsact_init(struct Qdisc *sch, struct nlattr *opt,
> struct net_device *dev = qdisc_dev(sch);
> int err;
>
> + if (sch->parent != TC_H_CLSACT)
> + return -EOPNOTSUPP;
> +
> net_inc_ingress_queue();
> net_inc_egress_queue();
>
> @@ -254,6 +257,9 @@ static void clsact_destroy(struct Qdisc *sch)
> {
> struct clsact_sched_data *q = qdisc_priv(sch);
>
> + if (sch->parent != TC_H_CLSACT)
> + return;
> +
> tcf_block_put_ext(q->egress_block, sch, &q->egress_block_info);
> tcf_block_put_ext(q->ingress_block, sch, &q->ingress_block_info);
>

2023-05-24 16:27:19

by Jamal Hadi Salim

Subject: Re: [PATCH v5 net 2/6] net/sched: sch_clsact: Only create under TC_H_CLSACT

On Wed, May 24, 2023 at 11:38 AM Pedro Tammela <[email protected]> wrote:
>
> On 23/05/2023 22:18, Peilin Ye wrote:
> > From: Peilin Ye <[email protected]>
> >
> > clsact Qdiscs are only supposed to be created under TC_H_CLSACT (which
> > equals TC_H_INGRESS). Return -EOPNOTSUPP if 'parent' is not
> > TC_H_CLSACT.
> >
> > Fixes: 1f211a1b929c ("net, sched: add clsact qdisc")
> > Signed-off-by: Peilin Ye <[email protected]>
>
> Tested-by: Pedro Tammela <[email protected]>
>

Reviewed-by: Jamal Hadi Salim <[email protected]>
Acked-by: Jamal Hadi Salim <[email protected]>

cheers,
jamal
> > ---
> > change in v5:
> > - avoid underflowing @egress_needed_key in ->destroy(), reported by
> > Pedro
> >
> > change in v3, v4:
> > - add in-body From: tag
> >
> > net/sched/sch_ingress.c | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
> > index f9ef6deb2770..35963929e117 100644
> > --- a/net/sched/sch_ingress.c
> > +++ b/net/sched/sch_ingress.c
> > @@ -225,6 +225,9 @@ static int clsact_init(struct Qdisc *sch, struct nlattr *opt,
> > struct net_device *dev = qdisc_dev(sch);
> > int err;
> >
> > + if (sch->parent != TC_H_CLSACT)
> > + return -EOPNOTSUPP;
> > +
> > net_inc_ingress_queue();
> > net_inc_egress_queue();
> >
> > @@ -254,6 +257,9 @@ static void clsact_destroy(struct Qdisc *sch)
> > {
> > struct clsact_sched_data *q = qdisc_priv(sch);
> >
> > + if (sch->parent != TC_H_CLSACT)
> > + return;
> > +
> > tcf_block_put_ext(q->egress_block, sch, &q->egress_block_info);
> > tcf_block_put_ext(q->ingress_block, sch, &q->ingress_block_info);
> >
>