From patchwork Wed Oct 18 23:09:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Long Li X-Patchwork-Id: 827859 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 3yHSZG1PcTz9t44 for ; Thu, 19 Oct 2017 10:14:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751524AbdJRXK5 (ORCPT ); Wed, 18 Oct 2017 19:10:57 -0400 Received: from a2nlsmtp01-02.prod.iad2.secureserver.net ([198.71.225.36]:35440 "EHLO a2nlsmtp01-02.prod.iad2.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751217AbdJRXKy (ORCPT ); Wed, 18 Oct 2017 19:10:54 -0400 Received: from linuxonhyperv.com ([107.180.71.197]) by : HOSTING RELAY : with SMTP id 4xT9e07D5OVNQ4xT9evdII; 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 1e4xT9-0005Vl-4y; Wed, 18 Oct 2017 16:09:47 -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 15/21] CIFS: SMBD: Upper layer sends data via RDMA send Date: Wed, 18 Oct 2017 16:09:14 -0700 Message-Id: <20171018230920.21042-16-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 With SMB Direct connected, use it for sending data via RDMA send. Signed-off-by: Long Li --- fs/cifs/transport.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 7efbab0..1b51d08 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -37,6 +37,9 @@ #include "cifsglob.h" #include "cifsproto.h" #include "cifs_debug.h" +#ifdef CONFIG_CIFS_SMB_DIRECT +#include "smbdirect.h" +#endif void cifs_wake_up_task(struct mid_q_entry *mid) @@ -229,7 +232,12 @@ __smb_send_rqst(struct TCP_Server_Info *server, struct smb_rqst *rqst) struct socket *ssocket = server->ssocket; struct msghdr smb_msg; int val = 1; - +#ifdef CONFIG_CIFS_SMB_DIRECT + if (server->smbd_conn) { + rc = smbd_send(server->smbd_conn, rqst); + goto smbd_done; + } +#endif if (ssocket == NULL) return -ENOTSOCK; @@ -298,7 +306,9 @@ __smb_send_rqst(struct TCP_Server_Info *server, struct smb_rqst *rqst) */ server->tcpStatus = CifsNeedReconnect; } - +#ifdef CONFIG_CIFS_SMB_DIRECT +smbd_done: +#endif if (rc < 0 && rc != -EINTR) cifs_dbg(VFS, "Error %d sending data on socket to server\n", rc);