| Message ID | 1528166576-55047-1-git-send-email-weiyongjun1@huawei.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net/mlx5e: fix error return code in mlx5e_alloc_rq() | expand |
On 05/06/2018 5:42 AM, Wei Yongjun wrote: > Fix to return error code -ENOMEM from the kvzalloc_node() error handling > case instead of 0, as done elsewhere in this function. > > Fixes: 069d11465a80 ("net/mlx5e: RX, Enhance legacy Receive Queue memory scheme") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c > index 333d4ed..89c96a0 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c > @@ -566,8 +566,10 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, > kvzalloc_node((wq_sz << rq->wqe.info.log_num_frags) * > sizeof(*rq->wqe.frags), > GFP_KERNEL, cpu_to_node(c->cpu)); > - if (!rq->wqe.frags) > + if (!rq->wqe.frags) { > + err = -ENOMEM; > goto err_free; > + } > > err = mlx5e_init_di_list(rq, params, wq_sz, c->cpu); > if (err) > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Thanks Wei! Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
From: Wei Yongjun <weiyongjun1@huawei.com> Date: Tue, 5 Jun 2018 02:42:56 +0000 > Fix to return error code -ENOMEM from the kvzalloc_node() error handling > case instead of 0, as done elsewhere in this function. > > Fixes: 069d11465a80 ("net/mlx5e: RX, Enhance legacy Receive Queue memory scheme") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Applied.
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 333d4ed..89c96a0 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -566,8 +566,10 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, kvzalloc_node((wq_sz << rq->wqe.info.log_num_frags) * sizeof(*rq->wqe.frags), GFP_KERNEL, cpu_to_node(c->cpu)); - if (!rq->wqe.frags) + if (!rq->wqe.frags) { + err = -ENOMEM; goto err_free; + } err = mlx5e_init_di_list(rq, params, wq_sz, c->cpu); if (err)
Fix to return error code -ENOMEM from the kvzalloc_node() error handling case instead of 0, as done elsewhere in this function. Fixes: 069d11465a80 ("net/mlx5e: RX, Enhance legacy Receive Queue memory scheme") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)