update xdp_features flag according to NIC re-configuration
Subsystems (9)
cover update xdp_features flag according to NIC re-configuration
Take into account possible NIC configuration changes (e.g. LRO or tx/rx queues reconfiguration) setting device xdp_features flag.
Introduce xdp_set_features_flag utility routine.
Lorenzo Bianconi (6):
tools: ynl: fix render-max for flags definition
xdp: add xdp_set_features_flag utility routine
net: thunderx: take into account xdp_features setting tx/rx queues
net: ena: take into account xdp_features setting tx/rx queues
veth: take into account device reconfiguration for xdp_features flag net/mlx5e: take into account device reconfiguration for xdp_features
flag
Documentation/netlink/specs/netdev.yaml | 1 + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 15 +++++-- drivers/net/ethernet/amazon/ena/ena_netdev.c | 6 ++- .../ethernet/cavium/thunder/nicvf_ethtool.c | 17 ++++--- .../net/ethernet/cavium/thunder/nicvf_main.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 + .../ethernet/mellanox/mlx5/core/en_ethtool.c | 10 ++++- .../net/ethernet/mellanox/mlx5/core/en_main.c | 45 ++++++++++++++++--- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 3 ++ drivers/net/veth.c | 42 +++++++++++++++-- include/net/xdp.h | 11 +++++ include/uapi/linux/netdev.h | 2 + net/core/xdp.c | 26 ++++++++--- tools/include/uapi/linux/netdev.h | 2 + tools/net/ynl/ynl-gen-c.py | 11 +++-- 15 files changed, 162 insertions(+), 34 deletions(-)
Signature · 1 line
2.39.2
RFC 1/6 tools: ynl: fix render-max for flags definition
Properly manage render-max property for flags definition type introducing mask value and setting it to (last_element << 1) - 1 instead of adding max value set to last_element + 1
--- tools/net/ynl/ynl-gen-c.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
tools/net/ynl/ynl-gen-c.py +8 -3
@@ -1995,9 +1995,14 @@ def render_uapi(family, cw): if const.get('render-max', False): cw.nl() - max_name = c_upper(name_pfx + 'max') - cw.p('__' + max_name + ',') - cw.p(max_name + ' = (__' + max_name + ' - 1)') + if const['type'] == 'flags': + max_name = c_upper(name_pfx + 'mask') + max_val = f' = {(entry.user_value() << 1) - 1},' + cw.p(max_name + max_val) + else: + max_name = c_upper(name_pfx + 'max') + cw.p('__' + max_name + ',') + cw.p(max_name + ' = (__' + max_name + ' - 1)') cw.block_end(line=';') cw.nl() elif const['type'] == 'const':
Signature · 1 line
2.39.2
Jakub Kicinski
maintainerRe: [RFC net-next 1/6] tools: ynl: fix render-max for flags definition
tools/net/ynl/ynl-gen-c.py def render_uapi(family, cw): · line 2001
Quoted 4 lines · On Thu, 23 Feb 2023 13:11:33 +0100 Lorenzo Bianconi wrote:
tools/net/ynl/ynl-gen-c.py +4
-0+ if const['type'] == 'flags': + max_name = c_upper(name_pfx + 'mask') + max_val = f' = {(entry.user_value() << 1) - 1},' + cw.p(max_name + max_val)
Could you use EnumSet::get_mask instead() ?
I think it also needs to be fixed to actually walk the elements and combine the user_value()s rather than count them and assume there are no gaps.
Re: [RFC net-next 1/6] tools: ynl: fix render-max for flags definition
Quoted 7 lines · On Thu, 23 Feb 2023 13:11:33 +0100 Lorenzo Bianconi wrote:
tools/net/ynl/ynl-gen-c.py def render_uapi(family, cw): · line 2001
Quoted 4 lines
tools/net/ynl/ynl-gen-c.py +4
-0+ if const['type'] == 'flags': + max_name = c_upper(name_pfx + 'mask') + max_val = f' = {(entry.user_value() << 1) - 1},' + cw.p(max_name + max_val)Could you use
EnumSet::get_maskinstead()?
ack, I will fix it.
Quoted 4 lines
I think it also needs to be fixed to actually walk the elements and combine the user_value()s rather than count them and assume there are no gaps.
Do you mean get_mask()?
Regards,
Lorenzo
Jakub Kicinski
maintainerRe: [RFC net-next 1/6] tools: ynl: fix render-max for flags definition
Quoted 5 lines · On Wed, 1 Mar 2023 00:16:16 +0100 Lorenzo Bianconi wrote:
Quoted 3 lines
I think it also needs to be fixed to actually walk the elements and combine the user_value()s rather than count them and assume there are no gaps.
Do you mean
get_mask()?
Yup, get_mask() predates the ability to control the values of enum entries individually so while at it we should fix it.
Re: [RFC net-next 1/6] tools: ynl: fix render-max for flags definition
Quoted 9 lines · On Wed, 1 Mar 2023 00:16:16 +0100 Lorenzo Bianconi wrote:
Quoted 5 lines
Quoted 3 lines
I think it also needs to be fixed to actually walk the elements and combine the user_value()s rather than count them and assume there are no gaps.
Do you mean
get_mask()?Yup,
get_mask()predates the ability to control the values of enum entries individually so while at it we should fix it.
ack, I will add a separated patch to the series.
Regards,
Lorenzo
RFC 2/6 xdp: add xdp_set_features_flag utility routine
In reply to Lorenzo BianconiIntroduce xdp_set_features_flag utility routine in order to update dynamically xdp_features according to the dynamic hw configuration via ethtool (e.g. changing number of hw rx/tx queues).
Add xdp_clear_features_flag() in order to clear all xdp_feature flag.
--- Documentation/netlink/specs/netdev.yaml | 1 + include/net/xdp.h | 11 +++++++++++ include/uapi/linux/netdev.h | 2 ++ net/core/xdp.c | 26 ++++++++++++++++++------- tools/include/uapi/linux/netdev.h | 2 ++ 5 files changed, 35 insertions(+), 7 deletions(-)
Documentation/netlink/specs/netdev.yaml +1 -0
@@ -7,6 +7,7 @@ definitions: - type: flags name: xdp-act + render-max: true entries: - name: basic
include/net/xdp.h +11 -0
@@ -428,12 +428,18 @@ MAX_XDP_METADATA_KFUNC,#ifdef CONFIG_NET u32 bpf_xdp_metadata_kfunc_id (int id);bool bpf_dev_bound_kfunc_id (u32 btf_id); +void xdp_set_features_flag (struct net_device *dev,xdp_features_t val);void xdp_features_set_redirect_target (struct net_device *dev,bool support_sg);void xdp_features_clear_redirect_target (struct net_device *dev);#else static inline u32 bpf_xdp_metadata_kfunc_id (int id) {return 0 ; }static inline bool bpf_dev_bound_kfunc_id (u32 btf_id) {return false; } +static inline void +xdp_set_features_flag (struct net_device *dev,xdp_features_t val) +{ +} +static inline void xdp_features_set_redirect_target (struct net_device *dev,bool support_sg) {
@@ -445,4 +451,9 @@ xdp_features_clear_redirect_target(struct net_device *dev) }#endif +static inline void xdp_clear_features_flag (struct net_device *dev) +{ +xdp_set_features_flag (dev,0 ); +} +#endif /* __LINUX_NET_XDP_H__ */
include/uapi/linux/netdev.h +2 -0
@@ -33,6 +33,8 @@ enum netdev_xdp_act {NETDEV_XDP_ACT_HW_OFFLOAD =16 ,NETDEV_XDP_ACT_RX_SG =32 ,NETDEV_XDP_ACT_NDO_XMIT_SG =64 , + + NETDEV_XDP_ACT_MASK = 127, }; enum {
net/core/xdp.c +19 -7
@@ -774,20 +774,32 @@ static int __init xdp_metadata_init(void) }late_initcall (xdp_metadata_init); -void xdp_features_set_redirect_target (struct net_device *dev,bool support_sg) +void xdp_set_features_flag (struct net_device *dev,xdp_features_t val) { - dev->xdp_features |=NETDEV_XDP_ACT_NDO_XMIT ; -if (support_sg) - dev->xdp_features |=NETDEV_XDP_ACT_NDO_XMIT_SG ; + val &=NETDEV_XDP_ACT_MASK ; +if (dev->xdp_features == val) +return ; + dev->xdp_features = val;call_netdevice_notifiers (NETDEV_XDP_FEAT_CHANGE , dev); } +EXPORT_SYMBOL_GPL (xdp_set_features_flag); + +void xdp_features_set_redirect_target (struct net_device *dev,bool support_sg) +{ +xdp_features_t val = (dev->xdp_features |NETDEV_XDP_ACT_NDO_XMIT ); + +if (support_sg) + val |=NETDEV_XDP_ACT_NDO_XMIT_SG ; +xdp_set_features_flag (dev, val); +}EXPORT_SYMBOL_GPL (xdp_features_set_redirect_target);void xdp_features_clear_redirect_target (struct net_device *dev) { - dev->xdp_features &= ~(NETDEV_XDP_ACT_NDO_XMIT | -NETDEV_XDP_ACT_NDO_XMIT_SG ); -call_netdevice_notifiers (NETDEV_XDP_FEAT_CHANGE , dev); +xdp_features_t val = dev->xdp_features; + + val &= ~(NETDEV_XDP_ACT_NDO_XMIT |NETDEV_XDP_ACT_NDO_XMIT_SG ); +xdp_set_features_flag (dev, val); }EXPORT_SYMBOL_GPL (xdp_features_clear_redirect_target);
tools/include/uapi/linux/netdev.h +2 -0
@@ -33,6 +33,8 @@ enum netdev_xdp_act {NETDEV_XDP_ACT_HW_OFFLOAD =16 ,NETDEV_XDP_ACT_RX_SG =32 ,NETDEV_XDP_ACT_NDO_XMIT_SG =64 , + + NETDEV_XDP_ACT_MASK = 127, }; enum {
Signature · 1 line
2.39.2
RFC 3/6 net: thunderx: take into account xdp_features setting tx/rx queues
In reply to Lorenzo Bianconithunderx nic allows xdp just if enough hw queues are available for XDP. Take into account queues configuration setting xdp_features.
--- .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 17 +++++++++++------ .../net/ethernet/cavium/thunder/nicvf_main.c | 4 +++- 2 files changed, 14 insertions(+), 7 deletions(-)
drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c +11 -6
@@ -735,12 +735,17 @@ static int nicvf_set_channels(struct net_device *dev,if (channel->tx_count > nic->max_queues)return -EINVAL ; -if (nic->xdp_prog && - ((channel->tx_count + channel->rx_count) > nic->max_queues)) { -netdev_err (nic->netdev, -"XDP mode, RXQs + TXQs > Max %d\n" , - nic->max_queues); -return -EINVAL ; +if (channel->tx_count + channel->rx_count > nic->max_queues) { +if (nic->xdp_prog) { +netdev_err (nic->netdev, +"XDP mode, RXQs + TXQs > Max %d\n" , + nic->max_queues); +return -EINVAL ; + } + +xdp_clear_features_flag (nic->netdev); + }else if (!pass1_silicon (nic->pdev)) { +xdp_set_features_flag (dev,NETDEV_XDP_ACT_BASIC ); }if (if_up)
drivers/net/ethernet/cavium/thunder/nicvf_main.c +3 -1
@@ -2218,7 +2218,9 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) netdev->netdev_ops = &nicvf_netdev_ops; netdev->watchdog_timeo =NICVF_TX_TIMEOUT ; - netdev->xdp_features =NETDEV_XDP_ACT_BASIC ; +if (!pass1_silicon (nic->pdev) && + nic->rx_queues + nic->tx_queues <= nic->max_queues) + netdev->xdp_features =NETDEV_XDP_ACT_BASIC ;/* MTU range: 64 - 9200 */ netdev->min_mtu =NIC_HW_MIN_FRS ;
Signature · 1 line
2.39.2
RFC 4/6 net: ena: take into account xdp_features setting tx/rx queues
In reply to Lorenzo Bianconiena nic allows xdp just if enough hw queues are available for XDP. Take into account queues configuration setting xdp_features.
--- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 15 ++++++++++++--- drivers/net/ethernet/amazon/ena/ena_netdev.c | 6 ++++-- 2 files changed, 16 insertions(+), 5 deletions(-)
drivers/net/ethernet/amazon/ena/ena_ethtool.c +12 -3
@@ -850,11 +850,20 @@ static int ena_set_channels(struct net_device *netdev,struct ena_adapter *adapter =netdev_priv (netdev);u32 count = channels->combined_count;/* The check for max value is already done in ethtool */ -if (count <ENA_MIN_NUM_IO_QUEUES || - (ena_xdp_present (adapter) && - !ena_xdp_legal_queue_count (adapter, count))) +if (count <ENA_MIN_NUM_IO_QUEUES )return -EINVAL ; +if (!ena_xdp_legal_queue_count (adapter, count)) { +if (ena_xdp_present (adapter)) +return -EINVAL ; + +xdp_clear_features_flag (netdev); + }else { +xdp_set_features_flag (netdev, +NETDEV_XDP_ACT_BASIC | +NETDEV_XDP_ACT_REDIRECT ); + } +return ena_update_queue_count (adapter, count); }
drivers/net/ethernet/amazon/ena/ena_netdev.c +4 -2
@@ -4105,8 +4105,6 @@ static void ena_set_conf_feat_params(struct ena_adapter *adapter,/* Set offload features */ ena_set_dev_offloads (feat, netdev); - netdev->xdp_features =NETDEV_XDP_ACT_BASIC |NETDEV_XDP_ACT_REDIRECT ; - adapter->max_mtu = feat->dev_attr.max_mtu; netdev->max_mtu = adapter->max_mtu; netdev->min_mtu =ENA_MIN_MTU ;
@@ -4393,6 +4391,10 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)ena_config_debug_area (adapter); +if (ena_xdp_legal_queue_count (adapter, adapter->num_io_queues)) + netdev->xdp_features =NETDEV_XDP_ACT_BASIC | +NETDEV_XDP_ACT_REDIRECT ; +memcpy (adapter->netdev->perm_addr, adapter->mac_addr, netdev->addr_len);netif_carrier_off (netdev);
Signature · 1 line
2.39.2
RFC 5/6 veth: take into account device reconfiguration for xdp_features flag
In reply to Lorenzo BianconiTake into account tx/rx queues reconfiguration setting device xdp_features flag. Moreover consider NETIF_F_GRO flag in order to enable ndo_xdp_xmit callback.
--- drivers/net/veth.c | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-)
drivers/net/veth.c +38 -4
@@ -1257,6 +1257,26 @@ static int veth_enable_range_safe(struct net_device *dev, int start, int end)return 0 ; } +static void veth_set_xdp_features (struct net_device *dev) +{ +struct veth_priv *priv =netdev_priv (dev); +struct net_device *peer; + + peer =rcu_dereference (priv->peer); +if (peer && peer->real_num_tx_queues <= dev->real_num_rx_queues) { +xdp_features_t val =NETDEV_XDP_ACT_BASIC | +NETDEV_XDP_ACT_REDIRECT | +NETDEV_XDP_ACT_RX_SG ; + +if (priv->_xdp_prog ||veth_gro_requested (dev)) + val |=NETDEV_XDP_ACT_NDO_XMIT | +NETDEV_XDP_ACT_NDO_XMIT_SG ; +xdp_set_features_flag (dev, val); + }else { +xdp_clear_features_flag (dev); + } +} +static int veth_set_channels (struct net_device *dev,struct ethtool_channels *ch) {
@@ -1323,6 +1343,12 @@ static int veth_set_channels(struct net_device *dev,if (peer)netif_carrier_on (peer); } + +/* update XDP supported features */ +veth_set_xdp_features (dev); +if (peer) +veth_set_xdp_features (peer); +return err; revert:
@@ -1489,7 +1515,10 @@ static int veth_set_features(struct net_device *dev, err =veth_napi_enable (dev);if (err)return err; + +xdp_features_set_redirect_target (dev, true); }else { +xdp_features_clear_redirect_target (dev);veth_napi_del (dev); }return 0 ;
@@ -1570,10 +1599,15 @@ static int veth_xdp_set(struct net_device *dev, struct bpf_prog *prog, peer->hw_features &= ~NETIF_F_GSO_SOFTWARE ; peer->max_mtu = max_mtu; } + +xdp_features_set_redirect_target (dev, true); }if (old_prog) {if (!prog) { +if (!veth_gro_requested (dev)) +xdp_features_clear_redirect_target (dev); +if (dev->flags &IFF_UP )veth_disable_xdp (dev);
@@ -1686,10 +1720,6 @@ static void veth_setup(struct net_device *dev) dev->hw_enc_features =VETH_FEATURES ; dev->mpls_features =NETIF_F_HW_CSUM |NETIF_F_GSO_SOFTWARE ;netif_set_tso_max_size (dev,GSO_MAX_SIZE ); - - dev->xdp_features =NETDEV_XDP_ACT_BASIC |NETDEV_XDP_ACT_REDIRECT | -NETDEV_XDP_ACT_NDO_XMIT |NETDEV_XDP_ACT_RX_SG | -NETDEV_XDP_ACT_NDO_XMIT_SG ; }/*
@@ -1857,6 +1887,10 @@ static int veth_newlink(struct net *src_net, struct net_device *dev, goto err_queues;veth_disable_gro (dev); +/* update XDP supported features */ +veth_set_xdp_features (dev); +veth_set_xdp_features (peer); +return 0 ; err_queues:
Signature · 1 line
2.39.2
RFC 6/6 net/mlx5e: take into account device reconfiguration for xdp_features flag
In reply to Lorenzo BianconiTake into account LRO and GRO configuration setting device xdp_features flag. Moreover consider channel rq_wq_type enabling rx scatter-gatter support in xdp_features flag.
--- drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 + .../ethernet/mellanox/mlx5/core/en_ethtool.c | 10 ++++- .../net/ethernet/mellanox/mlx5/core/en_main.c | 45 ++++++++++++++++--- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 3 ++ 4 files changed, 51 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en.h +1 -0
@@ -1243,6 +1243,7 @@ void mlx5e_build_nic_params(struct mlx5e_priv *priv, struct mlx5e_xsk *xsk, u16void mlx5e_rx_dim_work (struct work_struct *work);void mlx5e_tx_dim_work (struct work_struct *work); +void mlx5e_set_xdp_feature (struct net_device *netdev);netdev_features_t mlx5e_features_check (struct sk_buff *skb,struct net_device *netdev,netdev_features_t features);
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +9 -1
@@ -1985,6 +1985,7 @@ static int set_pflag_rx_striding_rq(struct net_device *netdev, bool enable)struct mlx5e_priv *priv =netdev_priv (netdev);struct mlx5_core_dev *mdev = priv->mdev;struct mlx5e_params new_params; +int err;if (enable) {/* Checking the regular RQ here; mlx5e_validate_xsk_param called
@@ -2005,7 +2006,14 @@ static int set_pflag_rx_striding_rq(struct net_device *netdev, bool enable)MLX5E_SET_PFLAG (&new_params,MLX5E_PFLAG_RX_STRIDING_RQ , enable);mlx5e_set_rq_type (mdev, &new_params); -return mlx5e_safe_switch_params (priv, &new_params,NULL ,NULL , true); + err =mlx5e_safe_switch_params (priv, &new_params,NULL ,NULL , true); +if (err) +return err; + +/* update XDP supported features */ +mlx5e_set_xdp_feature (netdev); + +return 0 ; }static int set_pflag_rx_no_csum_complete (struct net_device *netdev,bool enable)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +38 -7
79 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +3 -0
@@ -747,6 +747,9 @@ static void mlx5e_build_rep_params(struct net_device *netdev)/* RQ */ mlx5e_build_rq_params (mdev, params); +/* update XDP supported features */ +mlx5e_set_xdp_feature (netdev); +/* CQ moderation params */ params->rx_dim_enabled =MLX5_CAP_GEN (mdev, cq_moderation);mlx5e_set_rx_cq_mode_params (params, cq_period_mode);
Signature · 1 line
2.39.2