From: Michal Hocko <mhocko@kernel.org>
To: "Jorgen S. Hansen" <jhansen@vmware.com>
Cc: Aditya Sarwade <asarwade@vmware.com>,
Thomas Hellstrom <thellstrom@vmware.com>,
Petr Masik <Petr.Masik@nudz.cz>,
Ben Hutchings <ben@decadent.org.uk>,
Sasha Levin <alexander.levin@verizon.com>,
netdev@vger.kernel.org, Stable tree <stable@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH stable-3.16 2/3] VSOCK: Fix lockdep issue.
Date: Wed, 13 Sep 2017 17:23:06 +0200 [thread overview]
Message-ID: <20170913152307.20317-2-mhocko@kernel.org> (raw)
In-Reply-To: <20170913152307.20317-1-mhocko@kernel.org>
From: Jorgen Hansen <jhansen@vmware.com>
commit 8566b86ab9f0f45bc6f7dd422b21de9d0cf5415a upstream.
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>
Signed-off-by: Michal Hocko <mhocko@suse.com>
---
net/vmw_vsock/vmci_transport.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index aed136d27b01..314312272e08 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;
--
2.14.1
next prev parent reply other threads:[~2017-09-13 15:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-12 9:08 scheduling while atomic from vmci_transport_recv_stream_cb in 3.16 kernels Michal Hocko
2017-09-13 15:07 ` Jorgen S. Hansen
2017-09-13 15:19 ` Michal Hocko
2017-09-13 15:23 ` [PATCH stable-3.16 1/3] VSOCK: sock_put wasn't safe to call in interrupt context Michal Hocko
2017-09-13 15:23 ` Michal Hocko [this message]
2017-09-13 15:23 ` [PATCH stable-3.16 3/3] VSOCK: Detach QP check should filter out non matching QPs Michal Hocko
2017-09-13 18:58 ` scheduling while atomic from vmci_transport_recv_stream_cb in 3.16 kernels Jorgen S. Hansen
2017-09-14 8:59 ` Michal Hocko
2017-09-15 17:12 ` Ben Hutchings
2017-09-18 6:11 ` Michal Hocko
2017-11-21 19:58 ` Ben Hutchings
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=20170913152307.20317-2-mhocko@kernel.org \
--to=mhocko@kernel.org \
--cc=Petr.Masik@nudz.cz \
--cc=alexander.levin@verizon.com \
--cc=asarwade@vmware.com \
--cc=ben@decadent.org.uk \
--cc=jhansen@vmware.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=thellstrom@vmware.com \
/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).