| Message ID | 20210722091938.12956-3-simon.horman@corigine.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | flow_offload: hardware offload of TC actions | expand |
On Thu 22 Jul 2021 at 12:19, Simon Horman <simon.horman@corigine.com> wrote: > From: Baowen Zheng <baowen.zheng@corigine.com> > > Add a basic process to delete offloaded actions from net device. > > Should not remove the offloaded action entries if the action > fails to delete in tcf_del_notify. > > Signed-off-by: Baowen Zheng <baowen.zheng@corigine.com> > Signed-off-by: Louis Peens <louis.peens@corigine.com> > Signed-off-by: Simon Horman <simon.horman@corigine.com> > --- > include/net/pkt_cls.h | 1 + > net/sched/act_api.c | 112 +++++++++++++++++++++++++++++++++++------- > net/sched/cls_api.c | 14 ++++-- > 3 files changed, 106 insertions(+), 21 deletions(-) > > diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h > index cd4cf6b10f5d..03dae225d64f 100644 > --- a/include/net/pkt_cls.h > +++ b/include/net/pkt_cls.h > @@ -573,6 +573,7 @@ int tc_setup_cb_reoffload(struct tcf_block *block, struct tcf_proto *tp, > void *cb_priv, u32 *flags, unsigned int *in_hw_count); > unsigned int tcf_exts_num_actions(struct tcf_exts *exts); > unsigned int tcf_act_num_actions(struct tc_action *actions[]); > +unsigned int tcf_act_num_actions_single(struct tc_action *act); > > #ifdef CONFIG_NET_CLS_ACT > int tcf_qevent_init(struct tcf_qevent *qe, struct Qdisc *sch, > diff --git a/net/sched/act_api.c b/net/sched/act_api.c > index 185f17ea60d5..23a4538916af 100644 > --- a/net/sched/act_api.c > +++ b/net/sched/act_api.c > @@ -1060,36 +1060,109 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp, > return ERR_PTR(err); > } > > -/* offload the tc command after inserted */ > -int tcf_action_offload_cmd(struct tc_action *actions[], > - struct netlink_ext_ack *extack) > +int tcf_action_offload_cmd_pre(struct tc_action *actions[], > + enum flow_act_command cmd, > + struct netlink_ext_ack *extack, > + struct flow_offload_action **fl_act) > { > - struct flow_offload_action *fl_act; > + struct flow_offload_action *fl_act_p; > int err = 0; > > - fl_act = flow_action_alloc(tcf_act_num_actions(actions)); > - if (!fl_act) > + fl_act_p = flow_action_alloc(tcf_act_num_actions(actions)); > + if (!fl_act_p) > return -ENOMEM; > > - fl_act->extack = extack; > - err = tc_setup_action(&fl_act->action, actions); > + fl_act_p->extack = extack; > + fl_act_p->command = cmd; > + err = tc_setup_action(&fl_act_p->action, actions); > if (err) { > NL_SET_ERR_MSG_MOD(extack, > "Failed to setup tc actions for offload\n"); > goto err_out; > } > - fl_act->command = FLOW_ACT_REPLACE; > + *fl_act = fl_act_p; > + return 0; > +err_out: > + kfree(fl_act_p); > + return err; > +} > +EXPORT_SYMBOL(tcf_action_offload_cmd_pre); This doesn't seem be used anywhere outside this file. > + > +int tcf_action_offload_cmd_post(struct flow_offload_action *fl_act, > + struct netlink_ext_ack *extack) > +{ > + if (IS_ERR(fl_act)) > + return PTR_ERR(fl_act); > > flow_indr_dev_setup_offload(NULL, NULL, TC_SETUP_ACT, fl_act, NULL, NULL); > > tc_cleanup_flow_action(&fl_act->action); > - > -err_out: > kfree(fl_act); > - return err; > + return 0; > +} This one is not exported, by is non-static. > + > +/* offload the tc command after inserted */ > +int tcf_action_offload_cmd(struct tc_action *actions[], > + struct netlink_ext_ack *extack) > +{ > + struct flow_offload_action *fl_act; > + int err = 0; > + > + err = tcf_action_offload_cmd_pre(actions, > + FLOW_ACT_REPLACE, > + extack, > + &fl_act); > + if (err) > + return err; > + > + return tcf_action_offload_cmd_post(fl_act, extack); > } > EXPORT_SYMBOL(tcf_action_offload_cmd); > > +/* offload the tc command after deleted */ > +int tcf_action_offload_del_post(struct flow_offload_action *fl_act, > + struct tc_action *actions[], > + struct netlink_ext_ack *extack, > + int fallback_num) > +{ > + int fallback_entries = 0; > + struct tc_action *act; > + int total_entries = 0; > + int i; > + > + if (!fl_act) > + return -EINVAL; > + > + if (fallback_num) { > + /* for each the actions to fallback the action entries remain in the actions */ > + for (i = 0; i < TCA_ACT_MAX_PRIO; i++) { > + act = actions[i]; > + if (!act) > + continue; > + > + fallback_entries += tcf_act_num_actions_single(act); > + } > + fallback_entries += fallback_num; > + } > + total_entries = fl_act->action.num_entries; > + if (total_entries > fallback_entries) { > + /* just offload the actions that is not fallback and start with the actions */ > + fl_act->action.num_entries -= fallback_entries; > + flow_indr_dev_setup_offload(NULL, NULL, TC_SETUP_ACT, fl_act, NULL, NULL); > + > + /* recovery num_entries for cleanup */ > + fl_act->action.num_entries = total_entries; > + } else { > + NL_SET_ERR_MSG(extack, "no entries to offload when deleting the tc actions"); > + } > + > + tc_cleanup_flow_action(&fl_act->action); > + > + kfree(fl_act); > + return 0; > +} > +EXPORT_SYMBOL(tcf_action_offload_del_post); > + > /* Returns numbers of initialized actions or negative error. */ > > int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla, > @@ -1393,7 +1466,7 @@ static int tca_action_flush(struct net *net, struct nlattr *nla, > return err; > } > > -static int tcf_action_delete(struct net *net, struct tc_action *actions[]) > +static int tcf_action_delete(struct net *net, struct tc_action *actions[], int *fallbacknum) > { > int i; > > @@ -1407,6 +1480,7 @@ static int tcf_action_delete(struct net *net, struct tc_action *actions[]) > u32 act_index = a->tcfa_index; > > actions[i] = NULL; > + *fallbacknum = tcf_act_num_actions_single(a); > if (tcf_action_put(a)) { > /* last reference, action was deleted concurrently */ > module_put(ops->owner); > @@ -1419,12 +1493,13 @@ static int tcf_action_delete(struct net *net, struct tc_action *actions[]) > return ret; > } > } > + *fallbacknum = 0; > return 0; > } > > static int > tcf_del_notify(struct net *net, struct nlmsghdr *n, struct tc_action *actions[], > - u32 portid, size_t attr_size, struct netlink_ext_ack *extack) > + u32 portid, size_t attr_size, struct netlink_ext_ack *extack, int *fallbacknum) > { > int ret; > struct sk_buff *skb; > @@ -1442,7 +1517,7 @@ tcf_del_notify(struct net *net, struct nlmsghdr *n, struct tc_action *actions[], > } > > /* now do the delete */ > - ret = tcf_action_delete(net, actions); > + ret = tcf_action_delete(net, actions, fallbacknum); > if (ret < 0) { > NL_SET_ERR_MSG(extack, "Failed to delete TC action"); > kfree_skb(skb); > @@ -1458,11 +1533,12 @@ static int > tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n, > u32 portid, int event, struct netlink_ext_ack *extack) > { > - int i, ret; > struct nlattr *tb[TCA_ACT_MAX_PRIO + 1]; > struct tc_action *act; > size_t attr_size = 0; > struct tc_action *actions[TCA_ACT_MAX_PRIO] = {}; > + struct flow_offload_action *fl_act; > + int i, ret, fallback_num; > > ret = nla_parse_nested_deprecated(tb, TCA_ACT_MAX_PRIO, nla, NULL, > extack); > @@ -1492,7 +1568,9 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n, > if (event == RTM_GETACTION) > ret = tcf_get_notify(net, portid, n, actions, event, extack); > else { /* delete */ > - ret = tcf_del_notify(net, n, actions, portid, attr_size, extack); > + tcf_action_offload_cmd_pre(actions, FLOW_ACT_DESTROY, extack, &fl_act); > + ret = tcf_del_notify(net, n, actions, portid, attr_size, extack, &fallback_num); > + tcf_action_offload_del_post(fl_act, actions, extack, fallback_num); This tcf_action_offload_cmd_{pre|post}() approach looks slightly complicated, especially with fallback_num calculations. I would suggest to simplify it by only initializing action cookies in flow_action->entries[] (I assume you don't really need all the action data just to delete it, right?) for DEL/STATS and do one of the following: - Unoffload actions one-by-one after every deletion in tcf_actions_delete(), perhaps reusing the same flow_offload_action of size 1 by only changing the cookie on each iteration. - If you really want to send the whole batch to the driver, save cookies for all successfully deleted actions in an array and initialize compound flow_offload_action from the array. This would remove the need for whole pre/post thing, which otherwise gets even more complicated in following patch by 'keep_fl_act' arg. > if (ret) > goto err; > return 0; > diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c > index 9b9770dab5e8..23ce021f07f8 100644 > --- a/net/sched/cls_api.c > +++ b/net/sched/cls_api.c > @@ -3755,6 +3755,15 @@ unsigned int tcf_exts_num_actions(struct tcf_exts *exts) > } > EXPORT_SYMBOL(tcf_exts_num_actions); > > +unsigned int tcf_act_num_actions_single(struct tc_action *act) > +{ > + if (is_tcf_pedit(act)) > + return tcf_pedit_nkeys(act); > + else > + return 1; > +} > +EXPORT_SYMBOL(tcf_act_num_actions_single); > + > unsigned int tcf_act_num_actions(struct tc_action *actions[]) > { > unsigned int num_acts = 0; > @@ -3762,10 +3771,7 @@ unsigned int tcf_act_num_actions(struct tc_action *actions[]) > int i; > > tcf_act_for_each_action(i, act, actions) { > - if (is_tcf_pedit(act)) > - num_acts += tcf_pedit_nkeys(act); > - else > - num_acts++; > + num_acts += tcf_act_num_actions_single(act); > } > return num_acts; > }
Hi Simon,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on net-next/master]
url: https://github.com/0day-ci/linux/commits/Simon-Horman/flow_offload-hardware-offload-of-TC-actions/20210722-172229
base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git c2255ff47768c94a0ebc3968f007928bb47ea43b
config: microblaze-randconfig-r011-20210722 (attached as .config)
compiler: microblaze-linux-gcc (GCC) 10.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/a8e2d0acfc98c127ab0b5189f7635049515c43f3
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Simon-Horman/flow_offload-hardware-offload-of-TC-actions/20210722-172229
git checkout a8e2d0acfc98c127ab0b5189f7635049515c43f3
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-10.3.0 make.cross ARCH=microblaze
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
>> net/sched/act_api.c:1063:5: warning: no previous prototype for 'tcf_action_offload_cmd_pre' [-Wmissing-prototypes]
1063 | int tcf_action_offload_cmd_pre(struct tc_action *actions[],
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
>> net/sched/act_api.c:1091:5: warning: no previous prototype for 'tcf_action_offload_cmd_post' [-Wmissing-prototypes]
1091 | int tcf_action_offload_cmd_post(struct flow_offload_action *fl_act,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
net/sched/act_api.c:1105:5: warning: no previous prototype for 'tcf_action_offload_cmd' [-Wmissing-prototypes]
1105 | int tcf_action_offload_cmd(struct tc_action *actions[],
| ^~~~~~~~~~~~~~~~~~~~~~
>> net/sched/act_api.c:1123:5: warning: no previous prototype for 'tcf_action_offload_del_post' [-Wmissing-prototypes]
1123 | int tcf_action_offload_del_post(struct flow_offload_action *fl_act,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/tcf_action_offload_cmd_pre +1063 net/sched/act_api.c
1062
> 1063 int tcf_action_offload_cmd_pre(struct tc_action *actions[],
1064 enum flow_act_command cmd,
1065 struct netlink_ext_ack *extack,
1066 struct flow_offload_action **fl_act)
1067 {
1068 struct flow_offload_action *fl_act_p;
1069 int err = 0;
1070
1071 fl_act_p = flow_action_alloc(tcf_act_num_actions(actions));
1072 if (!fl_act_p)
1073 return -ENOMEM;
1074
1075 fl_act_p->extack = extack;
1076 fl_act_p->command = cmd;
1077 err = tc_setup_action(&fl_act_p->action, actions);
1078 if (err) {
1079 NL_SET_ERR_MSG_MOD(extack,
1080 "Failed to setup tc actions for offload\n");
1081 goto err_out;
1082 }
1083 *fl_act = fl_act_p;
1084 return 0;
1085 err_out:
1086 kfree(fl_act_p);
1087 return err;
1088 }
1089 EXPORT_SYMBOL(tcf_action_offload_cmd_pre);
1090
> 1091 int tcf_action_offload_cmd_post(struct flow_offload_action *fl_act,
1092 struct netlink_ext_ack *extack)
1093 {
1094 if (IS_ERR(fl_act))
1095 return PTR_ERR(fl_act);
1096
1097 flow_indr_dev_setup_offload(NULL, NULL, TC_SETUP_ACT, fl_act, NULL, NULL);
1098
1099 tc_cleanup_flow_action(&fl_act->action);
1100 kfree(fl_act);
1101 return 0;
1102 }
1103
1104 /* offload the tc command after inserted */
1105 int tcf_action_offload_cmd(struct tc_action *actions[],
1106 struct netlink_ext_ack *extack)
1107 {
1108 struct flow_offload_action *fl_act;
1109 int err = 0;
1110
1111 err = tcf_action_offload_cmd_pre(actions,
1112 FLOW_ACT_REPLACE,
1113 extack,
1114 &fl_act);
1115 if (err)
1116 return err;
1117
1118 return tcf_action_offload_cmd_post(fl_act, extack);
1119 }
1120 EXPORT_SYMBOL(tcf_action_offload_cmd);
1121
1122 /* offload the tc command after deleted */
> 1123 int tcf_action_offload_del_post(struct flow_offload_action *fl_act,
1124 struct tc_action *actions[],
1125 struct netlink_ext_ack *extack,
1126 int fallback_num)
1127 {
1128 int fallback_entries = 0;
1129 struct tc_action *act;
1130 int total_entries = 0;
1131 int i;
1132
1133 if (!fl_act)
1134 return -EINVAL;
1135
1136 if (fallback_num) {
1137 /* for each the actions to fallback the action entries remain in the actions */
1138 for (i = 0; i < TCA_ACT_MAX_PRIO; i++) {
1139 act = actions[i];
1140 if (!act)
1141 continue;
1142
1143 fallback_entries += tcf_act_num_actions_single(act);
1144 }
1145 fallback_entries += fallback_num;
1146 }
1147 total_entries = fl_act->action.num_entries;
1148 if (total_entries > fallback_entries) {
1149 /* just offload the actions that is not fallback and start with the actions */
1150 fl_act->action.num_entries -= fallback_entries;
1151 flow_indr_dev_setup_offload(NULL, NULL, TC_SETUP_ACT, fl_act, NULL, NULL);
1152
1153 /* recovery num_entries for cleanup */
1154 fl_act->action.num_entries = total_entries;
1155 } else {
1156 NL_SET_ERR_MSG(extack, "no entries to offload when deleting the tc actions");
1157 }
1158
1159 tc_cleanup_flow_action(&fl_act->action);
1160
1161 kfree(fl_act);
1162 return 0;
1163 }
1164 EXPORT_SYMBOL(tcf_action_offload_del_post);
1165
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Hi Simon,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on net-next/master]
url: https://github.com/0day-ci/linux/commits/Simon-Horman/flow_offload-hardware-offload-of-TC-actions/20210722-172229
base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git c2255ff47768c94a0ebc3968f007928bb47ea43b
config: powerpc-randconfig-r016-20210722 (attached as .config)
compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project 9625ca5b602616b2f5584e8a49ba93c52c141e40)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install powerpc cross compiling tool for clang build
# apt-get install binutils-powerpc-linux-gnu
# https://github.com/0day-ci/linux/commit/a8e2d0acfc98c127ab0b5189f7635049515c43f3
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Simon-Horman/flow_offload-hardware-offload-of-TC-actions/20210722-172229
git checkout a8e2d0acfc98c127ab0b5189f7635049515c43f3
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=powerpc
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
In file included from include/linux/dma-mapping.h:10:
In file included from include/linux/scatterlist.h:9:
In file included from arch/powerpc/include/asm/io.h:619:
arch/powerpc/include/asm/io-defs.h:43:1: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
DEF_PCI_AC_NORET(insb, (unsigned long p, void *b, unsigned long c),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:616:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:238:1: note: expanded from here
__do_insb
^
arch/powerpc/include/asm/io.h:556:56: note: expanded from macro '__do_insb'
#define __do_insb(p, b, n) readsb((PCI_IO_ADDR)_IO_BASE+(p), (b), (n))
~~~~~~~~~~~~~~~~~~~~~^
In file included from net/sched/act_api.c:13:
In file included from include/linux/skbuff.h:31:
In file included from include/linux/dma-mapping.h:10:
In file included from include/linux/scatterlist.h:9:
In file included from arch/powerpc/include/asm/io.h:619:
arch/powerpc/include/asm/io-defs.h:45:1: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
DEF_PCI_AC_NORET(insw, (unsigned long p, void *b, unsigned long c),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:616:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:2:1: note: expanded from here
__do_insw
^
arch/powerpc/include/asm/io.h:557:56: note: expanded from macro '__do_insw'
#define __do_insw(p, b, n) readsw((PCI_IO_ADDR)_IO_BASE+(p), (b), (n))
~~~~~~~~~~~~~~~~~~~~~^
In file included from net/sched/act_api.c:13:
In file included from include/linux/skbuff.h:31:
In file included from include/linux/dma-mapping.h:10:
In file included from include/linux/scatterlist.h:9:
In file included from arch/powerpc/include/asm/io.h:619:
arch/powerpc/include/asm/io-defs.h:47:1: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
DEF_PCI_AC_NORET(insl, (unsigned long p, void *b, unsigned long c),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:616:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:4:1: note: expanded from here
__do_insl
^
arch/powerpc/include/asm/io.h:558:56: note: expanded from macro '__do_insl'
#define __do_insl(p, b, n) readsl((PCI_IO_ADDR)_IO_BASE+(p), (b), (n))
~~~~~~~~~~~~~~~~~~~~~^
In file included from net/sched/act_api.c:13:
In file included from include/linux/skbuff.h:31:
In file included from include/linux/dma-mapping.h:10:
In file included from include/linux/scatterlist.h:9:
In file included from arch/powerpc/include/asm/io.h:619:
arch/powerpc/include/asm/io-defs.h:49:1: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
DEF_PCI_AC_NORET(outsb, (unsigned long p, const void *b, unsigned long c),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:616:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:6:1: note: expanded from here
__do_outsb
^
arch/powerpc/include/asm/io.h:559:58: note: expanded from macro '__do_outsb'
#define __do_outsb(p, b, n) writesb((PCI_IO_ADDR)_IO_BASE+(p),(b),(n))
~~~~~~~~~~~~~~~~~~~~~^
In file included from net/sched/act_api.c:13:
In file included from include/linux/skbuff.h:31:
In file included from include/linux/dma-mapping.h:10:
In file included from include/linux/scatterlist.h:9:
In file included from arch/powerpc/include/asm/io.h:619:
arch/powerpc/include/asm/io-defs.h:51:1: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
DEF_PCI_AC_NORET(outsw, (unsigned long p, const void *b, unsigned long c),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:616:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:8:1: note: expanded from here
__do_outsw
^
arch/powerpc/include/asm/io.h:560:58: note: expanded from macro '__do_outsw'
#define __do_outsw(p, b, n) writesw((PCI_IO_ADDR)_IO_BASE+(p),(b),(n))
~~~~~~~~~~~~~~~~~~~~~^
In file included from net/sched/act_api.c:13:
In file included from include/linux/skbuff.h:31:
In file included from include/linux/dma-mapping.h:10:
In file included from include/linux/scatterlist.h:9:
In file included from arch/powerpc/include/asm/io.h:619:
arch/powerpc/include/asm/io-defs.h:53:1: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
DEF_PCI_AC_NORET(outsl, (unsigned long p, const void *b, unsigned long c),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:616:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:10:1: note: expanded from here
__do_outsl
^
arch/powerpc/include/asm/io.h:561:58: note: expanded from macro '__do_outsl'
#define __do_outsl(p, b, n) writesl((PCI_IO_ADDR)_IO_BASE+(p),(b),(n))
~~~~~~~~~~~~~~~~~~~~~^
>> net/sched/act_api.c:1063:5: warning: no previous prototype for function 'tcf_action_offload_cmd_pre' [-Wmissing-prototypes]
int tcf_action_offload_cmd_pre(struct tc_action *actions[],
^
net/sched/act_api.c:1063:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int tcf_action_offload_cmd_pre(struct tc_action *actions[],
^
static
>> net/sched/act_api.c:1091:5: warning: no previous prototype for function 'tcf_action_offload_cmd_post' [-Wmissing-prototypes]
int tcf_action_offload_cmd_post(struct flow_offload_action *fl_act,
^
net/sched/act_api.c:1091:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int tcf_action_offload_cmd_post(struct flow_offload_action *fl_act,
^
static
net/sched/act_api.c:1105:5: warning: no previous prototype for function 'tcf_action_offload_cmd' [-Wmissing-prototypes]
int tcf_action_offload_cmd(struct tc_action *actions[],
^
net/sched/act_api.c:1105:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int tcf_action_offload_cmd(struct tc_action *actions[],
^
static
>> net/sched/act_api.c:1123:5: warning: no previous prototype for function 'tcf_action_offload_del_post' [-Wmissing-prototypes]
int tcf_action_offload_del_post(struct flow_offload_action *fl_act,
^
net/sched/act_api.c:1123:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int tcf_action_offload_del_post(struct flow_offload_action *fl_act,
^
static
16 warnings generated.
vim +/tcf_action_offload_cmd_pre +1063 net/sched/act_api.c
1062
> 1063 int tcf_action_offload_cmd_pre(struct tc_action *actions[],
1064 enum flow_act_command cmd,
1065 struct netlink_ext_ack *extack,
1066 struct flow_offload_action **fl_act)
1067 {
1068 struct flow_offload_action *fl_act_p;
1069 int err = 0;
1070
1071 fl_act_p = flow_action_alloc(tcf_act_num_actions(actions));
1072 if (!fl_act_p)
1073 return -ENOMEM;
1074
1075 fl_act_p->extack = extack;
1076 fl_act_p->command = cmd;
1077 err = tc_setup_action(&fl_act_p->action, actions);
1078 if (err) {
1079 NL_SET_ERR_MSG_MOD(extack,
1080 "Failed to setup tc actions for offload\n");
1081 goto err_out;
1082 }
1083 *fl_act = fl_act_p;
1084 return 0;
1085 err_out:
1086 kfree(fl_act_p);
1087 return err;
1088 }
1089 EXPORT_SYMBOL(tcf_action_offload_cmd_pre);
1090
> 1091 int tcf_action_offload_cmd_post(struct flow_offload_action *fl_act,
1092 struct netlink_ext_ack *extack)
1093 {
1094 if (IS_ERR(fl_act))
1095 return PTR_ERR(fl_act);
1096
1097 flow_indr_dev_setup_offload(NULL, NULL, TC_SETUP_ACT, fl_act, NULL, NULL);
1098
1099 tc_cleanup_flow_action(&fl_act->action);
1100 kfree(fl_act);
1101 return 0;
1102 }
1103
1104 /* offload the tc command after inserted */
1105 int tcf_action_offload_cmd(struct tc_action *actions[],
1106 struct netlink_ext_ack *extack)
1107 {
1108 struct flow_offload_action *fl_act;
1109 int err = 0;
1110
1111 err = tcf_action_offload_cmd_pre(actions,
1112 FLOW_ACT_REPLACE,
1113 extack,
1114 &fl_act);
1115 if (err)
1116 return err;
1117
1118 return tcf_action_offload_cmd_post(fl_act, extack);
1119 }
1120 EXPORT_SYMBOL(tcf_action_offload_cmd);
1121
1122 /* offload the tc command after deleted */
> 1123 int tcf_action_offload_del_post(struct flow_offload_action *fl_act,
1124 struct tc_action *actions[],
1125 struct netlink_ext_ack *extack,
1126 int fallback_num)
1127 {
1128 int fallback_entries = 0;
1129 struct tc_action *act;
1130 int total_entries = 0;
1131 int i;
1132
1133 if (!fl_act)
1134 return -EINVAL;
1135
1136 if (fallback_num) {
1137 /* for each the actions to fallback the action entries remain in the actions */
1138 for (i = 0; i < TCA_ACT_MAX_PRIO; i++) {
1139 act = actions[i];
1140 if (!act)
1141 continue;
1142
1143 fallback_entries += tcf_act_num_actions_single(act);
1144 }
1145 fallback_entries += fallback_num;
1146 }
1147 total_entries = fl_act->action.num_entries;
1148 if (total_entries > fallback_entries) {
1149 /* just offload the actions that is not fallback and start with the actions */
1150 fl_act->action.num_entries -= fallback_entries;
1151 flow_indr_dev_setup_offload(NULL, NULL, TC_SETUP_ACT, fl_act, NULL, NULL);
1152
1153 /* recovery num_entries for cleanup */
1154 fl_act->action.num_entries = total_entries;
1155 } else {
1156 NL_SET_ERR_MSG(extack, "no entries to offload when deleting the tc actions");
1157 }
1158
1159 tc_cleanup_flow_action(&fl_act->action);
1160
1161 kfree(fl_act);
1162 return 0;
1163 }
1164 EXPORT_SYMBOL(tcf_action_offload_del_post);
1165
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
On 2021-07-22 5:19 a.m., Simon Horman wrote: [..] > tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n, > u32 portid, int event, struct netlink_ext_ack *extack) > { > - int i, ret; > struct nlattr *tb[TCA_ACT_MAX_PRIO + 1]; > struct tc_action *act; > size_t attr_size = 0; > struct tc_action *actions[TCA_ACT_MAX_PRIO] = {}; > + struct flow_offload_action *fl_act; > + int i, ret, fallback_num; > > ret = nla_parse_nested_deprecated(tb, TCA_ACT_MAX_PRIO, nla, NULL, > extack); > @@ -1492,7 +1568,9 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n, > if (event == RTM_GETACTION) > ret = tcf_get_notify(net, portid, n, actions, event, extack); > else { /* delete */ > - ret = tcf_del_notify(net, n, actions, portid, attr_size, extack); > + tcf_action_offload_cmd_pre(actions, FLOW_ACT_DESTROY, extack, &fl_act); > + ret = tcf_del_notify(net, n, actions, portid, attr_size, extack, &fallback_num); > + tcf_action_offload_del_post(fl_act, actions, extack, fallback_num); > if (ret) > goto err; It is hard to read from a patch context, but iiuc: if the hardware update fails in tcf_action_offload_del_post() then user space would still have been notified that it succeeded via tcf_del_notify()... and there is no remediation after the fact. cheers, jamal
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index cd4cf6b10f5d..03dae225d64f 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -573,6 +573,7 @@ int tc_setup_cb_reoffload(struct tcf_block *block, struct tcf_proto *tp, void *cb_priv, u32 *flags, unsigned int *in_hw_count); unsigned int tcf_exts_num_actions(struct tcf_exts *exts); unsigned int tcf_act_num_actions(struct tc_action *actions[]); +unsigned int tcf_act_num_actions_single(struct tc_action *act); #ifdef CONFIG_NET_CLS_ACT int tcf_qevent_init(struct tcf_qevent *qe, struct Qdisc *sch, diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 185f17ea60d5..23a4538916af 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -1060,36 +1060,109 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp, return ERR_PTR(err); } -/* offload the tc command after inserted */ -int tcf_action_offload_cmd(struct tc_action *actions[], - struct netlink_ext_ack *extack) +int tcf_action_offload_cmd_pre(struct tc_action *actions[], + enum flow_act_command cmd, + struct netlink_ext_ack *extack, + struct flow_offload_action **fl_act) { - struct flow_offload_action *fl_act; + struct flow_offload_action *fl_act_p; int err = 0; - fl_act = flow_action_alloc(tcf_act_num_actions(actions)); - if (!fl_act) + fl_act_p = flow_action_alloc(tcf_act_num_actions(actions)); + if (!fl_act_p) return -ENOMEM; - fl_act->extack = extack; - err = tc_setup_action(&fl_act->action, actions); + fl_act_p->extack = extack; + fl_act_p->command = cmd; + err = tc_setup_action(&fl_act_p->action, actions); if (err) { NL_SET_ERR_MSG_MOD(extack, "Failed to setup tc actions for offload\n"); goto err_out; } - fl_act->command = FLOW_ACT_REPLACE; + *fl_act = fl_act_p; + return 0; +err_out: + kfree(fl_act_p); + return err; +} +EXPORT_SYMBOL(tcf_action_offload_cmd_pre); + +int tcf_action_offload_cmd_post(struct flow_offload_action *fl_act, + struct netlink_ext_ack *extack) +{ + if (IS_ERR(fl_act)) + return PTR_ERR(fl_act); flow_indr_dev_setup_offload(NULL, NULL, TC_SETUP_ACT, fl_act, NULL, NULL); tc_cleanup_flow_action(&fl_act->action); - -err_out: kfree(fl_act); - return err; + return 0; +} + +/* offload the tc command after inserted */ +int tcf_action_offload_cmd(struct tc_action *actions[], + struct netlink_ext_ack *extack) +{ + struct flow_offload_action *fl_act; + int err = 0; + + err = tcf_action_offload_cmd_pre(actions, + FLOW_ACT_REPLACE, + extack, + &fl_act); + if (err) + return err; + + return tcf_action_offload_cmd_post(fl_act, extack); } EXPORT_SYMBOL(tcf_action_offload_cmd); +/* offload the tc command after deleted */ +int tcf_action_offload_del_post(struct flow_offload_action *fl_act, + struct tc_action *actions[], + struct netlink_ext_ack *extack, + int fallback_num) +{ + int fallback_entries = 0; + struct tc_action *act; + int total_entries = 0; + int i; + + if (!fl_act) + return -EINVAL; + + if (fallback_num) { + /* for each the actions to fallback the action entries remain in the actions */ + for (i = 0; i < TCA_ACT_MAX_PRIO; i++) { + act = actions[i]; + if (!act) + continue; + + fallback_entries += tcf_act_num_actions_single(act); + } + fallback_entries += fallback_num; + } + total_entries = fl_act->action.num_entries; + if (total_entries > fallback_entries) { + /* just offload the actions that is not fallback and start with the actions */ + fl_act->action.num_entries -= fallback_entries; + flow_indr_dev_setup_offload(NULL, NULL, TC_SETUP_ACT, fl_act, NULL, NULL); + + /* recovery num_entries for cleanup */ + fl_act->action.num_entries = total_entries; + } else { + NL_SET_ERR_MSG(extack, "no entries to offload when deleting the tc actions"); + } + + tc_cleanup_flow_action(&fl_act->action); + + kfree(fl_act); + return 0; +} +EXPORT_SYMBOL(tcf_action_offload_del_post); + /* Returns numbers of initialized actions or negative error. */ int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla, @@ -1393,7 +1466,7 @@ static int tca_action_flush(struct net *net, struct nlattr *nla, return err; } -static int tcf_action_delete(struct net *net, struct tc_action *actions[]) +static int tcf_action_delete(struct net *net, struct tc_action *actions[], int *fallbacknum) { int i; @@ -1407,6 +1480,7 @@ static int tcf_action_delete(struct net *net, struct tc_action *actions[]) u32 act_index = a->tcfa_index; actions[i] = NULL; + *fallbacknum = tcf_act_num_actions_single(a); if (tcf_action_put(a)) { /* last reference, action was deleted concurrently */ module_put(ops->owner); @@ -1419,12 +1493,13 @@ static int tcf_action_delete(struct net *net, struct tc_action *actions[]) return ret; } } + *fallbacknum = 0; return 0; } static int tcf_del_notify(struct net *net, struct nlmsghdr *n, struct tc_action *actions[], - u32 portid, size_t attr_size, struct netlink_ext_ack *extack) + u32 portid, size_t attr_size, struct netlink_ext_ack *extack, int *fallbacknum) { int ret; struct sk_buff *skb; @@ -1442,7 +1517,7 @@ tcf_del_notify(struct net *net, struct nlmsghdr *n, struct tc_action *actions[], } /* now do the delete */ - ret = tcf_action_delete(net, actions); + ret = tcf_action_delete(net, actions, fallbacknum); if (ret < 0) { NL_SET_ERR_MSG(extack, "Failed to delete TC action"); kfree_skb(skb); @@ -1458,11 +1533,12 @@ static int tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n, u32 portid, int event, struct netlink_ext_ack *extack) { - int i, ret; struct nlattr *tb[TCA_ACT_MAX_PRIO + 1]; struct tc_action *act; size_t attr_size = 0; struct tc_action *actions[TCA_ACT_MAX_PRIO] = {}; + struct flow_offload_action *fl_act; + int i, ret, fallback_num; ret = nla_parse_nested_deprecated(tb, TCA_ACT_MAX_PRIO, nla, NULL, extack); @@ -1492,7 +1568,9 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n, if (event == RTM_GETACTION) ret = tcf_get_notify(net, portid, n, actions, event, extack); else { /* delete */ - ret = tcf_del_notify(net, n, actions, portid, attr_size, extack); + tcf_action_offload_cmd_pre(actions, FLOW_ACT_DESTROY, extack, &fl_act); + ret = tcf_del_notify(net, n, actions, portid, attr_size, extack, &fallback_num); + tcf_action_offload_del_post(fl_act, actions, extack, fallback_num); if (ret) goto err; return 0; diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 9b9770dab5e8..23ce021f07f8 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -3755,6 +3755,15 @@ unsigned int tcf_exts_num_actions(struct tcf_exts *exts) } EXPORT_SYMBOL(tcf_exts_num_actions); +unsigned int tcf_act_num_actions_single(struct tc_action *act) +{ + if (is_tcf_pedit(act)) + return tcf_pedit_nkeys(act); + else + return 1; +} +EXPORT_SYMBOL(tcf_act_num_actions_single); + unsigned int tcf_act_num_actions(struct tc_action *actions[]) { unsigned int num_acts = 0; @@ -3762,10 +3771,7 @@ unsigned int tcf_act_num_actions(struct tc_action *actions[]) int i; tcf_act_for_each_action(i, act, actions) { - if (is_tcf_pedit(act)) - num_acts += tcf_pedit_nkeys(act); - else - num_acts++; + num_acts += tcf_act_num_actions_single(act); } return num_acts; }