Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 633A73D75CE for ; Mon, 17 Aug 2026 12:50:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786971023; cv=none; b=D4+Vs+1Ves3/YfOhWP1i3KysnHwJAAuiiTLvhrhyOhRWtysiQPi+EF1VGMMzFqbQuq6J0b3q8EdLjI0S1yjNW/DlVpImxnc7ixbNzkwNQ3NBMhKDSzsH3Uc5elCjL4qWGdWSLqGD5+V9wlaWuN/1DTKp/PHoZrwu5x12VA2hMZ8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786971023; c=relaxed/simple; bh=DAv0KIfXKUAnzB1s5Bc7dA4LhlDW4JsofFItP6mr3Vw=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=m2kiuNDtjHpVyWbYhDd4STa2td6nZS5JZOxFeB5B0ApoRdFTD7GZ0vF7gEnwmTxy8J1TjvBADzk7TAUG/7WBVDDmZAfZ/As9QbpIztkShO0uY2oUsczBVjvTSzNTMZ8phTuWYxdgtnTOimloiwiEMj70pMqyxY39NMSXI5n04+4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MHw4szdR; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="MHw4szdR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E7101F000E9; Mon, 17 Aug 2026 12:50:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786971021; bh=wvKrFbd9KQgPihi+1ibwJjxlnbln/hzR3si23glR3z8=; h=Subject:To:Cc:From:Date; b=MHw4szdRf7UmhkYg8LWrkLNR+PJkdvJrxmp1PASN1PP28I3IWejqXKyt23VVl7Onj ocpBuz06nZ5ISzWNtNo8tW8ZBCYM/d76ICAlU3orvY8Q6BPgygNgM4cL31IJ6KRsOd e43rs7WyXmpggYFYHh+IXcKslksBkWJCitMDuSvQ= Subject: FAILED: patch "[PATCH] ring-buffer: Prevent resizing of persistent ring buffer" failed to apply to 6.12-stable tree To: vdonnefort@google.com,rostedt@goodmis.org Cc: From: Date: Mon, 17 Aug 2026 14:50:09 +0200 Message-ID: <2026081709-tank-childcare-2caa@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.12-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y git checkout FETCH_HEAD git cherry-pick -x 7c727dfce6be04dd009b29091a4a17d952dbfe03 # git commit -s git send-email --to '' --in-reply-to '2026081709-tank-childcare-2caa@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 7c727dfce6be04dd009b29091a4a17d952dbfe03 Mon Sep 17 00:00:00 2001 From: Vincent Donnefort Date: Thu, 6 Aug 2026 22:13:01 +0100 Subject: [PATCH] ring-buffer: Prevent resizing of persistent ring buffer Dynamically resizing a persistent ring buffer is not possible. Disable the feature. Cc: stable@vger.kernel.org Fixes: be68d63a139b ("ring-buffer: Add ring_buffer_alloc_range()") Link: https://patch.msgid.link/20260806211306.3704194-2-vdonnefort@google.com Signed-off-by: Vincent Donnefort Signed-off-by: Steven Rostedt diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 58dc8995a88d..09d502ef4c55 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -2528,6 +2528,8 @@ rb_allocate_cpu_buffer(struct trace_buffer *buffer, long nr_pages, int cpu) if (cpu_buffer->ring_meta->head_buffer) rb_meta_buffer_update(cpu_buffer, bpage); bpage->range = 1; + + atomic_inc(&cpu_buffer->resize_disabled); } else if (buffer->remote) { struct ring_buffer_desc *desc = ring_buffer_desc(buffer->remote->desc, cpu);