From mboxrd@z Thu Jan 1 00:00:00 1970 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 6363A14A89 for ; Fri, 8 Dec 2023 11:07:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TFx7SVah" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64603C433C7; Fri, 8 Dec 2023 11:07:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702033662; bh=FOXTguR/9YRg7/ngZ594YyeO27u4zSeFjK8XdGbtK6s=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=TFx7SVahayfgCB5aSPjSUK4La85oKQauc0/m9Awlm5xYRnHGDmJPAsVds/YsHMtez NKyjWBlznIIO2MVvC8yNILoSmB6asBGXGhQ5FTS9ahUWwJE7EEEccZQwG+Pg28Vxfl eoCL9JC2OMpV6gyjuH2zJGJ6XetuUrh9hbrDnddIWP1WibFUEbFEaxjcfPeOzkKlLr TguUEvYrwIfr2LJYKY3w1yPHP7uhawsSp5msNH0ljyMwm95paf858FVtEqg/tH49CY zHzT5ynIJctjZWtlrt6s/WdgMew713nxXTzv7YZGGxUv9pj/kaR9xQbztcT0Lb29BE OpKEgGMQaNn0Q== Date: Fri, 8 Dec 2023 20:07:38 +0900 From: Masami Hiramatsu (Google) To: Steven Rostedt Cc: LKML , Linux Trace Kernel , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers Subject: Re: [PATCH v2] ring-buffer: Add offset of events in dump on mismatch Message-Id: <20231208200738.8931aef2857866baf469505a@kernel.org> In-Reply-To: <20231207173108.484b912c@gandalf.local.home> References: <20231207173108.484b912c@gandalf.local.home> X-Mailer: Sylpheed 3.7.0 (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 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Thu, 7 Dec 2023 17:31:08 -0500 Steven Rostedt wrote: > From: "Steven Rostedt (Google)" > > On bugs that have the ring buffer timestamp get out of sync, the config > CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS, that checks for it and if it is > detected it causes a dump of the bad sub buffer. > > It shows each event and their timestamp as well as the delta in the event. > But it's also good to see the offset into the subbuffer for that event to > know if how close to the end it is. > > Signed-off-by: Steven Rostedt (Google) Looks good to me. Acked-by: Masami Hiramatsu (Google) Thanks! > --- > Changes since v1: https://lore.kernel.org/linux-trace-kernel/20231207171613.0592087d@gandalf.local.home > > - Add "0x" before the "%x" to make the print less confusing (Mathieu Desnoyers) > > kernel/trace/ring_buffer.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c > index 8d2a4f00eca9..09d4b1aa8820 100644 > --- a/kernel/trace/ring_buffer.c > +++ b/kernel/trace/ring_buffer.c > @@ -3424,23 +3424,27 @@ static void dump_buffer_page(struct buffer_data_page *bpage, > case RINGBUF_TYPE_TIME_EXTEND: > delta = rb_event_time_stamp(event); > ts += delta; > - pr_warn(" [%lld] delta:%lld TIME EXTEND\n", ts, delta); > + pr_warn(" 0x%x: [%lld] delta:%lld TIME EXTEND\n", > + e, ts, delta); > break; > > case RINGBUF_TYPE_TIME_STAMP: > delta = rb_event_time_stamp(event); > ts = rb_fix_abs_ts(delta, ts); > - pr_warn(" [%lld] absolute:%lld TIME STAMP\n", ts, delta); > + pr_warn(" 0x%x: [%lld] absolute:%lld TIME STAMP\n", > + e, ts, delta); > break; > > case RINGBUF_TYPE_PADDING: > ts += event->time_delta; > - pr_warn(" [%lld] delta:%d PADDING\n", ts, event->time_delta); > + pr_warn(" 0x%x: [%lld] delta:%d PADDING\n", > + e, ts, event->time_delta); > break; > > case RINGBUF_TYPE_DATA: > ts += event->time_delta; > - pr_warn(" [%lld] delta:%d\n", ts, event->time_delta); > + pr_warn(" 0x%x: [%lld] delta:%d\n", > + e, ts, event->time_delta); > break; > > default: > -- > 2.42.0 > -- Masami Hiramatsu (Google)