[v5,06/15] ring-buffer: Clear pages on error in ring_buffer_subbuf_order_set() failure
Message ID | 20231219185629.179352802@goodmis.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-5840-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp2155977dyi; Tue, 19 Dec 2023 10:57:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IF+uaAazCWv00pvSn68rV7CjexLlrMpFabnaaPC0b+m78BCBI8CeSdGtnCMkKGDa0NiyRtT X-Received: by 2002:a05:622a:1756:b0:427:78a7:b591 with SMTP id l22-20020a05622a175600b0042778a7b591mr1437329qtk.69.1703012261257; Tue, 19 Dec 2023 10:57:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703012261; cv=none; d=google.com; s=arc-20160816; b=jDXm/5US8z1S4VPjUWmRxsvQOBiZ/uMmwIsw9i7mZMlVEmJl6KJoDXHriFiKhYXtvV grsnoPSm+nqa8Gva8+UsNK8DiiVQao2AKr7WL2LJv0DXACdCKAiYYKf2a+9ohXtzLFFA uSHEezVmI6O5XFslSp6qW/KAirGX1BGuY/vHXzDHmcuK8HVEZi/aH2PzQ/xhOgq0bMu4 C7gkfTNa0mN+Vb/m96ND7lQsrmgsL6ffCf2B/DTKmyz6JpvdjfeMc9ufxJzJTR8pWbIa nsOU0fqotNSIaPdzeVGajH6RSBgUzjEeukkQJX7bj3ZHmoctpz6XqoXRE7lg5EEySxB9 D/IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:subject:cc:to:from:date:user-agent:message-id; bh=k3OP6Zr+52NuwVqecV9PcQUdP4UpcgRi4H8UIXl44ps=; fh=pL1t9p0RxD5qCgSUniSa3P4+XmpksJYPzX6TE+dndao=; b=o5J8J1x7cd2YrvFIEbnLrTCrZMjN9gVUKJ/Mg1S0EOGebLU9DHm2RekPVOabGJgFCZ pA+NKrFkBtIv36K9H94aMoDg8YRLBYRVLy5h7IkdIzs06icTErlX/UjmtqDWmNKl4mvx E+/0twVZZYh0SpGz4q/JA8eDxobzlBmj7+RilWuoEhEOKjRr/WJ4s9UZ7gPxi+VOkEqs LKAS9wdEMFz1s3eyYfjvCQs7em7Cr2wKnul1n+h1ITk3SiigMFBxh7p2fRpuvaui/S9+ keZOnnyke75kHwt47lwyelYke5xELT2rnBpzGs3117zLpyJBojRdvUD43MAHGUw63oXM PZAw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-5840-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5840-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id f11-20020a05622a104b00b004276175cda7si5174744qte.136.2023.12.19.10.57.41 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 10:57:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-5840-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-5840-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5840-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 1101F1C22031 for <ouuuleilei@gmail.com>; Tue, 19 Dec 2023 18:57:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A315C3EA87; Tue, 19 Dec 2023 18:55:32 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0021739AC5; Tue, 19 Dec 2023 18:55:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DAE7CC433C7; Tue, 19 Dec 2023 18:55:29 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from <rostedt@goodmis.org>) id 1rFfGX-00000003R2L-1frl; Tue, 19 Dec 2023 13:56:29 -0500 Message-ID: <20231219185629.179352802@goodmis.org> User-Agent: quilt/0.67 Date: Tue, 19 Dec 2023 13:54:20 -0500 From: Steven Rostedt <rostedt@goodmis.org> To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu <mhiramat@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Mathieu Desnoyers <mathieu.desnoyers@efficios.com>, Andrew Morton <akpm@linux-foundation.org>, Tzvetomir Stoyanov <tz.stoyanov@gmail.com>, Vincent Donnefort <vdonnefort@google.com>, Kent Overstreet <kent.overstreet@gmail.com> Subject: [PATCH v5 06/15] ring-buffer: Clear pages on error in ring_buffer_subbuf_order_set() failure References: <20231219185414.474197117@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785737784882459638 X-GMAIL-MSGID: 1785737784882459638 |
Series |
ring-buffer/tracing: Allow ring buffer to have bigger sub buffers
|
|
Commit Message
Steven Rostedt
Dec. 19, 2023, 6:54 p.m. UTC
From: "Steven Rostedt (Google)" <rostedt@goodmis.org> On failure to allocate ring buffer pages, the pointer to the CPU buffer pages is freed, but the pages that were allocated previously were not. Make sure they are freed too. Fixes: TBD ("tracing: Set new size of the ring buffer sub page") Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> --- kernel/trace/ring_buffer.c | 1 + 1 file changed, 1 insertion(+)
Comments
On Tue, 19 Dec 2023 13:54:20 -0500 Steven Rostedt <rostedt@goodmis.org> wrote: > From: "Steven Rostedt (Google)" <rostedt@goodmis.org> > > On failure to allocate ring buffer pages, the pointer to the CPU buffer > pages is freed, but the pages that were allocated previously were not. > Make sure they are freed too. > > Fixes: TBD ("tracing: Set new size of the ring buffer sub page") Do you merge this fix to the original one in the same series later? I think it is better to merge it for git bisect. Thank you, > Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> > --- > kernel/trace/ring_buffer.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c > index c2afcf98ea91..3c11e8e811ed 100644 > --- a/kernel/trace/ring_buffer.c > +++ b/kernel/trace/ring_buffer.c > @@ -5927,6 +5927,7 @@ int ring_buffer_subbuf_order_set(struct trace_buffer *buffer, int order) > for_each_buffer_cpu(buffer, cpu) { > if (!cpu_buffers[cpu]) > continue; > + rb_free_cpu_buffer(cpu_buffers[cpu]); > kfree(cpu_buffers[cpu]); > } > kfree(cpu_buffers); > -- > 2.42.0 > >
On Thu, 21 Dec 2023 01:23:14 +0900 Masami Hiramatsu (Google) <mhiramat@kernel.org> wrote: > On Tue, 19 Dec 2023 13:54:20 -0500 > Steven Rostedt <rostedt@goodmis.org> wrote: > > > From: "Steven Rostedt (Google)" <rostedt@goodmis.org> > > > > On failure to allocate ring buffer pages, the pointer to the CPU buffer > > pages is freed, but the pages that were allocated previously were not. > > Make sure they are freed too. > > > > Fixes: TBD ("tracing: Set new size of the ring buffer sub page") > > Do you merge this fix to the original one in the same series later? > I think it is better to merge it for git bisect. It only fixes the new functionality. If a git bisect gets here for that, then we know the issue already. But it shouldn't break bisect for things that happened before this change. The reason I'm not merging this with the other patch is because the original patch is from Tzvetomir, who isn't working on this anymore. I want to keep his patches untouched, and anything I do is on top of it. -- Steve
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index c2afcf98ea91..3c11e8e811ed 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -5927,6 +5927,7 @@ int ring_buffer_subbuf_order_set(struct trace_buffer *buffer, int order) for_each_buffer_cpu(buffer, cpu) { if (!cpu_buffers[cpu]) continue; + rb_free_cpu_buffer(cpu_buffers[cpu]); kfree(cpu_buffers[cpu]); } kfree(cpu_buffers);