admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

reconnect: we need to reset the in/out iovectors on reconnect

Browse Source 
This is a bug that has been there a long time.
When we reconnect and requeue a PDU we must reset the iovectors
for the task. Otherwise, any partially sent/received data when the
command is reconnected would end up containing garbage.

Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2015-02-24 06:54:18 -08:00
parent 76f8296dbb
commit 6822baee3f
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/iscsi-private.h
View File

@@ -324,6 +324,7 @@ void iscsi_set_error(struct iscsi_context *iscsi, const char *error_string,
struct scsi_iovector *iscsi_get_scsi_task_iovector_in(struct iscsi_context *iscsi, struct iscsi_in_pdu *in); struct scsi_iovector *iscsi_get_scsi_task_iovector_in(struct iscsi_context *iscsi, struct iscsi_in_pdu *in);
struct scsi_iovector *iscsi_get_scsi_task_iovector_out(struct iscsi_context *iscsi, struct iscsi_pdu *pdu); struct scsi_iovector *iscsi_get_scsi_task_iovector_out(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
void scsi_task_reset_iov(struct scsi_iovector *iovector);
void* iscsi_malloc(struct iscsi_context *iscsi, size_t size); void* iscsi_malloc(struct iscsi_context *iscsi, size_t size);
void* iscsi_zmalloc(struct iscsi_context *iscsi, size_t size); void* iscsi_zmalloc(struct iscsi_context *iscsi, size_t size);

3
lib/connect.c
View File

@@ -351,6 +351,9 @@ try_again:
continue; continue;
} }
scsi_task_reset_iov(&pdu->scsi_cbdata.task->iovector_in);
scsi_task_reset_iov(&pdu->scsi_cbdata.task->iovector_out);
/* We pass NULL as 'd' since any databuffer has already /* We pass NULL as 'd' since any databuffer has already
* been converted to a task-> iovector first time this * been converted to a task-> iovector first time this
* PDU was sent. * PDU was sent.

8
lib/scsi-lowlevel.c
View File

@@ -3817,6 +3817,14 @@ scsi_task_set_iov_in(struct scsi_task *task, struct scsi_iovec *iov, int niov)
task->iovector_in.niov = niov; task->iovector_in.niov = niov;
} }
void
scsi_task_reset_iov(struct scsi_iovector *iovector)
{
iovector->nalloc = 0;
iovector->offset = 0;
iovector->consumed = 0;
}
#define IOVECTOR_INITAL_ALLOC (16) #define IOVECTOR_INITAL_ALLOC (16)
static int static int