| Message ID | db6a87eb7372072d4da844ca5b01496d60ed3baa.1491415908.git-series.germano.percossi@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2017-04-07 4:29 GMT-07:00 Germano Percossi <germano.percossi@citrix.com>: > In case of error, smb2_reconnect_server reschedule itself > with a delay, to avoid being too aggressive. > > Signed-off-by: Germano Percossi <germano.percossi@citrix.com> > --- > fs/cifs/smb2pdu.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c > index efe167c..17af75a 100644 > --- a/fs/cifs/smb2pdu.c > +++ b/fs/cifs/smb2pdu.c > @@ -2177,6 +2177,9 @@ void smb2_reconnect_server(struct work_struct *work) > struct cifs_tcon *tcon, *tcon2; > struct list_head tmp_list; > int tcon_exist = false; > + int rc; > + int resched = false; > + > > /* Prevent simultaneous reconnects that can corrupt tcon->rlist list */ > mutex_lock(&server->reconnect_mutex); > @@ -2204,13 +2207,18 @@ void smb2_reconnect_server(struct work_struct *work) > spin_unlock(&cifs_tcp_ses_lock); > > list_for_each_entry_safe(tcon, tcon2, &tmp_list, rlist) { > - if (!smb2_reconnect(SMB2_INTERNAL_CMD, tcon)) > + rc = smb2_reconnect(SMB2_INTERNAL_CMD, tcon); > + if (!rc) > cifs_reopen_persistent_handles(tcon); > + else > + resched = true; > list_del_init(&tcon->rlist); > cifs_put_tcon(tcon); > } > > cifs_dbg(FYI, "Reconnecting tcons finished\n"); > + if (resched) > + queue_delayed_work(cifsiod_wq, &server->reconnect, 2 * HZ); > mutex_unlock(&server->reconnect_mutex); > > /* now we can safely release srv struct */ > -- > git-series 0.9.1 > -- > 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 Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com> -- Best regards, Pavel Shilovsky -- 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
Hi Pavel, Thanks for the review. This patch is part of the minimal set that solves my persistent_handles problem. I did not want to add anything more. Does anyone see room, though, for a configurable reconnect delay instead of an hardcoded one? I did not want to submit here to avoid delays for inclusion in stable but if it OK to all of you, I'd submit the configuration patch and the needed bits for mount.cifs and smbclient (if necessary). Cheers, Germano On 04/10/2017 06:38 PM, Pavel Shilovsky wrote: > 2017-04-07 4:29 GMT-07:00 Germano Percossi <germano.percossi@citrix.com>: >> In case of error, smb2_reconnect_server reschedule itself >> with a delay, to avoid being too aggressive. >> >> Signed-off-by: Germano Percossi <germano.percossi@citrix.com> >> --- >> fs/cifs/smb2pdu.c | 10 +++++++++- >> 1 file changed, 9 insertions(+), 1 deletion(-) >> >> diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c >> index efe167c..17af75a 100644 >> --- a/fs/cifs/smb2pdu.c >> +++ b/fs/cifs/smb2pdu.c >> @@ -2177,6 +2177,9 @@ void smb2_reconnect_server(struct work_struct *work) >> struct cifs_tcon *tcon, *tcon2; >> struct list_head tmp_list; >> int tcon_exist = false; >> + int rc; >> + int resched = false; >> + >> >> /* Prevent simultaneous reconnects that can corrupt tcon->rlist list */ >> mutex_lock(&server->reconnect_mutex); >> @@ -2204,13 +2207,18 @@ void smb2_reconnect_server(struct work_struct *work) >> spin_unlock(&cifs_tcp_ses_lock); >> >> list_for_each_entry_safe(tcon, tcon2, &tmp_list, rlist) { >> - if (!smb2_reconnect(SMB2_INTERNAL_CMD, tcon)) >> + rc = smb2_reconnect(SMB2_INTERNAL_CMD, tcon); >> + if (!rc) >> cifs_reopen_persistent_handles(tcon); >> + else >> + resched = true; >> list_del_init(&tcon->rlist); >> cifs_put_tcon(tcon); >> } >> >> cifs_dbg(FYI, "Reconnecting tcons finished\n"); >> + if (resched) >> + queue_delayed_work(cifsiod_wq, &server->reconnect, 2 * HZ); >> mutex_unlock(&server->reconnect_mutex); >> >> /* now we can safely release srv struct */ >> -- >> git-series 0.9.1 >> -- >> 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 > > Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com> > > -- > Best regards, > Pavel Shilovsky > -- 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
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index efe167c..17af75a 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -2177,6 +2177,9 @@ void smb2_reconnect_server(struct work_struct *work) struct cifs_tcon *tcon, *tcon2; struct list_head tmp_list; int tcon_exist = false; + int rc; + int resched = false; + /* Prevent simultaneous reconnects that can corrupt tcon->rlist list */ mutex_lock(&server->reconnect_mutex); @@ -2204,13 +2207,18 @@ void smb2_reconnect_server(struct work_struct *work) spin_unlock(&cifs_tcp_ses_lock); list_for_each_entry_safe(tcon, tcon2, &tmp_list, rlist) { - if (!smb2_reconnect(SMB2_INTERNAL_CMD, tcon)) + rc = smb2_reconnect(SMB2_INTERNAL_CMD, tcon); + if (!rc) cifs_reopen_persistent_handles(tcon); + else + resched = true; list_del_init(&tcon->rlist); cifs_put_tcon(tcon); } cifs_dbg(FYI, "Reconnecting tcons finished\n"); + if (resched) + queue_delayed_work(cifsiod_wq, &server->reconnect, 2 * HZ); mutex_unlock(&server->reconnect_mutex); /* now we can safely release srv struct */
In case of error, smb2_reconnect_server reschedule itself with a delay, to avoid being too aggressive. Signed-off-by: Germano Percossi <germano.percossi@citrix.com> --- fs/cifs/smb2pdu.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)