Received-SPF: pass (google.com: domain of linux-kernel+bounces-191576-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Ankur Arora <ankur.a.arora@oracle.com>
To: linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de, peterz@infradead.org, torvalds@linux-foundation.org,
        paulmck@kernel.org, rostedt@goodmis.org, mark.rutland@arm.com,
        juri.lelli@redhat.com, joel@joelfernandes.org, raghavendra.kt@amd.com,
        sshegde@linux.ibm.com, boris.ostrovsky@oracle.com,
        konrad.wilk@oracle.com, Ankur Arora <ankur.a.arora@oracle.com>,
        Masami Hiramatsu <mhiramat@kernel.org>
Subject: [PATCH v2 31/35] tracing: support lazy resched
Date: Mon, 27 May 2024 17:35:17 -0700
Message-Id: <20240528003521.979836-32-ankur.a.arora@oracle.com>
In-Reply-To: <20240528003521.979836-1-ankur.a.arora@oracle.com>
References: <20240528003521.979836-1-ankur.a.arora@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?taBzYBcKW1jcV55NTYudUFlUW3fO/TIqm0Ih1GKiQadlTL4U6eaiXY5fGJCN?=
 =?us-ascii?Q?oDYZ9cR0PURlxTENyq8kzXqUCaJnVc/c5ra6ZTJ1SE6Ev5CGjGJrd1vhDyrP?=
 =?us-ascii?Q?2MOedb8IYVi5eq3KksoT5a96hEa7aEUEwblff/6esAqfsENwaBACswxWX8UQ?=
 =?us-ascii?Q?QlCj4x5qAw+VR0UhIBuwfmFgs7czPnFelQATPdQwJcrzpMk9d6cnryQmGjDl?=
 =?us-ascii?Q?eQ7MW+shNb07kNIxQ0ljraUlJdk7DxEpv/29zeLGCeJhw5tPlnqG+o2JPrrx?=
 =?us-ascii?Q?MSaWUbE+hcDNqwNZ6XZqeOVzNJJNG1zUGzm0F7yqp/8YYbdCJdb4UFWFKNBV?=
 =?us-ascii?Q?vCmJ5uOFrsgm6m9I7VXhRXNatjss/mRWLGpO0yUgtraStCQHmKKR1sUzo4/g?=
 =?us-ascii?Q?WqzV0hwA9EeGmeZ4k9t09UWdfrh9m0a8G6HaRFyGgFPVUOUqFuG3bM7WICLS?=
 =?us-ascii?Q?TCcMgeZyYpiXEQpQpouj9RAGA00TmsPOSBz8lSAcfdu1ngkc+eesTp+boFwF?=
 =?us-ascii?Q?CbVvP+I+emrZZeDp4kACGtZ1LnzhofQQo+kXoU3qGkyZKU9oOJk5L4LahYwH?=
 =?us-ascii?Q?6dilouZwoXSN8lakMZNFtNWXoA3a3FRn2ZoH1Htvc30jIV/xv4cY9diNU7Ae?=
 =?us-ascii?Q?Vy1XPvP6/MI0xgEoLjhlXzKQg8cQ7eGenIAMfOJ5CWGUEMQS+xb1w2wEzRcq?=
 =?us-ascii?Q?/aLHyEvwiEFG7JtxbRtY4YcQJsmkoy1uOwEdXoj0dR2zDPTumDrpna6YJtE5?=
 =?us-ascii?Q?OKztTulGmxD+QJqv/deKUL2TvdhgSWuWfkVmGO5DJrKbDRRRcl/Kc4Kqi1u2?=
 =?us-ascii?Q?HXXQvyC4CWwrf3yqLpCDgOlMDMwa+fZTyEbSyfoL5fHfNK+Lt+FdRQMraqel?=
 =?us-ascii?Q?UMFUJSuSUiwuiomutmkNr/VbYbqwdvzuqVgk3BOvfHSbrWYBXqrjj0mpapmD?=
 =?us-ascii?Q?zJlq0UMiXn3282PJqfVpQjnoGJb37TF1prpypUMok9IG/jFP/UFTB3tQKpmH?=
 =?us-ascii?Q?Ps4TU79hVQ342wVvEbBw/BMu8fZVO9CY3/aljF2dzk4YmyV6s6UlunvEjDmg?=
 =?us-ascii?Q?pSS++PRD8SAaHMWCVLNfn2tjDhqlyLmxRxkewfz7Cm1koT27MPL2TsAp+/yi?=
 =?us-ascii?Q?+FiBShPueRHxaNEyp0mB7kPs2r8wLiZm6MC2P1bmZLrxuFyEzYPCBuuwDxyr?=
 =?us-ascii?Q?Jy5A6ev11+SNInjHqHhZsR/GjxxE1VZDEu9XQ4sypdTnHC+G0bWN/F5ygMkj?=
 =?us-ascii?Q?FsV3ZIztrqbP/nq+oEwuLyld8x/9BAWGahzDsHI9cjlW4yLlwZH5kclBHqkT?=
 =?us-ascii?Q?r4PstlSoB29cThYIVFd4ZIx7KXdSx+ffjoF1DPUFYQMNpwSnsPPuqJSjOa2U?=
 =?us-ascii?Q?WFxYrspOKidG/C+sK6loWRHnhp0eW4jk/wduxenn4ZBciZUnd9zBq+cMHFc+?=
 =?us-ascii?Q?iZ+BSwdI+NSrFAt+sQZ9DO3JyFW8Ok4Wf6wTyWUP9woSa+FZdArgKCwgM/MZ?=
 =?us-ascii?Q?MMrgG4LqsmhopgSNdnJm5zUWZuta5yrHIpraJ4c7tiDZBeCLtEwrny4RBAGg?=
 =?us-ascii?Q?VTbxMRk0KeHTFMHRrxqEV5S3ndP9Sxtp6Cmo7WySL3PkuTzb8c6WX6MDUJcn?=
 =?us-ascii?Q?sQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	q2+Dqck73u57lG2xDieVLhCz+RYQ2fy2DeXlfyXBVPs96Y/uKqXpAvTwjN7oB9s3DwP3Ds/w17ewET9z2MmX38+zOmgjaN4fNT0aImbWbvMJvqc5l6x6QMavLzNPiimS0zbwu8dyDkC2495ji4CDqRSog0CwXQ42CKV1LMVdwLlbAA7a6/k7i+dozwJIiigyXgwSBQeAAmXJyxDSWIqqYnEbDONaiDss0/Frlqi9zmN36hr4XQV912riwti9DQOxjFk178OdJn2zL9dodNMuSZFG3lKv26WIrRyFcXGISjRGEYpnHdGb5Octb1lAXRvqbZTzuWJe0Quo4wmWfWIwrukHLwPpoWpqAcEO3IhLsU6Ba5SC9s8Vo6S676BA+MtNc1nanab8yusDpCsE46uh3psU8/Jgk+B9s739usLywI6yD2p1KnMv3Peb+gGIfA46Mjjmh/KnG1uNdhj2Qm6YCH8fz9I0HxAJqP8rWggrdHTmetvCBqhzj6FSvcaB0aMoaa/+I7mUoSpLSbjILskB022btLO9pMljeA1HIB7xKxrsZN+LBVYdlDeUGsFbePc/UdtCMi6pbjH2PaS24HUXgrqQTirNR1PthlnDlaBkWh8=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6834cd4f-13b5-4913-7c69-08dc7eae47cd
X-MS-Exchange-CrossTenant-AuthSource: CO6PR10MB5409.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 00:36:57.4762
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 6tctMxPcMx2p3iZPLwE9eBwGDDTxjMs9VDb/S4837oqaxB7ORh3BeQ/FZC0LQoEiCjFEdswoJu/d6Wh2V17dUIXnCGnzoHf0ILEB3oixzzg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB7177
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16
 definitions=2024-05-27_06,2024-05-27_01,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 adultscore=0
 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000
 definitions=main-2405280003
X-Proofpoint-GUID: ImPh37L3gM42hIsA3r3nIuZMnMNuw8mg
X-Proofpoint-ORIG-GUID: ImPh37L3gM42hIsA3r3nIuZMnMNuw8mg

trace_entry::flags is full, so reuse the TRACE_FLAG_IRQS_NOSUPPORT
bit for this. The flag is safe to reuse since it is only used in
old archs that don't support lockdep irq tracing.

Also, now that we have a variety of need-resched combinations, document
these in the tracing headers.

Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Originally-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/lkml/87jzshhexi.ffs@tglx/
Signed-off-by: Ankur Arora <ankur.a.arora@oracle.com>
---
 include/linux/trace_events.h |  6 +++---
 kernel/trace/trace.c         | 28 ++++++++++++++++++----------
 kernel/trace/trace_output.c  | 16 ++++++++++++++--
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index 6f9bdfb09d1d..329002785b4d 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -184,7 +184,7 @@ unsigned int tracing_gen_ctx_irq_test(unsigned int irqs_status);
 
 enum trace_flag_type {
 	TRACE_FLAG_IRQS_OFF		= 0x01,
-	TRACE_FLAG_IRQS_NOSUPPORT	= 0x02,
+	TRACE_FLAG_NEED_RESCHED_LAZY    = 0x02,
 	TRACE_FLAG_NEED_RESCHED		= 0x04,
 	TRACE_FLAG_HARDIRQ		= 0x08,
 	TRACE_FLAG_SOFTIRQ		= 0x10,
@@ -211,11 +211,11 @@ static inline unsigned int tracing_gen_ctx(void)
 
 static inline unsigned int tracing_gen_ctx_flags(unsigned long irqflags)
 {
-	return tracing_gen_ctx_irq_test(TRACE_FLAG_IRQS_NOSUPPORT);
+	return tracing_gen_ctx_irq_test(0);
 }
 static inline unsigned int tracing_gen_ctx(void)
 {
-	return tracing_gen_ctx_irq_test(TRACE_FLAG_IRQS_NOSUPPORT);
+	return tracing_gen_ctx_irq_test(0);
 }
 #endif
 
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index ed229527be05..7941e9ec979a 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2513,6 +2513,8 @@ unsigned int tracing_gen_ctx_irq_test(unsigned int irqs_status)
 
 	if (__tif_need_resched(RESCHED_NOW))
 		trace_flags |= TRACE_FLAG_NEED_RESCHED;
+	if (__tif_need_resched(RESCHED_LAZY))
+		trace_flags |= TRACE_FLAG_NEED_RESCHED_LAZY;
 	if (test_preempt_need_resched())
 		trace_flags |= TRACE_FLAG_PREEMPT_RESCHED;
 	return (trace_flags << 16) | (min_t(unsigned int, pc & 0xff, 0xf)) |
@@ -4096,17 +4098,23 @@ unsigned long trace_total_entries(struct trace_array *tr)
 	return entries;
 }
 
+#ifdef CONFIG_PREEMPT_AUTO
+#define NR_LEGEND "l: lazy, n: now, p: preempt, b: l|n, L: l|p, N: n|p, B: l|n|p"
+#else
+#define NR_LEGEND "n: now, p: preempt, N: n|p"
+#endif
+
 static void print_lat_help_header(struct seq_file *m)
 {
-	seq_puts(m, "#                    _------=> CPU#            \n"
-		    "#                   / _-----=> irqs-off/BH-disabled\n"
-		    "#                  | / _----=> need-resched    \n"
-		    "#                  || / _---=> hardirq/softirq \n"
-		    "#                  ||| / _--=> preempt-depth   \n"
-		    "#                  |||| / _-=> migrate-disable \n"
-		    "#                  ||||| /     delay           \n"
-		    "#  cmd     pid     |||||| time  |   caller     \n"
-		    "#     \\   /        ||||||  \\    |    /       \n");
+	seq_printf(m, "#                    _------=> CPU#            \n"
+		      "#                   / _-----=> irqs-off/BH-disabled\n"
+		      "#                  | / _----=> need-resched ( %s ) \n"
+		      "#                  || / _---=> hardirq/softirq \n"
+		      "#                  ||| / _--=> preempt-depth   \n"
+		      "#                  |||| / _-=> migrate-disable \n"
+		      "#                  ||||| /     delay           \n"
+		      "#  cmd     pid     |||||| time  |   caller     \n"
+		      "#     \\   /        ||||||  \\    |    /       \n", NR_LEGEND);
 }
 
 static void print_event_info(struct array_buffer *buf, struct seq_file *m)
@@ -4141,7 +4149,7 @@ static void print_func_help_header_irq(struct array_buffer *buf, struct seq_file
 	print_event_info(buf, m);
 
 	seq_printf(m, "#                            %.*s  _-----=> irqs-off/BH-disabled\n", prec, space);
-	seq_printf(m, "#                            %.*s / _----=> need-resched\n", prec, space);
+	seq_printf(m, "#                            %.*s / _----=> need-resched ( %s )\n", prec, space, NR_LEGEND);
 	seq_printf(m, "#                            %.*s| / _---=> hardirq/softirq\n", prec, space);
 	seq_printf(m, "#                            %.*s|| / _--=> preempt-depth\n", prec, space);
 	seq_printf(m, "#                            %.*s||| / _-=> migrate-disable\n", prec, space);
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index d8b302d01083..4f58a196e14c 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -460,17 +460,29 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
 		(entry->flags & TRACE_FLAG_IRQS_OFF && bh_off) ? 'D' :
 		(entry->flags & TRACE_FLAG_IRQS_OFF) ? 'd' :
 		bh_off ? 'b' :
-		(entry->flags & TRACE_FLAG_IRQS_NOSUPPORT) ? 'X' :
+		!IS_ENABLED(CONFIG_TRACE_IRQFLAGS_SUPPORT) ? 'X' :
 		'.';
 
-	switch (entry->flags & (TRACE_FLAG_NEED_RESCHED |
+	switch (entry->flags & (TRACE_FLAG_NEED_RESCHED | TRACE_FLAG_NEED_RESCHED_LAZY |
 				TRACE_FLAG_PREEMPT_RESCHED)) {
+	case TRACE_FLAG_NEED_RESCHED | TRACE_FLAG_NEED_RESCHED_LAZY | TRACE_FLAG_PREEMPT_RESCHED:
+		need_resched = 'B';
+		break;
 	case TRACE_FLAG_NEED_RESCHED | TRACE_FLAG_PREEMPT_RESCHED:
 		need_resched = 'N';
 		break;
+	case TRACE_FLAG_NEED_RESCHED_LAZY | TRACE_FLAG_PREEMPT_RESCHED:
+		need_resched = 'L';
+		break;
+	case TRACE_FLAG_NEED_RESCHED | TRACE_FLAG_NEED_RESCHED_LAZY:
+		need_resched = 'b';
+		break;
 	case TRACE_FLAG_NEED_RESCHED:
 		need_resched = 'n';
 		break;
+	case TRACE_FLAG_NEED_RESCHED_LAZY:
+		need_resched = 'l';
+		break;
 	case TRACE_FLAG_PREEMPT_RESCHED:
 		need_resched = 'p';
 		break;
-- 
2.31.1