1 files changed, 255 insertions, 76 deletions

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index 0046c219833d..981ea0d8b9cd 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -49,7 +49,8 @@ AllocMidQEntry(struct smb_hdr *smb_buffer, struct cifsSesInfo *ses)
                 return NULL;
         }
         
-        temp = (struct mid_q_entry *) mempool_alloc(cifs_mid_poolp,SLAB_KERNEL | SLAB_NOFS);
+        temp = (struct mid_q_entry *) mempool_alloc(cifs_mid_poolp,
+                                                    SLAB_KERNEL | SLAB_NOFS);
         if (temp == NULL)
                 return temp;
         else {
@@ -58,7 +59,9 @@ AllocMidQEntry(struct smb_hdr *smb_buffer, struct cifsSesInfo *ses)
                 temp->pid = current->pid;
                 temp->command = smb_buffer->Command;
                 cFYI(1, ("For smb_command %d", temp->command));
-                do_gettimeofday(&temp->when_sent);
+        /*      do_gettimeofday(&temp->when_sent);*/ /* easier to use jiffies */
+                /* when mid allocated can be before when sent */
+                temp->when_alloc = jiffies;
                 temp->ses = ses;
                 temp->tsk = current;
         }
@@ -74,6 +77,9 @@ AllocMidQEntry(struct smb_hdr *smb_buffer, struct cifsSesInfo *ses)
 static void
 DeleteMidQEntry(struct mid_q_entry *midEntry)
 {
+#ifdef CONFIG_CIFS_STATS2
+        unsigned long now;
+#endif
         spin_lock(&GlobalMid_Lock);
         midEntry->midState = MID_FREE;
         list_del(&midEntry->qhead);
@@ -83,6 +89,22 @@ DeleteMidQEntry(struct mid_q_entry *midEntry)
                 cifs_buf_release(midEntry->resp_buf);
         else
                 cifs_small_buf_release(midEntry->resp_buf);
+#ifdef CONFIG_CIFS_STATS2
+        now = jiffies;
+        /* commands taking longer than one second are indications that
+           something is wrong, unless it is quite a slow link or server */
+        if((now - midEntry->when_alloc) > HZ) {
+                if((cifsFYI & CIFS_TIMER) && 
+                   (midEntry->command != SMB_COM_LOCKING_ANDX)) {
+                        printk(KERN_DEBUG " CIFS slow rsp: cmd %d mid %d",
+                               midEntry->command, midEntry->mid);
+                        printk(" A: 0x%lx S: 0x%lx R: 0x%lx\n",
+                               now - midEntry->when_alloc,
+                               now - midEntry->when_sent,
+                               now - midEntry->when_received);
+                }
+        }
+#endif
         mempool_free(midEntry, cifs_mid_poolp);
 }
 
