mlx5 misc patches
Subsystems (7)
Tariq Toukan
maintainerv2 cover mlx5 misc patches
Hi,
This patchset includes small features and misc code enhancements for the mlx5 core and EN drivers.
Patches 1-4 by Gal improves the mlx5e ethtool stats implementation, for example by using standard helpers ethtool_sprintf/puts.
Patch 5 by me adds a reset option for the FW command interface debugfs stats entries. This allows explicit FW command interface stats reset between different runs of a test case.
Patches 6 and 7 are simple cleanups.
Patch 8 by Gal adds driver support for 800Gbps link modes.
Patch 9 by Jianbo enhances the L4 steering abilities.
Patches 10-11 by Jianbo save redundant operations.
Series generated against:
commit 5fc68320c1fb ("ipv6: remove RTNL protection from inet6_dump_fib()")
Thanks,
Tariq.
V2:
- Removed patch 5 (representor remote RX drop counter), to be adjusted and submitted later.
- Mention offending commit in patch 6 description, per Simon's feedback.
- Added Simon Horman's Reviewed-by tags.
- Added patches 8 - 11.
Carolina Jubran (1):
net/mlx5e: XDP, Fix an inconsistent comment
Gal Pressman (6):
net/mlx5e: Use ethtool_sprintf/puts() to fill priv flags strings net/mlx5e: Use ethtool_sprintf/puts() to fill selftests strings net/mlx5e: Use ethtool_sprintf/puts() to fill stats strings net/mlx5e: Make stats group fill_stats callbacks consistent with the
API
net/mlx5: Convert uintX_t to uX
net/mlx5e: Add support for 800Gbps link modes
Jianbo Liu (3):
net/mlx5: Support matching on l4_type for ttc_table net/mlx5: Skip pages EQ creation for non-page supplier function net/mlx5: Don't call give_pages() if request 0 page
Tariq Toukan (1):
net/mlx5e: debugfs, Add reset option for command interface stats
.../net/ethernet/mellanox/mlx5/core/debugfs.c | 22 +- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- .../net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- .../mellanox/mlx5/core/en_accel/fs_tcp.c | 2 +- .../mellanox/mlx5/core/en_accel/fs_tcp.h | 4 +- .../mellanox/mlx5/core/en_accel/ipsec_stats.c | 28 +- .../mellanox/mlx5/core/en_accel/ktls.h | 14 +- .../mellanox/mlx5/core/en_accel/ktls_stats.c | 26 +- .../mlx5/core/en_accel/macsec_stats.c | 22 +- .../ethernet/mellanox/mlx5/core/en_ethtool.c | 10 +- .../net/ethernet/mellanox/mlx5/core/en_fs.c | 6 +- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 30 +- .../ethernet/mellanox/mlx5/core/en_selftest.c | 2 +- .../ethernet/mellanox/mlx5/core/en_stats.c | 491 +++++++++--------- .../ethernet/mellanox/mlx5/core/en_stats.h | 10 +- .../net/ethernet/mellanox/mlx5/core/en_tc.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 9 +- drivers/net/ethernet/mellanox/mlx5/core/fw.c | 2 +- .../mellanox/mlx5/core/lag/port_sel.c | 8 +- .../ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 254 +++++++-- .../ethernet/mellanox/mlx5/core/lib/fs_ttc.h | 2 +- .../ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +- .../ethernet/mellanox/mlx5/core/pagealloc.c | 3 + .../mellanox/mlx5/core/steering/dr_ste_v0.c | 2 +- .../mellanox/mlx5/core/steering/dr_ste_v1.c | 4 +- include/linux/mlx5/device.h | 8 +- include/linux/mlx5/mlx5_ifc.h | 36 +- 27 files changed, 596 insertions(+), 408 deletions(-)
Signature · 1 line
2.31.1
Tariq Toukan
maintainerPATCH v2 1/11 net/mlx5e: Use ethtool_sprintf/puts() to fill priv flags strings
From: Gal Pressman <[email protected]>
Use ethtool_sprintf/puts() helper functions which handle the common pattern of printing a string into the ethtool strings interface and incrementing the string pointer by ETH_GSTRING_LEN.
--- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +1 -2
@@ -269,8 +269,7 @@ void mlx5e_ethtool_get_strings(struct mlx5e_priv *priv, u32 stringset, u8 *data)switch (stringset) {case ETH_SS_PRIV_FLAGS :for (i =0 ; i <MLX5E_NUM_PFLAGS ; i++) -strcpy (data + i *ETH_GSTRING_LEN , - mlx5e_priv_flags[i].name); +ethtool_puts (&data, mlx5e_priv_flags[i].name);break ;case ETH_SS_TEST :
Signature · 1 line
2.31.1
Tariq Toukan
maintainerPATCH v2 2/11 net/mlx5e: Use ethtool_sprintf/puts() to fill selftests strings
In reply to Tariq ToukanFrom: Gal Pressman <[email protected]>
Use ethtool_sprintf/puts() helper functions which handle the common pattern of printing a string into the ethtool strings interface and incrementing the string pointer by ETH_GSTRING_LEN.
The int return value in mlx5e_self_test_fill_strings() is not removed as it is still used to return the number of selftests.
--- drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c +1 -1
@@ -359,7 +359,7 @@ int mlx5e_self_test_fill_strings(struct mlx5e_priv *priv, u8 *data)if (st.cond_func && st.cond_func (priv))continue ;if (data) -strcpy (data + count *ETH_GSTRING_LEN , st.name); +ethtool_puts (&data, st.name); count++; }return count;
Signature · 1 line
2.31.1
Tariq Toukan
maintainerPATCH v2 3/11 net/mlx5e: Use ethtool_sprintf/puts() to fill stats strings
In reply to Tariq ToukanFrom: Gal Pressman <[email protected]>
Use ethtool_sprintf/puts() helper functions which handle the common pattern of printing a string into the ethtool strings interface and incrementing the string pointer by ETH_GSTRING_LEN.
Change the fill_strings callback to accept a **data pointer, and remove the index and return value.
--- .../mellanox/mlx5/core/en_accel/ipsec_stats.c | 11 +- .../mellanox/mlx5/core/en_accel/ktls.h | 7 +- .../mellanox/mlx5/core/en_accel/ktls_stats.c | 11 +- .../mlx5/core/en_accel/macsec_stats.c | 9 +- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 10 +- .../ethernet/mellanox/mlx5/core/en_stats.c | 179 +++++++----------- .../ethernet/mellanox/mlx5/core/en_stats.h | 4 +- 7 files changed, 85 insertions(+), 146 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_stats.c +3 -8
@@ -78,13 +78,10 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STRS(ipsec_hw)unsigned int i;if (!priv->ipsec) -return idx; +return ;for (i =0 ; i <NUM_IPSEC_HW_COUNTERS ; i++) -strcpy (data + (idx++) *ETH_GSTRING_LEN , - mlx5e_ipsec_hw_stats_desc[i].format); - -return idx; +ethtool_puts (data, mlx5e_ipsec_hw_stats_desc[i].format); }static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS (ipsec_hw)
@@ -115,9 +112,7 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STRS(ipsec_sw)if (priv->ipsec)for (i =0 ; i <NUM_IPSEC_SW_COUNTERS ; i++) -strcpy (data + (idx++) *ETH_GSTRING_LEN , - mlx5e_ipsec_sw_stats_desc[i].format); -return idx; +ethtool_puts (data, mlx5e_ipsec_sw_stats_desc[i].format); }static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS (ipsec_sw)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h +2 -5
@@ -95,7 +95,7 @@ int mlx5e_ktls_init(struct mlx5e_priv *priv);void mlx5e_ktls_cleanup (struct mlx5e_priv *priv);int mlx5e_ktls_get_count (struct mlx5e_priv *priv); -int mlx5e_ktls_get_strings (struct mlx5e_priv *priv,uint8_t *data); +void mlx5e_ktls_get_strings (struct mlx5e_priv *priv,uint8_t **data);int mlx5e_ktls_get_stats (struct mlx5e_priv *priv,u64 *data);#else
@@ -144,10 +144,7 @@ static inline bool mlx5e_is_ktls_rx(struct mlx5_core_dev *mdev)static inline int mlx5e_ktls_init (struct mlx5e_priv *priv) {return 0 ; }static inline void mlx5e_ktls_cleanup (struct mlx5e_priv *priv) { }static inline int mlx5e_ktls_get_count (struct mlx5e_priv *priv) {return 0 ; } -static inline int mlx5e_ktls_get_strings (struct mlx5e_priv *priv,uint8_t *data) -{ -return 0 ; -} +static inline void mlx5e_ktls_get_strings (struct mlx5e_priv *priv,uint8_t **data) { }static inline int mlx5e_ktls_get_stats (struct mlx5e_priv *priv,u64 *data) {
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_stats.c +4 -7
@@ -58,20 +58,17 @@ int mlx5e_ktls_get_count(struct mlx5e_priv *priv)return ARRAY_SIZE (mlx5e_ktls_sw_stats_desc); } -int mlx5e_ktls_get_strings (struct mlx5e_priv *priv,uint8_t *data) +void mlx5e_ktls_get_strings (struct mlx5e_priv *priv,uint8_t **data) { -unsigned int i, n, idx =0 ; +unsigned int i, n;if (!priv->tls) -return 0 ; +return ; n =mlx5e_ktls_get_count (priv);for (i =0 ; i < n; i++) -strcpy (data + (idx++) *ETH_GSTRING_LEN , - mlx5e_ktls_sw_stats_desc[i].format); - -return n; +ethtool_puts (data, mlx5e_ktls_sw_stats_desc[i].format); }int mlx5e_ktls_get_stats (struct mlx5e_priv *priv,u64 *data)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_stats.c +3 -6
@@ -38,16 +38,13 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STRS(macsec_hw)unsigned int i;if (!priv->macsec) -return idx; +return ;if (!mlx5e_is_macsec_device (priv->mdev)) -return idx; +return ;for (i =0 ; i <NUM_MACSEC_HW_COUNTERS ; i++) -strcpy (data + (idx++) *ETH_GSTRING_LEN , - mlx5e_macsec_hw_stats_desc[i].format); - -return idx; +ethtool_puts (data, mlx5e_macsec_hw_stats_desc[i].format); }static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS (macsec_hw)
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +3 -7
@@ -135,9 +135,7 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STRS(sw_rep)int i;for (i =0 ; i <NUM_VPORT_REP_SW_COUNTERS ; i++) -strcpy (data + (idx++) *ETH_GSTRING_LEN , - sw_rep_stats_desc[i].format); -return idx; +ethtool_puts (data, sw_rep_stats_desc[i].format); }static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS (sw_rep)
@@ -176,11 +174,9 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STRS(vport_rep)int i;for (i =0 ; i <NUM_VPORT_REP_HW_COUNTERS ; i++) -strcpy (data + (idx++) *ETH_GSTRING_LEN , vport_rep_stats_desc[i].format); +ethtool_puts (data, vport_rep_stats_desc[i].format);for (i =0 ; i <NUM_VPORT_REP_LOOPBACK_COUNTERS (priv->mdev); i++) -strcpy (data + (idx++) *ETH_GSTRING_LEN , - vport_rep_loopback_stats_desc[i].format); -return idx; +ethtool_puts (data, vport_rep_loopback_stats_desc[i].format); }static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS (vport_rep)
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c +68 -111
378 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_stats.h +2 -2
@@ -71,7 +71,7 @@ struct mlx5e_priv;struct mlx5e_stats_grp {u16 update_stats_mask;int (*get_num_stats)(struct mlx5e_priv *priv); -int (*fill_strings)(struct mlx5e_priv *priv,u8 *data,int idx); +void (*fill_strings)(struct mlx5e_priv *priv,u8 **data);int (*fill_stats)(struct mlx5e_priv *priv,u64 *data,int idx);void (*update_stats)(struct mlx5e_priv *priv); };
@@ -87,7 +87,7 @@ typedef const struct mlx5e_stats_grp *const mlx5e_stats_grp_t; void MLX5E_STATS_GRP_OP(grp, update_stats)(struct mlx5e_priv *priv)#define MLX5E_DECLARE_STATS_GRP_OP_FILL_STRS (grp) \ - int MLX5E_STATS_GRP_OP(grp, fill_strings)(struct mlx5e_priv *priv, u8 *data, int idx) + void MLX5E_STATS_GRP_OP(grp, fill_strings)(struct mlx5e_priv *priv, u8 **data)#define MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS (grp) \ int MLX5E_STATS_GRP_OP(grp, fill_stats)(struct mlx5e_priv *priv, u64 *data, int idx)
Signature · 1 line
2.31.1
Tariq Toukan
maintainerPATCH v2 4/11 net/mlx5e: Make stats group fill_stats callbacks consistent with the API
In reply to Tariq ToukanFrom: Gal Pressman <[email protected]>
The fill_strings() callbacks were changed to accept a **data pointer, and not rely on propagating the index value.
Make a similar change to fill_stats() callbacks to keep the API consistent.
--- .../mellanox/mlx5/core/en_accel/ipsec_stats.c | 17 +- .../mellanox/mlx5/core/en_accel/ktls.h | 7 +- .../mellanox/mlx5/core/en_accel/ktls_stats.c | 15 +- .../mlx5/core/en_accel/macsec_stats.c | 13 +- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 18 +- .../ethernet/mellanox/mlx5/core/en_stats.c | 312 ++++++++++-------- .../ethernet/mellanox/mlx5/core/en_stats.h | 6 +- 7 files changed, 215 insertions(+), 173 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_stats.c +9 -8
@@ -89,14 +89,14 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(ipsec_hw)int i;if (!priv->ipsec) -return idx; +return ;mlx5e_accel_ipsec_fs_read_stats (priv, &priv->ipsec->hw_stats);for (i =0 ; i <NUM_IPSEC_HW_COUNTERS ; i++) - data[idx++] =MLX5E_READ_CTR_ATOMIC64 (&priv->ipsec->hw_stats, - mlx5e_ipsec_hw_stats_desc, i); - -return idx; +mlx5e_ethtool_put_stat ( + data, +MLX5E_READ_CTR_ATOMIC64 (&priv->ipsec->hw_stats, + mlx5e_ipsec_hw_stats_desc, i)); }static MLX5E_DECLARE_STATS_GRP_OP_NUM_STATS (ipsec_sw)
@@ -121,9 +121,10 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(ipsec_sw)if (priv->ipsec)for (i =0 ; i <NUM_IPSEC_SW_COUNTERS ; i++) - data[idx++] =MLX5E_READ_CTR_ATOMIC64 (&priv->ipsec->sw_stats, - mlx5e_ipsec_sw_stats_desc, i); -return idx; +mlx5e_ethtool_put_stat ( + data,MLX5E_READ_CTR_ATOMIC64 ( + &priv->ipsec->sw_stats, + mlx5e_ipsec_sw_stats_desc, i)); }MLX5E_DEFINE_STATS_GRP (ipsec_hw,0 );
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h +2 -5
@@ -96,7 +96,7 @@ void mlx5e_ktls_cleanup(struct mlx5e_priv *priv);int mlx5e_ktls_get_count (struct mlx5e_priv *priv);void mlx5e_ktls_get_strings (struct mlx5e_priv *priv,uint8_t **data); -int mlx5e_ktls_get_stats (struct mlx5e_priv *priv,u64 *data); +void mlx5e_ktls_get_stats (struct mlx5e_priv *priv,u64 **data);#else static inline void mlx5e_ktls_build_netdev (struct mlx5e_priv *priv)
@@ -146,10 +146,7 @@ static inline void mlx5e_ktls_cleanup(struct mlx5e_priv *priv) { }static inline int mlx5e_ktls_get_count (struct mlx5e_priv *priv) {return 0 ; }static inline void mlx5e_ktls_get_strings (struct mlx5e_priv *priv,uint8_t **data) { } -static inline int mlx5e_ktls_get_stats (struct mlx5e_priv *priv,u64 *data) -{ -return 0 ; -} +static inline void mlx5e_ktls_get_stats (struct mlx5e_priv *priv,u64 **data) { }#endif #endif /* __MLX5E_TLS_H__ */
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_stats.c +7 -8
@@ -71,19 +71,18 @@ void mlx5e_ktls_get_strings(struct mlx5e_priv *priv, uint8_t **data)ethtool_puts (data, mlx5e_ktls_sw_stats_desc[i].format); } -int mlx5e_ktls_get_stats (struct mlx5e_priv *priv,u64 *data) +void mlx5e_ktls_get_stats (struct mlx5e_priv *priv,u64 **data) { -unsigned int i, n, idx =0 ; +unsigned int i, n;if (!priv->tls) -return 0 ; +return ; n =mlx5e_ktls_get_count (priv);for (i =0 ; i < n; i++) - data[idx++] =MLX5E_READ_CTR_ATOMIC64 (&priv->tls->sw_stats, - mlx5e_ktls_sw_stats_desc, - i); - -return n; +mlx5e_ethtool_put_stat ( + data, +MLX5E_READ_CTR_ATOMIC64 (&priv->tls->sw_stats, + mlx5e_ktls_sw_stats_desc, i)); }
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_stats.c +6 -7
@@ -53,19 +53,18 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(macsec_hw)int i;if (!priv->macsec) -return idx; +return ;if (!mlx5e_is_macsec_device (priv->mdev)) -return idx; +return ; macsec_fs = priv->mdev->macsec_fs;mlx5_macsec_fs_get_stats_fill (macsec_fs,mlx5_macsec_fs_get_stats (macsec_fs));for (i =0 ; i <NUM_MACSEC_HW_COUNTERS ; i++) - data[idx++] =MLX5E_READ_CTR64_CPU (mlx5_macsec_fs_get_stats (macsec_fs), - mlx5e_macsec_hw_stats_desc, - i); - -return idx; +mlx5e_ethtool_put_stat ( + data,MLX5E_READ_CTR64_CPU ( +mlx5_macsec_fs_get_stats (macsec_fs), + mlx5e_macsec_hw_stats_desc, i)); }MLX5E_DEFINE_STATS_GRP (macsec_hw,0 );
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +10 -8
@@ -143,9 +143,9 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(sw_rep)int i;for (i =0 ; i <NUM_VPORT_REP_SW_COUNTERS ; i++) - data[idx++] =MLX5E_READ_CTR64_CPU (&priv->stats.sw, - sw_rep_stats_desc, i); -return idx; +mlx5e_ethtool_put_stat ( + data,MLX5E_READ_CTR64_CPU (&priv->stats.sw, + sw_rep_stats_desc, i)); }static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS (sw_rep)
@@ -184,12 +184,14 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(vport_rep)int i;for (i =0 ; i <NUM_VPORT_REP_HW_COUNTERS ; i++) - data[idx++] =MLX5E_READ_CTR64_CPU (&priv->stats.rep_stats, - vport_rep_stats_desc, i); +mlx5e_ethtool_put_stat ( + data,MLX5E_READ_CTR64_CPU (&priv->stats.rep_stats, + vport_rep_stats_desc, i));for (i =0 ; i <NUM_VPORT_REP_LOOPBACK_COUNTERS (priv->mdev); i++) - data[idx++] =MLX5E_READ_CTR64_CPU (&priv->stats.rep_stats, - vport_rep_loopback_stats_desc, i); -return idx; +mlx5e_ethtool_put_stat ( + data, +MLX5E_READ_CTR64_CPU (&priv->stats.rep_stats, + vport_rep_loopback_stats_desc, i)); }static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS (vport_rep)
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c +177 -135
516 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_stats.h +4 -2
@@ -72,10 +72,12 @@ struct mlx5e_stats_grp {u16 update_stats_mask;int (*get_num_stats)(struct mlx5e_priv *priv);void (*fill_strings)(struct mlx5e_priv *priv,u8 **data); -int (*fill_stats)(struct mlx5e_priv *priv,u64 *data,int idx); +void (*fill_stats)(struct mlx5e_priv *priv,u64 **data);void (*update_stats)(struct mlx5e_priv *priv); }; +void mlx5e_ethtool_put_stat (u64 **data,u64 val); +typedef const struct mlx5e_stats_grp *const mlx5e_stats_grp_t ;#define MLX5E_STATS_GRP_OP (grp, name) mlx5e_stats_grp_ ## grp ## _ ## name
@@ -90,7 +92,7 @@ typedef const struct mlx5e_stats_grp *const mlx5e_stats_grp_t; void MLX5E_STATS_GRP_OP(grp, fill_strings)(struct mlx5e_priv *priv, u8 **data)#define MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS (grp) \ - int MLX5E_STATS_GRP_OP(grp, fill_stats)(struct mlx5e_priv *priv, u64 *data, int idx) + void MLX5E_STATS_GRP_OP(grp, fill_stats)(struct mlx5e_priv *priv, u64 **data)#define MLX5E_STATS_GRP (grp) mlx5e_stats_grp_ ## grp
Signature · 1 line
2.31.1
Tariq Toukan
maintainerPATCH v2 5/11 net/mlx5e: debugfs, Add reset option for command interface stats
In reply to Tariq ToukanResetting stats just before some test/debug case allows us to eliminate out the impact of previous commands. Useful in particular for the average latency calculation.
The average_write() callback was unreachable, as "average" is a read-only file. Extend, rename, and use it for a newly exposed write-only "reset" file.
--- .../net/ethernet/mellanox/mlx5/core/debugfs.c | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/debugfs.c +17 -5
@@ -143,8 +143,8 @@ static ssize_t average_read(struct file *filp, char __user *buf, size_t count,return simple_read_from_buffer (buf, count, pos, tbuf, ret); } -static ssize_t average_write (struct file *filp,const char __user *buf, -size_t count,loff_t *pos) +static ssize_t reset_write (struct file *filp,const char __user *buf, +size_t count,loff_t *pos) {struct mlx5_cmd_stats *stats;
@@ -152,6 +152,11 @@ static ssize_t average_write(struct file *filp, const char __user *buf,spin_lock_irq (&stats->lock); stats->sum =0 ; stats->n =0 ; + stats->failed =0 ; + stats->failed_mbox_status =0 ; + stats->last_failed_errno =0 ; + stats->last_failed_mbox_status =0 ; + stats->last_failed_syndrome =0 ;spin_unlock_irq (&stats->lock); *pos += count;
@@ -159,11 +164,16 @@ static ssize_t average_write(struct file *filp, const char __user *buf,return count; } -static const struct file_operations stats_fops = { +static const struct file_operations reset_fops = { + .owner =THIS_MODULE , + .open = simple_open, + .write = reset_write, +}; + +static const struct file_operations average_fops = { .owner =THIS_MODULE , .open = simple_open, .read = average_read, - .write = average_write, }; static ssize_t slots_read(struct file *filp, char __user *buf, size_t count,
@@ -228,8 +238,10 @@ void mlx5_cmdif_debugfs_init(struct mlx5_core_dev *dev)continue ; stats->root =debugfs_create_dir (namep, *cmd); +debugfs_create_file ("reset" ,0200 , stats->root, stats, + &reset_fops);debugfs_create_file ("average" ,0400 , stats->root, stats, - &stats_fops); + &average_fops);debugfs_create_u64 ("n" ,0400 , stats->root, &stats->n);debugfs_create_u64 ("failed" ,0400 , stats->root, &stats->failed); debugfs_create_u64("failed_mbox_status", 0400, stats->root,
Signature · 1 line
2.31.1
Tariq Toukan
maintainerPATCH v2 6/11 net/mlx5e: XDP, Fix an inconsistent comment
In reply to Tariq ToukanFrom: Carolina Jubran <[email protected]>
Starting from commiteb9b9fdcafe2 ("net/mlx5e: Introduce extended version for mlx5e_xmit_data") sinfo is no longer passed as an argument to mlx5e_xmit_xdp_frame(), the comment is inconsistent.
check_result must be zero when the packet is fragmented.
--- drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c +1 -1
@@ -565,7 +565,7 @@ mlx5e_xmit_xdp_frame(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptxd, linear = !!(dma_len - inline_hdr_sz); ds_cnt =MLX5E_TX_WQE_EMPTY_DS_COUNT + linear + !!inline_hdr_sz; -/* check_result must be 0 if sinfo is passed. */ +/* check_result must be 0 if xdptxd->has_frags is true. */ if (!check_result) {int stop_room =1 ;
Signature · 1 line
2.31.1
Tariq Toukan
maintainerPATCH v2 7/11 net/mlx5: Convert uintX_t to uX
In reply to Tariq ToukanFrom: Gal Pressman <[email protected]>
In the kernel, the preferred types are uX.
--- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.h | 4 ++-- drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h | 4 ++-- drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_stats.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/fw.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v0.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c | 4 ++-- include/linux/mlx5/device.h | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en.h +1 -1
@@ -1160,7 +1160,7 @@ void mlx5e_vxlan_set_netdev_info(struct mlx5e_priv *priv);void mlx5e_ethtool_get_drvinfo (struct mlx5e_priv *priv,struct ethtool_drvinfo *drvinfo);void mlx5e_ethtool_get_strings (struct mlx5e_priv *priv, -uint32_t stringset,uint8_t *data); +u32 stringset,u8 *data);int mlx5e_ethtool_get_sset_count (struct mlx5e_priv *priv,int sset);void mlx5e_ethtool_get_ethtool_stats (struct mlx5e_priv *priv,struct ethtool_stats *stats,u64 *data);
drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c +1 -1
@@ -73,7 +73,7 @@ void mlx5e_accel_fs_del_sk(struct mlx5_flow_handle *rule)struct mlx5_flow_handle *mlx5e_accel_fs_add_sk (struct mlx5e_flow_steering *fs,struct sock *sk,u32 tirn, -uint32_t flow_tag) +u32 flow_tag) {struct mlx5e_accel_fs_tcp *fs_tcp =mlx5e_fs_get_accel_tcp (fs);struct mlx5_flow_destination dest = {};
drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.h +2 -2
@@ -11,14 +11,14 @@ int mlx5e_accel_fs_tcp_create(struct mlx5e_flow_steering *fs);void mlx5e_accel_fs_tcp_destroy (struct mlx5e_flow_steering *fs);struct mlx5_flow_handle *mlx5e_accel_fs_add_sk (struct mlx5e_flow_steering *fs,struct sock *sk,u32 tirn, -uint32_t flow_tag); +u32 flow_tag);void mlx5e_accel_fs_del_sk (struct mlx5_flow_handle *rule);#else static inline int mlx5e_accel_fs_tcp_create (struct mlx5e_flow_steering *fs) {return 0 ; }static inline void mlx5e_accel_fs_tcp_destroy (struct mlx5e_flow_steering *fs) {}static inline struct mlx5_flow_handle *mlx5e_accel_fs_add_sk (struct mlx5e_flow_steering *fs,struct sock *sk,u32 tirn, -uint32_t flow_tag) +u32 flow_tag) {return ERR_PTR (-EOPNOTSUPP ); }static inline void mlx5e_accel_fs_del_sk (struct mlx5_flow_handle *rule) {}#endif
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h +2 -2
@@ -95,7 +95,7 @@ int mlx5e_ktls_init(struct mlx5e_priv *priv);void mlx5e_ktls_cleanup (struct mlx5e_priv *priv);int mlx5e_ktls_get_count (struct mlx5e_priv *priv); -void mlx5e_ktls_get_strings (struct mlx5e_priv *priv,uint8_t **data); +void mlx5e_ktls_get_strings (struct mlx5e_priv *priv,u8 **data);void mlx5e_ktls_get_stats (struct mlx5e_priv *priv,u64 **data);#else
@@ -144,7 +144,7 @@ static inline bool mlx5e_is_ktls_rx(struct mlx5_core_dev *mdev)static inline int mlx5e_ktls_init (struct mlx5e_priv *priv) {return 0 ; }static inline void mlx5e_ktls_cleanup (struct mlx5e_priv *priv) { }static inline int mlx5e_ktls_get_count (struct mlx5e_priv *priv) {return 0 ; } -static inline void mlx5e_ktls_get_strings (struct mlx5e_priv *priv,uint8_t **data) { } +static inline void mlx5e_ktls_get_strings (struct mlx5e_priv *priv,u8 **data) { }static inline void mlx5e_ktls_get_stats (struct mlx5e_priv *priv,u64 **data) { }#endif
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_stats.c +1 -1
@@ -58,7 +58,7 @@ int mlx5e_ktls_get_count(struct mlx5e_priv *priv)return ARRAY_SIZE (mlx5e_ktls_sw_stats_desc); } -void mlx5e_ktls_get_strings (struct mlx5e_priv *priv,uint8_t **data) +void mlx5e_ktls_get_strings (struct mlx5e_priv *priv,u8 **data) {unsigned int i, n;
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +1 -1
@@ -274,7 +274,7 @@ static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(vport_rep) }static void mlx5e_rep_get_strings (struct net_device *dev, -u32 stringset,uint8_t *data) +u32 stringset,u8 *data) {struct mlx5e_priv *priv =netdev_priv (dev);
drivers/net/ethernet/mellanox/mlx5/core/fw.c +1 -1
@@ -283,7 +283,7 @@ int mlx5_query_hca_caps(struct mlx5_core_dev *dev)return 0 ; } -int mlx5_cmd_init_hca (struct mlx5_core_dev *dev,uint32_t *sw_owner_id) +int mlx5_cmd_init_hca (struct mlx5_core_dev *dev,u32 *sw_owner_id) {u32 in[MLX5_ST_SZ_DW (init_hca_in)] = {};int i;
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +1 -1
@@ -205,7 +205,7 @@ int mlx5_cmd_enable(struct mlx5_core_dev *dev);void mlx5_cmd_disable (struct mlx5_core_dev *dev);void mlx5_cmd_set_state (struct mlx5_core_dev *dev,enum mlx5_cmdif_state cmdif_state); -int mlx5_cmd_init_hca (struct mlx5_core_dev *dev,uint32_t *sw_owner_id); +int mlx5_cmd_init_hca (struct mlx5_core_dev *dev,u32 *sw_owner_id);int mlx5_cmd_teardown_hca (struct mlx5_core_dev *dev);int mlx5_cmd_force_teardown_hca (struct mlx5_core_dev *dev);int mlx5_cmd_fast_teardown_hca (struct mlx5_core_dev *dev);
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v0.c +1 -1
@@ -1883,7 +1883,7 @@ dr_ste_v0_build_tnl_gtpu_flex_parser_1_init(struct mlx5dr_ste_build *sb,static int dr_ste_v0_build_tnl_header_0_1_tag (struct mlx5dr_match_param *value,struct mlx5dr_ste_build *sb, -uint8_t *tag) +u8 *tag) {struct mlx5dr_match_misc5 *misc5 = &value->misc5;
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c +2 -2
@@ -1897,7 +1897,7 @@ void dr_ste_v1_build_flex_parser_tnl_geneve_init(struct mlx5dr_ste_build *sb,static int dr_ste_v1_build_tnl_header_0_1_tag (struct mlx5dr_match_param *value,struct mlx5dr_ste_build *sb, -uint8_t *tag) +u8 *tag) {struct mlx5dr_match_misc5 *misc5 = &value->misc5;
@@ -2129,7 +2129,7 @@ dr_ste_v1_build_flex_parser_tnl_geneve_tlv_opt_init(struct mlx5dr_ste_build *sb,static int dr_ste_v1_build_flex_parser_tnl_geneve_tlv_opt_exist_tag (struct mlx5dr_match_param *value,struct mlx5dr_ste_build *sb, -uint8_t *tag) +u8 *tag) {u8 parser_id = sb->caps->flex_parser_id_geneve_tlv_option_0;struct mlx5dr_match_misc *misc = &value->misc;
include/linux/mlx5/device.h +1 -1
@@ -68,7 +68,7 @@#define MLX5_UN_SZ_BYTES (typ) (sizeof(union mlx5_ifc_##typ##_bits) / 8)#define MLX5_UN_SZ_DW (typ) (sizeof(union mlx5_ifc_##typ##_bits) / 32)#define MLX5_BYTE_OFF (typ, fld) (__mlx5_bit_off(typ, fld) / 8) -#define MLX5_ADDR_OF (typ, p, fld) ((void *)((uint8_t *)(p) + MLX5_BYTE_OFF(typ, fld))) +#define MLX5_ADDR_OF (typ, p, fld) ((void *)((u8 *)(p) + MLX5_BYTE_OFF(typ, fld)))/* insert a value to a struct */ #define MLX5_SET (typ, p, fld, v) do { \
Signature · 1 line
2.31.1
Tariq Toukan
maintainerPATCH v2 8/11 net/mlx5e: Add support for 800Gbps link modes
In reply to Tariq ToukanFrom: Gal Pressman <[email protected]>
Add support for 800Gbps speed, link modes of 100Gbps per lane.
--- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +7 -0
@@ -219,6 +219,13 @@ void mlx5e_build_ptys2ethtool_map(void) ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT, ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT, ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT); +MLX5_BUILD_PTYS2ETHTOOL_CONFIG (MLX5E_800GAUI_8_800GBASE_CR8_KR8 , ext, + ETHTOOL_LINK_MODE_800000baseCR8_Full_BIT, + ETHTOOL_LINK_MODE_800000baseKR8_Full_BIT, + ETHTOOL_LINK_MODE_800000baseDR8_Full_BIT, + ETHTOOL_LINK_MODE_800000baseDR8_2_Full_BIT, + ETHTOOL_LINK_MODE_800000baseSR8_Full_BIT, + ETHTOOL_LINK_MODE_800000baseVR8_Full_BIT); } static void mlx5e_ethtool_get_speed_arr(struct mlx5_core_dev *mdev,
Signature · 1 line
2.31.1
Tariq Toukan
maintainerPATCH v2 9/11 net/mlx5: Support matching on l4_type for ttc_table
In reply to Tariq ToukanFrom: Jianbo Liu <[email protected]>
Replace matching on TCP and UDP protocols with new l4_type field which is parsed by steering for ttc_table. It is enabled by the outer_l4_type or inner_l4_type bits in nic_rx or port_sel flow table capabilities and used only if pcc_ifa2 bit in HCA capabilities is set.
--- .../net/ethernet/mellanox/mlx5/core/en_fs.c | 6 +- .../net/ethernet/mellanox/mlx5/core/en_tc.c | 3 +- .../mellanox/mlx5/core/lag/port_sel.c | 8 +- .../ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 254 ++++++++++++++---- .../ethernet/mellanox/mlx5/core/lib/fs_ttc.h | 2 +- include/linux/mlx5/device.h | 6 + include/linux/mlx5/mlx5_ifc.h | 32 ++- 7 files changed, 244 insertions(+), 67 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c +2 -4
@@ -896,8 +896,7 @@ static void mlx5e_set_inner_ttc_params(struct mlx5e_flow_steering *fs,int tt;memset (ttc_params,0 ,sizeof (*ttc_params)); - ttc_params->ns =mlx5_get_flow_namespace (fs->mdev, -MLX5_FLOW_NAMESPACE_KERNEL ); + ttc_params->ns_type =MLX5_FLOW_NAMESPACE_KERNEL ; ft_attr->level =MLX5E_INNER_TTC_FT_LEVEL ; ft_attr->prio =MLX5E_NIC_PRIO ;
@@ -920,8 +919,7 @@ void mlx5e_set_ttc_params(struct mlx5e_flow_steering *fs,int tt;memset (ttc_params,0 ,sizeof (*ttc_params)); - ttc_params->ns =mlx5_get_flow_namespace (fs->mdev, -MLX5_FLOW_NAMESPACE_KERNEL ); + ttc_params->ns_type =MLX5_FLOW_NAMESPACE_KERNEL ; ft_attr->level =MLX5E_TTC_FT_LEVEL ; ft_attr->prio =MLX5E_NIC_PRIO ;
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +1 -2
@@ -835,8 +835,7 @@ static void mlx5e_hairpin_set_ttc_params(struct mlx5e_hairpin *hp,memset (ttc_params,0 ,sizeof (*ttc_params)); - ttc_params->ns =mlx5_get_flow_namespace (hp->func_mdev, -MLX5_FLOW_NAMESPACE_KERNEL ); + ttc_params->ns_type =MLX5_FLOW_NAMESPACE_KERNEL ;for (tt =0 ; tt <MLX5_NUM_TT ; tt++) { ttc_params->dests[tt].type =MLX5_FLOW_DESTINATION_TYPE_TIR ; ttc_params->dests[tt].tir_num =
drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c +2 -6
@@ -449,13 +449,11 @@ static void set_tt_map(struct mlx5_lag_port_sel *port_sel,static void mlx5_lag_set_inner_ttc_params (struct mlx5_lag *ldev,struct ttc_params *ttc_params) { -struct mlx5_core_dev *dev = ldev->pf[MLX5_LAG_P1 ].dev;struct mlx5_lag_port_sel *port_sel = &ldev->port_sel;struct mlx5_flow_table_attr *ft_attr;int tt; - ttc_params->ns =mlx5_get_flow_namespace (dev, -MLX5_FLOW_NAMESPACE_PORT_SEL ); + ttc_params->ns_type =MLX5_FLOW_NAMESPACE_PORT_SEL ; ft_attr = &ttc_params->ft_attr; ft_attr->level =MLX5_LAG_FT_LEVEL_INNER_TTC ;
@@ -470,13 +468,11 @@ static void mlx5_lag_set_inner_ttc_params(struct mlx5_lag *ldev,static void mlx5_lag_set_outer_ttc_params (struct mlx5_lag *ldev,struct ttc_params *ttc_params) { -struct mlx5_core_dev *dev = ldev->pf[MLX5_LAG_P1 ].dev;struct mlx5_lag_port_sel *port_sel = &ldev->port_sel;struct mlx5_flow_table_attr *ft_attr;int tt; - ttc_params->ns =mlx5_get_flow_namespace (dev, -MLX5_FLOW_NAMESPACE_PORT_SEL ); + ttc_params->ns_type =MLX5_FLOW_NAMESPACE_PORT_SEL ; ft_attr = &ttc_params->ft_attr; ft_attr->level =MLX5_LAG_FT_LEVEL_TTC ;
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c +205 -49
439 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.h +1 -1
@@ -40,7 +40,7 @@ struct mlx5_ttc_rule {struct mlx5_ttc_table ;struct ttc_params { -struct mlx5_flow_namespace *ns; +enum mlx5_flow_namespace_type ns_type;struct mlx5_flow_table_attr ft_attr;struct mlx5_flow_destination dests[MLX5_NUM_TT ]; DECLARE_BITMAP(ignore_dests, MLX5_NUM_TT);
include/linux/mlx5/device.h +6 -0
@@ -1336,6 +1336,9 @@ enum mlx5_qcam_feature_groups {#define MLX5_CAP_ESW_FT_FIELD_SUPPORT_2 (mdev, cap) \ MLX5_CAP_ESW_FLOWTABLE(mdev, ft_field_support_2_esw_fdb.cap) +#define MLX5_CAP_NIC_RX_FT_FIELD_SUPPORT_2 (mdev, cap) \ + MLX5_CAP_FLOWTABLE(mdev, ft_field_support_2_nic_receive.cap) +#define MLX5_CAP_ESW (mdev, cap) \ MLX5_GET(e_switch_cap, \ mdev->caps.hca[MLX5_CAP_ESWITCH]->cur, cap)
@@ -1359,6 +1362,9 @@ enum mlx5_qcam_feature_groups {#define MLX5_CAP_FLOWTABLE_PORT_SELECTION (mdev, cap) \ MLX5_CAP_PORT_SELECTION(mdev, flow_table_properties_port_selection.cap) +#define MLX5_CAP_PORT_SELECTION_FT_FIELD_SUPPORT_2 (mdev, cap) \ + MLX5_CAP_PORT_SELECTION(mdev, ft_field_support_2_port_selection.cap) +#define MLX5_CAP_ODP (mdev, cap)\ MLX5_GET(odp_cap, mdev->caps.hca[MLX5_CAP_ODP]->cur, cap)
include/linux/mlx5/mlx5_ifc.h +27 -5
@@ -416,7 +416,10 @@ struct mlx5_ifc_flow_table_fields_supported_bits {/* Table 2170 - Flow Table Fields Supported 2 Format */ struct mlx5_ifc_flow_table_fields_supported_2_bits { -u8 reserved_at_0[0xe ]; +u8 reserved_at_0[0x2 ]; +u8 inner_l4_type[0x1 ]; +u8 outer_l4_type[0x1 ]; +u8 reserved_at_4[0xa ];u8 bth_opcode[0x1 ];u8 reserved_at_f[0x1 ];u8 tunnel_header_0_1[0x1 ];
@@ -525,6 +528,12 @@ union mlx5_ifc_ipv6_layout_ipv4_layout_auto_bits {u8 reserved_at_0[0x80 ]; }; +enum { +MLX5_PACKET_L4_TYPE_NONE , +MLX5_PACKET_L4_TYPE_TCP , +MLX5_PACKET_L4_TYPE_UDP , +}; +struct mlx5_ifc_fte_match_set_lyr_2_4_bits {u8 smac_47_16[0x20 ];
@@ -550,7 +559,8 @@ struct mlx5_ifc_fte_match_set_lyr_2_4_bits {u8 tcp_sport[0x10 ];u8 tcp_dport[0x10 ]; -u8 reserved_at_c0[0x10 ]; +u8 l4_type[0x2 ]; +u8 reserved_at_c2[0xe ];u8 ipv4_ihl[0x4 ];u8 reserved_at_c4[0x4 ];
@@ -846,7 +856,11 @@ struct mlx5_ifc_flow_table_nic_cap_bits {struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_transmit_sniffer; -u8 reserved_at_e00[0x700 ]; +u8 reserved_at_e00[0x600 ]; + +struct mlx5_ifc_flow_table_fields_supported_2_bits ft_field_support_2_nic_receive; + +u8 reserved_at_1480[0x80 ];struct mlx5_ifc_flow_table_fields_supported_2_bits ft_field_support_2_nic_receive_rdma;
@@ -876,7 +890,9 @@ struct mlx5_ifc_port_selection_cap_bits {struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_port_selection; -u8 reserved_at_400[0x7c00 ]; +struct mlx5_ifc_flow_table_fields_supported_2_bits ft_field_support_2_port_selection; + +u8 reserved_at_480[0x7b80 ]; };enum {
@@ -2004,7 +2020,13 @@ struct mlx5_ifc_cmd_hca_cap_2_bits {u8 reserved_at_3a0[0x10 ];u8 max_rqt_vhca_id[0x10 ]; -u8 reserved_at_3c0[0x440 ]; +u8 reserved_at_3c0[0x20 ]; + +u8 reserved_at_3e0[0x10 ]; +u8 pcc_ifa2[0x1 ]; +u8 reserved_at_3f1[0xf ]; + +u8 reserved_at_400[0x400 ]; };enum mlx5_ifc_flow_destination_type {
Signature · 1 line
2.31.1
Tariq Toukan
maintainerPATCH v2 10/11 net/mlx5: Skip pages EQ creation for non-page supplier function
In reply to Tariq ToukanFrom: Jianbo Liu <[email protected]>
Page events are not issued by device on the function if page_request_disable is set, so no need to create pages EQ.
--- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 9 ++++++++- include/linux/mlx5/mlx5_ifc.h | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eq.c +8 -1
@@ -688,6 +688,12 @@ static int create_async_eqs(struct mlx5_core_dev *dev)if (err) goto err2; +/* Skip page eq creation when the device does not request for page requests */ +if (MLX5_CAP_GEN (dev, page_request_disable)) { +mlx5_core_dbg (dev,"Skip page EQ creation\n" ); +return 0 ; + } + param = (struct mlx5_eq_param ) { .irq = table->ctrl_irq, .nent =/* TODO: sriov max_vf + */ 1 ,
@@ -716,7 +722,8 @@ static void destroy_async_eqs(struct mlx5_core_dev *dev) {struct mlx5_eq_table *table = dev->priv.eq_table; -cleanup_async_eq (dev, &table->pages_eq,"pages" ); +if (!MLX5_CAP_GEN (dev, page_request_disable)) +cleanup_async_eq (dev, &table->pages_eq,"pages" );cleanup_async_eq (dev, &table->async_eq,"async" );mlx5_cmd_allowed_opcode (dev,MLX5_CMD_OP_DESTROY_EQ );mlx5_cmd_use_polling (dev);
include/linux/mlx5/mlx5_ifc.h +3 -1
@@ -1485,7 +1485,9 @@ enum { };struct mlx5_ifc_cmd_hca_cap_bits { -u8 reserved_at_0[0x10 ]; +u8 reserved_at_0[0x6 ]; +u8 page_request_disable[0x1 ]; +u8 reserved_at_7[0x9 ];u8 shared_object_to_user_object_allowed[0x1 ];u8 reserved_at_13[0xe ];u8 vhca_resource_manager[0x1 ];
Signature · 1 line
2.31.1
Tariq Toukan
maintainerPATCH v2 11/11 net/mlx5: Don't call give_pages() if request 0 page
In reply to Tariq ToukanFrom: Jianbo Liu <[email protected]>
Firmware will return 0 on query BOOT/INIT PAGES for non-page supplier functions (external host PF/VF/SF), so no page is needed to be allocated for them.
--- drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +3 -0
@@ -660,6 +660,9 @@ int mlx5_satisfy_startup_pages(struct mlx5_core_dev *dev, int boot)mlx5_core_dbg (dev,"requested %d %s pages for func_id 0x%x\n" , npages, boot ?"boot" :"init" , func_id); +if (!npages) +return 0 ; +return give_pages (dev, func_id, npages,0 ,mlx5_core_is_ecpf (dev)); }
Signature · 1 line
2.31.1
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Tue, 2 Apr 2024 16:30:32 +0300 you wrote:
Hi,
This patchset includes small features and misc code enhancements for the mlx5 core and EN drivers.
Patches 1-4 by Gal improves the mlx5e ethtool stats implementation, for example by using standard helpers ethtool_sprintf/puts.
[...]
Here is the summary with links:
- [net-next,V2,01/11] net/mlx5e: Use ethtool_sprintf/puts() to fill priv flags strings
https://git.kernel.org/netdev/net-next/c/e2d515eb8fcd - [net-next,V2,02/11] net/mlx5e: Use ethtool_sprintf/puts() to fill selftests strings https://git.kernel.org/netdev/net-next/c/9ac9299d41f6 - [net-next,V2,03/11] net/mlx5e: Use ethtool_sprintf/puts() to fill stats strings https://git.kernel.org/netdev/net-next/c/89b34322d293 - [net-next,V2,04/11] net/mlx5e: Make stats group fill_stats callbacks consistent with the API https://git.kernel.org/netdev/net-next/c/27ea84ab35f5 - [net-next,V2,05/11] net/mlx5e: debugfs, Add reset option for command interface stats https://git.kernel.org/netdev/net-next/c/19b85f1b37ce - [net-next,V2,06/11] net/mlx5e: XDP, Fix an inconsistent comment https://git.kernel.org/netdev/net-next/c/595f41608dba - [net-next,V2,07/11] net/mlx5: Convert uintX_t to uX https://git.kernel.org/netdev/net-next/c/30f8d23814ea - [net-next,V2,08/11] net/mlx5e: Add support for 800Gbps link modes https://git.kernel.org/netdev/net-next/c/8c54c89ad45a - [net-next,V2,09/11] net/mlx5: Support matching on l4_type for ttc_table https://git.kernel.org/netdev/net-next/c/137f3d50ad2a - [net-next,V2,10/11] net/mlx5: Skip pages EQ creation for non-page supplier function https://git.kernel.org/netdev/net-next/c/c788d79cfa6b - [net-next,V2,11/11] net/mlx5: Don't call give_pages() if request 0 page https://git.kernel.org/netdev/net-next/c/07e1bc785a91
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html