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

Commit 1caa70d8 authored by Jenny Derzhavetz's avatar Jenny Derzhavetz Committed by Doug Ledford
Browse files

IB/iser: set intuitive values for mr_valid 



This parameter is described as "is mr valid indicator".
In other words, it indicates whether memory registration
is valid or not. So intuitive values would be:
mr_valid=True, when memory registration is valid and
mr_valid=False otherwise.

Signed-off-by: default avatarJenny Derzhavetz <jennyf@mellanox.com>
Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent b5f04b00

drivers/infiniband/ulp/iser/iser_memory.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -399,7 +399,7 @@ iser_reg_sig_mr(struct iscsi_iser_task *iser_task, 




	iser_set_prot_checks(iser_task->sc, &sig_attrs->check_mask);

	iser_set_prot_checks(iser_task->sc, &sig_attrs->check_mask);





	if (!pi_ctx->sig_mr_valid)

	if (pi_ctx->sig_mr_valid)

		iser_inv_rkey(iser_tx_next_wr(tx_desc), pi_ctx->sig_mr, cqe);

		iser_inv_rkey(iser_tx_next_wr(tx_desc), pi_ctx->sig_mr, cqe);





	wr = sig_handover_wr(iser_tx_next_wr(tx_desc));

	wr = sig_handover_wr(iser_tx_next_wr(tx_desc));
@@ -417,7 +417,7 @@ iser_reg_sig_mr(struct iscsi_iser_task *iser_task, 
	wr->access_flags = IB_ACCESS_LOCAL_WRITE |

	wr->access_flags = IB_ACCESS_LOCAL_WRITE |

			   IB_ACCESS_REMOTE_READ |

			   IB_ACCESS_REMOTE_READ |

			   IB_ACCESS_REMOTE_WRITE;

			   IB_ACCESS_REMOTE_WRITE;

	pi_ctx->sig_mr_valid = 0;

	pi_ctx->sig_mr_valid = 1;





	sig_reg->sge.lkey = pi_ctx->sig_mr->lkey;

	sig_reg->sge.lkey = pi_ctx->sig_mr->lkey;

	sig_reg->rkey = pi_ctx->sig_mr->rkey;

	sig_reg->rkey = pi_ctx->sig_mr->rkey;
@@ -442,7 +442,7 @@ static int iser_fast_reg_mr(struct iscsi_iser_task *iser_task, 
	struct ib_reg_wr *wr;

	struct ib_reg_wr *wr;

	int n;

	int n;





	if (!rsc->mr_valid)

	if (rsc->mr_valid)

		iser_inv_rkey(iser_tx_next_wr(tx_desc), mr, cqe);

		iser_inv_rkey(iser_tx_next_wr(tx_desc), mr, cqe);





	n = ib_map_mr_sg(mr, mem->sg, mem->size, SIZE_4K);

	n = ib_map_mr_sg(mr, mem->sg, mem->size, SIZE_4K);
@@ -463,7 +463,7 @@ static int iser_fast_reg_mr(struct iscsi_iser_task *iser_task, 
		     IB_ACCESS_REMOTE_WRITE |

		     IB_ACCESS_REMOTE_WRITE |

		     IB_ACCESS_REMOTE_READ;

		     IB_ACCESS_REMOTE_READ;





	rsc->mr_valid = 0;

	rsc->mr_valid = 1;





	reg->sge.lkey = mr->lkey;

	reg->sge.lkey = mr->lkey;

	reg->rkey = mr->rkey;

	reg->rkey = mr->rkey;

drivers/infiniband/ulp/iser/iser_verbs.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -265,7 +265,7 @@ iser_alloc_reg_res(struct ib_device *ib_device, 
		iser_err("Failed to allocate ib_fast_reg_mr err=%d\n", ret);

		iser_err("Failed to allocate ib_fast_reg_mr err=%d\n", ret);

		return ret;

		return ret;

	}

	}

	res->mr_valid = 1;

	res->mr_valid = 0;





	return 0;

	return 0;

}

}
@@ -302,7 +302,7 @@ iser_alloc_pi_ctx(struct ib_device *ib_device, 
		ret = PTR_ERR(pi_ctx->sig_mr);

		ret = PTR_ERR(pi_ctx->sig_mr);

		goto sig_mr_failure;

		goto sig_mr_failure;

	}

	}

	pi_ctx->sig_mr_valid = 1;

	pi_ctx->sig_mr_valid = 0;

	desc->pi_ctx->sig_protected = 0;

	desc->pi_ctx->sig_protected = 0;





	return 0;

	return 0;