Merge pull request #782 from a-ilango/v1.5.x

Cherry picked bug fixes for v1.5.x
ofiwg · Dec 18, 2017 · 05de781 · 05de781
2 parents 99dda99 + 749f5f2
commit 05de781
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/complex/ft_domain.c b/complex/ft_domain.c
@@ -191,8 +191,9 @@ static int ft_setup_xcontrol_bufs(struct ft_xcontrol *ctrl)
 		memset(ctrl->buf, 0, size);
 	}
 
-	if ((fabric_info->mode & FI_LOCAL_MR) && !ctrl->mr) {
-		ret = fi_mr_reg(domain, ctrl->buf, size, FI_RECV | FI_SEND,
+	if ((fabric_info->domain_attr->mr_mode & FI_MR_LOCAL) && !ctrl->mr) {
+		ret = fi_mr_reg(domain, ctrl->buf, size,
+				ft_info_to_mr_access(fabric_info),
 				0, 0, 0, &ctrl->mr, NULL);
 		if (ret) {
 			FT_PRINTERR("fi_mr_reg", ret);
@@ -238,7 +239,7 @@ static int ft_setup_atomic_control(struct ft_atomic_control *ctrl)
 		memset(ctrl->orig_buf, 0, size);
 	}
 
-	if (fabric_info->mode & FI_LOCAL_MR) {
+	if (fabric_info->domain_attr->mr_mode & FI_MR_LOCAL) {
 		access = FI_READ | FI_WRITE | FI_REMOTE_READ | FI_REMOTE_WRITE;
 		if (!ctrl->res_mr) {
 			ret = fi_mr_reg(domain, ctrl->res_buf, size, access,

diff --git a/complex/ft_msg.c b/complex/ft_msg.c
@@ -261,7 +261,7 @@ static int ft_post_send_rma(void)
 	switch (test_info.class_function) {
 	case FT_FUNC_READ:
 		ft_send_retry(ret, fi_read, ft_tx_ctrl.ep, ft_tx_ctrl.buf,
-			ft_tx_ctrl.rma_msg_size, ft_mr_ctrl.memdesc,
+			ft_tx_ctrl.rma_msg_size, ft_tx_ctrl.memdesc,
 			ft_tx_ctrl.addr, 0, ft_mr_ctrl.mr_key, ctx);
 		ft_tx_ctrl.credits--;
 		break;
@@ -333,7 +333,7 @@ static int ft_post_send_rma(void)
 		break;
 	case FT_FUNC_WRITEDATA:
 		ft_send_retry(ret, fi_writedata, ft_tx_ctrl.ep, ft_tx_ctrl.buf,
-			ft_tx_ctrl.rma_msg_size, ft_mr_ctrl.memdesc, ft_tx_ctrl.remote_cq_data,
+			ft_tx_ctrl.rma_msg_size, ft_tx_ctrl.memdesc, ft_tx_ctrl.remote_cq_data,
 			ft_tx_ctrl.addr, 0, ft_mr_ctrl.mr_key, ctx);
 		ft_tx_ctrl.credits--;
 		break;
@@ -344,7 +344,7 @@ static int ft_post_send_rma(void)
 		break;
 	default:
 		ft_send_retry(ret, fi_write, ft_tx_ctrl.ep, ft_tx_ctrl.buf,
-			ft_tx_ctrl.rma_msg_size, ft_mr_ctrl.memdesc,
+			ft_tx_ctrl.rma_msg_size, ft_tx_ctrl.memdesc,
 			ft_tx_ctrl.addr, 0, ft_mr_ctrl.mr_key, ctx);
 		ft_tx_ctrl.credits--;
 		break;
@@ -599,7 +599,7 @@ static int ft_send_rma_sync(void)
 		return ret;
 
 	ft_send_retry(ret, fi_writedata, ft_tx_ctrl.ep, ft_tx_ctrl.buf,
-		0, ft_mr_ctrl.memdesc, ft_tx_ctrl.remote_cq_data,
+		0, ft_tx_ctrl.memdesc, ft_tx_ctrl.remote_cq_data,
 		ft_tx_ctrl.addr, 0, ft_mr_ctrl.mr_key, ctx);
 	ft_tx_ctrl.credits--;
 	return ret;