From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46BC6C4332F for ; Wed, 13 Dec 2023 00:34:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377839AbjLMAei (ORCPT ); Tue, 12 Dec 2023 19:34:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232683AbjLMAeg (ORCPT ); Tue, 12 Dec 2023 19:34:36 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B95E94 for ; Tue, 12 Dec 2023 16:34:43 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56BC1C433CA; Wed, 13 Dec 2023 00:34:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702427682; bh=/ISph84pf0nDZCF1PN/J4y6GYDwltF6+GD1dyW4BTAw=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=sNTL2WylqR2XS7e09Ednj0KkXPDi9k2B4n7+HmnIInUZZdW9h4S/HxEIfWO1yuEFR zpOdVjvNVQCMPz+R9OAN0QzBI76nZZ+LbMlWYPbYUxGLiM55UcSiS4YSzDYDI+sQ/U Tll5LhxGIcf1PUiXANdRW+ZCAc0Hsx+LtFjDbtbjc16KEK0KXMIOagMu/RTBbNXtn+ ezMXpwz6WHXiFlVTkdYfF5Nx+18g50qV5j38soNtXRFlsaVkVIic5XcDkifQnz8kBP SqlDEXtXBcUCnhZHwLb/4+IB+F0sERTOCbjZMJuvotfhF5Yk1bb4sj4llXhrlyHNQ5 7Hk/JyTU9Gnmg== Date: Wed, 13 Dec 2023 09:34:39 +0900 From: Masami Hiramatsu (Google) To: Steven Rostedt Cc: LKML , Linux Trace Kernel , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers Subject: Re: [PATCH] ring-buffer: Do not update before stamp when switching sub-buffers Message-Id: <20231213093439.9c14b3dd0ac09d92aea70ec1@kernel.org> In-Reply-To: <20231211114420.36dde01b@gandalf.local.home> References: <20231211114420.36dde01b@gandalf.local.home> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 11 Dec 2023 11:44:20 -0500 Steven Rostedt wrote: > From: "Steven Rostedt (Google)" > > The ring buffer timestamps are synchronized by two timestamp placeholders. > One is the "before_stamp" and the other is the "write_stamp" (sometimes > referred to as the "after stamp" but only in the comments. These two > stamps are key to knowing how to handle nested events coming in with a > lockless system. > > When moving across sub-buffers, the before stamp is updated but the write > stamp is not. There's an effort to put back the before stamp to something > that seems logical in case there's nested events. But as the current event > is about to cross sub-buffers, and so will any new nested event that happens, > updating the before stamp is useless, and could even introduce new race > conditions. > > The first event on a sub-buffer simply uses the sub-buffer's timestamp > and keeps a "delta" of zero. The "before_stamp" and "write_stamp" are not > used in the algorithm in this case. There's no reason to try to fix the > before_stamp when this happens. > > As a bonus, it removes a cmpxchg() when crossing sub-buffers! > Looks good to me. Reviewed-by: Masami Hiramatsu (Google) Thank you > Cc: stable@vger.kernel.org > Fixes: a389d86f7fd09 ("ring-buffer: Have nested events still record running time stamp") > Signed-off-by: Steven Rostedt (Google) > --- > kernel/trace/ring_buffer.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c > index 2596fa7b748a..02bc9986fe0d 100644 > --- a/kernel/trace/ring_buffer.c > +++ b/kernel/trace/ring_buffer.c > @@ -3607,14 +3607,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer, > > /* See if we shot pass the end of this buffer page */ > if (unlikely(write > BUF_PAGE_SIZE)) { > - /* before and after may now different, fix it up*/ > - b_ok = rb_time_read(&cpu_buffer->before_stamp, &info->before); > - a_ok = rb_time_read(&cpu_buffer->write_stamp, &info->after); > - if (a_ok && b_ok && info->before != info->after) > - (void)rb_time_cmpxchg(&cpu_buffer->before_stamp, > - info->before, info->after); > - if (a_ok && b_ok) > - check_buffer(cpu_buffer, info, CHECK_FULL_PAGE); > + check_buffer(cpu_buffer, info, CHECK_FULL_PAGE); > return rb_move_tail(cpu_buffer, tail, info); > } > > -- > 2.42.0 > -- Masami Hiramatsu (Google)