Skip to content

Commit bf11b18

Browse files
authored
Enable additional tracing in kernel-mshv (#15833)
Signed-off-by: Roaa Sakr <romoh@microsoft.com>
1 parent 34f0c70 commit bf11b18

4 files changed

Lines changed: 41 additions & 15 deletions

File tree

SPECS-SIGNED/kernel-mshv-signed/kernel-mshv-signed.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Signed MSHV-enabled Linux Kernel for %{buildarch} systems
1111
Name: kernel-mshv-signed-%{buildarch}
1212
Version: 6.6.100.mshv1
13-
Release: 3%{?dist}
13+
Release: 4%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -140,6 +140,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
140140
%exclude /lib/modules/%{uname_r}/build
141141

142142
%changelog
143+
* Thu Feb 19 2026 Roaa Sakr <romoh@microsoft.com> - 6.6.100.mshv1-4
144+
- Enable additional tracing in kernel config
145+
143146
* Mon Jan 06 2026 Roaa Sakr <romoh@microsoft.com> - 6.6.100.mshv1-3
144147
- Enable ftrace syscalls tracing support in kernel config
145148

SPECS/kernel-mshv/config

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ CONFIG_TREE_RCU=y
152152
# CONFIG_RCU_EXPERT is not set
153153
CONFIG_TREE_SRCU=y
154154
CONFIG_TASKS_RCU_GENERIC=y
155+
CONFIG_TASKS_RUDE_RCU=y
155156
CONFIG_TASKS_TRACE_RCU=y
156157
CONFIG_RCU_STALL_COMMON=y
157158
CONFIG_RCU_NEED_SEGCBLIST=y
@@ -487,6 +488,7 @@ CONFIG_LEGACY_VSYSCALL_NONE=y
487488
# CONFIG_MODIFY_LDT_SYSCALL is not set
488489
# CONFIG_STRICT_SIGALTSTACK_SIZE is not set
489490
CONFIG_HAVE_LIVEPATCH=y
491+
# CONFIG_LIVEPATCH is not set
490492
# end of Processor type and features
491493

492494
CONFIG_CC_HAS_SLS=y
@@ -692,6 +694,7 @@ CONFIG_JUMP_LABEL=y
692694
# CONFIG_STATIC_KEYS_SELFTEST is not set
693695
# CONFIG_STATIC_CALL_SELFTEST is not set
694696
CONFIG_OPTPROBES=y
697+
CONFIG_KPROBES_ON_FTRACE=y
695698
CONFIG_UPROBES=y
696699
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
697700
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
@@ -2283,7 +2286,7 @@ CONFIG_PATA_RZ1000=y
22832286
#
22842287
CONFIG_PATA_ACPI=y
22852288
CONFIG_ATA_GENERIC=y
2286-
CONFIG_PATA_LEGACY=y
2289+
CONFIG_PATA_LEGACY=m
22872290
CONFIG_MD=y
22882291
CONFIG_BLK_DEV_MD=m
22892292
CONFIG_MD_BITMAP_FILE=y
@@ -3079,7 +3082,7 @@ CONFIG_HW_CONSOLE=y
30793082
CONFIG_VT_HW_CONSOLE_BINDING=y
30803083
CONFIG_UNIX98_PTYS=y
30813084
# CONFIG_LEGACY_PTYS is not set
3082-
CONFIG_LEGACY_TIOCSTI=y
3085+
# CONFIG_LEGACY_TIOCSTI is not set
30833086
# CONFIG_LDISC_AUTOLOAD is not set
30843087

30853088
#
@@ -4919,6 +4922,7 @@ CONFIG_HID_HYPERV_MOUSE=m
49194922
#
49204923
# HID-BPF support
49214924
#
4925+
# CONFIG_HID_BPF is not set
49224926
# end of HID-BPF support
49234927

49244928
#
@@ -6469,6 +6473,7 @@ CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
64696473
CONFIG_PSTORE_COMPRESS=y
64706474
# CONFIG_PSTORE_CONSOLE is not set
64716475
# CONFIG_PSTORE_PMSG is not set
6476+
# CONFIG_PSTORE_FTRACE is not set
64726477
# CONFIG_PSTORE_RAM is not set
64736478
# CONFIG_PSTORE_BLK is not set
64746479
# CONFIG_SYSV_FS is not set
@@ -6634,10 +6639,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y
66346639
CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
66356640
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
66366641
# CONFIG_SECURITY_SELINUX_DEBUG is not set
6637-
CONFIG_SECURITY_SMACK=y
6638-
# CONFIG_SECURITY_SMACK_BRINGUP is not set
6639-
# CONFIG_SECURITY_SMACK_NETFILTER is not set
6640-
# CONFIG_SECURITY_SMACK_APPEND_SIGNALS is not set
6642+
# CONFIG_SECURITY_SMACK is not set
66416643
# CONFIG_SECURITY_TOMOYO is not set
66426644
CONFIG_SECURITY_APPARMOR=y
66436645
# CONFIG_SECURITY_APPARMOR_DEBUG is not set
@@ -6680,10 +6682,9 @@ CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y
66806682
# CONFIG_IMA_DISABLE_HTABLE is not set
66816683
# CONFIG_EVM is not set
66826684
# CONFIG_DEFAULT_SECURITY_SELINUX is not set
6683-
# CONFIG_DEFAULT_SECURITY_SMACK is not set
66846685
CONFIG_DEFAULT_SECURITY_APPARMOR=y
66856686
# CONFIG_DEFAULT_SECURITY_DAC is not set
6686-
CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
6687+
CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,tomoyo"
66876688

66886689
#
66896690
# Kernel hardening options
@@ -7362,6 +7363,8 @@ CONFIG_NOP_TRACER=y
73627363
CONFIG_HAVE_RETHOOK=y
73637364
CONFIG_RETHOOK=y
73647365
CONFIG_HAVE_FUNCTION_TRACER=y
7366+
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
7367+
CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y
73657368
CONFIG_HAVE_DYNAMIC_FTRACE=y
73667369
CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
73677370
CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
@@ -7374,6 +7377,7 @@ CONFIG_HAVE_OBJTOOL_MCOUNT=y
73747377
CONFIG_HAVE_OBJTOOL_NOP_MCOUNT=y
73757378
CONFIG_HAVE_C_RECORDMCOUNT=y
73767379
CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
7380+
CONFIG_BUILDTIME_MCOUNT_SORT=y
73777381
CONFIG_TRACE_CLOCK=y
73787382
CONFIG_RING_BUFFER=y
73797383
CONFIG_EVENT_TRACING=y
@@ -7383,7 +7387,15 @@ CONFIG_GENERIC_TRACER=y
73837387
CONFIG_TRACING_SUPPORT=y
73847388
CONFIG_FTRACE=y
73857389
# CONFIG_BOOTTIME_TRACING is not set
7386-
# CONFIG_FUNCTION_TRACER is not set
7390+
CONFIG_FUNCTION_TRACER=y
7391+
CONFIG_FUNCTION_GRAPH_TRACER=y
7392+
# CONFIG_FUNCTION_GRAPH_RETVAL is not set
7393+
CONFIG_DYNAMIC_FTRACE=y
7394+
CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
7395+
CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
7396+
CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
7397+
# CONFIG_FPROBE is not set
7398+
# CONFIG_FUNCTION_PROFILER is not set
73877399
# CONFIG_STACK_TRACER is not set
73887400
# CONFIG_IRQSOFF_TRACER is not set
73897401
# CONFIG_SCHED_TRACER is not set
@@ -7398,23 +7410,31 @@ CONFIG_BRANCH_PROFILE_NONE=y
73987410
# CONFIG_BLK_DEV_IO_TRACE is not set
73997411
CONFIG_PROBE_EVENTS_BTF_ARGS=y
74007412
CONFIG_KPROBE_EVENTS=y
7413+
# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
74017414
CONFIG_UPROBE_EVENTS=y
74027415
CONFIG_BPF_EVENTS=y
74037416
CONFIG_DYNAMIC_EVENTS=y
74047417
CONFIG_PROBE_EVENTS=y
74057418
# CONFIG_BPF_KPROBE_OVERRIDE is not set
7406-
# CONFIG_SYNTH_EVENTS is not set
7407-
# CONFIG_USER_EVENTS is not set
7408-
# CONFIG_HIST_TRIGGERS is not set
7419+
CONFIG_FTRACE_MCOUNT_RECORD=y
7420+
CONFIG_FTRACE_MCOUNT_USE_CC=y
7421+
CONFIG_TRACING_MAP=y
7422+
CONFIG_SYNTH_EVENTS=y
7423+
CONFIG_USER_EVENTS=y
7424+
CONFIG_HIST_TRIGGERS=y
74097425
# CONFIG_TRACE_EVENT_INJECT is not set
74107426
# CONFIG_TRACEPOINT_BENCHMARK is not set
74117427
# CONFIG_RING_BUFFER_BENCHMARK is not set
74127428
# CONFIG_TRACE_EVAL_MAP_FILE is not set
7429+
# CONFIG_FTRACE_RECORD_RECURSION is not set
74137430
# CONFIG_FTRACE_STARTUP_TEST is not set
7431+
# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
74147432
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
74157433
# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
74167434
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
7435+
# CONFIG_SYNTH_EVENT_GEN_TEST is not set
74177436
# CONFIG_KPROBE_EVENT_GEN_TEST is not set
7437+
# CONFIG_HIST_TRIGGERS_DEBUG is not set
74187438
# CONFIG_RV is not set
74197439
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
74207440
# CONFIG_SAMPLES is not set

SPECS/kernel-mshv/kernel-mshv.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"50_mariner_mshv.cfg": "12bf23f8857f893549933a20062ad2a69c3c654b87893e8dd3ce42f9329801c7",
44
"50_mariner_mshv_menuentry": "5a46bb273be0e829fec4e1f498b1a11b59ded6e14d42a19be7da860c3f4c35be",
55
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
6-
"config": "8ce3731fe06abb3fcf51942bb680ee425fac59de76818ac5491d53553550e2f5",
6+
"config": "b4b1f5df01a5ad0c9ec3c0ee0e9e83a8502adf0fae5f8218dd9e55e8d3bcb3df",
77
"kernel-mshv-6.6.100.mshv1.tar.gz": "4ea7cd612712401f2537fdeb12ebb28373532c11f649ebcd1b7c5c39af839893",
88
"config_aarch64": "a1ce617173428aa4c5b89ccfbe35705ed6dc53521b26590328a7a4f81aefb404"
99
}

SPECS/kernel-mshv/kernel-mshv.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
Summary: Mariner kernel that has MSHV Host support
1919
Name: kernel-mshv
2020
Version: 6.6.100.mshv1
21-
Release: 3%{?dist}
21+
Release: 4%{?dist}
2222
License: GPLv2
2323
Group: Development/Tools
2424
Vendor: Microsoft Corporation
@@ -267,6 +267,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
267267
%{_includedir}/perf/perf_dlfilter.h
268268

269269
%changelog
270+
* Thu Feb 19 2026 Roaa Sakr <romoh@microsoft.com> - 6.6.100.mshv1-4
271+
- Enable additional tracing in kernel config
272+
270273
* Mon Jan 06 2026 Roaa Sakr <romoh@microsoft.com> - 6.6.100.mshv1-3
271274
- Enable ftrace syscalls tracing support in kernel config
272275

0 commit comments

Comments
 (0)