From patchwork Tue Dec 19 18:54:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 181221 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp2156414dyi; Tue, 19 Dec 2023 10:58:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IHnqPY+mC/AB45qEBKb/Wvk4m0fvx79AkiMt0Ba9evrjX46w6g6/lpMYViFKKGftb6bB09x X-Received: by 2002:a9d:3e13:0:b0:6da:32f9:7728 with SMTP id a19-20020a9d3e13000000b006da32f97728mr11739884otd.46.1703012319247; Tue, 19 Dec 2023 10:58:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703012319; cv=none; d=google.com; s=arc-20160816; b=sSRvk06eC523Kh934YDesKiQlwlcPQVRb8xQI/kLWGtWSE4+8lhYmXW+2T1xk7UoyV m1bGdHer9RNPPj4oBnKS8q4BLLsI+8lrwSQ4HAwBuVJ7FH+t4XW7Nc4P4pOkkNXlCjBZ Nxr7rNTqRqjmwqxLXXPnyYbzSpekX5HunONzgD2gXxwwWf/mLM92JUMQv132uiWm/C0F bWWfH5P7VibO2ynL0mbsuZHI+ZwHFk5e8gEvKWX8kwxSJuZ8OIsXz/8VpGVRT+7w9g69 styI0M2MfZ7e10qjbz0uU8pu2CzyAquorzJovQPtudAHAZI2ApT04KS99E3PzkCv8QoQ VSiw== ARC-Message-Signature: i=1; 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=bTsqp09+4Tsj0gL9mZGFMne4F1ntMFriwejr7xCQvms=; fh=pL1t9p0RxD5qCgSUniSa3P4+XmpksJYPzX6TE+dndao=; b=CcMaaEQgvvG0T0D7HMQfQWos4OGScAgKeFfIu0OhBUm6RcztWW9nW/u/H14NGFIKFh Q3qdfzrXQkrcTYfJXCD2DJ7v/feFEDRTnTxvrNN1AzHA3dGJCnFmpOqdpma0glJErp44 6zLO9AEzSPxrrw8eB1F20SrgeR5AXB+f7lGmp9SOXevfFWSDthOdnUSgZjs4bcCH7qJ7 SzNToVF/BgmjNXgQPp4j13A31iewIpP1q/t5Qnj9RyyG2Qee4efdltONP/cLp603w92V hv5FI2LZxY4362YZKBcUFaAalV0mH3LZJZpFrUS32M9Mgj9JflU8AQrPiBVhPZv8FdM2 g21A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-5843-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5843-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id s31-20020a05622a1a9f00b004236f705a9bsi805261qtc.118.2023.12.19.10.58.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 10:58:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-5843-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-5843-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5843-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 0BDB31C2152E for ; Tue, 19 Dec 2023 18:58:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E0DD24122B; Tue, 19 Dec 2023 18:55:33 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org 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 3BF183B189; Tue, 19 Dec 2023 18:55:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09AD8C43395; Tue, 19 Dec 2023 18:55:31 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rFfGY-00000003R4M-2RSu; Tue, 19 Dec 2023 13:56:30 -0500 Message-ID: <20231219185630.353222794@goodmis.org> User-Agent: quilt/0.67 Date: Tue, 19 Dec 2023 13:54:24 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Tzvetomir Stoyanov , Vincent Donnefort , Kent Overstreet Subject: [PATCH v5 10/15] tracing: Stop the tracing while changing the ring buffer subbuf size References: <20231219185414.474197117@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: 1785737845526228103 X-GMAIL-MSGID: 1785737845526228103 From: "Steven Rostedt (Google)" Because the main buffer and the snapshot buffer need to be the same for some tracers, otherwise it will fail and disable all tracing, the tracers need to be stopped while updating the sub buffer sizes so that the tracers see the main and snapshot buffers with the same sub buffer size. Fixes: TBD ("ring-buffer: Add interface for configuring trace sub buffer size") Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 2439e00aa4ce..82303bd2bba1 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -9412,13 +9412,16 @@ buffer_order_write(struct file *filp, const char __user *ubuf, if (val < 0 || val > 7) return -EINVAL; + /* Do not allow tracing while changing the order of the ring buffer */ + tracing_stop_tr(tr); + old_order = ring_buffer_subbuf_order_get(tr->array_buffer.buffer); if (old_order == val) - return 0; + goto out; ret = ring_buffer_subbuf_order_set(tr->array_buffer.buffer, val); if (ret) - return 0; + goto out; #ifdef CONFIG_TRACER_MAX_TRACE @@ -9445,11 +9448,15 @@ buffer_order_write(struct file *filp, const char __user *ubuf, */ tracing_disabled = 1; } - return ret; + goto out; } out_max: #endif (*ppos)++; + out: + if (ret) + cnt = ret; + tracing_start_tr(tr); return cnt; }