From patchwork Sat Jul 29 18:33:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 12816 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1198206vqg; Sat, 29 Jul 2023 13:18:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlFK6Blo56BcCMm/8kenXusY87GOSgtl3z/n6NiU2vamZ4RUpkS83jELjyQhOPiL/FMXffQl X-Received: by 2002:a05:6a20:9388:b0:138:2fb8:6a14 with SMTP id x8-20020a056a20938800b001382fb86a14mr7211440pzh.3.1690661915492; Sat, 29 Jul 2023 13:18:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690661915; cv=none; d=google.com; s=arc-20160816; b=FcxdCNRC6dzb+UZt0a8J+k4S3u9umllKq7iTyhvVOHNbDb2m6QVVoY6+rFC5BzVFRT wpB1nFGG1ngKP6xmDZvtxtDmI9wNeusT+HdJ+4U0HmXkCPqO7BbYrUyIp/KFeHfMP7f+ mF0Cjjnkj2e74oYqp7Qk8BWwrCb57pv7iuCRRZFGlLkt2AAKUcjrq3Er4nJK1rdRu91H FIsW8tRmiBG0Q6imBKOf8wF8XHQs47SEZYgSig/r9uSWohYbUkIMEi3S2Kn+K5U2g+g+ kB3QMFoatGflkrx7jbTtQ19+cEi4lB3gJ5ghhIapqXnLXfMM+VypC/mDFmtbDwkhzMvv vDfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:date:user-agent:message-id; bh=eg6Cso9mRF5VqBkozUC4t4rAJNwbyWSsV4o1JPja7Zk=; fh=kgng34H5que7URbu24ZWqKKtWQj+H7d5uaZL8F1DzaU=; b=fB2BEgjeS3ElGy7OfYFvaRpAhqfb8buOMV5jFTHMxesMi8EwDcOzmOPMnzzfcO5899 jvIMjMpuSnGUkfGYOkaAnkau1o+ikZO/9L8IhJfIBsIOmMVjlLf7uZMJ+hmTljFqyJX2 MxlTbqGSHwHzT6NDIjuHO/D/QBgfxfMDOayXK+v1YW+bj9d/q9HqIPvicVI+Y0Hqkd4L CAbwfoKe/oDB67sUj2dAtSLkNP4q9pNIklkJD1O0w0+DKfneK09x5G3jzVR2yp4C1QBs FLifSyZeXiIiElD+VKbZQ8Gt13y/OTPX15nL+8aQ9DwghcrM7lvaWm2rvxjISuUuM0QR 9yJQ== 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 o13-20020a63920d000000b005633d1402a2si1294580pgd.440.2023.07.29.13.18.11; Sat, 29 Jul 2023 13:18:35 -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 S229820AbjG2SeZ (ORCPT + 99 others); Sat, 29 Jul 2023 14:34:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229448AbjG2SeY (ORCPT ); Sat, 29 Jul 2023 14:34:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CEF330FA for ; Sat, 29 Jul 2023 11:34:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C8908606A0 for ; Sat, 29 Jul 2023 18:34:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30666C433C7; Sat, 29 Jul 2023 18:34:22 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qPolh-0035Hq-04; Sat, 29 Jul 2023 14:34:21 -0400 Message-ID: <20230729183333.357029101@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 29 Jul 2023 14:33:33 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton Subject: [for-linus][PATCH 0/7] tracing: A few more fixes for 6.5 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham 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: INBOX X-GMAIL-THRID: 1772787508597761961 X-GMAIL-MSGID: 1772787508597761961 Tracing fixes for 6.5: - Fix to /sys/kernel/tracing/per_cpu/cpu*/stats read and entries. If a resize shrinks the buffer it clears the read count to notify readers that they need to reset. But the read count is also used for accounting and this causes the numbers to be off. Instead, create a separate variable to use to notify readers to reset. - Fix the ref counts of the "soft disable" mode. The wrong value was used for testing if soft disable mode should be enabled or disable, but instead, just change the logic to do the enable and disable in place when the SOFT_MODE is set or cleared. - Several kernel-doc fixes - Removal of unused external declarations git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace/urgent Head SHA1: dea499781a1150d285c62b26659f62fb00824fce Gaosheng Cui (4): ring-buffer: Fix kernel-doc warnings in ring_buffer.c tracing/synthetic: Fix kernel-doc warnings in trace_events_synth.c tracing: Fix kernel-doc warnings in trace_events_trigger.c tracing: Fix kernel-doc warnings in trace_seq.c YueHaibing (1): ftrace: Remove unused extern declarations Zheng Yejian (2): ring-buffer: Fix wrong stat of cpu_buffer->read tracing: Fix warning in trace_buffered_event_disable() ---- include/linux/ftrace.h | 4 ---- kernel/trace/ring_buffer.c | 25 +++++++++++++------------ kernel/trace/trace_events.c | 14 ++++---------- kernel/trace/trace_events_synth.c | 1 + kernel/trace/trace_events_trigger.c | 2 ++ kernel/trace/trace_seq.c | 1 + 6 files changed, 21 insertions(+), 26 deletions(-)