* [PATCH net 0/3] mlx5 misc fixes 2025-02-25
@ 2025-02-25 7:26 Tariq Toukan
2025-02-25 7:26 ` [PATCH net 1/3] net/mlx5: Fix vport QoS cleanup on error Tariq Toukan
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Tariq Toukan @ 2025-02-25 7:26 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski, Paolo Abeni, Eric Dumazet,
Andrew Lunn
Cc: Gal Pressman, Mark Bloch, Saeed Mahameed, Leon Romanovsky,
Tariq Toukan, Cosmin Ratiu, Carolina Jubran, Shay Drory, netdev,
linux-rdma, linux-kernel
Hi,
This small patchset provides misc bug fixes from the team to the mlx5
core driver.
Thanks,
Tariq.
Carolina Jubran (2):
net/mlx5: Fix vport QoS cleanup on error
net/mlx5: Restore missing trace event when enabling vport QoS
Shay Drory (1):
net/mlx5: IRQ, Fix null string in debug print
drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 8 +++++++-
drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
base-commit: 28b04731a38c80092f47437af6c2770765e0b99f
--
2.45.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net 1/3] net/mlx5: Fix vport QoS cleanup on error
2025-02-25 7:26 [PATCH net 0/3] mlx5 misc fixes 2025-02-25 Tariq Toukan
@ 2025-02-25 7:26 ` Tariq Toukan
2025-02-25 7:26 ` [PATCH net 2/3] net/mlx5: Restore missing trace event when enabling vport QoS Tariq Toukan
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Tariq Toukan @ 2025-02-25 7:26 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski, Paolo Abeni, Eric Dumazet,
Andrew Lunn
Cc: Gal Pressman, Mark Bloch, Saeed Mahameed, Leon Romanovsky,
Tariq Toukan, Cosmin Ratiu, Carolina Jubran, Shay Drory, netdev,
linux-rdma, linux-kernel, Dragos Tatulea
From: Carolina Jubran <cjubran@nvidia.com>
When enabling vport QoS fails, the scheduling node was never freed,
causing a leak.
Add the missing free and reset the vport scheduling node pointer to
NULL.
Fixes: be034baba83e ("net/mlx5: Make vport QoS enablement more flexible for future extensions")
Signed-off-by: Carolina Jubran <cjubran@nvidia.com>
Reviewed-by: Cosmin Ratiu <cratiu@nvidia.com>
Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
---
drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c
index 8b7c843446e1..07a28073a49e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c
@@ -591,8 +591,11 @@ static int mlx5_esw_qos_vport_enable(struct mlx5_vport *vport, enum sched_node_t
sched_node->vport = vport;
vport->qos.sched_node = sched_node;
err = esw_qos_vport_enable(vport, parent, extack);
- if (err)
+ if (err) {
+ __esw_qos_free_node(sched_node);
esw_qos_put(esw);
+ vport->qos.sched_node = NULL;
+ }
return err;
}
--
2.45.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net 2/3] net/mlx5: Restore missing trace event when enabling vport QoS
2025-02-25 7:26 [PATCH net 0/3] mlx5 misc fixes 2025-02-25 Tariq Toukan
2025-02-25 7:26 ` [PATCH net 1/3] net/mlx5: Fix vport QoS cleanup on error Tariq Toukan
@ 2025-02-25 7:26 ` Tariq Toukan
2025-02-25 7:26 ` [PATCH net 3/3] net/mlx5: IRQ, Fix null string in debug print Tariq Toukan
2025-02-27 4:00 ` [PATCH net 0/3] mlx5 misc fixes 2025-02-25 patchwork-bot+netdevbpf
3 siblings, 0 replies; 6+ messages in thread
From: Tariq Toukan @ 2025-02-25 7:26 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski, Paolo Abeni, Eric Dumazet,
Andrew Lunn
Cc: Gal Pressman, Mark Bloch, Saeed Mahameed, Leon Romanovsky,
Tariq Toukan, Cosmin Ratiu, Carolina Jubran, Shay Drory, netdev,
linux-rdma, linux-kernel, Dragos Tatulea
From: Carolina Jubran <cjubran@nvidia.com>
Restore the `trace_mlx5_esw_vport_qos_create` event when creating
the vport scheduling element. This trace event was lost during
refactoring.
Fixes: be034baba83e ("net/mlx5: Make vport QoS enablement more flexible for future extensions")
Signed-off-by: Carolina Jubran <cjubran@nvidia.com>
Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
---
drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c
index 07a28073a49e..823c1ba456cd 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c
@@ -564,6 +564,9 @@ static int esw_qos_vport_enable(struct mlx5_vport *vport, struct mlx5_esw_sched_
return err;
esw_qos_normalize_min_rate(parent->esw, parent, extack);
+ trace_mlx5_esw_vport_qos_create(vport->dev, vport,
+ vport->qos.sched_node->max_rate,
+ vport->qos.sched_node->bw_share);
return 0;
}
--
2.45.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net 3/3] net/mlx5: IRQ, Fix null string in debug print
2025-02-25 7:26 [PATCH net 0/3] mlx5 misc fixes 2025-02-25 Tariq Toukan
2025-02-25 7:26 ` [PATCH net 1/3] net/mlx5: Fix vport QoS cleanup on error Tariq Toukan
2025-02-25 7:26 ` [PATCH net 2/3] net/mlx5: Restore missing trace event when enabling vport QoS Tariq Toukan
@ 2025-02-25 7:26 ` Tariq Toukan
2025-02-25 8:42 ` Kalesh Anakkur Purayil
2025-02-27 4:00 ` [PATCH net 0/3] mlx5 misc fixes 2025-02-25 patchwork-bot+netdevbpf
3 siblings, 1 reply; 6+ messages in thread
From: Tariq Toukan @ 2025-02-25 7:26 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski, Paolo Abeni, Eric Dumazet,
Andrew Lunn
Cc: Gal Pressman, Mark Bloch, Saeed Mahameed, Leon Romanovsky,
Tariq Toukan, Cosmin Ratiu, Carolina Jubran, Shay Drory, netdev,
linux-rdma, linux-kernel, kernel test robot, Moshe Shemesh
From: Shay Drory <shayd@nvidia.com>
irq_pool_alloc() debug print can print a null string.
Fix it by providing a default string to print.
Fixes: 71e084e26414 ("net/mlx5: Allocating a pool of MSI-X vectors for SFs")
Signed-off-by: Shay Drory <shayd@nvidia.com>
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202501141055.SwfIphN0-lkp@intel.com/
Reviewed-by: Moshe Shemesh <moshe@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
---
drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
index 7db9cab9bedf..d9362eabc6a1 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
@@ -572,7 +572,7 @@ irq_pool_alloc(struct mlx5_core_dev *dev, int start, int size, char *name,
pool->min_threshold = min_threshold * MLX5_EQ_REFS_PER_IRQ;
pool->max_threshold = max_threshold * MLX5_EQ_REFS_PER_IRQ;
mlx5_core_dbg(dev, "pool->name = %s, pool->size = %d, pool->start = %d",
- name, size, start);
+ name ? name : "mlx5_pcif_pool", size, start);
return pool;
}
--
2.45.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net 3/3] net/mlx5: IRQ, Fix null string in debug print
2025-02-25 7:26 ` [PATCH net 3/3] net/mlx5: IRQ, Fix null string in debug print Tariq Toukan
@ 2025-02-25 8:42 ` Kalesh Anakkur Purayil
0 siblings, 0 replies; 6+ messages in thread
From: Kalesh Anakkur Purayil @ 2025-02-25 8:42 UTC (permalink / raw)
To: Tariq Toukan
Cc: David S. Miller, Jakub Kicinski, Paolo Abeni, Eric Dumazet,
Andrew Lunn, Gal Pressman, Mark Bloch, Saeed Mahameed,
Leon Romanovsky, Cosmin Ratiu, Carolina Jubran, Shay Drory,
netdev, linux-rdma, linux-kernel, kernel test robot,
Moshe Shemesh
[-- Attachment #1: Type: text/plain, Size: 689 bytes --]
On Tue, Feb 25, 2025 at 12:58 PM Tariq Toukan <tariqt@nvidia.com> wrote:
>
> From: Shay Drory <shayd@nvidia.com>
>
> irq_pool_alloc() debug print can print a null string.
> Fix it by providing a default string to print.
>
> Fixes: 71e084e26414 ("net/mlx5: Allocating a pool of MSI-X vectors for SFs")
> Signed-off-by: Shay Drory <shayd@nvidia.com>
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202501141055.SwfIphN0-lkp@intel.com/
> Reviewed-by: Moshe Shemesh <moshe@nvidia.com>
> Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
--
Regards,
Kalesh AP
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4239 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net 0/3] mlx5 misc fixes 2025-02-25
2025-02-25 7:26 [PATCH net 0/3] mlx5 misc fixes 2025-02-25 Tariq Toukan
` (2 preceding siblings ...)
2025-02-25 7:26 ` [PATCH net 3/3] net/mlx5: IRQ, Fix null string in debug print Tariq Toukan
@ 2025-02-27 4:00 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2025-02-27 4:00 UTC (permalink / raw)
To: Tariq Toukan
Cc: davem, kuba, pabeni, edumazet, andrew+netdev, gal, mbloch, saeedm,
leon, cratiu, cjubran, shayd, netdev, linux-rdma, linux-kernel
Hello:
This series was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Tue, 25 Feb 2025 09:26:05 +0200 you wrote:
> Hi,
>
> This small patchset provides misc bug fixes from the team to the mlx5
> core driver.
>
> Thanks,
> Tariq.
>
> [...]
Here is the summary with links:
- [net,1/3] net/mlx5: Fix vport QoS cleanup on error
https://git.kernel.org/netdev/net/c/7f3528f7d2f9
- [net,2/3] net/mlx5: Restore missing trace event when enabling vport QoS
https://git.kernel.org/netdev/net/c/47bcd9bf3d23
- [net,3/3] net/mlx5: IRQ, Fix null string in debug print
https://git.kernel.org/netdev/net/c/2f5a6014eb16
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-02-27 3:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-25 7:26 [PATCH net 0/3] mlx5 misc fixes 2025-02-25 Tariq Toukan
2025-02-25 7:26 ` [PATCH net 1/3] net/mlx5: Fix vport QoS cleanup on error Tariq Toukan
2025-02-25 7:26 ` [PATCH net 2/3] net/mlx5: Restore missing trace event when enabling vport QoS Tariq Toukan
2025-02-25 7:26 ` [PATCH net 3/3] net/mlx5: IRQ, Fix null string in debug print Tariq Toukan
2025-02-25 8:42 ` Kalesh Anakkur Purayil
2025-02-27 4:00 ` [PATCH net 0/3] mlx5 misc fixes 2025-02-25 patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox