From nobody Tue Apr 7 17:40:38 2026 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 2BDD7C433FE for ; Tue, 18 Oct 2022 12:03:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229543AbiJRMDA (ORCPT ); Tue, 18 Oct 2022 08:03:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230191AbiJRMCb (ORCPT ); Tue, 18 Oct 2022 08:02:31 -0400 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37DA1BEAD9 for ; Tue, 18 Oct 2022 05:01:27 -0700 (PDT) Received: by mail-pf1-f196.google.com with SMTP id y8so13821717pfp.13 for ; Tue, 18 Oct 2022 05:01:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L0jiE6G+beoQsyJkTi8DfZte8UyVW5LiFJH4O1RCA1M=; b=BWZQCJZprj6JVgsYTcQNog48I9ZJwgP/Wz/fCjhl7un7cUVrwZohQKq2KlQp3kmO/q podF/tLEfSmUxwLgVM0Ve4C3JoAtuSLsrICofiCOf5HilAuj08LI9I+DBjqq8Dows2jg zJVJq7Y0XWptvGsrfpdIt+ZOsUC8euaneR3/qzwBHlhPgSp8aIdduarVezALTCWP+ckk 8AZRa8gO+fRMCL4C9GTECDlDPYMMKbPNsfyPYGqudjQKojt0NjyDqyjreNVwtQGZTAfl g+bh/rFVb+qyYz3Ech7mB3TVrFFl8FRII8Ay37cpUpnXf1Y6aRLnsxSijwXAbNpebvCU ub0A== X-Gm-Message-State: ACrzQf3S5wkftv3aaVVwL4CN0sYaGG/GiJi4+Y4UXBtbvaEl00z81JVo M0MxZb9j/n8bOmOvJfwpaQ== X-Google-Smtp-Source: AMsMyM6QmN3oiQ60nOFLZVsqEqZaRFYhva+6a+ix3xTcZUqE+KlSRclrXuikvR2XVy6Yqp0QfV3OZw== X-Received: by 2002:a63:2bd5:0:b0:434:ea9a:ace2 with SMTP id r204-20020a632bd5000000b00434ea9aace2mr2357040pgr.323.1666094486975; Tue, 18 Oct 2022 05:01:26 -0700 (PDT) Received: from localhost.localdomain (ns1002484.ip-51-81-243.us. [51.81.243.185]) by smtp.gmail.com with ESMTPSA id v18-20020a634812000000b0043b565cb57csm7893851pga.73.2022.10.18.05.01.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 05:01:26 -0700 (PDT) From: sunliming To: rostedt@goodmis.org, mingo@kernel.org Cc: linux-kernel@vger.kernel.org, kelulanainsley@gmail.com, sunliming Subject: [PATCH 1/5] tracing/histogram: Fix incorrect description in histogram.rst Date: Tue, 18 Oct 2022 20:00:52 +0800 Message-Id: <20221018120056.1321426-2-sunliming@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221018120056.1321426-1-sunliming@kylinos.cn> References: <20221018120056.1321426-1-sunliming@kylinos.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Commit b94bc80df648 ("tracing: Use a no_filter_buffering_ref to stop using = the filter buffer") switch the hist trigger to not use absolute time stamps but left the documents incorrect, fix it. Signed-off-by: sunliming --- Documentation/trace/histogram.rst | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Documentation/trace/histogram.rst b/Documentation/trace/histog= ram.rst index c1b685a38f6b..5eecf2e1c2cc 100644 --- a/Documentation/trace/histogram.rst +++ b/Documentation/trace/histogram.rst @@ -1667,12 +1667,11 @@ features have been added to the hist trigger suppor= t: =20 A note on inter-event timestamps: If common_timestamp is used in a histogram, the trace buffer is automatically switched over to using -absolute timestamps and the "global" trace clock, in order to avoid -bogus timestamp differences with other clocks that aren't coherent -across CPUs. This can be overridden by specifying one of the other -trace clocks instead, using the "clock=3DXXX" hist trigger attribute, -where XXX is any of the clocks listed in the tracing/trace_clock -pseudo-file. +the "global" trace clock, in order to avoid bogus timestamp differences +with other clocks that aren't coherent across CPUs. This can be overridden +by specifying one of the other trace clocks instead, using the "clock=3DXX= X" +hist trigger attribute, where XXX is any of the clocks listed in the +tracing/trace_clock pseudo-file. =20 These features are described in more detail in the following sections. =20 --=20 2.25.1 From nobody Tue Apr 7 17:40:38 2026 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 62FAAC433FE for ; Tue, 18 Oct 2022 12:03:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230347AbiJRMDV (ORCPT ); Tue, 18 Oct 2022 08:03:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230340AbiJRMCq (ORCPT ); Tue, 18 Oct 2022 08:02:46 -0400 Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FF4BBEAED for ; Tue, 18 Oct 2022 05:01:58 -0700 (PDT) Received: by mail-pg1-f193.google.com with SMTP id 128so13122578pga.1 for ; Tue, 18 Oct 2022 05:01:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7ofPP8DVCUsopTN5llp+jQi2rMP9BnaBU/6vKHjTUOE=; b=ILaRob3h/lRFrdVMxChm74zl62XUStfHyuE3OUrqaHBlJriOphaMzyVV7l13w5Ny1j X3BzeqiptJrtycNk9tIClwvA84w6cBIdeTm9kMZBcjDi3T6Nv6rBX4y6L2+Ncl0D1idW Qk1NHYj0BcAH6Mbqxw9AruRfWbra2GYbpNmsFcqnblsFkvOOXfgmzNmYExV8WvKvocTt YiZqYM4Uqdi/zDbFmep+1lO6RWDqB067zG2ZQLxb7CIcSd83/d1f8fneGR4uc6TzifAj wmakD2EhOfsi4QFZEl+MYv04CMYc++BM+kNrLl7ZOuB2/BcOfFsX+m04gIfUQg1W/n7/ VHvg== X-Gm-Message-State: ACrzQf34wbwwZi6FP90fgv7BP3i/GDaaz1JjlZD4e64N5CGmfKAMJIEz 9I9zHmoH29ck1mDezQmOOg== X-Google-Smtp-Source: AMsMyM5kJPnzmyb4W+Q7DJhFvhGRqae42+A/afqISrvgRuSFl63B7nGZo+YcDhdmfkWs/+bdj69rww== X-Received: by 2002:a63:450c:0:b0:443:94a1:3703 with SMTP id s12-20020a63450c000000b0044394a13703mr2272819pga.565.1666094517932; Tue, 18 Oct 2022 05:01:57 -0700 (PDT) Received: from localhost.localdomain (ns1002484.ip-51-81-243.us. [51.81.243.185]) by smtp.gmail.com with ESMTPSA id v18-20020a634812000000b0043b565cb57csm7893851pga.73.2022.10.18.05.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 05:01:57 -0700 (PDT) From: sunliming To: rostedt@goodmis.org, mingo@kernel.org Cc: linux-kernel@vger.kernel.org, kelulanainsley@gmail.com, sunliming Subject: [PATCH 2/5] ring-buffer: Remove absolute timestamp from add_timestamp logic Date: Tue, 18 Oct 2022 20:00:53 +0800 Message-Id: <20221018120056.1321426-3-sunliming@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221018120056.1321426-1-sunliming@kylinos.cn> References: <20221018120056.1321426-1-sunliming@kylinos.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove absolute timestamp from add_timestamp logic. Signed-off-by: sunliming --- kernel/trace/ring_buffer.c | 49 +++++++++++++------------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 199759c73519..ab0aef15f82a 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -436,14 +436,12 @@ struct rb_event_info { * Used for the add_timestamp * NONE * EXTEND - wants a time extend - * ABSOLUTE - the buffer requests all events to have absolute time stamps * FORCE - force a full time stamp. */ enum { RB_ADD_STAMP_NONE =3D 0, RB_ADD_STAMP_EXTEND =3D BIT(1), - RB_ADD_STAMP_ABSOLUTE =3D BIT(2), - RB_ADD_STAMP_FORCE =3D BIT(3) + RB_ADD_STAMP_FORCE =3D BIT(2) }; /* * Used for which event context the event is in. @@ -2832,8 +2830,7 @@ static void rb_add_timestamp(struct ring_buffer_per_c= pu *cpu_buffer, u64 *delta, unsigned int *length) { - bool abs =3D info->add_timestamp & - (RB_ADD_STAMP_FORCE | RB_ADD_STAMP_ABSOLUTE); + bool abs =3D info->add_timestamp & RB_ADD_STAMP_FORCE; =20 if (unlikely(info->delta > (1ULL << 59))) { /* @@ -3435,8 +3432,7 @@ static void check_buffer(struct ring_buffer_per_cpu *= cpu_buffer, if (tail =3D=3D CHECK_FULL_PAGE) { full =3D true; tail =3D local_read(&bpage->commit); - } else if (info->add_timestamp & - (RB_ADD_STAMP_FORCE | RB_ADD_STAMP_ABSOLUTE)) { + } else if (info->add_timestamp & RB_ADD_STAMP_FORCE) { /* Ignore events with absolute time stamps */ return; } @@ -3535,23 +3531,19 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_b= uffer, barrier(); info->ts =3D rb_time_stamp(cpu_buffer->buffer); =20 - if ((info->add_timestamp & RB_ADD_STAMP_ABSOLUTE)) { - info->delta =3D info->ts; + /* + * If interrupting an event time update, we may need an + * absolute timestamp. + * Don't bother if this is the start of a new page (w =3D=3D 0). + */ + if (unlikely(!a_ok || !b_ok || (info->before !=3D info->after && w))) { + info->add_timestamp |=3D RB_ADD_STAMP_FORCE | RB_ADD_STAMP_EXTEND; + info->length +=3D RB_LEN_TIME_EXTEND; } else { - /* - * If interrupting an event time update, we may need an - * absolute timestamp. - * Don't bother if this is the start of a new page (w =3D=3D 0). - */ - if (unlikely(!a_ok || !b_ok || (info->before !=3D info->after && w))) { - info->add_timestamp |=3D RB_ADD_STAMP_FORCE | RB_ADD_STAMP_EXTEND; + info->delta =3D info->ts - info->after; + if (unlikely(test_time_stamp(info->delta))) { + info->add_timestamp |=3D RB_ADD_STAMP_EXTEND; info->length +=3D RB_LEN_TIME_EXTEND; - } else { - info->delta =3D info->ts - info->after; - if (unlikely(test_time_stamp(info->delta))) { - info->add_timestamp |=3D RB_ADD_STAMP_EXTEND; - info->length +=3D RB_LEN_TIME_EXTEND; - } } } =20 @@ -3586,8 +3578,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buf= fer, barrier(); /*E*/ s_ok =3D rb_time_read(&cpu_buffer->before_stamp, &save_before); RB_WARN_ON(cpu_buffer, !s_ok); - if (likely(!(info->add_timestamp & - (RB_ADD_STAMP_FORCE | RB_ADD_STAMP_ABSOLUTE)))) + if (likely(!(info->add_timestamp & RB_ADD_STAMP_FORCE))) /* This did not interrupt any time update */ info->delta =3D info->ts - info->after; else @@ -3644,8 +3635,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buf= fer, * If this is the first commit on the page, then it has the same * timestamp as the page itself. */ - if (unlikely(!tail && !(info->add_timestamp & - (RB_ADD_STAMP_FORCE | RB_ADD_STAMP_ABSOLUTE)))) + if (unlikely(!tail && !(info->add_timestamp & RB_ADD_STAMP_FORCE))) info->delta =3D 0; =20 /* We reserved something on the buffer */ @@ -3698,12 +3688,7 @@ rb_reserve_next_event(struct trace_buffer *buffer, =20 info.length =3D rb_calculate_event_length(length); =20 - if (ring_buffer_time_stamp_abs(cpu_buffer->buffer)) { - add_ts_default =3D RB_ADD_STAMP_ABSOLUTE; - info.length +=3D RB_LEN_TIME_EXTEND; - } else { - add_ts_default =3D RB_ADD_STAMP_NONE; - } + add_ts_default =3D RB_ADD_STAMP_NONE; =20 again: info.add_timestamp =3D add_ts_default; --=20 2.25.1 From nobody Tue Apr 7 17:40:38 2026 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 7E912C4332F for ; Tue, 18 Oct 2022 12:03:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229839AbiJRMDS (ORCPT ); Tue, 18 Oct 2022 08:03:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230347AbiJRMCq (ORCPT ); Tue, 18 Oct 2022 08:02:46 -0400 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 606ADBEAEE for ; Tue, 18 Oct 2022 05:02:01 -0700 (PDT) Received: by mail-pf1-f193.google.com with SMTP id 3so13866614pfw.4 for ; Tue, 18 Oct 2022 05:02:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0jWVRhQ6epTs90NrUPxMtzvO66wlX5P0y7vobtFY478=; b=W2nXKLmnsDHbUSuk2LpzIXUTXX4hUBY3Idwx+XwNAgiW0jpc0HAhVYDMAmOTHhwNqI r0Wz7Sz+dt7K+IXNeSQplJUQ/E3LzQRtJc+jH+J9qYuh62Aracg8H2n5N7ro7R3OXFso qToU/EqXTVhjS3lbQlZCE1B5exdbeevtDLk07FZcbYN5qWMNMDEb5Fw1JNv6WcJOswdM s2chtN7D+LZdqLL+b4fCZogwtx66+Dui17Q0BxiyJfIVa8Yd3pOFWGXbg+8Yh09Hos3M MPGjOMnEexVDCH3vYjA7yHNCFoqrY7Ve/gNSmYZn5UK1QNQVeCcDK2A350b+eaxxF71y 9kYg== X-Gm-Message-State: ACrzQf1p8avJ4Fq3VUbZLGxEZqwU/sdnYCR12bsUgrScUcRnTL9xvpE2 8aElov9QafOI/IObIN9OGQ== X-Google-Smtp-Source: AMsMyM7Exzp+nxEFvLMo9bs7vX/L/rCLKQQpJYWVkCKjUCfsbuhMiCn4kc26F3Bv0fwTuMUUvVRH9A== X-Received: by 2002:a05:6a00:1689:b0:557:9105:cf85 with SMTP id k9-20020a056a00168900b005579105cf85mr2851209pfc.55.1666094520961; Tue, 18 Oct 2022 05:02:00 -0700 (PDT) Received: from localhost.localdomain (ns1002484.ip-51-81-243.us. [51.81.243.185]) by smtp.gmail.com with ESMTPSA id v18-20020a634812000000b0043b565cb57csm7893851pga.73.2022.10.18.05.01.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 05:02:00 -0700 (PDT) From: sunliming To: rostedt@goodmis.org, mingo@kernel.org Cc: linux-kernel@vger.kernel.org, kelulanainsley@gmail.com, sunliming Subject: [PATCH 3/5] ring-buffer: Remove add_ts_default to simplify code Date: Tue, 18 Oct 2022 20:00:54 +0800 Message-Id: <20221018120056.1321426-4-sunliming@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221018120056.1321426-1-sunliming@kylinos.cn> References: <20221018120056.1321426-1-sunliming@kylinos.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The variable add_ts_default is not necessary when absolute timestamp is removed, so remove it to simplify code. Signed-off-by: sunliming --- kernel/trace/ring_buffer.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index ab0aef15f82a..cb261456216f 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -3666,7 +3666,6 @@ rb_reserve_next_event(struct trace_buffer *buffer, struct ring_buffer_event *event; struct rb_event_info info; int nr_loops =3D 0; - int add_ts_default; =20 rb_start_commit(cpu_buffer); /* The commit page can not change after this */ @@ -3688,10 +3687,8 @@ rb_reserve_next_event(struct trace_buffer *buffer, =20 info.length =3D rb_calculate_event_length(length); =20 - add_ts_default =3D RB_ADD_STAMP_NONE; - again: - info.add_timestamp =3D add_ts_default; + info.add_timestamp =3D RB_ADD_STAMP_NONE; info.delta =3D 0; =20 /* --=20 2.25.1 From nobody Tue Apr 7 17:40:38 2026 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 49F5EC43217 for ; Tue, 18 Oct 2022 12:03:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230430AbiJRMD0 (ORCPT ); Tue, 18 Oct 2022 08:03:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230350AbiJRMCq (ORCPT ); Tue, 18 Oct 2022 08:02:46 -0400 Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D085BEAF0 for ; Tue, 18 Oct 2022 05:02:05 -0700 (PDT) Received: by mail-pg1-f195.google.com with SMTP id 129so13106333pgc.5 for ; Tue, 18 Oct 2022 05:02:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6NgxHUHmcB+8+FicHls6Uc9flxwUPewu/G78v6fq4ok=; b=x9ZfN5EnFBUMQrKZHyoN3AUeZXO45hvUj6B/Qo0CmstW88FKV7NHX5eJdcfSkMWjVR 9E+iu1NfbHfmS7ihnVWxVQLwuOcsiyh8+ICvLNbAguT3v71NKB350fSJNKcJagpyxDVN Zgad6uUP/JwD//KqLXhd+FuDTZCTyQYczqVa0IYJ7X1/0hSFbXDUxYiUKzKx3gkX78WR 9Xi4AQbTAan0Qfp5Vm5GQ7vtDMKdTHE2uqBDF1+sFksMJ1dPPZF1xYHF9eSm17sk3yWN zZOAFXdzFHf5TkbprB3vAec93qxsQ24Ras+RwQmmPaVPa6pf5a2Syl0S2DNaTZNHmz7g f/Hg== X-Gm-Message-State: ACrzQf0Acc5871E8d5mgC9yZmrIBBsOTxTEwm4NzyNkJfPrVuEVpW8p1 349zwuDsme2kH5ISkY4mvw== X-Google-Smtp-Source: AMsMyM4RLpd428soF/UsWuvCNIkBQIztp19cpt1dIeWLev60b9OjlQ2522gIufrnPDpx4G1PhU6BZg== X-Received: by 2002:a05:6a00:4093:b0:563:2d96:8f44 with SMTP id bw19-20020a056a00409300b005632d968f44mr2657668pfb.4.1666094524978; Tue, 18 Oct 2022 05:02:04 -0700 (PDT) Received: from localhost.localdomain (ns1002484.ip-51-81-243.us. [51.81.243.185]) by smtp.gmail.com with ESMTPSA id v18-20020a634812000000b0043b565cb57csm7893851pga.73.2022.10.18.05.02.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 05:02:04 -0700 (PDT) From: sunliming To: rostedt@goodmis.org, mingo@kernel.org Cc: linux-kernel@vger.kernel.org, kelulanainsley@gmail.com, sunliming Subject: [PATCH 4/5] tracing: Delete timestamp_mode trace file Date: Tue, 18 Oct 2022 20:00:55 +0800 Message-Id: <20221018120056.1321426-5-sunliming@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221018120056.1321426-1-sunliming@kylinos.cn> References: <20221018120056.1321426-1-sunliming@kylinos.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The timestamp_mode trace file is not necessary duo to the removing of the absolute timestamp. Signed-off-by: sunliming --- Documentation/trace/ftrace.rst | 24 ------------------ kernel/trace/trace.c | 45 ---------------------------------- 2 files changed, 69 deletions(-) diff --git a/Documentation/trace/ftrace.rst b/Documentation/trace/ftrace.rst index 60bceb018d6a..9b4a4e9c1cbd 100644 --- a/Documentation/trace/ftrace.rst +++ b/Documentation/trace/ftrace.rst @@ -615,30 +615,6 @@ of ftrace. Here is a list of some of the key files: =20 See events.rst for more information. =20 - timestamp_mode: - - Certain tracers may change the timestamp mode used when - logging trace events into the event buffer. Events with - different modes can coexist within a buffer but the mode in - effect when an event is logged determines which timestamp mode - is used for that event. The default timestamp mode is - 'delta'. - - Usual timestamp modes for tracing: - - # cat timestamp_mode - [delta] absolute - - The timestamp mode with the square brackets around it is the - one in effect. - - delta: Default timestamp mode - timestamp is a delta against - a per-buffer timestamp. - - absolute: The timestamp is a full timestamp, not a delta - against some other value. As such it takes up more - space and is less efficient. - hwlat_detector: =20 Directory for the Hardware Latency Detector. diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 47a44b055a1d..af8cbcad0bad 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -5494,9 +5494,6 @@ static const char readme_msg[] =3D #ifdef CONFIG_X86_64 " x86-tsc: TSC cycle counter\n" #endif - "\n timestamp_mode\t- view the mode used to timestamp events\n" - " delta: Delta difference against a buffer-wide timestamp\n" - " absolute: Absolute (standalone) timestamp\n" "\n trace_marker\t\t- Writes into this file writes into the kernel buffe= r\n" "\n trace_marker_raw\t\t- Writes into this file writes binary data into = the kernel buffer\n" " tracing_cpumask\t- Limit which CPUs to trace\n" @@ -7319,38 +7316,6 @@ static int tracing_clock_open(struct inode *inode, s= truct file *file) return ret; } =20 -static int tracing_time_stamp_mode_show(struct seq_file *m, void *v) -{ - struct trace_array *tr =3D m->private; - - mutex_lock(&trace_types_lock); - - if (ring_buffer_time_stamp_abs(tr->array_buffer.buffer)) - seq_puts(m, "delta [absolute]\n"); - else - seq_puts(m, "[delta] absolute\n"); - - mutex_unlock(&trace_types_lock); - - return 0; -} - -static int tracing_time_stamp_mode_open(struct inode *inode, struct file *= file) -{ - struct trace_array *tr =3D inode->i_private; - int ret; - - ret =3D tracing_check_open_get_tr(tr); - if (ret) - return ret; - - ret =3D single_open(file, tracing_time_stamp_mode_show, inode->i_private); - if (ret < 0) - trace_array_put(tr); - - return ret; -} - u64 tracing_event_time_stamp(struct trace_buffer *buffer, struct ring_buff= er_event *rbe) { if (rbe =3D=3D this_cpu_read(trace_buffered_event)) @@ -7643,13 +7608,6 @@ static const struct file_operations trace_clock_fops= =3D { .write =3D tracing_clock_write, }; =20 -static const struct file_operations trace_time_stamp_mode_fops =3D { - .open =3D tracing_time_stamp_mode_open, - .read =3D seq_read, - .llseek =3D seq_lseek, - .release =3D tracing_single_release_tr, -}; - #ifdef CONFIG_TRACER_SNAPSHOT static const struct file_operations snapshot_fops =3D { .open =3D tracing_snapshot_open, @@ -9580,9 +9538,6 @@ init_tracer_tracefs(struct trace_array *tr, struct de= ntry *d_tracer) trace_create_file("tracing_on", TRACE_MODE_WRITE, d_tracer, tr, &rb_simple_fops); =20 - trace_create_file("timestamp_mode", TRACE_MODE_READ, d_tracer, tr, - &trace_time_stamp_mode_fops); - tr->buffer_percent =3D 50; =20 trace_create_file("buffer_percent", TRACE_MODE_READ, d_tracer, --=20 2.25.1 From nobody Tue Apr 7 17:40:38 2026 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 10781C433FE for ; Tue, 18 Oct 2022 12:03:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230451AbiJRMDk (ORCPT ); Tue, 18 Oct 2022 08:03:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230303AbiJRMC5 (ORCPT ); Tue, 18 Oct 2022 08:02:57 -0400 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E858CE22 for ; Tue, 18 Oct 2022 05:02:53 -0700 (PDT) Received: by mail-pf1-f196.google.com with SMTP id 3so13868664pfw.4 for ; Tue, 18 Oct 2022 05:02:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2H25EslXoLm9NA6np/ZGYDcJiS+NnA+nx4L/XVPPvjI=; b=Y00ldFc/sSnQfZYYDt7aGs+O4XQJUQV6IeiYc2OiI8UVelOxaz/esfI5FSWXU3VKNx WVzQGcmhSByRaP8vqFkEUw8AF5YwK2JtNlmgRgZUkMcwRniAPw5mDlkOy5xOqgh2WK7a CTbGGDSZk6dk0zM/71dNdz0T7oE+cggEG8f/lkFHs2EoP1lrl4pA00hVctjW1UfjbDxo kqqob4qxMZf2BYvUtZOLW0ciwLaS6JLclu5JfKVJJQyeBw8c/LBpExWzWxfEKc4lQEJk KU8qVE9i0Mmus3GyZa+z4aUj8FFm/NDemrKbVODF9M/jIEqELoI1mS4wAAKtZY8/M4Ac 5P1Q== X-Gm-Message-State: ACrzQf0ch5YvcTUbV2S7pU/ikS29j2Wn84OQgpU880mC6VEPDYrFrPcP Xqu8dOaUUPO0vHdIRpmwGQ== X-Google-Smtp-Source: AMsMyM6xASfErJnpjelEQ975LhMjTaj8jM0UqqPs2qjW50x5DyaezB7TaYz5sk09408asoycokcjxQ== X-Received: by 2002:a05:6a00:124e:b0:565:ba3c:58bf with SMTP id u14-20020a056a00124e00b00565ba3c58bfmr2622233pfi.82.1666094573180; Tue, 18 Oct 2022 05:02:53 -0700 (PDT) Received: from localhost.localdomain (ns1002484.ip-51-81-243.us. [51.81.243.185]) by smtp.gmail.com with ESMTPSA id v18-20020a634812000000b0043b565cb57csm7893851pga.73.2022.10.18.05.02.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 05:02:52 -0700 (PDT) From: sunliming To: rostedt@goodmis.org, mingo@kernel.org Cc: linux-kernel@vger.kernel.org, kelulanainsley@gmail.com, sunliming Subject: [PATCH 5/5] ring-buffer: Delete interface for setting absolute time stamps Date: Tue, 18 Oct 2022 20:00:56 +0800 Message-Id: <20221018120056.1321426-6-sunliming@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221018120056.1321426-1-sunliming@kylinos.cn> References: <20221018120056.1321426-1-sunliming@kylinos.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Commit efe6196a6bc5 ("ring-buffer: Allow ring_buffer_event_time_stamp() to return time stamp of all events") make ring_buffer_event_time_stamp() have the ability to return time stamp of all events. And there is no user about this interface. So remove it. Signed-off-by: sunliming --- include/linux/ring_buffer.h | 2 -- kernel/trace/ring_buffer.c | 11 ----------- 2 files changed, 13 deletions(-) diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index 2504df9a0453..b7bcf2ee0945 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -186,8 +186,6 @@ void ring_buffer_normalize_time_stamp(struct trace_buff= er *buffer, int cpu, u64 *ts); void ring_buffer_set_clock(struct trace_buffer *buffer, u64 (*clock)(void)); -void ring_buffer_set_time_stamp_abs(struct trace_buffer *buffer, bool abs); -bool ring_buffer_time_stamp_abs(struct trace_buffer *buffer); =20 size_t ring_buffer_nr_pages(struct trace_buffer *buffer, int cpu); size_t ring_buffer_nr_dirty_pages(struct trace_buffer *buffer, int cpu); diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index cb261456216f..68947652e46d 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -551,7 +551,6 @@ struct trace_buffer { u64 (*clock)(void); =20 struct rb_irq_work irq_work; - bool time_stamp_abs; }; =20 struct ring_buffer_iter { @@ -1876,16 +1875,6 @@ void ring_buffer_set_clock(struct trace_buffer *buff= er, buffer->clock =3D clock; } =20 -void ring_buffer_set_time_stamp_abs(struct trace_buffer *buffer, bool abs) -{ - buffer->time_stamp_abs =3D abs; -} - -bool ring_buffer_time_stamp_abs(struct trace_buffer *buffer) -{ - return buffer->time_stamp_abs; -} - static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer); =20 static inline unsigned long rb_page_entries(struct buffer_page *bpage) --=20 2.25.1