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

Commit 426f6059 authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[SCSI] zfcp: Use unchained mode for small ct and els requests 



The ELS ADISC and the GID_PN requests sent from zfcp fit into
unchained FSF requests. Change the FSF allocation logic to use
unchained requests whenever possible where everything fits in one
SBAL. This avoids acquiring more SBALs than necessary, especially
during zfcp recovery when things might be stalled.

Reviewed-by: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 688a1820

drivers/s390/scsi/zfcp_fsf.c

+25 −8
Original line number Original line Diff line number Diff line
@@ -1010,6 +1010,23 @@ static void zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *req) 
		send_ct->handler(send_ct->handler_data);

		send_ct->handler(send_ct->handler_data);

}

}





static void zfcp_fsf_setup_ct_els_unchained(struct qdio_buffer_element *sbale,

					    struct scatterlist *sg_req,

					    struct scatterlist *sg_resp)

{

	sbale[0].flags |= SBAL_FLAGS0_TYPE_WRITE_READ;

	sbale[2].addr   = sg_virt(sg_req);

	sbale[2].length = sg_req->length;

	sbale[3].addr   = sg_virt(sg_resp);

	sbale[3].length = sg_resp->length;

	sbale[3].flags |= SBAL_FLAGS_LAST_ENTRY;

}



static int zfcp_fsf_one_sbal(struct scatterlist *sg)

{

	return sg_is_last(sg) && sg->length <= PAGE_SIZE;

}



static int zfcp_fsf_setup_ct_els_sbals(struct zfcp_fsf_req *req,

static int zfcp_fsf_setup_ct_els_sbals(struct zfcp_fsf_req *req,

				       struct scatterlist *sg_req,

				       struct scatterlist *sg_req,

				       struct scatterlist *sg_resp,

				       struct scatterlist *sg_resp,
@@ -1020,16 +1037,16 @@ static int zfcp_fsf_setup_ct_els_sbals(struct zfcp_fsf_req *req, 
	int bytes;

	int bytes;





	if (!(feat & FSF_FEATURE_ELS_CT_CHAINED_SBALS)) {

	if (!(feat & FSF_FEATURE_ELS_CT_CHAINED_SBALS)) {

		if (sg_req->length > PAGE_SIZE || sg_resp->length > PAGE_SIZE ||

		if (!zfcp_fsf_one_sbal(sg_req) || !zfcp_fsf_one_sbal(sg_resp))

		    !sg_is_last(sg_req) || !sg_is_last(sg_resp))

			return -EOPNOTSUPP;

			return -EOPNOTSUPP;





		sbale[0].flags |= SBAL_FLAGS0_TYPE_WRITE_READ;

		zfcp_fsf_setup_ct_els_unchained(sbale, sg_req, sg_resp);

		sbale[2].addr   = sg_virt(sg_req);

		return 0;

		sbale[2].length = sg_req->length;

	}

		sbale[3].addr   = sg_virt(sg_resp);



		sbale[3].length = sg_resp->length;

	/* use single, unchained SBAL if it can hold the request */

		sbale[3].flags |= SBAL_FLAGS_LAST_ENTRY;

	if (zfcp_fsf_one_sbal(sg_req) && zfcp_fsf_one_sbal(sg_resp)) {

		zfcp_fsf_setup_ct_els_unchained(sbale, sg_req, sg_resp);

		return 0;

		return 0;

	}

	}