RDMA/srpt: Report the SCSI residual to the initiator

PATCH Applied Bart Van Assche 3 participants 5 messages Nov 5, 2019 – Nov 14, 2019

Subsystems (2)

InfiniBand SCSI RDMA protocol (SRP) target

lore

Share & tools

lore

Bart Van Assche

author maintainer

2019-11-05 21:46 UTC #0 lore raw

PATCH 1/1 RDMA/srpt: Report the SCSI residual to the initiator

The code added by this patch is similar to the code that already exists in ibmvscsis_determine_resid(). This patch has been tested by running the following command:

strace sg_raw -r 1k /dev/sdb 12 00 00 00 60 00 -o inquiry.bin |&
grep resid=

Cc Honggang LI <[email protected]>

Cc Laurence Oberman <[email protected]>

Fixes a42d985bd5b2 ("ib_srpt: Initial SRP Target merge for v3.3-rc1")

Signed-off-by Bart Van Assche <[email protected]>

---
 drivers/infiniband/ulp/srpt/ib_srpt.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

drivers/infiniband/ulp/srpt/ib_srpt.c +24 -0

index 653de1583cf9..23c782e3d49a 100644
@@ -1362,9 +1362,11 @@ static int srpt_build_cmd_rsp(struct srpt_rdma_ch *ch,
 			      struct srpt_send_ioctx *ioctx, u64 tag,
 			      int status)
 {
+	struct se_cmd *cmd = &ioctx->cmd;
 	struct srp_rsp *srp_rsp;
 	const u8 *sense_data;
 	int sense_data_len, max_sense_len;
+	u32 resid = cmd->residual_count;
 
 	/*
 	 * The lowest bit of all SAM-3 status codes is zero (see also

@@ -1386,6 +1388,28 @@ static int srpt_build_cmd_rsp(struct srpt_rdma_ch *ch,
 	srp_rsp->tag = tag;
 	srp_rsp->status = status;
 
+	if (cmd->se_cmd_flags & SCF_UNDERFLOW_BIT) {
+		if (cmd->data_direction == DMA_TO_DEVICE) {
+			/* residual data from an underflow write */
+			srp_rsp->flags = SRP_RSP_FLAG_DOUNDER;
+			srp_rsp->data_out_res_cnt = cpu_to_be32(resid);
+		} else if (cmd->data_direction == DMA_FROM_DEVICE) {
+			/* residual data from an underflow read */
+			srp_rsp->flags = SRP_RSP_FLAG_DIUNDER;
+			srp_rsp->data_in_res_cnt = cpu_to_be32(resid);
+		}
+	} else if (cmd->se_cmd_flags & SCF_OVERFLOW_BIT) {
+		if (cmd->data_direction == DMA_TO_DEVICE) {
+			/* residual data from an overflow write */
+			srp_rsp->flags = SRP_RSP_FLAG_DOOVER;
+			srp_rsp->data_out_res_cnt = cpu_to_be32(resid);
+		} else if (cmd->data_direction == DMA_FROM_DEVICE) {
+			/* residual data from an overflow read */
+			srp_rsp->flags = SRP_RSP_FLAG_DIOVER;
+			srp_rsp->data_in_res_cnt = cpu_to_be32(resid);
+		}
+	}
+
 	if (sense_data_len) {
 		BUILD_BUG_ON(MIN_MAX_RSP_SIZE <= sizeof(*srp_rsp));
 		max_sense_len = ch->max_ti_iu_len - sizeof(*srp_rsp);

Bart Van Assche

author maintainer

2019-11-05 21:47 UTC #1 lore raw

Quoted 3 lines · Bart Van Assche

The code added by this patch is similar to the code that already exists in ibmvscsis_determine_resid(). This patch has been tested by running the following command: [ ... ]

(replying to my own e-mail)

This is version 2 of this patch. The only change compared to the previous version is that the datatype of 'resid' has been changed from 'int' into 'u32'.

Bart.

Honggang LI

Acked-by on v1 1/1

2019-11-06 03:13 UTC #2 lore raw

In reply to Bart Van Assche

Quoted 50 lines · Bart Van Assche

The code added by this patch is similar to the code that already exists in ibmvscsis_determine_resid(). This patch has been tested by running the following command:

strace sg_raw -r 1k /dev/sdb 12 00 00 00 60 00 -o inquiry.bin |&
grep resid=

Cc Honggang LI <[email protected]>

Cc Laurence Oberman <[email protected]>

Fixes a42d985bd5b2 ("ib_srpt: Initial SRP Target merge for v3.3-rc1")

Signed-off-by Bart Van Assche <[email protected]>

---
 drivers/infiniband/ulp/srpt/ib_srpt.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

drivers/infiniband/ulp/srpt/ib_srpt.c +17 -0

index 653de1583cf9..23c782e3d49a 100644
@@ -1362,9 +1362,11 @@ static int srpt_build_cmd_rsp(struct srpt_rdma_ch *ch,
 			      struct srpt_send_ioctx *ioctx, u64 tag,
 			      int status)
 {
+	struct se_cmd *cmd = &ioctx->cmd;
 	struct srp_rsp *srp_rsp;
 	const u8 *sense_data;
 	int sense_data_len, max_sense_len;
+	u32 resid = cmd->residual_count;
 
 	/*
 	 * The lowest bit of all SAM-3 status codes is zero (see also

@@ -1386,6 +1388,28 @@ static int srpt_build_cmd_rsp(struct srpt_rdma_ch *ch,
 	srp_rsp->tag = tag;
 	srp_rsp->status = status;
 
+	if (cmd->se_cmd_flags & SCF_UNDERFLOW_BIT) {
+		if (cmd->data_direction == DMA_TO_DEVICE) {
+			/* residual data from an underflow write */
+			srp_rsp->flags = SRP_RSP_FLAG_DOUNDER;
+			srp_rsp->data_out_res_cnt = cpu_to_be32(resid);
+		} else if (cmd->data_direction == DMA_FROM_DEVICE) {
+			/* residual data from an underflow read */
+			srp_rsp->flags = SRP_RSP_FLAG_DIUNDER;
+			srp_rsp->data_in_res_cnt = cpu_to_be32(resid);
+		}
+	} else if (cmd->se_cmd_flags & SCF_OVERFLOW_BIT) {
+		if (cmd->data_direction == DMA_TO_DEVICE) {
+			/* residual data from an overflow write */
+			srp_rsp->flags = SRP_RSP_FLAG_DOOVER;
+			srp_rsp->data_out_res_cnt = cpu_to_be32(resid);

drivers/infiniband/ulp/srpt/ib_srpt.c static int srpt_build_cmd_rsp(struct srpt_rdma_ch *ch, · line 1415

Quoted 10 lines

drivers/infiniband/ulp/srpt/ib_srpt.c +7 -0

+		} else if (cmd->data_direction == DMA_FROM_DEVICE) {
+			/* residual data from an overflow read */
+			srp_rsp->flags = SRP_RSP_FLAG_DIOVER;
+			srp_rsp->data_in_res_cnt = cpu_to_be32(resid);
+		}
+	}
+
 	if (sense_data_len) {
 		BUILD_BUG_ON(MIN_MAX_RSP_SIZE <= sizeof(*srp_rsp));
 		max_sense_len = ch->max_ti_iu_len - sizeof(*srp_rsp);

Acked-by Honggang Li <[email protected]>

Bart Van Assche

author maintainer

2019-11-14 03:53 UTC #3 lore raw

Quoted 6 lines · Honggang LI

Quoted 3 lines · Bart Van Assche
The code added by this patch is similar to the code that already exists in ibmvscsis_determine_resid(). This patch has been tested by running the following command:
[ ... ]
Acked-by Honggang Li <[email protected]>

Hi Jason,

Please let me know if you want me to repost this patch.

Thanks,

Bart.

Jason Gunthorpe

Applied

2019-11-14 14:10 UTC #4 lore raw

In reply to Bart Van Assche

Quoted 7 lines · Bart Van Assche

The code added by this patch is similar to the code that already exists in ibmvscsis_determine_resid(). This patch has been tested by running the following command:
strace sg_raw -r 1k /dev/sdb 12 00 00 00 60 00 -o inquiry.bin |&
grep resid=

Quoted 8 lines

Cc Honggang LI <[email protected]>
Cc Laurence Oberman <[email protected]>
Fixes a42d985bd5b2 ("ib_srpt: Initial SRP Target merge for v3.3-rc1")
Signed-off-by Bart Van Assche <[email protected]>
Acked-by Honggang Li <[email protected]>
---
 drivers/infiniband/ulp/srpt/ib_srpt.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

Applied to for-next, thanks

Jason