From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08EC1C43465 for ; Mon, 21 Sep 2020 14:41:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C5316238A1 for ; Mon, 21 Sep 2020 14:41:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600699276; bh=0D7uARIEhqAt+0BC7YtnuY3eNgTy+QSF5MECcVALQUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=W+UTjV0ydu4vVj1t+qXmuWNwTeYJw329Y48RGSVq7G56uptyD0H3JOBkXyWKnFphq wa5Bfh6P1HQzM0mOq95shC1xRj/G1tReOXx36JjFri6p1nJjWaBm9KhNlTwrs7s8O7 3vPCtiKd7rNa9rqv1yqwD2x574NnvnhT/a3mJDWc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728007AbgIUOlP (ORCPT ); Mon, 21 Sep 2020 10:41:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:50114 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727795AbgIUOlH (ORCPT ); Mon, 21 Sep 2020 10:41:07 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CED2323888; Mon, 21 Sep 2020 14:41:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600699266; bh=0D7uARIEhqAt+0BC7YtnuY3eNgTy+QSF5MECcVALQUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rsNttDp5LIVfNuUhxgl3hsYB6AvUAgrKRqRNif+nzKplC/kZHY4M/ZG2dRpMxkMj8 t0+6YmRMBr5aWq/Fmuiy/3E9AFzgULFd55t6nvCxLld6X/US4Zbkf3jZ2w+1SN/gLU Jq2sHO4vy+9yGawfCWDB237h1VZjT3uxuu5seckg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sven Schnelle , Peter Zijlstra , Vasily Gorbik , Sasha Levin Subject: [PATCH AUTOSEL 5.4 09/15] lockdep: fix order in trace_hardirqs_off_caller() Date: Mon, 21 Sep 2020 10:40:48 -0400 Message-Id: <20200921144054.2135602-9-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921144054.2135602-1-sashal@kernel.org> References: <20200921144054.2135602-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sven Schnelle [ Upstream commit 73ac74c7d489756d2313219a108809921dbfaea1 ] Switch order so that locking state is consistent even if the IRQ tracer calls into lockdep again. Acked-by: Peter Zijlstra Signed-off-by: Sven Schnelle Signed-off-by: Vasily Gorbik Signed-off-by: Sasha Levin --- kernel/trace/trace_preemptirq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_preemptirq.c b/kernel/trace/trace_preemptirq.c index 4d8e99fdbbbee..26b06b09c9f68 100644 --- a/kernel/trace/trace_preemptirq.c +++ b/kernel/trace/trace_preemptirq.c @@ -63,14 +63,14 @@ NOKPROBE_SYMBOL(trace_hardirqs_on_caller); __visible void trace_hardirqs_off_caller(unsigned long caller_addr) { + lockdep_hardirqs_off(CALLER_ADDR0); + if (!this_cpu_read(tracing_irq_cpu)) { this_cpu_write(tracing_irq_cpu, 1); tracer_hardirqs_off(CALLER_ADDR0, caller_addr); if (!in_nmi()) trace_irq_disable_rcuidle(CALLER_ADDR0, caller_addr); } - - lockdep_hardirqs_off(CALLER_ADDR0); } EXPORT_SYMBOL(trace_hardirqs_off_caller); NOKPROBE_SYMBOL(trace_hardirqs_off_caller); -- 2.25.1