Skip to contentSkip to conversation

vsock: remove an unused variable and fix infinite sleep

PATCH Applied Dexuan Cui 4 participants 8 messages Nov 1, 2022 – Nov 3, 2022

Subsystems (6)
lore
Share & tools
lore

Dexuan Cui

author maintainer
#0 lore raw

v2 cover vsock: remove an unused variable and fix infinite sleep

Patch 1 removes the unused 'wait' variable.
Patch 2 fixes an infinite sleep issue reported by a hv_sock user.

Made v2 to address Stefano's comments.
Please see each patch's header for changes in v2.

Dexuan Cui (2):
vsock: remove the unused 'wait' in vsock_connectible_recvmsg()
vsock: fix possible infinite sleep in vsock_connectible_wait_data()

 net/vmw_vsock/af_vsock.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
Signature · 1 line
2.25.1
author maintainer
#1 lore raw

PATCH v2 1/2 vsock: remove the unused 'wait' in vsock_connectible_recvmsg()

Remove the unused variable introduced by 19c1b90e1979.

Fixes 19c1b90e1979 ("af_vsock: separate receive data loop")

---

Changes in v2:
Added Stefano's Reviewed-by.

 net/vmw_vsock/af_vsock.c | 2 --
 1 file changed, 2 deletions(-)
net/vmw_vsock/af_vsock.c +0 -2
index ee418701cdee..d258fd43092e 100644
@@ -2092,8 +2092,6 @@ vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
 	const struct vsock_transport *transport;
 	int err;
 
-	DEFINE_WAIT(wait);
-
 	sk = sock->sk;
 	vsk = vsock_sk(sk);
 	err = 0;
Signature · 1 line
2.25.1
author maintainer
#2 lore raw

PATCH v2 2/2 vsock: fix possible infinite sleep in vsock_connectible_wait_data()

In reply to Dexuan Cui

Currently vsock_connectible_has_data() may miss a wakeup operation between vsock_connectible_has_data() == 0 and the prepare_to_wait().

Fix the race by adding the process to the wait queue before checking vsock_connectible_has_data().

Fixes b3f7fd54881b ("af_vsock: separate wait data loop")

---

Changes in v2 (Thanks Stefano!):
Fixed a typo in the commit message.
Removed the unnecessary finish_wait() at the end of the loop.

 net/vmw_vsock/af_vsock.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
net/vmw_vsock/af_vsock.c +4 -1
index d258fd43092e..884eca7f6743 100644
@@ -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) ||
Signature · 1 line
2.25.1
maintainer Reviewed-by on v2 2/2
#3 lore raw

Re: [PATCH v2 2/2] vsock: fix possible infinite sleep in vsock_connectible_wait_data()

Quoted 6 lines · Dexuan Cui

Currently vsock_connectible_has_data() may miss a wakeup operation between vsock_connectible_has_data() == 0 and the prepare_to_wait().

Fix the race by adding the process to the wait queue before checking vsock_connectible_has_data().

Quoted 7 lines
Fixes b3f7fd54881b ("af_vsock: separate wait data loop")

---

Changes in v2 (Thanks Stefano!):
Fixed a typo in the commit message.
Removed the unnecessary finish_wait() at the end of the loop.

LGTM:

Quoted 24 lines

net/vmw_vsock/af_vsock.c | 5 ++++-

1 file changed, 4 insertions(+), 1 deletion(-)
net/vmw_vsock/af_vsock.c +4 -1
index d258fd43092e..884eca7f6743 100644
@@ -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) ||
Signature · 1 line
2.25.1

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

#4 lore raw

Re: [PATCH v2 2/2] vsock: fix possible infinite sleep in vsock_connectible_wait_data()

Quoted 11 lines · Stefano Garzarella
Quoted 10 lines · Dexuan Cui

Currently vsock_connectible_has_data() may miss a wakeup operation between vsock_connectible_has_data() == 0 and the prepare_to_wait().

Fix the race by adding the process to the wait queue before checking vsock_connectible_has_data().

Fixes b3f7fd54881b ("af_vsock: separate wait data loop")

---

Quoted 8 lines
Quoted 3 lines

Changes in v2 (Thanks Stefano!):
Fixed a typo in the commit message.
Removed the unnecessary finish_wait() at the end of the loop.

LGTM:

And I would add

Since Frédéric posted a similar patch some months ago (I lost it because netdev and I were not in cc):
https://lore.kernel.org/virtualization/[email protected]/

Thanks,
Stefano

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

#5 lore raw

Re: [PATCH v2 2/2] vsock: fix possible infinite sleep in vsock_connectible_wait_data()

Hi Dexuan, Stefano,

Regards,
Frédéric

Quoted 33 lines · Stefano Garzarella
Quoted 11 lines · Stefano Garzarella
Quoted 10 lines · Dexuan Cui

Currently vsock_connectible_has_data() may miss a wakeup operation between vsock_connectible_has_data() == 0 and the prepare_to_wait().

Fix the race by adding the process to the wait queue before checking vsock_connectible_has_data().

Fixes b3f7fd54881b ("af_vsock: separate wait data loop")

---

Quoted 8 lines
Quoted 3 lines

Changes in v2 (Thanks Stefano!):
Fixed a typo in the commit message.
Removed the unnecessary finish_wait() at the end of the loop.

LGTM:

And I would add

Since Frédéric posted a similar patch some months ago (I lost it because netdev and I were not in cc):
https://lore.kernel.org/virtualization/[email protected]/

Thanks,
Stefano

author maintainer
#6 lore raw

RE: [PATCH v2 2/2] vsock: fix possible infinite sleep in vsock_connectible_wait_data()

Quoted 10 lines

From: Frederic Dalleau <[email protected]>
Sent: Wednesday, November 2, 2022 6:31 AM
To: Stefano Garzarella <[email protected]>
...
Hi Dexuan, Stefano,

Regards,
Frédéric

Thank you, Frederic! I didn't realize you posted a similar patch in Aug :-)

Thanks Stefano for reviewing!

Thanks,
-- Dexuan

#7 lore raw
In reply to Dexuan Cui
This series was applied to netdev/net.git (master) by Paolo Abeni <[email protected]>:

Hello:

This series was applied to netdev/net.git (master) by Paolo Abeni <[email protected]>:

Quoted 11 lines · On Mon, 31 Oct 2022 19:17:04 -0700 you wrote:

Patch 1 removes the unused 'wait' variable.
Patch 2 fixes an infinite sleep issue reported by a hv_sock user.

Made v2 to address Stefano's comments.
Please see each patch's header for changes in v2.

Dexuan Cui (2):
vsock: remove the unused 'wait' in vsock_connectible_recvmsg()
vsock: fix possible infinite sleep in vsock_connectible_wait_data()

[...]

Here is the summary with links:
- [v2,1/2] vsock: remove the unused 'wait' in vsock_connectible_recvmsg()

    https://git.kernel.org/netdev/net/c/cf6ff0df0fd1
  - [v2,2/2] vsock: fix possible infinite sleep in vsock_connectible_wait_data()
    https://git.kernel.org/netdev/net/c/466a85336fee

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html