From patchwork Thu Dec 7 22:16:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 175454 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5096330vqy; Thu, 7 Dec 2023 14:16:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IF0I1B+gCOLt2fRMEWXKu6HWlnWuwZ2hzm6SwNRRzrN20ZWFCuNj8ojOn6dT9D3ajSWEnUH X-Received: by 2002:a17:90a:d40e:b0:282:d080:feed with SMTP id r14-20020a17090ad40e00b00282d080feedmr2946495pju.40.1701987362118; Thu, 07 Dec 2023 14:16:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701987362; cv=none; d=google.com; s=arc-20160816; b=cNdNf+rdKvxwYYIucjc3DcW3ZYKIk58T2sTEQ5eIL88jQIf3pMGYKas3efOuDE8mGM kPRVAD7Bn9re/tKwAZ1RqG8GCO+u9tYV8S3Fiq3Jid3f/OLsrq/V80C5hiaQmJ1GlJtL abBDW+ifuPV63pIt+BTwZXrj62rHlq1ajnrHXV3Xsq6Mv7I5bOBK6N7p8aFleqvHzkVY xtrkNXz4X+v9Rmr8XtmtYkzirrGeiKmQFcFCRwcjmmIGIKNCImgMuxH3XUK5EAi+F4PO Alkft8pS3wYGrRgJW2wHWjbInpowOJgZC7JuPuqvhCGezrVuxk27t2w/lMk+kdMCaKmV Su4A== 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=YdQnkrJPZPSgMmxsHkfThO0UNuMSAXfrsuPkQYvGcUc=; fh=R8JZsVKDlS7lXIAvTNV55bsjlDBI0i4sqiOYXO4tZQA=; b=kLpBXP1SK4+J/nlgkB/NwA0BsiN/1CCiwYaKZY3I1t/Nij8SK4o7oVW1xPmXOi9NMJ MknCB19VqDxYwsetMx1NOL1H1/wYCV83J6gBgE7fXgXEsoJUSAZy9bhiOdXdFhx8F1g8 /88+s07uJSVI5hrhy6bV5ul7SpXDTMaH9OaFd1YAvesPKGkx/QEug02oa3w/24bcruPF uvMo0GjCHkzBOylZ99UJfPX2lPs36s9Twc4k0lJsPtFC9XkXZWtDZWE6lFApmFLOkW9H WSOz51mkFRwfmHzT4YZ1OHVJFDLmLPBNtYQCKWRioo4yz+7N72qhAr8W9KXKIfxfdjoG 6gSA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id x22-20020a17090aca1600b002887c3b5617si1806430pjt.58.2023.12.07.14.16.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 14:16:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 85A108526814; Thu, 7 Dec 2023 14:15:59 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1444062AbjLGWPk (ORCPT + 99 others); Thu, 7 Dec 2023 17:15:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232521AbjLGWPj (ORCPT ); Thu, 7 Dec 2023 17:15:39 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E066610DE for ; Thu, 7 Dec 2023 14:15:44 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E485CC433C7; Thu, 7 Dec 2023 22:15:43 +0000 (UTC) Date: Thu, 7 Dec 2023 17:16:13 -0500 From: Steven Rostedt To: LKML , Linux Trace Kernel Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers Subject: [PATCH] ring-buffer: Add offset of events in dump on mismatch Message-ID: <20231207171613.0592087d@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 howler.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 (howler.vger.email [0.0.0.0]); Thu, 07 Dec 2023 14:15:59 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784663100284325647 X-GMAIL-MSGID: 1784663100284325647 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) --- 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..b10deb8a5647 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(" %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(" %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(" %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(" %x: [%lld] delta:%d\n", + e, ts, event->time_delta); break; default: