svn commit: r354993 - in stable/12/sys: contrib/rdma/krping ofed/include/rdma

[Hans Petter Selasky]

Author: hselasky
Date: Fri Nov 22 14:18:12 2019
New Revision: 354993
URL: https://svnweb.freebsd.org/changeset/base/354993

Log:
  MFC r354727:
  Correct MR length field to be 64-bit in ibcore.
  
  Linux commit:
  edd31551148c09608feee6b8756ad148d550ee3b
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/12/sys/contrib/rdma/krping/krping.c
  stable/12/sys/ofed/include/rdma/ib_verbs.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/contrib/rdma/krping/krping.c
==============================================================================
--- stable/12/sys/contrib/rdma/krping/krping.c	Fri Nov 22 10:15:15 2019	(r354992)
+++ stable/12/sys/contrib/rdma/krping/krping.c	Fri Nov 22 14:18:12 2019	(r354993)
@@ -736,7 +736,7 @@ static u32 krping_rdma_rkey(struct krping_cb *cb, u64 
 		post_inv,
 		cb->reg_mr_wr.key,
 		cb->reg_mr->page_size,
-		cb->reg_mr->length,
+		(unsigned)cb->reg_mr->length,
 	        (unsigned long long)cb->reg_mr->iova);
 
 	if (post_inv)

Modified: stable/12/sys/ofed/include/rdma/ib_verbs.h
==============================================================================
--- stable/12/sys/ofed/include/rdma/ib_verbs.h	Fri Nov 22 10:15:15 2019	(r354992)
+++ stable/12/sys/ofed/include/rdma/ib_verbs.h	Fri Nov 22 14:18:12 2019	(r354993)
@@ -1559,7 +1559,7 @@ struct ib_mr {
 	u32		   lkey;
 	u32		   rkey;
 	u64		   iova;
-	u32		   length;
+	u64		   length;
 	unsigned int	   page_size;
 	bool		   need_inval;
 	union {