From patchwork Sun Dec 10 03:54:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 176270 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6353897vqy; Sat, 9 Dec 2023 20:04:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IGESa33k9EpInn/FDkk0ziq91HOjSq3dXSZPxqghSs1h39mcy/QPW4yPLOYPS9BUgNjo5Jv X-Received: by 2002:a05:6871:a116:b0:1fb:75b:2fdc with SMTP id vs22-20020a056871a11600b001fb075b2fdcmr3232329oab.115.1702181098144; Sat, 09 Dec 2023 20:04:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702181098; cv=none; d=google.com; s=arc-20160816; b=eooJoASd+sIzZVbYvjw95qzJWPrP/n5ySYhHBllfarkcQj5SdnjctOcjlbpVIIb3Dr Y8Ar/bkQbinsRaZd2VAk8VsaW8DP/hM9OSFwNwX6vykcOsxcmhKYcQNZa1tAE65M4DJM fnMweD55A1xVvFeCsM0n7L3K9r1BO6nC1TcHnwOB4j6toPlv01Er0m0dPmKc25LsFEf3 kZ398crg3bzLWgUy21Ixw7w+UDPcD4wlrdilzk28wM+QWBsPKIuQd4z4oTiVNBMnicIp cNnm84ORlXXnKOYVrAp3EOM0lM0I+2VgShcZ4qe8zq9KEjBxB26wsqWQ6iAZyIobssPW 4ZBA== 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=ieu3+9d2yMJWO558m3E5V2AZFHf+3LScQkVUXq1naoo=; fh=pL1t9p0RxD5qCgSUniSa3P4+XmpksJYPzX6TE+dndao=; b=BpywXzGK5iMBS2mRgVr2ynNs+ydpYhUktaL67uj0opLhNLNwJo/hc9jPZNE3JXTUQF yw/Ik//mklsqER7ZdtLAOErtDFei7BgTxGi0apTXCJjsJMqanXjcEOLJr6I7YwTiTf9I JXlt8S/H/8d97rnUZg338TBQ2Y5BRXatbzGbztrmea0+R/5CiDOqFBEy1osl3v3hwKpw 9HmMjQ5LXBRgB2H7aQilaCLuQQzvDKGYtNDLAQigWMxcBFVY9QX51mOZDr4bPYq/umsJ UGnDYwIod8LP1sMKGCMU+C97GqaIfvUhbToRb1zDZXqGVDZtePZfyahChJImqP1DbUhT 1BCw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id k1-20020a63d841000000b00584ca25959csi3981326pgj.540.2023.12.09.20.04.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Dec 2023 20:04:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id 3FE4980681C9; Sat, 9 Dec 2023 20:04:54 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231565AbjLJEET (ORCPT + 99 others); Sat, 9 Dec 2023 23:04:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231487AbjLJEEH (ORCPT ); Sat, 9 Dec 2023 23:04:07 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5B3EB4 for ; Sat, 9 Dec 2023 20:04:13 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4AB36C433AB; Sun, 10 Dec 2023 04:04:13 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rCB3i-000000021OH-0soF; Sat, 09 Dec 2023 23:04:50 -0500 Message-ID: <20231210040449.997493720@goodmis.org> User-Agent: quilt/0.67 Date: Sat, 09 Dec 2023 22:54:10 -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 06/14] ring-buffer: Clear pages on error in ring_buffer_subbuf_order_set() failure References: <20231210035404.053677508@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email 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 (lipwig.vger.email [0.0.0.0]); Sat, 09 Dec 2023 20:04:54 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784866247455023582 X-GMAIL-MSGID: 1784866247455023582 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. Fixes: TBD ("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 4cb03b3b99e6..4e7eb41695f5 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -6060,6 +6060,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);