From patchwork Wed Jul 18 17:59:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1212761 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id EEB3B3FD4F for ; Wed, 18 Jul 2012 17:59:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755227Ab2GRR7T (ORCPT ); Wed, 18 Jul 2012 13:59:19 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:54047 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755273Ab2GRR7S (ORCPT ); Wed, 18 Jul 2012 13:59:18 -0400 Received: by mail-gg0-f174.google.com with SMTP id u4so1863454ggl.19 for ; Wed, 18 Jul 2012 10:59:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=EMnjZOiJDkDkwPXGYjSCwMbhL8q9TpEVean+J7h/3gA=; b=g0lKHO6BMEVx2mPwVIOpn74SOVNuxD4xshcl2iRuRDmN3UpUi4HVcMCHQ6MMcjHvWA rGXW05TsOXZz4yZ6sIfDMxmv28vFJAgUsr44gcW8mEHeStgdTNuMZ6yOQJ7HpTdwpN8a tb7G/yEZuzZ8JSENDFUE1rPLYS35hEz0snPJLeNoIAH882RK1dg1HDdl8fVccRYOj/Wf THvVOuBhZYUWb7sjj+NHKA/KscUwFJvmDwGVLNi9yojtfY4gNhw/SXA140Ww34+NF6ng NK0g2V//m3rZBItlJEi6ckYIz5JtWQcwCf+bwp9anS6ZXmrYU72mod60udYAI+CB9nkP 9xGA== Received: by 10.236.153.105 with SMTP id e69mr1743996yhk.66.1342634358526; Wed, 18 Jul 2012 10:59:18 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-076-182-054-194.nc.res.rr.com. [76.182.54.194]) by mx.google.com with ESMTPS id e5sm20270107ani.18.2012.07.18.10.59.17 (version=SSLv3 cipher=OTHER); Wed, 18 Jul 2012 10:59:18 -0700 (PDT) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org Subject: [PATCH 05/11] cifs: cork the socket before a send and uncork it afterward Date: Wed, 18 Jul 2012 13:59:00 -0400 Message-Id: <1342634346-22818-6-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342634346-22818-1-git-send-email-jlayton@redhat.com> References: <1342634346-22818-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQkGjTZrP8D4tSmUGKOSQkxmeybxIhqjOt2ZNS+Bk3qz9HKagAvbBIrvadrsdwjKSOeVfXwR Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org We want to send SMBs as "atomically" as possible. Prior to sending any data on the socket, cork it to make sure that no non-full frames go out. Afterward, uncork it to make sure all of the data gets pushed out to the wire. Note that this more or less renders the socket=TCP_NODELAY mount option obsolete. When TCP_CORK and TCP_NODELAY are used on the same socket, TCP_NODELAY is essentially ignored. Signed-off-by: Jeff Layton Acked-by: Pavel Shilovsky --- fs/cifs/connect.c | 4 ++++ fs/cifs/transport.c | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index e8c3e6b..99ca139 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1830,6 +1830,10 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, if (string == NULL) goto out_nomem; + /* + * FIXME: since we now cork/uncork the socket while + * sending, should we deprecate this option? + */ if (strnicmp(string, "TCP_NODELAY", 11) == 0) vol->sockopt_tcp_nodelay = 1; break; diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 5a1d817..af56e91 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -248,12 +249,23 @@ smb_send_rqst(struct TCP_Server_Info *server, struct smb_rqst *rqst) int n_vec = rqst->rq_nvec; unsigned int smb_buf_length = get_rfc1002_length(iov[0].iov_base); size_t total_len; + struct socket *ssocket = server->ssocket; + int val = 1; cFYI(1, "Sending smb: smb_len=%u", smb_buf_length); dump_smb(iov[0].iov_base, iov[0].iov_len); + /* cork the socket */ + kernel_setsockopt(ssocket, SOL_TCP, TCP_CORK, + (char *)&val, sizeof(val)); + rc = smb_send_kvec(server, iov, n_vec, &total_len); + /* uncork it */ + val = 0; + kernel_setsockopt(ssocket, SOL_TCP, TCP_CORK, + (char *)&val, sizeof(val)); + if ((total_len > 0) && (total_len != smb_buf_length + 4)) { cFYI(1, "partial send (wanted=%u sent=%zu): terminating " "session", smb_buf_length + 4, total_len);