| Message ID | 20180625210148.9386-7-jiri@resnulli.us |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: sched: introduce chain templates support with offloading to mlxsw | expand |
On Mon, 25 Jun 2018 23:01:45 +0200, Jiri Pirko wrote: > From: Jiri Pirko <jiri@mellanox.com> > > Introduce a couple of flower offload commands in order to propagate > template creation/destruction events down to device drivers. > Drivers may use this information to prepare HW in an optimal way > for future filter insertions. > > Signed-off-by: Jiri Pirko <jiri@mellanox.com> > diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c > index d64d43843a3a..276ba25a09c3 100644 > --- a/net/sched/cls_flower.c > +++ b/net/sched/cls_flower.c > @@ -1120,6 +1120,43 @@ static void fl_walk(struct tcf_proto *tp, struct tcf_walker *arg) > } > } > > +static void fl_hw_create_tmplt(struct tcf_chain *chain, > + struct fl_flow_tmplt *tmplt, > + struct netlink_ext_ack *extack) > +{ > + struct tc_cls_flower_offload cls_flower = {}; > + struct tcf_block *block = chain->block; > + struct tcf_exts dummy_exts = { 0, }; > + > + cls_flower.common.chain_index = chain->index; Did you skip extack on purpose? > + cls_flower.command = TC_CLSFLOWER_TMPLT_CREATE; > + cls_flower.cookie = (unsigned long) tmplt; > + cls_flower.dissector = &tmplt->dissector; > + cls_flower.mask = &tmplt->mask; > + cls_flower.key = &tmplt->dummy_key; > + cls_flower.exts = &dummy_exts; > + > + /* We don't care if driver (any of them) fails to handle this > + * call. It serves just as a hint for it. > + */ > + tc_setup_cb_call(block, NULL, TC_SETUP_CLSFLOWER, > + &cls_flower, false); > +}
Tue, Jun 26, 2018 at 07:00:50AM CEST, jakub.kicinski@netronome.com wrote: >On Mon, 25 Jun 2018 23:01:45 +0200, Jiri Pirko wrote: >> From: Jiri Pirko <jiri@mellanox.com> >> >> Introduce a couple of flower offload commands in order to propagate >> template creation/destruction events down to device drivers. >> Drivers may use this information to prepare HW in an optimal way >> for future filter insertions. >> >> Signed-off-by: Jiri Pirko <jiri@mellanox.com> > >> diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c >> index d64d43843a3a..276ba25a09c3 100644 >> --- a/net/sched/cls_flower.c >> +++ b/net/sched/cls_flower.c >> @@ -1120,6 +1120,43 @@ static void fl_walk(struct tcf_proto *tp, struct tcf_walker *arg) >> } >> } >> >> +static void fl_hw_create_tmplt(struct tcf_chain *chain, >> + struct fl_flow_tmplt *tmplt, >> + struct netlink_ext_ack *extack) >> +{ >> + struct tc_cls_flower_offload cls_flower = {}; >> + struct tcf_block *block = chain->block; >> + struct tcf_exts dummy_exts = { 0, }; >> + >> + cls_flower.common.chain_index = chain->index; > >Did you skip extack on purpose? Oh, the extack is leftover. I will remove it in v2. > >> + cls_flower.command = TC_CLSFLOWER_TMPLT_CREATE; >> + cls_flower.cookie = (unsigned long) tmplt; >> + cls_flower.dissector = &tmplt->dissector; >> + cls_flower.mask = &tmplt->mask; >> + cls_flower.key = &tmplt->dummy_key; >> + cls_flower.exts = &dummy_exts; >> + >> + /* We don't care if driver (any of them) fails to handle this >> + * call. It serves just as a hint for it. >> + */ >> + tc_setup_cb_call(block, NULL, TC_SETUP_CLSFLOWER, >> + &cls_flower, false); >> +}
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index a3c1a2c47cd4..e83968cf9a70 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -715,6 +715,8 @@ enum tc_fl_command { TC_CLSFLOWER_REPLACE, TC_CLSFLOWER_DESTROY, TC_CLSFLOWER_STATS, + TC_CLSFLOWER_TMPLT_CREATE, + TC_CLSFLOWER_TMPLT_DESTROY, }; struct tc_cls_flower_offload { diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index d64d43843a3a..276ba25a09c3 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -1120,6 +1120,43 @@ static void fl_walk(struct tcf_proto *tp, struct tcf_walker *arg) } } +static void fl_hw_create_tmplt(struct tcf_chain *chain, + struct fl_flow_tmplt *tmplt, + struct netlink_ext_ack *extack) +{ + struct tc_cls_flower_offload cls_flower = {}; + struct tcf_block *block = chain->block; + struct tcf_exts dummy_exts = { 0, }; + + cls_flower.common.chain_index = chain->index; + cls_flower.command = TC_CLSFLOWER_TMPLT_CREATE; + cls_flower.cookie = (unsigned long) tmplt; + cls_flower.dissector = &tmplt->dissector; + cls_flower.mask = &tmplt->mask; + cls_flower.key = &tmplt->dummy_key; + cls_flower.exts = &dummy_exts; + + /* We don't care if driver (any of them) fails to handle this + * call. It serves just as a hint for it. + */ + tc_setup_cb_call(block, NULL, TC_SETUP_CLSFLOWER, + &cls_flower, false); +} + +static void fl_hw_destroy_tmplt(struct tcf_chain *chain, + struct fl_flow_tmplt *tmplt) +{ + struct tc_cls_flower_offload cls_flower = {}; + struct tcf_block *block = chain->block; + + cls_flower.common.chain_index = chain->index; + cls_flower.command = TC_CLSFLOWER_TMPLT_DESTROY; + cls_flower.cookie = (unsigned long) tmplt; + + tc_setup_cb_call(block, NULL, TC_SETUP_CLSFLOWER, + &cls_flower, false); +} + static void *fl_tmplt_create(struct net *net, struct tcf_chain *chain, struct nlattr **tca, struct netlink_ext_ack *extack) @@ -1150,6 +1187,8 @@ static void *fl_tmplt_create(struct net *net, struct tcf_chain *chain, fl_init_dissector(&tmplt->dissector, &tmplt->mask); + fl_hw_create_tmplt(chain, tmplt, extack); + return tmplt; errout_tmplt: @@ -1163,6 +1202,7 @@ static void fl_tmplt_destroy(void *tmplt_priv) { struct fl_flow_tmplt *tmplt = tmplt_priv; + fl_hw_destroy_tmplt(tmplt->chain, tmplt); kfree(tmplt); }