From patchwork Mon Aug 6 11:31:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1278411 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6B4D3DF215 for ; Mon, 6 Aug 2012 11:31:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756001Ab2HFLb0 (ORCPT ); Mon, 6 Aug 2012 07:31:26 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:51153 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755995Ab2HFLbZ (ORCPT ); Mon, 6 Aug 2012 07:31:25 -0400 Received: by mail-yw0-f46.google.com with SMTP id m54so2324520yhm.19 for ; Mon, 06 Aug 2012 04:31:25 -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=0NOnqIJrMKBzv3E1yy3OesMpP8EUJXrmA3ahJ/A6JRo=; b=HxE763Y7+5BHgDHlOR85NJ3kNL9ToAf1hFYfk+Zek/FqM4Quij0xGfJqve+E/9i1h/ BWugPQZAb5c7KHRCzgTX7zCTM7xjnlvaXLJZFRV0dw8+mV88qvr/2Uh/b/J3WTIlkrlG DvU/mYNdPE/yVSJNggilQi7EmeCdI6t7H2vfs3Hax2p3iBe71xuh4tqh/nvT5mjsONYR xZK40MB/ec37gCd04p6PN7ta5l8Z8WEuOAPZMTPYIBPzDmZYclGLIxTDuGgkC5cmmoVz qHUh873hKCeMbYebpLojEKEe52GUvIKjqqvwj8yscpIym8paADCTf8wzsl6epcRq78tg 2wSw== Received: by 10.236.173.34 with SMTP id u22mr9531186yhl.100.1344252685381; Mon, 06 Aug 2012 04:31:25 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-069-134-145-027.nc.res.rr.com. [69.134.145.27]) by mx.google.com with ESMTPS id r25sm31198420yhi.13.2012.08.06.04.31.23 (version=SSLv3 cipher=OTHER); Mon, 06 Aug 2012 04:31:24 -0700 (PDT) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org, piastryyy@gmail.com Subject: [PATCH v3 04/15] cifs: cork the socket before a send and uncork it afterward Date: Mon, 6 Aug 2012 07:31:01 -0400 Message-Id: <1344252672-15244-5-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1344252672-15244-1-git-send-email-jlayton@redhat.com> References: <1344252672-15244-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQn7OHJBZzANwh5tgw1LgmkcwlFs9dZeft29KkjldXdNX+uz6iscmWoSCPLdPooDtRM+/qBp 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. Acked-by: Pavel Shilovsky Signed-off-by: Jeff Layton --- 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 549409b..5210bc8 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1680,6 +1680,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 766307b..8ff4c5f 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -247,12 +248,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);