Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3325669imu; Sun, 11 Nov 2018 12:25:17 -0800 (PST) X-Google-Smtp-Source: AJdET5eB7VFvUbCkRV6S+g5zI21rlkl97MkNNmCpHM4We6bn2/RFxIKLjjjTju4JC3yTczRgZDSQ X-Received: by 2002:a17:902:9886:: with SMTP id s6-v6mr2300984plp.55.1541967917333; Sun, 11 Nov 2018 12:25:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541967917; cv=none; d=google.com; s=arc-20160816; b=jelehWRECxTB5qL29HlzadrMhoKKeUkyXfx5b9IkZtmvLPo7ksyJ40ew22/EaHAnFR CTpAYDkAmZq1VjmpjuEHuoPty6rFCl7iZGhzfqW6YA69ahI5QZj2klcwP2TodoxZ9dMh Apxm8alt9N99Ss/v2Cm3GRWH1MGbcTl1uvyrgq+NwT9uAcPTdYSXBVemp0YAg2v0rwu2 tmwu70WFUcksCgQzROAtjQW2lQzZ5E3ofDCyUGEt+DNHehiFsYOXO/380CH/eM716tQB 0XdJm4ZZSRPFi1hGZyFM7aO5qTSR3iC44kM3SCi8z51dWVvAYC5gD5zcD1nI8bJ7HZXb JGcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from; bh=9Zy+GJdY58WRjcQc5jYDkEhNpLg9x78aPeVNym3T50o=; b=r1Hwtyluft1/jBZB4LujADiVowa313Xaa6LP7NRDhIQryuZ9hXuywqcX04NIGnnZTF oEkW5v9NbOML27/9OKFPtXtRFrQTfMRUq+jVMSRSFmkl7NgOcVlT4P+kjmHSDY3/yrW7 ANCwtJfDuVRfPoh4+uMw2u+EAexRz5/ZJbnkpfhjfxKYInkqVNG78FmocqxAD0rFcpb/ ZcwOx7VgjvuYR2zN6JGyQ27Ml1x1jbQj77ltuuGvdzFOwYbbNnu6xfObUqelOrwu7Ct8 B63lLE+jBNh/Kn2WE/iDNlNFkgfOyxKyk2/9odSrPOhl2CBhFS5XxYI7DTd72O5aqzCH mnhA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l11-v6si14176444pgm.102.2018.11.11.12.25.02; Sun, 11 Nov 2018 12:25:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731176AbeKLFyU (ORCPT + 99 others); Mon, 12 Nov 2018 00:54:20 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:37604 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730747AbeKLFyT (ORCPT ); Mon, 12 Nov 2018 00:54:19 -0500 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id wABJwtbJ018396 for ; Sun, 11 Nov 2018 15:04:50 -0500 Received: from e12.ny.us.ibm.com (e12.ny.us.ibm.com [129.33.205.202]) by mx0a-001b2d01.pphosted.com with ESMTP id 2npdhea944-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 11 Nov 2018 15:04:50 -0500 Received: from localhost by e12.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 11 Nov 2018 20:04:49 -0000 Received: from b01cxnp22033.gho.pok.ibm.com (9.57.198.23) by e12.ny.us.ibm.com (146.89.104.199) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Sun, 11 Nov 2018 20:04:44 -0000 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id wABK4ha826083456 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Sun, 11 Nov 2018 20:04:43 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9C4ECB206C; Sun, 11 Nov 2018 20:04:43 +0000 (GMT) Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 77364B2068; Sun, 11 Nov 2018 20:04:43 +0000 (GMT) Received: from paulmck-ThinkPad-W541 (unknown [9.85.207.24]) by b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP; Sun, 11 Nov 2018 20:04:43 +0000 (GMT) Received: by paulmck-ThinkPad-W541 (Postfix, from userid 1000) id AC1F216C5D70; Sun, 11 Nov 2018 12:04:44 -0800 (PST) From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org Cc: mingo@kernel.org, jiangshanlai@gmail.com, dipankar@in.ibm.com, akpm@linux-foundation.org, mathieu.desnoyers@efficios.com, josh@joshtriplett.org, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com, fweisbec@gmail.com, oleg@redhat.com, joel@joelfernandes.org, Lance Roy , Alexander Viro , linux-fsdevel@vger.kernel.org, "Paul E . McKenney" Subject: [PATCH tip/core/rcu 4/7] userfaultfd: Replace spin_is_locked() with lockdep Date: Sun, 11 Nov 2018 12:04:40 -0800 X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181111200421.GA10551@linux.ibm.com> References: <20181111200421.GA10551@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18111120-0060-0000-0000-000002D0FD81 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010028; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000270; SDB=6.01116026; UDB=6.00578736; IPR=6.00896127; MB=3.00024114; MTD=3.00000008; XFM=3.00000015; UTC=2018-11-11 20:04:49 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18111120-0061-0000-0000-0000472A0D3C Message-Id: <20181111200443.10772-4-paulmck@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-11-11_13:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=750 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1811110191 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lance Roy lockdep_assert_held() is better suited to checking locking requirements, since it only checks if the current thread holds the lock regardless of whether someone else does. This is also a step towards possibly removing spin_is_locked(). Signed-off-by: Lance Roy Cc: Alexander Viro Cc: Signed-off-by: Paul E. McKenney --- fs/userfaultfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 356d2b8568c1..681881dc8a9d 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -926,7 +926,7 @@ static inline struct userfaultfd_wait_queue *find_userfault_in( wait_queue_entry_t *wq; struct userfaultfd_wait_queue *uwq; - VM_BUG_ON(!spin_is_locked(&wqh->lock)); + lockdep_assert_held(&wqh->lock); uwq = NULL; if (!waitqueue_active(wqh)) -- 2.17.1