public inbox for linux-rdma@vger.kernel.org
 help / color / mirror / Atom feed
From: Long Li <longli@exchange.microsoft.com>
To: Steve French <sfrench@samba.org>,
	linux-cifs@vger.kernel.org, samba-technical@lists.samba.org,
	linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org,
	Christoph Hellwig <hch@infradead.org>,
	Tom Talpey <ttalpey@microsoft.com>,
	Matthew Wilcox <mawilcox@microsoft.com>
Cc: Long Li <longli@microsoft.com>
Subject: [Patch v3 14/19] CIFS: SMBD: Deregister memory on finishing SMB write
Date: Tue, 29 Aug 2017 12:29:10 -0700	[thread overview]
Message-ID: <20170829192915.26251-15-longli@exchange.microsoft.com> (raw)
In-Reply-To: <20170829192915.26251-1-longli@exchange.microsoft.com>

From: Long Li <longli@microsoft.com>

On write I/O finish, deregister the memory region if this was for a RDMA read.
If remote invalidation is not used, the call to smbd_deregister_mr will do
local invalidation and possibly wait. Memory region is normally deregistered
in MID callback as soon as it's used. There are situations where the MID may
not be created on I/O failure, under which memory region is deregistered when
write data context is released.

Signed-off-by: Long Li <longli@microsoft.com>
---
 fs/cifs/cifssmb.c |  6 ++++++
 fs/cifs/smb2pdu.c | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index fbb0d4c..6e1de21 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -43,6 +43,7 @@
 #include "cifs_unicode.h"
 #include "cifs_debug.h"
 #include "fscache.h"
+#include "smbdirect.h"
 
 #ifdef CONFIG_CIFS_POSIX
 static struct {
@@ -1905,6 +1906,11 @@ cifs_writedata_release(struct kref *refcount)
 	struct cifs_writedata *wdata = container_of(refcount,
 					struct cifs_writedata, refcount);
 
+	if (wdata->mr) {
+		smbd_deregister_mr(wdata->mr);
+		wdata->mr = NULL;
+	}
+
 	if (wdata->cfile)
 		cifsFileInfo_put(wdata->cfile);
 
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 5581afd..5551053 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -2666,6 +2666,18 @@ smb2_writev_callback(struct mid_q_entry *mid)
 		break;
 	}
 
+	/*
+	 * If this wdata has a memory registered, the MR can be freed
+	 * The number of MRs available is limited, it's important to recover
+	 * used MR as soon as I/O is finished. Hold MR longer in the later
+	 * I/O process can possibly result in I/O deadlock due to lack of MR
+	 * to send request on I/O retry
+	 */
+	if (wdata->mr) {
+		smbd_deregister_mr(wdata->mr);
+		wdata->mr = NULL;
+	}
+
 	if (wdata->result)
 		cifs_stats_fail_inc(tcon, SMB2_WRITE_HE);
 