@@ -146,32 +168,37 @@ smb_send(struct socket *ssocket, struct smb_hdr *smb_buffer,
            Flags2 is converted in SendReceive */
 
         smb_buffer->smb_buf_length = cpu_to_be32(smb_buffer->smb_buf_length);
-        cFYI(1, ("Sending smb of length %d ", smb_buf_length));
+        cFYI(1, ("Sending smb of length %d", smb_buf_length));
         dump_smb(smb_buffer, len);
 
         while (len > 0) {
                 rc = kernel_sendmsg(ssocket, &smb_msg, &iov, 1, len);
                 if ((rc == -ENOSPC) || (rc == -EAGAIN)) {
                         i++;
-                        if(i > 60) {
+                /* smaller timeout here than send2 since smaller size */
+                /* Although it may not be required, this also is smaller 
+                   oplock break time */  
+                        if(i > 12) {
                                 cERROR(1,
-                                   ("sends on sock %p stuck for 30 seconds",
+                                   ("sends on sock %p stuck for 7 seconds",
                                     ssocket));
                                 rc = -EAGAIN;
                                 break;
                         }
-                        msleep(500);
+                        msleep(1 << i);
                         continue;
                 }
                 if (rc < 0) 
                         break;
+                else
+                        i = 0; /* reset i after each successful send */
                 iov.iov_base += rc;
                 iov.iov_len -= rc;
                 len -= rc;
         }
 
         if (rc < 0) {
-                cERROR(1,("Error %d sending data on socket to server.", rc));
+                cERROR(1,("Error %d sending data on socket to server", rc));
         } else {
                 rc = 0;
         }
@@ -179,26 +206,21 @@ smb_send(struct socket *ssocket, struct smb_hdr *smb_buffer,
         return rc;
 }
 
-#ifdef CIFS_EXPERIMENTAL
-/* BB finish off this function, adding support for writing set of pages as iovec */
-/* and also adding support for operations that need to parse the response smb    */
-
-int
-smb_sendv(struct socket *ssocket, struct smb_hdr *smb_buffer,
-         unsigned int smb_buf_length, struct kvec * write_vector 
-          /* page list */, struct sockaddr *sin)
+#ifdef CONFIG_CIFS_EXPERIMENTAL
+static int
+smb_send2(struct socket *ssocket, struct kvec *iov, int n_vec,
+          struct sockaddr *sin)
 {
         int rc = 0;
         int i = 0;
         struct msghdr smb_msg;
-        number_of_pages += 1; /* account for SMB header */
-        struct kvec * piov  = kmalloc(number_of_pages * sizeof(struct kvec));
-        unsigned len = smb_buf_length + 4;
-
+        struct smb_hdr *smb_buffer = iov[0].iov_base;
+        unsigned int len = iov[0].iov_len;
+        unsigned int total_len;
+        int first_vec = 0;
+        
         if(ssocket == NULL)
                 return -ENOTSOCK; /* BB eventually add reconnect code here */
-        iov.iov_base = smb_buffer;
-        iov.iov_len = len;
 
         smb_msg.msg_name = sin;
         smb_msg.msg_namelen = sizeof (struct sockaddr);
@@ -211,49 +233,80 @@ smb_sendv(struct socket *ssocket, struct smb_hdr *smb_buffer,
            cifssmb.c and RFC1001 len is converted to bigendian in smb_send 
            Flags2 is converted in SendReceive */
 
+
+        total_len = 0;
+        for (i = 0; i < n_vec; i++)
+                total_len += iov[i].iov_len;
+
         smb_buffer->smb_buf_length = cpu_to_be32(smb_buffer->smb_buf_length);
-        cFYI(1, ("Sending smb of length %d ", smb_buf_length));
+        cFYI(1, ("Sending smb:  total_len %d", total_len));
         dump_smb(smb_buffer, len);
 
-        while (len > 0) {
-                rc = kernel_sendmsg(ssocket, &smb_msg, &iov, number_of_pages, 
-                                    len);
+        while (total_len) {
+                rc = kernel_sendmsg(ssocket, &smb_msg, &iov[first_vec],
+                                    n_vec - first_vec, total_len);
                 if ((rc == -ENOSPC) || (rc == -EAGAIN)) {
                         i++;
-                        if(i > 60) {
+                        if(i >= 14) {
                                 cERROR(1,
-                                   ("sends on sock %p stuck for 30 seconds",
+                                   ("sends on sock %p stuck for 15 seconds",
                                     ssocket));
                                 rc = -EAGAIN;
                                 break;
                         }
-                        msleep(500);
+                        msleep(1 << i);
                         continue;
                 }
                 if (rc < 0) 
                         break;
-                iov.iov_base += rc;
-                iov.iov_len -= rc;
-                len -= rc;
+
+                if (rc >= total_len) {
+                        WARN_ON(rc > total_len);
+                        break;
+                }
+                if(rc == 0) {
+                        /* should never happen, letting socket clear before
+                           retrying is our only obvious option here */
+                        cERROR(1,("tcp sent no data"));
+                        msleep(500);
+                        continue;
+                }
+                total_len -= rc;
+                /* the line below resets i */
+                for (i = first_vec; i < n_vec; i++) {
+                        if (iov[i].iov_len) {
+                                if (rc > iov[i].iov_len) {
+                                        rc -= iov[i].iov_len;
+                                        iov[i].iov_len = 0;
+                                } else {
+                                        iov[i].iov_base += rc;
+                                        iov[i].iov_len -= rc;
+                                        first_vec = i;
+                                        break;
+                                }
+                        }
+                }
+                i = 0; /* in case we get ENOSPC on the next send */
         }
 
         if (rc < 0) {
-                cERROR(1,("Error %d sending data on socket to server.", rc));
-        } else {
+                cERROR(1,("Error %d sending data on socket to server", rc));
+        } else
                 rc = 0;
-        }
 
         return rc;
 }
 
-
 int
-CIFSSendRcv(const unsigned int xid, struct cifsSesInfo *ses,
-            struct smb_hdr *in_buf, struct kvec * write_vector /* page list */, int *pbytes_returned, const int long_op)
+SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, 
+             struct kvec *iov, int n_vec, int *pbytes_returned,
+             const int long_op)
 {
         int rc = 0;
-        unsigned long timeout = 15 * HZ;
-        struct mid_q_entry *midQ = NULL;
+        unsigned int receive_len;
+        unsigned long timeout;
+        struct mid_q_entry *midQ;
+        struct smb_hdr *in_buf = iov[0].iov_base;
 
         if (ses == NULL) {
                 cERROR(1,("Null smb session"));
@@ -263,14 +316,8 @@ CIFSSendRcv(const unsigned int xid, struct cifsSesInfo *ses,
                 cERROR(1,("Null tcp session"));
                 return -EIO;
         }
-        if(pbytes_returned == NULL)
-                return -EIO;
-        else
-                *pbytes_returned = 0;
 
-  
-
-        if(ses->server->tcpStatus == CIFS_EXITING)
+        if(ses->server->tcpStatus == CifsExiting)
                 return -ENOENT;
 
         /* Ensure that we do not send more than 50 overlapping requests 
@@ -282,11 +329,18 @@ CIFSSendRcv(const unsigned int xid, struct cifsSesInfo *ses,
         } else {
                 spin_lock(&GlobalMid_Lock); 
                 while(1) {        
-                        if(atomic_read(&ses->server->inFlight) >= cifs_max_pending){
+                        if(atomic_read(&ses->server->inFlight) >= 
+                                        cifs_max_pending){
                                 spin_unlock(&GlobalMid_Lock);
+#ifdef CONFIG_CIFS_STATS2
+                                atomic_inc(&ses->server->num_waiters);
+#endif
                                 wait_event(ses->server->request_q,
                                         atomic_read(&ses->server->inFlight)
                                          < cifs_max_pending);
+#ifdef CONFIG_CIFS_STATS2
+                                atomic_dec(&ses->server->num_waiters);
+#endif
                                 spin_lock(&GlobalMid_Lock);
                         } else {
                                 if(ses->server->tcpStatus == CifsExiting) {
@@ -314,17 +368,17 @@ CIFSSendRcv(const unsigned int xid, struct cifsSesInfo *ses,
 
         if (ses->server->tcpStatus == CifsExiting) {
                 rc = -ENOENT;
-                goto cifs_out_label;
+                goto out_unlock2;
         } else if (ses->server->tcpStatus == CifsNeedReconnect) {
                 cFYI(1,("tcp session dead - return to caller to retry"));
                 rc = -EAGAIN;
-                goto cifs_out_label;
+                goto out_unlock2;
         } else if (ses->status != CifsGood) {
                 /* check if SMB session is bad because we are setting it up */
                 if((in_buf->Command != SMB_COM_SESSION_SETUP_ANDX) && 
                         (in_buf->Command != SMB_COM_NEGOTIATE)) {
                         rc = -EAGAIN;
-                        goto cifs_out_label;
+                        goto out_unlock2;
                 } /* else ok - we are setting up session */
         }
         midQ = AllocMidQEntry(in_buf, ses);
@@ -338,51 +392,162 @@ CIFSSendRcv(const unsigned int xid, struct cifsSesInfo *ses,
                 return -ENOMEM;
         }
 
-        if (in_buf->smb_buf_length > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4) {
-                up(&ses->server->tcpSem);
-                cERROR(1,
-                       ("Illegal length, greater than maximum frame, %d ",
-                        in_buf->smb_buf_length));
+/* BB FIXME */
+/*      rc = cifs_sign_smb2(iov, n_vec, ses->server, &midQ->sequence_number); */
+
+        midQ->midState = MID_REQUEST_SUBMITTED;
+#ifdef CONFIG_CIFS_STATS2
+        atomic_inc(&ses->server->inSend);
+#endif
+        rc = smb_send2(ses->server->ssocket, iov, n_vec,
+                      (struct sockaddr *) &(ses->server->addr.sockAddr));
+#ifdef CONFIG_CIFS_STATS2
+        atomic_dec(&ses->server->inSend);
+        midQ->when_sent = jiffies;
+#endif
+        if(rc < 0) {
                 DeleteMidQEntry(midQ);
+                up(&ses->server->tcpSem);
                 /* If not lock req, update # of requests on wire to server */
                 if(long_op < 3) {
                         atomic_dec(&ses->server->inFlight); 
                         wake_up(&ses->server->request_q);
                 }
-                return -EIO;
+                return rc;
+        } else
+                up(&ses->server->tcpSem);
+        if (long_op == -1)
+                goto cifs_no_response_exit2;
+        else if (long_op == 2) /* writes past end of file can take loong time */
+                timeout = 180 * HZ;
+        else if (long_op == 1)
+                timeout = 45 * HZ; /* should be greater than 
+                        servers oplock break timeout (about 43 seconds) */
+        else if (long_op > 2) {
+                timeout = MAX_SCHEDULE_TIMEOUT;
+        } else
+                timeout = 15 * HZ;
+        /* wait for 15 seconds or until woken up due to response arriving or 
+           due to last connection to this server being unmounted */
+        if (signal_pending(current)) {
+                /* if signal pending do not hold up user for full smb timeout
+                but we still give response a change to complete */
+                timeout = 2 * HZ;
+        }   
+
+        /* No user interrupts in wait - wreaks havoc with performance */
+        if(timeout != MAX_SCHEDULE_TIMEOUT) {
+                timeout += jiffies;
+                wait_event(ses->server->response_q,
+                        (!(midQ->midState & MID_REQUEST_SUBMITTED)) || 
+                        time_after(jiffies, timeout) || 
+                        ((ses->server->tcpStatus != CifsGood) &&
+                         (ses->server->tcpStatus != CifsNew)));
+        } else {
+                wait_event(ses->server->response_q,
+                        (!(midQ->midState & MID_REQUEST_SUBMITTED)) || 
+                        ((ses->server->tcpStatus != CifsGood) &&
+                         (ses->server->tcpStatus != CifsNew)));
         }
 
-        /* BB can we sign efficiently in this path? */
-        rc = cifs_sign_smb(in_buf, ses->server, &midQ->sequence_number);
+        spin_lock(&GlobalMid_Lock);
+        if (midQ->resp_buf) {
+                spin_unlock(&GlobalMid_Lock);
+                receive_len = midQ->resp_buf->smb_buf_length;
+        } else {
+                cERROR(1,("No response to cmd %d mid %d",
+                        midQ->command, midQ->mid));
+                if(midQ->midState == MID_REQUEST_SUBMITTED) {
+                        if(ses->server->tcpStatus == CifsExiting)
+                                rc = -EHOSTDOWN;
+                        else {
+                                ses->server->tcpStatus = CifsNeedReconnect;
+                                midQ->midState = MID_RETRY_NEEDED;
+                        }
+                }
 
-        midQ->midState = MID_REQUEST_SUBMITTED;
-/*      rc = smb_sendv(ses->server->ssocket, in_buf, in_buf->smb_buf_length,
-                       piovec, 
-                       (struct sockaddr *) &(ses->server->addr.sockAddr));*/
-        if(rc < 0) {
+                if (rc != -EHOSTDOWN) {
+                        if(midQ->midState == MID_RETRY_NEEDED) {
+                                rc = -EAGAIN;
+                                cFYI(1,("marking request for retry"));
+                        } else {
+                                rc = -EIO;
+                        }
+                }
+                spin_unlock(&GlobalMid_Lock);
                 DeleteMidQEntry(midQ);
-                up(&ses->server->tcpSem);
                 /* If not lock req, update # of requests on wire to server */
                 if(long_op < 3) {
                         atomic_dec(&ses->server->inFlight); 
                         wake_up(&ses->server->request_q);
                 }
                 return rc;
-        } else
-                up(&ses->server->tcpSem);
-cifs_out_label:
-        if(midQ)
-                DeleteMidQEntry(midQ);
-                                                                                                                           
+        }
+  
+        if (receive_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE) {
+                cERROR(1, ("Frame too large received.  Length: %d  Xid: %d",
+                        receive_len, xid));
+                rc = -EIO;
+        } else {                /* rcvd frame is ok */
+
+                if (midQ->resp_buf && 
+                        (midQ->midState == MID_RESPONSE_RECEIVED)) {
+                        in_buf->smb_buf_length = receive_len;
+                        /* BB verify that length would not overrun small buf */
+                        memcpy((char *)in_buf + 4,
+                               (char *)midQ->resp_buf + 4,
+                               receive_len);
+
+                        dump_smb(in_buf, 80);
+                        /* convert the length into a more usable form */
+                        if((receive_len > 24) &&
+                           (ses->server->secMode & (SECMODE_SIGN_REQUIRED |
+                                        SECMODE_SIGN_ENABLED))) {
+                                rc = cifs_verify_signature(in_buf,
+                                                ses->server->mac_signing_key,
+                                                midQ->sequence_number+1);
+                                if(rc) {
+                                        cERROR(1,("Unexpected SMB signature"));
+                                        /* BB FIXME add code to kill session */
+                                }
+                        }
+
+                        *pbytes_returned = in_buf->smb_buf_length;
+
+                        /* BB special case reconnect tid and uid here? */
+                        rc = map_smb_to_linux_error(in_buf);
+
+                        /* convert ByteCount if necessary */
+                        if (receive_len >=
+                            sizeof (struct smb_hdr) -
+                            4 /* do not count RFC1001 header */  +
+                            (2 * in_buf->WordCount) + 2 /* bcc */ )
+                                BCC(in_buf) = le16_to_cpu(BCC(in_buf));
+                } else {
+                        rc = -EIO;
+                        cFYI(1,("Bad MID state?"));
+                }
+        }
+cifs_no_response_exit2:
+        DeleteMidQEntry(midQ);
+
         if(long_op < 3) {
-                atomic_dec(&ses->server->inFlight);
+                atomic_dec(&ses->server->inFlight); 
                 wake_up(&ses->server->request_q);
         }
 
         return rc;
-}
 
+out_unlock2:
+        up(&ses->server->tcpSem);
+        /* If not lock req, update # of requests on wire to server */
+        if(long_op < 3) {
+                atomic_dec(&ses->server->inFlight); 
+                wake_up(&ses->server->request_q);
+        }
 
+        return rc;
+}
 #endif /* CIFS_EXPERIMENTAL */
 
 int
@@ -419,9 +584,15 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
                         if(atomic_read(&ses->server->inFlight) >= 
                                         cifs_max_pending){
                                 spin_unlock(&GlobalMid_Lock);
+#ifdef CONFIG_CIFS_STATS2
+                                atomic_inc(&ses->server->num_waiters);
+#endif
                                 wait_event(ses->server->request_q,
                                         atomic_read(&ses->server->inFlight)
                                          < cifs_max_pending);
+#ifdef CONFIG_CIFS_STATS2
+                                atomic_dec(&ses->server->num_waiters);
+#endif
                                 spin_lock(&GlobalMid_Lock);
                         } else {
                                 if(ses->server->tcpStatus == CifsExiting) {
@@ -490,8 +661,15 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
         rc = cifs_sign_smb(in_buf, ses->server, &midQ->sequence_number);
 
         midQ->midState = MID_REQUEST_SUBMITTED;
+#ifdef CONFIG_CIFS_STATS2
+        atomic_inc(&ses->server->inSend);
+#endif
         rc = smb_send(ses->server->ssocket, in_buf, in_buf->smb_buf_length,
                       (struct sockaddr *) &(ses->server->addr.sockAddr));
+#ifdef CONFIG_CIFS_STATS2
+        atomic_dec(&ses->server->inSend);
+        midQ->when_sent = jiffies;
+#endif
         if(rc < 0) {
                 DeleteMidQEntry(midQ);
                 up(&ses->server->tcpSem);
@@ -506,7 +684,7 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
         if (long_op == -1)
                 goto cifs_no_response_exit;
         else if (long_op == 2) /* writes past end of file can take loong time */
-                timeout = 300 * HZ;
+                timeout = 180 * HZ;
         else if (long_op == 1)
                 timeout = 45 * HZ; /* should be greater than 
                         servers oplock break timeout (about 43 seconds) */
@@ -540,9 +718,10 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
         spin_lock(&GlobalMid_Lock);
         if (midQ->resp_buf) {
                 spin_unlock(&GlobalMid_Lock);
-                receive_len = be32_to_cpu(*(__be32 *)midQ->resp_buf);
+                receive_len = midQ->resp_buf->smb_buf_length;
         } else {
-                cERROR(1,("No response buffer"));
+                cERROR(1,("No response for cmd %d mid %d",
+                          midQ->command, midQ->mid));
                 if(midQ->midState == MID_REQUEST_SUBMITTED) {
                         if(ses->server->tcpStatus == CifsExiting)
                                 rc = -EHOSTDOWN;
@@ -610,7 +789,7 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
                                 BCC(out_buf) = le16_to_cpu(BCC(out_buf));
                 } else {
                         rc = -EIO;
-                        cFYI(1,("Bad MID state? "));
+                        cERROR(1,("Bad MID state? "));
                 }
         }
 cifs_no_response_exit: