From patchwork Wed Dec 13 18:17:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 178243 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp7978040dys; Wed, 13 Dec 2023 10:22:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IHiPlOV82+uW2pgW7mGCwXKUFeUWQ6dHSiWSod8gpuDDsjCN5xXQFQ6+r7vr0LyJ16A1qQJ X-Received: by 2002:a05:6a00:310d:b0:6ce:f62c:dc66 with SMTP id bi13-20020a056a00310d00b006cef62cdc66mr6841579pfb.30.1702491737657; Wed, 13 Dec 2023 10:22:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702491737; cv=none; d=google.com; s=arc-20160816; b=x2lcEUuJlUF5TdagxjBmuGAg9wdjxKn+6OmPXywxRi9yjkZD63MrdHHB/9XcMbcpvw 6jFUihn16oj6NUhgi7HsZwRQ5ygTRg7kl9GGCji18Jof2d/GFNEpQNYxXUXQuB8qmtCs TN0tUZd9kUyJHUv2OoHGTRtycaS1BFLsIVH/fBajT5X2dhp8XPBeM7ivUNJ/N/ReLt87 pxqDMAP6FvP4y4koqQEItMWMy/1q+ICDCL/E1LR7RnNSPDFNyuUssyR/xk2qoSTtRBTW vf72/AV6gQUsS9B1tlRtnGHzBmAxc5tX7p840LmdOlH+hEMoIa+/VL3apPxjXl4wIPPy P6pA== 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=ZobDNIVy76n8TCtsWB9gVbVLeKlpwMA0LZQrV6oENA0=; fh=pL1t9p0RxD5qCgSUniSa3P4+XmpksJYPzX6TE+dndao=; b=dnAFwJ8xeC0RuwHeagmJn2hr4RjdtDDX/SMCcJ9gbWNcnUkBs//SjhgVJJRRiN6ZMi V0rmgXITQw/sfHBtOr2WMf2yeVyxBNz/cpsIHOKH8AbJ0Vh+uJLtZruB9xo57bjp33Tk n8aTaYVe1UqkiftxtIrWM0oJZnjT1nj5T1XaVSqBL9/0jgXXhDQxTtowMB+agv60yWkj 6GPBORiPbpo+BC6wflTIzrh25woS8dcNWiafXeMptJ/7AqlujzaEt9O0bYV4GGO23Vtb b9RC164vZbFAXUI0mHnrVzyx7lNWagUPZh/XJoEwPuaDhPwwFyIKuCKyTc+oRyPqpYK7 GL5w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id h2-20020a056a00170200b006c33a1bdf92si10077845pfc.307.2023.12.13.10.22.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 10:22:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B988180C8D5E; Wed, 13 Dec 2023 10:21:36 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442447AbjLMSVU (ORCPT + 99 others); Wed, 13 Dec 2023 13:21:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233759AbjLMSUh (ORCPT ); Wed, 13 Dec 2023 13:20:37 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 613D5B9 for ; Wed, 13 Dec 2023 10:20:40 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2D49C4339A; Wed, 13 Dec 2023 18:20:39 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rDTrJ-00000002aBI-1XPh; Wed, 13 Dec 2023 13:21:25 -0500 Message-ID: <20231213182125.140321029@goodmis.org> User-Agent: quilt/0.67 Date: Wed, 13 Dec 2023 13:17:48 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Tzvetomir Stoyanov , Vincent Donnefort , Kent Overstreet Subject: [PATCH v3 11/15] ring-buffer: Keep the same size when updating the order References: <20231213181737.791847466@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Dec 2023 10:21:36 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785191976602893119 X-GMAIL-MSGID: 1785191976602893119 From: "Steven Rostedt (Google)" The function ring_buffer_subbuf_order_set() just updated the sub-buffers to the new size, but this also changes the size of the buffer in doing so. As the size is determined by nr_pages * subbuf_size. If the subbuf_size is increased without decreasing the nr_pages, this causes the total size of the buffer to increase. This broke the latency tracers as the snapshot needs to be the same size as the main buffer. The size of the snapshot buffer is only expanded when needed, and because the order is still the same, the size becomes out of sync with the main buffer, as the main buffer increased in size without the tracing system knowing. Calculate the nr_pages to allocate with the new subbuf_size to be buffer_size / new_subbuf_size. Fixes: TBD ("ring-buffer: Set new size of the ring buffer sub page") Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ring_buffer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 2c908b4f3f68..86d3cac2a877 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -6039,7 +6039,10 @@ int ring_buffer_subbuf_order_set(struct trace_buffer *buffer, int order) if (!cpumask_test_cpu(cpu, buffer->cpumask)) continue; - nr_pages = buffer->buffers[cpu]->nr_pages; + /* Update the number of pages to match the new size */ + nr_pages = old_size * buffer->buffers[cpu]->nr_pages; + nr_pages = DIV_ROUND_UP(nr_pages, buffer->subbuf_size); + cpu_buffers[cpu] = rb_allocate_cpu_buffer(buffer, nr_pages, cpu); if (!cpu_buffers[cpu]) { err = -ENOMEM;