From mboxrd@z Thu Jan 1 00:00:00 1970 From: Long Li Subject: [Patch v7 15/22] CIFS: SMBD: Upper layer receives data via RDMA receive Date: Tue, 7 Nov 2017 01:55:07 -0700 Message-ID: <20171107085514.12693-16-longli@exchange.microsoft.com> References: <20171107085514.12693-1-longli@exchange.microsoft.com> Return-path: In-Reply-To: <20171107085514.12693-1-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org> Sender: linux-rdma-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Steve French , linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, samba-technical-w/Ol4Ecudpl8XjKLYN78aQ@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Christoph Hellwig , Tom Talpey , Matthew Wilcox , Stephen Hemminger Cc: Long Li List-Id: linux-rdma@vger.kernel.org From: Long Li With SMB Direct connected, use it for receiving data via RDMA receive. Signed-off-by: Long Li --- fs/cifs/connect.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 3d74983..fcd01df 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -539,8 +539,10 @@ cifs_readv_from_socket(struct TCP_Server_Info *server, struct msghdr *smb_msg) if (server_unresponsive(server)) return -ECONNABORTED; - - length = sock_recvmsg(server->ssocket, smb_msg, 0); + if (cifs_rdma_enabled(server) && server->smbd_conn) + length = smbd_recv(server->smbd_conn, smb_msg); + else + length = sock_recvmsg(server->ssocket, smb_msg, 0); if (server->tcpStatus == CifsExiting) return -ESHUTDOWN; -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755577AbdKGJAc (ORCPT ); Tue, 7 Nov 2017 04:00:32 -0500 Received: from a2nlsmtp01-03.prod.iad2.secureserver.net ([198.71.225.37]:47136 "EHLO a2nlsmtp01-03.prod.iad2.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753431AbdKGI5K (ORCPT ); Tue, 7 Nov 2017 03:57:10 -0500 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 , Stephen Hemminger Cc: Long Li Subject: [Patch v7 15/22] CIFS: SMBD: Upper layer receives data via RDMA receive Date: Tue, 7 Nov 2017 01:55:07 -0700 Message-Id: <20171107085514.12693-16-longli@exchange.microsoft.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171107085514.12693-1-longli@exchange.microsoft.com> References: <20171107085514.12693-1-longli@exchange.microsoft.com> X-CMAE-Envelope: MS4wfMMdhH5AVEt7Wy64WahBNKWcqMc9soy3/LLEOcmp03tQvQShtWn7zfWK8EnTr6fenuaDV2F5Y6Z4FBSXFubUUMyCR8Hnqy9x64Tugx2J75RvvUZLWIQq 4CNLwE/Sq8WWZkrqycDH0UXNyTcbPnpeb8dQU7DmzgaTuPzyFlpSAIyx7FoSUK7UttMaIrpPY79EaqvOAg4sMkqobme54K2ynELQmKVly3MHSCVs2a7YLezt bovkLtMxmFKvfaOdsWJlj5l5von7/xRbKAqMo2P8Uml6ULzyY1afU2MPZgF441iOeRjDonnqjcF3wyCyEPoxVoFIYyC6V71JT97y7H2P9B2UFFaLPuHVSeA6 iTunTS2hwasEh4cpdqS4QDx8PVoIO6JC+utl8CdGfVO3oArNXReVCcohQCsBMnhhXdsP0eOJPlJg4jEfIOl/BiPZ2V7P0Sg2f2YaLNT06bznjo0l4Pw6Qrl2 Ga/I52GZRR8GAepCKDWzc1KVDl2H6S6+zdkPvg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Long Li With SMB Direct connected, use it for receiving data via RDMA receive. Signed-off-by: Long Li --- fs/cifs/connect.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 3d74983..fcd01df 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -539,8 +539,10 @@ cifs_readv_from_socket(struct TCP_Server_Info *server, struct msghdr *smb_msg) if (server_unresponsive(server)) return -ECONNABORTED; - - length = sock_recvmsg(server->ssocket, smb_msg, 0); + if (cifs_rdma_enabled(server) && server->smbd_conn) + length = smbd_recv(server->smbd_conn, smb_msg); + else + length = sock_recvmsg(server->ssocket, smb_msg, 0); if (server->tcpStatus == CifsExiting) return -ESHUTDOWN; -- 2.7.4