Skip to contentSkip to conversation

Xenomai 4 fixes and debug mode, fix for head kernel selection

PATCH In review Jan Kiszka 2 participants 9 messages Jun 14 – Jun 15

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

cover Xenomai 4 fixes and debug mode, fix for head kernel selection

See patches.

Jan

Jan Kiszka (6):
Kconfig: Permit to enable debug mode for Xenomai 4 Add trace-cmd to debug images
linux-xenomai: Limit latest branch selection to official ones
ci: Drop 6.1 from xenomai-4 pipelines
linux-xenomai: Renovate xenomai-4 kernel versions
linux-xenomai: Switch riscv branch to latest integration

 Kconfig                                       | 61 ++++++++-----------
 ci/xenomai_4_next.yml                         |  1 -
 recipes-core/images/demo-image.bb             |  1 +
 .../linux/linux-xenomai-3_latest.bb           |  2 +-
 recipes-kernel/linux/linux-xenomai-4_6.1.bb   | 14 -----
 recipes-kernel/linux/linux-xenomai-4_6.12.bb  |  2 +-
 recipes-kernel/linux/linux-xenomai-4_6.18.bb  |  2 +-
 .../linux/linux-xenomai-4_latest.bb           |  9 ++-
 8 files changed, 34 insertions(+), 58 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-xenomai-4_6.1.bb
Signature · 1 line
2.47.3
author
#1 lore raw

PATCH 1/6 Kconfig: Permit to enable debug mode for Xenomai 4

From: Jan Kiszka <[email protected]>

No reason to limit this feature to Xenomai 3 configs. The compat mode, though, will remain 3-only.

---
 Kconfig | 51 ++++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 25 deletions(-)
Kconfig +26 -25
index 98cbfeb..dc79700 100644
@@ -201,31 +201,6 @@ config KAS_INCLUDE_KERNEL
 	default "kas/opt/linux-4.19-head.yaml" if KERNEL_4_19_HEAD
 	default "kas/opt/linux-4.19.yaml" if KERNEL_4_19
 
-comment "Features"
-
-config DEBUG
-	bool "Build debug version"
-	help
-	  This enables various debug options in the kernel that can help to
-	  validate the correctness of a particular Xenomai version and kernel
-	  patch.
-
-	  However, these options also significantly degrade the performance and
-	  maximum latencies, so don't use such a configuration for
-	  benchmarking!
-
-config KAS_INCLUDE_DEBUG
-	string
-	default "kas/opt/debug.yaml" if DEBUG
-
-config COMPAT
-	bool "Build 32 bit Xenomai userspace"
-	depends on (XENOMAI_HEAD || XENOMAI_3_3_HEAD || XENOMAI_3_3) && (ARCH_X86 || ARCH_ARM64)
-
-config KAS_INCLUDE_COMPAT
-	string
-	default "kas/opt/compat.yaml" if COMPAT
-
 endif	# if XENOMAI3
 
 if XENOMAI4
@@ -292,3 +267,29 @@ config KAS_INCLUDE_LIBEVL
 	default "kas/opt/libevl-latest-release.yaml" if LIBEVL_RELEASE
 
 endif	# if XENOMAI4
+
+comment "Features"
+
+config DEBUG
+	bool "Build debug version"
+	help
+	  This enables various debug options in the kernel that can help to
+	  validate the correctness of a particular Xenomai version and kernel
+	  patch.
+
+	  However, these options also significantly degrade the performance and
+	  maximum latencies, so don't use such a configuration for
+	  benchmarking!
+
+config KAS_INCLUDE_DEBUG
+	string
+	default "kas/opt/debug.yaml" if DEBUG
+
+config COMPAT
+	bool "Build 32 bit Xenomai userspace"
+	depends on XENOMAI3
+	depends on (XENOMAI_HEAD || XENOMAI_3_3_HEAD || XENOMAI_3_3) && (ARCH_X86 || ARCH_ARM64)
+
+config KAS_INCLUDE_COMPAT
+	string
+	default "kas/opt/compat.yaml" if COMPAT
Signature · 1 line
2.47.3
#2 lore raw

