| Message ID | 20211012183106.2315477-2-anthony.l.nguyen@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Anthony Nguyen |
| Headers | show |
| Series | support for tunnel in ice eswitch | expand |
Dear Michal, dear Tony, Am 12.10.21 um 20:31 schrieb Tony Nguyen: > From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> > > Implement indirect notification mechanism to support offloading TC rules > on tunnel devices. > > Keep indirect block list in netdev priv. Notification will call setting > tc cls flower function. With what hardware was this tested? > Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> > --- > drivers/net/ethernet/intel/ice/ice.h | 8 + > drivers/net/ethernet/intel/ice/ice_main.c | 198 +++++++++++++++++++- > drivers/net/ethernet/intel/ice/ice_tc_lib.h | 6 + > 3 files changed, 210 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h > index 5c651c7c58bf..afd46ef70bd8 100644 > --- a/drivers/net/ethernet/intel/ice/ice.h > +++ b/drivers/net/ethernet/intel/ice/ice.h > @@ -34,6 +34,7 @@ > #include <linux/if_bridge.h> > #include <linux/ctype.h> > #include <linux/bpf.h> > +#include <linux/btf.h> > #include <linux/auxiliary_bus.h> > #include <linux/avf/virtchnl.h> > #include <linux/cpu_rmap.h> > @@ -544,6 +545,13 @@ struct ice_pf { > struct ice_netdev_priv { > struct ice_vsi *vsi; > struct ice_repr *repr; > + /* indirect block callbacks on registered higher level devices > + * (e.g. tunnel devices) > + * > + * tc_indr_block_cb_priv_list is used to lookup indirect callback Nit: look up > + * private data > + */ > + struct list_head tc_indr_block_priv_list; > }; > > /** > diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c > index 51e12e5896b2..600c8444d23b 100644 > --- a/drivers/net/ethernet/intel/ice/ice_main.c > +++ b/drivers/net/ethernet/intel/ice/ice_main.c > @@ -55,6 +55,12 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type); > > static void ice_vsi_release_all(struct ice_pf *pf); > > +static int > +ice_indr_setup_tc_cb(struct net_device *netdev, struct Qdisc *sch, > + void *cb_priv, enum tc_setup_type type, void *type_data, > + void *data, > + void (*cleanup)(struct flow_block_cb *block_cb)); > + > bool netif_is_ice(struct net_device *dev) > { > return dev && (dev->netdev_ops == &ice_netdev_ops); > @@ -3399,6 +3405,63 @@ ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto, > return ret; > } > > +/** > + * ice_rep_indr_tc_block_unbind > + * @cb_priv: indirection block private data > + */ > +static void ice_rep_indr_tc_block_unbind(void *cb_priv) > +{ > + struct ice_indr_block_priv *indr_priv = cb_priv; > + > + list_del(&indr_priv->list); > + kfree(indr_priv); > +} > + > +/** > + * ice_tc_indir_block_unregister - Unregister TC indirect block notifications > + * @vsi: VSI struct which has the netdev > + */ > +static void ice_tc_indir_block_unregister(struct ice_vsi *vsi) > +{ > + struct ice_netdev_priv *np = netdev_priv(vsi->netdev); > + > + flow_indr_dev_unregister(ice_indr_setup_tc_cb, np, > + ice_rep_indr_tc_block_unbind); > +} > + > +/** > + * ice_tc_indir_block_remove - clean indirect TC block notifications > + * @pf: PF structure > + */ > +static void ice_tc_indir_block_remove(struct ice_pf *pf) > +{ > + struct ice_vsi *pf_vsi = ice_get_main_vsi(pf); > + > + if (!pf_vsi) > + return; > + > + ice_tc_indir_block_unregister(pf_vsi); > +} > + > +/** > + * ice_tc_indir_block_register - Register TC indirect block notifications > + * @vsi: VSI struct which has the netdev > + * > + * Returns 0 on success, negative value on failure > + */ > +static int ice_tc_indir_block_register(struct ice_vsi *vsi) > +{ > + struct ice_netdev_priv *np; > + > + if (!vsi || !vsi->netdev) > + return -EINVAL; > + > + np = netdev_priv(vsi->netdev); > + > + INIT_LIST_HEAD(&np->tc_indr_block_priv_list); > + return flow_indr_dev_register(ice_indr_setup_tc_cb, np); > +} > + > /** > * ice_setup_pf_sw - Setup the HW switch on startup or after reset > * @pf: board private structure > @@ -3407,6 +3470,7 @@ ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto, > */ > static int ice_setup_pf_sw(struct ice_pf *pf) > { > + struct device *dev = ice_pf_to_dev(pf); > struct ice_vsi *vsi; > int status = 0; > > @@ -3425,6 +3489,13 @@ static int ice_setup_pf_sw(struct ice_pf *pf) > /* netdev has to be configured before setting frame size */ > ice_vsi_cfg_frame_size(vsi); > > + /* init indirect block notifications */ > + status = ice_tc_indir_block_register(vsi); > + if (status) { > + dev_err(dev, "Failed to register netdev notifier\n"); > + goto unroll_cfg_netdev; > + } > + > /* Setup DCB netlink interface */ > ice_dcbnl_setup(vsi); > > @@ -3436,7 +3507,7 @@ static int ice_setup_pf_sw(struct ice_pf *pf) > > status = ice_set_cpu_rx_rmap(vsi); > if (status) { > - dev_err(ice_pf_to_dev(pf), "Failed to set CPU Rx map VSI %d error %d\n", > + dev_err(dev, "Failed to set CPU Rx map VSI %d error %d\n", > vsi->vsi_num, status); > status = -EINVAL; > goto unroll_napi_add; > @@ -3449,8 +3520,9 @@ static int ice_setup_pf_sw(struct ice_pf *pf) > > free_cpu_rx_map: > ice_free_cpu_rx_rmap(vsi); > - > unroll_napi_add: > + ice_tc_indir_block_unregister(vsi); > +unroll_cfg_netdev: > if (vsi) { > ice_napi_del(vsi); > if (vsi->netdev) { > @@ -4727,6 +4799,8 @@ static void ice_remove(struct pci_dev *pdev) > msleep(100); > } > > + ice_tc_indir_block_remove(pf); > + > if (test_bit(ICE_FLAG_SRIOV_ENA, pf->flags)) { > set_bit(ICE_VF_RESETS_DISABLED, pf->state); > ice_free_vfs(pf); > @@ -7272,6 +7346,126 @@ ice_setup_tc(struct net_device *netdev, enum tc_setup_type type, > return -EOPNOTSUPP; > } > > +static struct ice_indr_block_priv * > +ice_indr_block_priv_lookup(struct ice_netdev_priv *np, > + struct net_device *netdev) > +{ > + struct ice_indr_block_priv *cb_priv; > + > + /* All callback list access should be protected by RTNL. */ > + ASSERT_RTNL(); > + > + list_for_each_entry(cb_priv, &np->tc_indr_block_priv_list, list) { > + if (!cb_priv->netdev) > + return NULL; > + if (cb_priv->netdev == netdev) > + return cb_priv; > + } > + return NULL; > +} > + > +static int > +ice_indr_setup_block_cb(enum tc_setup_type type, void *type_data, > + void *indr_priv) > +{ > + struct ice_indr_block_priv *priv = indr_priv; > + struct ice_netdev_priv *np = priv->np; > + > + switch (type) { > + case TC_SETUP_CLSFLOWER: > + return ice_setup_tc_cls_flower(np, priv->netdev, > + (struct flow_cls_offload *) > + type_data); > + default: > + return -EOPNOTSUPP; > + } > +} > + > +static int > +ice_indr_setup_tc_block(struct net_device *netdev, struct Qdisc *sch, > + struct ice_netdev_priv *np, > + struct flow_block_offload *f, void *data, > + void (*cleanup)(struct flow_block_cb *block_cb)) > +{ > + struct ice_indr_block_priv *indr_priv; > + struct flow_block_cb *block_cb; > + > + int tunnel_type = 0; > + > + if (tunnel_type != TNL_VXLAN && tunnel_type != TNL_GENEVE && > + !(is_vlan_dev(netdev) && > + vlan_dev_real_dev(netdev) == np->vsi->netdev)) > + return -EOPNOTSUPP; > + > + if (f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS) Could you please document in the commit message, why other types are not supported? > + return -EOPNOTSUPP; > + > + switch (f->command) { > + case FLOW_BLOCK_BIND: > + indr_priv = ice_indr_block_priv_lookup(np, netdev); > + if (indr_priv) > + return -EEXIST; > + > + indr_priv = kzalloc(sizeof(*indr_priv), GFP_KERNEL); > + if (!indr_priv) > + return -ENOMEM; > + > + indr_priv->netdev = netdev; > + indr_priv->np = np; > + list_add(&indr_priv->list, &np->tc_indr_block_priv_list); > + > + block_cb = > + flow_indr_block_cb_alloc(ice_indr_setup_block_cb, > + indr_priv, indr_priv, > + ice_rep_indr_tc_block_unbind, > + f, netdev, sch, data, np, > + cleanup); > + > + if (IS_ERR(block_cb)) { > + list_del(&indr_priv->list); > + kfree(indr_priv); > + return PTR_ERR(block_cb); > + } > + flow_block_cb_add(block_cb, f); > + list_add_tail(&block_cb->driver_list, &ice_block_cb_list); > + return 0; > + case FLOW_BLOCK_UNBIND: > + indr_priv = ice_indr_block_priv_lookup(np, netdev); > + if (!indr_priv) > + return -ENOENT; > + > + block_cb = flow_block_cb_lookup(f->block, > + ice_indr_setup_block_cb, > + indr_priv); > + if (!block_cb) > + return -ENOENT; > + > + flow_indr_block_cb_remove(block_cb, f); > + > + list_del(&block_cb->driver_list); > + return 0; > + default: > + return -EOPNOTSUPP; > + } > + return 0; > +} > + > +static int > +ice_indr_setup_tc_cb(struct net_device *netdev, struct Qdisc *sch, > + void *cb_priv, enum tc_setup_type type, void *type_data, > + void *data, > + void (*cleanup)(struct flow_block_cb *block_cb)) > +{ > + switch (type) { > + case TC_SETUP_BLOCK: > + return ice_indr_setup_tc_block(netdev, sch, cb_priv, type_data, > + data, cleanup); > + > + default: > + return -EOPNOTSUPP; > + } > +} > + > /** > * ice_open - Called when a network interface becomes active > * @netdev: network interface device structure > diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.h b/drivers/net/ethernet/intel/ice/ice_tc_lib.h > index d90e9e37ae25..332c70342f1f 100644 > --- a/drivers/net/ethernet/intel/ice/ice_tc_lib.h > +++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.h > @@ -23,6 +23,12 @@ > #define ICE_TC_FLWR_FIELD_ENC_DST_MAC BIT(16) > #define ICE_TC_FLWR_FIELD_ETH_TYPE_ID BIT(17) > > +struct ice_indr_block_priv { > + struct net_device *netdev; > + struct ice_netdev_priv *np; > + struct list_head list; > +}; > + > struct ice_tc_flower_action { > u32 tc_class; > enum ice_sw_fwd_act_type fltr_act; > Acked-by: Paul Menzel <pmenzel@molgen.mpg.de> Kind regards, Paul
On Tue, Oct 12, 2021 at 08:46:12PM +0200, Paul Menzel wrote: > Dear Michal, dear Tony, > > > Am 12.10.21 um 20:31 schrieb Tony Nguyen: > > From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> > > > > Implement indirect notification mechanism to support offloading TC rules > > on tunnel devices. > > > > Keep indirect block list in netdev priv. Notification will call setting > > tc cls flower function. > > With what hardware was this tested? > This was tested on cvl card (E810-C). > > Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> > > --- > > drivers/net/ethernet/intel/ice/ice.h | 8 + > > drivers/net/ethernet/intel/ice/ice_main.c | 198 +++++++++++++++++++- > > drivers/net/ethernet/intel/ice/ice_tc_lib.h | 6 + > > 3 files changed, 210 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h > > index 5c651c7c58bf..afd46ef70bd8 100644 > > --- a/drivers/net/ethernet/intel/ice/ice.h > > +++ b/drivers/net/ethernet/intel/ice/ice.h > > @@ -34,6 +34,7 @@ > > #include <linux/if_bridge.h> > > #include <linux/ctype.h> > > #include <linux/bpf.h> > > +#include <linux/btf.h> > > #include <linux/auxiliary_bus.h> > > #include <linux/avf/virtchnl.h> > > #include <linux/cpu_rmap.h> > > @@ -544,6 +545,13 @@ struct ice_pf { > > struct ice_netdev_priv { > > struct ice_vsi *vsi; > > struct ice_repr *repr; > > + /* indirect block callbacks on registered higher level devices > > + * (e.g. tunnel devices) > > + * > > + * tc_indr_block_cb_priv_list is used to lookup indirect callback > > Nit: look up > > > + * private data > > + */ > > + struct list_head tc_indr_block_priv_list; > > }; > > /** > > diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c > > index 51e12e5896b2..600c8444d23b 100644 > > --- a/drivers/net/ethernet/intel/ice/ice_main.c > > +++ b/drivers/net/ethernet/intel/ice/ice_main.c > > @@ -55,6 +55,12 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type); > > static void ice_vsi_release_all(struct ice_pf *pf); > > +static int > > +ice_indr_setup_tc_cb(struct net_device *netdev, struct Qdisc *sch, > > + void *cb_priv, enum tc_setup_type type, void *type_data, > > + void *data, > > + void (*cleanup)(struct flow_block_cb *block_cb)); > > + > > bool netif_is_ice(struct net_device *dev) > > { > > return dev && (dev->netdev_ops == &ice_netdev_ops); > > @@ -3399,6 +3405,63 @@ ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto, > > return ret; > > } > > +/** > > + * ice_rep_indr_tc_block_unbind > > + * @cb_priv: indirection block private data > > + */ > > +static void ice_rep_indr_tc_block_unbind(void *cb_priv) > > +{ > > + struct ice_indr_block_priv *indr_priv = cb_priv; > > + > > + list_del(&indr_priv->list); > > + kfree(indr_priv); > > +} > > + > > +/** > > + * ice_tc_indir_block_unregister - Unregister TC indirect block notifications > > + * @vsi: VSI struct which has the netdev > > + */ > > +static void ice_tc_indir_block_unregister(struct ice_vsi *vsi) > > +{ > > + struct ice_netdev_priv *np = netdev_priv(vsi->netdev); > > + > > + flow_indr_dev_unregister(ice_indr_setup_tc_cb, np, > > + ice_rep_indr_tc_block_unbind); > > +} > > + > > +/** > > + * ice_tc_indir_block_remove - clean indirect TC block notifications > > + * @pf: PF structure > > + */ > > +static void ice_tc_indir_block_remove(struct ice_pf *pf) > > +{ > > + struct ice_vsi *pf_vsi = ice_get_main_vsi(pf); > > + > > + if (!pf_vsi) > > + return; > > + > > + ice_tc_indir_block_unregister(pf_vsi); > > +} > > + > > +/** > > + * ice_tc_indir_block_register - Register TC indirect block notifications > > + * @vsi: VSI struct which has the netdev > > + * > > + * Returns 0 on success, negative value on failure > > + */ > > +static int ice_tc_indir_block_register(struct ice_vsi *vsi) > > +{ > > + struct ice_netdev_priv *np; > > + > > + if (!vsi || !vsi->netdev) > > + return -EINVAL; > > + > > + np = netdev_priv(vsi->netdev); > > + > > + INIT_LIST_HEAD(&np->tc_indr_block_priv_list); > > + return flow_indr_dev_register(ice_indr_setup_tc_cb, np); > > +} > > + > > /** > > * ice_setup_pf_sw - Setup the HW switch on startup or after reset > > * @pf: board private structure > > @@ -3407,6 +3470,7 @@ ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto, > > */ > > static int ice_setup_pf_sw(struct ice_pf *pf) > > { > > + struct device *dev = ice_pf_to_dev(pf); > > struct ice_vsi *vsi; > > int status = 0; > > @@ -3425,6 +3489,13 @@ static int ice_setup_pf_sw(struct ice_pf *pf) > > /* netdev has to be configured before setting frame size */ > > ice_vsi_cfg_frame_size(vsi); > > + /* init indirect block notifications */ > > + status = ice_tc_indir_block_register(vsi); > > + if (status) { > > + dev_err(dev, "Failed to register netdev notifier\n"); > > + goto unroll_cfg_netdev; > > + } > > + > > /* Setup DCB netlink interface */ > > ice_dcbnl_setup(vsi); > > @@ -3436,7 +3507,7 @@ static int ice_setup_pf_sw(struct ice_pf *pf) > > status = ice_set_cpu_rx_rmap(vsi); > > if (status) { > > - dev_err(ice_pf_to_dev(pf), "Failed to set CPU Rx map VSI %d error %d\n", > > + dev_err(dev, "Failed to set CPU Rx map VSI %d error %d\n", > > vsi->vsi_num, status); > > status = -EINVAL; > > goto unroll_napi_add; > > @@ -3449,8 +3520,9 @@ static int ice_setup_pf_sw(struct ice_pf *pf) > > free_cpu_rx_map: > > ice_free_cpu_rx_rmap(vsi); > > - > > unroll_napi_add: > > + ice_tc_indir_block_unregister(vsi); > > +unroll_cfg_netdev: > > if (vsi) { > > ice_napi_del(vsi); > > if (vsi->netdev) { > > @@ -4727,6 +4799,8 @@ static void ice_remove(struct pci_dev *pdev) > > msleep(100); > > } > > + ice_tc_indir_block_remove(pf); > > + > > if (test_bit(ICE_FLAG_SRIOV_ENA, pf->flags)) { > > set_bit(ICE_VF_RESETS_DISABLED, pf->state); > > ice_free_vfs(pf); > > @@ -7272,6 +7346,126 @@ ice_setup_tc(struct net_device *netdev, enum tc_setup_type type, > > return -EOPNOTSUPP; > > } > > +static struct ice_indr_block_priv * > > +ice_indr_block_priv_lookup(struct ice_netdev_priv *np, > > + struct net_device *netdev) > > +{ > > + struct ice_indr_block_priv *cb_priv; > > + > > + /* All callback list access should be protected by RTNL. */ > > + ASSERT_RTNL(); > > + > > + list_for_each_entry(cb_priv, &np->tc_indr_block_priv_list, list) { > > + if (!cb_priv->netdev) > > + return NULL; > > + if (cb_priv->netdev == netdev) > > + return cb_priv; > > + } > > + return NULL; > > +} > > + > > +static int > > +ice_indr_setup_block_cb(enum tc_setup_type type, void *type_data, > > + void *indr_priv) > > +{ > > + struct ice_indr_block_priv *priv = indr_priv; > > + struct ice_netdev_priv *np = priv->np; > > + > > + switch (type) { > > + case TC_SETUP_CLSFLOWER: > > + return ice_setup_tc_cls_flower(np, priv->netdev, > > + (struct flow_cls_offload *) > > + type_data); > > + default: > > + return -EOPNOTSUPP; > > + } > > +} > > + > > +static int > > +ice_indr_setup_tc_block(struct net_device *netdev, struct Qdisc *sch, > > + struct ice_netdev_priv *np, > > + struct flow_block_offload *f, void *data, > > + void (*cleanup)(struct flow_block_cb *block_cb)) > > +{ > > + struct ice_indr_block_priv *indr_priv; > > + struct flow_block_cb *block_cb; > > + > > + int tunnel_type = 0; > > + > > + if (tunnel_type != TNL_VXLAN && tunnel_type != TNL_GENEVE && > > + !(is_vlan_dev(netdev) && > > + vlan_dev_real_dev(netdev) == np->vsi->netdev)) > > + return -EOPNOTSUPP; > > + > > + if (f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS) > > Could you please document in the commit message, why other types are not > supported? > There are no supported, becasue we can't offload it. For now we only support ingress type of filters. Thanks for Your review. > > + return -EOPNOTSUPP; > > + > > + switch (f->command) { > > + case FLOW_BLOCK_BIND: > > + indr_priv = ice_indr_block_priv_lookup(np, netdev); > > + if (indr_priv) > > + return -EEXIST; > > + > > + indr_priv = kzalloc(sizeof(*indr_priv), GFP_KERNEL); > > + if (!indr_priv) > > + return -ENOMEM; > > + > > + indr_priv->netdev = netdev; > > + indr_priv->np = np; > > + list_add(&indr_priv->list, &np->tc_indr_block_priv_list); > > + > > + block_cb = > > + flow_indr_block_cb_alloc(ice_indr_setup_block_cb, > > + indr_priv, indr_priv, > > + ice_rep_indr_tc_block_unbind, > > + f, netdev, sch, data, np, > > + cleanup); > > + > > + if (IS_ERR(block_cb)) { > > + list_del(&indr_priv->list); > > + kfree(indr_priv); > > + return PTR_ERR(block_cb); > > + } > > + flow_block_cb_add(block_cb, f); > > + list_add_tail(&block_cb->driver_list, &ice_block_cb_list); > > + return 0; > > + case FLOW_BLOCK_UNBIND: > > + indr_priv = ice_indr_block_priv_lookup(np, netdev); > > + if (!indr_priv) > > + return -ENOENT; > > + > > + block_cb = flow_block_cb_lookup(f->block, > > + ice_indr_setup_block_cb, > > + indr_priv); > > + if (!block_cb) > > + return -ENOENT; > > + > > + flow_indr_block_cb_remove(block_cb, f); > > + > > + list_del(&block_cb->driver_list); > > + return 0; > > + default: > > + return -EOPNOTSUPP; > > + } > > + return 0; > > +} > > + > > +static int > > +ice_indr_setup_tc_cb(struct net_device *netdev, struct Qdisc *sch, > > + void *cb_priv, enum tc_setup_type type, void *type_data, > > + void *data, > > + void (*cleanup)(struct flow_block_cb *block_cb)) > > +{ > > + switch (type) { > > + case TC_SETUP_BLOCK: > > + return ice_indr_setup_tc_block(netdev, sch, cb_priv, type_data, > > + data, cleanup); > > + > > + default: > > + return -EOPNOTSUPP; > > + } > > +} > > + > > /** > > * ice_open - Called when a network interface becomes active > > * @netdev: network interface device structure > > diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.h b/drivers/net/ethernet/intel/ice/ice_tc_lib.h > > index d90e9e37ae25..332c70342f1f 100644 > > --- a/drivers/net/ethernet/intel/ice/ice_tc_lib.h > > +++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.h > > @@ -23,6 +23,12 @@ > > #define ICE_TC_FLWR_FIELD_ENC_DST_MAC BIT(16) > > #define ICE_TC_FLWR_FIELD_ETH_TYPE_ID BIT(17) > > +struct ice_indr_block_priv { > > + struct net_device *netdev; > > + struct ice_netdev_priv *np; > > + struct list_head list; > > +}; > > + > > struct ice_tc_flower_action { > > u32 tc_class; > > enum ice_sw_fwd_act_type fltr_act; > > > > Acked-by: Paul Menzel <pmenzel@molgen.mpg.de> > > > Kind regards, > > Paul > _______________________________________________ > Intel-wired-lan mailing list > Intel-wired-lan@osuosl.org > https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
>-----Original Message----- >From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of >Tony Nguyen >Sent: Wednesday, October 13, 2021 12:01 AM >To: intel-wired-lan@lists.osuosl.org >Subject: [Intel-wired-lan] [next-queue v2 1/4] ice: support for indirect >notification > >From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> > >Implement indirect notification mechanism to support offloading TC rules on >tunnel devices. > >Keep indirect block list in netdev priv. Notification will call setting tc cls flower >function. > >Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> >--- > drivers/net/ethernet/intel/ice/ice.h | 8 + > drivers/net/ethernet/intel/ice/ice_main.c | 198 +++++++++++++++++++- > drivers/net/ethernet/intel/ice/ice_tc_lib.h | 6 + > 3 files changed, 210 insertions(+), 2 deletions(-) > Tested-by: Sandeep Penigalapati <sandeep.penigalapati@intel.com>
diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h index 5c651c7c58bf..afd46ef70bd8 100644 --- a/drivers/net/ethernet/intel/ice/ice.h +++ b/drivers/net/ethernet/intel/ice/ice.h @@ -34,6 +34,7 @@ #include <linux/if_bridge.h> #include <linux/ctype.h> #include <linux/bpf.h> +#include <linux/btf.h> #include <linux/auxiliary_bus.h> #include <linux/avf/virtchnl.h> #include <linux/cpu_rmap.h> @@ -544,6 +545,13 @@ struct ice_pf { struct ice_netdev_priv { struct ice_vsi *vsi; struct ice_repr *repr; + /* indirect block callbacks on registered higher level devices + * (e.g. tunnel devices) + * + * tc_indr_block_cb_priv_list is used to lookup indirect callback + * private data + */ + struct list_head tc_indr_block_priv_list; }; /** diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 51e12e5896b2..600c8444d23b 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -55,6 +55,12 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type); static void ice_vsi_release_all(struct ice_pf *pf); +static int +ice_indr_setup_tc_cb(struct net_device *netdev, struct Qdisc *sch, + void *cb_priv, enum tc_setup_type type, void *type_data, + void *data, + void (*cleanup)(struct flow_block_cb *block_cb)); + bool netif_is_ice(struct net_device *dev) { return dev && (dev->netdev_ops == &ice_netdev_ops); @@ -3399,6 +3405,63 @@ ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto, return ret; } +/** + * ice_rep_indr_tc_block_unbind + * @cb_priv: indirection block private data + */ +static void ice_rep_indr_tc_block_unbind(void *cb_priv) +{ + struct ice_indr_block_priv *indr_priv = cb_priv; + + list_del(&indr_priv->list); + kfree(indr_priv); +} + +/** + * ice_tc_indir_block_unregister - Unregister TC indirect block notifications + * @vsi: VSI struct which has the netdev + */ +static void ice_tc_indir_block_unregister(struct ice_vsi *vsi) +{ + struct ice_netdev_priv *np = netdev_priv(vsi->netdev); + + flow_indr_dev_unregister(ice_indr_setup_tc_cb, np, + ice_rep_indr_tc_block_unbind); +} + +/** + * ice_tc_indir_block_remove - clean indirect TC block notifications + * @pf: PF structure + */ +static void ice_tc_indir_block_remove(struct ice_pf *pf) +{ + struct ice_vsi *pf_vsi = ice_get_main_vsi(pf); + + if (!pf_vsi) + return; + + ice_tc_indir_block_unregister(pf_vsi); +} + +/** + * ice_tc_indir_block_register - Register TC indirect block notifications + * @vsi: VSI struct which has the netdev + * + * Returns 0 on success, negative value on failure + */ +static int ice_tc_indir_block_register(struct ice_vsi *vsi) +{ + struct ice_netdev_priv *np; + + if (!vsi || !vsi->netdev) + return -EINVAL; + + np = netdev_priv(vsi->netdev); + + INIT_LIST_HEAD(&np->tc_indr_block_priv_list); + return flow_indr_dev_register(ice_indr_setup_tc_cb, np); +} + /** * ice_setup_pf_sw - Setup the HW switch on startup or after reset * @pf: board private structure @@ -3407,6 +3470,7 @@ ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto, */ static int ice_setup_pf_sw(struct ice_pf *pf) { + struct device *dev = ice_pf_to_dev(pf); struct ice_vsi *vsi; int status = 0; @@ -3425,6 +3489,13 @@ static int ice_setup_pf_sw(struct ice_pf *pf) /* netdev has to be configured before setting frame size */ ice_vsi_cfg_frame_size(vsi); + /* init indirect block notifications */ + status = ice_tc_indir_block_register(vsi); + if (status) { + dev_err(dev, "Failed to register netdev notifier\n"); + goto unroll_cfg_netdev; + } + /* Setup DCB netlink interface */ ice_dcbnl_setup(vsi); @@ -3436,7 +3507,7 @@ static int ice_setup_pf_sw(struct ice_pf *pf) status = ice_set_cpu_rx_rmap(vsi); if (status) { - dev_err(ice_pf_to_dev(pf), "Failed to set CPU Rx map VSI %d error %d\n", + dev_err(dev, "Failed to set CPU Rx map VSI %d error %d\n", vsi->vsi_num, status); status = -EINVAL; goto unroll_napi_add; @@ -3449,8 +3520,9 @@ static int ice_setup_pf_sw(struct ice_pf *pf) free_cpu_rx_map: ice_free_cpu_rx_rmap(vsi); - unroll_napi_add: + ice_tc_indir_block_unregister(vsi); +unroll_cfg_netdev: if (vsi) { ice_napi_del(vsi); if (vsi->netdev) { @@ -4727,6 +4799,8 @@ static void ice_remove(struct pci_dev *pdev) msleep(100); } + ice_tc_indir_block_remove(pf); + if (test_bit(ICE_FLAG_SRIOV_ENA, pf->flags)) { set_bit(ICE_VF_RESETS_DISABLED, pf->state); ice_free_vfs(pf); @@ -7272,6 +7346,126 @@ ice_setup_tc(struct net_device *netdev, enum tc_setup_type type, return -EOPNOTSUPP; } +static struct ice_indr_block_priv * +ice_indr_block_priv_lookup(struct ice_netdev_priv *np, + struct net_device *netdev) +{ + struct ice_indr_block_priv *cb_priv; + + /* All callback list access should be protected by RTNL. */ + ASSERT_RTNL(); + + list_for_each_entry(cb_priv, &np->tc_indr_block_priv_list, list) { + if (!cb_priv->netdev) + return NULL; + if (cb_priv->netdev == netdev) + return cb_priv; + } + return NULL; +} + +static int +ice_indr_setup_block_cb(enum tc_setup_type type, void *type_data, + void *indr_priv) +{ + struct ice_indr_block_priv *priv = indr_priv; + struct ice_netdev_priv *np = priv->np; + + switch (type) { + case TC_SETUP_CLSFLOWER: + return ice_setup_tc_cls_flower(np, priv->netdev, + (struct flow_cls_offload *) + type_data); + default: + return -EOPNOTSUPP; + } +} + +static int +ice_indr_setup_tc_block(struct net_device *netdev, struct Qdisc *sch, + struct ice_netdev_priv *np, + struct flow_block_offload *f, void *data, + void (*cleanup)(struct flow_block_cb *block_cb)) +{ + struct ice_indr_block_priv *indr_priv; + struct flow_block_cb *block_cb; + + int tunnel_type = 0; + + if (tunnel_type != TNL_VXLAN && tunnel_type != TNL_GENEVE && + !(is_vlan_dev(netdev) && + vlan_dev_real_dev(netdev) == np->vsi->netdev)) + return -EOPNOTSUPP; + + if (f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS) + return -EOPNOTSUPP; + + switch (f->command) { + case FLOW_BLOCK_BIND: + indr_priv = ice_indr_block_priv_lookup(np, netdev); + if (indr_priv) + return -EEXIST; + + indr_priv = kzalloc(sizeof(*indr_priv), GFP_KERNEL); + if (!indr_priv) + return -ENOMEM; + + indr_priv->netdev = netdev; + indr_priv->np = np; + list_add(&indr_priv->list, &np->tc_indr_block_priv_list); + + block_cb = + flow_indr_block_cb_alloc(ice_indr_setup_block_cb, + indr_priv, indr_priv, + ice_rep_indr_tc_block_unbind, + f, netdev, sch, data, np, + cleanup); + + if (IS_ERR(block_cb)) { + list_del(&indr_priv->list); + kfree(indr_priv); + return PTR_ERR(block_cb); + } + flow_block_cb_add(block_cb, f); + list_add_tail(&block_cb->driver_list, &ice_block_cb_list); + return 0; + case FLOW_BLOCK_UNBIND: + indr_priv = ice_indr_block_priv_lookup(np, netdev); + if (!indr_priv) + return -ENOENT; + + block_cb = flow_block_cb_lookup(f->block, + ice_indr_setup_block_cb, + indr_priv); + if (!block_cb) + return -ENOENT; + + flow_indr_block_cb_remove(block_cb, f); + + list_del(&block_cb->driver_list); + return 0; + default: + return -EOPNOTSUPP; + } + return 0; +} + +static int +ice_indr_setup_tc_cb(struct net_device *netdev, struct Qdisc *sch, + void *cb_priv, enum tc_setup_type type, void *type_data, + void *data, + void (*cleanup)(struct flow_block_cb *block_cb)) +{ + switch (type) { + case TC_SETUP_BLOCK: + return ice_indr_setup_tc_block(netdev, sch, cb_priv, type_data, + data, cleanup); + + default: + return -EOPNOTSUPP; + } +} + /** * ice_open - Called when a network interface becomes active * @netdev: network interface device structure diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.h b/drivers/net/ethernet/intel/ice/ice_tc_lib.h index d90e9e37ae25..332c70342f1f 100644 --- a/drivers/net/ethernet/intel/ice/ice_tc_lib.h +++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.h @@ -23,6 +23,12 @@ #define ICE_TC_FLWR_FIELD_ENC_DST_MAC BIT(16) #define ICE_TC_FLWR_FIELD_ETH_TYPE_ID BIT(17) +struct ice_indr_block_priv { + struct net_device *netdev; + struct ice_netdev_priv *np; + struct list_head list; +}; + struct ice_tc_flower_action { u32 tc_class; enum ice_sw_fwd_act_type fltr_act;