Received: by 2002:a17:90a:9307:0:0:0:0 with SMTP id p7csp5145826pjo; Tue, 11 Feb 2020 04:52:15 -0800 (PST) X-Google-Smtp-Source: APXvYqwn0bAfUq2ddANs6HeVCjhVgem2M1Px6y+kwcPB5+ZN9URHctkSKnOL6wpHY/RlVPPnNZlB X-Received: by 2002:aca:100e:: with SMTP id 14mr2762564oiq.88.1581425534923; Tue, 11 Feb 2020 04:52:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581425534; cv=none; d=google.com; s=arc-20160816; b=k4goXznCrvjoprtHMcQrEIRk5cn9TzNodiQBTADzCYw3NX8AUxm8NRo484nlv4smDU Bac4hptIMuTkMoix+ZwsayP30wqMGPGyb3avxj9UAAWxsJV6gnA6pHPubrTKXxPkEqke RWzE2dF6LU6g7n8VNpCkEipfVCp/W4213OeCD/QM0YjG7q16xrecVlbwK2zujI8oMQlD oTCfcSd6mx5xIICxL5uilDB7xcxBDjglem+RG9kyZDqAXfNgu+4/g0htSsizSteF9h8h VPNVAIWTqpJ3wi5VHOC6sr/XPZGv0vHr8QjvI1CmRTOwPJjGwYGo1pAYOXp9tHolagTn yRgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:date; bh=aRmw1agx/eJGM2Ycs5ewNf8lgOSO/4HfvssEScKqhZ4=; b=unEpoD4xErB0kYdeV534cqOq6UW0i8Llp6/RxemUyUIfYzkw4HqMSE7EU/G98q6ETb 7VHkJtYOrod0yGe2xXXPCiTek9GcPmDiqPQNc7nukY5FwdCQIHIaWh3BpSDO1wYEeFLB 6Um0ttcpoBkJbR3DK3c1+8nIfOlfYf+dQYktpFyNKxp+v8p2DuNW5QkIA5Vj2Z3Aa8rY FobaU7BYNz/SIyuBtlwcfcCrV0I0Jcrr77Jfwj8SucXXGvcgp429RoRxr+MbKVg0YvOq 4pSwb7VSnsyO3cGP+8ilRPIVPumWIy8T0ZqiD65pHnVdqNb5t1b1C2UV2J/ihUwl/ahk Beuw== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j3si1576529oie.86.2020.02.11.04.52.03; Tue, 11 Feb 2020 04:52:14 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729145AbgBKMtW (ORCPT + 99 others); Tue, 11 Feb 2020 07:49:22 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:46066 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728946AbgBKMs0 (ORCPT ); Tue, 11 Feb 2020 07:48:26 -0500 Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1j1Uxi-0007kD-Fw; Tue, 11 Feb 2020 13:48:22 +0100 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 148A11C2017; Tue, 11 Feb 2020 13:48:22 +0100 (CET) Date: Tue, 11 Feb 2020 12:48:21 -0000 From: "tip-bot2 for Davidlohr Bueso" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] locking/percpu-rwsem: Add might_sleep() for writer locking Cc: Davidlohr Bueso , "Peter Zijlstra (Intel)" , Ingo Molnar , Will Deacon , Waiman Long , x86 , LKML In-Reply-To: <20200108013305.7732-1-dave@stgolabs.net> References: <20200108013305.7732-1-dave@stgolabs.net> MIME-Version: 1.0 Message-ID: <158142530179.411.17952389583883812912.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the locking/core branch of tip: Commit-ID: 41f0e29190ac9e38099a37abd1a8a4cb1dc21233 Gitweb: https://git.kernel.org/tip/41f0e29190ac9e38099a37abd1a8a4cb1dc21233 Author: Davidlohr Bueso AuthorDate: Tue, 07 Jan 2020 17:33:04 -08:00 Committer: Ingo Molnar CommitterDate: Tue, 11 Feb 2020 13:11:02 +01:00 locking/percpu-rwsem: Add might_sleep() for writer locking We are missing this annotation in percpu_down_write(). Correct this. Signed-off-by: Davidlohr Bueso Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Acked-by: Will Deacon Acked-by: Waiman Long Link: https://lkml.kernel.org/r/20200108013305.7732-1-dave@stgolabs.net --- kernel/locking/percpu-rwsem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/locking/percpu-rwsem.c b/kernel/locking/percpu-rwsem.c index 8048a9a..183a3aa 100644 --- a/kernel/locking/percpu-rwsem.c +++ b/kernel/locking/percpu-rwsem.c @@ -212,6 +212,7 @@ static bool readers_active_check(struct percpu_rw_semaphore *sem) void percpu_down_write(struct percpu_rw_semaphore *sem) { + might_sleep(); rwsem_acquire(&sem->dep_map, 0, 0, _RET_IP_); /* Notify readers to take the slow path. */