From patchwork Sat Jul 29 18:33:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 128168 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1178770vqg; Sat, 29 Jul 2023 12:16:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlGwP/242UNXvqtcjaDcC4RZ3j6YibJI8thp4QX3JeDLmZy0V+8oS9sC1c+ZNB5I+GP74Jkh X-Received: by 2002:a17:90b:1917:b0:268:1376:d501 with SMTP id mp23-20020a17090b191700b002681376d501mr4714243pjb.5.1690658178086; Sat, 29 Jul 2023 12:16:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690658178; cv=none; d=google.com; s=arc-20160816; b=grzGy2wSDLJNhODTkjSVxLqvDqYqerhl3owYSvahq8iGqcdwKrA0+YAcskBJc+N9aj RJ6am/nl5LXOHrbd1li3W3/sKYP48oHa3bA3qxuXm8LtUXB8hR98hrDvV5wRhWNamLM2 4L6H60J3Q01CIOPXbJVRADJfZ7t09x5L1Khc6EdQsZyvhRgQtzRv6I5BNXiRTxeboCCs UpE1AKH67EksrvgfhA/wxttLn67hvP7eeNzssdNzSJ0aDdCcQmCxBPCdKfH/IzJehk80 JU1Zmbo36md2yKlj2DbXYdII8W6XeQ7lMxRyGmnj9WyLhC6mhN465GAOpstNCD7Jzfwu JdDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=XF/OWVtNblwqL+sxBOB5mLfmSUfvK9v7SYk8k0/IMcI=; fh=ej2bCHQANsm4KTazc0aE0aCq2j9N8MhS9R2H8LgnC60=; b=MRtTnIU7Jw9WbBfcynj0lmJ505A4ac0GLb+C56g0r+n32rE8xZM7jvNuqdZz6ZXQkt xboCjws6h8PkIjKgoDe2/SngX3JcDBr6YwOn7J/S01dJJnQQk+sucELaHi/3b18xyUbB WoYfHESDoeVPCWhCepEF1iuKh8zGiRRwHFQ64zgufs4ostHjiYqVUQSBLJOWN4QpXkgV sIE/8cUvSJhGxRdGyY/1TOix5UJoe0yOChzVDbgi57ALJ1zCY68XqXQt4YEig8/MEuIO D3UhBrBWTfqlBw2+xhx1eJWF9mBub4GZdM4i3mgBgdoyL/h8t4yOWR6GZbODkW5af2z6 CHZw== 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 pi10-20020a17090b1e4a00b00263c48abf8asi6790497pjb.31.2023.07.29.12.16.04; Sat, 29 Jul 2023 12:16:18 -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 S229828AbjG2Se1 (ORCPT + 99 others); Sat, 29 Jul 2023 14:34:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229610AbjG2SeY (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 606EF30FC 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 D6D40608C3 for ; Sat, 29 Jul 2023 18:34:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39C4FC433C8; Sat, 29 Jul 2023 18:34:22 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qPolh-0035IS-0l; Sat, 29 Jul 2023 14:34:21 -0400 Message-ID: <20230729183421.051522156@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 29 Jul 2023 14:33:34 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , , Zheng Yejian Subject: [for-linus][PATCH 1/7] ring-buffer: Fix wrong stat of cpu_buffer->read References: <20230729183333.357029101@goodmis.org> MIME-Version: 1.0 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: 1772783590134059617 X-GMAIL-MSGID: 1772783590134059617 From: Zheng Yejian When pages are removed in rb_remove_pages(), 'cpu_buffer->read' is set to 0 in order to make sure any read iterators reset themselves. However, this will mess 'entries' stating, see following steps: # cd /sys/kernel/tracing/ # 1. Enlarge ring buffer prepare for later reducing: # echo 20 > per_cpu/cpu0/buffer_size_kb # 2. Write a log into ring buffer of cpu0: # taskset -c 0 echo "hello1" > trace_marker # 3. Read the log: # cat per_cpu/cpu0/trace_pipe <...>-332 [000] ..... 62.406844: tracing_mark_write: hello1 # 4. Stop reading and see the stats, now 0 entries, and 1 event readed: # cat per_cpu/cpu0/stats entries: 0 [...] read events: 1 # 5. Reduce the ring buffer # echo 7 > per_cpu/cpu0/buffer_size_kb # 6. Now entries became unexpected 1 because actually no entries!!! # cat per_cpu/cpu0/stats entries: 1 [...] read events: 0 To fix it, introduce 'page_removed' field to count total removed pages since last reset, then use it to let read iterators reset themselves instead of changing the 'read' pointer. Link: https://lore.kernel.org/linux-trace-kernel/20230724054040.3489499-1-zhengyejian1@huawei.com Cc: Cc: Fixes: 83f40318dab0 ("ring-buffer: Make removal of ring buffer pages atomic") Signed-off-by: Zheng Yejian Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ring_buffer.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index de061dd47313..46b4a3c7c3bf 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -523,6 +523,8 @@ struct ring_buffer_per_cpu { rb_time_t before_stamp; u64 event_stamp[MAX_NEST]; u64 read_stamp; + /* pages removed since last reset */ + unsigned long pages_removed; /* ring buffer pages to update, > 0 to add, < 0 to remove */ long nr_pages_to_update; struct list_head new_pages; /* new pages to add */ @@ -559,6 +561,7 @@ struct ring_buffer_iter { struct buffer_page *head_page; struct buffer_page *cache_reader_page; unsigned long cache_read; + unsigned long cache_pages_removed; u64 read_stamp; u64 page_stamp; struct ring_buffer_event *event; @@ -1957,6 +1960,8 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned long nr_pages) to_remove = rb_list_head(to_remove)->next; head_bit |= (unsigned long)to_remove & RB_PAGE_HEAD; } + /* Read iterators need to reset themselves when some pages removed */ + cpu_buffer->pages_removed += nr_removed; next_page = rb_list_head(to_remove)->next; @@ -1978,12 +1983,6 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned long nr_pages) cpu_buffer->head_page = list_entry(next_page, struct buffer_page, list); - /* - * change read pointer to make sure any read iterators reset - * themselves - */ - cpu_buffer->read = 0; - /* pages are removed, resume tracing and then free the pages */ atomic_dec(&cpu_buffer->record_disabled); raw_spin_unlock_irq(&cpu_buffer->reader_lock); @@ -4395,6 +4394,7 @@ static void rb_iter_reset(struct ring_buffer_iter *iter) iter->cache_reader_page = iter->head_page; iter->cache_read = cpu_buffer->read; + iter->cache_pages_removed = cpu_buffer->pages_removed; if (iter->head) { iter->read_stamp = cpu_buffer->read_stamp; @@ -4849,12 +4849,13 @@ rb_iter_peek(struct ring_buffer_iter *iter, u64 *ts) buffer = cpu_buffer->buffer; /* - * Check if someone performed a consuming read to - * the buffer. A consuming read invalidates the iterator - * and we need to reset the iterator in this case. + * Check if someone performed a consuming read to the buffer + * or removed some pages from the buffer. In these cases, + * iterator was invalidated and we need to reset it. */ if (unlikely(iter->cache_read != cpu_buffer->read || - iter->cache_reader_page != cpu_buffer->reader_page)) + iter->cache_reader_page != cpu_buffer->reader_page || + iter->cache_pages_removed != cpu_buffer->pages_removed)) rb_iter_reset(iter); again: @@ -5298,6 +5299,7 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer) cpu_buffer->last_overrun = 0; rb_head_page_activate(cpu_buffer); + cpu_buffer->pages_removed = 0; } /* Must have disabled the cpu buffer then done a synchronize_rcu */ From patchwork Sat Jul 29 18:33:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 128169 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1178965vqg; Sat, 29 Jul 2023 12:16:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlFsLZHfndG4bVAN6ie4OywsW5LmjdwBiVG/RnqD+ouCfy22Vt8NjU2iWtXOR+EGEVdDmbtW X-Received: by 2002:a17:90a:94c2:b0:263:40e1:d4d9 with SMTP id j2-20020a17090a94c200b0026340e1d4d9mr5086110pjw.47.1690658209245; Sat, 29 Jul 2023 12:16:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690658209; cv=none; d=google.com; s=arc-20160816; b=PoDqfAb/cIBLZH0AUHOFzdbKTtaXw2VkCM7tVrT9nv6AixvFp8gOEv6ZVW2z730iX6 eYq5sk6GX6MwKNO4N4XqElZVzLUwjoas8+COLFmK3BBkuyWqSe4vw7MtCrw8Weqw0ZuD bfLS2VkyjLjDyu8p44x0A38hUJ2KInSPylQuyps5RNL5PLsKY9KEy4kYcuCPOltLPDUA Em6m+XUU2XuLk32ePLkCpCf26eBKJ6iNM+EbTCF48Kgvq1D8kd1zLj8iSMDMLov8324N 0B4I6FA7u6OgIKVLNkqT0s2WhKbJw64GFNutJg9jTL0oAqIMptQGahh4sbe5VYCRBwO8 fEyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=JmvmBQVrfheAjrdOn88XziKMzMPwznQEQkDGKveBm2k=; fh=mQvw8ETxqMNxI20RcI1leTTVW928YS5jvnmrHbcxzT0=; b=VZoY+ELfw6BDRvJfG+MaFDOCXYwI2Y2+j9HA/v8BYyJ3C+k5qVktCLdYg0cgia4bzd RxCFU49dAZokGgAcqJZk1G/4mHarfwH/25vppKjr9LX4aJtmTn9HmcI8k4Dtw59XjowK IIvkFY9OTzeC4u71714Tq3hDUKyTWa5gIdH0/+DofFVxh4B5Hzx9p/0jATCpTKkZp8jP ofptzmDpDLlxcP+OZeJsisHpvYS22kmJ1mGAhR5FdBfss6MuVdNKBSSRut6r3FIwyBiw viXz57uRx1K0BVieBquP8Lv/zGIuctmWLScQYHwVqWU0wTRixaQYMHY+hsD4sIM3/IMH nf7w== 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 pi10-20020a17090b1e4a00b00263c48abf8asi6790497pjb.31.2023.07.29.12.16.36; Sat, 29 Jul 2023 12:16:49 -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 S229843AbjG2Se3 (ORCPT + 99 others); Sat, 29 Jul 2023 14:34:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229627AbjG2SeZ (ORCPT ); Sat, 29 Jul 2023 14:34:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 706CF3580 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)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F0F556092A for ; Sat, 29 Jul 2023 18:34:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 648C4C433CA; Sat, 29 Jul 2023 18:34:22 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qPolh-0035J1-1Q; Sat, 29 Jul 2023 14:34:21 -0400 Message-ID: <20230729183421.257956360@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 29 Jul 2023 14:33:35 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Gaosheng Cui Subject: [for-linus][PATCH 2/7] ring-buffer: Fix kernel-doc warnings in ring_buffer.c References: <20230729183333.357029101@goodmis.org> MIME-Version: 1.0 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: 1772783622385419016 X-GMAIL-MSGID: 1772783622385419016 From: Gaosheng Cui Fix kernel-doc warnings: kernel/trace/ring_buffer.c:954: warning: Function parameter or member 'cpu' not described in 'ring_buffer_wake_waiters' kernel/trace/ring_buffer.c:3383: warning: Excess function parameter 'event' description in 'ring_buffer_unlock_commit' kernel/trace/ring_buffer.c:5359: warning: Excess function parameter 'cpu' description in 'ring_buffer_reset_online_cpus' Link: https://lkml.kernel.org/r/20230724140827.1023266-2-cuigaosheng1@huawei.com Cc: Signed-off-by: Gaosheng Cui Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ring_buffer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 46b4a3c7c3bf..52dea5dd5362 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -950,6 +950,7 @@ static void rb_wake_up_waiters(struct irq_work *work) /** * ring_buffer_wake_waiters - wake up any waiters on this ring buffer * @buffer: The ring buffer to wake waiters on + * @cpu: The CPU buffer to wake waiters on * * In the case of a file that represents a ring buffer is closing, * it is prudent to wake up any waiters that are on this. @@ -3375,7 +3376,6 @@ void ring_buffer_nest_end(struct trace_buffer *buffer) /** * ring_buffer_unlock_commit - commit a reserved * @buffer: The buffer to commit to - * @event: The event pointer to commit. * * This commits the data to the ring buffer, and releases any locks held. * @@ -5358,7 +5358,6 @@ EXPORT_SYMBOL_GPL(ring_buffer_reset_cpu); /** * ring_buffer_reset_online_cpus - reset a ring buffer per CPU buffer * @buffer: The ring buffer to reset a per cpu buffer of - * @cpu: The CPU buffer to be reset */ void ring_buffer_reset_online_cpus(struct trace_buffer *buffer) { From patchwork Sat Jul 29 18:33:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 128172 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1179376vqg; Sat, 29 Jul 2023 12:18:02 -0700 (PDT) X-Google-Smtp-Source: APBJJlENrU9LAnuMJZSskTA+wv9MUjkFAuVli6myUTPhV0N7FKf+3BRm9rBxxwG+XaEQphwfdR2l X-Received: by 2002:a17:902:ec90:b0:1b9:d335:1b7d with SMTP id x16-20020a170902ec9000b001b9d3351b7dmr6371070plg.6.1690658282149; Sat, 29 Jul 2023 12:18:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690658282; cv=none; d=google.com; s=arc-20160816; b=MmjI83qFJ9ecZ0Zt4kvub9XqFjv8ulWZEkBZIHbqN8tjJyvYsI+3Uh1Li2MgNvtlF5 3WM92f7SUnIjYVsvXnEFR547UuT0ReiXRbG3XipmioVSRVwDGnXvpul5EupKrfpQ8cXG vCf7QN9UlWWD0NEo1BRIuf2HMELIMB5GFtHR5eg6Aop4ycm98jU3v4Obnjl3Uw/7DsbU ym5pKFPOzb+ez5hftY3kDYp7zJJla4q86oZ2w5sCyvYsKsVWjGbzNt5YAMIIuj/oGQGh M5a/9CXLmOMj9ZqK+TJDRcPSbJ8O6opS+OtUrV7pPmH+D9sMbZ5qkCujwBPbL0+9Mism rcQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=Nwi4EQ9IoXI1gymQbwxKdT1IS51crMTQe9eNRB85/Ec=; fh=mQvw8ETxqMNxI20RcI1leTTVW928YS5jvnmrHbcxzT0=; b=izjVt72tz1zGs2MzS6axDcFqyKo5UIs5AJdFqEHS7x98OLaNB/7xqvseCcZIrUEcp4 A7HXaQ6B+kRXcveziVYG2lIYRnUe9xJp7UN3K/EbiwbkW8GWxZv5D6X+ZW1G+08RqGk9 OR1nHbOUv+apj5n5s9FLGj8gsiYk+Slr6t0BGIQ9/6ODqTAU4YAIwDZieMLbq6xIUzJP ZO2YkTJWsTMu3KpP95K7IzFX+gP32NZ3YxrNau4BS6P8hsi2/6AjsP8sbNdO2/2cMRwY Sh27hyLPCpgVIKq60ZRUfdcVVU5X7uEk6Kp1OhUq5kmAiTsmELNH810PEH/2r95Ng1kW PpwA== 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 y71-20020a638a4a000000b0055c95e91f69si5014851pgd.388.2023.07.29.12.17.49; Sat, 29 Jul 2023 12:18:02 -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 S229850AbjG2Sea (ORCPT + 99 others); Sat, 29 Jul 2023 14:34:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229729AbjG2SeZ (ORCPT ); Sat, 29 Jul 2023 14:34:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A83CC3582 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)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2D42860766 for ; Sat, 29 Jul 2023 18:34:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E2ACC433CD; Sat, 29 Jul 2023 18:34:22 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qPolh-0035JZ-25; Sat, 29 Jul 2023 14:34:21 -0400 Message-ID: <20230729183421.462537802@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 29 Jul 2023 14:33:36 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Gaosheng Cui Subject: [for-linus][PATCH 3/7] tracing/synthetic: Fix kernel-doc warnings in trace_events_synth.c References: <20230729183333.357029101@goodmis.org> MIME-Version: 1.0 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: 1772783699095886708 X-GMAIL-MSGID: 1772783699095886708 From: Gaosheng Cui Fix kernel-doc warning: kernel/trace/trace_events_synth.c:1257: warning: Function parameter or member 'mod' not described in 'synth_event_gen_cmd_array_start' Link: https://lkml.kernel.org/r/20230724140827.1023266-3-cuigaosheng1@huawei.com Cc: Signed-off-by: Gaosheng Cui Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_synth.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c index d6a70aff2410..dd398afc8e25 100644 --- a/kernel/trace/trace_events_synth.c +++ b/kernel/trace/trace_events_synth.c @@ -1230,6 +1230,7 @@ EXPORT_SYMBOL_GPL(__synth_event_gen_cmd_start); * synth_event_gen_cmd_array_start - Start synthetic event command from an array * @cmd: A pointer to the dynevent_cmd struct representing the new event * @name: The name of the synthetic event + * @mod: The module creating the event, NULL if not created from a module * @fields: An array of type/name field descriptions * @n_fields: The number of field descriptions contained in the fields array * From patchwork Sat Jul 29 18:33:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 128170 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1179097vqg; Sat, 29 Jul 2023 12:17:17 -0700 (PDT) X-Google-Smtp-Source: APBJJlFnovHW3C3kyX0T+tAeVOiWFuRW2LpwUUQGSIYmpwr9sdLkuUR0XcbVMnr76IwQWFo5iXD/ X-Received: by 2002:a05:6a00:a0f:b0:658:cbf1:d05a with SMTP id p15-20020a056a000a0f00b00658cbf1d05amr6681513pfh.3.1690658237109; Sat, 29 Jul 2023 12:17:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690658237; cv=none; d=google.com; s=arc-20160816; b=uk/cCgeitaviC0m9QHFkPQ8N6eb6fIZf+QzFQvxHj7JeXfYlAJp0LQl4LY0eARY3x4 FV3nkU1o0VU/MVIs5w2d5N1mUAdC8z8MykCQiuqsWnBFkBdLW+0KqmbhshPslNxoY2sh 1CcEQGcrIEgNvPPJgzB4jAJi2IwjVS74TjP3fCK4wyOCIsct2vXAjpe/QAd67ja6qn7E DAJf93XWbrHKdBSccG01Q+ajSI1rPd0OCnYoY2IB1ksMnzNZcjOljvTdTWlK/8MFgkdM Ph4EI0rfwgr51ddm0iIVV+RHji6T7keGiS2bKrlV+7l5CFv5SDp+OZWLCF3hRA05p2O2 rK5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=tZcqoPJ0hoHTej2rV0Elh377AmTtbpiSbrXUdD8bmVM=; fh=mQvw8ETxqMNxI20RcI1leTTVW928YS5jvnmrHbcxzT0=; b=SwxCh5qSUg7+Ix4WziUOaYkY9CP8q1raMvh4emY1BWBohhjwXy2cEXIzw6I9tYoWtH VDwPhTovq1c8pzdCp3l8JQ/ac6It4g5L6idQpcdmCRo4sywQb9/BgEGP0e0FVFuOeiiW SE1iQVs//mpoPiYppblpLfu4ggdL0MnIzLRaNHT3hxvAWK5Gy3fNEh3btuHiVLF27mkt E1TURyW4LE6EQsiWNUdrJVRmwYF2yksFA+kGlNuTUedQAL/Z4J6ldalVK//o9A8UXXay HEQkCtQj7tNj8/f69M6pLZAXdZAhY8/fNjdXX2LaUYCfKH5pwNGuggXVG4or1KdNfoYq L/RA== 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 y18-20020a63fa12000000b0055c8d14df3bsi4742242pgh.501.2023.07.29.12.17.04; Sat, 29 Jul 2023 12:17:17 -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 S229854AbjG2Sed (ORCPT + 99 others); Sat, 29 Jul 2023 14:34:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229764AbjG2SeZ (ORCPT ); Sat, 29 Jul 2023 14:34:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA4703585 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)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 74BBD60A0A for ; Sat, 29 Jul 2023 18:34:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2959C433C7; Sat, 29 Jul 2023 18:34:22 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qPolh-0035K7-2l; Sat, 29 Jul 2023 14:34:21 -0400 Message-ID: <20230729183421.670475369@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 29 Jul 2023 14:33:37 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Gaosheng Cui Subject: [for-linus][PATCH 4/7] tracing: Fix kernel-doc warnings in trace_events_trigger.c References: <20230729183333.357029101@goodmis.org> MIME-Version: 1.0 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: 1772783651929865979 X-GMAIL-MSGID: 1772783651929865979 From: Gaosheng Cui Fix kernel-doc warnings: kernel/trace/trace_events_trigger.c:59: warning: Function parameter or member 'buffer' not described in 'event_triggers_call' kernel/trace/trace_events_trigger.c:59: warning: Function parameter or member 'event' not described in 'event_triggers_call' Link: https://lkml.kernel.org/r/20230724140827.1023266-4-cuigaosheng1@huawei.com Cc: Signed-off-by: Gaosheng Cui Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_trigger.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c index e535959939d3..46439e3bcec4 100644 --- a/kernel/trace/trace_events_trigger.c +++ b/kernel/trace/trace_events_trigger.c @@ -31,7 +31,9 @@ void trigger_data_free(struct event_trigger_data *data) /** * event_triggers_call - Call triggers associated with a trace event * @file: The trace_event_file associated with the event + * @buffer: The ring buffer that the event is being written to * @rec: The trace entry for the event, NULL for unconditional invocation + * @event: The event meta data in the ring buffer * * For each trigger associated with an event, invoke the trigger * function registered with the associated trigger command. If rec is From patchwork Sat Jul 29 18:33:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 128171 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1179334vqg; Sat, 29 Jul 2023 12:17:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlGdfGYvw0dJgX3a/OyFrlh4LTHEpXV2r7sHCuc6FSLlt+R75/18IMAQfDj+A/O2wK/Hxwt2 X-Received: by 2002:a05:6a21:47c8:b0:134:24bf:51b with SMTP id as8-20020a056a2147c800b0013424bf051bmr4820392pzc.30.1690658276390; Sat, 29 Jul 2023 12:17:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690658276; cv=none; d=google.com; s=arc-20160816; b=w8B56NSc0UFbaGfK1r7uMsePnfPaPud9JOPaDAYcZI+htO0Z4lr0MhjsqwPD6oiNlL chxcSsZa+gbYoNbFzxbC1n6R1SvetCAYjvSES9BtIf7t8yxwV2VRIb1xSeNGRQ1YcwMn wvp2CNNtLdzBsoCAbdxOXF1fii3PQtvTIdsR7PPM45btD7VJ7Y+2sQpXYISYLsVwxSQU m710kBJEyKGiN0bOh9lrgrGMfNdbJJTD0zDBZLrBijSXlRFpyDrQoh788Dum7h8pz8wM 5AO+9uFCs/PBmmVSl4iDtDqejO+jYPEcj0LL9BZPSzz4k+9Hj8YY/V4ZjzsN1WZZRA45 HfgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=2rRoSUI9FlrLSThgnY9Edk2wzKf2wQ82mvIQXg70uQ4=; fh=mQvw8ETxqMNxI20RcI1leTTVW928YS5jvnmrHbcxzT0=; b=P+o2LDfIKsifMS3QqYdkVSrGYftZ4NgU74QefhZ19VKGwm/oxNGxyNgrIej1y6hf9e cYJJN0P3gqvVkvNi93F+bhiB9DAZaXAAqYCokRx6VrdvRloFtmCkGQbS22ThT6Ww75rW 4GpnWskQcQ+z2/hpA4zZ/Ywo6mX4P16aJolWYzURgMdZMbjsGof+HsLXN62E6BoiYkwd GrVLMiN7/iSzSPYsnYl7Uoz4f96FL88cfLwp9QmuHlHe9wCAruT8wihSQ5QjHPYVQZqF A3xVPCE02g3OTat5BlEN6ins73h4n0hmxA3Aia3VPoGiC6Np//PSbN+6CLyzXesCpmII MvZQ== 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 y18-20020a63fa12000000b0055c8d14df3bsi4742242pgh.501.2023.07.29.12.17.43; Sat, 29 Jul 2023 12:17:56 -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 S229891AbjG2Sei (ORCPT + 99 others); Sat, 29 Jul 2023 14:34:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229818AbjG2SeZ (ORCPT ); Sat, 29 Jul 2023 14:34:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E257B3588 for ; Sat, 29 Jul 2023 11:34:24 -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)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9921560AD7 for ; Sat, 29 Jul 2023 18:34:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06B4DC433C8; Sat, 29 Jul 2023 18:34:23 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qPoli-0035Kg-0D; Sat, 29 Jul 2023 14:34:22 -0400 Message-ID: <20230729183421.877315009@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 29 Jul 2023 14:33:38 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Gaosheng Cui Subject: [for-linus][PATCH 5/7] tracing: Fix kernel-doc warnings in trace_seq.c References: <20230729183333.357029101@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,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: 1772783692954542922 X-GMAIL-MSGID: 1772783692954542922 From: Gaosheng Cui Fix kernel-doc warning: kernel/trace/trace_seq.c:142: warning: Function parameter or member 'args' not described in 'trace_seq_vprintf' Link: https://lkml.kernel.org/r/20230724140827.1023266-5-cuigaosheng1@huawei.com Cc: Signed-off-by: Gaosheng Cui Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_seq.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c index e5e299260d0c..bac06ee3b98b 100644 --- a/kernel/trace/trace_seq.c +++ b/kernel/trace/trace_seq.c @@ -131,6 +131,7 @@ EXPORT_SYMBOL_GPL(trace_seq_bitmask); * trace_seq_vprintf - sequence printing of trace information * @s: trace sequence descriptor * @fmt: printf format string + * @args: Arguments for the format string * * The tracer may use either sequence operations or its own * copy to user routines. To simplify formatting of a trace From patchwork Sat Jul 29 18:33:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 128167 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1177873vqg; Sat, 29 Jul 2023 12:13:47 -0700 (PDT) X-Google-Smtp-Source: APBJJlFbvJeJPbin5zQppQlplE3jVp+1XoKe5yrn7eB+5jyg3fl+gDpvuNYH54WHNX93EIdYk81n X-Received: by 2002:a17:90b:392:b0:262:e821:b3f8 with SMTP id ga18-20020a17090b039200b00262e821b3f8mr5627757pjb.38.1690658027457; Sat, 29 Jul 2023 12:13:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690658027; cv=none; d=google.com; s=arc-20160816; b=iyvGatfhbcwyFhGs2CHhTZuSb4kcyYEK5YZg6BQzoodzS845GfKUkUrzcpC8syrg52 XTg9hkiYF+FIhlbWaFD5SZ3xgQzvzt4kiRRRc+v0+FyyyNjecGxSGXrwXaMcu94vhObo 11i29ExPOqdyxnTj4Y9MVKIOI+9AGTa4kFmqRWlyOgAKUrDqfN8CM3nD790qayndok2f yn9wJ8NkFzit8Y224FYKJDmLCh8If3JXO91WkQhLf0FwfcWu2ICi9KLUzjwrMyYXSxvD DEly6OTrtg6xx4muLot9WlifWYCPJNUI4+dMRuF7ZmzmzHi/FMsNk2cVJ5CSzSHF7cBk nXow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=ezf5cdKeiwDUd/eIJhFIQwUyjLnzAdJXV/sdYie65Q4=; fh=ugO8u2jGP7BKOhvHf4OOAm2/ud3NXzBtH01f/YDxRuc=; b=VMTRtlJ/gba7vHTA8EHHWh4GMZRQYCrvkWok7nuxHkmw/9DaHntDJrMDE4CM1dkKci CSjjKavtA4w0rhhg9SExsUlTSQaSnQJL0tX3cPPktjiS8Jj8A8jy1AHB579O1OoXT4W3 dOm6rTHoem5WJUqemb8OtgH7OZYAmX7U1TIjmSegb9DZ4sRa5V7KQXhOArjRgWYZaI6A EMtytIMKA+qC/6omJwa9fOzHTWWHxQqwyfmh61FUhJpn38icVh4tXvQDQlaUAYPeOvvb ap4IyrUDQODBjoqaMcpk2WSGs94PgkFPJRC5OgOwXrH3VP9MRB5m9MPyg1RpJn6R4nVZ nDRA== 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 n9-20020a17090a670900b002680cee323dsi6509723pjj.119.2023.07.29.12.13.33; Sat, 29 Jul 2023 12:13: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 S229870AbjG2Sef (ORCPT + 99 others); Sat, 29 Jul 2023 14:34:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229798AbjG2SeZ (ORCPT ); Sat, 29 Jul 2023 14:34:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C49ED30FA for ; Sat, 29 Jul 2023 11:34:24 -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)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B8D7E60AF3 for ; Sat, 29 Jul 2023 18:34:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31AD5C433CB; Sat, 29 Jul 2023 18:34:23 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qPoli-0035LE-0s; Sat, 29 Jul 2023 14:34:22 -0400 Message-ID: <20230729183422.087580772@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 29 Jul 2023 14:33:39 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , YueHaibing Subject: [for-linus][PATCH 6/7] ftrace: Remove unused extern declarations References: <20230729183333.357029101@goodmis.org> MIME-Version: 1.0 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: 1772783431864032902 X-GMAIL-MSGID: 1772783431864032902 From: YueHaibing commit 6a9c981b1e96 ("ftrace: Remove unused function ftrace_arch_read_dyn_info()") left ftrace_arch_read_dyn_info() extern declaration. And commit 1d74f2a0f64b ("ftrace: remove ftrace_ip_converted()") leave ftrace_ip_converted() declaration. Link: https://lore.kernel.org/linux-trace-kernel/20230725134808.9716-1-yuehaibing@huawei.com Cc: Cc: Signed-off-by: YueHaibing Signed-off-by: Steven Rostedt (Google) --- include/linux/ftrace.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index ce156c7704ee..aad9cf8876b5 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -684,7 +684,6 @@ void __init ftrace_set_early_filter(struct ftrace_ops *ops, char *buf, int enable); /* defined in arch */ -extern int ftrace_ip_converted(unsigned long ip); extern int ftrace_dyn_arch_init(void); extern void ftrace_replace_code(int enable); extern int ftrace_update_ftrace_func(ftrace_func_t func); @@ -859,9 +858,6 @@ static inline int ftrace_modify_call(struct dyn_ftrace *rec, unsigned long old_a } #endif -/* May be defined in arch */ -extern int ftrace_arch_read_dyn_info(char *buf, int size); - extern int skip_trace(unsigned long ip); extern void ftrace_module_init(struct module *mod); extern void ftrace_module_enable(struct module *mod); From patchwork Sat Jul 29 18:33:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 128174 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1180597vqg; Sat, 29 Jul 2023 12:21:37 -0700 (PDT) X-Google-Smtp-Source: APBJJlGu8zEeHDMJp30T6ueLyXiWZv2xAUM5n3QolNsLOlzHCoctT6cMgB7XHrqTXaR7Nks6IUT+ X-Received: by 2002:a17:902:eccf:b0:1b5:694:b1a9 with SMTP id a15-20020a170902eccf00b001b50694b1a9mr6890786plh.32.1690658497519; Sat, 29 Jul 2023 12:21:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690658497; cv=none; d=google.com; s=arc-20160816; b=fU+96CJp4RvjLDbS7ruzfewd1SGjaZFgEcupxvRX6/43tOH+5KPrvz0QQczKt+klng UTakheMzpMRbNa/PhBIJpBMpNXBfIYVKC2ktVSAtSoP+1ey/XUc+2QOqlGgxrCWQn8Ml tW43PVjM7JjXkeHL3Eoma4mMNtNiV4xO9HhJh16Y7W6xRbbnXGMDwqSIfNgR7qyIEExD aHzPstibfa/cOacNSjChN3rnYkRCQHFeld3elVyqhLYRvNEzazvFtwRrOYCjAqCQLxxW VhJkcaRC4hYnA3Blxs4wGskY75cNBd4tLcBODpuw/udKXk8cDN0nyYSbwy/gs/1s3Pl8 q5kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=xXnknxSKtrUyFy8dDEM91hp3GW0yg3kI6TVcBU9e/sk=; fh=7thvPshOcIsAIQaDnmYsf8hk3pomkQCyuLhDsBEzWIw=; b=ynK1j68IW8PjsbE1kdTH4AZB8gnWFNscOkd1zs6ae77I3B0ZfqtKu7q8zWYv+OCaXk nEDSD+hM08wOFUb2rLx/rCqS7uUt1en420pW9WDVikg5DHu8832sWl+y2iqVS30ujo43 0kegNLkmxdtX5ow0QvplwvALnfmqz1qH2nY6rysjJhoweakfEgCnHBFJ1U7rSCcGFd0V hT0DZYnxOAG1VDEHE/OTavoUFNX3bLjGY/Pop6rWYsr8TJ+D3h/YVf+nB/ssGyP0r5Wz IRMH4SwNYiQuYYX7zpL14A8g0s2QBLd47PGeqdAWgBrHJPIKFfwnyO4Ngc/40GRwHZF8 YeSQ== 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 b3-20020a170903228300b001b024322547si778641plh.577.2023.07.29.12.21.24; Sat, 29 Jul 2023 12:21:37 -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 S229910AbjG2Sel (ORCPT + 99 others); Sat, 29 Jul 2023 14:34:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229819AbjG2SeZ (ORCPT ); Sat, 29 Jul 2023 14:34:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC9DA30FC for ; Sat, 29 Jul 2023 11:34:24 -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)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DDADF60909 for ; Sat, 29 Jul 2023 18:34:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58B3FC433D9; Sat, 29 Jul 2023 18:34:23 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qPoli-0035Lo-1X; Sat, 29 Jul 2023 14:34:22 -0400 Message-ID: <20230729183422.299073875@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 29 Jul 2023 14:33:40 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Zheng Yejian Subject: [for-linus][PATCH 7/7] tracing: Fix warning in trace_buffered_event_disable() References: <20230729183333.357029101@goodmis.org> MIME-Version: 1.0 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: 1772783924425331055 X-GMAIL-MSGID: 1772783924425331055 From: Zheng Yejian Warning happened in trace_buffered_event_disable() at WARN_ON_ONCE(!trace_buffered_event_ref) Call Trace: ? __warn+0xa5/0x1b0 ? trace_buffered_event_disable+0x189/0x1b0 __ftrace_event_enable_disable+0x19e/0x3e0 free_probe_data+0x3b/0xa0 unregister_ftrace_function_probe_func+0x6b8/0x800 event_enable_func+0x2f0/0x3d0 ftrace_process_regex.isra.0+0x12d/0x1b0 ftrace_filter_write+0xe6/0x140 vfs_write+0x1c9/0x6f0 [...] The cause of the warning is in __ftrace_event_enable_disable(), trace_buffered_event_enable() was called once while trace_buffered_event_disable() was called twice. Reproduction script show as below, for analysis, see the comments: ``` #!/bin/bash cd /sys/kernel/tracing/ # 1. Register a 'disable_event' command, then: # 1) SOFT_DISABLED_BIT was set; # 2) trace_buffered_event_enable() was called first time; echo 'cmdline_proc_show:disable_event:initcall:initcall_finish' > \ set_ftrace_filter # 2. Enable the event registered, then: # 1) SOFT_DISABLED_BIT was cleared; # 2) trace_buffered_event_disable() was called first time; echo 1 > events/initcall/initcall_finish/enable # 3. Try to call into cmdline_proc_show(), then SOFT_DISABLED_BIT was # set again!!! cat /proc/cmdline # 4. Unregister the 'disable_event' command, then: # 1) SOFT_DISABLED_BIT was cleared again; # 2) trace_buffered_event_disable() was called second time!!! echo '!cmdline_proc_show:disable_event:initcall:initcall_finish' > \ set_ftrace_filter ``` To fix it, IIUC, we can change to call trace_buffered_event_enable() at fist time soft-mode enabled, and call trace_buffered_event_disable() at last time soft-mode disabled. Link: https://lore.kernel.org/linux-trace-kernel/20230726095804.920457-1-zhengyejian1@huawei.com Cc: Fixes: 0fc1b09ff1ff ("tracing: Use temp buffer when filtering events") Signed-off-by: Zheng Yejian Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 5d6ae4eae510..578f1f7d49a6 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -611,7 +611,6 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file, { struct trace_event_call *call = file->event_call; struct trace_array *tr = file->tr; - unsigned long file_flags = file->flags; int ret = 0; int disable; @@ -635,6 +634,8 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file, break; disable = file->flags & EVENT_FILE_FL_SOFT_DISABLED; clear_bit(EVENT_FILE_FL_SOFT_MODE_BIT, &file->flags); + /* Disable use of trace_buffered_event */ + trace_buffered_event_disable(); } else disable = !(file->flags & EVENT_FILE_FL_SOFT_MODE); @@ -673,6 +674,8 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file, if (atomic_inc_return(&file->sm_ref) > 1) break; set_bit(EVENT_FILE_FL_SOFT_MODE_BIT, &file->flags); + /* Enable use of trace_buffered_event */ + trace_buffered_event_enable(); } if (!(file->flags & EVENT_FILE_FL_ENABLED)) { @@ -712,15 +715,6 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file, break; } - /* Enable or disable use of trace_buffered_event */ - if ((file_flags & EVENT_FILE_FL_SOFT_DISABLED) != - (file->flags & EVENT_FILE_FL_SOFT_DISABLED)) { - if (file->flags & EVENT_FILE_FL_SOFT_DISABLED) - trace_buffered_event_enable(); - else - trace_buffered_event_disable(); - } - return ret; }