diff options
author | Steve French <sfrench@us.ibm.com> | 2008-10-29 00:47:57 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-10-29 00:47:57 +0000 |
commit | edf1ae403896cb7750800508b14996ba6be39a53 (patch) | |
tree | ff792ea77e558d473a9f6515397728d31e73fd09 /fs/cifs/cifsglob.h | |
parent | 49fdf6785fd660e18a1eb4588928f47e9fa29a9a (diff) | |
download | kernel_samsung_tuna-edf1ae403896cb7750800508b14996ba6be39a53.zip kernel_samsung_tuna-edf1ae403896cb7750800508b14996ba6be39a53.tar.gz kernel_samsung_tuna-edf1ae403896cb7750800508b14996ba6be39a53.tar.bz2 |
[CIFS] Reduce number of socket retries in large write path
CIFS in some heavy stress conditions cifs could get EAGAIN
repeatedly in smb_send2 which led to repeated retries and eventually
failure of large writes which could lead to data corruption.
There are three changes that were suggested by various network
developers:
1) convert cifs from non-blocking to blocking tcp sendmsg
(we left in the retry on failure)
2) change cifs to not set sendbuf and rcvbuf size for the socket
(let tcp autotune the buffer sizes since that works much better
in the TCP stack now)
3) if we have a partial frame sent in smb_send2, mark the tcp
session as invalid (close the socket and reconnect) so we do
not corrupt the remaining part of the SMB with the beginning
of the next SMB.
This does not appear to hurt performance measurably and has
been run in various scenarios, but it definately removes
a corruption that we were seeing in some high stress
test cases.
Acked-by: Shirish Pargaonkar <shirishp@us.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsglob.h')
-rw-r--r-- | fs/cifs/cifsglob.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index c791e5b..1cb1189 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -141,6 +141,8 @@ struct TCP_Server_Info { char versionMajor; char versionMinor; bool svlocal:1; /* local server or remote */ + bool noblocksnd; /* use blocking sendmsg */ + bool noautotune; /* do not autotune send buf sizes */ atomic_t socketUseCount; /* number of open cifs sessions on socket */ atomic_t inFlight; /* number of requests on the wire to server */ #ifdef CONFIG_CIFS_STATS2 |