From patchwork Tue Feb 13 23:14:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 200726 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp862360dyb; Tue, 13 Feb 2024 15:14:15 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXU866qJLFT5M+vWzg7tKSY9p3g9jJvFf2NLSZkloOMl5LUYPi5jdotxdMhbKpfFsoKDPORhsISl0Sfm3Pmu3ux3x4JWA== X-Google-Smtp-Source: AGHT+IE029EKyJT2Qh0V2a7qvR24rRuhSUxNpNlmtnx6U8drfqIDu1rTMkjcCjITa2lFRpfuSmDh X-Received: by 2002:a17:903:2351:b0:1d9:4544:ed22 with SMTP id c17-20020a170903235100b001d94544ed22mr1046053plh.42.1707866055068; Tue, 13 Feb 2024 15:14:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707866055; cv=pass; d=google.com; s=arc-20160816; b=XA6SFB7KPCie9n2GA/bI6epZrd3zDQF6Y8TlHjqXjswVpiS5xHadpII2pl8Tjopx2G okFwvINlUGMVaVDDhVXTEQGqtg+oL/BNG/s7bLJd5zHtOCD7EDgWamPge6AdZlXKBeJd TBa1lpSOI+hn4NqqoIgjGwXAtA5mRJ/Kr/3ePsqLD25mZZ7a0iGA69o5zvBXqEueOwdp wlVtH344B6ziLxkdhnP4/iIKQiLvKEB/f5k2YlFKKTfBeC84P6WdnNO94vtCpK5anRog xHY7ZptiPSpsmljRMeOQvmqFoedZhSkBDvqn+rvwa3IT0BZQgFWH43ytJPrPLzIDf7Yo 10dw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:subject:cc:to:from:date:user-agent:message-id; bh=EmOchA1O8XATAkk8p/p5gCL2KDYLIvEgTEIwOBD/FEA=; fh=g/L2iSLL03zY6pDLnyXNyoTdakZ4SudbUVPy9E1GYDU=; b=ZRTw8qeYfm1jezhGTqYrZNE1IEVXnFr3xlkYOvHPh4vx90m4yHQqFfDWd72YpvCFyk T9uKWGdgmfw6x6lC/h4B1ILvliDGi8hMxsd/xnnaatrtGGv6KDmvD+sXJik7rr/+buPZ FXHSU4gmA26CS40nAEkBuWkZIc44f2Crx8Bc+QZABwh7dWjbByjh1daOno+szQIMX53v LKvZ5aZ/IjmwUF40wfCnpE+14NQF5lJzM9kqrei7ODGK9/gk06gId1/l29xwFtLWW47L j5+ZZHoHzR3SwJWulwKzZFQlRXaZsUQ/do5GGbTqibRC/dS7OJ194tnAPj0WDRHJ3HDE pskg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-64517-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64517-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCWitTVDR+Kp+u0Lw5X1X3lQZSD1xciZHHxvbtWoymA2+481xKb2AyaVJNYqhHuJMMPHZnrG1KZwh71d3XAhOt0VuiK7og== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id o2-20020a170902d4c200b001db27d25955si94906plg.136.2024.02.13.15.14.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 15:14:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64517-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-64517-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64517-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id D694B284358 for ; Tue, 13 Feb 2024 23:14:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 54FB064A94; Tue, 13 Feb 2024 23:13:11 +0000 (UTC) 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790827356398061542 X-GMAIL-MSGID: 1790827356398061542 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-petr.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 ftrace_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) From patchwork Tue Feb 13 23:14:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 200727 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp862395dyb; Tue, 13 Feb 2024 15:14:19 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVpNngxPAtwy5FbHbt2qg0ODQ5oFx5cLXnNw2bkThFis3eBECekfg8657o+FnaxQX1NrF7FCuy/+RrkK9dRXOzoEoZasw== X-Google-Smtp-Source: AGHT+IEKx2W5rEgLFWYD+uMPkpiVlqOIBwuxqyoldbtbmV8g55fO572XX86gFVjed0DOeV0lyysS X-Received: by 2002:a17:906:5593:b0:a3c:b354:b947 with SMTP id y19-20020a170906559300b00a3cb354b947mr551932ejp.24.1707866059727; Tue, 13 Feb 2024 15:14:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707866059; cv=pass; d=google.com; s=arc-20160816; b=i0EFVmn3MQeSPpqeDeYTonNPFL/jbm+nGEoEdd6xiEAs49q5m1bha2JUlnjI06A1qZ cIarA+wh67UcJ2mDoc/a0cvruN1Jl4ks3J+xrm/qiN3atc2GPioBcH9+NbwmslynttLU E4zmLaA7vMvsELpP2do9ndlaal/04xARxbyPrhFgUVS70FtgEdmotAQIdi189LGI1a1A X0/wcp42LPUnFFD9pr1fBsdDeNHBf6OjhfAj7qWvOruBxhWyDK7WuhvNFCAIgxI1FkUl KjbKDX8kLGgTpanTQ+YP64d5oDsU42piG6/0gEhTxsUN8SncRBiyGDtHOCFH4j+f56i9 c3sg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:subject:cc:to:from:date:user-agent:message-id; bh=jjxcZ+dqGZPU5dXHGAwlHHxGL4UkYm/L6dc8zYt31ew=; fh=8uLNuMGxPVM+x3gMrz3ECFvySCSxly3P1sOq4tGXuRk=; b=pDwkv9bUMVmNHCY/7s1seD1ZQu3xSJ9kddTvuh7YN0vFffz35GSkAQx8KdyD5mPaLi pJiY30Eeg7CaN3e7ISbU1ePoQC+uBClhOFc1Ex1ZHMkRfgks2cbqqMdKBJV3+bQ9F41f 6MYtl8pSsTOaQMTL6TbRYuLXa7tJwODvrtDlSsyQVPhdbIb/KL2qYdbo79Rk08IJOVmQ otbHma2KF6R4X43aBwTkwnboPhsvxRQriSLJoYPlrnGvUkuAC0bEJvjT5J66QQm1jVOR vAUiG1p2LePuz13Da+Oy73sOqY4Ji6vWK8qoE8jVD5iY3uLd+hZ7g+l3tkWM5LydimXs AvBQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-64519-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64519-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCWBhSNrMd9s93mzT39bcT1UyyLGSpKmQoX9pB5aLz7+hURX04S84SjqRHBdXexBPlSJkma+RXMyuHromhB6PY4YABVtcA== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id x15-20020a170906b08f00b00a3851c2ab09si1635071ejy.786.2024.02.13.15.14.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 15:14:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64519-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-64519-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64519-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 553BD1F24859 for ; Tue, 13 Feb 2024 23:14:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7689E64AA5; Tue, 13 Feb 2024 23:13:11 +0000 (UTC) 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790827361202162028 X-GMAIL-MSGID: 1790827361202162028 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-svens@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; }