Message ID | 20231219185629.467894710@goodmis.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-5842-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp2156356dyi; Tue, 19 Dec 2023 10:58:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IF4XJzb+602+gChX/KxA9/7oulSMMY6EZ0zJSOx3GP9mGticEHHpv5pwjsgbqLX+hi61NYa X-Received: by 2002:a17:902:a58b:b0:1cf:8cca:4f62 with SMTP id az11-20020a170902a58b00b001cf8cca4f62mr8137770plb.46.1703012312731; Tue, 19 Dec 2023 10:58:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703012312; cv=none; d=google.com; s=arc-20160816; b=GK7qbkF72e3S6W5MYavEmeqc3csRH1LQrNTvTk6H38EPNzfCJQ28EbRCVcLMWewNzI i2JW53Yb7UGJtBjSi2416TWJM54b/eE3qiD1F0tHFYJcdrVkqk/lMsX9Hj0Kl4RWKtX2 pcwk2hjxUHk3aeWp3PGnvqTpz8ewQvh/Y0kyKNbRUpdRKRtn+Lyjf2aMuG1JIHvc2/OE VLebvF7sVdjRCx6nbgxEgfRletaU06uyjLr2BGjjeNuNpr/vDsBhQD3/+JM6g+NIqIxt hxg17n1eaaq42G8PrpK/4VCr4+juza07OMjoAyhp4CrNNl8rS8X2mVZu/KhDway5F2jx 9YIw== 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=elUKXX2QmNIZfhHx0hcFOlwYqhVI6SaF+I4yAO9Juk8=; fh=pL1t9p0RxD5qCgSUniSa3P4+XmpksJYPzX6TE+dndao=; b=JwMqfb/5kG4ApL4ROJCc/EIkE9xKuVp5INpfCZotwjfkCRZo+AsXWYW3ZJYABQiJmd rN6Rl8ecSJoMDLqtpwlZwC3gfJFynkTNQ8M9XCuxoCr5+tO0Nt6AbQD0Ay7QN0fyqziK YVBvs8LPGu3CHBmEzEVhUGauWpxzko1VEZvNC7D+DHYyDIUVa+u3Dhb1MFL/EI54EWjW 1IXP++8IAZpiD6op1SJqv13UU4lCBB/YMHnSbzFS+3ZzOz1LmiyKhwHF+OaMuKMHRGJt bjWj+wtIs9kjiMUCdBQS36XSTABySchcqpi85T2tnFEPxK5kTKh9Q0cDxSDfuDC27AzM cN1Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-5842-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5842-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id q13-20020a170902edcd00b001cfc9894958si4411337plk.379.2023.12.19.10.58.32 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 10:58:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-5842-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; spf=pass (google.com: domain of linux-kernel+bounces-5842-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5842-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 6F112287A83 for <ouuuleilei@gmail.com>; Tue, 19 Dec 2023 18:58:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BD7D040C19; 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 117CE3A29F; Tue, 19 Dec 2023 18:55:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3DDA1C4339A; Tue, 19 Dec 2023 18:55:30 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from <rostedt@goodmis.org>) id 1rFfGX-00000003R2q-2uH4; Tue, 19 Dec 2023 13:56:29 -0500 Message-ID: <20231219185629.467894710@goodmis.org> User-Agent: quilt/0.67 Date: Tue, 19 Dec 2023 13:54:21 -0500 From: Steven Rostedt <rostedt@goodmis.org> To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu <mhiramat@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Mathieu Desnoyers <mathieu.desnoyers@efficios.com>, Andrew Morton <akpm@linux-foundation.org>, Tzvetomir Stoyanov <tz.stoyanov@gmail.com>, Vincent Donnefort <vdonnefort@google.com>, Kent Overstreet <kent.overstreet@gmail.com> Subject: [PATCH v5 07/15] ring-buffer: Do no swap cpu buffers if order is different References: <20231219185414.474197117@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785737839160281573 X-GMAIL-MSGID: 1785737839160281573 |
Series |
ring-buffer/tracing: Allow ring buffer to have bigger sub buffers
|
|
Commit Message
Steven Rostedt
Dec. 19, 2023, 6:54 p.m. UTC
From: "Steven Rostedt (Google)" <rostedt@goodmis.org> As all the subbuffer order (subbuffer sizes) must be the same throughout the ring buffer, check the order of the buffers that are doing a CPU buffer swap in ring_buffer_swap_cpu() to make sure they are the same. If the are not the same, then fail to do the swap, otherwise the ring buffer will think the CPU buffer has a specific subbuffer size when it does not. Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> --- kernel/trace/ring_buffer.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 3c11e8e811ed..fdcd171b09b5 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -5417,6 +5417,9 @@ int ring_buffer_swap_cpu(struct trace_buffer *buffer_a, if (cpu_buffer_a->nr_pages != cpu_buffer_b->nr_pages) goto out; + if (buffer_a->subbuf_order != buffer_b->subbuf_order) + goto out; + ret = -EAGAIN; if (atomic_read(&buffer_a->record_disabled))