e7d7b8a0eb
upversion stalld to v1.19.8
compile stalld with ebpf support
Test plan:
PASS - AIO-SX standard kernel:
confirm --backend queue_track and verify
BPF kernel option by configuring stalld
with queue_track backend
PASS - AIO-SX rt kernel:
Built rt kernel with CONFIG_BPF_JIT=y
and CONFIG_DEBUG_INFO_BTF=y
rt kernel (lowlatency) configured
confirm --backend queue_track and verify
BPF kernel option by configuring stalld
with queue_track backend
Story: 2011378
Task: 52252
Change-Id: I869f421251bbabb2abb7f57dd91302b9d2f57f11
Signed-off-by: Kyale, Eliud <Eliud.Kyale@windriver.com>
78 lines
2.6 KiB
Diff
78 lines
2.6 KiB
Diff
From fcda0b2df242d08fad74af85951e36afd5b0fced Mon Sep 17 00:00:00 2001
|
|
From: "Kyale, Eliud" <Eliud.Kyale@windriver.com>
|
|
Date: Mon, 26 May 2025 12:51:34 -0400
|
|
Subject: [PATCH] Build and compatibility for StarlingX.
|
|
|
|
Disable redhat specific headers in Makefile
|
|
Change Environment config to /etc/default/stalld
|
|
Add $CUSTOM enviroment variable to stalld startup arguments
|
|
|
|
Signed-off-by: Kyale, Eliud <Eliud.Kyale@windriver.com>
|
|
---
|
|
Makefile | 2 +-
|
|
systemd/Makefile | 8 ++++----
|
|
systemd/stalld.service | 4 ++--
|
|
3 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 4585b6c..e735c7f 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -48,7 +48,7 @@ MOPTS := $(strip $(MTUNE)) $(strip $(M64)) -mno-omit-leaf-frame-pointer
|
|
|
|
WOPTS := -Wall -Werror=format-security
|
|
|
|
-SOPTS := -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1
|
|
+#SOPTS := -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1
|
|
|
|
DEFS := -DUSE_BPF=$(USE_BPF) -D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS
|
|
|
|
diff --git a/systemd/Makefile b/systemd/Makefile
|
|
index 99db1ad..c1da68e 100644
|
|
--- a/systemd/Makefile
|
|
+++ b/systemd/Makefile
|
|
@@ -1,17 +1,17 @@
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
-# Red Hat specific Makefile
|
|
+# Debian specific Makefile
|
|
|
|
INSTALL := install
|
|
UNITDIR := /usr/lib/systemd/system
|
|
|
|
install:
|
|
- $(INSTALL) -m 755 -d $(DESTDIR)/etc/sysconfig
|
|
- $(INSTALL) stalld.conf -m 644 $(DESTDIR)/etc/sysconfig/stalld
|
|
+ $(INSTALL) -m 755 -d $(DESTDIR)/etc/default
|
|
+ $(INSTALL) stalld.conf -m 644 $(DESTDIR)/etc/default/stalld
|
|
$(INSTALL) -m 755 -d $(DESTDIR)$(UNITDIR)
|
|
$(INSTALL) stalld.service -m 644 $(DESTDIR)$(UNITDIR)
|
|
|
|
uninstall:
|
|
- rm -f $(DESTDIR)/etc/sysconfig/stalld
|
|
+ rm -f $(DESTDIR)/etc/default/stalld
|
|
rm -f $(DESTDIR)$(UNITDIR)/stalld.service
|
|
clean:
|
|
@rm -rf *~
|
|
diff --git a/systemd/stalld.service b/systemd/stalld.service
|
|
index 96fca1f..fef512a 100644
|
|
--- a/systemd/stalld.service
|
|
+++ b/systemd/stalld.service
|
|
@@ -5,13 +5,13 @@ Description=Stall Monitor
|
|
[Service]
|
|
Type=simple
|
|
# Type=forking
|
|
-EnvironmentFile=/etc/sysconfig/stalld
|
|
+EnvironmentFile=/etc/default/stalld
|
|
ExecStartPre=/usr/bin/throttlectl off
|
|
ExecStartPre=/usr/bin/mkdir -p /run/stalld
|
|
|
|
# In case the regex passed to IT or IP includes C escape sequences,
|
|
# use ${IT} or ${IP} instead of $IT or $IP
|
|
-ExecStart=/usr/bin/stalld --systemd $CLIST $AGGR $BP $BR $BD $THRESH $LOGGING $FG $PF $IT $IP $BE
|
|
+ExecStart=/usr/bin/stalld --systemd $CLIST $AGGR $BP $BR $BD $THRESH $LOGGING $FG $PF $IT $IP $BE $CUSTOM
|
|
ExecStopPost=/usr/bin/throttlectl on
|
|
Restart=always
|
|
|
|
--
|
|
2.34.1
|