From patchwork Thu Dec 21 16:10:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 182340 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp518105dyi; Thu, 21 Dec 2023 08:13:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IG8p5y8cDOfuyMARLS7fODjRsfTBO+Q2WwcCz/4HhSA0jzdrR/1MtrFG55c49kRAMdNyDY0 X-Received: by 2002:a05:6e02:12ce:b0:35d:59a2:1281 with SMTP id i14-20020a056e0212ce00b0035d59a21281mr31214797ilm.45.1703175216779; Thu, 21 Dec 2023 08:13:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703175216; cv=none; d=google.com; s=arc-20160816; b=mHxjbIn+fFhNWrMMemvsmkuiy5Zx5FBja1a928JYSxO0mcl1wF0yQQlbOHveUyaAwz IIGlHIzIetD1CHdTTMhbNejDyqn6j+xJoF5MTLp/6J6Rc3JlwnRJYLVRGFWc0pBOmRRJ A+b2/1Akc4/ig7js82Eq6r3nP4n9VHMBDdUHdNuL2rdR20S+ixWW2zE3JXpqX2hhGK8v POdZ00OPgrdpLouBBGds2DaFl0HqGsPxPyGmwxBuFyAe1Lk0GC2ZdIUrMNYfdb447xVw 5f9iMh1R2SuNB0ZnfSpHhzAWIXmu3iHYxIOAvt4QBPVnyDuasXeLx/tlhkcqExKx73SH Hajg== 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=5qSTLMqxg4rMWTsxNN+DS9D/jbhLJSuGGJhe4XBOvKc=; fh=e3UoLP0GGIVG/JuDivUt2G6X10h9sIOfzt1IJTPiLuw=; b=s6auhbaH6OF7HOf9SFXS2oUArLk4MCOTerlpNKGrpnEmLDFizMHLPIKfzrhYkbrtNh Sqyb3zQP9gBH1RNTncLPECRY2Ee1T/SOvQhDp5ltRbO5Hvf523UrHeEVePc4K1sVKcHD x9NIpsF1PZDEum8euIJu3HZaEFVF/j0QbhVmWAi+gJimwA2UJ39FIQg8hzxhmm+pPtwW VgazXlOs3VaHC+83FKj7MeOILbHeNOEYp8M5z2O855ABh94iliFKS2JJmIYA4ctJa1Da EBYyRS1cioZwoCCG/lxs9XvUD7epDAIvcgZOCHb+SMmvwxzrjx1+uWJqb7I/g0kL8P/Q p/5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-8730-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8730-ouuuleilei=gmail.com@vger.kernel.org" Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id h33-20020a63f921000000b005cd8b9dc455si1758352pgi.567.2023.12.21.08.13.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:13:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-8730-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-8730-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8730-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id E7BCAB22C95 for ; Thu, 21 Dec 2023 16:12:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9591F64AA2; Thu, 21 Dec 2023 16:10:02 +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 AD8A759910 for ; Thu, 21 Dec 2023 16:10:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F87BC433C8; Thu, 21 Dec 2023 16:10:00 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rGLdY-000000041J3-0WLL; Thu, 21 Dec 2023 11:11:04 -0500 Message-ID: <20231221161103.912510492@goodmis.org> User-Agent: quilt/0.67 Date: Thu, 21 Dec 2023 11:10:30 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Tzvetomir Stoyanov , Vincent Donnefort , Kent Overstreet Subject: [for-next][PATCH 06/16] ring-buffer: Clear pages on error in ring_buffer_subbuf_order_set() failure References: <20231221161024.478795180@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785908656029630783 X-GMAIL-MSGID: 1785908656029630783 From: "Steven Rostedt (Google)" 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. Link: https://lore.kernel.org/linux-trace-kernel/20231219185629.179352802@goodmis.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Mathieu Desnoyers Cc: Andrew Morton Cc: Tzvetomir Stoyanov Cc: Vincent Donnefort Cc: Kent Overstreet Fixes: f9b94daa542a ("tracing: Set new size of the ring buffer sub page") Signed-off-by: Steven Rostedt (Google) --- 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);