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

Commit d34ac5cd authored by Bart Van Assche's avatar Bart Van Assche Committed by Jason Gunthorpe
Browse files

RDMA, core and ULPs: Declare ib_post_send() and ib_post_recv() arguments const 



Since neither ib_post_send() nor ib_post_recv() modify the data structure
their second argument points at, declare that argument const. This change
makes it necessary to declare the 'bad_wr' argument const too and also to
modify all ULPs that call ib_post_send(), ib_post_recv() or
ib_post_srq_recv(). This patch does not change any functionality but makes
it possible for the compiler to verify whether the
ib_post_(send|recv|srq_recv) really do not modify the posted work request.

To make this possible, only one cast had to be introduce that casts away
constness, namely in rpcrdma_post_recvs(). The only way I can think of to
avoid that cast is to introduce an additional loop in that function or to
change the data type of bad_wr from struct ib_recv_wr ** into int
(an index that refers to an element in the work request list). However,
both approaches would require even more extensive changes than this
patch.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 7bb1fafc

drivers/infiniband/core/uverbs_cmd.c

+6 −3
Original line number Diff line number Diff line
@@ -2155,7 +2155,8 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file, 
	struct ib_uverbs_post_send      cmd;

	struct ib_uverbs_post_send_resp resp;

	struct ib_uverbs_send_wr       *user_wr;

	struct ib_send_wr              *wr = NULL, *last, *next, *bad_wr;

	struct ib_send_wr              *wr = NULL, *last, *next;

	const struct ib_send_wr	       *bad_wr;

	struct ib_qp                   *qp;

	int                             i, sg_ind;

	int				is_ud;
