From patchwork Wed Oct 18 23:09:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Long Li X-Patchwork-Id: 827863 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yHSZy4pqGz9t44 for ; Thu, 19 Oct 2017 10:15:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751420AbdJRXK4 (ORCPT ); Wed, 18 Oct 2017 19:10:56 -0400 Received: from a2nlsmtp01-02.prod.iad2.secureserver.net ([198.71.225.36]:35452 "EHLO a2nlsmtp01-02.prod.iad2.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751110AbdJRXKy (ORCPT ); Wed, 18 Oct 2017 19:10:54 -0400 Received: from linuxonhyperv.com ([107.180.71.197]) by : HOSTING RELAY : with SMTP id 4xT8e07CeOVNQ4xT8evdI2; Wed, 18 Oct 2017 16:09:53 -0700 x-originating-ip: 107.180.71.197 Received: from longli by linuxonhyperv.com with local (Exim 4.89) (envelope-from ) id 1e4xT8-0005VN-MD; Wed, 18 Oct 2017 16:09:46 -0700 From: Long Li To: Steve French , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, Tom Talpey , Matthew Wilcox , Stephen Hemminger Cc: Long Li Subject: [Patch v5 11/21] CIFS: SMBD: Set SMB Direct maximum read or write size for I/O Date: Wed, 18 Oct 2017 16:09:10 -0700 Message-Id: <20171018230920.21042-12-longli@exchange.microsoft.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171018230920.21042-1-longli@exchange.microsoft.com> References: <20171018230920.21042-1-longli@exchange.microsoft.com> X-CMAE-Envelope: MS4wfB8i4WH/y4xDLhVCvit/QRPYHcwk+abfbWmgtIGJJ8zGyEdqL21W+bBTVdi8tGir0948pPbGHWn6a2d0/vgIgf53wsA9/b7rJvrxcLm/+4/dWSptih2U sjPIqQOqWcx7/H1hANY5DZXy1eLv71Ai8ZOZ0JdWFMTE6DyUEPQpFHF33yD2/zBs1m1YHyCW62QP+OsbQaB/GteXkMUYBoUJ+XMA8tXKmKIU/3KaGR4y6yBl IsVxwvxf1ZcDOzjlqZsS1WDCvxc4dBC9QTLzTLEb77qAZ33Xej0vLDVFHOsOpGgFhjwiotW/jQGxASZD7oezmUEyoYs/p4zbbT41MVjBgZeG34B+6bEtSWK7 geb9UIpwDIVVGKXhJNUDFKZq2TbXtEhuwjMGmgyUkJzzmvAp+XPz0iPprbqKNZxACTQyyev8jAAgGKNF3wBaJYqpJo8rdRjmSBrAfazif0oxyWgflXT6ytSY HUB9pakpFDsHFpjM Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org From: Long Li When connecting over SMB Direct, the transport negotiates its maximum I/O sizes with the server and determines how to choose to do RDMA send/recv vs read/write. Expose these maximum I/O sizes to upper layer so we will get the correct sized payloads. Signed-off-by: Long Li --- fs/cifs/smb2ops.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index fb2934b..25028da 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -32,6 +32,9 @@ #include "smb2status.h" #include "smb2glob.h" #include "cifs_ioctl.h" +#ifdef CONFIG_CIFS_SMB_DIRECT +#include "smbdirect.h" +#endif static int change_conf(struct TCP_Server_Info *server) @@ -250,7 +253,11 @@ smb2_negotiate_wsize(struct cifs_tcon *tcon, struct smb_vol *volume_info) /* start with specified wsize, or default */ wsize = volume_info->wsize ? volume_info->wsize : CIFS_DEFAULT_IOSIZE; wsize = min_t(unsigned int, wsize, server->max_write); - +#ifdef CONFIG_CIFS_SMB_DIRECT + if (server->rdma) + wsize = min_t(unsigned int, + wsize, server->smbd_conn->max_readwrite_size); +#endif if (!(server->capabilities & SMB2_GLOBAL_CAP_LARGE_MTU)) wsize = min_t(unsigned int, wsize, SMB2_MAX_BUFFER_SIZE); @@ -266,6 +273,11 @@ smb2_negotiate_rsize(struct cifs_tcon *tcon, struct smb_vol *volume_info) /* start with specified rsize, or default */ rsize = volume_info->rsize ? volume_info->rsize : CIFS_DEFAULT_IOSIZE; rsize = min_t(unsigned int, rsize, server->max_read); +#ifdef CONFIG_CIFS_SMB_DIRECT + if (server->rdma) + rsize = min_t(unsigned int, + rsize, server->smbd_conn->max_readwrite_size); +#endif if (!(server->capabilities & SMB2_GLOBAL_CAP_LARGE_MTU)) rsize = min_t(unsigned int, rsize, SMB2_MAX_BUFFER_SIZE);