lkml.org 
[lkml]   [2020]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 080/312] net/mlx5: use mlx5_buf_alloc_node instead of mlx5_buf_alloc in mlx5_wq_ll_create
    Date
    From: Wang Sheng-Hui <shhuiw@foxmail.com>

    commit f299a02d5f13c4deb52c1a7ddf2b42630fe6294a upstream.

    Commit 311c7c71c9bb ("net/mlx5e: Allocate DMA coherent memory on
    reader NUMA node") introduced mlx5_*_alloc_node() but missed changing
    some calling and warn messages. This patch introduces 2 changes:
    * Use mlx5_buf_alloc_node() instead of mlx5_buf_alloc() in
    mlx5_wq_ll_create()
    * Update the failure warn messages with _node postfix for
    mlx5_*_alloc function names

    Fixes: 311c7c71c9bb ("net/mlx5e: Allocate DMA coherent memory on reader NUMA node")
    Signed-off-by: Wang Sheng-Hui <shhuiw@foxmail.com>
    Acked-By: Saeed Mahameed <saeedm@mellanox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/ethernet/mellanox/mlx5/core/wq.c | 15 ++++++++-------
    1 file changed, 8 insertions(+), 7 deletions(-)

    --- a/drivers/net/ethernet/mellanox/mlx5/core/wq.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/wq.c
    @@ -75,14 +75,14 @@ int mlx5_wq_cyc_create(struct mlx5_core_

    err = mlx5_db_alloc_node(mdev, &wq_ctrl->db, param->db_numa_node);
    if (err) {
    - mlx5_core_warn(mdev, "mlx5_db_alloc() failed, %d\n", err);
    + mlx5_core_warn(mdev, "mlx5_db_alloc_node() failed, %d\n", err);
    return err;
    }

    err = mlx5_buf_alloc_node(mdev, mlx5_wq_cyc_get_byte_size(wq),
    &wq_ctrl->buf, param->buf_numa_node);
    if (err) {
    - mlx5_core_warn(mdev, "mlx5_buf_alloc() failed, %d\n", err);
    + mlx5_core_warn(mdev, "mlx5_buf_alloc_node() failed, %d\n", err);
    goto err_db_free;
    }

    @@ -111,14 +111,14 @@ int mlx5_cqwq_create(struct mlx5_core_de

    err = mlx5_db_alloc_node(mdev, &wq_ctrl->db, param->db_numa_node);
    if (err) {
    - mlx5_core_warn(mdev, "mlx5_db_alloc() failed, %d\n", err);
    + mlx5_core_warn(mdev, "mlx5_db_alloc_node() failed, %d\n", err);
    return err;
    }

    err = mlx5_buf_alloc_node(mdev, mlx5_cqwq_get_byte_size(wq),
    &wq_ctrl->buf, param->buf_numa_node);
    if (err) {
    - mlx5_core_warn(mdev, "mlx5_buf_alloc() failed, %d\n", err);
    + mlx5_core_warn(mdev, "mlx5_buf_alloc_node() failed, %d\n", err);
    goto err_db_free;
    }

    @@ -148,13 +148,14 @@ int mlx5_wq_ll_create(struct mlx5_core_d

    err = mlx5_db_alloc_node(mdev, &wq_ctrl->db, param->db_numa_node);
    if (err) {
    - mlx5_core_warn(mdev, "mlx5_db_alloc() failed, %d\n", err);
    + mlx5_core_warn(mdev, "mlx5_db_alloc_node() failed, %d\n", err);
    return err;
    }

    - err = mlx5_buf_alloc(mdev, mlx5_wq_ll_get_byte_size(wq), &wq_ctrl->buf);
    + err = mlx5_buf_alloc_node(mdev, mlx5_wq_ll_get_byte_size(wq),
    + &wq_ctrl->buf, param->buf_numa_node);
    if (err) {
    - mlx5_core_warn(mdev, "mlx5_buf_alloc() failed, %d\n", err);
    + mlx5_core_warn(mdev, "mlx5_buf_alloc_node() failed, %d\n", err);
    goto err_db_free;
    }


    \
     
     \ /
      Last update: 2020-05-08 15:22    [W:4.090 / U:0.764 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site