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 E2E87149013; Tue, 23 Jan 2024 01:08:10 +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=1705972091; cv=none; b=k6RqUGovDtsqSNfQOVIdU5G4JbbvoCP96LU/2CcvN4q0cj+5f/Qvhrq9opkvxayLytbrZt3Pyqo7oUom02lWF0Hdjd4JtJ1WYeoibrkbGJ4Y4U+PCNDVSW038LxRgpSGuWyXRISAA/bfzF53RcGuj9sF7tX0XgoHpjvqm1ReZIM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705972091; c=relaxed/simple; bh=OseBUT3CBeWThPaDWxfHBR+dzzmp8JJSPUxDXjLZ2mE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QSrxMryjAqrlU1Ri4SA9LUJ2xNfBbbTyOQiVGApaNvgROkq6k3PRPH5OutXxDmRflRWJlE5xglukHIWbq/xc4NlPi15NDW0khzLSB1A205l+It2L5yB2WTm78Muo/79ApX12eBKpcnIuxRmH5ajh+dId5tEPxI7cspci5LZYo4U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LUW1Rlw6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LUW1Rlw6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8EA2FC433C7; Tue, 23 Jan 2024 01:08:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705972090; bh=OseBUT3CBeWThPaDWxfHBR+dzzmp8JJSPUxDXjLZ2mE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LUW1Rlw6tbBvbbtA/doIpsNQd+oFpDh12sWhwgGQRQgzC0B5+M2f0G8NJOT3whwHU qKH9pkRfomDbSzDHHYBISzjjiMDvK6wFiPKALe8A935u0VFYa0Fg3F6hdh5Za/Waqk XF33/2irOu7cdTuAOlyXjGwTqBWDXtqzqxtbdD2E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mark Rutland , Mathieu Desnoyers , "Masami Hiramatsu (Google)" , "Steven Rostedt (Google)" , Sasha Levin Subject: [PATCH 5.15 031/374] tracing: Have large events show up as [LINE TOO BIG] instead of nothing Date: Mon, 22 Jan 2024 15:54:47 -0800 Message-ID: <20240122235745.723960496@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235744.598274724@linuxfoundation.org> References: <20240122235744.598274724@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Steven Rostedt (Google) [ Upstream commit b55b0a0d7c4aa2dac3579aa7e6802d1f57445096 ] If a large event was added to the ring buffer that is larger than what the trace_seq can handle, it just drops the output: ~# cat /sys/kernel/tracing/trace # tracer: nop # # entries-in-buffer/entries-written: 2/2 #P:8 # # _-----=> irqs-off/BH-disabled # / _----=> need-resched # | / _---=> hardirq/softirq # || / _--=> preempt-depth # ||| / _-=> migrate-disable # |||| / delay # TASK-PID CPU# ||||| TIMESTAMP FUNCTION # | | | ||||| | | <...>-859 [001] ..... 141.118951: tracing_mark_write <...>-859 [001] ..... 141.148201: tracing_mark_write: 78901234 Instead, catch this case and add some context: ~# cat /sys/kernel/tracing/trace # tracer: nop # # entries-in-buffer/entries-written: 2/2 #P:8 # # _-----=> irqs-off/BH-disabled # / _----=> need-resched # | / _---=> hardirq/softirq # || / _--=> preempt-depth # ||| / _-=> migrate-disable # |||| / delay # TASK-PID CPU# ||||| TIMESTAMP FUNCTION # | | | ||||| | | <...>-852 [001] ..... 121.550551: tracing_mark_write[LINE TOO BIG] <...>-852 [001] ..... 121.550581: tracing_mark_write: 78901234 This now emulates the same output as trace_pipe. Link: https://lore.kernel.org/linux-trace-kernel/20231209171058.78c1a026@gandalf.local.home Cc: Mark Rutland Cc: Mathieu Desnoyers Reviewed-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin --- kernel/trace/trace.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 91ff118138c8..66322196b256 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -4667,7 +4667,11 @@ static int s_show(struct seq_file *m, void *v) iter->leftover = ret; } else { - print_trace_line(iter); + ret = print_trace_line(iter); + if (ret == TRACE_TYPE_PARTIAL_LINE) { + iter->seq.full = 0; + trace_seq_puts(&iter->seq, "[LINE TOO BIG]\n"); + } ret = trace_print_seq(m, &iter->seq); /* * If we overflow the seq_file buffer, then it will -- 2.43.0