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

Commit dbace111 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Doug Ledford
Browse files

RDMA/core: Annotate timeout as unsigned long 



The ucma users supply timeout in u32 format, it means that any number
with most significant bit set will be converted to negative value
by various rdma_*, cma_* and sa_query functions, which treat timeout
as int.

In the lowest level, the timeout is converted back to be unsigned long.
Remove this ambiguous conversion by updating all function signatures to
receive unsigned long.

Reported-by: default avatarNoa Osherovich <noaos@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 9549c2bd

drivers/infiniband/core/addr.c

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ static void process_one_req(struct work_struct *_work) 
}



int rdma_resolve_ip(struct sockaddr *src_addr, const struct sockaddr *dst_addr,

		    struct rdma_dev_addr *addr, int timeout_ms,

		    struct rdma_dev_addr *addr, unsigned long timeout_ms,

		    void (*callback)(int status, struct sockaddr *src_addr,

				     struct rdma_dev_addr *addr, void *context),

		    bool resolve_by_gid_attr, void *context)

drivers/infiniband/core/cma.c

+6 −5
Original line number Diff line number Diff line
@@ -2510,8 +2510,8 @@ static void cma_query_handler(int status, struct sa_path_rec *path_rec, 
	queue_work(cma_wq, &work->work);

}



static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms,

			      struct cma_work *work)

static int cma_query_ib_route(struct rdma_id_private *id_priv,

			      unsigned long timeout_ms, struct cma_work *work)

{

	struct rdma_dev_addr *dev_addr = &id_priv->id.route.addr.dev_addr;

	struct sa_path_rec path_rec;
@@ -2629,7 +2629,8 @@ static void cma_init_resolve_addr_work(struct cma_work *work, 
	work->event.event = RDMA_CM_EVENT_ADDR_RESOLVED;

}



static int cma_resolve_ib_route(struct rdma_id_private *id_priv, int timeout_ms)

static int cma_resolve_ib_route(struct rdma_id_private *id_priv,

				unsigned long timeout_ms)

{

	struct rdma_route *route = &id_priv->id.route;

	struct cma_work *work;
@@ -2852,7 +2853,7 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv) 
	return ret;

}



int rdma_resolve_route(struct rdma_cm_id *id, int timeout_ms)

int rdma_resolve_route(struct rdma_cm_id *id, unsigned long timeout_ms)

{

	struct rdma_id_private *id_priv;

	int ret;
@@ -3072,7 +3073,7 @@ static int cma_bind_addr(struct rdma_cm_id *id, struct sockaddr *src_addr, 
}



int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,

		      const struct sockaddr *dst_addr, int timeout_ms)

		      const struct sockaddr *dst_addr, unsigned long timeout_ms)

{

	struct rdma_id_private *id_priv;

	int ret;

drivers/infiniband/core/mad.c

+1 −1
Original line number Diff line number Diff line
@@ -2414,7 +2414,7 @@ static void wait_for_response(struct ib_mad_send_wr_private *mad_send_wr) 
}



void ib_reset_mad_timeout(struct ib_mad_send_wr_private *mad_send_wr,

			  int timeout_ms)

			  unsigned long timeout_ms)

{

	mad_send_wr->timeout = msecs_to_jiffies(timeout_ms);

	wait_for_response(mad_send_wr);

drivers/infiniband/core/mad_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -221,6 +221,6 @@ void ib_mad_complete_send_wr(struct ib_mad_send_wr_private *mad_send_wr, 
void ib_mark_mad_done(struct ib_mad_send_wr_private *mad_send_wr);



void ib_reset_mad_timeout(struct ib_mad_send_wr_private *mad_send_wr,

			  int timeout_ms);

			  unsigned long timeout_ms);



#endif	/* __IB_MAD_PRIV_H__ */

drivers/infiniband/core/sa.h

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ static inline void ib_sa_client_put(struct ib_sa_client *client) 
int ib_sa_mcmember_rec_query(struct ib_sa_client *client,

			     struct ib_device *device, u8 port_num, u8 method,

			     struct ib_sa_mcmember_rec *rec,

			     ib_sa_comp_mask comp_mask, int timeout_ms,

			     gfp_t gfp_mask,

			     ib_sa_comp_mask comp_mask,

			     unsigned long timeout_ms, gfp_t gfp_mask,

			     void (*callback)(int status,

					      struct ib_sa_mcmember_rec *resp,

					      void *context),