From patchwork Wed Dec 13 02:19:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 177744 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp8133600vqy; Tue, 12 Dec 2023 18:19:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IHPwDo7V2J70lbwags5alNcS/W2c0KZ5pb8igev2Cbd22W/lLKfAqWNK1H3bc5iYJPQgH+X X-Received: by 2002:a05:690c:2c13:b0:5e2:3ef8:d91c with SMTP id eo19-20020a05690c2c1300b005e23ef8d91cmr1140229ywb.13.1702433986947; Tue, 12 Dec 2023 18:19:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702433986; cv=none; d=google.com; s=arc-20160816; b=ncY2Vr45vkYG91VrS2za3ntkK4Z7QqnRWYzK1CRvlcKA1y9tCw0RgukEn5GR1AITyL hKf9hF3LrH0Uh9SmcR+qgKluIhhS33CK6l0CEMdV5rBHJ9obr6WTwqtauaqSoVTcs8XB nep1fiH+LKyzE0GtuGi8zX9j3DNCWkaDCJ8k2H5Tj8eKY+GssEXt3rNG/Sbua2/IXG4f J0uhfZAgrw6UP71AJuzJ9WGBmoQ244e+lNgBwQyHh/fVoMZhyP4tA7GqS/N738yf8Qvs TshNhXNSO19Yqee1juzzqQUiLreGB6tZvSB19wHB6cf3QZVEAkKsXl8alQaTeTybPiJp giKw== 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=oD1U99Rnv3qrpuGvCu9nS4gHJid3Suzmm3jAUPP20HY=; fh=e3UoLP0GGIVG/JuDivUt2G6X10h9sIOfzt1IJTPiLuw=; b=l2WSqqDYs92anHJzR6m7Y6IKOjF9R7NS2UiXaXVuz4lfBLiu9aYD6DzBJKt3GKPLj+ YRwgRwugZ7B/e3Yy21hTXY+q5gMRwelK7kPDxqP9rhIKdOjeoOIGccHU/8zTYtPHhCrW O+vTPPLqhhZWBdM2SrYG2NSFtpzgMWpI8z8bMSw+yEU7XfssF5LlsNn0bYga9FstZAl8 lKl6EA5XKEGT12o7nWsh7PSZ1fl0dNeSX1it0mGcScD0uUT9Z/5GasUn9dVzmEjTM+m0 1deyDlrNHobons070c7gJCFTXinW1xYDGWQXfF8suP2jRz19OBJ+WQTRwI8aqvkU/IhZ tTCw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id w13-20020a170902e88d00b001d348627d4csi819240plg.239.2023.12.12.18.19.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 18:19:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 F212880408E5; Tue, 12 Dec 2023 18:19:44 -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 S1378374AbjLMCTc (ORCPT + 99 others); Tue, 12 Dec 2023 21:19:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378297AbjLMCTW (ORCPT ); Tue, 12 Dec 2023 21:19:22 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C914EFD for ; Tue, 12 Dec 2023 18:19:27 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F7F4C43397; Wed, 13 Dec 2023 02:19:26 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rDEr3-00000002Tnn-3w4M; Tue, 12 Dec 2023 21:20:09 -0500 Message-ID: <20231213022009.725077654@goodmis.org> User-Agent: quilt/0.67 Date: Tue, 12 Dec 2023 21:19:20 -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: [PATCH v2 06/15] ring-buffer: Clear pages on error in ring_buffer_subbuf_order_set() failure References: <20231213021914.361709558@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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 12 Dec 2023 18:19:45 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785131420307392940 X-GMAIL-MSGID: 1785131420307392940 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 729fd4f07c1e..ea3c217e4e43 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -6069,6 +6069,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);