!23 sync 24.03lts

From: @Jer6y 
Reviewed-by: @jianli-97 
Signed-off-by: @jianli-97
This commit is contained in:
openeuler-ci-bot 2024-03-26 01:05:23 +00:00 committed by Gitee
commit 71c9556e46
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 47 additions and 18 deletions

View File

@ -1,12 +0,0 @@
diff -up ./src/stalld.h.old ./src/stalld.h
--- ./src/stalld.h.old 2023-07-20 10:28:58.525933347 +0800
+++ ./src/stalld.h 2023-07-20 10:29:25.674132507 +0800
@@ -83,7 +83,7 @@ struct cpu_info {
#elif __arm__
# define __NR_sched_setattr 380
# define __NR_sched_getattr 381
-#elif __aarch64__
+#elif __aarch64__ || __loongarch64
# define __NR_sched_setattr 274
# define __NR_sched_getattr 275
#elif __powerpc__

30
riscv_support.patch Normal file
View File

@ -0,0 +1,30 @@
diff --git a/Makefile b/Makefile
index f866a74..76aefe2 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,12 @@ USE_BPF := 0
FCF_PROTECTION := $(CF_PROTECTION_OPTS)
TMOPTS := -mtune=powerpc
endif
+ifeq ($(ARCH),riscv64)
+USE_BPF :=0
+FCF_PROTECTION := $(CF_PROTECTION_OPTS)
+TMOPTS := -march=rv64gc -mabi=lp64d
+endif
+
$(info USE_BPF=$(USE_BPF))
$(info FCF_PROTECTION=$(FCF_PROTECTION))
diff --git a/src/stalld.h b/src/stalld.h
index a5b9dbc..7362d4e 100644
--- a/src/stalld.h
+++ b/src/stalld.h
@@ -119,7 +119,7 @@ struct stalld_backend {
#elif __arm__
# define __NR_sched_setattr 380
# define __NR_sched_getattr 381
-#elif __aarch64__ || __loongarch64
+#elif __aarch64__ || __loongarch64 || __riscv
# define __NR_sched_setattr 274
# define __NR_sched_getattr 275
#elif __powerpc__

Binary file not shown.

BIN
stalld-v1.19.1.tar.bz2 Normal file

Binary file not shown.

View File

@ -1,12 +1,12 @@
Name: stalld
Version: 1.16
Release: 3
Version: v1.19.1
Release: 1
Summary: Daemon that finds starving tasks and gives them a temporary boost
License: GPLv2
URL: https://gitlab.com/rt-linux-tools/%{name}
Source0: https://gitlab.com/rt-linux-tools/%{name}/-/archive/v%{version}/%{name}-%{version}.tar.bz2
Patch0: 0001-Add-support-for-loongarch.patch
Source0: https://gitlab.com/rt-linux-tools/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2
Patch0: riscv_support.patch
BuildRequires: glibc-devel
BuildRequires: gcc
@ -15,6 +15,15 @@ BuildRequires: systemd
Requires: systemd
%ifnarch i686
BuildRequires: bpftool
BuildRequires: clang
BuildRequires: libbpf-devel
BuildRequires: llvm
Requires: libbpf
%endif
%description
The stalld program monitors the set of system threads,
looking for threads that are ready-to-run but have not
@ -31,11 +40,10 @@ allow 10 microseconds of runtime for 1 second of clock time.
%install
%make_install DOCDIR=%{_docdir} MANDIR=%{_mandir} BINDIR=%{_bindir} DATADIR=%{_datadir} VERSION=%{version}
%make_install -C redhat UNITDIR=%{_unitdir}
%make_install -C systemd UNITDIR=%{_unitdir}
mkdir -p %{buildroot}%{_docdir}/%{name}
mv %{buildroot}%{_docdir}/README.md %{buildroot}%{_docdir}/%{name}/
%files
%{_bindir}/%{name}
%{_bindir}/throttlectl
@ -55,6 +63,9 @@ mv %{buildroot}%{_docdir}/README.md %{buildroot}%{_docdir}/%{name}/
%systemd_postun_with_restart %{name}.service
%changelog
* Sat Mar 23 2024 luojun <luojun.oerv@isrc.iscas.ac.cn> - v1.19.1-1
- update to v1.19 and support for oe-riscv
* Thu Sep 14 2023 duyiwei <duyiwei@kylinos.cn> - 1.16-3
- move README