From patchwork Wed Sep 13 15:23:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Hocko X-Patchwork-Id: 813487 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xslnS0gV2z9s7v for ; Thu, 14 Sep 2017 01:24:12 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752501AbdIMPYA (ORCPT ); Wed, 13 Sep 2017 11:24:00 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:37265 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751393AbdIMPXZ (ORCPT ); Wed, 13 Sep 2017 11:23:25 -0400 Received: by mail-wr0-f194.google.com with SMTP id u48so277383wrf.4; Wed, 13 Sep 2017 08:23:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6mi6Wj5PCM3XycE6UWHJ4GoQJdNBd2/mQeHQW25E1e0=; b=jnmPud2ojwMc7/2oPED4pHF8/oQY4AXnYvOJVZeRvMSBszVkTYIJJjsEPIwFfcAXNx D++xefNwAYbGkeg6Nn3UMayrtnmiVfiFjNJptBz3mF4rD0QMVNCtHTQlwVgERykQllHN QqJoQ/LQUbNARgB8LFUW5N9Z2K3iTgs/1PWi7NVRuPUzcF83GN5ccZ4qk3qfW6FOEUUB 4ptgzh0gSslJlNK3UKQPUVtAVwu/GsL8lGFMvybsOefNZl+xdg2hHPEMiRwVsMYo6WLa eJThREefo4whGoGWA5E/vh7uY1ujY2Awx4cATDlplyR/MAJ7n1yWb4rYPjSdoQhT4L/b GcOg== X-Gm-Message-State: AHPjjUgJrAEWeHsmMGweDRnZJR1v/smibr8/w1l/1X1jB044i2BKflUz DyFbsLKLg8ms6tJZ X-Google-Smtp-Source: ADKCNb46zkgVIe7HD4wErn0EQm2zyXa0U0kvyI8WZdZTUupMJZyeBYAGHmJ2YA9h6+vebq/RLXpfEQ== X-Received: by 10.223.160.136 with SMTP id m8mr17602061wrm.70.1505316203631; Wed, 13 Sep 2017 08:23:23 -0700 (PDT) Received: from tiehlicka.suse.cz (ip-89-177-66-30.net.upcbroadband.cz. [89.177.66.30]) by smtp.gmail.com with ESMTPSA id w73sm1155497wmw.31.2017.09.13.08.23.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Sep 2017 08:23:23 -0700 (PDT) From: Michal Hocko To: "Jorgen S. Hansen" Cc: Aditya Sarwade , Thomas Hellstrom , Petr Masik , Ben Hutchings , Sasha Levin , netdev@vger.kernel.org, Stable tree , LKML Subject: [PATCH stable-3.16 2/3] VSOCK: Fix lockdep issue. Date: Wed, 13 Sep 2017 17:23:06 +0200 Message-Id: <20170913152307.20317-2-mhocko@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170913152307.20317-1-mhocko@kernel.org> References: <20170913151939.gf7n6rvvjtz47tz7@dhcp22.suse.cz> <20170913152307.20317-1-mhocko@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jorgen Hansen 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 Signed-off-by: Jorgen Hansen Signed-off-by: David S. Miller Signed-off-by: Michal Hocko --- 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;