From mboxrd@z Thu Jan 1 00:00:00 1970 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 4EBAB37DEA3; Sun, 22 Mar 2026 03:09:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774148974; cv=none; b=C7eYSEMSvr+xM2G8IIQWOOz1ctp91PBnO8dkYRD9aos0rTtsALd5XDzrDFMY9uNGmtiKCzl3025tK2RCILhHikIi7RQpUVnOu3ovQFRDo8lmKNhM16PAeZDnKnAMhGM8qkvYjVipY9LLhm4ekAu3Jke/X8UmfSvzAyTt/y6vL1Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774148974; c=relaxed/simple; bh=iejwqkXaOG/T7GdgDguaa9GJnn2r+//3Ug9XdJlwwOM=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=i534M2IJTlBxJNoA7m3J8AstwE6l1mK6YAqkuO6Sxj7c23P85brJ7NciTxIcjpKHIXhLUjGwMt38nnlIS8RaS4ypjgq0t8j6m39jC1vftp7egUyamBBkbHK0hXBUKTQfnKjVT+xKkgy1G4ARN9jLMRoRoPsx2eh/yV1ZOhxI0ns= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Oce8VZSf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Oce8VZSf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2165FC2BCB2; Sun, 22 Mar 2026 03:09:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774148974; bh=iejwqkXaOG/T7GdgDguaa9GJnn2r+//3Ug9XdJlwwOM=; h=Date:From:To:Cc:Subject:References:From; b=Oce8VZSfV+8BGJbgWQWdnWfxFUMI4xc97Rump7CVb3+tbHF7S9x6LwJsJ1xIJbRf+ YAPJxddmfJI3hjH/dCvdMH247UTkbX+Vi0wFzCcqfhpqlwGEby44PnSdlunRE+9p3C p3x0EgHb8VbWvPZMVOzGEHTbxjqQErrwR5lMkvo93jSRAAl0azXrjAS32vDK6R0/UW /mo86fm879q2YJVDNTJOqknwhF8S+F+eXTEl5EvOrfsy1gLQf439lpFsnJAvKXt4cw tra1bd4hnmCUfIB8cv7AjVFMk1XpHUOeGZb2BF3jSGMyKeKpECGyMB38CGsFI1Tq48 5Ce+WTJqjydAg== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1w49Cc-0000000B7km-2rYj; Sat, 21 Mar 2026 23:10:10 -0400 Message-ID: <20260322031010.535986464@kernel.org> User-Agent: quilt/0.69 Date: Sat, 21 Mar 2026 23:09:58 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , stable@vger.kernel.org, Ian Rogers Subject: [for-linus][PATCH 4/5] ring-buffer: Fix to update per-subbuf entries of persistent ring buffer References: <20260322030954.198361547@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 From: "Masami Hiramatsu (Google)" Since the validation loop in rb_meta_validate_events() updates the same cpu_buffer->head_page->entries, the other subbuf entries are not updated. Fix to use head_page to update the entries field, since it is the cursor in this loop. Cc: stable@vger.kernel.org Cc: Mathieu Desnoyers Cc: Ian Rogers Fixes: 5f3b6e839f3c ("ring-buffer: Validate boot range memory events") Link: https://patch.msgid.link/177391153882.193994.17158784065013676533.stgit@mhiramat.tok.corp.google.com Signed-off-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ring_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 17d0ea0cc3e6..170170bd83bd 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -2053,7 +2053,7 @@ static void rb_meta_validate_events(struct ring_buffer_per_cpu *cpu_buffer) entries += ret; entry_bytes += local_read(&head_page->page->commit); - local_set(&cpu_buffer->head_page->entries, ret); + local_set(&head_page->entries, ret); if (head_page == cpu_buffer->commit_page) break; -- 2.51.0