From patchwork Tue Oct 18 12:00:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sunliming X-Patchwork-Id: 4136 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1921002wrs; Tue, 18 Oct 2022 05:05:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4d+e2DIm1nQDozMLrmcGTME+6OyZUNXYH+Y6wxZK8U/yTyyCQHeHG94a9M30SD9wubh/b/ X-Received: by 2002:a50:fc0a:0:b0:458:73c0:7e04 with SMTP id i10-20020a50fc0a000000b0045873c07e04mr2226473edr.270.1666094723689; Tue, 18 Oct 2022 05:05:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666094723; cv=none; d=google.com; s=arc-20160816; b=H/ixU0CeCIOCyiRoM0ZeCkhhb+30Lyn5vmsv1r3NCxcyIdE8kJrKkZTilDhpxh7lZ/ SYpGUD9On4vpHU9yzKusb59glPJ4wXYy+fkhqtYHiX6ndhxwcwBE0nAMZ4vp+GuDlHfJ ecZzGRnmqJXEZHZsUVYygH0jyGLwLwLju0QtQNlowE8qjoHDqjzd+MLEiSlF4oemzGAk Mdr3V4j6fxlPgp+1JSey27vkL0COAiRCWELgB0WE4E6jV6FHBle7XGgqk/1AkQwqDYnh ORQywHLqGLlt4ycdLCiV9puq3FQFRcxjhjy1onVi42TDsHon5faF+EUMB9N2u7hawBHQ RTmA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=L0jiE6G+beoQsyJkTi8DfZte8UyVW5LiFJH4O1RCA1M=; b=CWEonZW5kKc5EH0o+1mfmMiffEjnfVtVdw/m63cOQaldmNog1WWwkXVDb+Nz69WSuS hENxscsXPm0qCP7JRXgnq3Xi1qPOPEwzrEwIfGNGEABlsjQNUEWA3eltT/YlraAuDDA+ NM7ZEg3XVZ2c5UbHcqfOHSXhl6yVSX5GKV4/yuRMWLKs9+aHGL1j70pICatR5MrH42M2 94KXhXZSqEOTCxXgY6ZavrOdlicfhqPm++lCPSUM+gzZ06uSuTrfOjkij8CBgCMGdrA2 AKqiZTnIS4hTTLxmOEFJvUFYV8lIo7hDTYqFFtPg8RT2Aodnj6hXLr9HM9+Zl8u5748J QD6g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cw10-20020a170906478a00b0078db89b526asi12447460ejc.108.2022.10.18.05.04.51; Tue, 18 Oct 2022 05:05:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230304AbiJRMC6 (ORCPT + 99 others); Tue, 18 Oct 2022 08:02:58 -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-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 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747026940957872900?= X-GMAIL-MSGID: =?utf-8?q?1747026940957872900?= 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/histogram.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 support: 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=XXX" 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=XXX" +hist trigger attribute, where XXX is any of the clocks listed in the +tracing/trace_clock pseudo-file. These features are described in more detail in the following sections. From patchwork Tue Oct 18 12:00:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sunliming X-Patchwork-Id: 4138 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1921772wrs; Tue, 18 Oct 2022 05:06:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6GBEo4pvk49+a5FzRPhs2JZO0+YCe0dJR+a5KzPYGCTlqqO1oTzakNgsf3YNffh91XI0rz X-Received: by 2002:a17:907:60d3:b0:78d:f874:3267 with SMTP id hv19-20020a17090760d300b0078df8743267mr2086615ejc.409.1666094809011; Tue, 18 Oct 2022 05:06:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666094809; cv=none; d=google.com; s=arc-20160816; b=F2kdnCATt14eawjIlC0LFNZhcXpXfVgqaBKNC8w4RqfFG2MHKyneqnDTUNZ1TEejJY LSYu+ecZ8q3UmOwlaP87VGXRMiF449vLE6WKomsWqTd2AjbRUEQe13msBJm1kCqO0Bo/ FEUhednTT8yKYFF/nDa6cFUVipr8lXcRjPNkqi2vHL54rdRsPVADHeL4DiQ2YkvZn1Q/ 9CsNI4WuT92IdhKpt8ucfQFg0k6LPaxICJ/NhOM/mN5rXrXfDob9KZNV2A/+GOLn7WXE 8IGrom1EdXfrEjVbinEfWceEVcLzs+1jxRVsrj8bHKQyR8hjfJSAY29xf/wcgb49dpDr 8aYQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=7ofPP8DVCUsopTN5llp+jQi2rMP9BnaBU/6vKHjTUOE=; b=b6kjHmtGkIGYaAYMc7QvP6v0gPbclZW06LzlX/a61obzjvxk6kqL31AFD3cNix6js/ +i7iceSjVlUnkaq9cV6DEagQXtZtmDUiZQ9QejYa87oh6NAUTLJekBdl9oA4QM2Yfsgv sFbB5Ub+aMaap74IqdvXrrKcsEe0T7UZlyJYpno02hNFZm9kAv3qTAUhFkpqHB7SHwlj t88sWbtwei4OEq/pjFx//vhT7hyIHDjM+PQkYECyZDMyeICqdg/En/Nssb2mn5vGS4V4 a4r462FYMNspZ0sOUtZNgLTiHTc0jgJXgfrW04nSGFeFqYvb0VSVDKZC4eZPU0A8GyAw c4jw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gb38-20020a170907962600b0078261fd56efsi12378426ejc.571.2022.10.18.05.06.23; Tue, 18 Oct 2022 05:06:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229930AbiJRMDV (ORCPT + 99 others); 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-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 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747027030064569363?= X-GMAIL-MSGID: =?utf-8?q?1747027030064569363?= 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 = 0, RB_ADD_STAMP_EXTEND = BIT(1), - RB_ADD_STAMP_ABSOLUTE = BIT(2), - RB_ADD_STAMP_FORCE = BIT(3) + RB_ADD_STAMP_FORCE = BIT(2) }; /* * Used for which event context the event is in. @@ -2832,8 +2830,7 @@ static void rb_add_timestamp(struct ring_buffer_per_cpu *cpu_buffer, u64 *delta, unsigned int *length) { - bool abs = info->add_timestamp & - (RB_ADD_STAMP_FORCE | RB_ADD_STAMP_ABSOLUTE); + bool abs = info->add_timestamp & RB_ADD_STAMP_FORCE; if (unlikely(info->delta > (1ULL << 59))) { /* @@ -3435,8 +3432,7 @@ static void check_buffer(struct ring_buffer_per_cpu *cpu_buffer, if (tail == CHECK_FULL_PAGE) { full = true; tail = 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_buffer, barrier(); info->ts = rb_time_stamp(cpu_buffer->buffer); - if ((info->add_timestamp & RB_ADD_STAMP_ABSOLUTE)) { - info->delta = 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 == 0). + */ + if (unlikely(!a_ok || !b_ok || (info->before != info->after && w))) { + info->add_timestamp |= RB_ADD_STAMP_FORCE | RB_ADD_STAMP_EXTEND; + info->length += 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 == 0). - */ - if (unlikely(!a_ok || !b_ok || (info->before != info->after && w))) { - info->add_timestamp |= RB_ADD_STAMP_FORCE | RB_ADD_STAMP_EXTEND; + info->delta = info->ts - info->after; + if (unlikely(test_time_stamp(info->delta))) { + info->add_timestamp |= RB_ADD_STAMP_EXTEND; info->length += RB_LEN_TIME_EXTEND; - } else { - info->delta = info->ts - info->after; - if (unlikely(test_time_stamp(info->delta))) { - info->add_timestamp |= RB_ADD_STAMP_EXTEND; - info->length += RB_LEN_TIME_EXTEND; - } } } @@ -3586,8 +3578,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer, barrier(); /*E*/ s_ok = 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 = info->ts - info->after; else @@ -3644,8 +3635,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer, * 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 = 0; /* We reserved something on the buffer */ @@ -3698,12 +3688,7 @@ rb_reserve_next_event(struct trace_buffer *buffer, info.length = rb_calculate_event_length(length); - if (ring_buffer_time_stamp_abs(cpu_buffer->buffer)) { - add_ts_default = RB_ADD_STAMP_ABSOLUTE; - info.length += RB_LEN_TIME_EXTEND; - } else { - add_ts_default = RB_ADD_STAMP_NONE; - } + add_ts_default = RB_ADD_STAMP_NONE; again: info.add_timestamp = add_ts_default; From patchwork Tue Oct 18 12:00:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sunliming X-Patchwork-Id: 4134 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1920597wrs; Tue, 18 Oct 2022 05:04:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7aG0WdQ0L7f1CPYbzdR36nAPcQldN1B3ooreUMxl4e5Mx306dFTosAOaF/T+IY1vf6uMA5 X-Received: by 2002:a17:902:e8c3:b0:177:f078:7871 with SMTP id v3-20020a170902e8c300b00177f0787871mr2712242plg.90.1666094687283; Tue, 18 Oct 2022 05:04:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666094687; cv=none; d=google.com; s=arc-20160816; b=SsbjMdPy6ofGHOIyn+X+wgT4t+o4dmfZTDFXzcD25eQxer4YJ6l5fhoaxPeUXRw3cr PMTSfEliTbsN773RbsdCXSY5VXw8VEQtv0h5Qp3QAXyTpvXg36mGcTvljKoD5d1A1wMO w69VhwNh1RjVEO7hxTKH9m6vzuoHUvR/b8/F4az3tSkHrSfJa4KmU3aT6Rd2QcqXO6fy kDgSKSiJZmRGlwjQEozNeg3dRZjb+PKBf8s8PeBfpQNb2R7NCZhlbGhJsC7ImqsMO1pr NVVW2EkfiD08lm+9+8Y2NcvcT5tpPzUIgdaig4Ij0Rf9PSmkaKZ0BIhZnrwlN2R8AVjU f6Aw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0jWVRhQ6epTs90NrUPxMtzvO66wlX5P0y7vobtFY478=; b=wIxnuSHHmfwFiVbyyr1hszcacMkReGbLPxM4pGivFBwdHnXPKuFkQBW2e7TP9Ga7m9 FWVERBKdHKG46ofz0zXJmWjREtOB1rnY9RKUQ8t52WUF1whAKvAzE72oBwF6mGEcq9Vj cba5b9mVKCLHsOcT9x08ruojXTql4AGo8m9okkQFIWPX9ifiyltv1tgSmJTl47pMPyPZ SJFO0Fg1djE1xIMbllrGKxKQdlDfKniXPuzPCPxLhLM+YTyx+toCuUlXws/jITaQIa5l 7rcF/Pl3yW9PPkYa3at+zAcnucFMqmO0LjHmjtmYPmDTHFdm94oPDxvBxhaB6Axy36WT qQsw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d2-20020a056a0010c200b0055f8c0018b0si15142910pfu.288.2022.10.18.05.04.29; Tue, 18 Oct 2022 05:04:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229535AbiJRMDS (ORCPT + 99 others); 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-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 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747026902871363948?= X-GMAIL-MSGID: =?utf-8?q?1747026902871363948?= 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 = 0; - int add_ts_default; 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, info.length = rb_calculate_event_length(length); - add_ts_default = RB_ADD_STAMP_NONE; - again: - info.add_timestamp = add_ts_default; + info.add_timestamp = RB_ADD_STAMP_NONE; info.delta = 0; /* From patchwork Tue Oct 18 12:00:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sunliming X-Patchwork-Id: 4135 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1920840wrs; Tue, 18 Oct 2022 05:05:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7rOdnU72tASOq75BpWAtfyZCR6+S3VJsH6dOQfIDW76smW7Z6Wvj2kp0HOFDXQTi/tMTsA X-Received: by 2002:aa7:dcc5:0:b0:45c:7613:65f6 with SMTP id w5-20020aa7dcc5000000b0045c761365f6mr2385950edu.142.1666094707615; Tue, 18 Oct 2022 05:05:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666094707; cv=none; d=google.com; s=arc-20160816; b=0kbc7UaHnB7BoQRgQIWCnWVZ9rC+qfEkeGEi6wRYShQ7nuUU+L7wKiDk/e0BCietMM 2cUuJz1TsrT7xwbtuIw6vRzlc1cUhjEXxpXyBIzZYuhbC/hodzuFF2dTek3uacZtFjBV rAOBrAmozhO3rMGk81VlOzno7hoKDa237iv/z+fn6z+T5fRb88t7Xq5HerK+OjsM0wlT iuY+0lMIFvJgFlWLGJvD7750rk9BHmnSYdhAx8L69lnfmC3FX05VFE3nV+ZdXw0aPaLP s0xm6xBXV0mNO0uJ6dpDsXkof1tnYhMpem09qUSU4mb15Mt8hGIPFgOUOAtxicxvJF4S 3uOw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=6NgxHUHmcB+8+FicHls6Uc9flxwUPewu/G78v6fq4ok=; b=eT3OB6AIIi1oLAdfttPVW9rKmqKla0TZGNCKlKfVxge9DmV1duun7lsSjdVQWdd6pH IFQiac8cR+8zu/KA56h6UJw2BvIPVahtEdLmdnfTgfSEXIk2nQhOXvTcCy8YH0aSlCds 8ksr+ilBsKRT/28gDuwMvuxmMx7oBjgYOHet+CHRVOgxXPQ64FLRMKj/5mKi4KVWsure /GLXyh5YxSzBt+BC1UZSUDQglkuzaK9ApWP7sesYMCLl4zRDNczcG+DoUx90lOFhRlLo I7YVRXobTseYtOfVU5CMGfUqyEo2aB3l8ZTVMOyHrQZ1xW9By9Iol/UyiXRHSa9jU5oX SKew== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w24-20020a17090633d800b0078d20294fe1si10635851eja.168.2022.10.18.05.04.32; Tue, 18 Oct 2022 05:05:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230423AbiJRMDY (ORCPT + 99 others); Tue, 18 Oct 2022 08:03:24 -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-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 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747026924203110813?= X-GMAIL-MSGID: =?utf-8?q?1747026924203110813?= 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: See events.rst for more information. - 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: 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[] = #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 buffer\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, struct file *file) return ret; } -static int tracing_time_stamp_mode_show(struct seq_file *m, void *v) -{ - struct trace_array *tr = 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 = inode->i_private; - int ret; - - ret = tracing_check_open_get_tr(tr); - if (ret) - return ret; - - ret = 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_buffer_event *rbe) { if (rbe == this_cpu_read(trace_buffered_event)) @@ -7643,13 +7608,6 @@ static const struct file_operations trace_clock_fops = { .write = tracing_clock_write, }; -static const struct file_operations trace_time_stamp_mode_fops = { - .open = tracing_time_stamp_mode_open, - .read = seq_read, - .llseek = seq_lseek, - .release = tracing_single_release_tr, -}; - #ifdef CONFIG_TRACER_SNAPSHOT static const struct file_operations snapshot_fops = { .open = tracing_snapshot_open, @@ -9580,9 +9538,6 @@ init_tracer_tracefs(struct trace_array *tr, struct dentry *d_tracer) trace_create_file("tracing_on", TRACE_MODE_WRITE, d_tracer, tr, &rb_simple_fops); - trace_create_file("timestamp_mode", TRACE_MODE_READ, d_tracer, tr, - &trace_time_stamp_mode_fops); - tr->buffer_percent = 50; trace_create_file("buffer_percent", TRACE_MODE_READ, d_tracer, From patchwork Tue Oct 18 12:00:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sunliming X-Patchwork-Id: 4137 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1921118wrs; Tue, 18 Oct 2022 05:05:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6BqVaJyQr53DEZIqEptVyRIqpBb+Up1w6p7eZCMjI8B6/W9FleBTT/BfABNHxx1EDpU++a X-Received: by 2002:a05:6402:2285:b0:45c:7c8c:3032 with SMTP id cw5-20020a056402228500b0045c7c8c3032mr2229447edb.78.1666094736647; Tue, 18 Oct 2022 05:05:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666094736; cv=none; d=google.com; s=arc-20160816; b=V19D7ToaiEQ94zKaeoPzUGCwWmIkkJ9nU3K4LMLga4FzfNX90C4iS5Xie++XsDQCOE ejK4iJJ6mEPY32OJ2rAoiBUuyfZLrF2TRBvZFnkr7CBuE9b48KgxR8SX7Qqiva81rEfm rKL9OqvAI3nhYY+yZi/b52rVmqZ8fmb3mJod9M04XnTu5Jt787I1e4psAdJtmHh0y9cp sJYraNiaJh/mkJRnN/sb4UHQEcxOz4vVWnhPcWAhQzatLl8Glqra6I5KxanlS+0OOOdF lq6rxzedXiiEXp6In4Y1VsOfV8Gtdk/CSA0KKKLT/CiYOfeU8aDAmAnCZGupdFhBUtTp gF3w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=2H25EslXoLm9NA6np/ZGYDcJiS+NnA+nx4L/XVPPvjI=; b=N/y4glTH3B1/kJDyFpGtTnfVnSrQnL1jGISW+5ZEsu6St/Yi+RoxqnlUKWqWjN+3oy qsTlZIfc7g5ObzQKjL9C7itS6fQtUprLhUSJ2+NdU2h/UHIPt4U0Zn0g9K9b03J73imy qTzQkwIFGE0BkB8LONAmn88Oq9vpzN8bt14nXdHCqDqbI6XbMQGXKPSAh41wvazulVWH Xmu0U+3lTZ3OPo48o9LQCsrQntBnyvl5gdIt+QkwYLVoY2L/9UPoihXQLHqi6hbnnwI5 zVSYmA9EU6ftHINYfJTus4UAWYXRKK87B1QWJEIMMEBNCMcAbxbCreGJ7dVm6pETQsks QMhA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hc35-20020a17090716a300b0073ce34d1a13si13306340ejc.499.2022.10.18.05.05.04; Tue, 18 Oct 2022 05:05:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230446AbiJRMDj (ORCPT + 99 others); Tue, 18 Oct 2022 08:03:39 -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-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 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747026954457751041?= X-GMAIL-MSGID: =?utf-8?q?1747026954457751041?= 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_buffer *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); 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); struct rb_irq_work irq_work; - bool time_stamp_abs; }; struct ring_buffer_iter { @@ -1876,16 +1875,6 @@ void ring_buffer_set_clock(struct trace_buffer *buffer, buffer->clock = clock; } -void ring_buffer_set_time_stamp_abs(struct trace_buffer *buffer, bool abs) -{ - buffer->time_stamp_abs = 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); static inline unsigned long rb_page_entries(struct buffer_page *bpage)