2005-08-05 04:30:08 +02:00
|
|
|
/*
|
|
|
|
* iSCSI Initiator over TCP/IP Data-Path
|
|
|
|
*
|
|
|
|
* Copyright (C) 2004 Dmitry Yusupov
|
|
|
|
* Copyright (C) 2004 Alex Aizman
|
2006-04-07 04:26:46 +02:00
|
|
|
* Copyright (C) 2005 - 2006 Mike Christie
|
|
|
|
* Copyright (C) 2006 Red Hat, Inc. All rights reserved.
|
2005-08-05 04:30:08 +02:00
|
|
|
* maintained by open-iscsi@googlegroups.com
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published
|
|
|
|
* by the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* General Public License for more details.
|
|
|
|
*
|
|
|
|
* See the file COPYING included with this distribution for more details.
|
|
|
|
*
|
|
|
|
* Credits:
|
|
|
|
* Christoph Hellwig
|
|
|
|
* FUJITA Tomonori
|
|
|
|
* Arne Redlich
|
|
|
|
* Zhenyu Wang
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/list.h>
|
|
|
|
#include <linux/inet.h>
|
2007-05-30 19:57:23 +02:00
|
|
|
#include <linux/file.h>
|
2005-08-05 04:30:08 +02:00
|
|
|
#include <linux/blkdev.h>
|
|
|
|
#include <linux/crypto.h>
|
|
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/kfifo.h>
|
|
|
|
#include <linux/scatterlist.h>
|
|
|
|
#include <net/tcp.h>
|
|
|
|
#include <scsi/scsi_cmnd.h>
|
2007-05-30 19:57:21 +02:00
|
|
|
#include <scsi/scsi_device.h>
|
2005-08-05 04:30:08 +02:00
|
|
|
#include <scsi/scsi_host.h>
|
|
|
|
#include <scsi/scsi.h>
|
|
|
|
#include <scsi/scsi_transport_iscsi.h>
|
|
|
|
|
|
|
|
#include "iscsi_tcp.h"
|
|
|
|
|
|
|
|
MODULE_AUTHOR("Dmitry Yusupov <dmitry_yus@yahoo.com>, "
|
|
|
|
"Alex Aizman <itn780@yahoo.com>");
|
|
|
|
MODULE_DESCRIPTION("iSCSI/TCP data-path");
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
/* #define DEBUG_TCP */
|
|
|
|
#define DEBUG_ASSERT
|
|
|
|
|
|
|
|
#ifdef DEBUG_TCP
|
2006-04-07 04:26:46 +02:00
|
|
|
#define debug_tcp(fmt...) printk(KERN_INFO "tcp: " fmt)
|
2005-08-05 04:30:08 +02:00
|
|
|
#else
|
|
|
|
#define debug_tcp(fmt...)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef DEBUG_ASSERT
|
|
|
|
#ifdef BUG_ON
|
|
|
|
#undef BUG_ON
|
|
|
|
#endif
|
|
|
|
#define BUG_ON(expr)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static unsigned int iscsi_max_lun = 512;
|
|
|
|
module_param_named(max_lun, iscsi_max_lun, uint, S_IRUGO);
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
iscsi_buf_init_iov(struct iscsi_buf *ibuf, char *vbuf, int size)
|
|
|
|
{
|
2006-01-14 01:05:47 +01:00
|
|
|
ibuf->sg.page = virt_to_page(vbuf);
|
|
|
|
ibuf->sg.offset = offset_in_page(vbuf);
|
2005-08-05 04:30:08 +02:00
|
|
|
ibuf->sg.length = size;
|
|
|
|
ibuf->sent = 0;
|
2006-01-14 01:05:47 +01:00
|
|
|
ibuf->use_sendmsg = 1;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
iscsi_buf_init_sg(struct iscsi_buf *ibuf, struct scatterlist *sg)
|
|
|
|
{
|
2006-01-14 01:05:47 +01:00
|
|
|
ibuf->sg.page = sg->page;
|
|
|
|
ibuf->sg.offset = sg->offset;
|
|
|
|
ibuf->sg.length = sg->length;
|
2005-08-05 04:30:08 +02:00
|
|
|
/*
|
|
|
|
* Fastpath: sg element fits into single page
|
|
|
|
*/
|
2006-01-14 01:05:56 +01:00
|
|
|
if (sg->length + sg->offset <= PAGE_SIZE && !PageSlab(sg->page))
|
2006-01-14 01:05:47 +01:00
|
|
|
ibuf->use_sendmsg = 0;
|
|
|
|
else
|
|
|
|
ibuf->use_sendmsg = 1;
|
2005-08-05 04:30:08 +02:00
|
|
|
ibuf->sent = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int
|
|
|
|
iscsi_buf_left(struct iscsi_buf *ibuf)
|
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
rc = ibuf->sg.length - ibuf->sent;
|
|
|
|
BUG_ON(rc < 0);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
2005-09-13 04:01:32 +02:00
|
|
|
iscsi_hdr_digest(struct iscsi_conn *conn, struct iscsi_buf *buf,
|
|
|
|
u8* crc)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-09-23 22:33:43 +02:00
|
|
|
crypto_hash_digest(&tcp_conn->tx_hash, &buf->sg, buf->sg.length, crc);
|
2007-05-30 19:57:17 +02:00
|
|
|
buf->sg.length += sizeof(u32);
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline int
|
2006-04-07 04:26:46 +02:00
|
|
|
iscsi_hdr_extract(struct iscsi_tcp_conn *tcp_conn)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct sk_buff *skb = tcp_conn->in.skb;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.zero_copy_hdr = 0;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
if (tcp_conn->in.copy >= tcp_conn->hdr_size &&
|
|
|
|
tcp_conn->in_progress == IN_PROGRESS_WAIT_HEADER) {
|
2005-08-05 04:30:08 +02:00
|
|
|
/*
|
|
|
|
* Zero-copy PDU Header: using connection context
|
|
|
|
* to store header pointer.
|
|
|
|
*/
|
|
|
|
if (skb_shinfo(skb)->frag_list == NULL &&
|
2006-04-07 04:26:46 +02:00
|
|
|
!skb_shinfo(skb)->nr_frags) {
|
|
|
|
tcp_conn->in.hdr = (struct iscsi_hdr *)
|
|
|
|
((char*)skb->data + tcp_conn->in.offset);
|
|
|
|
tcp_conn->in.zero_copy_hdr = 1;
|
|
|
|
} else {
|
2005-08-05 04:30:08 +02:00
|
|
|
/* ignoring return code since we checked
|
|
|
|
* in.copy before */
|
2006-04-07 04:26:46 +02:00
|
|
|
skb_copy_bits(skb, tcp_conn->in.offset,
|
|
|
|
&tcp_conn->hdr, tcp_conn->hdr_size);
|
|
|
|
tcp_conn->in.hdr = &tcp_conn->hdr;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.offset += tcp_conn->hdr_size;
|
|
|
|
tcp_conn->in.copy -= tcp_conn->hdr_size;
|
2005-08-05 04:30:08 +02:00
|
|
|
} else {
|
|
|
|
int hdr_remains;
|
|
|
|
int copylen;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PDU header scattered across SKB's,
|
|
|
|
* copying it... This'll happen quite rarely.
|
|
|
|
*/
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
if (tcp_conn->in_progress == IN_PROGRESS_WAIT_HEADER)
|
|
|
|
tcp_conn->in.hdr_offset = 0;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
hdr_remains = tcp_conn->hdr_size - tcp_conn->in.hdr_offset;
|
2005-08-05 04:30:08 +02:00
|
|
|
BUG_ON(hdr_remains <= 0);
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
copylen = min(tcp_conn->in.copy, hdr_remains);
|
|
|
|
skb_copy_bits(skb, tcp_conn->in.offset,
|
|
|
|
(char*)&tcp_conn->hdr + tcp_conn->in.hdr_offset,
|
|
|
|
copylen);
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
debug_tcp("PDU gather offset %d bytes %d in.offset %d "
|
2006-04-07 04:26:46 +02:00
|
|
|
"in.copy %d\n", tcp_conn->in.hdr_offset, copylen,
|
|
|
|
tcp_conn->in.offset, tcp_conn->in.copy);
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.offset += copylen;
|
|
|
|
tcp_conn->in.copy -= copylen;
|
2005-08-05 04:30:08 +02:00
|
|
|
if (copylen < hdr_remains) {
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in_progress = IN_PROGRESS_HEADER_GATHER;
|
|
|
|
tcp_conn->in.hdr_offset += copylen;
|
2005-08-05 04:30:08 +02:00
|
|
|
return -EAGAIN;
|
|
|
|
}
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.hdr = &tcp_conn->hdr;
|
|
|
|
tcp_conn->discontiguous_hdr_cnt++;
|
|
|
|
tcp_conn->in_progress = IN_PROGRESS_WAIT_HEADER;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-04-07 04:13:39 +02:00
|
|
|
/*
|
|
|
|
* must be called with session lock
|
|
|
|
*/
|
|
|
|
static void
|
2006-07-24 22:47:15 +02:00
|
|
|
iscsi_tcp_cleanup_ctask(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
2006-07-24 22:47:15 +02:00
|
|
|
struct iscsi_r2t_info *r2t;
|
2006-04-07 04:13:39 +02:00
|
|
|
struct scsi_cmnd *sc;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-07-24 22:47:15 +02:00
|
|
|
/* flush ctask's r2t queues */
|
|
|
|
while (__kfifo_get(tcp_ctask->r2tqueue, (void*)&r2t, sizeof(void*))) {
|
|
|
|
__kfifo_put(tcp_ctask->r2tpool.queue, (void*)&r2t,
|
|
|
|
sizeof(void*));
|
|
|
|
debug_scsi("iscsi_tcp_cleanup_ctask pending r2t dropped\n");
|
|
|
|
}
|
|
|
|
|
2006-04-07 04:13:39 +02:00
|
|
|
sc = ctask->sc;
|
|
|
|
if (unlikely(!sc))
|
2005-08-05 04:30:08 +02:00
|
|
|
return;
|
2006-04-07 04:13:39 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_ctask->xmstate = XMSTATE_IDLE;
|
|
|
|
tcp_ctask->r2t = NULL;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* iscsi_data_rsp - SCSI Data-In Response processing
|
|
|
|
* @conn: iscsi connection
|
|
|
|
* @ctask: scsi command task
|
|
|
|
**/
|
|
|
|
static int
|
|
|
|
iscsi_data_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
|
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
|
|
|
struct iscsi_data_rsp *rhdr = (struct iscsi_data_rsp *)tcp_conn->in.hdr;
|
2005-08-05 04:30:08 +02:00
|
|
|
struct iscsi_session *session = conn->session;
|
2007-05-30 19:57:15 +02:00
|
|
|
struct scsi_cmnd *sc = ctask->sc;
|
2005-08-05 04:30:08 +02:00
|
|
|
int datasn = be32_to_cpu(rhdr->datasn);
|
|
|
|
|
2007-05-30 19:57:18 +02:00
|
|
|
iscsi_update_cmdsn(session, (struct iscsi_nopin*)rhdr);
|
2005-08-05 04:30:08 +02:00
|
|
|
/*
|
|
|
|
* setup Data-In byte counter (gets decremented..)
|
|
|
|
*/
|
2006-04-07 04:26:46 +02:00
|
|
|
ctask->data_count = tcp_conn->in.datalen;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
if (tcp_conn->in.datalen == 0)
|
2005-08-05 04:30:08 +02:00
|
|
|
return 0;
|
|
|
|
|
2007-05-30 19:57:14 +02:00
|
|
|
if (tcp_ctask->exp_datasn != datasn) {
|
|
|
|
debug_tcp("%s: ctask->exp_datasn(%d) != rhdr->datasn(%d)\n",
|
|
|
|
__FUNCTION__, tcp_ctask->exp_datasn, datasn);
|
2005-08-05 04:30:08 +02:00
|
|
|
return ISCSI_ERR_DATASN;
|
2007-05-30 19:57:14 +02:00
|
|
|
}
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2007-05-30 19:57:14 +02:00
|
|
|
tcp_ctask->exp_datasn++;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_ctask->data_offset = be32_to_cpu(rhdr->offset);
|
2007-06-14 15:13:17 +02:00
|
|
|
if (tcp_ctask->data_offset + tcp_conn->in.datalen > scsi_bufflen(sc)) {
|
2007-05-30 19:57:15 +02:00
|
|
|
debug_tcp("%s: data_offset(%d) + data_len(%d) > total_length_in(%d)\n",
|
|
|
|
__FUNCTION__, tcp_ctask->data_offset,
|
2007-06-14 15:13:17 +02:00
|
|
|
tcp_conn->in.datalen, scsi_bufflen(sc));
|
2005-08-05 04:30:08 +02:00
|
|
|
return ISCSI_ERR_DATA_OFFSET;
|
2007-05-30 19:57:15 +02:00
|
|
|
}
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
if (rhdr->flags & ISCSI_FLAG_DATA_STATUS) {
|
|
|
|
conn->exp_statsn = be32_to_cpu(rhdr->statsn) + 1;
|
2006-01-14 01:05:38 +01:00
|
|
|
if (rhdr->flags & ISCSI_FLAG_DATA_UNDERFLOW) {
|
2005-08-05 04:30:08 +02:00
|
|
|
int res_count = be32_to_cpu(rhdr->residual_count);
|
|
|
|
|
|
|
|
if (res_count > 0 &&
|
2007-06-14 15:13:17 +02:00
|
|
|
res_count <= scsi_bufflen(sc)) {
|
|
|
|
scsi_set_resid(sc, res_count);
|
2005-08-05 04:30:08 +02:00
|
|
|
sc->result = (DID_OK << 16) | rhdr->cmd_status;
|
|
|
|
} else
|
|
|
|
sc->result = (DID_BAD_TARGET << 16) |
|
|
|
|
rhdr->cmd_status;
|
2006-01-14 01:05:38 +01:00
|
|
|
} else if (rhdr->flags & ISCSI_FLAG_DATA_OVERFLOW) {
|
2007-06-14 15:13:17 +02:00
|
|
|
scsi_set_resid(sc, be32_to_cpu(rhdr->residual_count));
|
2005-08-05 04:30:08 +02:00
|
|
|
sc->result = (DID_OK << 16) | rhdr->cmd_status;
|
|
|
|
} else
|
|
|
|
sc->result = (DID_OK << 16) | rhdr->cmd_status;
|
|
|
|
}
|
|
|
|
|
|
|
|
conn->datain_pdus_cnt++;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* iscsi_solicit_data_init - initialize first Data-Out
|
|
|
|
* @conn: iscsi connection
|
|
|
|
* @ctask: scsi command task
|
|
|
|
* @r2t: R2T info
|
|
|
|
*
|
|
|
|
* Notes:
|
|
|
|
* Initialize first Data-Out within this R2T sequence and finds
|
|
|
|
* proper data_offset within this SCSI command.
|
|
|
|
*
|
|
|
|
* This function is called with connection lock taken.
|
|
|
|
**/
|
|
|
|
static void
|
|
|
|
iscsi_solicit_data_init(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,
|
|
|
|
struct iscsi_r2t_info *r2t)
|
|
|
|
{
|
|
|
|
struct iscsi_data *hdr;
|
|
|
|
struct scsi_cmnd *sc = ctask->sc;
|
2007-06-14 15:13:17 +02:00
|
|
|
int i, sg_count = 0;
|
|
|
|
struct scatterlist *sg;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-05-19 03:31:36 +02:00
|
|
|
hdr = &r2t->dtask.hdr;
|
2005-08-05 04:30:08 +02:00
|
|
|
memset(hdr, 0, sizeof(struct iscsi_data));
|
|
|
|
hdr->ttt = r2t->ttt;
|
|
|
|
hdr->datasn = cpu_to_be32(r2t->solicit_datasn);
|
|
|
|
r2t->solicit_datasn++;
|
|
|
|
hdr->opcode = ISCSI_OP_SCSI_DATA_OUT;
|
2006-04-07 04:26:46 +02:00
|
|
|
memcpy(hdr->lun, ctask->hdr->lun, sizeof(hdr->lun));
|
|
|
|
hdr->itt = ctask->hdr->itt;
|
2005-08-05 04:30:08 +02:00
|
|
|
hdr->exp_statsn = r2t->exp_statsn;
|
|
|
|
hdr->offset = cpu_to_be32(r2t->data_offset);
|
|
|
|
if (r2t->data_length > conn->max_xmit_dlength) {
|
|
|
|
hton24(hdr->dlength, conn->max_xmit_dlength);
|
|
|
|
r2t->data_count = conn->max_xmit_dlength;
|
|
|
|
hdr->flags = 0;
|
|
|
|
} else {
|
|
|
|
hton24(hdr->dlength, r2t->data_length);
|
|
|
|
r2t->data_count = r2t->data_length;
|
|
|
|
hdr->flags = ISCSI_FLAG_CMD_FINAL;
|
|
|
|
}
|
|
|
|
conn->dataout_pdus_cnt++;
|
|
|
|
|
|
|
|
r2t->sent = 0;
|
|
|
|
|
2006-05-19 03:31:31 +02:00
|
|
|
iscsi_buf_init_iov(&r2t->headbuf, (char*)hdr,
|
2005-09-13 04:01:32 +02:00
|
|
|
sizeof(struct iscsi_hdr));
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2007-06-14 15:13:17 +02:00
|
|
|
sg = scsi_sglist(sc);
|
|
|
|
r2t->sg = NULL;
|
|
|
|
for (i = 0; i < scsi_sg_count(sc); i++, sg += 1) {
|
|
|
|
/* FIXME: prefetch ? */
|
|
|
|
if (sg_count + sg->length > r2t->data_offset) {
|
|
|
|
int page_offset;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2007-06-14 15:13:17 +02:00
|
|
|
/* sg page found! */
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2007-06-14 15:13:17 +02:00
|
|
|
/* offset within this page */
|
|
|
|
page_offset = r2t->data_offset - sg_count;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2007-06-14 15:13:17 +02:00
|
|
|
/* fill in this buffer */
|
|
|
|
iscsi_buf_init_sg(&r2t->sendbuf, sg);
|
|
|
|
r2t->sendbuf.sg.offset += page_offset;
|
|
|
|
r2t->sendbuf.sg.length -= page_offset;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2007-06-14 15:13:17 +02:00
|
|
|
/* xmit logic will continue with next one */
|
|
|
|
r2t->sg = sg + 1;
|
|
|
|
break;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
2007-06-14 15:13:17 +02:00
|
|
|
sg_count += sg->length;
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
}
|
2007-06-14 15:13:17 +02:00
|
|
|
BUG_ON(r2t->sg == NULL);
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* iscsi_r2t_rsp - iSCSI R2T Response processing
|
|
|
|
* @conn: iscsi connection
|
|
|
|
* @ctask: scsi command task
|
|
|
|
**/
|
|
|
|
static int
|
|
|
|
iscsi_r2t_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
|
|
|
|
{
|
|
|
|
struct iscsi_r2t_info *r2t;
|
|
|
|
struct iscsi_session *session = conn->session;
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
|
|
|
struct iscsi_r2t_rsp *rhdr = (struct iscsi_r2t_rsp *)tcp_conn->in.hdr;
|
2005-08-05 04:30:08 +02:00
|
|
|
int r2tsn = be32_to_cpu(rhdr->r2tsn);
|
|
|
|
int rc;
|
|
|
|
|
2006-09-01 00:09:26 +02:00
|
|
|
if (tcp_conn->in.datalen) {
|
|
|
|
printk(KERN_ERR "iscsi_tcp: invalid R2t with datalen %d\n",
|
|
|
|
tcp_conn->in.datalen);
|
2005-08-05 04:30:08 +02:00
|
|
|
return ISCSI_ERR_DATALEN;
|
2006-09-01 00:09:26 +02:00
|
|
|
}
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2007-05-30 19:57:14 +02:00
|
|
|
if (tcp_ctask->exp_datasn != r2tsn){
|
|
|
|
debug_tcp("%s: ctask->exp_datasn(%d) != rhdr->r2tsn(%d)\n",
|
|
|
|
__FUNCTION__, tcp_ctask->exp_datasn, r2tsn);
|
2005-08-05 04:30:08 +02:00
|
|
|
return ISCSI_ERR_R2TSN;
|
2007-05-30 19:57:14 +02:00
|
|
|
}
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
/* fill-in new R2T associated with the task */
|
|
|
|
spin_lock(&session->lock);
|
2007-05-30 19:57:18 +02:00
|
|
|
iscsi_update_cmdsn(session, (struct iscsi_nopin*)rhdr);
|
|
|
|
|
2005-08-05 04:30:08 +02:00
|
|
|
if (!ctask->sc || ctask->mtask ||
|
|
|
|
session->state != ISCSI_STATE_LOGGED_IN) {
|
|
|
|
printk(KERN_INFO "iscsi_tcp: dropping R2T itt %d in "
|
|
|
|
"recovery...\n", ctask->itt);
|
|
|
|
spin_unlock(&session->lock);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-07-24 22:47:15 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
rc = __kfifo_get(tcp_ctask->r2tpool.queue, (void*)&r2t, sizeof(void*));
|
2005-08-05 04:30:08 +02:00
|
|
|
BUG_ON(!rc);
|
|
|
|
|
|
|
|
r2t->exp_statsn = rhdr->statsn;
|
|
|
|
r2t->data_length = be32_to_cpu(rhdr->data_length);
|
2006-09-01 00:09:26 +02:00
|
|
|
if (r2t->data_length == 0) {
|
|
|
|
printk(KERN_ERR "iscsi_tcp: invalid R2T with zero data len\n");
|
2005-08-05 04:30:08 +02:00
|
|
|
spin_unlock(&session->lock);
|
|
|
|
return ISCSI_ERR_DATALEN;
|
|
|
|
}
|
|
|
|
|
2006-09-01 00:09:26 +02:00
|
|
|
if (r2t->data_length > session->max_burst)
|
|
|
|
debug_scsi("invalid R2T with data len %u and max burst %u."
|
|
|
|
"Attempting to execute request.\n",
|
|
|
|
r2t->data_length, session->max_burst);
|
|
|
|
|
2005-08-05 04:30:08 +02:00
|
|
|
r2t->data_offset = be32_to_cpu(rhdr->data_offset);
|
2007-06-14 15:13:17 +02:00
|
|
|
if (r2t->data_offset + r2t->data_length > scsi_bufflen(ctask->sc)) {
|
2005-08-05 04:30:08 +02:00
|
|
|
spin_unlock(&session->lock);
|
2006-09-01 00:09:26 +02:00
|
|
|
printk(KERN_ERR "iscsi_tcp: invalid R2T with data len %u at "
|
|
|
|
"offset %u and total length %d\n", r2t->data_length,
|
2007-06-14 15:13:17 +02:00
|
|
|
r2t->data_offset, scsi_bufflen(ctask->sc));
|
2005-08-05 04:30:08 +02:00
|
|
|
return ISCSI_ERR_DATALEN;
|
|
|
|
}
|
|
|
|
|
|
|
|
r2t->ttt = rhdr->ttt; /* no flip */
|
|
|
|
r2t->solicit_datasn = 0;
|
|
|
|
|
|
|
|
iscsi_solicit_data_init(conn, ctask, r2t);
|
|
|
|
|
2007-05-30 19:57:14 +02:00
|
|
|
tcp_ctask->exp_datasn = r2tsn + 1;
|
2006-04-07 04:26:46 +02:00
|
|
|
__kfifo_put(tcp_ctask->r2tqueue, (void*)&r2t, sizeof(void*));
|
2007-05-30 19:57:17 +02:00
|
|
|
tcp_ctask->xmstate |= XMSTATE_SOL_HDR_INIT;
|
2006-07-24 22:47:15 +02:00
|
|
|
list_move_tail(&ctask->running, &conn->xmitqueue);
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-01-14 01:05:53 +01:00
|
|
|
scsi_queue_work(session->host, &conn->xmitwork);
|
2005-08-05 04:30:08 +02:00
|
|
|
conn->r2t_pdus_cnt++;
|
|
|
|
spin_unlock(&session->lock);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2006-04-07 04:26:46 +02:00
|
|
|
iscsi_tcp_hdr_recv(struct iscsi_conn *conn)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
int rc = 0, opcode, ahslen;
|
2005-08-05 04:30:08 +02:00
|
|
|
struct iscsi_hdr *hdr;
|
|
|
|
struct iscsi_session *session = conn->session;
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
|
|
|
uint32_t cdgst, rdgst = 0, itt;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
hdr = tcp_conn->in.hdr;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
/* verify PDU length */
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.datalen = ntoh24(hdr->dlength);
|
|
|
|
if (tcp_conn->in.datalen > conn->max_recv_dlength) {
|
2005-08-05 04:30:08 +02:00
|
|
|
printk(KERN_ERR "iscsi_tcp: datalen %d > %d\n",
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.datalen, conn->max_recv_dlength);
|
2005-08-05 04:30:08 +02:00
|
|
|
return ISCSI_ERR_DATALEN;
|
|
|
|
}
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->data_copied = 0;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
/* read AHS */
|
2006-04-07 04:26:46 +02:00
|
|
|
ahslen = hdr->hlength << 2;
|
|
|
|
tcp_conn->in.offset += ahslen;
|
|
|
|
tcp_conn->in.copy -= ahslen;
|
|
|
|
if (tcp_conn->in.copy < 0) {
|
2005-08-05 04:30:08 +02:00
|
|
|
printk(KERN_ERR "iscsi_tcp: can't handle AHS with length "
|
2006-04-07 04:26:46 +02:00
|
|
|
"%d bytes\n", ahslen);
|
2005-08-05 04:30:08 +02:00
|
|
|
return ISCSI_ERR_AHSLEN;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* calculate read padding */
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.padding = tcp_conn->in.datalen & (ISCSI_PAD_LEN-1);
|
|
|
|
if (tcp_conn->in.padding) {
|
|
|
|
tcp_conn->in.padding = ISCSI_PAD_LEN - tcp_conn->in.padding;
|
|
|
|
debug_scsi("read padding %d bytes\n", tcp_conn->in.padding);
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (conn->hdrdgst_en) {
|
|
|
|
struct scatterlist sg;
|
|
|
|
|
|
|
|
sg_init_one(&sg, (u8 *)hdr,
|
2006-04-07 04:26:46 +02:00
|
|
|
sizeof(struct iscsi_hdr) + ahslen);
|
2006-09-23 22:33:43 +02:00
|
|
|
crypto_hash_digest(&tcp_conn->rx_hash, &sg, sg.length,
|
|
|
|
(u8 *)&cdgst);
|
2005-08-05 04:30:08 +02:00
|
|
|
rdgst = *(uint32_t*)((char*)hdr + sizeof(struct iscsi_hdr) +
|
2006-04-07 04:26:46 +02:00
|
|
|
ahslen);
|
2005-11-30 09:27:19 +01:00
|
|
|
if (cdgst != rdgst) {
|
2006-04-07 04:26:46 +02:00
|
|
|
printk(KERN_ERR "iscsi_tcp: hdrdgst error "
|
|
|
|
"recv 0x%x calc 0x%x\n", rdgst, cdgst);
|
2005-11-30 09:27:19 +01:00
|
|
|
return ISCSI_ERR_HDR_DGST;
|
|
|
|
}
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
opcode = hdr->opcode & ISCSI_OPCODE_MASK;
|
2005-08-05 04:30:08 +02:00
|
|
|
/* verify itt (itt encoding: age+cid+itt) */
|
2006-04-07 04:26:46 +02:00
|
|
|
rc = iscsi_verify_itt(conn, hdr, &itt);
|
|
|
|
if (rc == ISCSI_ERR_NO_SCSI_CMD) {
|
|
|
|
tcp_conn->in.datalen = 0; /* force drop */
|
|
|
|
return 0;
|
|
|
|
} else if (rc)
|
|
|
|
return rc;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
debug_tcp("opcode 0x%x offset %d copy %d ahslen %d datalen %d\n",
|
2006-04-07 04:26:46 +02:00
|
|
|
opcode, tcp_conn->in.offset, tcp_conn->in.copy,
|
|
|
|
ahslen, tcp_conn->in.datalen);
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
switch(opcode) {
|
|
|
|
case ISCSI_OP_SCSI_DATA_IN:
|
|
|
|
tcp_conn->in.ctask = session->cmds[itt];
|
|
|
|
rc = iscsi_data_rsp(conn, tcp_conn->in.ctask);
|
2006-07-24 22:47:17 +02:00
|
|
|
if (rc)
|
|
|
|
return rc;
|
2006-04-07 04:26:46 +02:00
|
|
|
/* fall through */
|
|
|
|
case ISCSI_OP_SCSI_CMD_RSP:
|
|
|
|
tcp_conn->in.ctask = session->cmds[itt];
|
|
|
|
if (tcp_conn->in.datalen)
|
|
|
|
goto copy_hdr;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
spin_lock(&session->lock);
|
|
|
|
rc = __iscsi_complete_pdu(conn, hdr, NULL, 0);
|
|
|
|
spin_unlock(&session->lock);
|
|
|
|
break;
|
|
|
|
case ISCSI_OP_R2T:
|
|
|
|
tcp_conn->in.ctask = session->cmds[itt];
|
|
|
|
if (ahslen)
|
|
|
|
rc = ISCSI_ERR_AHSLEN;
|
|
|
|
else if (tcp_conn->in.ctask->sc->sc_data_direction ==
|
|
|
|
DMA_TO_DEVICE)
|
|
|
|
rc = iscsi_r2t_rsp(conn, tcp_conn->in.ctask);
|
|
|
|
else
|
|
|
|
rc = ISCSI_ERR_PROTO;
|
|
|
|
break;
|
|
|
|
case ISCSI_OP_LOGIN_RSP:
|
|
|
|
case ISCSI_OP_TEXT_RSP:
|
|
|
|
case ISCSI_OP_REJECT:
|
|
|
|
case ISCSI_OP_ASYNC_EVENT:
|
2006-07-24 22:47:39 +02:00
|
|
|
/*
|
|
|
|
* It is possible that we could get a PDU with a buffer larger
|
|
|
|
* than 8K, but there are no targets that currently do this.
|
|
|
|
* For now we fail until we find a vendor that needs it
|
|
|
|
*/
|
2007-03-01 00:32:17 +01:00
|
|
|
if (ISCSI_DEF_MAX_RECV_SEG_LEN <
|
2006-07-24 22:47:39 +02:00
|
|
|
tcp_conn->in.datalen) {
|
|
|
|
printk(KERN_ERR "iscsi_tcp: received buffer of len %u "
|
|
|
|
"but conn buffer is only %u (opcode %0x)\n",
|
|
|
|
tcp_conn->in.datalen,
|
2007-03-01 00:32:17 +01:00
|
|
|
ISCSI_DEF_MAX_RECV_SEG_LEN, opcode);
|
2006-07-24 22:47:39 +02:00
|
|
|
rc = ISCSI_ERR_PROTO;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
if (tcp_conn->in.datalen)
|
|
|
|
goto copy_hdr;
|
|
|
|
/* fall through */
|
2006-07-24 22:47:39 +02:00
|
|
|
case ISCSI_OP_LOGOUT_RSP:
|
|
|
|
case ISCSI_OP_NOOP_IN:
|
2006-04-07 04:26:46 +02:00
|
|
|
case ISCSI_OP_SCSI_TMFUNC_RSP:
|
|
|
|
rc = iscsi_complete_pdu(conn, hdr, NULL, 0);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
rc = ISCSI_ERR_BAD_OPCODE;
|
|
|
|
break;
|
|
|
|
}
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
return rc;
|
2006-04-07 04:26:46 +02:00
|
|
|
|
|
|
|
copy_hdr:
|
|
|
|
/*
|
|
|
|
* if we did zero copy for the header but we will need multiple
|
|
|
|
* skbs to complete the command then we have to copy the header
|
|
|
|
* for later use
|
|
|
|
*/
|
2006-07-24 22:47:17 +02:00
|
|
|
if (tcp_conn->in.zero_copy_hdr && tcp_conn->in.copy <=
|
2006-04-07 04:26:46 +02:00
|
|
|
(tcp_conn->in.datalen + tcp_conn->in.padding +
|
|
|
|
(conn->datadgst_en ? 4 : 0))) {
|
|
|
|
debug_tcp("Copying header for later use. in.copy %d in.datalen"
|
|
|
|
" %d\n", tcp_conn->in.copy, tcp_conn->in.datalen);
|
|
|
|
memcpy(&tcp_conn->hdr, tcp_conn->in.hdr,
|
|
|
|
sizeof(struct iscsi_hdr));
|
|
|
|
tcp_conn->in.hdr = &tcp_conn->hdr;
|
|
|
|
tcp_conn->in.zero_copy_hdr = 0;
|
|
|
|
}
|
|
|
|
return 0;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* iscsi_ctask_copy - copy skb bits to the destanation cmd task
|
2006-04-07 04:26:46 +02:00
|
|
|
* @conn: iscsi tcp connection
|
2005-08-05 04:30:08 +02:00
|
|
|
* @ctask: scsi command task
|
|
|
|
* @buf: buffer to copy to
|
|
|
|
* @buf_size: size of buffer
|
|
|
|
* @offset: offset within the buffer
|
|
|
|
*
|
|
|
|
* Notes:
|
|
|
|
* The function calls skb_copy_bits() and updates per-connection and
|
|
|
|
* per-cmd byte counters.
|
|
|
|
*
|
|
|
|
* Read counters (in bytes):
|
|
|
|
*
|
|
|
|
* conn->in.offset offset within in progress SKB
|
|
|
|
* conn->in.copy left to copy from in progress SKB
|
|
|
|
* including padding
|
|
|
|
* conn->in.copied copied already from in progress SKB
|
|
|
|
* conn->data_copied copied already from in progress buffer
|
|
|
|
* ctask->sent total bytes sent up to the MidLayer
|
|
|
|
* ctask->data_count left to copy from in progress Data-In
|
|
|
|
* buf_left left to copy from in progress buffer
|
|
|
|
**/
|
|
|
|
static inline int
|
2006-04-07 04:26:46 +02:00
|
|
|
iscsi_ctask_copy(struct iscsi_tcp_conn *tcp_conn, struct iscsi_cmd_task *ctask,
|
2005-08-05 04:30:08 +02:00
|
|
|
void *buf, int buf_size, int offset)
|
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
|
|
|
int buf_left = buf_size - (tcp_conn->data_copied + offset);
|
2007-05-30 19:57:15 +02:00
|
|
|
unsigned size = min(tcp_conn->in.copy, buf_left);
|
2005-08-05 04:30:08 +02:00
|
|
|
int rc;
|
|
|
|
|
|
|
|
size = min(size, ctask->data_count);
|
|
|
|
|
|
|
|
debug_tcp("ctask_copy %d bytes at offset %d copied %d\n",
|
2006-04-07 04:26:46 +02:00
|
|
|
size, tcp_conn->in.offset, tcp_conn->in.copied);
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
BUG_ON(size <= 0);
|
2007-06-14 15:13:17 +02:00
|
|
|
BUG_ON(tcp_ctask->sent + size > scsi_bufflen(ctask->sc));
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
rc = skb_copy_bits(tcp_conn->in.skb, tcp_conn->in.offset,
|
|
|
|
(char*)buf + (offset + tcp_conn->data_copied), size);
|
2005-08-05 04:30:08 +02:00
|
|
|
/* must fit into skb->len */
|
|
|
|
BUG_ON(rc);
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.offset += size;
|
|
|
|
tcp_conn->in.copy -= size;
|
|
|
|
tcp_conn->in.copied += size;
|
|
|
|
tcp_conn->data_copied += size;
|
|
|
|
tcp_ctask->sent += size;
|
2005-08-05 04:30:08 +02:00
|
|
|
ctask->data_count -= size;
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
BUG_ON(tcp_conn->in.copy < 0);
|
2005-08-05 04:30:08 +02:00
|
|
|
BUG_ON(ctask->data_count < 0);
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
if (buf_size != (tcp_conn->data_copied + offset)) {
|
2005-08-05 04:30:08 +02:00
|
|
|
if (!ctask->data_count) {
|
2006-04-07 04:26:46 +02:00
|
|
|
BUG_ON(buf_size - tcp_conn->data_copied < 0);
|
2005-08-05 04:30:08 +02:00
|
|
|
/* done with this PDU */
|
2006-04-07 04:26:46 +02:00
|
|
|
return buf_size - tcp_conn->data_copied;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
return -EAGAIN;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* done with this buffer or with both - PDU and buffer */
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->data_copied = 0;
|
2005-08-05 04:30:08 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* iscsi_tcp_copy - copy skb bits to the destanation buffer
|
2006-04-07 04:26:46 +02:00
|
|
|
* @conn: iscsi tcp connection
|
2005-08-05 04:30:08 +02:00
|
|
|
*
|
|
|
|
* Notes:
|
|
|
|
* The function calls skb_copy_bits() and updates per-connection
|
|
|
|
* byte counters.
|
|
|
|
**/
|
|
|
|
static inline int
|
2006-09-01 00:09:32 +02:00
|
|
|
iscsi_tcp_copy(struct iscsi_conn *conn, int buf_size)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-07-24 22:47:39 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
2006-04-07 04:26:46 +02:00
|
|
|
int buf_left = buf_size - tcp_conn->data_copied;
|
|
|
|
int size = min(tcp_conn->in.copy, buf_left);
|
2005-08-05 04:30:08 +02:00
|
|
|
int rc;
|
|
|
|
|
|
|
|
debug_tcp("tcp_copy %d bytes at offset %d copied %d\n",
|
2006-04-07 04:26:46 +02:00
|
|
|
size, tcp_conn->in.offset, tcp_conn->data_copied);
|
2005-08-05 04:30:08 +02:00
|
|
|
BUG_ON(size <= 0);
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
rc = skb_copy_bits(tcp_conn->in.skb, tcp_conn->in.offset,
|
2006-07-24 22:47:39 +02:00
|
|
|
(char*)conn->data + tcp_conn->data_copied, size);
|
2005-08-05 04:30:08 +02:00
|
|
|
BUG_ON(rc);
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.offset += size;
|
|
|
|
tcp_conn->in.copy -= size;
|
|
|
|
tcp_conn->in.copied += size;
|
|
|
|
tcp_conn->data_copied += size;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
if (buf_size != tcp_conn->data_copied)
|
2005-08-05 04:30:08 +02:00
|
|
|
return -EAGAIN;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
2006-09-23 22:33:43 +02:00
|
|
|
partial_sg_digest_update(struct hash_desc *desc, struct scatterlist *sg,
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
int offset, int length)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
|
|
|
struct scatterlist temp;
|
|
|
|
|
|
|
|
memcpy(&temp, sg, sizeof(struct scatterlist));
|
|
|
|
temp.offset = offset;
|
|
|
|
temp.length = length;
|
2006-09-23 22:33:43 +02:00
|
|
|
crypto_hash_update(desc, &temp, length);
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
2005-11-30 06:12:57 +01:00
|
|
|
static void
|
2006-04-07 04:26:46 +02:00
|
|
|
iscsi_recv_digest_update(struct iscsi_tcp_conn *tcp_conn, char* buf, int len)
|
2005-11-30 06:12:57 +01:00
|
|
|
{
|
|
|
|
struct scatterlist tmp;
|
|
|
|
|
|
|
|
sg_init_one(&tmp, buf, len);
|
2006-09-23 22:33:43 +02:00
|
|
|
crypto_hash_update(&tcp_conn->rx_hash, &tmp, len);
|
2005-11-30 06:12:57 +01:00
|
|
|
}
|
|
|
|
|
2005-08-05 04:30:08 +02:00
|
|
|
static int iscsi_scsi_data_in(struct iscsi_conn *conn)
|
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
|
|
|
struct iscsi_cmd_task *ctask = tcp_conn->in.ctask;
|
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
2005-08-05 04:30:08 +02:00
|
|
|
struct scsi_cmnd *sc = ctask->sc;
|
2005-11-30 06:12:57 +01:00
|
|
|
struct scatterlist *sg;
|
2005-08-05 04:30:08 +02:00
|
|
|
int i, offset, rc = 0;
|
|
|
|
|
|
|
|
BUG_ON((void*)ctask != sc->SCp.ptr);
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
offset = tcp_ctask->data_offset;
|
2007-06-14 15:13:17 +02:00
|
|
|
sg = scsi_sglist(sc);
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
if (tcp_ctask->data_offset)
|
|
|
|
for (i = 0; i < tcp_ctask->sg_count; i++)
|
2005-08-05 04:30:08 +02:00
|
|
|
offset -= sg[i].length;
|
|
|
|
/* we've passed through partial sg*/
|
|
|
|
if (offset < 0)
|
|
|
|
offset = 0;
|
|
|
|
|
2007-06-14 15:13:17 +02:00
|
|
|
for (i = tcp_ctask->sg_count; i < scsi_sg_count(sc); i++) {
|
2005-08-05 04:30:08 +02:00
|
|
|
char *dest;
|
|
|
|
|
|
|
|
dest = kmap_atomic(sg[i].page, KM_SOFTIRQ0);
|
2006-04-07 04:26:46 +02:00
|
|
|
rc = iscsi_ctask_copy(tcp_conn, ctask, dest + sg[i].offset,
|
2005-08-05 04:30:08 +02:00
|
|
|
sg[i].length, offset);
|
|
|
|
kunmap_atomic(dest, KM_SOFTIRQ0);
|
|
|
|
if (rc == -EAGAIN)
|
|
|
|
/* continue with the next SKB/PDU */
|
|
|
|
return rc;
|
|
|
|
if (!rc) {
|
|
|
|
if (conn->datadgst_en) {
|
|
|
|
if (!offset)
|
2006-08-24 10:45:50 +02:00
|
|
|
crypto_hash_update(
|
2006-09-23 22:33:43 +02:00
|
|
|
&tcp_conn->rx_hash,
|
2006-12-17 19:10:24 +01:00
|
|
|
&sg[i], sg[i].length);
|
2005-08-05 04:30:08 +02:00
|
|
|
else
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
partial_sg_digest_update(
|
2006-09-23 22:33:43 +02:00
|
|
|
&tcp_conn->rx_hash,
|
2006-04-07 04:26:46 +02:00
|
|
|
&sg[i],
|
2005-08-05 04:30:08 +02:00
|
|
|
sg[i].offset + offset,
|
|
|
|
sg[i].length - offset);
|
|
|
|
}
|
|
|
|
offset = 0;
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_ctask->sg_count++;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!ctask->data_count) {
|
|
|
|
if (rc && conn->datadgst_en)
|
|
|
|
/*
|
|
|
|
* data-in is complete, but buffer not...
|
|
|
|
*/
|
2006-09-23 22:33:43 +02:00
|
|
|
partial_sg_digest_update(&tcp_conn->rx_hash,
|
|
|
|
&sg[i],
|
|
|
|
sg[i].offset,
|
|
|
|
sg[i].length-rc);
|
2005-08-05 04:30:08 +02:00
|
|
|
rc = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
if (!tcp_conn->in.copy)
|
2005-08-05 04:30:08 +02:00
|
|
|
return -EAGAIN;
|
|
|
|
}
|
|
|
|
BUG_ON(ctask->data_count);
|
|
|
|
|
|
|
|
/* check for non-exceptional status */
|
2006-04-07 04:26:46 +02:00
|
|
|
if (tcp_conn->in.hdr->flags & ISCSI_FLAG_DATA_STATUS) {
|
2006-07-24 22:47:15 +02:00
|
|
|
debug_scsi("done [sc %lx res %d itt 0x%x flags 0x%x]\n",
|
|
|
|
(long)sc, sc->result, ctask->itt,
|
|
|
|
tcp_conn->in.hdr->flags);
|
2006-04-07 04:26:46 +02:00
|
|
|
spin_lock(&conn->session->lock);
|
|
|
|
__iscsi_complete_pdu(conn, tcp_conn->in.hdr, NULL, 0);
|
|
|
|
spin_unlock(&conn->session->lock);
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
iscsi_data_recv(struct iscsi_conn *conn)
|
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
|
|
|
int rc = 0, opcode;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
opcode = tcp_conn->in.hdr->opcode & ISCSI_OPCODE_MASK;
|
|
|
|
switch (opcode) {
|
2005-08-05 04:30:08 +02:00
|
|
|
case ISCSI_OP_SCSI_DATA_IN:
|
|
|
|
rc = iscsi_scsi_data_in(conn);
|
|
|
|
break;
|
2006-04-07 04:26:46 +02:00
|
|
|
case ISCSI_OP_SCSI_CMD_RSP:
|
2005-08-05 04:30:08 +02:00
|
|
|
case ISCSI_OP_TEXT_RSP:
|
|
|
|
case ISCSI_OP_LOGIN_RSP:
|
2006-04-07 04:26:46 +02:00
|
|
|
case ISCSI_OP_ASYNC_EVENT:
|
|
|
|
case ISCSI_OP_REJECT:
|
2005-08-05 04:30:08 +02:00
|
|
|
/*
|
|
|
|
* Collect data segment to the connection's data
|
|
|
|
* placeholder
|
|
|
|
*/
|
2006-09-01 00:09:32 +02:00
|
|
|
if (iscsi_tcp_copy(conn, tcp_conn->in.datalen)) {
|
2005-08-05 04:30:08 +02:00
|
|
|
rc = -EAGAIN;
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
2006-07-24 22:47:39 +02:00
|
|
|
rc = iscsi_complete_pdu(conn, tcp_conn->in.hdr, conn->data,
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.datalen);
|
|
|
|
if (!rc && conn->datadgst_en && opcode != ISCSI_OP_LOGIN_RSP)
|
2006-07-24 22:47:39 +02:00
|
|
|
iscsi_recv_digest_update(tcp_conn, conn->data,
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.datalen);
|
|
|
|
break;
|
2005-08-05 04:30:08 +02:00
|
|
|
default:
|
|
|
|
BUG_ON(1);
|
|
|
|
}
|
|
|
|
exit:
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* iscsi_tcp_data_recv - TCP receive in sendfile fashion
|
|
|
|
* @rd_desc: read descriptor
|
|
|
|
* @skb: socket buffer
|
|
|
|
* @offset: offset in skb
|
|
|
|
* @len: skb->len - offset
|
|
|
|
**/
|
|
|
|
static int
|
|
|
|
iscsi_tcp_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb,
|
|
|
|
unsigned int offset, size_t len)
|
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
struct iscsi_conn *conn = rd_desc->arg.data;
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
2005-08-05 04:30:08 +02:00
|
|
|
int processed;
|
|
|
|
char pad[ISCSI_PAD_LEN];
|
|
|
|
struct scatterlist sg;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Save current SKB and its offset in the corresponding
|
|
|
|
* connection context.
|
|
|
|
*/
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.copy = skb->len - offset;
|
|
|
|
tcp_conn->in.offset = offset;
|
|
|
|
tcp_conn->in.skb = skb;
|
|
|
|
tcp_conn->in.len = tcp_conn->in.copy;
|
|
|
|
BUG_ON(tcp_conn->in.copy <= 0);
|
|
|
|
debug_tcp("in %d bytes\n", tcp_conn->in.copy);
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
more:
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.copied = 0;
|
2005-08-05 04:30:08 +02:00
|
|
|
rc = 0;
|
|
|
|
|
|
|
|
if (unlikely(conn->suspend_rx)) {
|
|
|
|
debug_tcp("conn %d Rx suspended!\n", conn->id);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
if (tcp_conn->in_progress == IN_PROGRESS_WAIT_HEADER ||
|
|
|
|
tcp_conn->in_progress == IN_PROGRESS_HEADER_GATHER) {
|
|
|
|
rc = iscsi_hdr_extract(tcp_conn);
|
2005-08-05 04:30:08 +02:00
|
|
|
if (rc) {
|
|
|
|
if (rc == -EAGAIN)
|
|
|
|
goto nomore;
|
|
|
|
else {
|
2006-07-24 22:47:11 +02:00
|
|
|
iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
|
2005-08-05 04:30:08 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Verify and process incoming PDU header.
|
|
|
|
*/
|
2006-04-07 04:26:46 +02:00
|
|
|
rc = iscsi_tcp_hdr_recv(conn);
|
|
|
|
if (!rc && tcp_conn->in.datalen) {
|
2006-09-01 00:09:28 +02:00
|
|
|
if (conn->datadgst_en)
|
2006-09-23 22:33:43 +02:00
|
|
|
crypto_hash_init(&tcp_conn->rx_hash);
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in_progress = IN_PROGRESS_DATA_RECV;
|
2005-08-05 04:30:08 +02:00
|
|
|
} else if (rc) {
|
2006-07-24 22:47:45 +02:00
|
|
|
iscsi_conn_failure(conn, rc);
|
2005-08-05 04:30:08 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-05-30 19:57:20 +02:00
|
|
|
if (tcp_conn->in_progress == IN_PROGRESS_DDIGEST_RECV &&
|
|
|
|
tcp_conn->in.copy) {
|
2005-11-30 06:12:57 +01:00
|
|
|
uint32_t recv_digest;
|
2006-04-07 04:26:46 +02:00
|
|
|
|
2005-08-05 04:30:08 +02:00
|
|
|
debug_tcp("extra data_recv offset %d copy %d\n",
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.offset, tcp_conn->in.copy);
|
2007-05-30 19:57:20 +02:00
|
|
|
|
|
|
|
if (!tcp_conn->data_copied) {
|
|
|
|
if (tcp_conn->in.padding) {
|
|
|
|
debug_tcp("padding -> %d\n",
|
|
|
|
tcp_conn->in.padding);
|
|
|
|
memset(pad, 0, tcp_conn->in.padding);
|
|
|
|
sg_init_one(&sg, pad, tcp_conn->in.padding);
|
|
|
|
crypto_hash_update(&tcp_conn->rx_hash,
|
|
|
|
&sg, sg.length);
|
|
|
|
}
|
|
|
|
crypto_hash_final(&tcp_conn->rx_hash,
|
|
|
|
(u8 *) &tcp_conn->in.datadgst);
|
|
|
|
debug_tcp("rx digest 0x%x\n", tcp_conn->in.datadgst);
|
|
|
|
}
|
|
|
|
|
2006-09-01 00:09:32 +02:00
|
|
|
rc = iscsi_tcp_copy(conn, sizeof(uint32_t));
|
|
|
|
if (rc) {
|
|
|
|
if (rc == -EAGAIN)
|
|
|
|
goto again;
|
|
|
|
iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(&recv_digest, conn->data, sizeof(uint32_t));
|
2006-04-07 04:26:46 +02:00
|
|
|
if (recv_digest != tcp_conn->in.datadgst) {
|
2005-11-30 06:12:57 +01:00
|
|
|
debug_tcp("iscsi_tcp: data digest error!"
|
|
|
|
"0x%x != 0x%x\n", recv_digest,
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.datadgst);
|
2005-11-30 06:12:57 +01:00
|
|
|
iscsi_conn_failure(conn, ISCSI_ERR_DATA_DGST);
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
debug_tcp("iscsi_tcp: data digest match!"
|
|
|
|
"0x%x == 0x%x\n", recv_digest,
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.datadgst);
|
|
|
|
tcp_conn->in_progress = IN_PROGRESS_WAIT_HEADER;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
if (tcp_conn->in_progress == IN_PROGRESS_DATA_RECV &&
|
2007-05-30 19:57:20 +02:00
|
|
|
tcp_conn->in.copy) {
|
2005-08-05 04:30:08 +02:00
|
|
|
debug_tcp("data_recv offset %d copy %d\n",
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.offset, tcp_conn->in.copy);
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
rc = iscsi_data_recv(conn);
|
|
|
|
if (rc) {
|
2006-05-03 02:46:49 +02:00
|
|
|
if (rc == -EAGAIN)
|
2005-08-05 04:30:08 +02:00
|
|
|
goto again;
|
2006-07-24 22:47:11 +02:00
|
|
|
iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
|
2005-08-05 04:30:08 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2007-05-30 19:57:20 +02:00
|
|
|
|
|
|
|
if (tcp_conn->in.padding)
|
|
|
|
tcp_conn->in_progress = IN_PROGRESS_PAD_RECV;
|
|
|
|
else if (conn->datadgst_en)
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in_progress = IN_PROGRESS_DDIGEST_RECV;
|
2007-05-30 19:57:20 +02:00
|
|
|
else
|
|
|
|
tcp_conn->in_progress = IN_PROGRESS_WAIT_HEADER;
|
|
|
|
tcp_conn->data_copied = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tcp_conn->in_progress == IN_PROGRESS_PAD_RECV &&
|
|
|
|
tcp_conn->in.copy) {
|
|
|
|
int copylen = min(tcp_conn->in.padding - tcp_conn->data_copied,
|
|
|
|
tcp_conn->in.copy);
|
|
|
|
|
|
|
|
tcp_conn->in.copy -= copylen;
|
|
|
|
tcp_conn->in.offset += copylen;
|
|
|
|
tcp_conn->data_copied += copylen;
|
|
|
|
|
|
|
|
if (tcp_conn->data_copied != tcp_conn->in.padding)
|
|
|
|
tcp_conn->in_progress = IN_PROGRESS_PAD_RECV;
|
|
|
|
else if (conn->datadgst_en)
|
|
|
|
tcp_conn->in_progress = IN_PROGRESS_DDIGEST_RECV;
|
|
|
|
else
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in_progress = IN_PROGRESS_WAIT_HEADER;
|
2007-05-30 19:57:20 +02:00
|
|
|
tcp_conn->data_copied = 0;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
debug_tcp("f, processed %d from out of %d padding %d\n",
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->in.offset - offset, (int)len, tcp_conn->in.padding);
|
|
|
|
BUG_ON(tcp_conn->in.offset - offset > len);
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
if (tcp_conn->in.offset - offset != len) {
|
2005-08-05 04:30:08 +02:00
|
|
|
debug_tcp("continue to process %d bytes\n",
|
2006-04-07 04:26:46 +02:00
|
|
|
(int)len - (tcp_conn->in.offset - offset));
|
2005-08-05 04:30:08 +02:00
|
|
|
goto more;
|
|
|
|
}
|
|
|
|
|
|
|
|
nomore:
|
2006-04-07 04:26:46 +02:00
|
|
|
processed = tcp_conn->in.offset - offset;
|
2005-08-05 04:30:08 +02:00
|
|
|
BUG_ON(processed == 0);
|
|
|
|
return processed;
|
|
|
|
|
|
|
|
again:
|
2006-04-07 04:26:46 +02:00
|
|
|
processed = tcp_conn->in.offset - offset;
|
2005-08-05 04:30:08 +02:00
|
|
|
debug_tcp("c, processed %d from out of %d rd_desc_cnt %d\n",
|
|
|
|
processed, (int)len, (int)rd_desc->count);
|
|
|
|
BUG_ON(processed == 0);
|
|
|
|
BUG_ON(processed > len);
|
|
|
|
|
|
|
|
conn->rxdata_octets += processed;
|
|
|
|
return processed;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
iscsi_tcp_data_ready(struct sock *sk, int flag)
|
|
|
|
{
|
|
|
|
struct iscsi_conn *conn = sk->sk_user_data;
|
|
|
|
read_descriptor_t rd_desc;
|
|
|
|
|
|
|
|
read_lock(&sk->sk_callback_lock);
|
|
|
|
|
2006-05-03 02:46:49 +02:00
|
|
|
/*
|
|
|
|
* Use rd_desc to pass 'conn' to iscsi_tcp_data_recv.
|
|
|
|
* We set count to 1 because we want the network layer to
|
|
|
|
* hand us all the skbs that are available. iscsi_tcp_data_recv
|
|
|
|
* handled pdus that cross buffers or pdus that still need data.
|
|
|
|
*/
|
2005-08-05 04:30:08 +02:00
|
|
|
rd_desc.arg.data = conn;
|
2006-05-03 02:46:49 +02:00
|
|
|
rd_desc.count = 1;
|
2005-08-05 04:30:08 +02:00
|
|
|
tcp_read_sock(sk, &rd_desc, iscsi_tcp_data_recv);
|
|
|
|
|
|
|
|
read_unlock(&sk->sk_callback_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
iscsi_tcp_state_change(struct sock *sk)
|
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn;
|
2005-08-05 04:30:08 +02:00
|
|
|
struct iscsi_conn *conn;
|
|
|
|
struct iscsi_session *session;
|
|
|
|
void (*old_state_change)(struct sock *);
|
|
|
|
|
|
|
|
read_lock(&sk->sk_callback_lock);
|
|
|
|
|
|
|
|
conn = (struct iscsi_conn*)sk->sk_user_data;
|
|
|
|
session = conn->session;
|
|
|
|
|
2005-11-30 06:12:49 +01:00
|
|
|
if ((sk->sk_state == TCP_CLOSE_WAIT ||
|
|
|
|
sk->sk_state == TCP_CLOSE) &&
|
|
|
|
!atomic_read(&sk->sk_rmem_alloc)) {
|
2005-08-05 04:30:08 +02:00
|
|
|
debug_tcp("iscsi_tcp_state_change: TCP_CLOSE|TCP_CLOSE_WAIT\n");
|
|
|
|
iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
|
|
|
|
}
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn = conn->dd_data;
|
|
|
|
old_state_change = tcp_conn->old_state_change;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
read_unlock(&sk->sk_callback_lock);
|
|
|
|
|
|
|
|
old_state_change(sk);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* iscsi_write_space - Called when more output buffer space is available
|
|
|
|
* @sk: socket space is available for
|
|
|
|
**/
|
|
|
|
static void
|
|
|
|
iscsi_write_space(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct iscsi_conn *conn = (struct iscsi_conn*)sk->sk_user_data;
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
|
|
|
|
|
|
|
tcp_conn->old_write_space(sk);
|
2005-08-05 04:30:08 +02:00
|
|
|
debug_tcp("iscsi_write_space: cid %d\n", conn->id);
|
2006-01-14 01:05:53 +01:00
|
|
|
scsi_queue_work(conn->session->host, &conn->xmitwork);
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
iscsi_conn_set_callbacks(struct iscsi_conn *conn)
|
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
|
|
|
struct sock *sk = tcp_conn->sock->sk;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
/* assign new callbacks */
|
|
|
|
write_lock_bh(&sk->sk_callback_lock);
|
|
|
|
sk->sk_user_data = conn;
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->old_data_ready = sk->sk_data_ready;
|
|
|
|
tcp_conn->old_state_change = sk->sk_state_change;
|
|
|
|
tcp_conn->old_write_space = sk->sk_write_space;
|
2005-08-05 04:30:08 +02:00
|
|
|
sk->sk_data_ready = iscsi_tcp_data_ready;
|
|
|
|
sk->sk_state_change = iscsi_tcp_state_change;
|
|
|
|
sk->sk_write_space = iscsi_write_space;
|
|
|
|
write_unlock_bh(&sk->sk_callback_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2006-07-24 22:47:26 +02:00
|
|
|
iscsi_conn_restore_callbacks(struct iscsi_tcp_conn *tcp_conn)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct sock *sk = tcp_conn->sock->sk;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
/* restore socket callbacks, see also: iscsi_conn_set_callbacks() */
|
|
|
|
write_lock_bh(&sk->sk_callback_lock);
|
|
|
|
sk->sk_user_data = NULL;
|
2006-04-07 04:26:46 +02:00
|
|
|
sk->sk_data_ready = tcp_conn->old_data_ready;
|
|
|
|
sk->sk_state_change = tcp_conn->old_state_change;
|
|
|
|
sk->sk_write_space = tcp_conn->old_write_space;
|
2005-08-05 04:30:08 +02:00
|
|
|
sk->sk_no_check = 0;
|
|
|
|
write_unlock_bh(&sk->sk_callback_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* iscsi_send - generic send routine
|
|
|
|
* @sk: kernel's socket
|
|
|
|
* @buf: buffer to write from
|
|
|
|
* @size: actual size to write
|
|
|
|
* @flags: socket's flags
|
|
|
|
*/
|
|
|
|
static inline int
|
2006-01-14 01:05:44 +01:00
|
|
|
iscsi_send(struct iscsi_conn *conn, struct iscsi_buf *buf, int size, int flags)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
|
|
|
struct socket *sk = tcp_conn->sock;
|
2006-05-30 07:37:28 +02:00
|
|
|
int offset = buf->sg.offset + buf->sent, res;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-01-14 01:05:47 +01:00
|
|
|
/*
|
|
|
|
* if we got use_sg=0 or are sending something we kmallocd
|
|
|
|
* then we did not have to do kmap (kmap returns page_address)
|
|
|
|
*
|
|
|
|
* if we got use_sg > 0, but had to drop down, we do not
|
|
|
|
* set clustering so this should only happen for that
|
|
|
|
* slab case.
|
|
|
|
*/
|
|
|
|
if (buf->use_sendmsg)
|
2006-05-30 07:37:28 +02:00
|
|
|
res = sock_no_sendpage(sk, buf->sg.page, offset, size, flags);
|
2006-01-14 01:05:47 +01:00
|
|
|
else
|
2006-05-30 07:37:28 +02:00
|
|
|
res = tcp_conn->sendpage(sk, buf->sg.page, offset, size, flags);
|
|
|
|
|
|
|
|
if (res >= 0) {
|
|
|
|
conn->txdata_octets += res;
|
|
|
|
buf->sent += res;
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
tcp_conn->sendpage_failures_cnt++;
|
|
|
|
if (res == -EAGAIN)
|
|
|
|
res = -ENOBUFS;
|
|
|
|
else
|
|
|
|
iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
|
|
|
|
return res;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* iscsi_sendhdr - send PDU Header via tcp_sendpage()
|
|
|
|
* @conn: iscsi connection
|
|
|
|
* @buf: buffer to write from
|
|
|
|
* @datalen: lenght of data to be sent after the header
|
|
|
|
*
|
|
|
|
* Notes:
|
|
|
|
* (Tx, Fast Path)
|
|
|
|
**/
|
|
|
|
static inline int
|
|
|
|
iscsi_sendhdr(struct iscsi_conn *conn, struct iscsi_buf *buf, int datalen)
|
|
|
|
{
|
|
|
|
int flags = 0; /* MSG_DONTWAIT; */
|
|
|
|
int res, size;
|
|
|
|
|
|
|
|
size = buf->sg.length - buf->sent;
|
|
|
|
BUG_ON(buf->sent + size > buf->sg.length);
|
|
|
|
if (buf->sent + size != buf->sg.length || datalen)
|
|
|
|
flags |= MSG_MORE;
|
|
|
|
|
2006-01-14 01:05:44 +01:00
|
|
|
res = iscsi_send(conn, buf, size, flags);
|
2005-08-05 04:30:08 +02:00
|
|
|
debug_tcp("sendhdr %d bytes, sent %d res %d\n", size, buf->sent, res);
|
|
|
|
if (res >= 0) {
|
|
|
|
if (size != res)
|
|
|
|
return -EAGAIN;
|
|
|
|
return 0;
|
2006-05-30 07:37:28 +02:00
|
|
|
}
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* iscsi_sendpage - send one page of iSCSI Data-Out.
|
|
|
|
* @conn: iscsi connection
|
|
|
|
* @buf: buffer to write from
|
|
|
|
* @count: remaining data
|
|
|
|
* @sent: number of bytes sent
|
|
|
|
*
|
|
|
|
* Notes:
|
|
|
|
* (Tx, Fast Path)
|
|
|
|
**/
|
|
|
|
static inline int
|
|
|
|
iscsi_sendpage(struct iscsi_conn *conn, struct iscsi_buf *buf,
|
|
|
|
int *count, int *sent)
|
|
|
|
{
|
|
|
|
int flags = 0; /* MSG_DONTWAIT; */
|
|
|
|
int res, size;
|
|
|
|
|
|
|
|
size = buf->sg.length - buf->sent;
|
|
|
|
BUG_ON(buf->sent + size > buf->sg.length);
|
|
|
|
if (size > *count)
|
|
|
|
size = *count;
|
2005-09-13 04:01:28 +02:00
|
|
|
if (buf->sent + size != buf->sg.length || *count != size)
|
2005-08-05 04:30:08 +02:00
|
|
|
flags |= MSG_MORE;
|
|
|
|
|
2006-01-14 01:05:44 +01:00
|
|
|
res = iscsi_send(conn, buf, size, flags);
|
2005-08-05 04:30:08 +02:00
|
|
|
debug_tcp("sendpage: %d bytes, sent %d left %d sent %d res %d\n",
|
|
|
|
size, buf->sent, *count, *sent, res);
|
|
|
|
if (res >= 0) {
|
|
|
|
*count -= res;
|
|
|
|
*sent += res;
|
|
|
|
if (size != res)
|
|
|
|
return -EAGAIN;
|
|
|
|
return 0;
|
2006-05-30 07:37:28 +02:00
|
|
|
}
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
2006-04-07 04:26:46 +02:00
|
|
|
iscsi_data_digest_init(struct iscsi_tcp_conn *tcp_conn,
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-09-23 22:33:43 +02:00
|
|
|
crypto_hash_init(&tcp_conn->tx_hash);
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_ctask->digest_count = 4;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* iscsi_solicit_data_cont - initialize next Data-Out
|
|
|
|
* @conn: iscsi connection
|
|
|
|
* @ctask: scsi command task
|
|
|
|
* @r2t: R2T info
|
|
|
|
* @left: bytes left to transfer
|
|
|
|
*
|
|
|
|
* Notes:
|
|
|
|
* Initialize next Data-Out within this R2T sequence and continue
|
|
|
|
* to process next Scatter-Gather element(if any) of this SCSI command.
|
|
|
|
*
|
|
|
|
* Called under connection lock.
|
|
|
|
**/
|
|
|
|
static void
|
|
|
|
iscsi_solicit_data_cont(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,
|
|
|
|
struct iscsi_r2t_info *r2t, int left)
|
|
|
|
{
|
|
|
|
struct iscsi_data *hdr;
|
|
|
|
int new_offset;
|
|
|
|
|
2006-05-19 03:31:36 +02:00
|
|
|
hdr = &r2t->dtask.hdr;
|
2005-08-05 04:30:08 +02:00
|
|
|
memset(hdr, 0, sizeof(struct iscsi_data));
|
|
|
|
hdr->ttt = r2t->ttt;
|
|
|
|
hdr->datasn = cpu_to_be32(r2t->solicit_datasn);
|
|
|
|
r2t->solicit_datasn++;
|
|
|
|
hdr->opcode = ISCSI_OP_SCSI_DATA_OUT;
|
2006-04-07 04:26:46 +02:00
|
|
|
memcpy(hdr->lun, ctask->hdr->lun, sizeof(hdr->lun));
|
|
|
|
hdr->itt = ctask->hdr->itt;
|
2005-08-05 04:30:08 +02:00
|
|
|
hdr->exp_statsn = r2t->exp_statsn;
|
|
|
|
new_offset = r2t->data_offset + r2t->sent;
|
|
|
|
hdr->offset = cpu_to_be32(new_offset);
|
|
|
|
if (left > conn->max_xmit_dlength) {
|
|
|
|
hton24(hdr->dlength, conn->max_xmit_dlength);
|
|
|
|
r2t->data_count = conn->max_xmit_dlength;
|
|
|
|
} else {
|
|
|
|
hton24(hdr->dlength, left);
|
|
|
|
r2t->data_count = left;
|
|
|
|
hdr->flags = ISCSI_FLAG_CMD_FINAL;
|
|
|
|
}
|
|
|
|
conn->dataout_pdus_cnt++;
|
|
|
|
|
2006-05-19 03:31:31 +02:00
|
|
|
iscsi_buf_init_iov(&r2t->headbuf, (char*)hdr,
|
2005-09-13 04:01:32 +02:00
|
|
|
sizeof(struct iscsi_hdr));
|
2005-08-05 04:30:08 +02:00
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
if (iscsi_buf_left(&r2t->sendbuf))
|
|
|
|
return;
|
|
|
|
|
2007-06-14 15:13:17 +02:00
|
|
|
iscsi_buf_init_sg(&r2t->sendbuf, r2t->sg);
|
|
|
|
r2t->sg += 1;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
static void iscsi_set_padding(struct iscsi_tcp_cmd_task *tcp_ctask,
|
|
|
|
unsigned long len)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
tcp_ctask->pad_count = len & (ISCSI_PAD_LEN - 1);
|
|
|
|
if (!tcp_ctask->pad_count)
|
|
|
|
return;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
tcp_ctask->pad_count = ISCSI_PAD_LEN - tcp_ctask->pad_count;
|
|
|
|
debug_scsi("write padding %d bytes\n", tcp_ctask->pad_count);
|
|
|
|
tcp_ctask->xmstate |= XMSTATE_W_PAD;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-04-07 04:26:46 +02:00
|
|
|
* iscsi_tcp_cmd_init - Initialize iSCSI SCSI_READ or SCSI_WRITE commands
|
2005-08-05 04:30:08 +02:00
|
|
|
* @conn: iscsi connection
|
|
|
|
* @ctask: scsi command task
|
|
|
|
* @sc: scsi command
|
|
|
|
**/
|
|
|
|
static void
|
2006-04-07 04:26:46 +02:00
|
|
|
iscsi_tcp_cmd_init(struct iscsi_cmd_task *ctask)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
BUG_ON(__kfifo_len(tcp_ctask->r2tqueue));
|
2007-05-30 19:57:17 +02:00
|
|
|
tcp_ctask->xmstate = XMSTATE_CMD_HDR_INIT;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-04-07 04:26:46 +02:00
|
|
|
* iscsi_tcp_mtask_xmit - xmit management(immediate) task
|
2005-08-05 04:30:08 +02:00
|
|
|
* @conn: iscsi connection
|
|
|
|
* @mtask: task management task
|
|
|
|
*
|
|
|
|
* Notes:
|
|
|
|
* The function can return -EAGAIN in which case caller must
|
|
|
|
* call it again later, or recover. '0' return code means successful
|
|
|
|
* xmit.
|
|
|
|
*
|
2007-05-30 19:57:17 +02:00
|
|
|
* Management xmit state machine consists of these states:
|
|
|
|
* XMSTATE_IMM_HDR_INIT - calculate digest of PDU Header
|
|
|
|
* XMSTATE_IMM_HDR - PDU Header xmit in progress
|
|
|
|
* XMSTATE_IMM_DATA - PDU Data xmit in progress
|
|
|
|
* XMSTATE_IDLE - management PDU is done
|
2005-08-05 04:30:08 +02:00
|
|
|
**/
|
|
|
|
static int
|
2006-04-07 04:26:46 +02:00
|
|
|
iscsi_tcp_mtask_xmit(struct iscsi_conn *conn, struct iscsi_mgmt_task *mtask)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_mgmt_task *tcp_mtask = mtask->dd_data;
|
2006-05-30 07:37:28 +02:00
|
|
|
int rc;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
debug_scsi("mtask deq [cid %d state %x itt 0x%x]\n",
|
2006-04-07 04:26:46 +02:00
|
|
|
conn->id, tcp_mtask->xmstate, mtask->itt);
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2007-05-30 19:57:17 +02:00
|
|
|
if (tcp_mtask->xmstate & XMSTATE_IMM_HDR_INIT) {
|
|
|
|
iscsi_buf_init_iov(&tcp_mtask->headbuf, (char*)mtask->hdr,
|
|
|
|
sizeof(struct iscsi_hdr));
|
|
|
|
|
|
|
|
if (mtask->data_count) {
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_mtask->xmstate |= XMSTATE_IMM_DATA;
|
2007-05-30 19:57:17 +02:00
|
|
|
iscsi_buf_init_iov(&tcp_mtask->sendbuf,
|
|
|
|
(char*)mtask->data,
|
|
|
|
mtask->data_count);
|
|
|
|
}
|
|
|
|
|
2005-09-13 04:01:32 +02:00
|
|
|
if (conn->c_stage != ISCSI_CONN_INITIAL_STAGE &&
|
2006-04-07 04:13:39 +02:00
|
|
|
conn->stop_stage != STOP_CONN_RECOVER &&
|
2005-09-13 04:01:32 +02:00
|
|
|
conn->hdrdgst_en)
|
2006-04-07 04:26:46 +02:00
|
|
|
iscsi_hdr_digest(conn, &tcp_mtask->headbuf,
|
|
|
|
(u8*)tcp_mtask->hdrext);
|
2007-05-30 19:57:17 +02:00
|
|
|
|
|
|
|
tcp_mtask->sent = 0;
|
|
|
|
tcp_mtask->xmstate &= ~XMSTATE_IMM_HDR_INIT;
|
|
|
|
tcp_mtask->xmstate |= XMSTATE_IMM_HDR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tcp_mtask->xmstate & XMSTATE_IMM_HDR) {
|
2006-05-30 07:37:28 +02:00
|
|
|
rc = iscsi_sendhdr(conn, &tcp_mtask->headbuf,
|
|
|
|
mtask->data_count);
|
2007-05-30 19:57:17 +02:00
|
|
|
if (rc)
|
2006-05-30 07:37:28 +02:00
|
|
|
return rc;
|
2007-05-30 19:57:17 +02:00
|
|
|
tcp_mtask->xmstate &= ~XMSTATE_IMM_HDR;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
if (tcp_mtask->xmstate & XMSTATE_IMM_DATA) {
|
2005-08-05 04:30:08 +02:00
|
|
|
BUG_ON(!mtask->data_count);
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_mtask->xmstate &= ~XMSTATE_IMM_DATA;
|
2005-08-05 04:30:08 +02:00
|
|
|
/* FIXME: implement.
|
|
|
|
* Virtual buffer could be spreaded across multiple pages...
|
|
|
|
*/
|
|
|
|
do {
|
2006-05-30 07:37:28 +02:00
|
|
|
int rc;
|
|
|
|
|
|
|
|
rc = iscsi_sendpage(conn, &tcp_mtask->sendbuf,
|
|
|
|
&mtask->data_count, &tcp_mtask->sent);
|
|
|
|
if (rc) {
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_mtask->xmstate |= XMSTATE_IMM_DATA;
|
2006-05-30 07:37:28 +02:00
|
|
|
return rc;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
} while (mtask->data_count);
|
|
|
|
}
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
BUG_ON(tcp_mtask->xmstate != XMSTATE_IDLE);
|
2007-02-09 17:39:40 +01:00
|
|
|
if (mtask->hdr->itt == RESERVED_ITT) {
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_session *session = conn->session;
|
|
|
|
|
|
|
|
spin_lock_bh(&session->lock);
|
|
|
|
list_del(&conn->mtask->running);
|
|
|
|
__kfifo_put(session->mgmtpool.queue, (void*)&conn->mtask,
|
|
|
|
sizeof(void*));
|
|
|
|
spin_unlock_bh(&session->lock);
|
|
|
|
}
|
2005-08-05 04:30:08 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-05-30 19:57:17 +02:00
|
|
|
static int
|
|
|
|
iscsi_send_cmd_hdr(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2007-05-30 19:57:17 +02:00
|
|
|
struct scsi_cmnd *sc = ctask->sc;
|
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
|
|
|
int rc = 0;
|
2006-05-30 07:37:28 +02:00
|
|
|
|
2007-05-30 19:57:17 +02:00
|
|
|
if (tcp_ctask->xmstate & XMSTATE_CMD_HDR_INIT) {
|
|
|
|
tcp_ctask->sent = 0;
|
|
|
|
tcp_ctask->sg_count = 0;
|
|
|
|
tcp_ctask->exp_datasn = 0;
|
|
|
|
|
|
|
|
if (sc->sc_data_direction == DMA_TO_DEVICE) {
|
2007-06-14 15:13:17 +02:00
|
|
|
struct scatterlist *sg = scsi_sglist(sc);
|
|
|
|
|
|
|
|
iscsi_buf_init_sg(&tcp_ctask->sendbuf, sg);
|
|
|
|
tcp_ctask->sg = sg + 1;
|
|
|
|
tcp_ctask->bad_sg = sg + scsi_sg_count(sc);
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2007-05-30 19:57:17 +02:00
|
|
|
debug_scsi("cmd [itt 0x%x total %d imm_data %d "
|
|
|
|
"unsol count %d, unsol offset %d]\n",
|
2007-06-14 15:13:17 +02:00
|
|
|
ctask->itt, scsi_bufflen(sc),
|
2007-05-30 19:57:17 +02:00
|
|
|
ctask->imm_count, ctask->unsol_count,
|
|
|
|
ctask->unsol_offset);
|
|
|
|
}
|
2006-04-07 04:26:46 +02:00
|
|
|
|
2007-05-30 19:57:17 +02:00
|
|
|
iscsi_buf_init_iov(&tcp_ctask->headbuf, (char*)ctask->hdr,
|
|
|
|
sizeof(struct iscsi_hdr));
|
|
|
|
|
|
|
|
if (conn->hdrdgst_en)
|
|
|
|
iscsi_hdr_digest(conn, &tcp_ctask->headbuf,
|
|
|
|
(u8*)tcp_ctask->hdrext);
|
|
|
|
tcp_ctask->xmstate &= ~XMSTATE_CMD_HDR_INIT;
|
|
|
|
tcp_ctask->xmstate |= XMSTATE_CMD_HDR_XMIT;
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
}
|
|
|
|
|
2007-05-30 19:57:17 +02:00
|
|
|
if (tcp_ctask->xmstate & XMSTATE_CMD_HDR_XMIT) {
|
|
|
|
rc = iscsi_sendhdr(conn, &tcp_ctask->headbuf, ctask->imm_count);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
tcp_ctask->xmstate &= ~XMSTATE_CMD_HDR_XMIT;
|
|
|
|
|
|
|
|
if (sc->sc_data_direction != DMA_TO_DEVICE)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (ctask->imm_count) {
|
|
|
|
tcp_ctask->xmstate |= XMSTATE_IMM_DATA;
|
|
|
|
iscsi_set_padding(tcp_ctask, ctask->imm_count);
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
|
2007-05-30 19:57:17 +02:00
|
|
|
if (ctask->conn->datadgst_en) {
|
|
|
|
iscsi_data_digest_init(ctask->conn->dd_data,
|
|
|
|
tcp_ctask);
|
|
|
|
tcp_ctask->immdigest = 0;
|
|
|
|
}
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
}
|
|
|
|
|
2007-05-30 19:57:17 +02:00
|
|
|
if (ctask->unsol_count)
|
|
|
|
tcp_ctask->xmstate |=
|
|
|
|
XMSTATE_UNS_HDR | XMSTATE_UNS_INIT;
|
|
|
|
}
|
|
|
|
return rc;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
static int
|
|
|
|
iscsi_send_padding(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
|
|
|
int sent = 0, rc;
|
2006-04-07 04:26:46 +02:00
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
if (tcp_ctask->xmstate & XMSTATE_W_PAD) {
|
|
|
|
iscsi_buf_init_iov(&tcp_ctask->sendbuf, (char*)&tcp_ctask->pad,
|
|
|
|
tcp_ctask->pad_count);
|
|
|
|
if (conn->datadgst_en)
|
2006-09-23 22:33:43 +02:00
|
|
|
crypto_hash_update(&tcp_conn->tx_hash,
|
|
|
|
&tcp_ctask->sendbuf.sg,
|
|
|
|
tcp_ctask->sendbuf.sg.length);
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
} else if (!(tcp_ctask->xmstate & XMSTATE_W_RESEND_PAD))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
tcp_ctask->xmstate &= ~XMSTATE_W_PAD;
|
|
|
|
tcp_ctask->xmstate &= ~XMSTATE_W_RESEND_PAD;
|
|
|
|
debug_scsi("sending %d pad bytes for itt 0x%x\n",
|
|
|
|
tcp_ctask->pad_count, ctask->itt);
|
|
|
|
rc = iscsi_sendpage(conn, &tcp_ctask->sendbuf, &tcp_ctask->pad_count,
|
|
|
|
&sent);
|
2006-05-30 07:37:28 +02:00
|
|
|
if (rc) {
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
debug_scsi("padding send failed %d\n", rc);
|
|
|
|
tcp_ctask->xmstate |= XMSTATE_W_RESEND_PAD;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
2006-05-30 07:37:28 +02:00
|
|
|
return rc;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
static int
|
|
|
|
iscsi_send_digest(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,
|
|
|
|
struct iscsi_buf *buf, uint32_t *digest)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask;
|
|
|
|
struct iscsi_tcp_conn *tcp_conn;
|
|
|
|
int rc, sent = 0;
|
2006-04-07 04:26:46 +02:00
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
if (!conn->datadgst_en)
|
|
|
|
return 0;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
tcp_ctask = ctask->dd_data;
|
|
|
|
tcp_conn = conn->dd_data;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
if (!(tcp_ctask->xmstate & XMSTATE_W_RESEND_DATA_DIGEST)) {
|
2006-09-23 22:33:43 +02:00
|
|
|
crypto_hash_final(&tcp_conn->tx_hash, (u8*)digest);
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
iscsi_buf_init_iov(buf, (char*)digest, 4);
|
|
|
|
}
|
|
|
|
tcp_ctask->xmstate &= ~XMSTATE_W_RESEND_DATA_DIGEST;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
rc = iscsi_sendpage(conn, buf, &tcp_ctask->digest_count, &sent);
|
|
|
|
if (!rc)
|
|
|
|
debug_scsi("sent digest 0x%x for itt 0x%x\n", *digest,
|
|
|
|
ctask->itt);
|
|
|
|
else {
|
|
|
|
debug_scsi("sending digest 0x%x failed for itt 0x%x!\n",
|
|
|
|
*digest, ctask->itt);
|
|
|
|
tcp_ctask->xmstate |= XMSTATE_W_RESEND_DATA_DIGEST;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
return rc;
|
|
|
|
}
|
2005-08-05 04:30:08 +02:00
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
static int
|
|
|
|
iscsi_send_data(struct iscsi_cmd_task *ctask, struct iscsi_buf *sendbuf,
|
|
|
|
struct scatterlist **sg, int *sent, int *count,
|
|
|
|
struct iscsi_buf *digestbuf, uint32_t *digest)
|
|
|
|
{
|
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
|
|
|
struct iscsi_conn *conn = ctask->conn;
|
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
|
|
|
int rc, buf_sent, offset;
|
|
|
|
|
|
|
|
while (*count) {
|
|
|
|
buf_sent = 0;
|
|
|
|
offset = sendbuf->sent;
|
|
|
|
|
|
|
|
rc = iscsi_sendpage(conn, sendbuf, count, &buf_sent);
|
|
|
|
*sent = *sent + buf_sent;
|
|
|
|
if (buf_sent && conn->datadgst_en)
|
2006-09-23 22:33:43 +02:00
|
|
|
partial_sg_digest_update(&tcp_conn->tx_hash,
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
&sendbuf->sg, sendbuf->sg.offset + offset,
|
|
|
|
buf_sent);
|
|
|
|
if (!iscsi_buf_left(sendbuf) && *sg != tcp_ctask->bad_sg) {
|
|
|
|
iscsi_buf_init_sg(sendbuf, *sg);
|
|
|
|
*sg = *sg + 1;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
rc = iscsi_send_padding(conn, ctask);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
return iscsi_send_digest(conn, ctask, digestbuf, digest);
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
static int
|
|
|
|
iscsi_send_unsol_hdr(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
2005-08-05 04:30:08 +02:00
|
|
|
struct iscsi_data_task *dtask;
|
2006-05-30 07:37:28 +02:00
|
|
|
int rc;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_ctask->xmstate |= XMSTATE_UNS_DATA;
|
|
|
|
if (tcp_ctask->xmstate & XMSTATE_UNS_INIT) {
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
dtask = &tcp_ctask->unsol_dtask;
|
|
|
|
|
2006-09-01 00:09:24 +02:00
|
|
|
iscsi_prep_unsolicit_data_pdu(ctask, &dtask->hdr);
|
|
|
|
iscsi_buf_init_iov(&tcp_ctask->headbuf, (char*)&dtask->hdr,
|
|
|
|
sizeof(struct iscsi_hdr));
|
2005-09-13 04:01:32 +02:00
|
|
|
if (conn->hdrdgst_en)
|
2006-04-07 04:26:46 +02:00
|
|
|
iscsi_hdr_digest(conn, &tcp_ctask->headbuf,
|
2005-09-13 04:01:32 +02:00
|
|
|
(u8*)dtask->hdrext);
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_ctask->xmstate &= ~XMSTATE_UNS_INIT;
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
iscsi_set_padding(tcp_ctask, ctask->data_count);
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
2006-05-30 07:37:28 +02:00
|
|
|
|
|
|
|
rc = iscsi_sendhdr(conn, &tcp_ctask->headbuf, ctask->data_count);
|
|
|
|
if (rc) {
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_ctask->xmstate &= ~XMSTATE_UNS_DATA;
|
|
|
|
tcp_ctask->xmstate |= XMSTATE_UNS_HDR;
|
2006-05-30 07:37:28 +02:00
|
|
|
return rc;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
2006-09-01 00:09:28 +02:00
|
|
|
if (conn->datadgst_en) {
|
|
|
|
dtask = &tcp_ctask->unsol_dtask;
|
|
|
|
iscsi_data_digest_init(ctask->conn->dd_data, tcp_ctask);
|
|
|
|
dtask->digest = 0;
|
|
|
|
}
|
|
|
|
|
2005-08-05 04:30:08 +02:00
|
|
|
debug_scsi("uns dout [itt 0x%x dlen %d sent %d]\n",
|
2006-04-07 04:26:46 +02:00
|
|
|
ctask->itt, ctask->unsol_count, tcp_ctask->sent);
|
2005-08-05 04:30:08 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
static int
|
|
|
|
iscsi_send_unsol_pdu(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
2006-05-30 07:37:28 +02:00
|
|
|
int rc;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
if (tcp_ctask->xmstate & XMSTATE_UNS_HDR) {
|
|
|
|
BUG_ON(!ctask->unsol_count);
|
|
|
|
tcp_ctask->xmstate &= ~XMSTATE_UNS_HDR;
|
|
|
|
send_hdr:
|
|
|
|
rc = iscsi_send_unsol_hdr(conn, ctask);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
if (tcp_ctask->xmstate & XMSTATE_UNS_DATA) {
|
|
|
|
struct iscsi_data_task *dtask = &tcp_ctask->unsol_dtask;
|
2006-04-07 04:26:46 +02:00
|
|
|
int start = tcp_ctask->sent;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
rc = iscsi_send_data(ctask, &tcp_ctask->sendbuf, &tcp_ctask->sg,
|
|
|
|
&tcp_ctask->sent, &ctask->data_count,
|
|
|
|
&dtask->digestbuf, &dtask->digest);
|
2006-04-07 04:26:46 +02:00
|
|
|
ctask->unsol_count -= tcp_ctask->sent - start;
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
tcp_ctask->xmstate &= ~XMSTATE_UNS_DATA;
|
2005-08-05 04:30:08 +02:00
|
|
|
/*
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
* Done with the Data-Out. Next, check if we need
|
|
|
|
* to send another unsolicited Data-Out.
|
2005-08-05 04:30:08 +02:00
|
|
|
*/
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
if (ctask->unsol_count) {
|
|
|
|
debug_scsi("sending more uns\n");
|
|
|
|
tcp_ctask->xmstate |= XMSTATE_UNS_INIT;
|
|
|
|
goto send_hdr;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
static int iscsi_send_sol_pdu(struct iscsi_conn *conn,
|
|
|
|
struct iscsi_cmd_task *ctask)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
struct iscsi_session *session = conn->session;
|
|
|
|
struct iscsi_r2t_info *r2t;
|
|
|
|
struct iscsi_data_task *dtask;
|
2006-05-30 07:37:28 +02:00
|
|
|
int left, rc;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2007-05-30 19:57:17 +02:00
|
|
|
if (tcp_ctask->xmstate & XMSTATE_SOL_HDR_INIT) {
|
2006-11-08 22:58:33 +01:00
|
|
|
if (!tcp_ctask->r2t) {
|
|
|
|
spin_lock_bh(&session->lock);
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
__kfifo_get(tcp_ctask->r2tqueue, (void*)&tcp_ctask->r2t,
|
|
|
|
sizeof(void*));
|
2006-11-08 22:58:33 +01:00
|
|
|
spin_unlock_bh(&session->lock);
|
|
|
|
}
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
send_hdr:
|
|
|
|
r2t = tcp_ctask->r2t;
|
|
|
|
dtask = &r2t->dtask;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
if (conn->hdrdgst_en)
|
|
|
|
iscsi_hdr_digest(conn, &r2t->headbuf,
|
|
|
|
(u8*)dtask->hdrext);
|
2007-05-30 19:57:17 +02:00
|
|
|
tcp_ctask->xmstate &= ~XMSTATE_SOL_HDR_INIT;
|
|
|
|
tcp_ctask->xmstate |= XMSTATE_SOL_HDR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tcp_ctask->xmstate & XMSTATE_SOL_HDR) {
|
|
|
|
r2t = tcp_ctask->r2t;
|
|
|
|
dtask = &r2t->dtask;
|
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
rc = iscsi_sendhdr(conn, &r2t->headbuf, r2t->data_count);
|
2007-05-30 19:57:17 +02:00
|
|
|
if (rc)
|
2006-05-30 07:37:28 +02:00
|
|
|
return rc;
|
2007-05-30 19:57:17 +02:00
|
|
|
tcp_ctask->xmstate &= ~XMSTATE_SOL_HDR;
|
|
|
|
tcp_ctask->xmstate |= XMSTATE_SOL_DATA;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
if (conn->datadgst_en) {
|
2006-09-01 00:09:28 +02:00
|
|
|
iscsi_data_digest_init(conn->dd_data, tcp_ctask);
|
|
|
|
dtask->digest = 0;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
iscsi_set_padding(tcp_ctask, r2t->data_count);
|
|
|
|
debug_scsi("sol dout [dsn %d itt 0x%x dlen %d sent %d]\n",
|
|
|
|
r2t->solicit_datasn - 1, ctask->itt, r2t->data_count,
|
|
|
|
r2t->sent);
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
if (tcp_ctask->xmstate & XMSTATE_SOL_DATA) {
|
|
|
|
r2t = tcp_ctask->r2t;
|
|
|
|
dtask = &r2t->dtask;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
rc = iscsi_send_data(ctask, &r2t->sendbuf, &r2t->sg,
|
|
|
|
&r2t->sent, &r2t->data_count,
|
|
|
|
&dtask->digestbuf, &dtask->digest);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
tcp_ctask->xmstate &= ~XMSTATE_SOL_DATA;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
/*
|
|
|
|
* Done with this Data-Out. Next, check if we have
|
|
|
|
* to send another Data-Out for this R2T.
|
|
|
|
*/
|
|
|
|
BUG_ON(r2t->data_length - r2t->sent < 0);
|
|
|
|
left = r2t->data_length - r2t->sent;
|
|
|
|
if (left) {
|
|
|
|
iscsi_solicit_data_cont(conn, ctask, r2t, left);
|
|
|
|
goto send_hdr;
|
|
|
|
}
|
2005-08-05 04:30:08 +02:00
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
/*
|
|
|
|
* Done with this R2T. Check if there are more
|
|
|
|
* outstanding R2Ts ready to be processed.
|
|
|
|
*/
|
|
|
|
spin_lock_bh(&session->lock);
|
|
|
|
tcp_ctask->r2t = NULL;
|
|
|
|
__kfifo_put(tcp_ctask->r2tpool.queue, (void*)&r2t,
|
|
|
|
sizeof(void*));
|
|
|
|
if (__kfifo_get(tcp_ctask->r2tqueue, (void*)&r2t,
|
|
|
|
sizeof(void*))) {
|
|
|
|
tcp_ctask->r2t = r2t;
|
|
|
|
spin_unlock_bh(&session->lock);
|
|
|
|
goto send_hdr;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
spin_unlock_bh(&session->lock);
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-05-30 19:57:17 +02:00
|
|
|
/**
|
|
|
|
* iscsi_tcp_ctask_xmit - xmit normal PDU task
|
|
|
|
* @conn: iscsi connection
|
|
|
|
* @ctask: iscsi command task
|
|
|
|
*
|
|
|
|
* Notes:
|
|
|
|
* The function can return -EAGAIN in which case caller must
|
|
|
|
* call it again later, or recover. '0' return code means successful
|
|
|
|
* xmit.
|
|
|
|
* The function is devided to logical helpers (above) for the different
|
|
|
|
* xmit stages.
|
|
|
|
*
|
|
|
|
*iscsi_send_cmd_hdr()
|
|
|
|
* XMSTATE_CMD_HDR_INIT - prepare Header and Data buffers Calculate
|
|
|
|
* Header Digest
|
|
|
|
* XMSTATE_CMD_HDR_XMIT - Transmit header in progress
|
|
|
|
*
|
|
|
|
*iscsi_send_padding
|
|
|
|
* XMSTATE_W_PAD - Prepare and send pading
|
|
|
|
* XMSTATE_W_RESEND_PAD - retry send pading
|
|
|
|
*
|
|
|
|
*iscsi_send_digest
|
|
|
|
* XMSTATE_W_RESEND_DATA_DIGEST - Finalize and send Data Digest
|
|
|
|
* XMSTATE_W_RESEND_DATA_DIGEST - retry sending digest
|
|
|
|
*
|
|
|
|
*iscsi_send_unsol_hdr
|
|
|
|
* XMSTATE_UNS_INIT - prepare un-solicit data header and digest
|
|
|
|
* XMSTATE_UNS_HDR - send un-solicit header
|
|
|
|
*
|
|
|
|
*iscsi_send_unsol_pdu
|
|
|
|
* XMSTATE_UNS_DATA - send un-solicit data in progress
|
|
|
|
*
|
|
|
|
*iscsi_send_sol_pdu
|
|
|
|
* XMSTATE_SOL_HDR_INIT - solicit data header and digest initialize
|
|
|
|
* XMSTATE_SOL_HDR - send solicit header
|
|
|
|
* XMSTATE_SOL_DATA - send solicit data
|
|
|
|
*
|
|
|
|
*iscsi_tcp_ctask_xmit
|
|
|
|
* XMSTATE_IMM_DATA - xmit managment data (??)
|
|
|
|
**/
|
2005-08-05 04:30:08 +02:00
|
|
|
static int
|
2006-04-07 04:26:46 +02:00
|
|
|
iscsi_tcp_ctask_xmit(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
2005-08-05 04:30:08 +02:00
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
debug_scsi("ctask deq [cid %d xmstate %x itt 0x%x]\n",
|
2006-04-07 04:26:46 +02:00
|
|
|
conn->id, tcp_ctask->xmstate, ctask->itt);
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2007-05-30 19:57:17 +02:00
|
|
|
rc = iscsi_send_cmd_hdr(conn, ctask);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
if (ctask->sc->sc_data_direction != DMA_TO_DEVICE)
|
|
|
|
return 0;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
if (tcp_ctask->xmstate & XMSTATE_IMM_DATA) {
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
rc = iscsi_send_data(ctask, &tcp_ctask->sendbuf, &tcp_ctask->sg,
|
|
|
|
&tcp_ctask->sent, &ctask->imm_count,
|
|
|
|
&tcp_ctask->immbuf, &tcp_ctask->immdigest);
|
2005-08-05 04:30:08 +02:00
|
|
|
if (rc)
|
|
|
|
return rc;
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
tcp_ctask->xmstate &= ~XMSTATE_IMM_DATA;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
rc = iscsi_send_unsol_pdu(conn, ctask);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
[SCSI] iscsi_tcp: fix padding, data digests, and IO at weird offsets
iscsi_tcp calculates padding by using the expected transfer length. This
has the problem where if we have immediate data = no and initial R2T =
yes, and the transfer length ended up needing padding then we send:
1. header
2. padding which should have gone after data
3. data
Besides this bug, we also assume the target will always ask for nice
transfer lengths and the first burst length will always be a nice value.
As far as I can tell form the RFC this is not a requirement. It would be
silly to do this, but if someone did it we will end doing bad things.
Finally the last bug in that bit of code is in our handling of the
recalculation of data digests when we do not send a whole iscsi_buf in
one try. The bug here is that we call crypto_digest_final on a
iscsi_sendpage error, then when we send the rest of the iscsi_buf, we
doiscsi_data_digest_init and this causes the previous data digest to be
lost.
And to make matters worse, some of these bugs are replicated over and
over and over again for immediate data, solicited data and unsolicited
data. So the attached patch made over the iscsi git tree (see
kernel.org/git for details) which I updated today to include the patches
I said I merged, consolidates the sending of data, padding and digests
and calculation of data digests and fixes the above bugs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-01 00:09:27 +02:00
|
|
|
rc = iscsi_send_sol_pdu(conn, ctask);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
static struct iscsi_cls_conn *
|
|
|
|
iscsi_tcp_conn_create(struct iscsi_cls_session *cls_session, uint32_t conn_idx)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_conn *conn;
|
|
|
|
struct iscsi_cls_conn *cls_conn;
|
|
|
|
struct iscsi_tcp_conn *tcp_conn;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
cls_conn = iscsi_conn_setup(cls_session, conn_idx);
|
|
|
|
if (!cls_conn)
|
|
|
|
return NULL;
|
|
|
|
conn = cls_conn->dd_data;
|
2005-08-05 04:30:08 +02:00
|
|
|
/*
|
2006-04-07 04:26:46 +02:00
|
|
|
* due to strange issues with iser these are not set
|
|
|
|
* in iscsi_conn_setup
|
2005-08-05 04:30:08 +02:00
|
|
|
*/
|
2007-03-01 00:32:17 +01:00
|
|
|
conn->max_recv_dlength = ISCSI_DEF_MAX_RECV_SEG_LEN;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn = kzalloc(sizeof(*tcp_conn), GFP_KERNEL);
|
|
|
|
if (!tcp_conn)
|
|
|
|
goto tcp_conn_alloc_fail;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
conn->dd_data = tcp_conn;
|
|
|
|
tcp_conn->iscsi_conn = conn;
|
|
|
|
tcp_conn->in_progress = IN_PROGRESS_WAIT_HEADER;
|
|
|
|
/* initial operational parameters */
|
|
|
|
tcp_conn->hdr_size = sizeof(struct iscsi_hdr);
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-09-23 22:33:43 +02:00
|
|
|
tcp_conn->tx_hash.tfm = crypto_alloc_hash("crc32c", 0,
|
|
|
|
CRYPTO_ALG_ASYNC);
|
|
|
|
tcp_conn->tx_hash.flags = 0;
|
2007-03-01 00:32:21 +01:00
|
|
|
if (IS_ERR(tcp_conn->tx_hash.tfm)) {
|
|
|
|
printk(KERN_ERR "Could not create connection due to crc32c "
|
|
|
|
"loading error %ld. Make sure the crc32c module is "
|
|
|
|
"built as a module or into the kernel\n",
|
|
|
|
PTR_ERR(tcp_conn->tx_hash.tfm));
|
2006-09-01 00:09:28 +02:00
|
|
|
goto free_tcp_conn;
|
2007-03-01 00:32:21 +01:00
|
|
|
}
|
2006-09-01 00:09:28 +02:00
|
|
|
|
2006-09-23 22:33:43 +02:00
|
|
|
tcp_conn->rx_hash.tfm = crypto_alloc_hash("crc32c", 0,
|
|
|
|
CRYPTO_ALG_ASYNC);
|
|
|
|
tcp_conn->rx_hash.flags = 0;
|
2007-03-01 00:32:21 +01:00
|
|
|
if (IS_ERR(tcp_conn->rx_hash.tfm)) {
|
|
|
|
printk(KERN_ERR "Could not create connection due to crc32c "
|
|
|
|
"loading error %ld. Make sure the crc32c module is "
|
|
|
|
"built as a module or into the kernel\n",
|
|
|
|
PTR_ERR(tcp_conn->rx_hash.tfm));
|
2006-09-01 00:09:28 +02:00
|
|
|
goto free_tx_tfm;
|
2007-03-01 00:32:21 +01:00
|
|
|
}
|
2006-09-01 00:09:28 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
return cls_conn;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-09-01 00:09:28 +02:00
|
|
|
free_tx_tfm:
|
2006-09-23 22:33:43 +02:00
|
|
|
crypto_free_hash(tcp_conn->tx_hash.tfm);
|
2006-09-01 00:09:28 +02:00
|
|
|
free_tcp_conn:
|
|
|
|
kfree(tcp_conn);
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn_alloc_fail:
|
|
|
|
iscsi_conn_teardown(cls_conn);
|
|
|
|
return NULL;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
2006-07-24 22:47:26 +02:00
|
|
|
static void
|
|
|
|
iscsi_tcp_release_conn(struct iscsi_conn *conn)
|
|
|
|
{
|
2007-05-30 19:57:24 +02:00
|
|
|
struct iscsi_session *session = conn->session;
|
2006-07-24 22:47:26 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
2007-05-30 19:57:24 +02:00
|
|
|
struct socket *sock = tcp_conn->sock;
|
2006-07-24 22:47:26 +02:00
|
|
|
|
2007-05-30 19:57:24 +02:00
|
|
|
if (!sock)
|
2006-07-24 22:47:26 +02:00
|
|
|
return;
|
|
|
|
|
2007-05-30 19:57:24 +02:00
|
|
|
sock_hold(sock->sk);
|
2006-07-24 22:47:26 +02:00
|
|
|
iscsi_conn_restore_callbacks(tcp_conn);
|
2007-05-30 19:57:24 +02:00
|
|
|
sock_put(sock->sk);
|
2006-07-24 22:47:26 +02:00
|
|
|
|
2007-05-30 19:57:24 +02:00
|
|
|
spin_lock_bh(&session->lock);
|
2006-07-24 22:47:26 +02:00
|
|
|
tcp_conn->sock = NULL;
|
|
|
|
conn->recv_lock = NULL;
|
2007-05-30 19:57:24 +02:00
|
|
|
spin_unlock_bh(&session->lock);
|
|
|
|
sockfd_put(sock);
|
2006-07-24 22:47:26 +02:00
|
|
|
}
|
|
|
|
|
2005-08-05 04:30:08 +02:00
|
|
|
static void
|
2006-04-07 04:26:46 +02:00
|
|
|
iscsi_tcp_conn_destroy(struct iscsi_cls_conn *cls_conn)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_conn *conn = cls_conn->dd_data;
|
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-07-24 22:47:26 +02:00
|
|
|
iscsi_tcp_release_conn(conn);
|
2006-04-07 04:26:46 +02:00
|
|
|
iscsi_conn_teardown(cls_conn);
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-11-08 22:58:31 +01:00
|
|
|
if (tcp_conn->tx_hash.tfm)
|
|
|
|
crypto_free_hash(tcp_conn->tx_hash.tfm);
|
|
|
|
if (tcp_conn->rx_hash.tfm)
|
|
|
|
crypto_free_hash(tcp_conn->rx_hash.tfm);
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
kfree(tcp_conn);
|
|
|
|
}
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-07-24 22:47:26 +02:00
|
|
|
static void
|
|
|
|
iscsi_tcp_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
|
|
|
|
{
|
|
|
|
struct iscsi_conn *conn = cls_conn->dd_data;
|
2006-09-01 00:09:30 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
2006-07-24 22:47:26 +02:00
|
|
|
|
|
|
|
iscsi_conn_stop(cls_conn, flag);
|
|
|
|
iscsi_tcp_release_conn(conn);
|
2006-09-01 00:09:30 +02:00
|
|
|
tcp_conn->hdr_size = sizeof(struct iscsi_hdr);
|
2006-07-24 22:47:26 +02:00
|
|
|
}
|
|
|
|
|
2007-05-30 19:57:24 +02:00
|
|
|
static int iscsi_tcp_get_addr(struct iscsi_conn *conn, struct socket *sock,
|
|
|
|
char *buf, int *port,
|
|
|
|
int (*getname)(struct socket *, struct sockaddr *,
|
|
|
|
int *addrlen))
|
|
|
|
{
|
|
|
|
struct sockaddr_storage *addr;
|
|
|
|
struct sockaddr_in6 *sin6;
|
|
|
|
struct sockaddr_in *sin;
|
|
|
|
int rc = 0, len;
|
|
|
|
|
2007-07-20 17:03:40 +02:00
|
|
|
addr = kmalloc(sizeof(*addr), GFP_KERNEL);
|
2007-05-30 19:57:24 +02:00
|
|
|
if (!addr)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
if (getname(sock, (struct sockaddr *) addr, &len)) {
|
|
|
|
rc = -ENODEV;
|
|
|
|
goto free_addr;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (addr->ss_family) {
|
|
|
|
case AF_INET:
|
|
|
|
sin = (struct sockaddr_in *)addr;
|
|
|
|
spin_lock_bh(&conn->session->lock);
|
|
|
|
sprintf(buf, NIPQUAD_FMT, NIPQUAD(sin->sin_addr.s_addr));
|
|
|
|
*port = be16_to_cpu(sin->sin_port);
|
|
|
|
spin_unlock_bh(&conn->session->lock);
|
|
|
|
break;
|
|
|
|
case AF_INET6:
|
|
|
|
sin6 = (struct sockaddr_in6 *)addr;
|
|
|
|
spin_lock_bh(&conn->session->lock);
|
|
|
|
sprintf(buf, NIP6_FMT, NIP6(sin6->sin6_addr));
|
|
|
|
*port = be16_to_cpu(sin6->sin6_port);
|
|
|
|
spin_unlock_bh(&conn->session->lock);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
free_addr:
|
|
|
|
kfree(addr);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
static int
|
|
|
|
iscsi_tcp_conn_bind(struct iscsi_cls_session *cls_session,
|
2006-05-03 02:46:36 +02:00
|
|
|
struct iscsi_cls_conn *cls_conn, uint64_t transport_eph,
|
2006-04-07 04:26:46 +02:00
|
|
|
int is_leading)
|
|
|
|
{
|
|
|
|
struct iscsi_conn *conn = cls_conn->dd_data;
|
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
|
|
|
struct sock *sk;
|
|
|
|
struct socket *sock;
|
|
|
|
int err;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
/* lookup for existing socket */
|
2006-05-03 02:46:36 +02:00
|
|
|
sock = sockfd_lookup((int)transport_eph, &err);
|
2006-04-07 04:26:46 +02:00
|
|
|
if (!sock) {
|
|
|
|
printk(KERN_ERR "iscsi_tcp: sockfd_lookup failed %d\n", err);
|
|
|
|
return -EEXIST;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
2007-05-30 19:57:24 +02:00
|
|
|
/*
|
|
|
|
* copy these values now because if we drop the session
|
|
|
|
* userspace may still want to query the values since we will
|
|
|
|
* be using them for the reconnect
|
|
|
|
*/
|
|
|
|
err = iscsi_tcp_get_addr(conn, sock, conn->portal_address,
|
|
|
|
&conn->portal_port, kernel_getpeername);
|
|
|
|
if (err)
|
|
|
|
goto free_socket;
|
|
|
|
|
|
|
|
err = iscsi_tcp_get_addr(conn, sock, conn->local_address,
|
|
|
|
&conn->local_port, kernel_getsockname);
|
|
|
|
if (err)
|
|
|
|
goto free_socket;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
err = iscsi_conn_bind(cls_session, cls_conn, is_leading);
|
|
|
|
if (err)
|
2007-05-30 19:57:24 +02:00
|
|
|
goto free_socket;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-05-30 07:37:20 +02:00
|
|
|
/* bind iSCSI connection and socket */
|
|
|
|
tcp_conn->sock = sock;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-05-30 07:37:20 +02:00
|
|
|
/* setup Socket parameters */
|
|
|
|
sk = sock->sk;
|
|
|
|
sk->sk_reuse = 1;
|
|
|
|
sk->sk_sndtimeo = 15 * HZ; /* FIXME: make it configurable */
|
|
|
|
sk->sk_allocation = GFP_ATOMIC;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-05-30 07:37:20 +02:00
|
|
|
/* FIXME: disable Nagle's algorithm */
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-05-30 07:37:20 +02:00
|
|
|
/*
|
|
|
|
* Intercept TCP callbacks for sendfile like receive
|
|
|
|
* processing.
|
|
|
|
*/
|
|
|
|
conn->recv_lock = &sk->sk_callback_lock;
|
|
|
|
iscsi_conn_set_callbacks(conn);
|
|
|
|
tcp_conn->sendpage = tcp_conn->sock->ops->sendpage;
|
|
|
|
/*
|
|
|
|
* set receive state machine into initial state
|
|
|
|
*/
|
|
|
|
tcp_conn->in_progress = IN_PROGRESS_WAIT_HEADER;
|
2005-08-05 04:30:08 +02:00
|
|
|
return 0;
|
2007-05-30 19:57:24 +02:00
|
|
|
|
|
|
|
free_socket:
|
|
|
|
sockfd_put(sock);
|
|
|
|
return err;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
/* called with host lock */
|
2006-04-07 04:13:39 +02:00
|
|
|
static void
|
2007-05-30 19:57:18 +02:00
|
|
|
iscsi_tcp_mgmt_init(struct iscsi_conn *conn, struct iscsi_mgmt_task *mtask)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_mgmt_task *tcp_mtask = mtask->dd_data;
|
2007-05-30 19:57:17 +02:00
|
|
|
tcp_mtask->xmstate = XMSTATE_IMM_HDR_INIT;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
iscsi_r2tpool_alloc(struct iscsi_session *session)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int cmd_i;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* initialize per-task: R2T pool and xmit queue
|
|
|
|
*/
|
|
|
|
for (cmd_i = 0; cmd_i < session->cmds_max; cmd_i++) {
|
|
|
|
struct iscsi_cmd_task *ctask = session->cmds[cmd_i];
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* pre-allocated x4 as much r2ts to handle race when
|
|
|
|
* target acks DataOut faster than we data_xmit() queues
|
|
|
|
* could replenish r2tqueue.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* R2T pool */
|
2006-04-07 04:26:46 +02:00
|
|
|
if (iscsi_pool_init(&tcp_ctask->r2tpool, session->max_r2t * 4,
|
|
|
|
(void***)&tcp_ctask->r2ts,
|
|
|
|
sizeof(struct iscsi_r2t_info))) {
|
2005-08-05 04:30:08 +02:00
|
|
|
goto r2t_alloc_fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* R2T xmit queue */
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_ctask->r2tqueue = kfifo_alloc(
|
2005-08-05 04:30:08 +02:00
|
|
|
session->max_r2t * 4 * sizeof(void*), GFP_KERNEL, NULL);
|
2006-04-07 04:26:46 +02:00
|
|
|
if (tcp_ctask->r2tqueue == ERR_PTR(-ENOMEM)) {
|
|
|
|
iscsi_pool_free(&tcp_ctask->r2tpool,
|
|
|
|
(void**)tcp_ctask->r2ts);
|
2005-08-05 04:30:08 +02:00
|
|
|
goto r2t_alloc_fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
r2t_alloc_fail:
|
|
|
|
for (i = 0; i < cmd_i; i++) {
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_cmd_task *ctask = session->cmds[i];
|
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
|
|
|
|
|
|
|
kfifo_free(tcp_ctask->r2tqueue);
|
|
|
|
iscsi_pool_free(&tcp_ctask->r2tpool,
|
|
|
|
(void**)tcp_ctask->r2ts);
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
iscsi_r2tpool_free(struct iscsi_session *session)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < session->cmds_max; i++) {
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_cmd_task *ctask = session->cmds[i];
|
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
kfifo_free(tcp_ctask->r2tqueue);
|
|
|
|
iscsi_pool_free(&tcp_ctask->r2tpool,
|
|
|
|
(void**)tcp_ctask->r2ts);
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2006-02-02 04:06:49 +01:00
|
|
|
iscsi_conn_set_param(struct iscsi_cls_conn *cls_conn, enum iscsi_param param,
|
2006-06-28 19:00:26 +02:00
|
|
|
char *buf, int buflen)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-02-02 04:06:49 +01:00
|
|
|
struct iscsi_conn *conn = cls_conn->dd_data;
|
2005-08-05 04:30:08 +02:00
|
|
|
struct iscsi_session *session = conn->session;
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
2006-06-28 19:00:26 +02:00
|
|
|
int value;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
switch(param) {
|
|
|
|
case ISCSI_PARAM_HDRDGST_EN:
|
2006-06-28 19:00:26 +02:00
|
|
|
iscsi_set_param(cls_conn, param, buf, buflen);
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->hdr_size = sizeof(struct iscsi_hdr);
|
2006-09-01 00:09:28 +02:00
|
|
|
if (conn->hdrdgst_en)
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->hdr_size += sizeof(__u32);
|
2005-08-05 04:30:08 +02:00
|
|
|
break;
|
|
|
|
case ISCSI_PARAM_DATADGST_EN:
|
2006-06-28 19:00:26 +02:00
|
|
|
iscsi_set_param(cls_conn, param, buf, buflen);
|
2006-04-07 04:26:46 +02:00
|
|
|
tcp_conn->sendpage = conn->datadgst_en ?
|
|
|
|
sock_no_sendpage : tcp_conn->sock->ops->sendpage;
|
2005-08-05 04:30:08 +02:00
|
|
|
break;
|
|
|
|
case ISCSI_PARAM_MAX_R2T:
|
2006-06-28 19:00:26 +02:00
|
|
|
sscanf(buf, "%d", &value);
|
2005-08-05 04:30:08 +02:00
|
|
|
if (session->max_r2t == roundup_pow_of_two(value))
|
|
|
|
break;
|
|
|
|
iscsi_r2tpool_free(session);
|
2006-06-28 19:00:26 +02:00
|
|
|
iscsi_set_param(cls_conn, param, buf, buflen);
|
2005-08-05 04:30:08 +02:00
|
|
|
if (session->max_r2t & (session->max_r2t - 1))
|
|
|
|
session->max_r2t = roundup_pow_of_two(session->max_r2t);
|
|
|
|
if (iscsi_r2tpool_alloc(session))
|
|
|
|
return -ENOMEM;
|
|
|
|
break;
|
|
|
|
default:
|
2006-06-28 19:00:26 +02:00
|
|
|
return iscsi_set_param(cls_conn, param, buf, buflen);
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2006-06-28 19:00:26 +02:00
|
|
|
iscsi_tcp_conn_get_param(struct iscsi_cls_conn *cls_conn,
|
|
|
|
enum iscsi_param param, char *buf)
|
2006-01-14 01:05:50 +01:00
|
|
|
{
|
2006-02-02 04:06:49 +01:00
|
|
|
struct iscsi_conn *conn = cls_conn->dd_data;
|
2006-06-28 19:00:26 +02:00
|
|
|
int len;
|
2006-01-14 01:05:50 +01:00
|
|
|
|
|
|
|
switch(param) {
|
2006-04-07 04:13:36 +02:00
|
|
|
case ISCSI_PARAM_CONN_PORT:
|
2007-05-30 19:57:24 +02:00
|
|
|
spin_lock_bh(&conn->session->lock);
|
|
|
|
len = sprintf(buf, "%hu\n", conn->portal_port);
|
|
|
|
spin_unlock_bh(&conn->session->lock);
|
2006-05-03 02:46:47 +02:00
|
|
|
break;
|
2006-04-07 04:13:36 +02:00
|
|
|
case ISCSI_PARAM_CONN_ADDRESS:
|
2007-05-30 19:57:24 +02:00
|
|
|
spin_lock_bh(&conn->session->lock);
|
|
|
|
len = sprintf(buf, "%s\n", conn->portal_address);
|
|
|
|
spin_unlock_bh(&conn->session->lock);
|
2006-04-07 04:13:36 +02:00
|
|
|
break;
|
|
|
|
default:
|
2006-06-28 19:00:26 +02:00
|
|
|
return iscsi_conn_get_param(cls_conn, param, buf);
|
2006-04-07 04:13:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2007-05-30 19:57:24 +02:00
|
|
|
static int
|
|
|
|
iscsi_tcp_host_get_param(struct Scsi_Host *shost, enum iscsi_host_param param,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
struct iscsi_session *session = iscsi_hostdata(shost->hostdata);
|
|
|
|
int len;
|
|
|
|
|
|
|
|
switch (param) {
|
|
|
|
case ISCSI_HOST_PARAM_IPADDRESS:
|
|
|
|
spin_lock_bh(&session->lock);
|
|
|
|
if (!session->leadconn)
|
|
|
|
len = -ENODEV;
|
|
|
|
else
|
|
|
|
len = sprintf(buf, "%s\n",
|
|
|
|
session->leadconn->local_address);
|
|
|
|
spin_unlock_bh(&session->lock);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return iscsi_host_get_param(shost, param, buf);
|
|
|
|
}
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2005-08-05 04:30:08 +02:00
|
|
|
static void
|
2006-02-02 04:06:49 +01:00
|
|
|
iscsi_conn_get_stats(struct iscsi_cls_conn *cls_conn, struct iscsi_stats *stats)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-02-02 04:06:49 +01:00
|
|
|
struct iscsi_conn *conn = cls_conn->dd_data;
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
|
|
|
stats->txdata_octets = conn->txdata_octets;
|
|
|
|
stats->rxdata_octets = conn->rxdata_octets;
|
|
|
|
stats->scsicmd_pdus = conn->scsicmd_pdus_cnt;
|
|
|
|
stats->dataout_pdus = conn->dataout_pdus_cnt;
|
|
|
|
stats->scsirsp_pdus = conn->scsirsp_pdus_cnt;
|
|
|
|
stats->datain_pdus = conn->datain_pdus_cnt;
|
|
|
|
stats->r2t_pdus = conn->r2t_pdus_cnt;
|
|
|
|
stats->tmfcmd_pdus = conn->tmfcmd_pdus_cnt;
|
|
|
|
stats->tmfrsp_pdus = conn->tmfrsp_pdus_cnt;
|
|
|
|
stats->custom_length = 3;
|
|
|
|
strcpy(stats->custom[0].desc, "tx_sendpage_failures");
|
2006-04-07 04:26:46 +02:00
|
|
|
stats->custom[0].value = tcp_conn->sendpage_failures_cnt;
|
2005-08-05 04:30:08 +02:00
|
|
|
strcpy(stats->custom[1].desc, "rx_discontiguous_hdr");
|
2006-04-07 04:26:46 +02:00
|
|
|
stats->custom[1].value = tcp_conn->discontiguous_hdr_cnt;
|
2005-08-05 04:30:08 +02:00
|
|
|
strcpy(stats->custom[2].desc, "eh_abort_cnt");
|
|
|
|
stats->custom[2].value = conn->eh_abort_cnt;
|
|
|
|
}
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
static struct iscsi_cls_session *
|
|
|
|
iscsi_tcp_session_create(struct iscsi_transport *iscsit,
|
|
|
|
struct scsi_transport_template *scsit,
|
2007-05-30 19:57:19 +02:00
|
|
|
uint16_t cmds_max, uint16_t qdepth,
|
2006-04-07 04:26:46 +02:00
|
|
|
uint32_t initial_cmdsn, uint32_t *hostno)
|
2005-08-05 04:30:08 +02:00
|
|
|
{
|
2006-04-07 04:26:46 +02:00
|
|
|
struct iscsi_cls_session *cls_session;
|
|
|
|
struct iscsi_session *session;
|
|
|
|
uint32_t hn;
|
|
|
|
int cmd_i;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2007-05-30 19:57:19 +02:00
|
|
|
cls_session = iscsi_session_setup(iscsit, scsit, cmds_max, qdepth,
|
2006-04-07 04:26:46 +02:00
|
|
|
sizeof(struct iscsi_tcp_cmd_task),
|
|
|
|
sizeof(struct iscsi_tcp_mgmt_task),
|
|
|
|
initial_cmdsn, &hn);
|
|
|
|
if (!cls_session)
|
|
|
|
return NULL;
|
|
|
|
*hostno = hn;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
session = class_to_transport_session(cls_session);
|
|
|
|
for (cmd_i = 0; cmd_i < session->cmds_max; cmd_i++) {
|
|
|
|
struct iscsi_cmd_task *ctask = session->cmds[cmd_i];
|
|
|
|
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
|
|
|
|
|
|
|
|
ctask->hdr = &tcp_ctask->hdr;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (cmd_i = 0; cmd_i < session->mgmtpool_max; cmd_i++) {
|
|
|
|
struct iscsi_mgmt_task *mtask = session->mgmt_cmds[cmd_i];
|
|
|
|
struct iscsi_tcp_mgmt_task *tcp_mtask = mtask->dd_data;
|
|
|
|
|
|
|
|
mtask->hdr = &tcp_mtask->hdr;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (iscsi_r2tpool_alloc(class_to_transport_session(cls_session)))
|
|
|
|
goto r2tpool_alloc_fail;
|
|
|
|
|
|
|
|
return cls_session;
|
|
|
|
|
|
|
|
r2tpool_alloc_fail:
|
|
|
|
iscsi_session_teardown(cls_session);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void iscsi_tcp_session_destroy(struct iscsi_cls_session *cls_session)
|
|
|
|
{
|
|
|
|
iscsi_r2tpool_free(class_to_transport_session(cls_session));
|
|
|
|
iscsi_session_teardown(cls_session);
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
2007-05-30 19:57:21 +02:00
|
|
|
static int iscsi_tcp_slave_configure(struct scsi_device *sdev)
|
|
|
|
{
|
2007-07-26 19:46:47 +02:00
|
|
|
blk_queue_bounce_limit(sdev->request_queue, BLK_BOUNCE_ANY);
|
2007-05-30 19:57:21 +02:00
|
|
|
blk_queue_dma_alignment(sdev->request_queue, 0);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-04-07 04:26:46 +02:00
|
|
|
static struct scsi_host_template iscsi_sht = {
|
2007-07-26 19:46:46 +02:00
|
|
|
.module = THIS_MODULE,
|
2006-07-24 22:47:54 +02:00
|
|
|
.name = "iSCSI Initiator over TCP/IP",
|
2006-04-07 04:26:46 +02:00
|
|
|
.queuecommand = iscsi_queuecommand,
|
|
|
|
.change_queue_depth = iscsi_change_queue_depth,
|
2007-05-30 19:57:19 +02:00
|
|
|
.can_queue = ISCSI_DEF_XMIT_CMDS_MAX - 1,
|
2006-04-07 04:26:46 +02:00
|
|
|
.sg_tablesize = ISCSI_SG_TABLESIZE,
|
2007-03-01 00:32:20 +01:00
|
|
|
.max_sectors = 0xFFFF,
|
2006-04-07 04:26:46 +02:00
|
|
|
.cmd_per_lun = ISCSI_DEF_CMD_PER_LUN,
|
|
|
|
.eh_abort_handler = iscsi_eh_abort,
|
|
|
|
.eh_host_reset_handler = iscsi_eh_host_reset,
|
|
|
|
.use_clustering = DISABLE_CLUSTERING,
|
2007-05-30 19:57:21 +02:00
|
|
|
.slave_configure = iscsi_tcp_slave_configure,
|
2006-04-07 04:26:46 +02:00
|
|
|
.proc_name = "iscsi_tcp",
|
|
|
|
.this_id = -1,
|
|
|
|
};
|
|
|
|
|
2005-08-05 04:30:08 +02:00
|
|
|
static struct iscsi_transport iscsi_tcp_transport = {
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.name = "tcp",
|
|
|
|
.caps = CAP_RECOVERY_L0 | CAP_MULTI_R2T | CAP_HDRDGST
|
|
|
|
| CAP_DATADGST,
|
2006-04-07 04:13:36 +02:00
|
|
|
.param_mask = ISCSI_MAX_RECV_DLENGTH |
|
|
|
|
ISCSI_MAX_XMIT_DLENGTH |
|
|
|
|
ISCSI_HDRDGST_EN |
|
|
|
|
ISCSI_DATADGST_EN |
|
|
|
|
ISCSI_INITIAL_R2T_EN |
|
|
|
|
ISCSI_MAX_R2T |
|
|
|
|
ISCSI_IMM_DATA_EN |
|
|
|
|
ISCSI_FIRST_BURST |
|
|
|
|
ISCSI_MAX_BURST |
|
|
|
|
ISCSI_PDU_INORDER_EN |
|
|
|
|
ISCSI_DATASEQ_INORDER_EN |
|
|
|
|
ISCSI_ERL |
|
|
|
|
ISCSI_CONN_PORT |
|
2006-05-03 02:46:47 +02:00
|
|
|
ISCSI_CONN_ADDRESS |
|
2006-06-28 19:00:26 +02:00
|
|
|
ISCSI_EXP_STATSN |
|
|
|
|
ISCSI_PERSISTENT_PORT |
|
|
|
|
ISCSI_PERSISTENT_ADDRESS |
|
2007-05-30 19:57:16 +02:00
|
|
|
ISCSI_TARGET_NAME | ISCSI_TPGT |
|
|
|
|
ISCSI_USERNAME | ISCSI_PASSWORD |
|
|
|
|
ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN,
|
2007-05-30 19:57:24 +02:00
|
|
|
.host_param_mask = ISCSI_HOST_HWADDRESS | ISCSI_HOST_IPADDRESS |
|
[SCSI] iscsi class, iscsi_tcp, iser, qla4xxx: add netdevname sysfs attr
iSCSI must support software iscsi (iscsi_tcp, iser), hardware iscsi (qla4xxx),
and partial offload (broadcom). To be able to allow each stack or driver
or port (virtual or physical) to be able to log into the same target portal
we use the initiator tuple [[HWADDRESS | NETDEVNAME], INITIATOR_NAME] and
the target tuple [TARGETNAME, CONN_ADDRESS, CONN_PORT] to id a session.
This patch adds the netdev name, which is used by software iscsi when
it binds a session to a netdevice using the SO_BINDTODEVICE sock opt.
It cannot use HWADDRESS because if someone did vlans then the same netdevice
will have the same mac and the initiator,target id will not be unique.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Cc: Roland Dreier <rdreier@cisco.com>
Cc: David C Somayajulu <david.somayajulu@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2007-05-30 19:57:25 +02:00
|
|
|
ISCSI_HOST_INITIATOR_NAME |
|
|
|
|
ISCSI_HOST_NETDEV_NAME,
|
2005-08-05 04:30:08 +02:00
|
|
|
.host_template = &iscsi_sht,
|
2006-01-14 01:05:50 +01:00
|
|
|
.conndata_size = sizeof(struct iscsi_conn),
|
2005-08-05 04:30:08 +02:00
|
|
|
.max_conn = 1,
|
|
|
|
.max_cmd_len = ISCSI_TCP_MAX_CMD_LEN,
|
2006-04-07 04:26:46 +02:00
|
|
|
/* session management */
|
|
|
|
.create_session = iscsi_tcp_session_create,
|
|
|
|
.destroy_session = iscsi_tcp_session_destroy,
|
|
|
|
/* connection management */
|
|
|
|
.create_conn = iscsi_tcp_conn_create,
|
|
|
|
.bind_conn = iscsi_tcp_conn_bind,
|
|
|
|
.destroy_conn = iscsi_tcp_conn_destroy,
|
2005-08-05 04:30:08 +02:00
|
|
|
.set_param = iscsi_conn_set_param,
|
2006-06-28 19:00:26 +02:00
|
|
|
.get_conn_param = iscsi_tcp_conn_get_param,
|
2006-01-14 01:05:50 +01:00
|
|
|
.get_session_param = iscsi_session_get_param,
|
2005-08-05 04:30:08 +02:00
|
|
|
.start_conn = iscsi_conn_start,
|
2006-07-24 22:47:26 +02:00
|
|
|
.stop_conn = iscsi_tcp_conn_stop,
|
2007-05-30 19:57:12 +02:00
|
|
|
/* iscsi host params */
|
2007-05-30 19:57:24 +02:00
|
|
|
.get_host_param = iscsi_tcp_host_get_param,
|
2007-05-30 19:57:12 +02:00
|
|
|
.set_host_param = iscsi_host_set_param,
|
2006-04-07 04:26:46 +02:00
|
|
|
/* IO */
|
2005-08-05 04:30:08 +02:00
|
|
|
.send_pdu = iscsi_conn_send_pdu,
|
|
|
|
.get_stats = iscsi_conn_get_stats,
|
2006-04-07 04:26:46 +02:00
|
|
|
.init_cmd_task = iscsi_tcp_cmd_init,
|
|
|
|
.init_mgmt_task = iscsi_tcp_mgmt_init,
|
|
|
|
.xmit_cmd_task = iscsi_tcp_ctask_xmit,
|
|
|
|
.xmit_mgmt_task = iscsi_tcp_mtask_xmit,
|
|
|
|
.cleanup_cmd_task = iscsi_tcp_cleanup_ctask,
|
|
|
|
/* recovery */
|
2006-04-07 04:13:39 +02:00
|
|
|
.session_recovery_timedout = iscsi_session_recovery_timedout,
|
2005-08-05 04:30:08 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
static int __init
|
|
|
|
iscsi_tcp_init(void)
|
|
|
|
{
|
|
|
|
if (iscsi_max_lun < 1) {
|
2006-05-03 02:46:43 +02:00
|
|
|
printk(KERN_ERR "iscsi_tcp: Invalid max_lun value of %u\n",
|
|
|
|
iscsi_max_lun);
|
2005-08-05 04:30:08 +02:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
iscsi_tcp_transport.max_lun = iscsi_max_lun;
|
|
|
|
|
2006-01-14 01:05:50 +01:00
|
|
|
if (!iscsi_register_transport(&iscsi_tcp_transport))
|
2006-05-19 03:31:36 +02:00
|
|
|
return -ENODEV;
|
2005-08-05 04:30:08 +02:00
|
|
|
|
2006-01-14 01:05:50 +01:00
|
|
|
return 0;
|
2005-08-05 04:30:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit
|
|
|
|
iscsi_tcp_exit(void)
|
|
|
|
{
|
|
|
|
iscsi_unregister_transport(&iscsi_tcp_transport);
|
|
|
|
}
|
|
|
|
|
|
|
|
module_init(iscsi_tcp_init);
|
|
|
|
module_exit(iscsi_tcp_exit);
|