| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20210722131909.GB31574@corigine.com>
Date: Thu, 22 Jul 2021 15:19:11 +0200
From: Simon Horman <simon.horman@...igine.com>
To: Roi Dayan <roid@...dia.com>
Cc: David Miller <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>,
Jamal Hadi Salim <jhs@...atatu.com>,
Cong Wang <xiyou.wangcong@...il.com>,
Jiri Pirko <jiri@...lanox.com>, netdev@...r.kernel.org,
oss-drivers@...igine.com, Baowen Zheng <baowen.zheng@...igine.com>,
Louis Peens <louis.peens@...igine.com>
Subject: Re: [PATCH net-next 1/3] flow_offload: allow user to offload tc
action to net device
On Thu, Jul 22, 2021 at 03:24:07PM +0300, Roi Dayan wrote:
>
>
> On 2021-07-22 12:19 PM, Simon Horman wrote:
> > From: Baowen Zheng <baowen.zheng@...igine.com>
> >
> > Use flow_indr_dev_register/flow_indr_dev_setup_offload to
> > offload tc action.
> >
> > We offload the tc action mainly for ovs meter configuration.
> > Make some basic changes for different vendors to return EOPNOTSUPP.
> >
> > We need to call tc_cleanup_flow_action to clean up tc action entry since
> > in tc_setup_action, some actions may hold dev refcnt, especially the mirror
> > action.
> >
> > As per review from the RFC, the kernel test robot will fail to run, so
> > we add CONFIG_NET_CLS_ACT control for the action offload.
> >
> > Signed-off-by: Baowen Zheng <baowen.zheng@...igine.com>
> > Signed-off-by: Louis Peens <louis.peens@...igine.com>
> > Signed-off-by: Simon Horman <simon.horman@...igine.com>
> > ---
> > drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 2 +-
> > .../ethernet/mellanox/mlx5/core/en/rep/tc.c | 3 ++
> > .../ethernet/netronome/nfp/flower/offload.c | 3 ++
> > include/linux/netdevice.h | 1 +
> > include/net/flow_offload.h | 15 ++++++++
> > include/net/pkt_cls.h | 15 ++++++++
> > net/core/flow_offload.c | 26 +++++++++++++-
> > net/sched/act_api.c | 33 +++++++++++++++++
> > net/sched/cls_api.c | 36 ++++++++++++++++---
> > 9 files changed, 128 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
> > index 5e4429b14b8c..edbbf7b4df77 100644
> > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
> > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
> > @@ -1951,7 +1951,7 @@ static int bnxt_tc_setup_indr_cb(struct net_device *netdev, struct Qdisc *sch, v
> > void *data,
> > void (*cleanup)(struct flow_block_cb *block_cb))
> > {
> > - if (!bnxt_is_netdev_indr_offload(netdev))
> > + if (!netdev || !bnxt_is_netdev_indr_offload(netdev))
> > return -EOPNOTSUPP;
> > switch (type) {
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c
> > index 059799e4f483..111daacc4cc3 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c
> > @@ -486,6 +486,9 @@ int mlx5e_rep_indr_setup_cb(struct net_device *netdev, struct Qdisc *sch, void *
> > void *data,
> > void (*cleanup)(struct flow_block_cb *block_cb))
> > {
> > + if (!netdev)
> > + return -EOPNOTSUPP;
> > +
> > switch (type) {
> > case TC_SETUP_BLOCK:
> > return mlx5e_rep_indr_setup_block(netdev, sch, cb_priv, type_data,
> > diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
> > index 2406d33356ad..88bbc86347b4 100644
> > --- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
> > +++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
> > @@ -1869,6 +1869,9 @@ nfp_flower_indr_setup_tc_cb(struct net_device *netdev, struct Qdisc *sch, void *
> > void *data,
> > void (*cleanup)(struct flow_block_cb *block_cb))
> > {
> > + if (!netdev)
> > + return -EOPNOTSUPP;
> > +
> > if (!nfp_fl_is_netdev_to_offload(netdev))
> > return -EOPNOTSUPP;
> > diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> > index 42f6f866d5f3..b138219baf6f 100644
> > --- a/include/linux/netdevice.h
> > +++ b/include/linux/netdevice.h
> > @@ -923,6 +923,7 @@ enum tc_setup_type {
> > TC_SETUP_QDISC_TBF,
> > TC_SETUP_QDISC_FIFO,
> > TC_SETUP_QDISC_HTB,
> > + TC_SETUP_ACT,
> > };
> > /* These structures hold the attributes of bpf state that are being passed
> > diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h
> > index 69c9eabf8325..26644596fd54 100644
> > --- a/include/net/flow_offload.h
> > +++ b/include/net/flow_offload.h
> > @@ -553,6 +553,21 @@ struct flow_cls_offload {
> > u32 classid;
> > };
> > +enum flow_act_command {
> > + FLOW_ACT_REPLACE,
> > + FLOW_ACT_DESTROY,
> > + FLOW_ACT_STATS,
> > +};
> > +
> > +struct flow_offload_action {
> > + struct netlink_ext_ack *extack;
> > + enum flow_act_command command;
> > + struct flow_stats stats;
> > + struct flow_action action;
> > +};
> > +
> > +struct flow_offload_action *flow_action_alloc(unsigned int num_actions);
> > +
> > static inline struct flow_rule *
> > flow_cls_offload_flow_rule(struct flow_cls_offload *flow_cmd)
> > {
> > diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
> > index ec7823921bd2..cd4cf6b10f5d 100644
> > --- a/include/net/pkt_cls.h
> > +++ b/include/net/pkt_cls.h
> > @@ -266,6 +266,9 @@ static inline void tcf_exts_put_net(struct tcf_exts *exts)
> > for (; 0; (void)(i), (void)(a), (void)(exts))
> > #endif
> > +#define tcf_act_for_each_action(i, a, actions) \
> > + for (i = 0; i < TCA_ACT_MAX_PRIO && ((a) = actions[i]); i++)
> > +
> > static inline void
> > tcf_exts_stats_update(const struct tcf_exts *exts,
> > u64 bytes, u64 packets, u64 drops, u64 lastuse,
> > @@ -536,8 +539,19 @@ tcf_match_indev(struct sk_buff *skb, int ifindex)
> > return ifindex == skb->skb_iif;
> > }
> > +#ifdef CONFIG_NET_CLS_ACT
> > int tc_setup_flow_action(struct flow_action *flow_action,
> > const struct tcf_exts *exts);
> > +#else
> > +static inline int tc_setup_flow_action(struct flow_action *flow_action,
> > + const struct tcf_exts *exts)
> > +{
> > + return 0;
> > +}
> > +#endif
> > +
> > +int tc_setup_action(struct flow_action *flow_action,
> > + struct tc_action *actions[]);
> > void tc_cleanup_flow_action(struct flow_action *flow_action);
> > int tc_setup_cb_call(struct tcf_block *block, enum tc_setup_type type,
> > @@ -558,6 +572,7 @@ int tc_setup_cb_reoffload(struct tcf_block *block, struct tcf_proto *tp,
> > enum tc_setup_type type, void *type_data,
> > 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[]);
> > #ifdef CONFIG_NET_CLS_ACT
> > int tcf_qevent_init(struct tcf_qevent *qe, struct Qdisc *sch,
> > diff --git a/net/core/flow_offload.c b/net/core/flow_offload.c
> > index 715b67f6c62f..0fa2f75cc9b3 100644
> > --- a/net/core/flow_offload.c
> > +++ b/net/core/flow_offload.c
> > @@ -27,6 +27,27 @@ struct flow_rule *flow_rule_alloc(unsigned int num_actions)
> > }
> > EXPORT_SYMBOL(flow_rule_alloc);
> > +struct flow_offload_action *flow_action_alloc(unsigned int num_actions)
> > +{
> > + struct flow_offload_action *fl_action;
> > + int i;
> > +
> > + fl_action = kzalloc(struct_size(fl_action, action.entries, num_actions),
> > + GFP_KERNEL);
> > + if (!fl_action)
> > + return NULL;
>
> Hi Simon,
>
> Our automatic tests got a trace from flow_action_alloc()
> introduced in this series.
> I don't have specific commands right now but maybe its easy
> to reproduce with option CONFIG_DEBUG_ATOMIC_SLEEP=y
>
> fl_dump->fl_hw_update_stats->fl_hw_update_stats->tcf_exts_stats_update
> ->tcf_action_update_hw_stats->tcf_action_offload_cmd_pre->
> ->flow_action_alloc
>
> Thanks,
> Roi
Thanks Roi,
we'll look into this.
Powered by blists - more mailing lists