From nobody Sun Oct 5 09:05:16 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 B02BA205AA1; Wed, 6 Aug 2025 08:01:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754467298; cv=none; b=ppiC40snzaYQoQn4TofAqRbkPFUecPBH3rYG+EJe10sVQsYYYlZc+1nEjy16hnFt14Ickhqbvb/HBCCHDof7veK8IHWPJODDKheXivH7btyQE+DB9/jZZPuxAQjiirx/9g4tMRRxk5CYClekcv30Yi229xWElWjJAL92kjSI8IU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754467298; c=relaxed/simple; bh=Uesn38aob0MqcbKV3gio0rTGdqwKMtOR7nm2jvHxr4I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vF1LEYy9EZKNFKhlxIRzYbUxCxABr0SVxzNMDj43HoJu+nFMZPFctjtQu89fxZus1NH9Tj5vrn/G8ZctkoAAJEHcblxhK1xrYqVtbMrknbk0bmcIRFaePivzlPM11KDA51aE5vHuODYO4hFjAaGm5j3+hvyvpH9CaqYQ5tmCnQY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=03j0tmuS; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=fXsBEKlV; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="03j0tmuS"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="fXsBEKlV" From: Nam Cao DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1754467288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sTX3RTvCUX/Mm46SCDPZbioQpsq3KjD49jPHt93BLXs=; b=03j0tmuSn4UpxWJJQj6z/P+9XuWbi6fltbN3mVixvyEyvvJbb/oIpQi/G4kOs6qE8Jxy7l BL0oYhAjsuSQw4ZxjwYqwHUcpJRKq+dLcmOdtDkaitEWurekLEaexbD4UeO9VF06AA0pvw mhIbhC43DP022AXK1tfKmSpDmHqQh/8MuK8pWvqanPw1fNk2TTHOxkaalBjxLQ4hKEj2Vn 2MpJyA6tITd7X6DgULIO5QUoqOkZfRwOhkEy8M1aCHVO6Ds4+IbO53dOKKI02dJRTPr7nz Y38+Z0KXLUwdNhXD8cnL3JjfxfjmcnucdgmrNO3n1yCLsi2UXXsF46M2UU/O7g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1754467288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sTX3RTvCUX/Mm46SCDPZbioQpsq3KjD49jPHt93BLXs=; b=fXsBEKlVmyayAWh/cFcO94BIAdjcmqHmFrkFc5OkhhVDvsP5XWBj/+2nVyappRpGXberad 34zBKhvb+1DyfCBw== To: Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Gabriele Monaco , linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Nam Cao Subject: [PATCH v2 1/5] rv/ltl: Prepare for other monitor types Date: Wed, 6 Aug 2025 10:01:17 +0200 Message-Id: In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" rv/ltl_monitor.h is the template file used by all LTL monitors. But only per-task monitor is supported. Prepare to support for other monitor types: - Change the monitored target type into an opaque type which will be defined differently depending on the monitor type. This type is only defined as struct task_struct * for now. - Separate out the per-task-specific printf format and arguments, so that rv_cond_react() can be shared with other monitor types. No functional change intended. Reviewed-by: Gabriele Monaco Signed-off-by: Nam Cao --- v2: define the macros for DA usage as well --- include/linux/rv.h | 4 + include/rv/ltl_monitor.h | 85 +++++++++++-------- .../trace/rv/monitors/pagefault/pagefault.h | 2 + kernel/trace/rv/monitors/sleep/sleep.h | 2 + 4 files changed, 58 insertions(+), 35 deletions(-) diff --git a/include/linux/rv.h b/include/linux/rv.h index 14410a42faef..10a8be730d89 100644 --- a/include/linux/rv.h +++ b/include/linux/rv.h @@ -13,6 +13,10 @@ #define MAX_DA_NAME_LEN 32 #define MAX_DA_RETRY_RACING_EVENTS 3 =20 +#define RV_MON_GLOBAL 0 +#define RV_MON_PER_CPU 1 +#define RV_MON_PER_TASK 2 + #ifdef CONFIG_RV #include #include diff --git a/include/rv/ltl_monitor.h b/include/rv/ltl_monitor.h index 67031a774e3d..9dabc5b133a3 100644 --- a/include/rv/ltl_monitor.h +++ b/include/rv/ltl_monitor.h @@ -16,49 +16,63 @@ #error "Please include $(MODEL_NAME).h generated by rvgen" #endif =20 +#if LTL_MONITOR_TYPE =3D=3D RV_MON_PER_TASK + +#define TARGET_PRINT_FORMAT "%s[%d]" +#define TARGET_PRINT_ARGS(task) task->comm, task->pid + +typedef struct task_struct *monitor_target; + +#endif + #ifdef CONFIG_RV_REACTORS #define RV_MONITOR_NAME CONCATENATE(rv_, MONITOR_NAME) static struct rv_monitor RV_MONITOR_NAME; =20 -static void rv_cond_react(struct task_struct *task) +static void rv_cond_react(monitor_target target) { if (!rv_reacting_on() || !RV_MONITOR_NAME.react) return; - RV_MONITOR_NAME.react("rv: "__stringify(MONITOR_NAME)": %s[%d]: violation= detected\n", - task->comm, task->pid); + + RV_MONITOR_NAME.react( + "rv: "__stringify(MONITOR_NAME)": "TARGET_PRINT_FORMAT": violation detec= ted\n", + TARGET_PRINT_ARGS(target)); } #else -static void rv_cond_react(struct task_struct *task) +static void rv_cond_react(monitor_target target) { } #endif =20 -static int ltl_monitor_slot =3D RV_PER_TASK_MONITOR_INIT; +static void ltl_atoms_fetch(monitor_target target, struct ltl_monitor *mon= ); +static void ltl_atoms_init(monitor_target target, struct ltl_monitor *mon,= bool target_creation); =20 -static void ltl_atoms_fetch(struct task_struct *task, struct ltl_monitor *= mon); -static void ltl_atoms_init(struct task_struct *task, struct ltl_monitor *m= on, bool task_creation); +#if LTL_MONITOR_TYPE =3D=3D RV_MON_PER_TASK +static int ltl_monitor_slot =3D RV_PER_TASK_MONITOR_INIT; =20 -static struct ltl_monitor *ltl_get_monitor(struct task_struct *task) +static struct ltl_monitor *ltl_get_monitor(monitor_target target) { - return &task->rv[ltl_monitor_slot].ltl_mon; + return &target->rv[ltl_monitor_slot].ltl_mon; } +#endif =20 -static void ltl_task_init(struct task_struct *task, bool task_creation) +static void ltl_target_init(monitor_target target, bool target_creation) { - struct ltl_monitor *mon =3D ltl_get_monitor(task); + struct ltl_monitor *mon =3D ltl_get_monitor(target); =20 memset(&mon->states, 0, sizeof(mon->states)); =20 for (int i =3D 0; i < LTL_NUM_ATOM; ++i) __set_bit(i, mon->unknown_atoms); =20 - ltl_atoms_init(task, mon, task_creation); - ltl_atoms_fetch(task, mon); + ltl_atoms_init(target, mon, target_creation); + ltl_atoms_fetch(target, mon); } =20 +#if LTL_MONITOR_TYPE =3D=3D RV_MON_PER_TASK static void handle_task_newtask(void *data, struct task_struct *task, unsi= gned long flags) { - ltl_task_init(task, true); + ltl_target_init(task, true); } =20 static int ltl_monitor_init(void) @@ -77,10 +91,10 @@ static int ltl_monitor_init(void) read_lock(&tasklist_lock); =20 for_each_process_thread(g, p) - ltl_task_init(p, false); + ltl_target_init(p, false); =20 for_each_present_cpu(cpu) - ltl_task_init(idle_task(cpu), false); + ltl_target_init(idle_task(cpu), false); =20 read_unlock(&tasklist_lock); =20 @@ -94,17 +108,18 @@ static void ltl_monitor_destroy(void) rv_put_task_monitor_slot(ltl_monitor_slot); ltl_monitor_slot =3D RV_PER_TASK_MONITOR_INIT; } +#endif =20 -static void ltl_illegal_state(struct task_struct *task, struct ltl_monitor= *mon) +static void ltl_illegal_state(monitor_target target, struct ltl_monitor *m= on) { - CONCATENATE(trace_error_, MONITOR_NAME)(task); - rv_cond_react(task); + CONCATENATE(trace_error_, MONITOR_NAME)(target); + rv_cond_react(target); } =20 -static void ltl_attempt_start(struct task_struct *task, struct ltl_monitor= *mon) +static void ltl_attempt_start(monitor_target target, struct ltl_monitor *m= on) { if (rv_ltl_all_atoms_known(mon)) - ltl_start(task, mon); + ltl_start(target, mon); } =20 static inline void ltl_atom_set(struct ltl_monitor *mon, enum ltl_atom ato= m, bool value) @@ -117,7 +132,7 @@ static inline void ltl_atom_set(struct ltl_monitor *mon= , enum ltl_atom atom, boo } =20 static void -ltl_trace_event(struct task_struct *task, struct ltl_monitor *mon, unsigne= d long *next_state) +ltl_trace_event(monitor_target target, struct ltl_monitor *mon, unsigned l= ong *next_state) { const char *format_str =3D "%s"; DECLARE_SEQ_BUF(atoms, 64); @@ -137,10 +152,10 @@ ltl_trace_event(struct task_struct *task, struct ltl_= monitor *mon, unsigned long } } =20 - CONCATENATE(trace_event_, MONITOR_NAME)(task, states, atoms.buffer, next); + CONCATENATE(trace_event_, MONITOR_NAME)(target, states, atoms.buffer, nex= t); } =20 -static void ltl_validate(struct task_struct *task, struct ltl_monitor *mon) +static void ltl_validate(monitor_target target, struct ltl_monitor *mon) { DECLARE_BITMAP(next_states, RV_MAX_BA_STATES) =3D {0}; =20 @@ -152,35 +167,35 @@ static void ltl_validate(struct task_struct *task, st= ruct ltl_monitor *mon) ltl_possible_next_states(mon, i, next_states); } =20 - ltl_trace_event(task, mon, next_states); + ltl_trace_event(target, mon, next_states); =20 memcpy(mon->states, next_states, sizeof(next_states)); =20 if (!rv_ltl_valid_state(mon)) - ltl_illegal_state(task, mon); + ltl_illegal_state(target, mon); } =20 -static void ltl_atom_update(struct task_struct *task, enum ltl_atom atom, = bool value) +static void ltl_atom_update(monitor_target target, enum ltl_atom atom, boo= l value) { - struct ltl_monitor *mon =3D ltl_get_monitor(task); + struct ltl_monitor *mon =3D ltl_get_monitor(target); =20 ltl_atom_set(mon, atom, value); - ltl_atoms_fetch(task, mon); + ltl_atoms_fetch(target, mon); =20 if (!rv_ltl_valid_state(mon)) { - ltl_attempt_start(task, mon); + ltl_attempt_start(target, mon); return; } =20 - ltl_validate(task, mon); + ltl_validate(target, mon); } =20 -static void __maybe_unused ltl_atom_pulse(struct task_struct *task, enum l= tl_atom atom, bool value) +static void __maybe_unused ltl_atom_pulse(monitor_target target, enum ltl_= atom atom, bool value) { - struct ltl_monitor *mon =3D ltl_get_monitor(task); + struct ltl_monitor *mon =3D ltl_get_monitor(target); =20 - ltl_atom_update(task, atom, value); + ltl_atom_update(target, atom, value); =20 ltl_atom_set(mon, atom, !value); - ltl_validate(task, mon); + ltl_validate(target, mon); } diff --git a/kernel/trace/rv/monitors/pagefault/pagefault.h b/kernel/trace/= rv/monitors/pagefault/pagefault.h index c580ec194009..d449af84c24c 100644 --- a/kernel/trace/rv/monitors/pagefault/pagefault.h +++ b/kernel/trace/rv/monitors/pagefault/pagefault.h @@ -11,6 +11,8 @@ =20 #define MONITOR_NAME pagefault =20 +#define LTL_MONITOR_TYPE RV_MON_PER_TASK + enum ltl_atom { LTL_PAGEFAULT, LTL_RT, diff --git a/kernel/trace/rv/monitors/sleep/sleep.h b/kernel/trace/rv/monit= ors/sleep/sleep.h index 2ab46fd218d2..0c87875d9040 100644 --- a/kernel/trace/rv/monitors/sleep/sleep.h +++ b/kernel/trace/rv/monitors/sleep/sleep.h @@ -11,6 +11,8 @@ =20 #define MONITOR_NAME sleep =20 +#define LTL_MONITOR_TYPE RV_MON_PER_TASK + enum ltl_atom { LTL_ABORT_SLEEP, LTL_BLOCK_ON_RT_MUTEX, --=20 2.39.5 From nobody Sun Oct 5 09:05:16 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 B031820A5EC; Wed, 6 Aug 2025 08:01:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754467298; cv=none; b=U3RhedeLoM0YA0GFlc8BuSmAuEGxF0ZWbrFwngijsa5ATnQ9d/fcdTCowFduKme3/ST9mcYk55FlPZhO/vnNxrzdi5xZJ8Nnws5rkIGkTw16/1VpyDqggvQcmrcb6UbHF27FmKxKWiej2woZ6t9fp12JEhdr7LGZT1F/fkFynVs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754467298; c=relaxed/simple; bh=8ZQpaVqGZMiSUnYX8EDOyClxHz2CZCaC9dSfVWom550=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZGNErEVo3wcgk2p2hO0nfYxS4OZ/XG3FMIPc6h9hgtfaezCiRJKcHMrc2yHLn1jyKWuMVYoyHCAlptn1ZdH/zEZyqoDI2AfC0u+0TzZsyt8KosocEdvcT2ElzPndnaxFFtVzMx6bwRT0OVJfhVuW88gt+nKakrSmGXiFsi7WXAU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=hXNVaiXT; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=3YSL8LZr; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="hXNVaiXT"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="3YSL8LZr" From: Nam Cao DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1754467289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DnRAFrkM/lmqxcfi1GIpiaGCyoxcPE5rzhs8o1bC4d8=; b=hXNVaiXTyCTfcKjLSo1DfSw+WTfcwYfbAoCYqsXcm0zQxOlp5Qch4yH/wM6I3ibGnJoUdj vDdbax0TkPrWcK4Ef5KjjbuCCkTkpsRry3JHguP2Ag8hPNmkzMh475aEK6csFfvlRQqO8G F3kkbYL3OVpLYjBWm1L6+Tyv87bg8TdipPJsYblEHk3U5LhjEBeuMl0iD2WAZlsjlh5+t+ /VTGsOT4RjY1t51XD17nBINjzJc3b2W3r6BId84zUGyAcjynt0frPvK3KGf8RZwfcg1I44 S5juJt6D0Ho+8bVtfflKSo89eR7vTuZ3yYv5t4OY1uGiRDw7Nh2x9sBX/2P12A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1754467289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DnRAFrkM/lmqxcfi1GIpiaGCyoxcPE5rzhs8o1bC4d8=; b=3YSL8LZrXx49xc/4Wf9gd7WwOrspjctFTPD7mS2DTM+qO4E2mKFHNjdRs2EkmsLMCEmQ3y U9KNx7MxI2GczHDA== To: Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Gabriele Monaco , linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Nam Cao Subject: [PATCH v2 2/5] rv/ltl: Support per-cpu monitors Date: Wed, 6 Aug 2025 10:01:18 +0200 Message-Id: <8e2b9d37f0543b1c0f78119d459d2294d99c8d4d.1754466623.git.namcao@linutronix.de> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add support for per-cpu run-time verification linear temporal logic monitors. This is analogous to deterministic automaton per-cpu monitors. Signed-off-by: Nam Cao Reviewed-by: Gabriele Monaco --- v2: Rename "implicit" to "cpu" --- include/rv/ltl_monitor.h | 32 ++++++++++++++++++++++++++ kernel/trace/rv/Kconfig | 4 ++++ kernel/trace/rv/rv_trace.h | 46 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/include/rv/ltl_monitor.h b/include/rv/ltl_monitor.h index 9dabc5b133a3..4ad08b5b9f2d 100644 --- a/include/rv/ltl_monitor.h +++ b/include/rv/ltl_monitor.h @@ -23,12 +23,21 @@ =20 typedef struct task_struct *monitor_target; =20 +#elif LTL_MONITOR_TYPE =3D=3D RV_MON_PER_CPU + +#define TARGET_PRINT_FORMAT "%u" +#define TARGET_PRINT_ARGS(cpu) cpu + +typedef unsigned int monitor_target; + #endif =20 #ifdef CONFIG_RV_REACTORS #define RV_MONITOR_NAME CONCATENATE(rv_, MONITOR_NAME) static struct rv_monitor RV_MONITOR_NAME; =20 +static struct ltl_monitor *ltl_get_monitor(monitor_target target); + static void rv_cond_react(monitor_target target) { if (!rv_reacting_on() || !RV_MONITOR_NAME.react) @@ -54,6 +63,13 @@ static struct ltl_monitor *ltl_get_monitor(monitor_targe= t target) { return &target->rv[ltl_monitor_slot].ltl_mon; } +#elif LTL_MONITOR_TYPE =3D=3D RV_MON_PER_CPU +static struct ltl_monitor *ltl_get_monitor(unsigned int cpu) +{ + static DEFINE_PER_CPU(struct ltl_monitor, ltl_monitor); + + return per_cpu_ptr(<l_monitor, cpu); +} #endif =20 static void ltl_target_init(monitor_target target, bool target_creation) @@ -108,6 +124,22 @@ static void ltl_monitor_destroy(void) rv_put_task_monitor_slot(ltl_monitor_slot); ltl_monitor_slot =3D RV_PER_TASK_MONITOR_INIT; } + +#elif LTL_MONITOR_TYPE =3D=3D RV_MON_PER_CPU + +static int ltl_monitor_init(void) +{ + unsigned int cpu; + + for_each_possible_cpu(cpu) + ltl_target_init(cpu, false); + return 0; +} + +static void ltl_monitor_destroy(void) +{ +} + #endif =20 static void ltl_illegal_state(monitor_target target, struct ltl_monitor *m= on) diff --git a/kernel/trace/rv/Kconfig b/kernel/trace/rv/Kconfig index 5b4be87ba59d..7ef89006ed50 100644 --- a/kernel/trace/rv/Kconfig +++ b/kernel/trace/rv/Kconfig @@ -16,6 +16,10 @@ config DA_MON_EVENTS_ID select RV_MON_MAINTENANCE_EVENTS bool =20 +config LTL_MON_EVENTS_CPU + select RV_MON_EVENTS + bool + config LTL_MON_EVENTS_ID select RV_MON_EVENTS bool diff --git a/kernel/trace/rv/rv_trace.h b/kernel/trace/rv/rv_trace.h index 4a6faddac614..bf7cca6579ec 100644 --- a/kernel/trace/rv/rv_trace.h +++ b/kernel/trace/rv/rv_trace.h @@ -177,8 +177,54 @@ DECLARE_EVENT_CLASS(error_ltl_monitor_id, #include #include // Add new monitors based on CONFIG_LTL_MON_EVENTS_ID here + #endif /* CONFIG_LTL_MON_EVENTS_ID */ =20 +#ifdef CONFIG_LTL_MON_EVENTS_CPU +DECLARE_EVENT_CLASS(event_ltl_monitor_cpu, + + TP_PROTO(unsigned int cpu, char *states, char *atoms, char *next), + + TP_ARGS(cpu, states, atoms, next), + + TP_STRUCT__entry( + __field(unsigned int, cpu) + __string(states, states) + __string(atoms, atoms) + __string(next, next) + ), + + TP_fast_assign( + __entry->cpu =3D cpu; + __assign_str(states); + __assign_str(atoms); + __assign_str(next); + ), + + TP_printk("cpu%u: (%s) x (%s) -> (%s)", __entry->cpu, + __get_str(states), __get_str(atoms), __get_str(next)) +); + +DECLARE_EVENT_CLASS(error_ltl_monitor_cpu, + + TP_PROTO(unsigned int cpu), + + TP_ARGS(cpu), + + TP_STRUCT__entry( + __field(unsigned int, cpu) + ), + + TP_fast_assign( + __entry->cpu =3D cpu; + ), + + TP_printk("cpu%u: violation detected", __entry->cpu) +); +// Add new monitors based on CONFIG_LTL_MON_EVENTS_CPU here + +#endif /* CONFIG_LTL_MON_EVENTS_CPU */ + #ifdef CONFIG_RV_MON_MAINTENANCE_EVENTS /* Tracepoint useful for monitors development, currenly only used in DA */ TRACE_EVENT(rv_retries_error, --=20 2.39.5 From nobody Sun Oct 5 09:05:16 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 B044E2116F4; Wed, 6 Aug 2025 08:01:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754467298; cv=none; b=lfc8oIo6IAFgDZPnAFtYBkc98/CjVQnlJ8pw77sYIDQxE3+RLb1fpcter3rU9M25GCrukPr5mcHFVrPldI/nQN0YMs1wq6eIPr7y2Rj4FBrfg6ZNpGSwt4UtxUCKsRz/dXxQA6+Y3mr974SVZwE07gZwl9A5azTFAmhrmes0rfk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754467298; c=relaxed/simple; bh=O4M9P9bbDOeBu4tGqBBS/Tb//F+y3As0UX7VXDij8rk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mY7RO9yML2LtchnjDgHBDYMjr5eQhvsYO3G8slDO9Fd7F0dq/oeuzDOe9Fgxciro80lnQxROGBR+dhIZEXYbEpAujlV34e7CWB6+wXUQyJivj5eTR6iq3zdnqeF8k6IxJJU/UOd9EuHBNcbM6c/BT3t8SRf0v3Zn35E19yptQCw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=06lv+nZM; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=mj8TtcwE; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="06lv+nZM"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="mj8TtcwE" From: Nam Cao DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1754467289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HnQ0MQTw+BmLcjHv2s7gBeRp9uTmYr1O9CQGEJFdKQ0=; b=06lv+nZM+OXLzb1dkfxe9E5ljr4WmekGY87tMJ9NZmhCOyCiFvf6EKrl5KrmpeT+5N4ClQ khPlcDthK/f0WXcBlSyYDWCf2Cui6Odh8JikT5xKSzaKucWyWbFGBkUMB0XF4WqAjUpP1X vU1h8KOe4AO3Ubzl58Cwalwy93bEZdGmdmHsc8cnXFMj2o6OC3htNUgmrAB4Vt9giPQqYa JRjlzCBgkDYW1JulU73YDpxOlRpruiyis+mdNBnh7QnAUz2b2AD3OzJud1z2gAjBjr6nEX 5M1Rou/j/+VxFQ8Qa46TsV2+X0hYeJAPmBIAmg8Qwbb3EKdEdMIwDsi30LQkjQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1754467289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HnQ0MQTw+BmLcjHv2s7gBeRp9uTmYr1O9CQGEJFdKQ0=; b=mj8TtcwEEWP/D9zM+u7ZZUoyMRMjEsZWeKTTCFytf0HP1hfB61Ig7rd6GMnmosivnPXhOg sNB//qXNjaIDp0Cw== To: Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Gabriele Monaco , linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Nam Cao Subject: [PATCH v2 3/5] verification/rvgen/ltl: Support per-cpu monitor generation Date: Wed, 6 Aug 2025 10:01:19 +0200 Message-Id: In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add support to generate per-cpu LTL monitors. Similar to generating per-cpu monitors from .dot files, the "-t per_cpu" parameter can be used to generate per-cpu monitors from .ltl files. Signed-off-by: Nam Cao --- v2: Rename "implicit" to "cpu" --- tools/verification/rvgen/rvgen/ltl2k.py | 48 ++++++++++++++++--- .../rvgen/rvgen/templates/ltl2k/main.c | 9 ++-- .../rvgen/rvgen/templates/ltl2k/trace.h | 7 ++- 3 files changed, 50 insertions(+), 14 deletions(-) diff --git a/tools/verification/rvgen/rvgen/ltl2k.py b/tools/verification/r= vgen/rvgen/ltl2k.py index b075f98d50c4..f291d1f03d05 100644 --- a/tools/verification/rvgen/rvgen/ltl2k.py +++ b/tools/verification/rvgen/rvgen/ltl2k.py @@ -57,9 +57,16 @@ class ltl2k(generator.Monitor): template_dir =3D "ltl2k" =20 def __init__(self, file_path, MonitorType, extra_params=3D{}): - if MonitorType !=3D "per_task": - raise NotImplementedError("Only per_task monitor is supported = for LTL") + if MonitorType =3D=3D "per_task": + self._target_arg =3D "struct task_struct *task" + self._target =3D "task" + elif MonitorType =3D=3D "per_cpu": + self._target_arg =3D "unsigned int cpu" + self._target =3D "cpu" + else: + raise NotImplementedError(f"LTL does not support monitor type = {MonitorType}") super().__init__(extra_params) + self.monitor_type =3D MonitorType with open(file_path) as f: self.atoms, self.ba, self.ltl =3D ltl2ba.create_graph(f.read()) self.atoms_abbr =3D abbreviate_atoms(self.atoms) @@ -67,6 +74,13 @@ class ltl2k(generator.Monitor): if not self.name: self.name =3D Path(file_path).stem =20 + def _fill_monitor_type(self) -> str: + if self.monitor_type =3D=3D "per_task": + return "#define LTL_MONITOR_TYPE RV_MON_PER_TASK" + if self.monitor_type =3D=3D "per_cpu": + return "#define LTL_MONITOR_TYPE RV_MON_PER_CPU" + assert False + def _fill_states(self) -> str: buf =3D [ "enum ltl_buchi_state {", @@ -174,7 +188,7 @@ class ltl2k(generator.Monitor): =20 def _fill_start(self): buf =3D [ - "static void ltl_start(struct task_struct *task, struct ltl_mo= nitor *mon)", + "static void ltl_start(%s, struct ltl_monitor *mon)" % self._t= arget_arg, "{" ] =20 @@ -205,7 +219,7 @@ class ltl2k(generator.Monitor): buff =3D [] buff.append("static void handle_example_event(void *data, /* XXX: = fill header */)") buff.append("{") - buff.append("\tltl_atom_update(task, LTL_%s, true/false);" % self.= atoms[0]) + buff.append("\tltl_atom_update(%s, LTL_%s, true/false);" % (self._= target, self.atoms[0])) buff.append("}") buff.append("") return '\n'.join(buff) @@ -241,6 +255,9 @@ class ltl2k(generator.Monitor): "" ] =20 + buf.append(self._fill_monitor_type()) + buf.append('') + buf.extend(self._fill_atoms()) buf.append('') =20 @@ -259,13 +276,32 @@ class ltl2k(generator.Monitor): return '\n'.join(buf) =20 def fill_monitor_class_type(self): - return "LTL_MON_EVENTS_ID" + if self.monitor_type =3D=3D "per_task": + return "LTL_MON_EVENTS_ID" + if self.monitor_type =3D=3D "per_cpu": + return "LTL_MON_EVENTS_CPU" + assert False =20 def fill_monitor_class(self): - return "ltl_monitor_id" + if self.monitor_type =3D=3D "per_task": + return "ltl_monitor_id" + if self.monitor_type =3D=3D "per_cpu": + return "ltl_monitor_cpu" + assert False + + def fill_tracepoint_args_skel(self, tp_type): + if tp_type =3D=3D "event": + return \ + ("\tTP_PROTO(%s, char *states, char *atoms, char *next),\n= " % self._target_arg) + \ + ("\tTP_ARGS(%s, states, atoms, next)" % self._target) + if tp_type =3D=3D "error": + return \ + ("\tTP_PROTO(%s),\n" % self._target_arg) + \ + ("\tTP_ARGS(%s)" % self._target) =20 def fill_main_c(self): main_c =3D super().fill_main_c() main_c =3D main_c.replace("%%ATOMS_INIT%%", self.fill_atoms_init()) + main_c =3D main_c.replace("%%TARGET_ARG%%", self._target_arg) =20 return main_c diff --git a/tools/verification/rvgen/rvgen/templates/ltl2k/main.c b/tools/= verification/rvgen/rvgen/templates/ltl2k/main.c index f85d076fbf78..09167efbfbf0 100644 --- a/tools/verification/rvgen/rvgen/templates/ltl2k/main.c +++ b/tools/verification/rvgen/rvgen/templates/ltl2k/main.c @@ -23,7 +23,7 @@ #include "%%MODEL_NAME%%.h" #include =20 -static void ltl_atoms_fetch(struct task_struct *task, struct ltl_monitor *= mon) +static void ltl_atoms_fetch(%%TARGET_ARG%%, struct ltl_monitor *mon) { /* * This is called everytime the Buchi automaton is triggered. @@ -36,13 +36,14 @@ static void ltl_atoms_fetch(struct task_struct *task, s= truct ltl_monitor *mon) */ } =20 -static void ltl_atoms_init(struct task_struct *task, struct ltl_monitor *m= on, bool task_creation) +static void ltl_atoms_init(%%TARGET_ARG%%, struct ltl_monitor *mon, bool t= arget_creation) { /* * This should initialize as many atomic propositions as possible. * - * @task_creation indicates whether the task is being created. This is - * false if the task is already running before the monitor is enabled. + * @target_creation indicates whether the monitored target is being + * created. This is false if the monitor target is already online before + * the monitor is enabled. */ %%ATOMS_INIT%% } diff --git a/tools/verification/rvgen/rvgen/templates/ltl2k/trace.h b/tools= /verification/rvgen/rvgen/templates/ltl2k/trace.h index 49394c4b0f1c..87d3a1308926 100644 --- a/tools/verification/rvgen/rvgen/templates/ltl2k/trace.h +++ b/tools/verification/rvgen/rvgen/templates/ltl2k/trace.h @@ -6,9 +6,8 @@ =20 #ifdef CONFIG_RV_MON_%%MODEL_NAME_UP%% DEFINE_EVENT(event_%%MONITOR_CLASS%%, event_%%MODEL_NAME%%, - TP_PROTO(struct task_struct *task, char *states, char *atoms, char *= next), - TP_ARGS(task, states, atoms, next)); +%%TRACEPOINT_ARGS_SKEL_EVENT%%); + DEFINE_EVENT(error_%%MONITOR_CLASS%%, error_%%MODEL_NAME%%, - TP_PROTO(struct task_struct *task), - TP_ARGS(task)); +%%TRACEPOINT_ARGS_SKEL_ERROR%%); #endif /* CONFIG_RV_MON_%%MODEL_NAME_UP%% */ --=20 2.39.5 From nobody Sun Oct 5 09:05:16 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 B90EA202F87; Wed, 6 Aug 2025 08:01:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754467300; cv=none; b=iIGBSaCxkdDYswDPAN37EjHYTymirmxl/w+0zZ4PJtAT/B3aapsASuroU8NeFL7N0omojcKCkCatB1tHSbFLtBhPhLc+4LFbniVjcmRGndVuZm7Hfz+x41WSJtQEKauk1iyMqeRAP4FxOCxVkC0U3zQ1hwyBzYKm92EMe397+6s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754467300; c=relaxed/simple; bh=e1GY5vP2bNmEyxjinI6NGV5JEY4vvanAT/Q+7Kr9JzI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ybm3yNaTMaF0NUCvnAFPDZ55NyHWCF7S+GQVc+fNXzjhP1Ccr6KaxYrHRq586dtTxbc2CLKEcap2crAcUILXQLYEgdDRCFFUnO0vhTlt3K4ob6zkpSSQ0/kQ4tCnRw++lhVtEbSxdoWYk4gtDMyEjbs8Yx5PzPwSh/tCHLqFl4g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=BJO+Z6HY; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=7pY9NSpm; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="BJO+Z6HY"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="7pY9NSpm" From: Nam Cao DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1754467290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9TG2oABEAGBSkyTcy0x4wV10S9w0c3hQgYmDbKB7zh8=; b=BJO+Z6HYp1NNFmnvkJBM/hOq/oK3qFXsWgB0dFU89oYtEEY/HQZVrIGLAB3MVnf7vH2KeZ kVcQtCuSPl3K7BFLPswrrd4EfT/wIGFJgMzZoRKaZHj8plg1krifQKhkwxhnPnGJl1ByQD ny59/x4t72Cg+O7yu1Zm5tekq7/fTWKj88S159zOcoAXZ9j7nXVZvehmxTvdEtefa85OBe 2MC89Yh8nskBJrq+eAeHQxpcGNl99OFXAOf7jl1xkdS1tgQTYi4g0blxSmVXiLciTCKfwV 56fYv+9OlxkKURng/Jb7E6yrMz8zmMh0r4y9zuybCyUhMDYAdp5sblYU5aXGOA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1754467290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9TG2oABEAGBSkyTcy0x4wV10S9w0c3hQgYmDbKB7zh8=; b=7pY9NSpmXsuqhqJlheAoXPcnN0wF8Tr74oez3fLekjJUVJiGwetMqZT7UDeOznONvWo89v B5fBOsGCNyHyI6Cg== To: Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Gabriele Monaco , linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Nam Cao , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Ben Segall , Mel Gorman , Valentin Schneider , K Prateek Nayak Subject: [PATCH v2 4/5] sched: Add task enqueue/dequeue trace points Date: Wed, 6 Aug 2025 10:01:20 +0200 Message-Id: In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add trace points into enqueue_task() and dequeue_task(). They are useful to implement RV monitor which validates RT scheduling. Signed-off-by: Nam Cao --- Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Juri Lelli Cc: Vincent Guittot Cc: Dietmar Eggemann Cc: Ben Segall Cc: Mel Gorman Cc: Valentin Schneider Cc: K Prateek Nayak --- v2: Move the tracepoints to cover all task enqueue/dequeue, not just RT --- include/trace/events/sched.h | 13 +++++++++++++ kernel/sched/core.c | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index c08893bde255..ec38928e61e7 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -898,6 +898,19 @@ DECLARE_TRACE(sched_set_need_resched, TP_PROTO(struct task_struct *tsk, int cpu, int tif), TP_ARGS(tsk, cpu, tif)); =20 +/* + * The two trace points below may not work as expected for fair tasks due + * to delayed dequeue. See: + * https://lore.kernel.org/lkml/179674c6-f82a-4718-ace2-67b5e672fdee@amd.c= om/ + */ +DECLARE_TRACE(enqueue_task, + TP_PROTO(int cpu, struct task_struct *task), + TP_ARGS(cpu, task)); + +DECLARE_TRACE(dequeue_task, + TP_PROTO(int cpu, struct task_struct *task), + TP_ARGS(cpu, task)); + #endif /* _TRACE_SCHED_H */ =20 /* This part must be outside protection */ diff --git a/kernel/sched/core.c b/kernel/sched/core.c index b485e0639616..553c08a63395 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2077,6 +2077,8 @@ unsigned long get_wchan(struct task_struct *p) =20 void enqueue_task(struct rq *rq, struct task_struct *p, int flags) { + trace_enqueue_task_tp(rq->cpu, p); + if (!(flags & ENQUEUE_NOCLOCK)) update_rq_clock(rq); =20 @@ -2119,7 +2121,11 @@ inline bool dequeue_task(struct rq *rq, struct task_= struct *p, int flags) * and mark the task ->sched_delayed. */ uclamp_rq_dec(rq, p); - return p->sched_class->dequeue_task(rq, p, flags); + if (p->sched_class->dequeue_task(rq, p, flags)) { + trace_dequeue_task_tp(rq->cpu, p); + return true; + } + return false; } =20 void activate_task(struct rq *rq, struct task_struct *p, int flags) --=20 2.39.5 From nobody Sun Oct 5 09:05:16 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 3D627220696; Wed, 6 Aug 2025 08:01:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754467303; cv=none; b=jySi+L2FhUE+6DoVn1B+2fSV/nWNEgNobWmo/7uLg3acIqazCgDG1ibvWso1h9wGXKv1YbcmifwTR5XZhL6EdtB6DuD+mNZCzaA2zExT982BeN88UnuMuSv9bq5ePKwdIE3qEkBndtyV76JPB7VitO86P1Vc3ZZ6InMhuEBb5lE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754467303; c=relaxed/simple; bh=BADNlnr1kahP8rhg4GWY4CVvz7wi0h9h7FQXGQQn0ew=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qXPhKGIcWKb+2i6WsQArNJ8ab3Yr2qGS6yYzV4HWKGarYmvhcqD7iM2PcleE8IF4/RAiCmzmKlmP9i1EetKbosRUAh0MrRBjPJa1aKz9uxaTMfBKEQ0Dvs2J0FEsXQJ+3iyzs5NDk7dI86DP+2KywyCAuFn7CnD4+rjk13QHOBk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=JnNsKd2f; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=oB5ahXfZ; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="JnNsKd2f"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="oB5ahXfZ" From: Nam Cao DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1754467291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8zmzmOCHQBCMM1BNC7xojuuKhp7HRhP0dq47/Fa8kkU=; b=JnNsKd2fydome4WKvfwKdMeQELD8vZjZ95yEPfrAml7w11g0eSeEQMAy1IcvZLFIlmEqfD K0ttWtxNp05RsyluXwCPCd8rZt3nL3jTFHKGQO3my5X5uWqQuKXDN15LwUTvtu+U3kcGHe CvcNSEya2FS6+qZ/zzhCQFz5+KNAxrPaV41J1HtwqgMuyU4YG2+Eq+68W8qOnPCnXgNkct 6unFjykCn8yykZAjKCNNVn1iXygb/Mlle9TESjzxR86J/2NLBpd1yfea7mf4H82sUsfUOg NqwDCOy92jW3o+BMOWyPoZtdKrz57WStv65l8gUBEjTVl7O33wrAGt7LKmSGtw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1754467291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8zmzmOCHQBCMM1BNC7xojuuKhp7HRhP0dq47/Fa8kkU=; b=oB5ahXfZFLRfrIbO4jAiaNyFh/wOFwKu6j39zQmPXEcT655TjdNNBy3fWGVCUedfe6q18z s4ECgb5tzgh01nAQ== To: Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Gabriele Monaco , linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Nam Cao , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Ben Segall , Mel Gorman , Valentin Schneider , K Prateek Nayak Subject: [PATCH v2 5/5] rv: Add rts monitor Date: Wed, 6 Aug 2025 10:01:21 +0200 Message-Id: <88fdbeb3f2ecf3a6259f3ee8636ae5b21fa6b72d.1754466623.git.namcao@linutronix.de> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add "real-time scheduling" monitor, which validates that SCHED_RR and SCHED_FIFO tasks are scheduled before tasks with normal and extensible scheduling policies Signed-off-by: Nam Cao --- Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Juri Lelli Cc: Vincent Guittot Cc: Dietmar Eggemann Cc: Ben Segall Cc: Mel Gorman Cc: Valentin Schneider Cc: K Prateek Nayak --- v2: - use the new tracepoints - move to be under the rtapp container monitor - re-generate with the modified scripts - fixup incorrect enqueued status --- Documentation/trace/rv/monitor_sched.rst | 19 +++ kernel/trace/rv/Kconfig | 1 + kernel/trace/rv/Makefile | 1 + kernel/trace/rv/monitors/rts/Kconfig | 17 +++ kernel/trace/rv/monitors/rts/rts.c | 144 +++++++++++++++++++++++ kernel/trace/rv/monitors/rts/rts.h | 126 ++++++++++++++++++++ kernel/trace/rv/monitors/rts/rts_trace.h | 15 +++ kernel/trace/rv/rv_trace.h | 1 + tools/verification/models/sched/rts.ltl | 5 + 9 files changed, 329 insertions(+) create mode 100644 kernel/trace/rv/monitors/rts/Kconfig create mode 100644 kernel/trace/rv/monitors/rts/rts.c create mode 100644 kernel/trace/rv/monitors/rts/rts.h create mode 100644 kernel/trace/rv/monitors/rts/rts_trace.h create mode 100644 tools/verification/models/sched/rts.ltl diff --git a/Documentation/trace/rv/monitor_sched.rst b/Documentation/trace= /rv/monitor_sched.rst index 3f8381ad9ec7..2f9d62a1af1f 100644 --- a/Documentation/trace/rv/monitor_sched.rst +++ b/Documentation/trace/rv/monitor_sched.rst @@ -396,6 +396,25 @@ preemption is always disabled. On non- ``PREEMPT_RT`` = kernels, the interrupts might invoke a softirq to set ``need_resched`` and wake up a task. This is another special case that is currently not supported by the monitor. =20 +Monitor rts +----------- + +The real-time scheduling monitor validates that tasks with real-time sched= uling +policies (`SCHED_FIFO` and `SCHED_RR`) are always scheduled before tasks w= ith +normal and extensible scheduling policies (`SCHED_OTHER`, `SCHED_BATCH`, +`SCHED_IDLE`, `SCHED_EXT`): + +.. literalinclude:: ../../../tools/verification/models/sched/rts.ltl + +Note that this monitor may report errors if real-time throttling or fair +deadline server is enabled. These mechanisms prevent real-time tasks from +monopolying the CPU by giving tasks with normal and extensible scheduling +policies a chance to run. They give system administrators a chance to kill= a +misbehaved real-time task. However, they violate the scheduling priorities= and +may cause latency to well-behaved real-time tasks. Thus, if you see errors= from +this monitor, consider disabling real-time throttling and the fair deadline +server. + References ---------- =20 diff --git a/kernel/trace/rv/Kconfig b/kernel/trace/rv/Kconfig index 7ef89006ed50..e9007ed32aea 100644 --- a/kernel/trace/rv/Kconfig +++ b/kernel/trace/rv/Kconfig @@ -67,6 +67,7 @@ source "kernel/trace/rv/monitors/opid/Kconfig" source "kernel/trace/rv/monitors/rtapp/Kconfig" source "kernel/trace/rv/monitors/pagefault/Kconfig" source "kernel/trace/rv/monitors/sleep/Kconfig" +source "kernel/trace/rv/monitors/rts/Kconfig" # Add new rtapp monitors here =20 # Add new monitors here diff --git a/kernel/trace/rv/Makefile b/kernel/trace/rv/Makefile index 750e4ad6fa0f..d7bfc7ae6677 100644 --- a/kernel/trace/rv/Makefile +++ b/kernel/trace/rv/Makefile @@ -17,6 +17,7 @@ obj-$(CONFIG_RV_MON_STS) +=3D monitors/sts/sts.o obj-$(CONFIG_RV_MON_NRP) +=3D monitors/nrp/nrp.o obj-$(CONFIG_RV_MON_SSSW) +=3D monitors/sssw/sssw.o obj-$(CONFIG_RV_MON_OPID) +=3D monitors/opid/opid.o +obj-$(CONFIG_RV_MON_RTS) +=3D monitors/rts/rts.o # Add new monitors here obj-$(CONFIG_RV_REACTORS) +=3D rv_reactors.o obj-$(CONFIG_RV_REACT_PRINTK) +=3D reactor_printk.o diff --git a/kernel/trace/rv/monitors/rts/Kconfig b/kernel/trace/rv/monitor= s/rts/Kconfig new file mode 100644 index 000000000000..5481b371bce1 --- /dev/null +++ b/kernel/trace/rv/monitors/rts/Kconfig @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +config RV_MON_RTS + depends on RV + select RV_LTL_MONITOR + depends on RV_MON_RTAPP + default y + select LTL_MON_EVENTS_CPU + bool "rts monitor" + help + Add support for RTS (real-time scheduling) monitor which validates + that real-time-priority tasks are scheduled before SCHED_OTHER tasks. + + This monitor may report an error if RT throttling or deadline server + is enabled. + + Say Y if you are debugging or testing a real-time system. diff --git a/kernel/trace/rv/monitors/rts/rts.c b/kernel/trace/rv/monitors/= rts/rts.c new file mode 100644 index 000000000000..b4c3d3a4671d --- /dev/null +++ b/kernel/trace/rv/monitors/rts/rts.c @@ -0,0 +1,144 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define MODULE_NAME "rts" + +#include +#include +#include + +#include "rts.h" +#include + +static DEFINE_PER_CPU(unsigned int, nr_queued); + +static void ltl_atoms_fetch(unsigned int cpu, struct ltl_monitor *mon) +{ +} + +static void ltl_atoms_init(unsigned int cpu, struct ltl_monitor *mon, + bool target_creation) +{ + ltl_atom_set(mon, LTL_SCHED_SWITCH, false); + ltl_atom_set(mon, LTL_SCHED_SWITCH_DL, false); + ltl_atom_set(mon, LTL_SCHED_SWITCH_RT, false); + + /* + * This may not be accurate, there may be enqueued RT tasks. But that's + * okay, the worst we get is a false negative. It will be accurate as + * soon as the CPU no longer has any queued RT task. + */ + ltl_atom_set(mon, LTL_RT_TASK_ENQUEUED, false); +} + +static void handle_enqueue_task(void *data, int cpu, struct task_struct *t= ask) +{ + unsigned int *queued =3D per_cpu_ptr(&nr_queued, cpu); + + if (!rt_task(task)) + return; + + (*queued)++; + ltl_atom_update(cpu, LTL_RT_TASK_ENQUEUED, true); +} + +static void handle_dequeue_task(void *data, int cpu, struct task_struct *t= ask) +{ + unsigned int *queued =3D per_cpu_ptr(&nr_queued, cpu); + + if (!rt_task(task)) + return; + + /* + * This may not be accurate for a short time after the monitor is + * enabled, because there may be enqueued RT tasks which are not counted + * torward nr_queued. But that's okay, the worst we get is a false + * negative. nr_queued will be accurate as soon as the CPU no longer has + * any queued RT task. + */ + if (*queued) + (*queued)--; + if (!*queued) + ltl_atom_update(cpu, LTL_RT_TASK_ENQUEUED, false); +} + +static void handle_sched_switch(void *data, bool preempt, struct task_stru= ct *prev, + struct task_struct *next, unsigned int prev_state) +{ + unsigned int cpu =3D smp_processor_id(); + struct ltl_monitor *mon =3D ltl_get_monitor(cpu); + + ltl_atom_set(mon, LTL_SCHED_SWITCH_RT, rt_task(next)); + ltl_atom_set(mon, LTL_SCHED_SWITCH_DL, dl_task(next)); + ltl_atom_update(cpu, LTL_SCHED_SWITCH, true); + + ltl_atom_set(mon, LTL_SCHED_SWITCH_RT, false); + ltl_atom_set(mon, LTL_SCHED_SWITCH_DL, false); + ltl_atom_update(cpu, LTL_SCHED_SWITCH, false); +} + +static int enable_rts(void) +{ + unsigned int cpu; + int retval; + + retval =3D ltl_monitor_init(); + if (retval) + return retval; + + for_each_possible_cpu(cpu) { + unsigned int *queued =3D per_cpu_ptr(&nr_queued, cpu); + + *queued =3D 0; + } + + rv_attach_trace_probe("rts", dequeue_task_tp, handle_dequeue_task); + rv_attach_trace_probe("rts", enqueue_task_tp, handle_enqueue_task); + rv_attach_trace_probe("rts", sched_switch, handle_sched_switch); + + return 0; +} + +static void disable_rts(void) +{ + rv_detach_trace_probe("rts", sched_switch, handle_sched_switch); + rv_detach_trace_probe("rts", enqueue_task_tp, handle_enqueue_task); + rv_detach_trace_probe("rts", dequeue_task_tp, handle_dequeue_task); + + ltl_monitor_destroy(); +} + +/* + * This is the monitor register section. + */ +static struct rv_monitor rv_rts =3D { + .name =3D "rts", + .description =3D "Validate that real-time tasks are scheduled before lowe= r-priority tasks", + .enable =3D enable_rts, + .disable =3D disable_rts, +}; + +static int __init register_rts(void) +{ + return rv_register_monitor(&rv_rts, &rv_rtapp); +} + +static void __exit unregister_rts(void) +{ + rv_unregister_monitor(&rv_rts); +} + +module_init(register_rts); +module_exit(unregister_rts); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Nam Cao "); +MODULE_DESCRIPTION("rts: Validate that real-time tasks are scheduled befor= e lower-priority tasks"); diff --git a/kernel/trace/rv/monitors/rts/rts.h b/kernel/trace/rv/monitors/= rts/rts.h new file mode 100644 index 000000000000..5881f30a38ce --- /dev/null +++ b/kernel/trace/rv/monitors/rts/rts.h @@ -0,0 +1,126 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * C implementation of Buchi automaton, automatically generated by + * tools/verification/rvgen from the linear temporal logic specification. + * For further information, see kernel documentation: + * Documentation/trace/rv/linear_temporal_logic.rst + */ + +#include + +#define MONITOR_NAME rts + +#define LTL_MONITOR_TYPE RV_MON_PER_CPU + +enum ltl_atom { + LTL_RT_TASK_ENQUEUED, + LTL_SCHED_SWITCH, + LTL_SCHED_SWITCH_DL, + LTL_SCHED_SWITCH_RT, + LTL_NUM_ATOM +}; +static_assert(LTL_NUM_ATOM <=3D RV_MAX_LTL_ATOM); + +static const char *ltl_atom_str(enum ltl_atom atom) +{ + static const char *const names[] =3D { + "rt_ta_en", + "sc_sw", + "sc_sw_dl", + "sc_sw_rt", + }; + + return names[atom]; +} + +enum ltl_buchi_state { + S0, + S1, + S2, + S3, + S4, + RV_NUM_BA_STATES +}; +static_assert(RV_NUM_BA_STATES <=3D RV_MAX_BA_STATES); + +static void ltl_start(unsigned int cpu, struct ltl_monitor *mon) +{ + bool sched_switch_rt =3D test_bit(LTL_SCHED_SWITCH_RT, mon->atoms); + bool sched_switch_dl =3D test_bit(LTL_SCHED_SWITCH_DL, mon->atoms); + bool sched_switch =3D test_bit(LTL_SCHED_SWITCH, mon->atoms); + bool rt_task_enqueued =3D test_bit(LTL_RT_TASK_ENQUEUED, mon->atoms); + bool val13 =3D !rt_task_enqueued; + bool val8 =3D sched_switch_dl || val13; + bool val9 =3D sched_switch_rt || val8; + bool val6 =3D !sched_switch; + bool val1 =3D !rt_task_enqueued; + + if (val1) + __set_bit(S0, mon->states); + if (val6) + __set_bit(S1, mon->states); + if (val9) + __set_bit(S4, mon->states); +} + +static void +ltl_possible_next_states(struct ltl_monitor *mon, unsigned int state, unsi= gned long *next) +{ + bool sched_switch_rt =3D test_bit(LTL_SCHED_SWITCH_RT, mon->atoms); + bool sched_switch_dl =3D test_bit(LTL_SCHED_SWITCH_DL, mon->atoms); + bool sched_switch =3D test_bit(LTL_SCHED_SWITCH, mon->atoms); + bool rt_task_enqueued =3D test_bit(LTL_RT_TASK_ENQUEUED, mon->atoms); + bool val13 =3D !rt_task_enqueued; + bool val8 =3D sched_switch_dl || val13; + bool val9 =3D sched_switch_rt || val8; + bool val6 =3D !sched_switch; + bool val1 =3D !rt_task_enqueued; + + switch (state) { + case S0: + if (val1) + __set_bit(S0, next); + if (val6) + __set_bit(S1, next); + if (val9) + __set_bit(S4, next); + break; + case S1: + if (val6) + __set_bit(S1, next); + if (val1 && val6) + __set_bit(S2, next); + if (val1 && val9) + __set_bit(S3, next); + if (val9) + __set_bit(S4, next); + break; + case S2: + if (val6) + __set_bit(S1, next); + if (val1 && val6) + __set_bit(S2, next); + if (val1 && val9) + __set_bit(S3, next); + if (val9) + __set_bit(S4, next); + break; + case S3: + if (val1) + __set_bit(S0, next); + if (val6) + __set_bit(S1, next); + if (val9) + __set_bit(S4, next); + break; + case S4: + if (val1) + __set_bit(S0, next); + if (val6) + __set_bit(S1, next); + if (val9) + __set_bit(S4, next); + break; + } +} diff --git a/kernel/trace/rv/monitors/rts/rts_trace.h b/kernel/trace/rv/mon= itors/rts/rts_trace.h new file mode 100644 index 000000000000..ac4ea84162f7 --- /dev/null +++ b/kernel/trace/rv/monitors/rts/rts_trace.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * Snippet to be included in rv_trace.h + */ + +#ifdef CONFIG_RV_MON_RTS +DEFINE_EVENT(event_ltl_monitor_cpu, event_rts, + TP_PROTO(unsigned int cpu, char *states, char *atoms, char *next), + TP_ARGS(cpu, states, atoms, next)); + +DEFINE_EVENT(error_ltl_monitor_cpu, error_rts, + TP_PROTO(unsigned int cpu), + TP_ARGS(cpu)); +#endif /* CONFIG_RV_MON_RTS */ diff --git a/kernel/trace/rv/rv_trace.h b/kernel/trace/rv/rv_trace.h index bf7cca6579ec..7b3a6fb8ca6f 100644 --- a/kernel/trace/rv/rv_trace.h +++ b/kernel/trace/rv/rv_trace.h @@ -221,6 +221,7 @@ DECLARE_EVENT_CLASS(error_ltl_monitor_cpu, =20 TP_printk("cpu%u: violation detected", __entry->cpu) ); +#include // Add new monitors based on CONFIG_LTL_MON_EVENTS_CPU here =20 #endif /* CONFIG_LTL_MON_EVENTS_CPU */ diff --git a/tools/verification/models/sched/rts.ltl b/tools/verification/m= odels/sched/rts.ltl new file mode 100644 index 000000000000..90872bca46b1 --- /dev/null +++ b/tools/verification/models/sched/rts.ltl @@ -0,0 +1,5 @@ +RULE =3D always (RT_TASK_ENQUEUED imply SCHEDULE_RT_NEXT) + +SCHEDULE_RT_NEXT =3D (not SCHED_SWITCH) until (SCHED_SWITCH_RT or EXCEPTIO= NS) + +EXCEPTIONS =3D SCHED_SWITCH_DL or not RT_TASK_ENQUEUED --=20 2.39.5