ce43ae2123
Some iSCSI initiators send a Data-OUT PDU sequence whose PDUs do not have block size multiples data. SPDK iSCSI target had replied SCSI write error to such initiators because previously we had sent a write subtask per Data-OUT PDU. SPDK SCSI library had rejected the write subtask because its data was not block size multiples. This patch fixes the issue. The idea is to aggregate multiple Data-OUT PDUs into a single write subtask up to 64KB or until F bit is set. MaxRecvDataSegmentLength is 64KB but MaxBurstLength is 1MB. Hence one Data-OUT PDU data may be split into multiple data buffers, but the maximum number of split is two. When processing the data segment of the Data-OUT PDU, save the data buffer of the current PDU to the current task if the data buffer is not full and F bit is not set. In this case, write subtask is not submitted. When processing the header of the Data-OUT PDU, if the current task saves the data buffer from the last Data-OUT PDU, it passes the data buffer to the Data-OUT PDU. When reading the data segment of the current PDU, attach the second data buffer to the current PDU if the first data buffer becomes full. These are enabled only if DIF is disabled. Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Change-Id: Ib9cfb53fe8c0807a63e58c61bed3bb52f60f4830 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6439 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
198 lines
5.2 KiB
C
198 lines
5.2 KiB
C
/*-
|
|
* BSD LICENSE
|
|
*
|
|
* Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
|
|
* Copyright (c) Intel Corporation.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* * Neither the name of Intel Corporation nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef SPDK_ISCSI_TASK_H
|
|
#define SPDK_ISCSI_TASK_H
|
|
|
|
#include "iscsi/iscsi.h"
|
|
#include "spdk/scsi.h"
|
|
#include "spdk/util.h"
|
|
|
|
struct spdk_iscsi_task {
|
|
struct spdk_scsi_task scsi;
|
|
|
|
struct spdk_iscsi_task *parent;
|
|
|
|
struct spdk_iscsi_conn *conn;
|
|
struct spdk_iscsi_pdu *pdu;
|
|
struct spdk_mobj *mobj;
|
|
uint32_t outstanding_r2t;
|
|
|
|
uint32_t desired_data_transfer_length;
|
|
|
|
/* Only valid for Read/Write */
|
|
uint32_t bytes_completed;
|
|
|
|
uint32_t data_out_cnt;
|
|
|
|
/*
|
|
* Tracks the current offset of large read or write io.
|
|
*/
|
|
uint32_t current_data_offset;
|
|
|
|
/*
|
|
* next_expected_r2t_offset is used when we receive
|
|
* the DataOUT PDU.
|
|
*/
|
|
uint32_t next_expected_r2t_offset;
|
|
|
|
/*
|
|
* Tracks the length of the R2T that is in progress.
|
|
* Used to check that an R2T burst does not exceed
|
|
* MaxBurstLength.
|
|
*/
|
|
uint32_t current_r2t_length;
|
|
|
|
/*
|
|
* next_r2t_offset is used when we are sending the
|
|
* R2T packet to keep track of next offset of r2t.
|
|
*/
|
|
uint32_t next_r2t_offset;
|
|
uint32_t R2TSN;
|
|
uint32_t r2t_datasn; /* record next datasn for a r2tsn */
|
|
uint32_t acked_r2tsn; /* next r2tsn to be acked */
|
|
uint32_t datain_datasn;
|
|
uint32_t acked_data_sn; /* next expected datain datasn */
|
|
uint32_t ttt;
|
|
bool is_r2t_active;
|
|
|
|
uint32_t tag;
|
|
|
|
/**
|
|
* Record the lun id just in case the lun is invalid,
|
|
* which will happen when hot removing the lun.
|
|
*/
|
|
int lun_id;
|
|
|
|
struct spdk_poller *mgmt_poller;
|
|
|
|
TAILQ_ENTRY(spdk_iscsi_task) link;
|
|
|
|
TAILQ_HEAD(subtask_list, spdk_iscsi_task) subtask_list;
|
|
TAILQ_ENTRY(spdk_iscsi_task) subtask_link;
|
|
bool is_queued; /* is queued in scsi layer for handling */
|
|
};
|
|
|
|
static inline void
|
|
iscsi_task_put(struct spdk_iscsi_task *task)
|
|
{
|
|
spdk_scsi_task_put(&task->scsi);
|
|
}
|
|
|
|
static inline struct spdk_iscsi_pdu *
|
|
iscsi_task_get_pdu(struct spdk_iscsi_task *task)
|
|
{
|
|
return task->pdu;
|
|
}
|
|
|
|
static inline void
|
|
iscsi_task_set_pdu(struct spdk_iscsi_task *task, struct spdk_iscsi_pdu *pdu)
|
|
{
|
|
task->pdu = pdu;
|
|
}
|
|
|
|
static inline struct iscsi_bhs *
|
|
iscsi_task_get_bhs(struct spdk_iscsi_task *task)
|
|
{
|
|
return &iscsi_task_get_pdu(task)->bhs;
|
|
}
|
|
|
|
static inline void
|
|
iscsi_task_associate_pdu(struct spdk_iscsi_task *task, struct spdk_iscsi_pdu *pdu)
|
|
{
|
|
iscsi_task_set_pdu(task, pdu);
|
|
pdu->ref++;
|
|
}
|
|
|
|
static inline void
|
|
iscsi_task_disassociate_pdu(struct spdk_iscsi_task *task)
|
|
{
|
|
if (iscsi_task_get_pdu(task)) {
|
|
iscsi_put_pdu(iscsi_task_get_pdu(task));
|
|
iscsi_task_set_pdu(task, NULL);
|
|
}
|
|
}
|
|
|
|
static inline int
|
|
iscsi_task_is_immediate(struct spdk_iscsi_task *task)
|
|
{
|
|
struct iscsi_bhs_scsi_req *scsi_req;
|
|
|
|
scsi_req = (struct iscsi_bhs_scsi_req *)iscsi_task_get_bhs(task);
|
|
return (scsi_req->immediate == 1);
|
|
}
|
|
|
|
static inline int
|
|
iscsi_task_is_read(struct spdk_iscsi_task *task)
|
|
{
|
|
struct iscsi_bhs_scsi_req *scsi_req;
|
|
|
|
scsi_req = (struct iscsi_bhs_scsi_req *)iscsi_task_get_bhs(task);
|
|
return (scsi_req->read_bit == 1);
|
|
}
|
|
|
|
struct spdk_iscsi_task *iscsi_task_get(struct spdk_iscsi_conn *conn,
|
|
struct spdk_iscsi_task *parent,
|
|
spdk_scsi_task_cpl cpl_fn);
|
|
|
|
static inline struct spdk_iscsi_task *
|
|
iscsi_task_from_scsi_task(struct spdk_scsi_task *task)
|
|
{
|
|
return SPDK_CONTAINEROF(task, struct spdk_iscsi_task, scsi);
|
|
}
|
|
|
|
static inline struct spdk_iscsi_task *
|
|
iscsi_task_get_primary(struct spdk_iscsi_task *task)
|
|
{
|
|
if (task->parent) {
|
|
return task->parent;
|
|
} else {
|
|
return task;
|
|
}
|
|
}
|
|
|
|
static inline void
|
|
iscsi_task_set_mobj(struct spdk_iscsi_task *task, struct spdk_mobj *mobj)
|
|
{
|
|
task->mobj = mobj;
|
|
}
|
|
|
|
static inline struct spdk_mobj *
|
|
iscsi_task_get_mobj(struct spdk_iscsi_task *task)
|
|
{
|
|
return task->mobj;
|
|
}
|
|
|
|
#endif /* SPDK_ISCSI_TASK_H */
|