Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / net / ethernet / mellanox / mlx5 / core / en / xsk / setup.c

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 7f78c00..2c4d1f4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
@@ -60,24 +60,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;
 
@@ -87,21 +91,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);
@@ -123,6 +129,9 @@ err_close_rq:
 err_close_rx_cq:
        mlx5e_close_cq(&c->xskrq.cq);
 
+err_free_cparam:
+       kvfree(cparam);
+
        return err;
 }