[kernel] r18900 - in dists/sid/linux-2.6/debian/patches: debian series
Ben Hutchings
benh at alioth.debian.org
Tue Apr 3 03:11:27 UTC 2012
Author: benh
Date: Tue Apr 3 03:11:24 2012
New Revision: 18900
Log:
Revert "CIFS: Respect negotiated MaxMpxCount"
This reverts commit a3f7edf2fcb8e3e9c530c596a6c07479aeed418b.
It's a high-risk change which hasn't been well-tested yet. Leave it a
while to see if further fixes are needed.
Added:
dists/sid/linux-2.6/debian/patches/debian/revert-CIFS-Respect-negotiated-MaxMpxCount.patch
Modified:
dists/sid/linux-2.6/debian/patches/series/base
Added: dists/sid/linux-2.6/debian/patches/debian/revert-CIFS-Respect-negotiated-MaxMpxCount.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/revert-CIFS-Respect-negotiated-MaxMpxCount.patch Tue Apr 3 03:11:24 2012 (r18900)
@@ -0,0 +1,205 @@
+From a7a1dde3ec3bc0503a0c5ecbcabf27b42b9f51d0 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Tue, 3 Apr 2012 04:07:11 +0100
+Subject: [PATCH] Revert "CIFS: Respect negotiated MaxMpxCount"
+
+This reverts commit a3f7edf2fcb8e3e9c530c596a6c07479aeed418b.
+It's a high-risk change which hasn't been well-tested yet. Leave it a
+while to see if further fixes are needed.
+---
+ fs/cifs/cifsfs.c | 8 ++++----
+ fs/cifs/cifsglob.h | 10 +++++++---
+ fs/cifs/cifssmb.c | 9 ++-------
+ fs/cifs/connect.c | 11 +++++++----
+ fs/cifs/dir.c | 6 ++----
+ fs/cifs/file.c | 4 ++--
+ fs/cifs/transport.c | 4 ++--
+ 7 files changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
+index b4c2c99..8f1fe32 100644
+--- a/fs/cifs/cifsfs.c
++++ b/fs/cifs/cifsfs.c
+@@ -76,7 +76,7 @@ MODULE_PARM_DESC(cifs_min_small, "Small network buffers in pool. Default: 30 "
+ unsigned int cifs_max_pending = CIFS_MAX_REQ;
+ module_param(cifs_max_pending, int, 0444);
+ MODULE_PARM_DESC(cifs_max_pending, "Simultaneous requests to server. "
+- "Default: 32767 Range: 2 to 32767.");
++ "Default: 50 Range: 2 to 256");
+ unsigned short echo_retries = 5;
+ module_param(echo_retries, ushort, 0644);
+ MODULE_PARM_DESC(echo_retries, "Number of echo attempts before giving up and "
+@@ -1116,9 +1116,9 @@ init_cifs(void)
+ if (cifs_max_pending < 2) {
+ cifs_max_pending = 2;
+ cFYI(1, "cifs_max_pending set to min of 2");
+- } else if (cifs_max_pending > CIFS_MAX_REQ) {
+- cifs_max_pending = CIFS_MAX_REQ;
+- cFYI(1, "cifs_max_pending set to max of %u", CIFS_MAX_REQ);
++ } else if (cifs_max_pending > 256) {
++ cifs_max_pending = 256;
++ cFYI(1, "cifs_max_pending set to max of 256");
+ }
+
+ rc = cifs_fscache_register();
+diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
+index c467ac8..8238aa1 100644
+--- a/fs/cifs/cifsglob.h
++++ b/fs/cifs/cifsglob.h
+@@ -55,9 +55,14 @@
+
+ /*
+ * MAX_REQ is the maximum number of requests that WE will send
+- * on one socket concurrently.
++ * on one socket concurrently. It also matches the most common
++ * value of max multiplex returned by servers. We may
++ * eventually want to use the negotiated value (in case
++ * future servers can handle more) when we are more confident that
++ * we will not have problems oveloading the socket with pending
++ * write data.
+ */
+-#define CIFS_MAX_REQ 32767
++#define CIFS_MAX_REQ 50
+
+ #define RFC1001_NAME_LEN 15
+ #define RFC1001_NAME_LEN_WITH_NULL (RFC1001_NAME_LEN + 1)
+@@ -258,7 +263,6 @@ struct TCP_Server_Info {
+ bool session_estab; /* mark when very first sess is established */
+ u16 dialect; /* dialect index that server chose */
+ enum securityEnum secType;
+- bool oplocks:1; /* enable oplocks */
+ unsigned int maxReq; /* Clients should submit no more */
+ /* than maxReq distinct unanswered SMBs to the server when using */
+ /* multiplexed reads or writes */
+diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
+index 0e6adac..6600aa2 100644
+--- a/fs/cifs/cifssmb.c
++++ b/fs/cifs/cifssmb.c
+@@ -458,10 +458,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifs_ses *ses)
+ goto neg_err_exit;
+ }
+ server->sec_mode = (__u8)le16_to_cpu(rsp->SecurityMode);
+- server->maxReq = min_t(unsigned int,
+- le16_to_cpu(rsp->MaxMpxCount),
+- cifs_max_pending);
+- server->oplocks = server->maxReq > 1 ? enable_oplocks : false;
++ server->maxReq = le16_to_cpu(rsp->MaxMpxCount);
+ server->maxBuf = le16_to_cpu(rsp->MaxBufSize);
+ server->max_vcs = le16_to_cpu(rsp->MaxNumberVcs);
+ /* even though we do not use raw we might as well set this
+@@ -567,9 +564,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifs_ses *ses)
+
+ /* one byte, so no need to convert this or EncryptionKeyLen from
+ little endian */
+- server->maxReq = min_t(unsigned int, le16_to_cpu(pSMBr->MaxMpxCount),
+- cifs_max_pending);
+- server->oplocks = server->maxReq > 1 ? enable_oplocks : false;
++ server->maxReq = le16_to_cpu(pSMBr->MaxMpxCount);
+ /* probably no need to store and check maxvcs */
+ server->maxBuf = le32_to_cpu(pSMBr->MaxBufferSize);
+ server->max_rw = le32_to_cpu(pSMBr->MaxRawSize);
+diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
+index 9e0675a..bdb62c8 100644
+--- a/fs/cifs/connect.c
++++ b/fs/cifs/connect.c
+@@ -625,10 +625,14 @@ static void clean_demultiplex_info(struct TCP_Server_Info *server)
+ spin_unlock(&GlobalMid_Lock);
+ wake_up_all(&server->response_q);
+
+- /* Check if we have blocked requests that need to free. */
++ /*
++ * Check if we have blocked requests that need to free. Note that
++ * cifs_max_pending is normally 50, but can be set at module install
++ * time to as little as two.
++ */
+ spin_lock(&GlobalMid_Lock);
+- if (atomic_read(&server->inFlight) >= server->maxReq)
+- atomic_set(&server->inFlight, server->maxReq - 1);
++ if (atomic_read(&server->inFlight) >= cifs_max_pending)
++ atomic_set(&server->inFlight, cifs_max_pending - 1);
+ /*
+ * We do not want to set the max_pending too low or we could end up
+ * with the counter going negative.
+@@ -1886,7 +1890,6 @@ cifs_get_tcp_session(struct smb_vol *volume_info)
+ tcp_ses->noautotune = volume_info->noautotune;
+ tcp_ses->tcp_nodelay = volume_info->sockopt_tcp_nodelay;
+ atomic_set(&tcp_ses->inFlight, 0);
+- tcp_ses->maxReq = 1; /* enough to send negotiate request */
+ init_waitqueue_head(&tcp_ses->response_q);
+ init_waitqueue_head(&tcp_ses->request_q);
+ INIT_LIST_HEAD(&tcp_ses->pending_mid_q);
+diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
+index 6937e7c..bf68b4f 100644
+--- a/fs/cifs/dir.c
++++ b/fs/cifs/dir.c
+@@ -171,7 +171,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
+ }
+ tcon = tlink_tcon(tlink);
+
+- if (tcon->ses->server->oplocks)
++ if (enable_oplocks)
+ oplock = REQ_OPLOCK;
+
+ if (nd)
+@@ -492,7 +492,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
+ {
+ int xid;
+ int rc = 0; /* to get around spurious gcc warning, set to zero here */
+- __u32 oplock;
++ __u32 oplock = enable_oplocks ? REQ_OPLOCK : 0;
+ __u16 fileHandle = 0;
+ bool posix_open = false;
+ struct cifs_sb_info *cifs_sb;
+@@ -518,8 +518,6 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
+ }
+ pTcon = tlink_tcon(tlink);
+
+- oplock = pTcon->ses->server->oplocks ? REQ_OPLOCK : 0;
+-
+ /*
+ * Don't allow the separator character in a path component.
+ * The VFS will not allow "/", but "\" is allowed by posix.
+diff --git a/fs/cifs/file.c b/fs/cifs/file.c
+index 159fcc5..8e02dbd 100644
+--- a/fs/cifs/file.c
++++ b/fs/cifs/file.c
+@@ -380,7 +380,7 @@ int cifs_open(struct inode *inode, struct file *file)
+ cFYI(1, "inode = 0x%p file flags are 0x%x for %s",
+ inode, file->f_flags, full_path);
+
+- if (tcon->ses->server->oplocks)
++ if (enable_oplocks)
+ oplock = REQ_OPLOCK;
+ else
+ oplock = 0;
+@@ -505,7 +505,7 @@ static int cifs_reopen_file(struct cifsFileInfo *pCifsFile, bool can_flush)
+ cFYI(1, "inode = 0x%p file flags 0x%x for %s",
+ inode, pCifsFile->f_flags, full_path);
+
+- if (tcon->ses->server->oplocks)
++ if (enable_oplocks)
+ oplock = REQ_OPLOCK;
+ else
+ oplock = 0;
+diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
+index 99a27cf..0cc9584 100644
+--- a/fs/cifs/transport.c
++++ b/fs/cifs/transport.c
+@@ -265,12 +265,12 @@ static int wait_for_free_request(struct TCP_Server_Info *server,
+
+ spin_lock(&GlobalMid_Lock);
+ while (1) {
+- if (atomic_read(&server->inFlight) >= server->maxReq) {
++ if (atomic_read(&server->inFlight) >= cifs_max_pending) {
+ spin_unlock(&GlobalMid_Lock);
+ cifs_num_waiters_inc(server);
+ wait_event(server->request_q,
+ atomic_read(&server->inFlight)
+- < server->maxReq);
++ < cifs_max_pending);
+ cifs_num_waiters_dec(server);
+ spin_lock(&GlobalMid_Lock);
+ } else {
+--
+1.7.9.5
+
Modified: dists/sid/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/base Tue Apr 3 02:52:51 2012 (r18899)
+++ dists/sid/linux-2.6/debian/patches/series/base Tue Apr 3 03:11:24 2012 (r18900)
@@ -81,3 +81,6 @@
+ features/all/fs-hardlink-creation-restriction-cleanup.patch
+ bugfix/all/Don-t-limit-non-nested-epoll-paths.patch
+ bugfix/all/kbuild-do-not-check-for-ancient-modutils-tools.patch
+
+# Temporary, until the original change has been tested some more
++ debian/revert-CIFS-Respect-negotiated-MaxMpxCount.patch
More information about the Kernel-svn-changes
mailing list