From patchwork Mon Jul 31 23:16: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: 128905 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2329194vqg; Mon, 31 Jul 2023 16:36:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlHQi40ctETu1znB0gwqOrQvxlGHREo6DN2hkPWh9M2X5V9xDx0A9nXEoXoxEkZjByGMJ1zy X-Received: by 2002:a05:6a21:3e05:b0:138:5a28:e8cc with SMTP id bk5-20020a056a213e0500b001385a28e8ccmr12840165pzc.37.1690846570034; Mon, 31 Jul 2023 16:36:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690846570; cv=none; d=google.com; s=arc-20160816; b=g8QpYTWTYHIOkGUx/PXHWh2KwnrlyoAOMGeokUZkUV8uhmXQWdWLzO7NVBvdaqrukD nZozvkH4a76P8poxFjewEbomGkUc97IwErTMBgtW9F/LMZZVcsY7vQwyiXoc88Aei903 XVKqhKl6x6OScOUg6f94ZEzGYOgYCo6U/W2wjyVteGkvygF4ruojao5UyGJDr6Fl9gy/ +VBtP5b2Qx8cLUFInOn/dv4my3dSRnyetIrwoFdx7KuYTpro3TaeQtn5mbABmTbKKFUD TklccDbhcHyF/iQe5JlcFsCalbQpCQuswsa5aDBN6djguoadle9qbhq7SpL7fRQeFd8Z W4Ng== 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=xBgN+/gPx7nSnpzbw1jUV3B2mOUUnd6jzjqQPfMLOXY=; fh=7thvPshOcIsAIQaDnmYsf8hk3pomkQCyuLhDsBEzWIw=; b=hBv4CEmTRAndZMAdybvo9tgo+k3Cu1d5Zey+PcwptviIpR4KJdr4bCR5VRh7Ciatb7 tkd2ffmlBo9jnDaYgW7pPbl5K8DAUS5lUmdhvG4HDE/xIdkm2CYQkYQJl27KW0QQfAQO 5m35k46W1dBicw/qHANYR4zXiN+qYJOwjFYOJc5tEs/RbCtIXyNB3I7+W4rqmANHwN2p nqPDqsKe3yBnLCEC9Lbv7m7KXJHYdM6wRUE0/umGgAn5uUIognmHFN9rtWoqIb1uo6yQ Qag55ZJm38pb/d0XXM8pMAprhky4KmH9JrSylxtolV2t7igOqGvy+RYzKSTeRvjDmh09 GmCQ== 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 n127-20020a632785000000b0055c7eb346e1si7923061pgn.757.2023.07.31.16.35.55; Mon, 31 Jul 2023 16:36:10 -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 S231936AbjGaXRk (ORCPT + 99 others); Mon, 31 Jul 2023 19:17:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231907AbjGaXRX (ORCPT ); Mon, 31 Jul 2023 19:17:23 -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 921F61FDE for ; Mon, 31 Jul 2023 16:17:15 -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 BBE6F61361 for ; Mon, 31 Jul 2023 23:17:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E281C433C8; Mon, 31 Jul 2023 23:17:07 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qQc8Q-003fMV-0D; Mon, 31 Jul 2023 19:17:06 -0400 Message-ID: <20230731231705.888984593@goodmis.org> User-Agent: quilt/0.66 Date: Mon, 31 Jul 2023 19:16:39 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Zheng Yejian Subject: [for-next][PATCH 05/15] tracing: Set actual size after ring buffer resize References: <20230731231634.031452225@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: 1772981133211841131 X-GMAIL-MSGID: 1772981133211841131 From: Zheng Yejian Currently we can resize trace ringbuffer by writing a value into file 'buffer_size_kb', then by reading the file, we get the value that is usually what we wrote. However, this value may be not actual size of trace ring buffer because of the round up when doing resize in kernel, and the actual size would be more useful. Link: https://lore.kernel.org/linux-trace-kernel/20230705002705.576633-1-zhengyejian1@huawei.com Cc: Signed-off-by: Zheng Yejian Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index a3c4f9826872..bc96567dc230 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6286,6 +6286,15 @@ static void set_buffer_entries(struct array_buffer *buf, unsigned long val) per_cpu_ptr(buf->data, cpu)->entries = val; } +static void update_buffer_entries(struct array_buffer *buf, int cpu) +{ + if (cpu == RING_BUFFER_ALL_CPUS) { + set_buffer_entries(buf, ring_buffer_size(buf->buffer, 0)); + } else { + per_cpu_ptr(buf->data, cpu)->entries = ring_buffer_size(buf->buffer, cpu); + } +} + #ifdef CONFIG_TRACER_MAX_TRACE /* resize @tr's buffer to the size of @size_tr's entries */ static int resize_buffer_duplicate_size(struct array_buffer *trace_buf, @@ -6364,18 +6373,12 @@ static int __tracing_resize_ring_buffer(struct trace_array *tr, return ret; } - if (cpu == RING_BUFFER_ALL_CPUS) - set_buffer_entries(&tr->max_buffer, size); - else - per_cpu_ptr(tr->max_buffer.data, cpu)->entries = size; + update_buffer_entries(&tr->max_buffer, cpu); out: #endif /* CONFIG_TRACER_MAX_TRACE */ - if (cpu == RING_BUFFER_ALL_CPUS) - set_buffer_entries(&tr->array_buffer, size); - else - per_cpu_ptr(tr->array_buffer.data, cpu)->entries = size; + update_buffer_entries(&tr->array_buffer, cpu); return ret; }