Commit 29610226 authored by Daisuke Matsuda's avatar Daisuke Matsuda Committed by Leon Romanovsky
Browse files

RDMA/rxe: Fix mismatched type declarations 



Some functions return int values while they are defined as enum resp_states
variables. This patch resolves the mismatches in rxe.

Signed-off-by: default avatarDaisuke Matsuda <matsuda-daisuke@fujitsu.com>
Link: https://patch.msgid.link/20250409102701.1275265-1-matsuda-daisuke@fujitsu.com


Reviewed-by: default avatarZhu Yanjun <yanjun.zhu@linux.dev>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 9334003d

drivers/infiniband/sw/rxe/rxe_loc.h

+7 −7
Original line number Diff line number Diff line
@@ -70,9 +70,9 @@ int copy_data(struct rxe_pd *pd, int access, struct rxe_dma_info *dma, 
	      void *addr, int length, enum rxe_mr_copy_dir dir);

int rxe_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg,

		  int sg_nents, unsigned int *sg_offset);

int rxe_mr_do_atomic_op(struct rxe_mr *mr, u64 iova, int opcode,

enum resp_states rxe_mr_do_atomic_op(struct rxe_mr *mr, u64 iova, int opcode,

				     u64 compare, u64 swap_add, u64 *orig_val);

int rxe_mr_do_atomic_write(struct rxe_mr *mr, u64 iova, u64 value);

enum resp_states rxe_mr_do_atomic_write(struct rxe_mr *mr, u64 iova, u64 value);

struct rxe_mr *lookup_mr(struct rxe_pd *pd, int access, u32 key,

			 enum rxe_mr_lookup_type type);

int mr_check_range(struct rxe_mr *mr, u64 iova, size_t length);
@@ -192,7 +192,7 @@ int rxe_odp_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, 
			 u64 iova, int access_flags, struct rxe_mr *mr);

int rxe_odp_mr_copy(struct rxe_mr *mr, u64 iova, void *addr, int length,

		    enum rxe_mr_copy_dir dir);

int rxe_odp_atomic_op(struct rxe_mr *mr, u64 iova, int opcode,

enum resp_states rxe_odp_atomic_op(struct rxe_mr *mr, u64 iova, int opcode,

				   u64 compare, u64 swap_add, u64 *orig_val);

int rxe_odp_flush_pmem_iova(struct rxe_mr *mr, u64 iova,

			    unsigned int length);
@@ -208,7 +208,7 @@ static inline int rxe_odp_mr_copy(struct rxe_mr *mr, u64 iova, void *addr, 
{

	return -EOPNOTSUPP;

}

static inline int

static inline enum resp_states

rxe_odp_atomic_op(struct rxe_mr *mr, u64 iova, int opcode,

		  u64 compare, u64 swap_add, u64 *orig_val)

{

drivers/infiniband/sw/rxe/rxe_mr.c

+6 −6
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ int rxe_flush_pmem_iova(struct rxe_mr *mr, u64 start, unsigned int length) 
/* Guarantee atomicity of atomic operations at the machine level. */

DEFINE_SPINLOCK(atomic_ops_lock);



int rxe_mr_do_atomic_op(struct rxe_mr *mr, u64 iova, int opcode,

enum resp_states rxe_mr_do_atomic_op(struct rxe_mr *mr, u64 iova, int opcode,

				     u64 compare, u64 swap_add, u64 *orig_val)

{

	unsigned int page_offset;
@@ -536,12 +536,12 @@ int rxe_mr_do_atomic_op(struct rxe_mr *mr, u64 iova, int opcode, 


	kunmap_local(va);



	return 0;

	return RESPST_NONE;

}



#if defined CONFIG_64BIT

/* only implemented or called for 64 bit architectures */

int rxe_mr_do_atomic_write(struct rxe_mr *mr, u64 iova, u64 value)

enum resp_states rxe_mr_do_atomic_write(struct rxe_mr *mr, u64 iova, u64 value)

{

	unsigned int page_offset;

	struct page *page;
@@ -578,10 +578,10 @@ int rxe_mr_do_atomic_write(struct rxe_mr *mr, u64 iova, u64 value) 
	smp_store_release(&va[page_offset >> 3], value);

	kunmap_local(va);



	return 0;

	return RESPST_NONE;

}

#else

int rxe_mr_do_atomic_write(struct rxe_mr *mr, u64 iova, u64 value)

enum resp_states rxe_mr_do_atomic_write(struct rxe_mr *mr, u64 iova, u64 value)

{

	return RESPST_ERR_UNSUPPORTED_OPCODE;

}

drivers/infiniband/sw/rxe/rxe_odp.c

+6 −5
Original line number Diff line number Diff line
@@ -266,8 +266,9 @@ int rxe_odp_mr_copy(struct rxe_mr *mr, u64 iova, void *addr, int length, 
	return err;

}



static int rxe_odp_do_atomic_op(struct rxe_mr *mr, u64 iova, int opcode,

				u64 compare, u64 swap_add, u64 *orig_val)

static enum resp_states rxe_odp_do_atomic_op(struct rxe_mr *mr, u64 iova,

					     int opcode, u64 compare,

					     u64 swap_add, u64 *orig_val)

{

	struct ib_umem_odp *umem_odp = to_ib_umem_odp(mr->umem);

	unsigned int page_offset;
@@ -315,10 +316,10 @@ static int rxe_odp_do_atomic_op(struct rxe_mr *mr, u64 iova, int opcode, 


	kunmap_local(va);



	return 0;

	return RESPST_NONE;

}



int rxe_odp_atomic_op(struct rxe_mr *mr, u64 iova, int opcode,

enum resp_states rxe_odp_atomic_op(struct rxe_mr *mr, u64 iova, int opcode,

				   u64 compare, u64 swap_add, u64 *orig_val)

{

	struct ib_umem_odp *umem_odp = to_ib_umem_odp(mr->umem);