cifs: smbd: Invalidate and deregister memory registration on re-send for direct I/O

On re-send, there might be a reconnect and all prevoius memory registrations
need to be invalidated and deregistered.

Signed-off-by: Long Li <longli@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index a80ec683ea323f8a7b7a3a4d99e8f3b2a54a5864..67e7d0ffe38504e0310c0cc5aadf802ad9fb15b9 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2803,9 +2803,17 @@ cifs_resend_wdata(struct cifs_writedata *wdata, struct list_head *wdata_list,
                if (!rc) {
                        if (wdata->cfile->invalidHandle)
                                rc = -EAGAIN;
-                       else
+                       else {
+#ifdef CONFIG_CIFS_SMB_DIRECT
+                               if (wdata->mr) {
+                                       wdata->mr->need_invalidate = true;
+                                       smbd_deregister_mr(wdata->mr);
+                                       wdata->mr = NULL;
+                               }
+#endif
                                rc = server->ops->async_writev(wdata,
                                        cifs_uncached_writedata_release);
+                       }
                }
 
                /* If the write was successfully sent, we are done */
@@ -3528,8 +3536,16 @@ static int cifs_resend_rdata(struct cifs_readdata *rdata,
                if (!rc) {
                        if (rdata->cfile->invalidHandle)
                                rc = -EAGAIN;
-                       else
+                       else {
+#ifdef CONFIG_CIFS_SMB_DIRECT
+                               if (rdata->mr) {
+                                       rdata->mr->need_invalidate = true;
+                                       smbd_deregister_mr(rdata->mr);
+                                       rdata->mr = NULL;
+                               }
+#endif
                                rc = server->ops->async_readv(rdata);
+                       }
                }
 
                /* If the read was successfully sent, we are done */