Re: [xenomai-images][PATCH 1/6] Kconfig: Permit to enable debug mode for Xenomai 4

Hi Jan,

Quoted 4 lines · Jan Kiszka

From: Jan Kiszka <[email protected]>

No reason to limit this feature to Xenomai 3 configs. The compat mode, though, will remain 3-only.

Care, that nobody enables the EVL_DEBUG_ switches at the moment. So this might be a bit misleading now.

Quoted 71 lines
---
  Kconfig | 51 ++++++++++++++++++++++++++-------------------------
  1 file changed, 26 insertions(+), 25 deletions(-)
Kconfig +26 -25
index 98cbfeb..dc79700 100644
@@ -201,31 +201,6 @@ config KAS_INCLUDE_KERNEL
  	default "kas/opt/linux-4.19-head.yaml" if KERNEL_4_19_HEAD
  	default "kas/opt/linux-4.19.yaml" if KERNEL_4_19
 
-comment "Features"
-
-config DEBUG
-	bool "Build debug version"
-	help
-	  This enables various debug options in the kernel that can help to
-	  validate the correctness of a particular Xenomai version and kernel
-	  patch.
-
-	  However, these options also significantly degrade the performance and
-	  maximum latencies, so don't use such a configuration for
-	  benchmarking!
-
-config KAS_INCLUDE_DEBUG
-	string
-	default "kas/opt/debug.yaml" if DEBUG
-
-config COMPAT
-	bool "Build 32 bit Xenomai userspace"
-	depends on (XENOMAI_HEAD || XENOMAI_3_3_HEAD || XENOMAI_3_3) && (ARCH_X86 || ARCH_ARM64)
-
-config KAS_INCLUDE_COMPAT
-	string
-	default "kas/opt/compat.yaml" if COMPAT
-
  endif	# if XENOMAI3
 
  if XENOMAI4
@@ -292,3 +267,29 @@ config KAS_INCLUDE_LIBEVL
  	default "kas/opt/libevl-latest-release.yaml" if LIBEVL_RELEASE
 
  endif	# if XENOMAI4
+
+comment "Features"
+
+config DEBUG
+	bool "Build debug version"
+	help
+	  This enables various debug options in the kernel that can help to
+	  validate the correctness of a particular Xenomai version and kernel
+	  patch.
+
+	  However, these options also significantly degrade the performance and
+	  maximum latencies, so don't use such a configuration for
+	  benchmarking!
+
+config KAS_INCLUDE_DEBUG
+	string
+	default "kas/opt/debug.yaml" if DEBUG
+
+config COMPAT
+	bool "Build 32 bit Xenomai userspace"
+	depends on XENOMAI3
+	depends on (XENOMAI_HEAD || XENOMAI_3_3_HEAD || XENOMAI_3_3) && (ARCH_X86 || ARCH_ARM64)
+
+config KAS_INCLUDE_COMPAT
+	string
+	default "kas/opt/compat.yaml" if COMPAT
author
#3 lore raw

Re: [xenomai-images][PATCH 1/6] Kconfig: Permit to enable debug mode for Xenomai 4

Quoted 10 lines · Tobias Schaffner

Hi Jan,

Quoted 4 lines · Jan Kiszka

From: Jan Kiszka <[email protected]>

No reason to limit this feature to Xenomai 3 configs. The compat mode, though, will remain 3-only.

Care, that nobody enables the EVL_DEBUG_ switches at the moment. So this might be a bit misleading now.

Happy to take patches (against evl.cfg). But this patch is already required to get the kernel's own debug features such as lockdep or even ftrace.

Jan

Quoted 76 lines
Quoted 75 lines

