linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v4] cifs: Do not modify mid entry after submitting I/O in cifs_call_async
@ 2017-06-28 22:55 Long Li
  2017-06-29 15:56 ` Steve French
  0 siblings, 1 reply; 2+ messages in thread
From: Long Li @ 2017-06-28 22:55 UTC (permalink / raw)
  To: Steve French, linux-cifs, samba-technical, linux-kernel; +Cc: Long Li

From: Long Li <longli@microsoft.com>

In cifs_call_async, server may respond as soon as I/O is submitted. Because
mid entry is freed on the return path, it should not be modified after I/O
is submitted.

cifs_save_when_sent modifies the sent timestamp in mid entry, and should not
be called after I/O. Call it before I/O.

Signed-off-by: Long Li <longli@microsoft.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
---
 fs/cifs/transport.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index 47a125e..7efbab0 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -536,11 +536,14 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst,
 	list_add_tail(&mid->qhead, &server->pending_mid_q);
 	spin_unlock(&GlobalMid_Lock);
 
-
+	/*
+	 * Need to store the time in mid before calling I/O. For call_async,
+	 * I/O response may come back and free the mid entry on another thread.
+	 */
+	cifs_save_when_sent(mid);
 	cifs_in_send_inc(server);
 	rc = smb_send_rqst(server, rqst, flags);
 	cifs_in_send_dec(server);
-	cifs_save_when_sent(mid);
 
 	if (rc < 0) {
 		server->sequence_number -= 2;
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v4] cifs: Do not modify mid entry after submitting I/O in cifs_call_async
  2017-06-28 22:55 [PATCH v4] cifs: Do not modify mid entry after submitting I/O in cifs_call_async Long Li
@ 2017-06-29 15:56 ` Steve French
  0 siblings, 0 replies; 2+ messages in thread
From: Steve French @ 2017-06-29 15:56 UTC (permalink / raw)
  To: Long Li; +Cc: Steve French, linux-cifs, samba-technical, LKML, Long Li

merged into cifs-2.6.git for-next

On Wed, Jun 28, 2017 at 5:55 PM, Long Li <longli@exchange.microsoft.com> wrote:
> From: Long Li <longli@microsoft.com>
>
> In cifs_call_async, server may respond as soon as I/O is submitted. Because
> mid entry is freed on the return path, it should not be modified after I/O
> is submitted.
>
> cifs_save_when_sent modifies the sent timestamp in mid entry, and should not
> be called after I/O. Call it before I/O.
>
> Signed-off-by: Long Li <longli@microsoft.com>
> Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
> ---
>  fs/cifs/transport.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
> index 47a125e..7efbab0 100644
> --- a/fs/cifs/transport.c
> +++ b/fs/cifs/transport.c
> @@ -536,11 +536,14 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst,
>         list_add_tail(&mid->qhead, &server->pending_mid_q);
>         spin_unlock(&GlobalMid_Lock);
>
> -
> +       /*
> +        * Need to store the time in mid before calling I/O. For call_async,
> +        * I/O response may come back and free the mid entry on another thread.
> +        */
> +       cifs_save_when_sent(mid);
>         cifs_in_send_inc(server);
>         rc = smb_send_rqst(server, rqst, flags);
>         cifs_in_send_dec(server);
> -       cifs_save_when_sent(mid);
>
>         if (rc < 0) {
>                 server->sequence_number -= 2;
> --
> 2.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



-- 
Thanks,

Steve

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-06-29 15:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-28 22:55 [PATCH v4] cifs: Do not modify mid entry after submitting I/O in cifs_call_async Long Li
2017-06-29 15:56 ` Steve French

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).