[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAH2r5muyH4HSWcYZSZMD_TNtF-Gw4Z13FvQ7H9NmmqWetYKZUQ@mail.gmail.com>
Date: Tue, 22 Jun 2021 12:09:28 -0500
From: Steve French <smfrench@...il.com>
To: Tom Talpey <tom@...pey.com>
Cc: Long Li <longli@...rosoft.com>, CIFS <linux-cifs@...r.kernel.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [SMBDIRECT][PATCH] missing rc checks while waiting for SMB3 over
RDMA events
patch updated with Tom's suggestions - let me know if I have missed anything.
On Tue, Jun 22, 2021 at 10:18 AM Tom Talpey <tom@...pey.com> wrote:
>
> On 6/21/2021 5:32 PM, Steve French wrote:
> > There were two places where we weren't checking for error
> > (e.g. ERESTARTSYS) while waiting for rdma resolution.
> >
> > Addresses-Coverity: 1462165 ("Unchecked return value")
> > Signed-off-by: Steve French <stfrench@...rosoft.com>
> >
> > diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c
> > index 10dfe5006792..ae07732f750f 100644
> > --- a/fs/cifs/smbdirect.c
> > +++ b/fs/cifs/smbdirect.c
> > @@ -572,8 +572,11 @@ static struct rdma_cm_id *smbd_create_id(
> > log_rdma_event(ERR, "rdma_resolve_addr() failed %i\n", rc);
> > goto out;
> > }
> > - wait_for_completion_interruptible_timeout(
> > + rc = wait_for_completion_interruptible_timeout(
> > &info->ri_done, msecs_to_jiffies(RDMA_RESOLVE_TIMEOUT));
> > + /* -ERESTARTSYS, returned when interrupted, is the only rc mentioned */
>
> Suggest the same comment text as the one below, this one seems uncertain.
>
> > + if (rc < 0)
> > + goto out;
> > rc = info->ri_rc;
> > if (rc) {
> > log_rdma_event(ERR, "rdma_resolve_addr() completed %i\n", rc);
> > @@ -586,8 +589,10 @@ static struct rdma_cm_id *smbd_create_id(
> > log_rdma_event(ERR, "rdma_resolve_route() failed %i\n", rc);
> > goto out;
> > }
> > - wait_for_completion_interruptible_timeout(
> > + rc = wait_for_completion_interruptible_timeout(
> > &info->ri_done, msecs_to_jiffies(RDMA_RESOLVE_TIMEOUT));
> > + if (rc < 0) /* e.g. if interrupted and returns -ERESTARTSYS */
>
> delete "and"?
>
> > + goto out
>
> Missing a semicolon. ^^^
>
> > rc = info->ri_rc;
> > if (rc) {
> > log_rdma_event(ERR, "rdma_resolve_route() completed %i\n", rc);
> >
> >
>
> One meta-comment. There's no message logged for these ERESTARTSYS cases.
> That might be confusing in the log, if they lead to failure.
>
> Reviewed-By: Tom Talpey <tom@...pey.com>
>
> Tom.
--
Thanks,
Steve
View attachment "0001-smbdirect-missing-rc-checks-while-waiting-for-rdma-e.patch" of type "text/x-patch" (1882 bytes)
Powered by blists - more mailing lists