Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b9a07ee authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Saeed Mahameed
Browse files

{net, IB}/mlx5: Replace mlx5_vzalloc with kvzalloc 



Commit a7c3e901 ("mm: introduce kv[mz]alloc helpers") added
proper implementation of mlx5_vzalloc function to the MM core.

This made the mlx5_vzalloc function useless, so let's remove it.

Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 2ea659a9

drivers/infiniband/hw/mlx5/cq.c

+3 −3
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ static int create_cq_user(struct mlx5_ib_dev *dev, struct ib_udata *udata, 


	*inlen = MLX5_ST_SZ_BYTES(create_cq_in) +

		 MLX5_FLD_SZ_BYTES(create_cq_in, pas[0]) * ncont;

	*cqb = mlx5_vzalloc(*inlen);

	*cqb = kvzalloc(*inlen, GFP_KERNEL);

	if (!*cqb) {

		err = -ENOMEM;

		goto err_db;
@@ -884,7 +884,7 @@ static int create_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq, 


	*inlen = MLX5_ST_SZ_BYTES(create_cq_in) +

		 MLX5_FLD_SZ_BYTES(create_cq_in, pas[0]) * cq->buf.buf.npages;

	*cqb = mlx5_vzalloc(*inlen);

	*cqb = kvzalloc(*inlen, GFP_KERNEL);

	if (!*cqb) {

		err = -ENOMEM;

		goto err_buf;
@@ -1314,7 +1314,7 @@ int mlx5_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata) 
	inlen = MLX5_ST_SZ_BYTES(modify_cq_in) +

		MLX5_FLD_SZ_BYTES(modify_cq_in, pas[0]) * npas;



	in = mlx5_vzalloc(inlen);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in) {

		err = -ENOMEM;

		goto ex_resize;

drivers/infiniband/hw/mlx5/mad.c

+2 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int process_pma_cmd(struct ib_device *ibdev, u8 port_num, 
			(struct ib_pma_portcounters_ext *)(out_mad->data + 40);

		int sz = MLX5_ST_SZ_BYTES(query_vport_counter_out);



		out_cnt = mlx5_vzalloc(sz);

		out_cnt = kvzalloc(sz, GFP_KERNEL);

		if (!out_cnt)

			return IB_MAD_RESULT_FAILURE;
@@ -231,7 +231,7 @@ static int process_pma_cmd(struct ib_device *ibdev, u8 port_num, 
			(struct ib_pma_portcounters *)(out_mad->data + 40);

		int sz = MLX5_ST_SZ_BYTES(ppcnt_reg);



		out_cnt = mlx5_vzalloc(sz);

		out_cnt = kvzalloc(sz, GFP_KERNEL);

		if (!out_cnt)

			return IB_MAD_RESULT_FAILURE;

drivers/infiniband/hw/mlx5/main.c

+3 −3
Original line number Diff line number Diff line
@@ -2263,7 +2263,7 @@ static struct mlx5_ib_flow_handler *create_flow_rule(struct mlx5_ib_dev *dev, 
	if (!is_valid_attr(dev->mdev, flow_attr))

		return ERR_PTR(-EINVAL);



	spec = mlx5_vzalloc(sizeof(*spec));

	spec = kvzalloc(sizeof(*spec), GFP_KERNEL);

	handler = kzalloc(sizeof(*handler), GFP_KERNEL);

	if (!handler || !spec) {

		err = -ENOMEM;
@@ -3456,7 +3456,7 @@ static int mlx5_ib_query_q_counters(struct mlx5_ib_dev *dev, 
	__be32 val;

	int ret, i;



	out = mlx5_vzalloc(outlen);

	out = kvzalloc(outlen, GFP_KERNEL);

	if (!out)

		return -ENOMEM;
@@ -3485,7 +3485,7 @@ static int mlx5_ib_query_cong_counters(struct mlx5_ib_dev *dev, 
	int ret, i;

	int offset = port->cnts.num_q_counters;



	out = mlx5_vzalloc(outlen);

	out = kvzalloc(outlen, GFP_KERNEL);

	if (!out)

		return -ENOMEM;

drivers/infiniband/hw/mlx5/mr.c

+1 −1
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ static struct mlx5_ib_mr *reg_create(struct ib_mr *ibmr, struct ib_pd *pd, 


	inlen = MLX5_ST_SZ_BYTES(create_mkey_in) +

		sizeof(*pas) * ((npages + 1) / 2) * 2;

	in = mlx5_vzalloc(inlen);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in) {

		err = -ENOMEM;

		goto err_1;

drivers/infiniband/hw/mlx5/qp.c

+16 −16
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ static int create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd, 


	*inlen = MLX5_ST_SZ_BYTES(create_qp_in) +

		 MLX5_FLD_SZ_BYTES(create_qp_in, pas[0]) * ncont;

	*in = mlx5_vzalloc(*inlen);

	*in = kvzalloc(*inlen, GFP_KERNEL);

	if (!*in) {

		err = -ENOMEM;

		goto err_umem;
@@ -931,7 +931,7 @@ static int create_kernel_qp(struct mlx5_ib_dev *dev, 
	qp->sq.qend = mlx5_get_send_wqe(qp, qp->sq.wqe_cnt);

	*inlen = MLX5_ST_SZ_BYTES(create_qp_in) +

		 MLX5_FLD_SZ_BYTES(create_qp_in, pas[0]) * qp->buf.npages;

	*in = mlx5_vzalloc(*inlen);

	*in = kvzalloc(*inlen, GFP_KERNEL);

	if (!*in) {

		err = -ENOMEM;

		goto err_buf;
@@ -1060,7 +1060,7 @@ static int create_raw_packet_qp_sq(struct mlx5_ib_dev *dev, 
		return err;



	inlen = MLX5_ST_SZ_BYTES(create_sq_in) + sizeof(u64) * ncont;

	in = mlx5_vzalloc(inlen);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in) {

		err = -ENOMEM;

		goto err_umem;
@@ -1140,7 +1140,7 @@ static int create_raw_packet_qp_rq(struct mlx5_ib_dev *dev, 
	u32 rq_pas_size = get_rq_pas_size(qpc);



	inlen = MLX5_ST_SZ_BYTES(create_rq_in) + rq_pas_size;

	in = mlx5_vzalloc(inlen);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in)

		return -ENOMEM;
@@ -1193,7 +1193,7 @@ static int create_raw_packet_qp_tir(struct mlx5_ib_dev *dev, 
	int err;



	inlen = MLX5_ST_SZ_BYTES(create_tir_in);

	in = mlx5_vzalloc(inlen);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in)

		return -ENOMEM;
@@ -1372,7 +1372,7 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, 
	}



	inlen = MLX5_ST_SZ_BYTES(create_tir_in);

	in = mlx5_vzalloc(inlen);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in)

		return -ENOMEM;
@@ -1633,7 +1633,7 @@ static int create_qp_common(struct mlx5_ib_dev *dev, struct ib_pd *pd, 
		if (err)

			return err;

	} else {

		in = mlx5_vzalloc(inlen);

		in = kvzalloc(inlen, GFP_KERNEL);

		if (!in)

			return -ENOMEM;
@@ -2164,7 +2164,7 @@ static int modify_raw_packet_eth_prio(struct mlx5_core_dev *dev, 
	int err;



	inlen = MLX5_ST_SZ_BYTES(modify_tis_in);

	in = mlx5_vzalloc(inlen);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in)

		return -ENOMEM;
@@ -2189,7 +2189,7 @@ static int modify_raw_packet_tx_affinity(struct mlx5_core_dev *dev, 
	int err;



	inlen = MLX5_ST_SZ_BYTES(modify_tis_in);

	in = mlx5_vzalloc(inlen);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in)

		return -ENOMEM;
@@ -2434,7 +2434,7 @@ static int modify_raw_packet_qp_rq(struct mlx5_ib_dev *dev, 
	int err;



	inlen = MLX5_ST_SZ_BYTES(modify_rq_in);

	in = mlx5_vzalloc(inlen);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in)

		return -ENOMEM;
@@ -2479,7 +2479,7 @@ static int modify_raw_packet_qp_sq(struct mlx5_core_dev *dev, 
	int err;



	inlen = MLX5_ST_SZ_BYTES(modify_sq_in);

	in = mlx5_vzalloc(inlen);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in)

		return -ENOMEM;
@@ -4294,7 +4294,7 @@ static int query_raw_packet_qp_sq_state(struct mlx5_ib_dev *dev, 
	int err;



	inlen = MLX5_ST_SZ_BYTES(query_sq_out);

	out = mlx5_vzalloc(inlen);

	out = kvzalloc(inlen, GFP_KERNEL);

	if (!out)

		return -ENOMEM;
@@ -4321,7 +4321,7 @@ static int query_raw_packet_qp_rq_state(struct mlx5_ib_dev *dev, 
	int err;



	inlen = MLX5_ST_SZ_BYTES(query_rq_out);

	out = mlx5_vzalloc(inlen);

	out = kvzalloc(inlen, GFP_KERNEL);

	if (!out)

		return -ENOMEM;
@@ -4625,7 +4625,7 @@ static int create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd, 
	dev = to_mdev(pd->device);



	inlen = MLX5_ST_SZ_BYTES(create_rq_in) + sizeof(u64) * rwq->rq_num_pas;

	in = mlx5_vzalloc(inlen);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in)

		return -ENOMEM;
@@ -4855,7 +4855,7 @@ struct ib_rwq_ind_table *mlx5_ib_create_rwq_ind_table(struct ib_device *device, 
		return ERR_PTR(-ENOMEM);



	inlen = MLX5_ST_SZ_BYTES(create_rqt_in) + sizeof(u32) * sz;

	in = mlx5_vzalloc(inlen);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in) {

		err = -ENOMEM;

		goto err;
@@ -4934,7 +4934,7 @@ int mlx5_ib_modify_wq(struct ib_wq *wq, struct ib_wq_attr *wq_attr, 
		return -EOPNOTSUPP;



	inlen = MLX5_ST_SZ_BYTES(modify_rq_in);

	in = mlx5_vzalloc(inlen);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in)

		return -ENOMEM;