Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751919AbdH2Td3 (ORCPT ); Tue, 29 Aug 2017 15:33:29 -0400 Received: from a2nlsmtp01-04.prod.iad2.secureserver.net ([198.71.225.38]:52044 "EHLO a2nlsmtp01-04.prod.iad2.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751708AbdH2Tas (ORCPT ); Tue, 29 Aug 2017 15:30:48 -0400 x-originating-ip: 107.180.71.197 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, Christoph Hellwig , Tom Talpey , Matthew Wilcox Cc: Long Li Subject: [Patch v3 08/19] CIFS: SMBD: Set SMBDirect maximum read or write size for I/O Date: Tue, 29 Aug 2017 12:29:04 -0700 Message-Id: <20170829192915.26251-9-longli@exchange.microsoft.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170829192915.26251-1-longli@exchange.microsoft.com> References: <20170829192915.26251-1-longli@exchange.microsoft.com> X-CMAE-Envelope: MS4wfBDKFEMqAiU3L23vrNbawr9MlYkhNNr+5zKpphIHgeabQEEnTXXxsofQDDTe1KKDEFiSCAuXzttpQHsHX0v+wQclCrZ1NMVbLAcThuRHw+4JQN/apkkn Y7mYYQAKz38JZotiQCp2H7Qxpoa1rGjmWsVPrWR7OkbJ+WKk61j5S6ZEPVkHoXSsStqANpC72ZKeIva8aRWwfPhaIkY6n90fzPAA5gnB97GkIvZqIMB+/Vd4 3lX55ZUvJaUZQ/1xFAJINwMngOTAJP+OaexbcAZyjo94b2pl8P53xuqSfTqUvwLOJaPa0Z+zrDSNOWNren359MKJDqSR9FYz6ZXEW5cLnHNQ9YI2ZXaxY4IS 0IbQ4qMZT9z9wX/dajYWwpMS9x1EKbHMNDO98QihnqiNPLDSgB8+53WE/lKS0yDKkBM2w3Iryi2Zwh+J1lDKipAmmYFk5m92fpckgYWsGA3HKPqAem9StMKX tL1V4FA9YnnMG4aM Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1866 Lines: 52 From: Long Li When connecting over SMBDirect, 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 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 06494e1..e67f5f0 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -32,6 +32,7 @@ #include "smb2status.h" #include "smb2glob.h" #include "cifs_ioctl.h" +#include "smbdirect.h" static int change_conf(struct TCP_Server_Info *server) @@ -249,7 +250,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); + if (server->rdma) + wsize = min_t(unsigned int, + wsize, server->smbd_conn->max_readwrite_size); + else + wsize = min_t(unsigned int, wsize, server->max_write); if (!(server->capabilities & SMB2_GLOBAL_CAP_LARGE_MTU)) wsize = min_t(unsigned int, wsize, SMB2_MAX_BUFFER_SIZE); @@ -265,7 +270,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); + if (server->rdma) + rsize = min_t(unsigned int, + rsize, server->smbd_conn->max_readwrite_size); + else + rsize = min_t(unsigned int, rsize, server->max_read); if (!(server->capabilities & SMB2_GLOBAL_CAP_LARGE_MTU)) rsize = min_t(unsigned int, rsize, SMB2_MAX_BUFFER_SIZE); -- 2.7.4