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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 A0425C388F7 for ; Mon, 9 Nov 2020 13:32:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 595782076E for ; Mon, 9 Nov 2020 13:32:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604928730; bh=m6kHqQgPIZ7nkhH5TeYrdCWNQcliOlgHi+wQkrUEd14=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eB2oKbbJ3etNr0krqY4dkH8pEBnfn/OIBtTZtw82LE9UijysxDjgaG+KreQ4nfGfr SicGFFolrWtU8xAA+SOK4CJejp6Cc44QzrRRpI2r4KxD917g8TXm62MpNlXwfI6Rbw EX1K/TI3FE4mXxC5CICYLWA4EtBtLGMDmgcXRpv0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732324AbgKINcJ (ORCPT ); Mon, 9 Nov 2020 08:32:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:32816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731585AbgKINIF (ORCPT ); Mon, 9 Nov 2020 08:08:05 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 904D220731; Mon, 9 Nov 2020 13:08:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927285; bh=m6kHqQgPIZ7nkhH5TeYrdCWNQcliOlgHi+wQkrUEd14=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cQ93SrWlme8UWhOkFpbsyTCfrVNXAo7JfcTvphuV3Z2hsATrBF8vLrIAEjakE/OWr mzBLlDsWT70D2gzIOi1EvZUjDt2UlGnldYHcCqTMQpljIDP2liYqI4Q8RVAHKtyGTj EKbB1uZO2C0cwKkwCAfYbcIzMoP1DcUvaSeMrGbo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Steven Rostedt (VMware)" Subject: [PATCH 4.14 22/48] ftrace: Fix recursion check for NMI test Date: Mon, 9 Nov 2020 13:55:31 +0100 Message-Id: <20201109125017.846007314@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125016.734107741@linuxfoundation.org> References: <20201109125016.734107741@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steven Rostedt (VMware) commit ee11b93f95eabdf8198edd4668bf9102e7248270 upstream. The code that checks recursion will work to only do the recursion check once if there's nested checks. The top one will do the check, the other nested checks will see recursion was already checked and return zero for its "bit". On the return side, nothing will be done if the "bit" is zero. The problem is that zero is returned for the "good" bit when in NMI context. This will set the bit for NMIs making it look like *all* NMI tracing is recursing, and prevent tracing of anything in NMI context! The simple fix is to return "bit + 1" and subtract that bit on the end to get the real bit. Cc: stable@vger.kernel.org Fixes: edc15cafcbfa3 ("tracing: Avoid unnecessary multiple recursion checks") Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -587,7 +587,7 @@ static __always_inline int trace_test_an current->trace_recursion = val; barrier(); - return bit; + return bit + 1; } static __always_inline void trace_clear_recursion(int bit) @@ -597,6 +597,7 @@ static __always_inline void trace_clear_ if (!bit) return; + bit--; bit = 1 << bit; val &= ~bit;