27 Jan, 2016
1 commit
-
This patch replaces uses of the long obsolete hash interface with
ahash.Signed-off-by: Herbert Xu
Reviewed-by: Mike Christie
12 Apr, 2014
1 commit
-
Several spots in the kernel perform a sequence like:
skb_queue_tail(&sk->s_receive_queue, skb);
sk->sk_data_ready(sk, skb->len);But at the moment we place the SKB onto the socket receive queue it
can be consumed and freed up. So this skb->len access is potentially
to freed up memory.Furthermore, the skb->len can be modified by the consumer so it is
possible that the value isn't accurate.And finally, no actual implementation of this callback actually uses
the length argument. And since nobody actually cared about it's
value, lots of call sites pass arbitrary values in such as '0' and
even '1'.So just remove the length argument from the callback, that way there
is no confusion whatsoever and all of these use-after-free cases get
fixed as a side effect.Based upon a patch by Eric Dumazet and his suggestion to audit this
issue tree-wide.Signed-off-by: David S. Miller
25 Feb, 2011
1 commit
-
This has iscsi_tcp use the iscsi_conn_get_addr_param
libiscsi function. It also drops the use of the libiscsi
session portal buffers, so they can be removed in
the next patches. Instead of copying the values
at bind time we get them during get() time. If we are
not connected userspace will now get -ENOTCONN,
so it knows that connection is disconnected instead
of a possible stale value.Signed-off-by: Mike Christie
Signed-off-by: James Bottomley
12 Apr, 2010
1 commit
-
iscsi_conn is not used so remove it from iscsi_sw_tcp_conn.
Signed-off-by: Avi Kaplan
Signed-off-by: Mike Christie
Signed-off-by: James Bottomley
30 Dec, 2008
2 commits
-
This hooks iscsi_tcp into the libiscsi_tcp module and removes
code that is now in libiscsi_tcp.Signed-off-by: Mike Christie
Signed-off-by: James Bottomley -
This converts iscsi_tcp to the new api and modifies how
it handles r2ts.Signed-off-by: Mike Christie
Signed-off-by: James Bottomley
12 Jul, 2008
2 commits
-
This converts iscsi_tcp to use the iscsi_task name.
Signed-off-by: Mike Christie
Signed-off-by: James Bottomley -
Convert iscsi_tcp to support merged tasks.
Signed-off-by: Mike Christie
Signed-off-by: James Bottomley
12 Jan, 2008
6 commits
-
The previous patches converted iscsi_tcp to support sg chaining.
This patch sets the proper flags and sets sg_table size to
4096. This allows fs io to be capped at max_sectors, but passthrough
IO to be limited by some other part of the kernel.Signed-off-by: Mike Christie
Signed-off-by: James Bottomley -
Convert xmit to iscsi chunks.
from michaelc@cs.wisc.edu:
Bug fixes, more digest integration, sg chaining conversion and other
sg wrapper changes, coding style sync up, and removal of io fields,
like pdu_sent, that are not needed.Signed-off-by: Olaf Kirch
Signed-off-by: Mike Christie
Signed-off-by: James Bottomley -
iscsi_pool_init simplified
iscsi_pool_init currently has a lot of duplicate kfree() calls it does
when some allocation fails. This patch simplifies the code a little by
using iscsi_pool_free to tear down the pool in case of an error.iscsi_pool_init also returns a copy of the item array to the caller.
Not all callers use this array, so we make it optional.Instead of allocating a second array and return that, allocate just one
array, of twice the size.Update users of iscsi_pool_{init,free}
This patch drops the (now useless) second argument to
iscsi_pool_free, and updates all callers.It also removes the ctask->r2ts array, which was never
used anyway. Since the items argument to iscsi_pool_init
is now optional, we can pass NULL instead.Signed-off-by: Olaf Kirch
Signed-off-by: Mike Christie
Signed-off-by: James Bottomley -
at libiscsi generic code
- currently code assumes a storage space of pdu header is allocated
at llds ctask and is pointed to by iscsi_cmd_task->hdr. Here I add
a hdr_max field pertaining to that storage, and an hdr_len that
accumulates the current use of the pdu-header.- Add an iscsi_next_hdr() inline which returns the next free space
to write new Header at. Also iscsi_next_hdr() is used to retrieve
the address at which to write the header-digest.- Add iscsi_add_hdr(length). What the user do is calls iscsi_next_hdr()
for address of the new header, than calls iscsi_add_hdr(length) with
the size of the new header. iscsi_add_hdr() will check if space is
available and update to the new size. length must be padded according
to standard.- Add 2 padding inline helpers thanks to Olaf. Current patch does not
use them but Following patches will.
Also moved definition of ISCSI_PAD_LEN to iscsi_proto.h which had
PAD_WORD_LEN that was never used anywhere.- Let iscsi_prep_scsi_cmd_pdu() signal an Error return since now it is
possible that it will fail.- I was tired of yet again writing a "this is a digest" comment next to
sizeof(__u32) so I defined a new ISCSI_DIGEST_SIZE. Now I don't need
any comments. Changed all places that used sizeof(__u32) or "4" in
connection to a digest.iscsi_tcp specific code
- At struct iscsi_tcp_cmd_task allocate maximum space allowed in
standard for all headers following the iscsi_cmd header. and mark
it so in iscsi_tcp_session_create()
- At iscsi_send_cmd_hdr() retrieve the correct headers size and
write header digest at iscsi_next_hdr().Signed-off-by: Boaz Harrosh
Signed-off-by: Olaf Kirch
Signed-off-by: Mike Christie
Signed-off-by: James Bottomley -
Rewrite recv path. Fixes:
- data digest processing and error handling.
- ahs support.Some fixups by Mike Christie
Signed-off-by: Olaf Kirch
Signed-off-by: Mike Christie
Signed-off-by: James Bottomley -
This patch adds logical unit reset support. This should work for ib_iser,
but I have not finished testing that driver so it is not hooked in yet.This patch also temporarily reverts the iscsi_tcp r2t write out patch.
That code is completely rewritten in this patchset.Signed-off-by: Mike Christie
Signed-off-by: James Bottomley
15 Nov, 2007
1 commit
-
There is a race condition in iscsi_tcp.c that may cause it to forget
that it received a R2T from the target. This race may cause a data-out
command (such as a write) to lock up. The race occurs here:static int
iscsi_send_unsol_pdu(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
{
struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
int rc;if (tcp_ctask->xmstate & XMSTATE_UNS_HDR) {
BUG_ON(!ctask->unsol_count);
tcp_ctask->xmstate &= ~XMSTATE_UNS_HDR; xmstate |= XMSTATE_SOL_HDR_INIT; xmstate. Usually, gcc
on x86 will make &= and |= atomic on UP (not guaranteed of course), but
in this case iscsi_send_unsol_pdu() reads the value of xmstate before
clearing the bit, which causes gcc to read xmstate into a CPU register,
test it, clear the bit, and then store it back to memory. If the recv
interrupt happens during this sequence, then the XMSTATE_SOL_HDR_INIT
bit set by the recv interrupt will be lost, and the R2T will be
forgotten.The patch below (against 2.6.24-rc1) converts accesses of xmstate to use
set_bit, clear_bit, and test_bit instead of |= and &=. I have tested
this patch and verified that it fixes the problem. Another possible
approach would be to hold a lock during most of the rx/tx setup and
post-processing, and drop the lock only for the actual rx/tx.Signed-off-by: Tony Battersby
Signed-off-by: Mike Christie
Signed-off-by: James Bottomley
03 Jun, 2007
1 commit
-
If we got the padding, data and header in different skbs,
we were not handling the padding correctly because we attributed it
to the data's skb. This resulted in the initiator reading from
pad bytes + skb offset instead of the correct offset.If you could not connect with the open solaris target, this
will fix the lock up problem you were hitting.Signed-off-by: Mike Christie
Signed-off-by: James Bottomley
02 Jun, 2007
2 commits
-
If iscsi_tcp partially sends a header, it would recalculate the
header size and readd the size of the digest (if header digests
are used).This would cause us to send sizeof(digest) extra bytes
when we sent the rest of the header.Signed-off-by: Mike Christie
Signed-off-by: James Bottomley -
This patch fixes handling of expected datasn/r2tsn as received from
target. It is done according to: T10 rfc3720 section 3.2.2.3. Data Sequencing.. unify expected datasn/r2tsn into one counter
. calculate than check expected datasn/r2tsn. On error print a message
and fail the request. (TODO use iscsi retransmits)
. remove the FIXME ;)
. avoid zero length memsetSigned-off-by: Boaz Harrosh
Signed-off-by: Benny Halevy
Signed-off-by: Mike Christie
Signed-off-by: James Bottomley
24 Sep, 2006
1 commit
-
Conflicts:
drivers/scsi/iscsi_tcp.c
drivers/scsi/iscsi_tcp.hPretty horrible merge between crypto hash consolidation
and crypto_digest_...->crypto_hash_... conversionSigned-off-by: James Bottomley
21 Sep, 2006
1 commit
-
This patch converts ISCSI to use the new crypto_hash interface instead
of crypto_digest. It's a fairly straightforward substitution.Signed-off-by: Herbert Xu
03 Sep, 2006
3 commits
-
We currently allocated seperate tfms for data and header digests. There
is no reason for this since we can never calculate a rx header and
digest at the same time. Same for sends. So this patch removes the data
tfms and has the send and recv sides use the rx_tfm or tx_tfm.I also made the connection creation code preallocate the tfms because I
thought I hit a bug where I changed the digests settings during a
relogin but could not allocate the tfm and then we just failed.Signed-off-by: Mike Christie
Signed-off-by: James Bottomley -
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. dataBesides 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
Signed-off-by: James Bottomley -
iSCSI RFC states that the first burst length must be smaller than the
max burst length. We currently assume targets will be good, but that may
not be the case, so this patch adds a check.This patch also moves the unsol data out offset to the lib so the LLDs
do not have to track it.Signed-off-by: Mike Christie
Signed-off-by: James Bottomley
29 Jul, 2006
1 commit
-
We currently try to allocate a max_recv_data_segment_length
which can be very large (default is 64K), and common uses
are up to 1MB. It is very very difficult to allocte this
much contiguous memory and it turns out we never even use it.
We really only need a couple of pages, so this patch has us
allocates just what we know what we need today.Later if vendors start adding vendor specific data and
we need to handle large buffers we can do this, but for
the last 4 years we have not seen anyone do this or request
it.Signed-off-by: Mike Christie
Signed-off-by: James Bottomley
20 May, 2006
1 commit
-
Discovered by steven@hayter.me.uk and patch by michaelc@cs.wisc.edu
The dtask mempool is reserving 261120 items per session! Since we are now
sending headers with sendmsg there is no reason for the mempool and that
was causing us to us carzy amounts of mem. We can preallicate a header in
the r2t and task struct and reuse themSigned-off-by: Mike Christie
Signed-off-by: James Bottomley
15 Apr, 2006
2 commits
-
This just converts iscsi_tcp to the lib
Signed-off-by: Mike Christie
Signed-off-by: James Bottomley -
The current iscsi_tcp eh is not nicely setup for dm-multipath
and performs some extra task management functions when they
are not needed.The attached patch:
- Fixes the TMF issues. If a session is rebuilt
then we do not send aborts.- Fixes the problem where if the host reset fired, we would
return SUCCESS even though we had not really done anything
yet. This ends up causing problem with scsi_error.c's TUR.- If someone has turned on the userspace nop daemon code to try
and detect network problems before the scsi command timeout
we can now drop and clean up the session before the scsi command
timesout and fires the eh speeding up the time it takes for a
command to go from one patch to another. For network problems
we fail the command with DID_BUS_BUSY so if failfast is set
scsi_decide_disposition fails the command up to dm for it to
try on another path.- And we had to add some basic iscsi session block code. Previously
if we were trying to repair a session we would retrun a MLQUEUE code
in the queuecommand. This worked but it was not the most efficient
or pretty thing to do since it would take a while to relogin
to the target. For iscsi_tcp/open-iscsi a lot of the iscsi error handler
is in userspace the block code is pretty bare. We will be
adding to that for qla4xxx.Signed-off-by: Mike Christie
Signed-off-by: James Bottomley
05 Feb, 2006
2 commits
-
>From erezz@voltaire.com:
rm conn->lock since it is not used anymore. The dataqueue is protected
by the session lock and xmitmutex.Signed-off-by: Mike Christie
Signed-off-by: Alex Aizman
Signed-off-by: Dmitry Yusupov
Signed-off-by: James Bottomley -
From:
michaelc@cs.wisc.edu
fujita.tomonori@lab.ntt.co.jp
da-x@monatomic.organd err path fixup from:
ogerlitz@voltaire.comThis patch cleans up that interface by having the lld and class
pass a iscsi_cls_session or iscsi_cls_conn between each other when
the function is used by HW and SW iscsi llds. This way the lld
does not have to remember if it has to send a handle or pointer
and a handle or pointer to connection, session or host.This also has the class verify the session handle that gets passed from
userspace instead of using the pointer passed into the kernel directly.Signed-off-by: Mike Christie
Signed-off-by: Alex Aizman
Signed-off-by: Dmitry Yusupov
Signed-off-by: James Bottomley
15 Jan, 2006
2 commits
-
From Mike Christie and FUJITA Tomonori :
We cannot use page_address becuase some pages could be highmem.
Instead, we can use sock_no_sendpage which does kmap for us.Signed-off-by: Alex Aizman
Signed-off-by: Dmitry Yusupov
Signed-off-by: Mike Christie
Signed-off-by: James Bottomley -
Users can write to a page while we are sending it and making
digest calculations. This ends up causing us to retry the command
when a digest error is later reported. By using sock_no_sendpage
when data digests are calculated we can avoid a lot of (not all but it
helps) the retries becuase sock_no_sendpage is not zero copy.Signed-off-by: Alex Aizman
Signed-off-by: Dmitry Yusupov
Signed-off-by: Mike Christie
Signed-off-by: James Bottomley
13 Jan, 2006
1 commit
-
the scsi layer is using semaphores in a mutex way, this patch converts
these into using mutexes insteadSigned-off-by: Arjan van de Ven
Signed-off-by: James Bottomley
14 Dec, 2005
1 commit
-
From Wang Zhenyu:
High queue depth was a problem for some targets so make queue_depth adjustable
From Mike Christie
Make default queue_depth a little lower
Signed-off-by: Mike Christie
Signed-off-by: Alex Aizman
Signed-off-by: Dmitry Yusupov
Signed-off-by: James Bottomley
06 Aug, 2005
1 commit
-
drivers/scsi/iscsi_tcp.h, header file.
Signed-off-by: Alex Aizman
Signed-off-by: Dmitry Yusupov
Signed-off-by: Mike Christie
Signed-off-by: James Bottomley
