From: Jason Gunthorpe <jgg@nvidia.com>
Date: Tue, 22 Jun 2021 17:42:52 +0000 (-0300)
Subject: Merge tag 'v5.13-rc7' into rdma.git for-next
X-Git-Tag: accepted/tizen/unified/20230118.172025~6935^2~37
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fdcebbc2ac2cfd82a18857b0c85067fa7e8f5233;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'v5.13-rc7' into rdma.git for-next

Linux 5.13-rc7

Needed for dependencies in following patches. Merge conflict in rxe_cmop.c
resolved by compining both patches.

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---

fdcebbc2ac2cfd82a18857b0c85067fa7e8f5233
diff --cc drivers/infiniband/hw/mlx5/doorbell.c
index 913af75,7af4df7..9ca2e61
--- a/drivers/infiniband/hw/mlx5/doorbell.c
+++ b/drivers/infiniband/hw/mlx5/doorbell.c
@@@ -41,9 -41,11 +41,10 @@@ struct mlx5_ib_user_db_page 
  	struct ib_umem	       *umem;
  	unsigned long		user_virt;
  	int			refcnt;
+ 	struct mm_struct	*mm;
  };
  
 -int mlx5_ib_db_map_user(struct mlx5_ib_ucontext *context,
 -			struct ib_udata *udata, unsigned long virt,
 +int mlx5_ib_db_map_user(struct mlx5_ib_ucontext *context, unsigned long virt,
  			struct mlx5_db *db)
  {
  	struct mlx5_ib_user_db_page *page;
diff --cc drivers/infiniband/sw/rxe/rxe_comp.c
index d4ceb81,a6712e3..58ad9c2
--- a/drivers/infiniband/sw/rxe/rxe_comp.c
+++ b/drivers/infiniband/sw/rxe/rxe_comp.c
@@@ -349,9 -345,11 +349,11 @@@ static inline enum comp_state do_read(s
  
  	ret = copy_data(qp->pd, IB_ACCESS_LOCAL_WRITE,
  			&wqe->dma, payload_addr(pkt),
 -			payload_size(pkt), to_mr_obj, NULL);
 +			payload_size(pkt), RXE_TO_MR_OBJ, NULL);
- 	if (ret)
+ 	if (ret) {
+ 		wqe->status = IB_WC_LOC_PROT_ERR;
  		return COMPST_ERROR;
+ 	}
  
  	if (wqe->dma.resid == 0 && (pkt->mask & RXE_END_MASK))
  		return COMPST_COMP_ACK;
@@@ -369,11 -367,13 +371,13 @@@ static inline enum comp_state do_atomic
  
  	ret = copy_data(qp->pd, IB_ACCESS_LOCAL_WRITE,
  			&wqe->dma, &atomic_orig,
 -			sizeof(u64), to_mr_obj, NULL);
 +			sizeof(u64), RXE_TO_MR_OBJ, NULL);
- 	if (ret)
+ 	if (ret) {
+ 		wqe->status = IB_WC_LOC_PROT_ERR;
  		return COMPST_ERROR;
- 	else
- 		return COMPST_COMP_ACK;
+ 	}
+ 
+ 	return COMPST_COMP_ACK;
  }
  
  static void make_send_cqe(struct rxe_qp *qp, struct rxe_send_wqe *wqe,