-- 
2.7.4

  parent reply	other threads:[~2017-08-29 19:29 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-29 19:28 [Patch v3 00/19] CIFS: Implement SMB Direct Long Li
     [not found] ` <20170829192915.26251-1-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-29 19:28   ` [Patch v3 01/19] CIFS: Add rdma mount option Long Li
     [not found]     ` <20170829192915.26251-2-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-29 22:37       ` Pavel Shilovsky
     [not found]         ` <CAKywueRsjjG6BDbkZL_qeVn3V129N2OFwAaw60ZeZXmWbX-32A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-08-29 22:56           ` Long Li
2017-08-29 19:29   ` [Patch v3 07/19] CIFS: SMBD: Destroy SMBDirect session on shutdown or umount Long Li
2017-08-29 19:29   ` [Patch v3 09/19] CIFS: SMBD: Receive data from SMBDirect Long Li
2017-08-29 19:29   ` [Patch v3 12/19] CIFS: SMBD: Fix the definition for SMB2_CHANNEL_RDMA_V1_INVALIDATE Long Li
     [not found]     ` <20170829192915.26251-13-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-30  0:50       ` Pavel Shilovsky
     [not found]         ` <CAKywueS4=RzCyodOYKDPEWvRrgpwsAX+s+v2KwfbrJWDTy10qg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-08-30  2:11           ` Long Li
2017-08-29 19:29   ` [Patch v3 13/19] CIFS: SMBD: Implement SMB write via RDMA read through memory registration Long Li
2017-08-29 19:29   ` [Patch v3 16/19] CIFS: SMBD: Read correct returned data length for RDMA write (SMB read) I/O Long Li
2017-08-29 19:29   ` [Patch v3 17/19] CIFS: SMBD: Implement SMB read via RDMA write through memory registration Long Li
2017-08-29 19:29   ` [Patch v3 18/19] CIFS: SMBD: Deregister memory when finishing SMB read Long Li
2017-08-30 18:40   ` [Patch v3 00/19] CIFS: Implement SMB Direct Long Li
2017-08-29 19:28 ` [Patch v3 02/19] CIFS: SMBD: Add SMBDirect protocol and transport constants Long Li
     [not found]   ` <20170829192915.26251-3-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-29 22:44     ` Pavel Shilovsky
     [not found]       ` <CAKywueQ3Vz9NUwfqgk36pnaXN=r3DDrrNAumMP418EkcXQPT9g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-08-29 23:00         ` Long Li
     [not found]           ` <MWHPR21MB0190D3CB134749B54A0F709ECE9F0-saRRjQKJ25M/hL2NnenhuM1VXTxX1y3OvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-08-30 18:19             ` Pavel Shilovsky
     [not found]               ` <CAKywueTyhmP+p=bLCmvK8pzGNKRfeh1x_B9OGWKzt77eAz3Sdg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-08-30 18:24                 ` Long Li
     [not found]                   ` <MWHPR21MB01907DFB1D1CBEDB17FD995ECE9C0-saRRjQKJ25M/hL2NnenhuM1VXTxX1y3OvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-08-30 18:30                     ` Pavel Shilovsky
2017-09-01 15:48                       ` Steve French
2017-08-29 19:28 ` [Patch v3 03/19] CIFS: SMBD: Implement SMBDirect transport Long Li
2017-08-29 19:29 ` [Patch v3 04/19] CIFS: SMBD: Add SMBDirect transport to SMB connection and Makefile Long Li
     [not found]   ` <20170829192915.26251-5-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-29 23:11     ` Pavel Shilovsky
     [not found]       ` <CAKywueRaTqR1yw_PbdcOYQTY9msweboej_6ZPcbsuyJfmiVgng-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-08-29 23:14         ` Long Li
2017-08-29 19:29 ` [Patch v3 05/19] CIFS: SMBD: Connect to SMBDirect session Long Li
2017-08-29 19:29 ` [Patch v3 06/19] CIFS: SMBD: Reconnect " Long Li
     [not found]   ` <20170829192915.26251-7-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-29 23:15     ` Pavel Shilovsky
2017-08-29 23:39       ` Long Li
2017-08-29 19:29 ` [Patch v3 08/19] CIFS: SMBD: Set SMBDirect maximum read or write size for I/O Long Li
2017-08-29 19:29 ` [Patch v3 10/19] CIFS: SMBD: Send data through SMBDirect Long Li
2017-08-29 19:29 ` [Patch v3 11/19] CIFS: SMBD: Define memory registration for I/O data Long Li
     [not found]   ` <20170829192915.26251-12-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-30  0:48     ` Pavel Shilovsky
     [not found]       ` <CAKywueSMXWN1tsHbFDGK9d9STL1qcC9G_VMfV2hz9YZhxhhH+w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-08-30  2:12         ` Long Li
2017-08-29 19:29 ` Long Li [this message]
2017-08-29 19:29 ` [Patch v3 15/19] CIFS: SMBD: Add parameter rdata to smb2_new_read_req Long Li
2017-08-29 19:29 ` [Patch v3 19/19] CIFS: SMBD: Add SMBDirect debug counters Long Li

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170829192915.26251-15-longli@exchange.microsoft.com \
    --to=longli@exchange.microsoft.com \
    --cc=hch@infradead.org \
    --cc=linux-cifs@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=longli@microsoft.com \
    --cc=mawilcox@microsoft.com \
    --cc=samba-technical@lists.samba.org \
    --cc=sfrench@samba.org \
    --cc=ttalpey@microsoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox