From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C2EB539AD45 for ; Tue, 12 May 2026 13:54:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778594067; cv=none; b=h8e1V+TWMxLHMpIX3mFfRSvJLaT6ZLVJQIt1Gq11blhrPUJ6AfSlwG4YEcwhuA0YdBhgN3yuLgHlBF9eDzj+708dmvozVZuZaNpADTIfV9eHMygIFlprUv/+VeCxHGt1mFD8tpj1HzZa2QN7C19RtG+Nz2NlLfYUdQxGaLnJM6E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778594067; c=relaxed/simple; bh=rXLoa9GBRBH6H+q+SMMAAzcD/K+nBASxRj8ZI+waeF4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Ga4l/8+LZVT6BZeYrobCPMf46/+POiuEZ+3aejNfW7ncbn3EfQkNIYy0fBkkEZRIMgtHLIFi8xm/UHthjonUb3A7Ut+dC/c0nJjek4xnbPkCRmBQuH/sMN9VArpYPVNhe9U9Eaezb3WMx26O4yQjDtMO1TH7Xpsh49d3YIoWXR0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=DQrn9UbQ; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DQrn9UbQ" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-48a3e9862f0so38119745e9.1 for ; Tue, 12 May 2026 06:54:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778594064; x=1779198864; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MsimPcdUANfcIFgHzpPOd6ABveJwxGYZMeC9Y1ifSik=; b=DQrn9UbQfmqEDaNFxTLznLX55Qp1UW3JRO4dcgoJfNKAdKab3bAS6cuiMRaO/uK11R N8QOKL1EmjSYKyXYpSJdjCLAFJds7h6ZWfq+DxBkOtK932OnrPgeUWUa7knVqvrX3YyM aOy7nERDh1BVVebhw4L7zUHOfCRicUzIw1E3fPQkc8jMxEF4RWVB9lgYwCFrNajYvKst EOggLMCBwdATnS4AVmW94614u9aCSYRyJq57A2Rb5NuHNpsDLa2IOr2egyOxk0urwUDi KIiDXhYrUuDR6VP6SbdRSQOBrl2ZRf5FL2ZyMw0MMQsxe6Wm83gg9IfklpN5aQy4oQUC mPwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778594064; x=1779198864; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=MsimPcdUANfcIFgHzpPOd6ABveJwxGYZMeC9Y1ifSik=; b=iBrx4q8MJ8zwkpN9vm6zASjURt5X7fsKOrl5/X0xpyFPG3sxDlfptNf8Ft37eQLurH 6zSYnXZNXlyy7YARCeErWoTb+wTUIwvrzB7WMabHr+VmKdxkX9yRJJ6Yd1XUY7NXbpVZ bD+Vr79TN5tZx5ncnKc6YN0AgD7f85C2kwo+HLk+HgNbGHAG4XRxcLYu5N2RAVu1Ahyf qpO9hXDhVvMaH+SKinNOEdFSTV9g9lfpd3dcUIOOKwA8GHMhxPrRwA7Z1Z2w096H+eLw k7Fj0hEuhZdcObFUynItRIeSp7eLvpO/4reYRblX/c4/9IF5yYQGBMUOPWT3+fQnkdVQ NIqQ== X-Forwarded-Encrypted: i=1; AFNElJ8kYy+iVsxVcg4A/HyH0kNkdl4Vjr61i6dJRh6UNUX9zGGshGmx9wqqs/m0EW+Y4HuSqJC0l7jM131Rfi8=@vger.kernel.org X-Gm-Message-State: AOJu0YzypZL0sE/wpmN0WQ4GC16ZsMqowdRzp5QrpWcuinO6T0QS+EIv sgV1XRIB4fsf51hencyQcDxEerMEjP5B90bZDmJDeXSrucOhIXoTSWelkaSb+AZ4zM0= X-Gm-Gg: Acq92OHzjTSXUB8X7DxYdAymjln7NqGXcC/75do62/TrIkQ0PCX7mx/AssKnAReR6+O kTLkUnMo/WDqrZPkRJDIh9EXVi6jU4HVnrRgbQkA22u1EXcHlHUwzhstmc+OysfU6NpxcqrAfvj 1MMc3Nsmn2f+T+Oh1SBYPeYxjk8b5JDgs0DoV4xOdTc6BRhwBAJdCfMx5TLjiM1FgwWKMSSk9wA ZG7cI4Mh4d8rXthf5Egd9YA/ryIxWnf9VvqLxshhaaONGK6/TSRf8PosGXQRKF/o/IidF15350F W013KOmr5ttUwBZW4rXTWdsrVqWiAzj7JoQJqtcdA+fLUfIXUdTZe7VpA2gnir33/3IUFCTAd7A bXc4cYpmx9+fbry4lVz+aB6FO41Fmm/bnpadg1prPfz8NSZxBDPtNnz7bGMZegTRbtvVOiSaewc EVYy0g5fytUM7KBnTcWnHontvMi1kzhBml2He4hnNaxI/ULZLdPrjEBQ9k8qgc2o0+VixaVBOT3 NtRyP1/rhM= X-Received: by 2002:a05:600c:3b99:b0:486:faa8:9e4 with SMTP id 5b1f17b1804b1-48e906c4525mr43131835e9.12.1778594063788; Tue, 12 May 2026 06:54:23 -0700 (PDT) Received: from dohko.chello.ie (188-141-5-72.dynamic.upc.ie. [188.141.5.72]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e908d890fsm43691055e9.15.2026.05.12.06.54.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2026 06:54:23 -0700 (PDT) From: David Carlier To: catalin.marinas@arm.com, will@kernel.org Cc: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, vdonnefort@google.com, ryan.roberts@arm.com, maz@kernel.org, linux-arm-kernel@lists.infradead.org, linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, David Carlier Subject: [PATCH v3] tracing: Fix nr_subbufs initialization in simple_ring_buffer_init_mm() Date: Tue, 12 May 2026 14:54:20 +0100 Message-ID: <20260512135420.99194-1-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit nr_subbufs in the ring buffer metadata is always initialized to zero because it is assigned from cpu_buffer->nr_pages before the page initialization loop has run. While nr_subbufs is not currently read by the kernel, it should reflect the actual buffer geometry in the meta page for correctness. Move the assignment after the page loop so that cpu_buffer->nr_pages holds the final count. Fixes: 34e5b958bdad ("tracing: Introduce simple_ring_buffer") Reviewed-by: Vincent Donnefort Assisted-by: Claude:claude-opus-4-7 Signed-off-by: David Carlier --- kernel/trace/simple_ring_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/simple_ring_buffer.c b/kernel/trace/simple_ring_buffer.c index 02af2297ae5a..f731f14d0ff7 100644 --- a/kernel/trace/simple_ring_buffer.c +++ b/kernel/trace/simple_ring_buffer.c @@ -395,7 +395,6 @@ int simple_ring_buffer_init_mm(struct simple_rb_per_cpu *cpu_buffer, memset(cpu_buffer->meta, 0, sizeof(*cpu_buffer->meta)); cpu_buffer->meta->meta_page_size = PAGE_SIZE; - cpu_buffer->meta->nr_subbufs = cpu_buffer->nr_pages; /* The reader page is not part of the ring initially */ page = load_page(desc->page_va[0]); @@ -437,6 +436,7 @@ int simple_ring_buffer_init_mm(struct simple_rb_per_cpu *cpu_buffer, return ret; } + cpu_buffer->meta->nr_subbufs = cpu_buffer->nr_pages; /* Close the ring */ bpage->link.next = &cpu_buffer->tail_page->link; cpu_buffer->tail_page->link.prev = &bpage->link; -- 2.53.0