| Message ID | 8a4781511ab6e3cd280e944eef69158954f1a15f.1676385351.git.lorenzo@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b6a4103c3538dec0a9ec8a6d1de7c009e428e7ab |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2,net-next] ice: update xdp_features with xdp multi-buff | expand |
On Tue, Feb 14, 2023 at 03:39:27PM +0100, Lorenzo Bianconi wrote: > Now ice driver supports xdp multi-buffer so add it to xdp_features. > Check vsi type before setting xdp_features flag. > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > --- > Changes since v1: > - rebase on top of net-next > - check vsi type before setting xdp_features flag > --- > drivers/net/ethernet/intel/ice/ice_main.c | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c > index 0712c1055aea..4994a0e5a668 100644 > --- a/drivers/net/ethernet/intel/ice/ice_main.c > +++ b/drivers/net/ethernet/intel/ice/ice_main.c > @@ -2912,7 +2912,7 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog, > if (xdp_ring_err) > NL_SET_ERR_MSG_MOD(extack, "Setting up XDP Tx resources failed"); > } > - xdp_features_set_redirect_target(vsi->netdev, false); > + xdp_features_set_redirect_target(vsi->netdev, true); > /* reallocate Rx queues that are used for zero-copy */ > xdp_ring_err = ice_realloc_zc_buf(vsi, true); > if (xdp_ring_err) > @@ -3333,10 +3333,11 @@ static void ice_napi_add(struct ice_vsi *vsi) > > /** > * ice_set_ops - set netdev and ethtools ops for the given netdev > - * @netdev: netdev instance > + * @vsi: the VSI associated with the new netdev > */ > -static void ice_set_ops(struct net_device *netdev) > +static void ice_set_ops(struct ice_vsi *vsi) > { > + struct net_device *netdev = vsi->netdev; > struct ice_pf *pf = ice_netdev_to_pf(netdev); > > if (ice_is_safe_mode(pf)) { > @@ -3348,6 +3349,13 @@ static void ice_set_ops(struct net_device *netdev) > netdev->netdev_ops = &ice_netdev_ops; > netdev->udp_tunnel_nic_info = &pf->hw.udp_tunnel_nic; > ice_set_ethtool_ops(netdev); > + > + if (vsi->type != ICE_VSI_PF) > + return; > + > + netdev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | > + NETDEV_XDP_ACT_XSK_ZEROCOPY | > + NETDEV_XDP_ACT_RX_SG; FWIW we do support frags in ndo_xdp_xmit() now so NETDEV_XDP_ACT_NDO_XMIT_SG should be set. > } > > /** > @@ -4568,9 +4576,7 @@ static int ice_cfg_netdev(struct ice_vsi *vsi) > np->vsi = vsi; > > ice_set_netdev_features(netdev); > - netdev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | > - NETDEV_XDP_ACT_XSK_ZEROCOPY; > - ice_set_ops(netdev); > + ice_set_ops(vsi); > > if (vsi->type == ICE_VSI_PF) { > SET_NETDEV_DEV(netdev, ice_pf_to_dev(vsi->back)); > -- > 2.39.1 > > _______________________________________________ > Intel-wired-lan mailing list > Intel-wired-lan@osuosl.org > https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
> On Tue, Feb 14, 2023 at 03:39:27PM +0100, Lorenzo Bianconi wrote: > > Now ice driver supports xdp multi-buffer so add it to xdp_features. > > Check vsi type before setting xdp_features flag. > > > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > > --- > > Changes since v1: > > - rebase on top of net-next > > - check vsi type before setting xdp_features flag > > --- > > drivers/net/ethernet/intel/ice/ice_main.c | 18 ++++++++++++------ > > 1 file changed, 12 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c > > index 0712c1055aea..4994a0e5a668 100644 > > --- a/drivers/net/ethernet/intel/ice/ice_main.c > > +++ b/drivers/net/ethernet/intel/ice/ice_main.c > > @@ -2912,7 +2912,7 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog, > > if (xdp_ring_err) > > NL_SET_ERR_MSG_MOD(extack, "Setting up XDP Tx resources failed"); > > } > > - xdp_features_set_redirect_target(vsi->netdev, false); > > + xdp_features_set_redirect_target(vsi->netdev, true); > > /* reallocate Rx queues that are used for zero-copy */ > > xdp_ring_err = ice_realloc_zc_buf(vsi, true); > > if (xdp_ring_err) > > @@ -3333,10 +3333,11 @@ static void ice_napi_add(struct ice_vsi *vsi) > > > > /** > > * ice_set_ops - set netdev and ethtools ops for the given netdev > > - * @netdev: netdev instance > > + * @vsi: the VSI associated with the new netdev > > */ > > -static void ice_set_ops(struct net_device *netdev) > > +static void ice_set_ops(struct ice_vsi *vsi) > > { > > + struct net_device *netdev = vsi->netdev; > > struct ice_pf *pf = ice_netdev_to_pf(netdev); > > > > if (ice_is_safe_mode(pf)) { > > @@ -3348,6 +3349,13 @@ static void ice_set_ops(struct net_device *netdev) > > netdev->netdev_ops = &ice_netdev_ops; > > netdev->udp_tunnel_nic_info = &pf->hw.udp_tunnel_nic; > > ice_set_ethtool_ops(netdev); > > + > > + if (vsi->type != ICE_VSI_PF) > > + return; > > + > > + netdev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | > > + NETDEV_XDP_ACT_XSK_ZEROCOPY | > > + NETDEV_XDP_ACT_RX_SG; > > FWIW we do support frags in ndo_xdp_xmit() now so > NETDEV_XDP_ACT_NDO_XMIT_SG should be set. yep, I have enabled them in ice_xdp_setup_prog() setting support_sg to true in xdp_features_set_redirect_target(). Regards, Lorenzo > > > } > > > > /** > > @@ -4568,9 +4576,7 @@ static int ice_cfg_netdev(struct ice_vsi *vsi) > > np->vsi = vsi; > > > > ice_set_netdev_features(netdev); > > - netdev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | > > - NETDEV_XDP_ACT_XSK_ZEROCOPY; > > - ice_set_ops(netdev); > > + ice_set_ops(vsi); > > > > if (vsi->type == ICE_VSI_PF) { > > SET_NETDEV_DEV(netdev, ice_pf_to_dev(vsi->back)); > > -- > > 2.39.1 > > > > _______________________________________________ > > Intel-wired-lan mailing list > > Intel-wired-lan@osuosl.org > > https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
On Tue, Feb 14, 2023 at 05:49:35PM +0100, Lorenzo Bianconi wrote: > > On Tue, Feb 14, 2023 at 03:39:27PM +0100, Lorenzo Bianconi wrote: > > > Now ice driver supports xdp multi-buffer so add it to xdp_features. > > > Check vsi type before setting xdp_features flag. > > > > > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > > > --- > > > Changes since v1: > > > - rebase on top of net-next > > > - check vsi type before setting xdp_features flag > > > --- > > > drivers/net/ethernet/intel/ice/ice_main.c | 18 ++++++++++++------ > > > 1 file changed, 12 insertions(+), 6 deletions(-) > > > > > > diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c > > > index 0712c1055aea..4994a0e5a668 100644 > > > --- a/drivers/net/ethernet/intel/ice/ice_main.c > > > +++ b/drivers/net/ethernet/intel/ice/ice_main.c > > > @@ -2912,7 +2912,7 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog, > > > if (xdp_ring_err) > > > NL_SET_ERR_MSG_MOD(extack, "Setting up XDP Tx resources failed"); > > > } > > > - xdp_features_set_redirect_target(vsi->netdev, false); > > > + xdp_features_set_redirect_target(vsi->netdev, true); > > > /* reallocate Rx queues that are used for zero-copy */ > > > xdp_ring_err = ice_realloc_zc_buf(vsi, true); > > > if (xdp_ring_err) > > > @@ -3333,10 +3333,11 @@ static void ice_napi_add(struct ice_vsi *vsi) > > > > > > /** > > > * ice_set_ops - set netdev and ethtools ops for the given netdev > > > - * @netdev: netdev instance > > > + * @vsi: the VSI associated with the new netdev > > > */ > > > -static void ice_set_ops(struct net_device *netdev) > > > +static void ice_set_ops(struct ice_vsi *vsi) > > > { > > > + struct net_device *netdev = vsi->netdev; > > > struct ice_pf *pf = ice_netdev_to_pf(netdev); > > > > > > if (ice_is_safe_mode(pf)) { > > > @@ -3348,6 +3349,13 @@ static void ice_set_ops(struct net_device *netdev) > > > netdev->netdev_ops = &ice_netdev_ops; > > > netdev->udp_tunnel_nic_info = &pf->hw.udp_tunnel_nic; > > > ice_set_ethtool_ops(netdev); > > > + > > > + if (vsi->type != ICE_VSI_PF) > > > + return; > > > + > > > + netdev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | > > > + NETDEV_XDP_ACT_XSK_ZEROCOPY | > > > + NETDEV_XDP_ACT_RX_SG; > > > > FWIW we do support frags in ndo_xdp_xmit() now so > > NETDEV_XDP_ACT_NDO_XMIT_SG should be set. > > yep, I have enabled them in ice_xdp_setup_prog() setting support_sg to true in > xdp_features_set_redirect_target(). oops missed this part, sorry:) Acked-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > > Regards, > Lorenzo > > > > > > } > > > > > > /** > > > @@ -4568,9 +4576,7 @@ static int ice_cfg_netdev(struct ice_vsi *vsi) > > > np->vsi = vsi; > > > > > > ice_set_netdev_features(netdev); > > > - netdev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | > > > - NETDEV_XDP_ACT_XSK_ZEROCOPY; > > > - ice_set_ops(netdev); > > > + ice_set_ops(vsi); > > > > > > if (vsi->type == ICE_VSI_PF) { > > > SET_NETDEV_DEV(netdev, ice_pf_to_dev(vsi->back)); > > > -- > > > 2.39.1 > > > > > > _______________________________________________ > > > Intel-wired-lan mailing list > > > Intel-wired-lan@osuosl.org > > > https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Tue, 14 Feb 2023 15:39:27 +0100 you wrote: > Now ice driver supports xdp multi-buffer so add it to xdp_features. > Check vsi type before setting xdp_features flag. > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > --- > Changes since v1: > - rebase on top of net-next > - check vsi type before setting xdp_features flag > > [...] Here is the summary with links: - [v2,net-next] ice: update xdp_features with xdp multi-buff https://git.kernel.org/netdev/net-next/c/b6a4103c3538 You are awesome, thank you!
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 0712c1055aea..4994a0e5a668 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -2912,7 +2912,7 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog, if (xdp_ring_err) NL_SET_ERR_MSG_MOD(extack, "Setting up XDP Tx resources failed"); } - xdp_features_set_redirect_target(vsi->netdev, false); + xdp_features_set_redirect_target(vsi->netdev, true); /* reallocate Rx queues that are used for zero-copy */ xdp_ring_err = ice_realloc_zc_buf(vsi, true); if (xdp_ring_err) @@ -3333,10 +3333,11 @@ static void ice_napi_add(struct ice_vsi *vsi) /** * ice_set_ops - set netdev and ethtools ops for the given netdev - * @netdev: netdev instance + * @vsi: the VSI associated with the new netdev */ -static void ice_set_ops(struct net_device *netdev) +static void ice_set_ops(struct ice_vsi *vsi) { + struct net_device *netdev = vsi->netdev; struct ice_pf *pf = ice_netdev_to_pf(netdev); if (ice_is_safe_mode(pf)) { @@ -3348,6 +3349,13 @@ static void ice_set_ops(struct net_device *netdev) netdev->netdev_ops = &ice_netdev_ops; netdev->udp_tunnel_nic_info = &pf->hw.udp_tunnel_nic; ice_set_ethtool_ops(netdev); + + if (vsi->type != ICE_VSI_PF) + return; + + netdev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | + NETDEV_XDP_ACT_XSK_ZEROCOPY | + NETDEV_XDP_ACT_RX_SG; } /** @@ -4568,9 +4576,7 @@ static int ice_cfg_netdev(struct ice_vsi *vsi) np->vsi = vsi; ice_set_netdev_features(netdev); - netdev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | - NETDEV_XDP_ACT_XSK_ZEROCOPY; - ice_set_ops(netdev); + ice_set_ops(vsi); if (vsi->type == ICE_VSI_PF) { SET_NETDEV_DEV(netdev, ice_pf_to_dev(vsi->back));
Now ice driver supports xdp multi-buffer so add it to xdp_features. Check vsi type before setting xdp_features flag. Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> --- Changes since v1: - rebase on top of net-next - check vsi type before setting xdp_features flag --- drivers/net/ethernet/intel/ice/ice_main.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)