From patchwork Mon Dec 11 16:59:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 13487694 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 D0A733B785 for ; Mon, 11 Dec 2023 16:59:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0FE0C433C7; Mon, 11 Dec 2023 16:59:09 +0000 (UTC) Date: Mon, 11 Dec 2023 11:59:49 -0500 From: Steven Rostedt To: LKML , Linux Trace Kernel Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers Subject: [PATCH] ring-buffer: Never use absolute timestamp for start event Message-ID: <20231211115949.4692e429@gandalf.local.home> X-Mailer: Claws Mail 3.19.1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: "Steven Rostedt (Google)" On 32bit machines, the 64 bit timestamps are broken up into 32 bit words to keep from using local64_cmpxchg(), as that is very expensive on 32 bit architectures. On 32 bit architectures, reading these timestamps can happen in a middle of an update. In this case, the read returns "false", telling the caller that the timestamp is in the middle of an update, and it needs to assume it is corrupted. The code then accommodates this. When first reserving space on the ring buffer, a "before_stamp" and "write_stamp" are read. If they do not match, or if either is in the process of being updated (false was returned from the read), an absolute timestamp is added and the delta is not used, as that requires reading theses timestamps without being corrupted. The one case that this does not matter is if the event is the first event on the sub-buffer, in which case, the event uses the sub-buffer's timestamp and doesn't need the other stamps for calculating them. After some work to consolidate the code, if the before or write stamps are in the process of updating, an absolute timestamp will be added regardless if the event is the first event on the sub-buffer. This is wrong as it should not care about the success of these reads if it is the first event on the sub-buffer. Fix up the parenthesis so that even if the timestamps are corrupted, if the event is the first event on the sub-buffer (w == 0) it still does not force an absolute timestamp. Cc: stable@vger.kernel.org Fixes: 58fbc3c63275c ("ring-buffer: Consolidate add_timestamp to remove some branches") Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ring_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 02bc9986fe0d..bc70cb9bbdb7 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -3584,7 +3584,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer, * absolute timestamp. * Don't bother if this is the start of a new page (w == 0). */ - if (unlikely(!a_ok || !b_ok || (info->before != info->after && w))) { + if (unlikely((!a_ok || !b_ok || info->before != info->after) && w)) { info->add_timestamp |= RB_ADD_STAMP_FORCE | RB_ADD_STAMP_EXTEND; info->length += RB_LEN_TIME_EXTEND; } else {