[SRU,Trusty,2/3] VSOCK: Fix lockdep issue.

Message ID 20180731135000.6114-3-eric.desrochers@canonical.com
State New
Headers show
Series
  • BUG: scheduling while atomic on VMware 6.0 and late.
Related show

Commit Message

Eric Desrochers July 31, 2018, 1:49 p.m.
From: Jorgen Hansen <jhansen@vmware.com>

BugLink: https://bugs.launchpad.net/bugs/1780470

The recent fix for the vsock sock_put issue used the wrong
initializer for the transport spin_lock causing an issue when
running with lockdep checking.

Testing: Verified fix on kernel with lockdep enabled.

Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Jorgen Hansen <jhansen@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from 8566b86ab9f0f45bc6f7dd422b21de9d0cf5415a)
Signed-off-by: Eric Desrochers <eric.desrochers@canonical.com>
---
 net/vmw_vsock/vmci_transport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index 65c80a1d1bd3..0d1fa05cc8ed 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -1570,7 +1570,7 @@  static int vmci_transport_socket_init(struct vsock_sock *vsk,
 	vmci_trans(vsk)->notify_ops = NULL;
 	INIT_LIST_HEAD(&vmci_trans(vsk)->elem);
 	vmci_trans(vsk)->sk = &vsk->sk;
-	vmci_trans(vsk)->lock = __SPIN_LOCK_UNLOCKED(vmci_trans(vsk)->lock);
+	spin_lock_init(&vmci_trans(vsk)->lock);
 	if (psk) {
 		vmci_trans(vsk)->queue_pair_size =
 			vmci_trans(psk)->queue_pair_size;