---
  Kconfig | 51 ++++++++++++++++++++++++++-------------------------

  1 file changed, 26 insertions(+), 25 deletions(-)
Kconfig +0 -0
index 98cbfeb..dc79700 100644
@@ -201,31 +201,6 @@ config KAS_INCLUDE_KERNEL

      default "kas/opt/linux-4.19-head.yaml" if KERNEL_4_19_HEAD default "kas/opt/linux-4.19.yaml" if KERNEL_4_19 -comment "Features"

Kconfig +0 -6
-
-config DEBUG
-    bool "Build debug version"
-    help
-      This enables various debug options in the kernel that can help to
-      validate the correctness of a particular Xenomai version and

kernel
-      patch.
-
-      However, these options also significantly degrade the performance and
-      maximum latencies, so don't use such a configuration for -      benchmarking!

Kconfig +0 -8
-
-config KAS_INCLUDE_DEBUG
-    string
-    default "kas/opt/debug.yaml" if DEBUG
-
-config COMPAT
-    bool "Build 32 bit Xenomai userspace"
-    depends on (XENOMAI_HEAD || XENOMAI_3_3_HEAD || XENOMAI_3_3) &&

(ARCH_X86 || ARCH_ARM64)

Kconfig +0 -5
-
-config KAS_INCLUDE_COMPAT
-    string
-    default "kas/opt/compat.yaml" if COMPAT
-

  endif    # if XENOMAI3
    if XENOMAI4

Kconfig +0 -0
@@ -292,3 +267,29 @@ config KAS_INCLUDE_LIBEVL

      default "kas/opt/libevl-latest-release.yaml" if LIBEVL_RELEASE endif    # if XENOMAI4

Kconfig +8 -0
+
+comment "Features"
+
+config DEBUG
+    bool "Build debug version"
+    help
+      This enables various debug options in the kernel that can help to
+      validate the correctness of a particular Xenomai version and

kernel
+      patch.
+
+      However, these options also significantly degrade the performance and
+      maximum latencies, so don't use such a configuration for +      benchmarking!

Kconfig +9 -0
+
+config KAS_INCLUDE_DEBUG
+    string
+    default "kas/opt/debug.yaml" if DEBUG
+
+config COMPAT
+    bool "Build 32 bit Xenomai userspace"
+    depends on XENOMAI3
+    depends on (XENOMAI_HEAD || XENOMAI_3_3_HEAD || XENOMAI_3_3) &&

(ARCH_X86 || ARCH_ARM64)

Kconfig +4 -0
+
+config KAS_INCLUDE_COMPAT
+    string
+    default "kas/opt/compat.yaml" if COMPAT
Signature · 2 lines
Siemens AG, Foundational Technologies
Linux Expert Center
author
#4 lore raw

PATCH 2/6 Add trace-cmd to debug images

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Simplifies interaction with ftrace which is part of the debug config. May eventually permit testing it in CI as well.

---
 recipes-core/images/demo-image.bb | 1 +
 1 file changed, 1 insertion(+)
recipes-core/images/demo-image.bb +1 -0
index 7ea4dbe..3133582 100644
@@ -46,6 +46,7 @@ IMAGE_PREINSTALL += " \
     ifupdown isc-dhcp-client net-tools iputils-ping ssh \
     iw wireless-tools wpasupplicant systemd-timesyncd dbus \
     lsb-release auditd"
+IMAGE_PREINSTALL += "${@'trace-cmd' if d.getVar('XENOMAI_DEBUG') == '1' else ''}"
 
 IMAGE_INSTALL:append:xenomai3 = " ${@get_package_names(d)}"
 IMAGE_INSTALL:append:xenomai4 = " libevl-test"
Signature · 1 line
2.47.3
author
#5 lore raw

PATCH 3/6 linux-xenomai: Limit latest branch selection to official ones

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

