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 87A8541B918; Sat, 28 Feb 2026 17:45:48 +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=1772300748; cv=none; b=QuZF+qjvCJoIFxW03RrmDZzfn/1MQOacN7Jb+tQiLIGsGAPCUPG9SxNUjhGapYs90UoCtn3cLUn9awE026oiGBd1JkM4zeSUeMWasmsyS6Tzbt6lYHMMNe/umPMsuab/0wp1Vap5vgivAbJUZgdm95lCp9Apmsq42JsMRFrUmio= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300748; c=relaxed/simple; bh=IFBb7akjpT9xHxJvEkyOMo+fidVQgV9jRlm3pQG56bo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ESlBeIPNJ6aKlBCSl1YSv4A0O7FI04BjE2iRQHAfvB8Psi/0d1PhIfLBMTpEvvRB/mB2d3yWofZULaWVGagDmbrMiY3Aj+8rXDY1lgzOpREnZNejTC1d1ixG6HhP4Dhqk91f1z2OF5i5mG0DImy/TZwg/V4fabEzREBtQI7IHXg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CiCZXQvR; 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="CiCZXQvR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2546C2BC87; Sat, 28 Feb 2026 17:45:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300748; bh=IFBb7akjpT9xHxJvEkyOMo+fidVQgV9jRlm3pQG56bo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CiCZXQvRn5ab9b3kOSsOXZPSHRB2YU7Lu5VekCDarOWZYoWUkWTXQxeNN2cfrRX9e aUNrSJh+9/0xFSSFd1pM5qF/TtuaBLEu0Y7RAvhgJz9eEMFCpLJk3/Vd2QSxDORxCG eaMqOStC9dO/Bk6BL0N9f6xqFDXK8p5CjFWK+dyGGNyXNLzlQUbCySSeK0Z48mO+ia ETVlZksihjuBcpbeI4y5SiFQs/AvL19dWDHpvRoUN/Y1G5VmURtWZuaz/jeXVnZQNj AaM217I7ENq253l2EGoS3BNM9qXwZSOgCUFjKRAKAwRrSA+pVcP0EZAElHS9cxPYGx kIW4PsNNOc9PQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Masami Hiramatsu (Google)" , Mathieu Desnoyers , "Steven Rostedt (Google)" , Sasha Levin Subject: [PATCH 6.19 784/844] tracing: Reset last_boot_info if ring buffer is reset Date: Sat, 28 Feb 2026 12:31:37 -0500 Message-ID: <20260228173244.1509663-785-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: "Masami Hiramatsu (Google)" [ Upstream commit 804c4a2209bcf6ed4c45386f033e4d0f7c5bfda5 ] Commit 32dc0042528d ("tracing: Reset last-boot buffers when reading out all cpu buffers") resets the last_boot_info when user read out all data via trace_pipe* files. But it is not reset when user resets the buffer from other files. (e.g. write `trace` file) Reset it when the corresponding ring buffer is reset too. Cc: stable@vger.kernel.org Cc: Mathieu Desnoyers Link: https://patch.msgid.link/177071302364.2293046.17895165659153977720.stgit@mhiramat.tok.corp.google.com Fixes: 32dc0042528d ("tracing: Reset last-boot buffers when reading out all cpu buffers") Signed-off-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin --- kernel/trace/trace.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 8e9c1bfe3ebb3..cc93d0e1f1876 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -4881,6 +4881,8 @@ static int tracing_single_release_tr(struct inode *inode, struct file *file) return single_release(inode, file); } +static bool update_last_data_if_empty(struct trace_array *tr); + static int tracing_open(struct inode *inode, struct file *file) { struct trace_array *tr = inode->i_private; @@ -4905,6 +4907,8 @@ static int tracing_open(struct inode *inode, struct file *file) tracing_reset_online_cpus(trace_buf); else tracing_reset_cpu(trace_buf, cpu); + + update_last_data_if_empty(tr); } if (file->f_mode & FMODE_READ) { @@ -5971,6 +5975,7 @@ tracing_set_trace_read(struct file *filp, char __user *ubuf, int tracer_init(struct tracer *t, struct trace_array *tr) { tracing_reset_online_cpus(&tr->array_buffer); + update_last_data_if_empty(tr); return t->init(tr); } @@ -7789,6 +7794,7 @@ int tracing_set_clock(struct trace_array *tr, const char *clockstr) ring_buffer_set_clock(tr->max_buffer.buffer, trace_clocks[i].func); tracing_reset_online_cpus(&tr->max_buffer); #endif + update_last_data_if_empty(tr); if (tr->scratch && !(tr->flags & TRACE_ARRAY_FL_LAST_BOOT)) { struct trace_scratch *tscratch = tr->scratch; -- 2.51.0