mirror of https://lore.kernel.org/lkml/
 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 18/19] CIFS: SMBD: Deregister memory when finishing SMB read
Date: Tue, 29 Aug 2017 12:29:14 -0700	[thread overview]
Message-ID: <20170829192915.26251-19-longli@exchange.microsoft.com> (raw)
In-Reply-To: <20170829192915.26251-1-longli@exchange.microsoft.com>

From: Long Li <longli@microsoft.com>

When SMB read is finished, deregister the memory regions if RDMA write is used
for this SMB read. smbd_deregister_mr may need to do local invalidation and
sleep, if server remote invalidation is not used.

There are situations where the MID may not be created on I/O failure, under
which memory region is deregistered when read data context is released.

Signed-off-by: Long Li <longli@microsoft.com>
---
 fs/cifs/file.c    |  5 +++++
 fs/cifs/smb2pdu.c | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 41460a5..5a6df25 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2910,6 +2910,11 @@ cifs_readdata_release(struct kref *refcount)
 	struct cifs_readdata *rdata = container_of(refcount,
 					struct cifs_readdata, refcount);
 
+	if (rdata->mr) {
+		smbd_deregister_mr(rdata->mr);
+		rdata->mr = NULL;
+	}
+
 	if (rdata->cfile)
 		cifsFileInfo_put(rdata->cfile);
 
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 1f08c75..43a7b60 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -2504,6 +2504,16 @@ smb2_readv_callback(struct mid_q_entry *mid)
 			rdata->result = -EIO;
 	}
 
+	/*
+	 * If this rdata has a memmory registered, the MR can be freed
+	 * MR needs to be freed as soon as I/O finishes to prevent deadlock
+	 * because they have limited number and are used for future I/Os
+	 */
+	if (rdata->mr) {
+		smbd_deregister_mr(rdata->mr);
+		rdata->mr = NULL;
+	}
+
 	if (rdata->result)
 		cifs_stats_fail_inc(tcon, SMB2_READ_HE);
 
-- 
2.7.4

  parent reply	other threads:[~2017-08-29 19:31 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
2017-08-29 19:28 ` [Patch v3 01/19] CIFS: Add rdma mount option Long Li
2017-08-29 22:37   ` Pavel Shilovsky
2017-08-29 22:56     ` Long Li
2017-08-29 19:28 ` [Patch v3 02/19] CIFS: SMBD: Add SMBDirect protocol and transport constants Long Li
2017-08-29 22:44   ` Pavel Shilovsky
2017-08-29 23:00     ` Long Li
2017-08-30 18:19       ` Pavel Shilovsky
2017-08-30 18:24         ` Long Li
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
2017-08-29 23:11   ` Pavel Shilovsky
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
2017-08-29 23:15   ` Pavel Shilovsky
2017-08-29 23:39     ` 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 08/19] CIFS: SMBD: Set SMBDirect maximum read or write size for I/O 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 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
2017-08-30  0:48   ` Pavel Shilovsky
2017-08-30  2:12     ` Long Li
2017-08-29 19:29 ` [Patch v3 12/19] CIFS: SMBD: Fix the definition for SMB2_CHANNEL_RDMA_V1_INVALIDATE Long Li
2017-08-30  0:50   ` Pavel Shilovsky
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 14/19] CIFS: SMBD: Deregister memory on finishing SMB write Long Li
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 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 ` Long Li [this message]
2017-08-29 19:29 ` [Patch v3 19/19] CIFS: SMBD: Add SMBDirect debug counters Long Li
2017-08-30 18:40 ` [Patch v3 00/19] CIFS: Implement SMB Direct 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-19-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

all inboxes | Powered by JetHome®