This was matching also pre-release branches like wip/flo/v7.1-dovetail-rebase or wip/flo/v7.1-evl-rebase.

---
 recipes-kernel/linux/linux-xenomai-3_latest.bb | 2 +-
 recipes-kernel/linux/linux-xenomai-4_latest.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
recipes-kernel/linux/linux-xenomai-3_latest.bb +1 -1
index 188b842..f526008 100644
@@ -23,7 +23,7 @@ python () {
     if is_kernel(d, 'latest'):
         cmd = 'git ls-remote --tags --head --refs https://gitlab.com/xenomai/linux-dovetail.git | ' \
               'sed -e "s/.*[[:space:]]refs\/\(tags\|heads\)\///" | ' \
-              'grep "v7\.[0-9].*-dovetail-rebase" | ' \
+              'grep "^v7\.[0-9].*-dovetail-rebase" | ' \
               'sort -r -n -k 1.4 | head -1'
         (ret, out) = subprocess.getstatusoutput(cmd)
         d.setVar('LATEST_KERNEL_BRANCH', out)
recipes-kernel/linux/linux-xenomai-4_latest.bb +1 -1
index e3c93fe..9d479cd 100644
@@ -22,7 +22,7 @@ python () {
     if is_kernel(d, 'latest'):
         cmd = 'git ls-remote --tags --head --refs https://gitlab.com/Xenomai/xenomai4/linux-evl.git | ' \
               'sed -e "s/.*[[:space:]]refs\/\(tags\|heads\)\///" | ' \
-              'grep "v7\.[0-9].*-evl-rebase" | ' \
+              'grep "^v7\.[0-9].*-evl-rebase" | ' \
               'sort -r -n -k 1.4 | head -1'
         (ret, out) = subprocess.getstatusoutput(cmd)
         d.setVar('LATEST_KERNEL_BRANCH', out)
Signature · 1 line
2.47.3
author
#6 lore raw

PATCH 4/6 ci: Drop 6.1 from xenomai-4 pipelines

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

That kernel is now end of life.

---
 ci/xenomai_4_next.yml | 1 -
 1 file changed, 1 deletion(-)
ci/xenomai_4_next.yml +0 -1
index ffb1ebb..6ef4b6a 100644
@@ -11,7 +11,6 @@
 
 include:
   - local: '/ci/lib/gitlab-ci-base.yml'
-  - local: '/ci/lib/kernel/6_1.yml'
   - local: '/ci/lib/kernel/6_12.yml'
   - local: '/ci/lib/kernel/6_18.yml'
   - local: '/ci/lib/kernel/head.yml'
Signature · 1 line
2.47.3
author
#7 lore raw

PATCH 5/6 linux-xenomai: Renovate xenomai-4 kernel versions

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

6.1.y-cip-evl is now EOL, drop it. Bump the rest to latest releases.

---
 Kconfig                                        | 10 ----------
 recipes-kernel/linux/linux-xenomai-4_6.1.bb    | 14 --------------
 recipes-kernel/linux/linux-xenomai-4_6.12.bb   |  2 +-
 recipes-kernel/linux/linux-xenomai-4_6.18.bb   |  2 +-
 recipes-kernel/linux/linux-xenomai-4_latest.bb |  5 ++---
 5 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-xenomai-4_6.1.bb
Kconfig +0 -10
index dc79700..091a299 100644
@@ -228,14 +228,6 @@ config EVL_KERNEL_6_12
 	bool "Latest 6.12 EVL release"
 	depends on !ARCH_RISCV64
 
-config EVL_KERNEL_6_1_HEAD
-	bool "Head of 6.1 EVL branch"
-	depends on !ARCH_RISCV64
-
-config EVL_KERNEL_6_1
-	bool "Latest 6.1 EVL release"
-	depends on !ARCH_RISCV64
-
 endchoice
 
 config KAS_INCLUDE_EVL_KERNEL
@@ -245,8 +237,6 @@ config KAS_INCLUDE_EVL_KERNEL
 	default "kas/opt/linux-6.18.yaml" if EVL_KERNEL_6_18
 	default "kas/opt/linux-6.12-head.yaml" if EVL_KERNEL_6_12_HEAD
 	default "kas/opt/linux-6.12.yaml" if EVL_KERNEL_6_12
-	default "kas/opt/linux-6.1-head.yaml" if EVL_KERNEL_6_1_HEAD
-	default "kas/opt/linux-6.1.yaml" if EVL_KERNEL_6_1
 
 choice
 	prompt "libevl version"
recipes-kernel/linux/linux-xenomai-4_6.1.bb deleted +0 -14
deleted file mode 100644
index 2efe538..0000000
@@ -1,14 +0,0 @@
-#
-# Xenomai Real-Time System
-#
-# Copyright (c) Siemens AG, 2023-2026
-#
-# Authors:
-#  Clara Kowalsky <[email protected]>
-#
-# SPDX-License-Identifier: MIT
-#
-
-require recipes-kernel/linux/linux-xenomai-4-evl.inc
-
-SRCREV ?= "v6.1.162-cip51-evl2-rebase"
recipes-kernel/linux/linux-xenomai-4_6.12.bb +1 -1
index 7281917..249b485 100644
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-4-evl.inc
 
-SRCREV ?= "v6.12.69-cip17-evl1-rebase"
+SRCREV ?= "v6.12.85-cip22-evl4-rebase"
recipes-kernel/linux/linux-xenomai-4_6.18.bb +1 -1
index a1ddad5..10fe5f9 100644
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-4-evl.inc
 
-SRCREV ?= "v6.18.7-evl2-rebase"
+SRCREV ?= "v6.18.22-evl5-rebase"
recipes-kernel/linux/linux-xenomai-4_latest.bb +2 -3
index 9d479cd..a542e80 100644
@@ -27,12 +27,11 @@ python () {
         (ret, out) = subprocess.getstatusoutput(cmd)
         d.setVar('LATEST_KERNEL_BRANCH', out)
     else:
-        d.setVar('LATEST_KERNEL_BRANCH', 'v6.12.y-evl-rebase')
+        d.setVar('LATEST_KERNEL_BRANCH', 'v6.18.y-evl-rebase')
 }
 
 GIT_BRANCH = "${@ \
-    'v6.1.y-cip-evl-rebase' if is_kernel(d, '6.1') \
-    else 'v6.12.y-cip-evl-rebase' if is_kernel(d, '6.12') \
+    'v6.12.y-cip-evl-rebase' if is_kernel(d, '6.12') \
     else 'v6.18.y-evl-rebase' if is_kernel(d, '6.18') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 GIT_BRANCH:riscv64 = "wip/evl-riscv"
Signature · 1 line
2.47.3
author
#8 lore raw

PATCH 6/6 linux-xenomai: Switch riscv branch to latest integration

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

wip/evl-riscv became stale, use Florian's 7.1 preview branch until everything is officially merged.

---
 recipes-kernel/linux/linux-xenomai-4_latest.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-kernel/linux/linux-xenomai-4_latest.bb +1 -1
index a542e80..48499ca 100644
@@ -34,7 +34,7 @@ GIT_BRANCH = "${@ \
     'v6.12.y-cip-evl-rebase' if is_kernel(d, '6.12') \
     else 'v6.18.y-evl-rebase' if is_kernel(d, '6.18') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
-GIT_BRANCH:riscv64 = "wip/evl-riscv"
+GIT_BRANCH:riscv64 = "wip/flo/v7.1-evl-rebase+riscv"
 
 SRC_URI += "git://gitlab.com/Xenomai/xenomai4/linux-evl.git;protocol=https;branch=${GIT_BRANCH}"
 SRCREV = "${AUTOREV}"
Signature · 1 line
2.47.3