From nobody Sat Feb 7 12:11:38 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C7F856340A for ; Tue, 13 Feb 2024 23:13:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707865989; cv=none; b=Zl1ztmwWuBDx0qTqwoaeDt5iVDISwnd89sDkHSPWzRzbhBfF/K1UhkcBFrRAxc2oPTjKyPud20gnObAvuPI70xrDScqAYtQcz8gcRdVYBLnpW4hJm5b9DfUjJBCKsVS8Ut/SVuzOIXL7oXh9M5VNVWRtdjl6VEKDyh+RHRbpnzg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707865989; c=relaxed/simple; bh=yLo7Vk9hD2t0eJ/1xt7wIqizBwtv5M+HWIQZsobPz2U=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=aV/RA/LhegAYODomSh4Pbd9ibLp7Crp70Jb2B7PFykFZk98DLgyXouzEIzShVrRjiiiXqHOvRLYHe9KDEHsV9RdyHjXgG4C8g0l7CjrsvzQ1uxWYIhTESe3on9fCqv1ajPO95/JeaNMzbX7yQP5CBV9W8FyOxUGvKjJ9dj2OVpc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B8B1C433C7; Tue, 13 Feb 2024 23:13:09 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1ra1z5-000000009EN-382x; Tue, 13 Feb 2024 18:14:39 -0500 Message-ID: <20240213231439.611753281@goodmis.org> User-Agent: quilt/0.67 Date: Tue, 13 Feb 2024 18:14:14 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Petr Pavlu Subject: [for-linus][PATCH 1/2] tracing: Fix HAVE_DYNAMIC_FTRACE_WITH_REGS ifdef References: <20240213231413.726507543@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Petr Pavlu Commit a8b9cf62ade1 ("ftrace: Fix DIRECT_CALLS to use SAVE_REGS by default") attempted to fix an issue with direct trampolines on x86, see its description for details. However, it wrongly referenced the HAVE_DYNAMIC_FTRACE_WITH_REGS config option and the problem is still present. Add the missing "CONFIG_" prefix for the logic to work as intended. Link: https://lore.kernel.org/linux-trace-kernel/20240213132434.22537-1-pet= r.pavlu@suse.com Fixes: a8b9cf62ade1 ("ftrace: Fix DIRECT_CALLS to use SAVE_REGS by default") Signed-off-by: Petr Pavlu Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ftrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index c060d5b47910..83ba342aef31 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -5331,7 +5331,7 @@ static int register_ftrace_function_nolock(struct ftr= ace_ops *ops); * not support ftrace_regs_caller but direct_call, use SAVE_ARGS so that it * jumps from ftrace_caller for multiple ftrace_ops. */ -#ifndef HAVE_DYNAMIC_FTRACE_WITH_REGS +#ifndef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS #define MULTI_FLAGS (FTRACE_OPS_FL_DIRECT | FTRACE_OPS_FL_SAVE_ARGS) #else #define MULTI_FLAGS (FTRACE_OPS_FL_DIRECT | FTRACE_OPS_FL_SAVE_REGS) --=20 2.43.0 From nobody Sat Feb 7 12:11:38 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC3DF6340F for ; Tue, 13 Feb 2024 23:13:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707865990; cv=none; b=UY0tbgUNxWDzuXvRn1Gq5rwQeSrt6PfgseqeV3czCol5SiK36ul4vx+AIdVgYsdgD2lHVWibTAU/FnU3bUmnLkF+JS586fXWbxMolDANSwFvxVrsElf7hFRhw3mF/HOj/VH3eO+1n3Ldoa2Mtq8rSgacpyK2b7eh9yw5MkkVDAk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707865990; c=relaxed/simple; bh=nLoRFPBJnfn59rTSLi0Dv6V2IC37p4t5fbYO1zZOBXk=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=fFuqMULlFQA5AonNP1Hw+YP9MWg/c/6cUfPB9haOyZecNsnq5Sh51q+tK0HgGJlopFKOC0jtoUxJGlr1IcpFKthzV6G5NO7/c4baNIVDj2LkKiJd15+ibYATl6WX27sqYC9z9wgMntmjykyVC9W/scrtuYApK8V+RmMfNuMKW8I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88251C433A6; Tue, 13 Feb 2024 23:13:09 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1ra1z5-000000009Er-3nbe; Tue, 13 Feb 2024 18:14:39 -0500 Message-ID: <20240213231439.765101665@goodmis.org> User-Agent: quilt/0.67 Date: Tue, 13 Feb 2024 18:14:15 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Mete Durlu , Sven Schnelle Subject: [for-linus][PATCH 2/2] tracing: Use ring_buffer_record_is_set_on() in tracer_tracing_is_on() References: <20240213231413.726507543@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Sven Schnelle tracer_tracing_is_on() checks whether record_disabled is not zero. This checks both the record_disabled counter and the RB_BUFFER_OFF flag. Reading the source it looks like this function should only check for the RB_BUFFER_OFF flag. Therefore use ring_buffer_record_is_set_on(). This fixes spurious fails in the 'test for function traceon/off triggers' test from the ftrace testsuite when the system is under load. Link: https://lore.kernel.org/linux-trace-kernel/20240205065340.2848065-1-s= vens@linux.ibm.com Cc: Masami Hiramatsu Cc: Mathieu Desnoyers Tested-By: Mete Durlu Signed-off-by: Sven Schnelle Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 9ff8a439d674..aa54810e8b56 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1532,7 +1532,7 @@ void disable_trace_on_warning(void) bool tracer_tracing_is_on(struct trace_array *tr) { if (tr->array_buffer.buffer) - return ring_buffer_record_is_on(tr->array_buffer.buffer); + return ring_buffer_record_is_set_on(tr->array_buffer.buffer); return !tr->buffer_disabled; } =20 --=20 2.43.0