From patchwork Fri Jun 24 06:51:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 915392 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5O6qt60028710 for ; Fri, 24 Jun 2011 06:52:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751825Ab1FXGwz (ORCPT ); Fri, 24 Jun 2011 02:52:55 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:46803 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751726Ab1FXGwz (ORCPT ); Fri, 24 Jun 2011 02:52:55 -0400 Received: by bwz15 with SMTP id 15so2012283bwz.19 for ; Thu, 23 Jun 2011 23:52:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=k6rNle/KPE/7gaMt0/atEsWvRlSDkamDMwKxI2FTN6c=; b=DKzC98dqT49Pm4AJIIUDpYJw8mXH3Nd1b2EfeYu+0Dz/Rfl4KUEhFoLOpWqEfqWsSP Foa4iaZ/7Mvf4OSPWmccEprhsMX/VclHb1BGaFoobQOmi7MzY3+mg+p0Pc7e/eynx4VJ Fud6GBTySHlp2lOabB8lMUR4ahmZhoGhyWGMo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; b=f4IsHyVNTCd6gXZFeMzlv4hpNEtoRd+oreqYrZTysNhsI7ykTnmuPGWzab1jwE9g/H Tr8myQSClT8uR6BXRTQI0IvNpKgMgu38W53L5IIq0q7cb7RB+Sq39UN7ZqeepUQHSCvH UmKIkRVA5Rk2Xq2i6O5fijcUpV3L+ac+T4CFs= Received: by 10.204.130.24 with SMTP id q24mr1639545bks.74.1308898373614; Thu, 23 Jun 2011 23:52:53 -0700 (PDT) Received: from localhost.localdomain (PPPoE-78-29-92-47.san.ru [78.29.92.47]) by mx.google.com with ESMTPS id g13sm1377815bkd.22.2011.06.23.23.52.52 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Jun 2011 23:52:53 -0700 (PDT) From: Pavel Shilovsky To: linux-cifs@vger.kernel.org Subject: [PATCH 1/5] CIFS: Move buffer allocation to a separate function Date: Fri, 24 Jun 2011 10:51:53 +0400 Message-Id: <1308898317-7667-2-git-send-email-piastryyy@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1308898317-7667-1-git-send-email-piastryyy@gmail.com> References: <1308898317-7667-1-git-send-email-piastryyy@gmail.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 24 Jun 2011 06:52:56 +0000 (UTC) Signed-off-by: Pavel Shilovsky --- fs/cifs/connect.c | 84 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 50 insertions(+), 34 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 19fdbda..566080d 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -317,14 +317,50 @@ requeue_echo: queue_delayed_work(system_nrt_wq, &server->echo, SMB_ECHO_INTERVAL); } +static bool +allocate_buffers(char **pbigbuf, char **psmallbuf, unsigned int size, + bool isLargeBuf) +{ + char *bigbuf = *pbigbuf, *smallbuf = *psmallbuf; + + if (bigbuf == NULL) { + bigbuf = (char *)cifs_buf_get(); + if (!bigbuf) { + cERROR(1, "No memory for large SMB response"); + msleep(3000); + /* retry will check if exiting */ + return false; + } + } else if (isLargeBuf) { + /* we are reusing a dirty large buf, clear its start */ + memset(bigbuf, 0, size); + } + + if (smallbuf == NULL) { + smallbuf = (char *)cifs_small_buf_get(); + if (!smallbuf) { + cERROR(1, "No memory for SMB response"); + msleep(1000); + /* retry will check if exiting */ + return false; + } + /* beginning of smb buffer is cleared in our buf_get */ + } else /* if existing small buf clear beginning */ + memset(smallbuf, 0, size); + + *pbigbuf = bigbuf; + *psmallbuf = smallbuf; + + return true; +} + static int cifs_demultiplex_thread(struct TCP_Server_Info *server) { int length; unsigned int pdu_length, total_read; + char *buf = NULL, *bigbuf = NULL, *smallbuf = NULL; struct smb_hdr *smb_buffer = NULL; - struct smb_hdr *bigbuf = NULL; - struct smb_hdr *smallbuf = NULL; struct msghdr smb_msg; struct kvec iov; struct socket *csocket = server->ssocket; @@ -348,34 +384,15 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server) while (server->tcpStatus != CifsExiting) { if (try_to_freeze()) continue; - if (bigbuf == NULL) { - bigbuf = cifs_buf_get(); - if (!bigbuf) { - cERROR(1, "No memory for large SMB response"); - msleep(3000); - /* retry will check if exiting */ - continue; - } - } else if (isLargeBuf) { - /* we are reusing a dirty large buf, clear its start */ - memset(bigbuf, 0, sizeof(struct smb_hdr)); - } - if (smallbuf == NULL) { - smallbuf = cifs_small_buf_get(); - if (!smallbuf) { - cERROR(1, "No memory for SMB response"); - msleep(1000); - /* retry will check if exiting */ - continue; - } - /* beginning of smb buffer is cleared in our buf_get */ - } else /* if existing small buf clear beginning */ - memset(smallbuf, 0, sizeof(struct smb_hdr)); + if (!allocate_buffers(&bigbuf, &smallbuf, + sizeof(struct smb_hdr), isLargeBuf)) + continue; isLargeBuf = false; isMultiRsp = false; - smb_buffer = smallbuf; + smb_buffer = (struct smb_hdr *)smallbuf; + buf = smallbuf; iov.iov_base = smb_buffer; iov.iov_len = 4; smb_msg.msg_control = NULL; @@ -414,8 +431,7 @@ incomplete_rcv: allowing socket to clear and app threads to set tcpStatus CifsNeedReconnect if server hung */ if (pdu_length < 4) { - iov.iov_base = (4 - pdu_length) + - (char *)smb_buffer; + iov.iov_base = (4 - pdu_length) + buf; iov.iov_len = pdu_length; smb_msg.msg_control = NULL; smb_msg.msg_controllen = 0; @@ -443,7 +459,7 @@ incomplete_rcv: /* the first byte big endian of the length field, is actually not part of the length but the type with the most common, zero, as regular data */ - temp = *((char *) smb_buffer); + temp = *buf; /* Note that FC 1001 length is big endian on the wire, but we convert it here so it is always manipulated @@ -477,8 +493,7 @@ incomplete_rcv: continue; } else if (temp != (char) 0) { cERROR(1, "Unknown RFC 1002 frame"); - cifs_dump_mem(" Received Data: ", (char *)smb_buffer, - length); + cifs_dump_mem(" Received Data: ", buf, length); cifs_reconnect(server); csocket = server->ssocket; continue; @@ -501,10 +516,11 @@ incomplete_rcv: if (pdu_length > MAX_CIFS_SMALL_BUFFER_SIZE - 4) { isLargeBuf = true; memcpy(bigbuf, smallbuf, 4); - smb_buffer = bigbuf; + smb_buffer = (struct smb_hdr *)bigbuf; + buf = bigbuf; } length = 0; - iov.iov_base = 4 + (char *)smb_buffer; + iov.iov_base = 4 + buf; iov.iov_len = pdu_length; for (total_read = 0; total_read < pdu_length; total_read += length) { @@ -645,7 +661,7 @@ multi_t2_fnd: !isMultiRsp) { cERROR(1, "No task to wake, unknown frame received! " "NumMids %d", atomic_read(&midCount)); - cifs_dump_mem("Received Data is: ", (char *)smb_buffer, + cifs_dump_mem("Received Data is: ", buf, sizeof(struct smb_hdr)); #ifdef CONFIG_CIFS_DEBUG2 cifs_dump_detail(smb_buffer);