From: Dexuan Cui <decui@microsoft.com>
To: Stefano Garzarella <sgarzare@redhat.com>
Cc: "davem@davemloft.net" <davem@davemloft.net>,
"edumazet@google.com" <edumazet@google.com>,
"kuba@kernel.org" <kuba@kernel.org>,
"pabeni@redhat.com" <pabeni@redhat.com>,
"arseny.krasnov@kaspersky.com" <arseny.krasnov@kaspersky.com>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"virtualization@lists.linux-foundation.org"
<virtualization@lists.linux-foundation.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
KY Srinivasan <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
"stephen@networkplumber.org" <stephen@networkplumber.org>,
"wei.liu@kernel.org" <wei.liu@kernel.org>,
"linux-hyperv@vger.kernel.org" <linux-hyperv@vger.kernel.org>
Subject: RE: [PATCH 2/2] vsock: fix possible infinite sleep in vsock_connectible_wait_data()
Date: Tue, 1 Nov 2022 01:58:24 +0000 [thread overview]
Message-ID: <SA1PR21MB1335A7C6DD342BCA6C0CCCD7BF369@SA1PR21MB1335.namprd21.prod.outlook.com> (raw)
In-Reply-To: <20221031084327.63vikvodhs7aowhe@sgarzare-redhat>
> From: Stefano Garzarella <sgarzare@redhat.com>
> Sent: Monday, October 31, 2022 1:43 AM
> ...
> s/qeuue/queue
Will fix this.
> >@@ -1905,8 +1905,11 @@ static int vsock_connectible_wait_data(struct
> sock *sk,
> > err = 0;
> > transport = vsk->transport;
> >
> >- while ((data = vsock_connectible_has_data(vsk)) == 0) {
> >+ while (1) {
> > prepare_to_wait(sk_sleep(sk), wait, TASK_INTERRUPTIBLE);
> >+ data = vsock_connectible_has_data(vsk);
> >+ if (data != 0)
> >+ break;
> >
> > if (sk->sk_err != 0 ||
> > (sk->sk_shutdown & RCV_SHUTDOWN) ||
> >@@ -1937,6 +1940,8 @@ static int vsock_connectible_wait_data(struct sock
> *sk,
> > err = -EAGAIN;
> > break;
> > }
> >+
> >+ finish_wait(sk_sleep(sk), wait);
>
> Since we are going to call again prepare_to_wait() on top of the loop,
> is finish_wait() call here really needed?
It's not needed. Will remove this and send v2.
> What about following what we do in vsock_accept and vsock_connect?
>
> prepare_to_wait()
>
> while (condition) {
> ...
> prepare_to_wait();
> }
>
> finish_wait()
>
> I find it a little more readable, but your solution is fine too.
>
> Thanks,
> Stefano
I'd like to stay with my version, as it only needs one line of
prepare_to_wait(), and IMO it's more readable if we only exit from
inside the while loop.
prev parent reply other threads:[~2022-11-01 1:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-28 20:56 [PATCH 0/2] vsock: remove an unused variable and fix infinite sleep Dexuan Cui
2022-10-28 20:56 ` [PATCH 1/2] vsock: remove the unused 'wait' in vsock_connectible_recvmsg() Dexuan Cui
2022-10-31 8:37 ` Stefano Garzarella
2022-10-28 20:56 ` [PATCH 2/2] vsock: fix possible infinite sleep in vsock_connectible_wait_data() Dexuan Cui
2022-10-31 8:43 ` Stefano Garzarella
2022-11-01 1:58 ` Dexuan Cui [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=SA1PR21MB1335A7C6DD342BCA6C0CCCD7BF369@SA1PR21MB1335.namprd21.prod.outlook.com \
--to=decui@microsoft.com \
--cc=arseny.krasnov@kaspersky.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=haiyangz@microsoft.com \
--cc=kuba@kernel.org \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sgarzare@redhat.com \
--cc=stephen@networkplumber.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=wei.liu@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).