From patchwork Tue Jul 31 13:49:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Desrochers X-Patchwork-Id: 951612 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41fyVy4Mwmz9s3N; Tue, 31 Jul 2018 23:50:18 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fkV2R-0003Xv-1X; Tue, 31 Jul 2018 13:50:11 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fkV2M-0003Wb-Lr for kernel-team@lists.ubuntu.com; Tue, 31 Jul 2018 13:50:06 +0000 Received: from mail-qk0-f197.google.com ([209.85.220.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fkV2M-0002Bt-9v for kernel-team@lists.ubuntu.com; Tue, 31 Jul 2018 13:50:06 +0000 Received: by mail-qk0-f197.google.com with SMTP id d194-v6so13891946qkb.12 for ; Tue, 31 Jul 2018 06:50:06 -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:subject:date:message-id:in-reply-to :references; bh=Nq/LBOJOYjQBsZX89bAp33HTR399f1VtnWwkXSaC/Nw=; b=s1IACYWNkjtOTEvbEG0O9LNazbQCjgJvZwE2ap/4IsHhCiYrxowzgef4Ao6R6+g2Il O4NNNAVYI7hPZOlM3zLBo6VHg7yeNKEQK6G86esumETHBUrhqo7ucbq+5td74ykoIBSN wQWKdmBuferf9CeOiHyTtjMSRaTkB2U1fH67q7Ivmjb1Ty9XEU0b8WT7KWq9yfqWKff+ IliQL6PTL37f3IB9Z4U8r4QMMladyVIyT8DsZslbIJxT70eSYCJRPdgoU/jrKURn0lib c880tbtZ9qGfNROsWh4Sm+WIFepANnfojmweILHcN5gaaOrhUYLsjczWwPqQ8hWijvC5 A9ig== X-Gm-Message-State: AOUpUlFKV4rxLqLeUArXfGB/Nd9CcMjfkpyxyLnTE7XIH1fvD38o2sdQ Jw7oqcEzSHZrD8lGSAfiILgGr8nMew00zE1lgRLdRGV32Ii0q9Y+uoHlciLR3uxprmXVfuObXim ZIVIztf6O5fw7auk9eZowrLBzYzFSwIiC2YmkuIj1iA== X-Received: by 2002:a37:9642:: with SMTP id y63-v6mr8024949qkd.27.1533045005378; Tue, 31 Jul 2018 06:50:05 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdRHmAtEoWWxN2yscQepP+4dwlpaFgUHPD6SQdhVPk/wcfai+67OW+2PnAJzX3TiMKz5i/llQ== X-Received: by 2002:a37:9642:: with SMTP id y63-v6mr8024928qkd.27.1533045005178; Tue, 31 Jul 2018 06:50:05 -0700 (PDT) Received: from thinkpad.in.azkaban.com (modemcable048.146-83-70.mc.videotron.ca. [70.83.146.48]) by smtp.gmail.com with ESMTPSA id h195-v6sm9095468qke.58.2018.07.31.06.50.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jul 2018 06:50:04 -0700 (PDT) From: Eric Desrochers To: kernel-team@lists.ubuntu.com Subject: [SRU][Trusty][PATCH 2/3] VSOCK: Fix lockdep issue. Date: Tue, 31 Jul 2018 09:49:59 -0400 Message-Id: <20180731135000.6114-3-eric.desrochers@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180731135000.6114-1-eric.desrochers@canonical.com> References: <20180731135000.6114-1-eric.desrochers@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Jorgen Hansen 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 Signed-off-by: Jorgen Hansen Signed-off-by: David S. Miller (cherry picked from 8566b86ab9f0f45bc6f7dd422b21de9d0cf5415a) Signed-off-by: Eric Desrochers --- 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 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;