You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
124 lines
4.3 KiB
124 lines
4.3 KiB
From bd1ba9688ed45fe25f151e33657b2c50c0b4f424 Mon Sep 17 00:00:00 2001
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
|
Date: Sun, 10 May 2020 14:51:25 -0400
|
|
Subject: [PATCH 008/312] [netdrv] net/mlx5e: xsk: dynamically allocate
|
|
mlx5e_channel_param
|
|
|
|
Message-id: <20200510145245.10054-3-ahleihel@redhat.com>
|
|
Patchwork-id: 306542
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.3 BZ 1789378 v2 02/82] net/mlx5e: xsk: dynamically allocate mlx5e_channel_param
|
|
Bugzilla: 1789378
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1789378
|
|
Upstream: v5.4-rc1
|
|
|
|
commit 658688ce6c936254c34ea1f31549ec62439574aa
|
|
Author: Arnd Bergmann <arnd@arndb.de>
|
|
Date: Tue Jul 23 12:02:26 2019 +0000
|
|
|
|
net/mlx5e: xsk: dynamically allocate mlx5e_channel_param
|
|
|
|
The structure is too large to put on the stack, resulting in a
|
|
warning on 32-bit ARM:
|
|
|
|
drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c:59:5: error: stack frame size of 1344 bytes in function
|
|
'mlx5e_open_xsk' [-Werror,-Wframe-larger-than=]
|
|
|
|
Use kvzalloc() instead.
|
|
|
|
Fixes: a038e9794541 ("net/mlx5e: Add XSK zero-copy support")
|
|
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
|
Signed-off-by: Maxim Mikityanskiy <maximmi@mellanox.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
|
---
|
|
.../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 27 ++++++++++++++--------
|
|
1 file changed, 18 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
|
|
index 81efd2fbc75d..79060ee60c98 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
|
|
@@ -65,24 +65,28 @@ int mlx5e_open_xsk(struct mlx5e_priv *priv, struct mlx5e_params *params,
|
|
struct mlx5e_xsk_param *xsk, struct xdp_umem *umem,
|
|
struct mlx5e_channel *c)
|
|
{
|
|
- struct mlx5e_channel_param cparam = {};
|
|
+ struct mlx5e_channel_param *cparam;
|
|
struct dim_cq_moder icocq_moder = {};
|
|
int err;
|
|
|
|
if (!mlx5e_validate_xsk_param(params, xsk, priv->mdev))
|
|
return -EINVAL;
|
|
|
|
- mlx5e_build_xsk_cparam(priv, params, xsk, &cparam);
|
|
+ cparam = kvzalloc(sizeof(*cparam), GFP_KERNEL);
|
|
+ if (!cparam)
|
|
+ return -ENOMEM;
|
|
|
|
- err = mlx5e_open_cq(c, params->rx_cq_moderation, &cparam.rx_cq, &c->xskrq.cq);
|
|
+ mlx5e_build_xsk_cparam(priv, params, xsk, cparam);
|
|
+
|
|
+ err = mlx5e_open_cq(c, params->rx_cq_moderation, &cparam->rx_cq, &c->xskrq.cq);
|
|
if (unlikely(err))
|
|
- return err;
|
|
+ goto err_free_cparam;
|
|
|
|
- err = mlx5e_open_rq(c, params, &cparam.rq, xsk, umem, &c->xskrq);
|
|
+ err = mlx5e_open_rq(c, params, &cparam->rq, xsk, umem, &c->xskrq);
|
|
if (unlikely(err))
|
|
goto err_close_rx_cq;
|
|
|
|
- err = mlx5e_open_cq(c, params->tx_cq_moderation, &cparam.tx_cq, &c->xsksq.cq);
|
|
+ err = mlx5e_open_cq(c, params->tx_cq_moderation, &cparam->tx_cq, &c->xsksq.cq);
|
|
if (unlikely(err))
|
|
goto err_close_rq;
|
|
|
|
@@ -92,21 +96,23 @@ int mlx5e_open_xsk(struct mlx5e_priv *priv, struct mlx5e_params *params,
|
|
* is disabled and then reenabled, but the SQ continues receiving CQEs
|
|
* from the old UMEM.
|
|
*/
|
|
- err = mlx5e_open_xdpsq(c, params, &cparam.xdp_sq, umem, &c->xsksq, true);
|
|
+ err = mlx5e_open_xdpsq(c, params, &cparam->xdp_sq, umem, &c->xsksq, true);
|
|
if (unlikely(err))
|
|
goto err_close_tx_cq;
|
|
|
|
- err = mlx5e_open_cq(c, icocq_moder, &cparam.icosq_cq, &c->xskicosq.cq);
|
|
+ err = mlx5e_open_cq(c, icocq_moder, &cparam->icosq_cq, &c->xskicosq.cq);
|
|
if (unlikely(err))
|
|
goto err_close_sq;
|
|
|
|
/* Create a dedicated SQ for posting NOPs whenever we need an IRQ to be
|
|
* triggered and NAPI to be called on the correct CPU.
|
|
*/
|
|
- err = mlx5e_open_icosq(c, params, &cparam.icosq, &c->xskicosq);
|
|
+ err = mlx5e_open_icosq(c, params, &cparam->icosq, &c->xskicosq);
|
|
if (unlikely(err))
|
|
goto err_close_icocq;
|
|
|
|
+ kvfree(cparam);
|
|
+
|
|
spin_lock_init(&c->xskicosq_lock);
|
|
|
|
set_bit(MLX5E_CHANNEL_STATE_XSK, c->state);
|
|
@@ -128,6 +134,9 @@ int mlx5e_open_xsk(struct mlx5e_priv *priv, struct mlx5e_params *params,
|
|
err_close_rx_cq:
|
|
mlx5e_close_cq(&c->xskrq.cq);
|
|
|
|
+err_free_cparam:
|
|
+ kvfree(cparam);
|
|
+
|
|
return err;
|
|
}
|
|
|
|
--
|
|
2.13.6
|
|
|