@@ -2434,7 +2435,8 @@ ssize_t ib_uverbs_post_recv(struct ib_uverbs_file *file, 
{

	struct ib_uverbs_post_recv      cmd;

	struct ib_uverbs_post_recv_resp resp;

	struct ib_recv_wr              *wr, *next, *bad_wr;

	struct ib_recv_wr              *wr, *next;

	const struct ib_recv_wr	       *bad_wr;

	struct ib_qp                   *qp;

	ssize_t                         ret = -EINVAL;
@@ -2483,7 +2485,8 @@ ssize_t ib_uverbs_post_srq_recv(struct ib_uverbs_file *file, 
{

	struct ib_uverbs_post_srq_recv      cmd;

	struct ib_uverbs_post_srq_recv_resp resp;

	struct ib_recv_wr                  *wr, *next, *bad_wr;

	struct ib_recv_wr                  *wr, *next;

	const struct ib_recv_wr		   *bad_wr;

	struct ib_srq                      *srq;

	ssize_t                             ret = -EINVAL;

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+8 −8
Original line number Diff line number Diff line
@@ -1519,8 +1519,8 @@ int bnxt_re_query_srq(struct ib_srq *ib_srq, struct ib_srq_attr *srq_attr) 
	return 0;

}



int bnxt_re_post_srq_recv(struct ib_srq *ib_srq, struct ib_recv_wr *wr,

			  struct ib_recv_wr **bad_wr)

int bnxt_re_post_srq_recv(struct ib_srq *ib_srq, const struct ib_recv_wr *wr,

			  const struct ib_recv_wr **bad_wr)

{

	struct bnxt_re_srq *srq = container_of(ib_srq, struct bnxt_re_srq,

					       ib_srq);
@@ -2048,7 +2048,7 @@ static int bnxt_re_build_qp1_send_v2(struct bnxt_re_qp *qp, 
 * and the MAD datagram out to the provided SGE.

 */

static int bnxt_re_build_qp1_shadow_qp_recv(struct bnxt_re_qp *qp,

					    struct ib_recv_wr *wr,

					    const struct ib_recv_wr *wr,

					    struct bnxt_qplib_swqe *wqe,

					    int payload_size)

{
@@ -2361,8 +2361,8 @@ static int bnxt_re_post_send_shadow_qp(struct bnxt_re_dev *rdev, 
	return rc;

}



int bnxt_re_post_send(struct ib_qp *ib_qp, struct ib_send_wr *wr,

		      struct ib_send_wr **bad_wr)

int bnxt_re_post_send(struct ib_qp *ib_qp, const struct ib_send_wr *wr,

		      const struct ib_send_wr **bad_wr)

{

	struct bnxt_re_qp *qp = container_of(ib_qp, struct bnxt_re_qp, ib_qp);

	struct bnxt_qplib_swqe wqe;
@@ -2461,7 +2461,7 @@ int bnxt_re_post_send(struct ib_qp *ib_qp, struct ib_send_wr *wr, 


static int bnxt_re_post_recv_shadow_qp(struct bnxt_re_dev *rdev,

				       struct bnxt_re_qp *qp,

				       struct ib_recv_wr *wr)

				       const struct ib_recv_wr *wr)

{

	struct bnxt_qplib_swqe wqe;

	int rc = 0;
@@ -2494,8 +2494,8 @@ static int bnxt_re_post_recv_shadow_qp(struct bnxt_re_dev *rdev, 
	return rc;

}



int bnxt_re_post_recv(struct ib_qp *ib_qp, struct ib_recv_wr *wr,

		      struct ib_recv_wr **bad_wr)

int bnxt_re_post_recv(struct ib_qp *ib_qp, const struct ib_recv_wr *wr,

		      const struct ib_recv_wr **bad_wr)

{

	struct bnxt_re_qp *qp = container_of(ib_qp, struct bnxt_re_qp, ib_qp);

	struct bnxt_qplib_swqe wqe;

drivers/infiniband/hw/bnxt_re/ib_verbs.h

+6 −6
Original line number Diff line number Diff line
@@ -181,8 +181,8 @@ int bnxt_re_modify_srq(struct ib_srq *srq, struct ib_srq_attr *srq_attr, 
		       struct ib_udata *udata);

int bnxt_re_query_srq(struct ib_srq *srq, struct ib_srq_attr *srq_attr);

int bnxt_re_destroy_srq(struct ib_srq *srq);

int bnxt_re_post_srq_recv(struct ib_srq *srq, struct ib_recv_wr *recv_wr,

			  struct ib_recv_wr **bad_recv_wr);

int bnxt_re_post_srq_recv(struct ib_srq *srq, const struct ib_recv_wr *recv_wr,

			  const struct ib_recv_wr **bad_recv_wr);

struct ib_qp *bnxt_re_create_qp(struct ib_pd *pd,

				struct ib_qp_init_attr *qp_init_attr,

				struct ib_udata *udata);
@@ -191,10 +191,10 @@ int bnxt_re_modify_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr, 
int bnxt_re_query_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr,

		     int qp_attr_mask, struct ib_qp_init_attr *qp_init_attr);

int bnxt_re_destroy_qp(struct ib_qp *qp);

int bnxt_re_post_send(struct ib_qp *qp, struct ib_send_wr *send_wr,

		      struct ib_send_wr **bad_send_wr);

int bnxt_re_post_recv(struct ib_qp *qp, struct ib_recv_wr *recv_wr,

		      struct ib_recv_wr **bad_recv_wr);

int bnxt_re_post_send(struct ib_qp *qp, const struct ib_send_wr *send_wr,

		      const struct ib_send_wr **bad_send_wr);

int bnxt_re_post_recv(struct ib_qp *qp, const struct ib_recv_wr *recv_wr,

		      const struct ib_recv_wr **bad_recv_wr);

struct ib_cq *bnxt_re_create_cq(struct ib_device *ibdev,

				const struct ib_cq_init_attr *attr,

				struct ib_ucontext *context,

drivers/infiniband/hw/cxgb3/iwch_provider.h

+4 −4
Original line number Diff line number Diff line
@@ -326,10 +326,10 @@ enum iwch_qp_query_flags { 
};



u16 iwch_rqes_posted(struct iwch_qp *qhp);

int iwch_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,

		      struct ib_send_wr **bad_wr);

int iwch_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,

		      struct ib_recv_wr **bad_wr);

int iwch_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr,

		   const struct ib_send_wr **bad_wr);

int iwch_post_receive(struct ib_qp *ibqp, const struct ib_recv_wr *wr,

		      const struct ib_recv_wr **bad_wr);

int iwch_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc);

int iwch_post_terminate(struct iwch_qp *qhp, struct respQ_msg_t *rsp_msg);

int iwch_post_zb_read(struct iwch_ep *ep);

drivers/infiniband/hw/cxgb3/iwch_qp.c

+6 −6
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static int iwch_sgl2pbl_map(struct iwch_dev *rhp, struct ib_sge *sg_list, 
}



static int build_rdma_recv(struct iwch_qp *qhp, union t3_wr *wqe,

				struct ib_recv_wr *wr)

			   const struct ib_recv_wr *wr)

{

	int i, err = 0;

	u32 pbl_addr[T3_MAX_SGE];
@@ -286,7 +286,7 @@ static int build_rdma_recv(struct iwch_qp *qhp, union t3_wr *wqe, 
}



static int build_zero_stag_recv(struct iwch_qp *qhp, union t3_wr *wqe,

				struct ib_recv_wr *wr)

				const struct ib_recv_wr *wr)

{

	int i;

	u32 pbl_addr;
@@ -348,8 +348,8 @@ static int build_zero_stag_recv(struct iwch_qp *qhp, union t3_wr *wqe, 
	return 0;

}



int iwch_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,

		      struct ib_send_wr **bad_wr)

int iwch_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr,

		   const struct ib_send_wr **bad_wr)

{

	int err = 0;

	u8 uninitialized_var(t3_wr_flit_cnt);
@@ -463,8 +463,8 @@ int iwch_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
	return err;

}



int iwch_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,

		      struct ib_recv_wr **bad_wr)

int iwch_post_receive(struct ib_qp *ibqp, const struct ib_recv_wr *wr,

		      const struct ib_recv_wr **bad_wr)

{

	int err = 0;

	struct iwch_qp *qhp;