* [PATCH] cifs: fix GlobalMid_Lock bug in cifs_reconnect
@ 2019-06-14 3:02 Ronnie Sahlberg
2019-06-14 3:57 ` Steve French
0 siblings, 1 reply; 3+ messages in thread
From: Ronnie Sahlberg @ 2019-06-14 3:02 UTC (permalink / raw)
To: linux-cifs; +Cc: Steve French, Stable, Ronnie Sahlberg
We can not hold the GlobalMid_Lock spinlock during the
dfs processing in cifs_reconnect since it invokes things that may sleep
and thus trigger :
BUG: sleeping function called from invalid context at kernel/locking/rwsem.c:23
Thus we need to drop the spinlock during this code block.
RHBZ: 1716743
Cc: stable@vger.kernel.org
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
---
fs/cifs/connect.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 8c4121da624e..8dd6637a3cbb 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -476,6 +476,7 @@ cifs_reconnect(struct TCP_Server_Info *server)
spin_lock(&GlobalMid_Lock);
server->nr_targets = 1;
#ifdef CONFIG_CIFS_DFS_UPCALL
+ spin_unlock(&GlobalMid_Lock);
cifs_sb = find_super_by_tcp(server);
if (IS_ERR(cifs_sb)) {
rc = PTR_ERR(cifs_sb);
@@ -493,6 +494,7 @@ cifs_reconnect(struct TCP_Server_Info *server)
}
cifs_dbg(FYI, "%s: will retry %d target(s)\n", __func__,
server->nr_targets);
+ spin_lock(&GlobalMid_Lock);
#endif
if (server->tcpStatus == CifsExiting) {
/* the demux thread will exit normally
--
2.13.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] cifs: fix GlobalMid_Lock bug in cifs_reconnect
2019-06-14 3:02 [PATCH] cifs: fix GlobalMid_Lock bug in cifs_reconnect Ronnie Sahlberg
@ 2019-06-14 3:57 ` Steve French
2019-06-17 21:25 ` Pavel Shilovsky
0 siblings, 1 reply; 3+ messages in thread
From: Steve French @ 2019-06-14 3:57 UTC (permalink / raw)
To: Ronnie Sahlberg; +Cc: linux-cifs, Stable
tentatively merged into cifs-2.6.git for-next and to the github tree
On Thu, Jun 13, 2019 at 10:02 PM Ronnie Sahlberg <lsahlber@redhat.com> wrote:
>
> We can not hold the GlobalMid_Lock spinlock during the
> dfs processing in cifs_reconnect since it invokes things that may sleep
> and thus trigger :
>
> BUG: sleeping function called from invalid context at kernel/locking/rwsem.c:23
>
> Thus we need to drop the spinlock during this code block.
>
> RHBZ: 1716743
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
> ---
> fs/cifs/connect.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> index 8c4121da624e..8dd6637a3cbb 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -476,6 +476,7 @@ cifs_reconnect(struct TCP_Server_Info *server)
> spin_lock(&GlobalMid_Lock);
> server->nr_targets = 1;
> #ifdef CONFIG_CIFS_DFS_UPCALL
> + spin_unlock(&GlobalMid_Lock);
> cifs_sb = find_super_by_tcp(server);
> if (IS_ERR(cifs_sb)) {
> rc = PTR_ERR(cifs_sb);
> @@ -493,6 +494,7 @@ cifs_reconnect(struct TCP_Server_Info *server)
> }
> cifs_dbg(FYI, "%s: will retry %d target(s)\n", __func__,
> server->nr_targets);
> + spin_lock(&GlobalMid_Lock);
> #endif
> if (server->tcpStatus == CifsExiting) {
> /* the demux thread will exit normally
> --
> 2.13.6
>
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] cifs: fix GlobalMid_Lock bug in cifs_reconnect
2019-06-14 3:57 ` Steve French
@ 2019-06-17 21:25 ` Pavel Shilovsky
0 siblings, 0 replies; 3+ messages in thread
From: Pavel Shilovsky @ 2019-06-17 21:25 UTC (permalink / raw)
To: Steve French; +Cc: Ronnie Sahlberg, linux-cifs, Stable
Acked-by: Pavel Shilovsky <pshilov@microsoft.com>
--
Best regards,
Pavel Shilovsky
чт, 13 июн. 2019 г. в 20:57, Steve French <smfrench@gmail.com>:
>
> tentatively merged into cifs-2.6.git for-next and to the github tree
>
> On Thu, Jun 13, 2019 at 10:02 PM Ronnie Sahlberg <lsahlber@redhat.com> wrote:
> >
> > We can not hold the GlobalMid_Lock spinlock during the
> > dfs processing in cifs_reconnect since it invokes things that may sleep
> > and thus trigger :
> >
> > BUG: sleeping function called from invalid context at kernel/locking/rwsem.c:23
> >
> > Thus we need to drop the spinlock during this code block.
> >
> > RHBZ: 1716743
> >
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
> > ---
> > fs/cifs/connect.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> > index 8c4121da624e..8dd6637a3cbb 100644
> > --- a/fs/cifs/connect.c
> > +++ b/fs/cifs/connect.c
> > @@ -476,6 +476,7 @@ cifs_reconnect(struct TCP_Server_Info *server)
> > spin_lock(&GlobalMid_Lock);
> > server->nr_targets = 1;
> > #ifdef CONFIG_CIFS_DFS_UPCALL
> > + spin_unlock(&GlobalMid_Lock);
> > cifs_sb = find_super_by_tcp(server);
> > if (IS_ERR(cifs_sb)) {
> > rc = PTR_ERR(cifs_sb);
> > @@ -493,6 +494,7 @@ cifs_reconnect(struct TCP_Server_Info *server)
> > }
> > cifs_dbg(FYI, "%s: will retry %d target(s)\n", __func__,
> > server->nr_targets);
> > + spin_lock(&GlobalMid_Lock);
> > #endif
> > if (server->tcpStatus == CifsExiting) {
> > /* the demux thread will exit normally
> > --
> > 2.13.6
> >
>
>
> --
> Thanks,
>
> Steve
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-06-17 21:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-14 3:02 [PATCH] cifs: fix GlobalMid_Lock bug in cifs_reconnect Ronnie Sahlberg
2019-06-14 3:57 ` Steve French
2019-06-17 21:25 ` Pavel Shilovsky
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).