From patchwork Thu Dec 7 22:31:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 175463 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5102797vqy; Thu, 7 Dec 2023 14:31:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IGGWBJ3cWNzn+FO1thFL8Xuu7hN2SJKKobI9H7Tsahjedl6TG27BPCLNimvfbYdt5tMQNAH X-Received: by 2002:a05:6a20:26a8:b0:18b:8dfa:8895 with SMTP id h40-20020a056a2026a800b0018b8dfa8895mr2643384pze.17.1701988305265; Thu, 07 Dec 2023 14:31:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701988305; cv=none; d=google.com; s=arc-20160816; b=zunhGWCxKKPShDD1iV+Tw9u7x0JUtq0ESSEtMtKKyafVcyYgxWhLlLrDWOhieJ/aup 2joOLh/uANoNy/q8/rCPhiMa3EavG29+qPS9GiworzHE34iwLcAsQqvgovNYIVzL5mwp cXv+C1C2MZKFEIxNsV2RkDznpqLXdkqQHmP9ub6OGRqJCQD26hUDI9G/l5yefubR0AWG 4M5+kgNELJGZajvYn2GUlsPrOHzX5PtLfRX3ABt1UZYirh0v6wuT3mLZ/b876ArZD+uT Jr6LFBxc2h1toGi49tIKTSpz28I7d0qLOKuIOBQt7w6ZCgWkavXuSb+seXJI73HYghLQ gHbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:subject:cc:to:from:date; bh=oGBAdrz8wR24XuAXUbP7SS3gM/zhQ2aWWkN0BlfZi5I=; fh=R8JZsVKDlS7lXIAvTNV55bsjlDBI0i4sqiOYXO4tZQA=; b=YT14xErPdPf0tqe/id9Lz5YT/3J9YLJEZL0eZDPu7B8EEbzSmBRAiABl42LS8QkuoE TkwftuL3RRfUFUBWDjs2i93KQofe+Cn0RFJ7zdRBG5zjrWGfoHfjrdIjvyMS813HAyCW QvQE5sH3vNZ4ksxJi3GSqoaeoi4gI8VKqn7W5F7Kn59I9hqk7E5+AWXGKYXqpCPRXyPx rZJ0VFpjhWBP/SL5CvujuG8prp3FAwM5JoNfi8SB5MoYR+v6tf5ib7pNRUmFTk7BZGsf QXv1yJ3CNhHzw9Eg7auNKAHw7278CWqNUp239TBLEZlpPIfq+6vNBAla6B9I71US7/GC FJhA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id r22-20020a62e416000000b006ce06fc9968si378920pfh.233.2023.12.07.14.31.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 14:31:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 51C578079CA0; Thu, 7 Dec 2023 14:30:51 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231461AbjLGWae (ORCPT + 99 others); Thu, 7 Dec 2023 17:30:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229634AbjLGWac (ORCPT ); Thu, 7 Dec 2023 17:30:32 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23D70BA for ; Thu, 7 Dec 2023 14:30:39 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 24756C433C8; Thu, 7 Dec 2023 22:30:38 +0000 (UTC) Date: Thu, 7 Dec 2023 17:31:08 -0500 From: Steven Rostedt To: LKML , Linux Trace Kernel Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers Subject: [PATCH v2] ring-buffer: Add offset of events in dump on mismatch Message-ID: <20231207173108.484b912c@gandalf.local.home> X-Mailer: Claws Mail 3.19.1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 07 Dec 2023 14:30:51 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784663100284325647 X-GMAIL-MSGID: 1784664089102580983 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) Acked-by: Masami Hiramatsu (Google) --- 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: