vsock: unify table locks

The DGRAM patches introduce an additional vsock table lock, in
addition to the original vsock_table_lock, to operate on the
vsock dgram bound table. But the knowledge of whether the socket
is dgram or not is not properly propagated, so there are code
paths that can operate on one list while having a lock on the
wrong one.

As the gains of having two table locks are minimal, unify the
table locks on the original one.

This fixes a kernel bug like this one:

[    3.260602] list_del corruption. prev->next should be ffff0000823a3748, but was ffff000080c379c8. (prev=ffff80008151e828)
[    3.261075] ------------[ cut here ]------------
[    3.261286] kernel BUG at lib/list_debug.c:62!
[    3.261382] Internal error: Oops - BUG: 00000000f2000800 [#1] SMP
[    3.261464] CPU: 2 UID: 0 PID: 222 Comm: vsock Not tainted 6.12.44 #3
[    3.261658] Hardware name: linux,dummy-virt (DT)
[    3.261799] pstate: 61400005 (nZCv daif +PAN -UAO -TCO +DIT -SSBS BTYPE=--)
[    3.262017] pc : __list_del_entry_valid_or_report+0xa0/0xd8
[    3.262210] lr : __list_del_entry_valid_or_report+0xa0/0xd8
[    3.262314] sp : ffff800082cc3c80
[    3.262349] x29: ffff800082cc3c80 x28: ffff000082c62100 x27: 0000000000000000
[    3.262615] x26: 0000000000000000 x25: ffff80008151fa58 x24: 0000000000000000
[    3.262818] x23: ffff0000823a3840 x22: ffff0000823a3748 x21: ffff80008151d878
[    3.263021] x20: ffff80008151fa58 x19: ffff0000823a3440 x18: 000000000000000a
[    3.263224] x17: 20747562202c3834 x16: 3733613332383030 x15: 3030666666662065
[    3.263428] x14: ffff8000813ec7f0 x13: 38666666663d7665 x12: 727028202e386339
[    3.263644] x11: ffff8000813ec7f0 x10: 000000000002bfa8 x9 : 00000000000000c6
[    3.263847] x8 : ffff8000814187f0 x7 : 80000000fffff800 x6 : ffff8000814187f0
[    3.264052] x5 : 0000000000000000 x4 : 0000000000000000 x3 : 00000000fffff7ff
[    3.264200] x2 : ffff8000813ec720 x1 : ffff8000813ec720 x0 : 000000000000006d
[    3.264270] Call trace:
[    3.264295]  __list_del_entry_valid_or_report+0xa0/0xd8
[    3.264459]  vsock_bind_common+0x2bc/0x2c0
[    3.264577]  __vsock_bind+0xa8/0x200
[    3.264686]  vsock_bind+0x44/0x70
[    3.264793]  __sys_bind+0x64/0xc4
[    3.264950]  __arm64_sys_bind+0x1c/0x38
[    3.265061]  invoke_syscall.constprop.0+0x40/0xf0
[    3.265203]  el0_svc_common.constprop.0+0x38/0xd8
[    3.265344]  do_el0_svc+0x1c/0x28
[    3.265451]  el0_svc+0x38/0x150
[    3.265560]  el0t_64_sync_handler+0x120/0x12c
[    3.265722]  el0t_64_sync+0x194/0x198
[    3.265834] Code: b00034c0 aa0403e2 912a0000 97ffd025 (d4210000)
[    3.266005] ---[ end trace 0000000000000000 ]---

Signed-off-by: Sergio Lopez <[email protected]>

Author: slp

patches-tee/0001-virtio-enable-DMA-API-if-memory-is-restricted.patch

@@ -1,4 +1,4 @@
-From c6edd578fcd5b420fdf759af974c050b92258480 Mon Sep 17 00:00:00 2001
+From b9512be602b76ff5870c000c657591ab2c427089 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Fri, 10 Sep 2021 13:05:01 +0200
 Subject: [PATCH 1/4] virtio: enable DMA API if memory is restricted

patches-tee/0002-x86-sev-write-AP-reset-vector.patch

@@ -1,4 +1,4 @@
-From e5a573b2dc70b01eaddf7124cb436140bd524688 Mon Sep 17 00:00:00 2001
+From 9103e0957f95b6457120c551bc269b9044079ae5 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 20 Oct 2022 10:23:16 +0200
 Subject: [PATCH 2/4] x86/sev: write AP reset vector

patches-tee/0003-Implement-driver-to-retrieve-secrets-from-cmdline.patch

@@ -1,4 +1,4 @@
-From 1e770f38f17fd55914d219d488fda76810f9e721 Mon Sep 17 00:00:00 2001
+From b924b6ed30ef595f6bfa3f0f231125184541c20e Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Wed, 3 Aug 2022 12:35:12 +0200
 Subject: [PATCH 3/4] Implement driver to retrieve secrets from cmdline

patches-tee/0004-x86-sev-Avoid-using-native_cpuid.patch

@@ -1,4 +1,4 @@
-From 0aacc70d72f0ca3b0eb91793b06651a72a4536ec Mon Sep 17 00:00:00 2001
+From 39bdaea7c82fb96155f41d9cf18bffa3ab35f507 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Wed, 5 Jun 2024 16:20:08 +0200
 Subject: [PATCH 4/4] x86/sev: Avoid using native_cpuid

patches/0008-virtio-vsock-support-dgrams.patch

@@ -1,4 +1,4 @@
-From 8e01b14892ef313342b0e738b65f6486f07aab26 Mon Sep 17 00:00:00 2001
+From 6c72954d95d84fbe85766ffeb5ba9070f52d7dbe Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:33 +0000
 Subject: [PATCH 08/21] virtio/vsock: support dgrams
@@ -29,11 +29,11 @@ Signed-off-by: Bobby Eshleman <[email protected]>
  include/linux/virtio_vsock.h            |   5 +-
  include/net/af_vsock.h                  |   1 +
  include/uapi/linux/virtio_vsock.h       |   1 +
- net/vmw_vsock/af_vsock.c                |  62 +++++++--
+ net/vmw_vsock/af_vsock.c                |  48 +++++--
  net/vmw_vsock/virtio_transport.c        |  23 +++-
  net/vmw_vsock/virtio_transport_common.c | 175 ++++++++++++++++++------
  net/vmw_vsock/vsock_loopback.c          |   8 +-
- 8 files changed, 242 insertions(+), 60 deletions(-)
+ 8 files changed, 229 insertions(+), 59 deletions(-)
 
 diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
 index 4659a74078bd..eb088aa1afc1 100644
@@ -157,7 +157,7 @@ index 9c25f267bbc0..27b4b2b8bf13 100644
 
  enum virtio_vsock_op {
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index b0bdb9d1f816..6b5526047973 100644
+index b0bdb9d1f816..6418b8fa98c5 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
 @@ -118,6 +118,7 @@ static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr);
@@ -168,16 +168,15 @@ index b0bdb9d1f816..6b5526047973 100644
 
  /* Protocol family. */
  struct proto vsock_proto = {
-@@ -185,6 +186,8 @@ struct list_head vsock_connected_table[VSOCK_HASH_SIZE];
+@@ -185,6 +186,7 @@ struct list_head vsock_connected_table[VSOCK_HASH_SIZE];
  EXPORT_SYMBOL_GPL(vsock_connected_table);
  DEFINE_SPINLOCK(vsock_table_lock);
  EXPORT_SYMBOL_GPL(vsock_table_lock);
 +static struct list_head vsock_dgram_bind_table[VSOCK_HASH_SIZE];
-+static DEFINE_SPINLOCK(vsock_dgram_table_lock);
 
  /* Autobind this socket to the local address if necessary. */
  static int vsock_auto_bind(struct vsock_sock *vsk)
-@@ -207,6 +210,9 @@ static void vsock_init_tables(void)
+@@ -207,6 +209,9 @@ static void vsock_init_tables(void)
 
  	for (i = 0; i < ARRAY_SIZE(vsock_connected_table); i++)
  		INIT_LIST_HEAD(&vsock_connected_table[i]);
@@ -187,7 +186,7 @@ index b0bdb9d1f816..6b5526047973 100644
  }
 
  static void __vsock_insert_bound(struct list_head *list,
-@@ -235,8 +241,8 @@ static void __vsock_remove_connected(struct vsock_sock *vsk)
+@@ -235,8 +240,8 @@ static void __vsock_remove_connected(struct vsock_sock *vsk)
  	sock_put(&vsk->sk);
  }
 
@@ -198,7 +197,7 @@ index b0bdb9d1f816..6b5526047973 100644
  {
  	struct vsock_sock *vsk;
 
-@@ -253,6 +259,23 @@ struct sock *vsock_find_bound_socket_common(struct sockaddr_vm *addr,
+@@ -253,6 +258,23 @@ struct sock *vsock_find_bound_socket_common(struct sockaddr_vm *addr,
  	return NULL;
  }
 
@@ -207,13 +206,13 @@ index b0bdb9d1f816..6b5526047973 100644
 +{
 +	struct sock *sk;
 +
-+	spin_lock_bh(&vsock_dgram_table_lock);
++	spin_lock_bh(&vsock_table_lock);
 +	sk = vsock_find_bound_socket_common(addr,
 +					    &vsock_dgram_bind_table[VSOCK_HASH(addr)]);
 +	if (sk)
 +		sock_hold(sk);
 +
-+	spin_unlock_bh(&vsock_dgram_table_lock);
++	spin_unlock_bh(&vsock_table_lock);
 +
 +	return sk;
 +}
@@ -222,38 +221,19 @@ index b0bdb9d1f816..6b5526047973 100644
  static struct sock *__vsock_find_bound_socket(struct sockaddr_vm *addr)
  {
  	return vsock_find_bound_socket_common(addr, vsock_bound_sockets(addr));
-@@ -292,6 +315,14 @@ void vsock_insert_connected(struct vsock_sock *vsk)
- }
- EXPORT_SYMBOL_GPL(vsock_insert_connected);
- 
-+static void vsock_remove_dgram_bound(struct vsock_sock *vsk)
-+{
-+	spin_lock_bh(&vsock_dgram_table_lock);
-+	if (__vsock_in_bound_table(vsk))
-+		__vsock_remove_bound(vsk);
-+	spin_unlock_bh(&vsock_dgram_table_lock);
-+}
-+
- void vsock_remove_bound(struct vsock_sock *vsk)
- {
- 	spin_lock_bh(&vsock_table_lock);
-@@ -344,9 +375,12 @@ EXPORT_SYMBOL_GPL(vsock_find_connected_socket);
+@@ -344,9 +366,9 @@ EXPORT_SYMBOL_GPL(vsock_find_connected_socket);
  void vsock_remove_sock(struct vsock_sock *vsk)
  {
  	/* Transport reassignment must not remove the binding. */
 -	if (sock_flag(sk_vsock(vsk), SOCK_DEAD))
--		vsock_remove_bound(vsk);
--
 +	if (sock_flag(sk_vsock(vsk), SOCK_DEAD)) {
-+		if (sock_type_connectible(sk_vsock(vsk)->sk_type))
-+			vsock_remove_bound(vsk);
-+		else
-+			vsock_remove_dgram_bound(vsk);
+ 		vsock_remove_bound(vsk);
+-
 +	}
  	vsock_remove_connected(vsk);
  }
  EXPORT_SYMBOL_GPL(vsock_remove_sock);
-@@ -772,11 +806,19 @@ static int __vsock_bind_connectible(struct vsock_sock *vsk,
+@@ -772,11 +794,19 @@ static int __vsock_bind_connectible(struct vsock_sock *vsk,
  	return vsock_bind_common(vsk, addr, vsock_bind_table, VSOCK_HASH_SIZE + 1);
  }
 
@@ -267,17 +247,17 @@ index b0bdb9d1f816..6b5526047973 100644
 +	if (!vsk->transport || !vsk->transport->dgram_bind) {
 +		int retval;
 +
-+		spin_lock_bh(&vsock_dgram_table_lock);
++		spin_lock_bh(&vsock_table_lock);
 +		retval = vsock_bind_common(vsk, addr, vsock_dgram_bind_table,
 +					   VSOCK_HASH_SIZE);
-+		spin_unlock_bh(&vsock_dgram_table_lock);
++		spin_unlock_bh(&vsock_table_lock);
 +
 +		return retval;
 +	}
 
  	return vsk->transport->dgram_bind(vsk, addr);
  }
-@@ -807,7 +849,7 @@ static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr)
+@@ -807,7 +837,7 @@ static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr)
  		break;
 
  	case SOCK_DGRAM:

patches/0009-Transparent-Socket-Impersonation-implementation.patch

@@ -1,4 +1,4 @@
-From 6e363ca51a842106546205ea318a04e966e05348 Mon Sep 17 00:00:00 2001
+From 0b8e9adbefbdf73b25160e7fb5c47f3749136cca Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 19 May 2022 22:38:26 +0200
 Subject: [PATCH 09/21] Transparent Socket Impersonation implementation

patches/0010-tsi-allow-hijacking-sockets-tsi_hijack.patch

@@ -1,4 +1,4 @@
-From 52d34f3715d37a0a20a0ab19adfc3cce14936ea5 Mon Sep 17 00:00:00 2001
+From e25f8d8cc856be6b342a20093a43eda95ce8fc35 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 19 May 2022 22:42:01 +0200
 Subject: [PATCH 10/21] tsi: allow hijacking sockets (tsi_hijack)

patches/0011-arm64-cpufeature-Unify-SCOPE_LOCAL_CPU-early-late-be.patch

@@ -1,4 +1,4 @@
-From ecf649ecac3697176040b7459080575cf6ddbade Mon Sep 17 00:00:00 2001
+From 771614b1f380963a7fec0fe2f5b2a3b265347782 Mon Sep 17 00:00:00 2001
 From: Asahi Lina <[email protected]>
 Date: Wed, 25 Sep 2024 16:35:34 +0200
 Subject: [PATCH 11/21] arm64: cpufeature: Unify SCOPE_LOCAL_CPU early & late

patches/0012-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch

@@ -1,4 +1,4 @@
-From 2052ac9ba265a1dbc4b46aa3444ca29319dd7f19 Mon Sep 17 00:00:00 2001
+From 3cc2e827a5a15eaf154c6e081d4a69c0d8c07e87 Mon Sep 17 00:00:00 2001
 From: Hector Martin <[email protected]>
 Date: Thu, 11 Apr 2024 09:51:20 +0900
 Subject: [PATCH 12/21] prctl: Introduce PR_{SET,GET}_MEM_MODEL

patches/0013-arm64-Implement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch

@@ -1,4 +1,4 @@
-From 8d60b85d1b4605a68212be4500777addbcd61bb4 Mon Sep 17 00:00:00 2001
+From 0cacaf7a382f24704d9483e76c0aa6e5a145d628 Mon Sep 17 00:00:00 2001
 From: Hector Martin <[email protected]>
 Date: Thu, 11 Apr 2024 09:51:21 +0900
 Subject: [PATCH 13/21] arm64: Implement PR_{GET,SET}_MEM_MODEL for always-TSO