From 17aef57cfe5519c40747a1e8af282b9345252f16 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 10 Oct 2024 11:02:33 -0600 Subject: [PATCH] kernel-6.12.0-0.rc2.20241010gitd3d1556696c1.27 * Thu Oct 10 2024 Fedora Kernel Team [6.12.0-0.rc2.d3d1556696c1.27] - Linux v6.12.0-0.rc2.d3d1556696c1 Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 6 +++ kernel.spec | 4 ++ patch-6.12-redhat.patch | 82 ++++++++++++++++++++++++++++++++++++++++- sources | 2 +- 4 files changed, 92 insertions(+), 2 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 856601fa9..cf37edbfa 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,9 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/ca41f78b1e55041ca8d07467f03768a777b98ce8 + ca41f78b1e55041ca8d07467f03768a777b98ce8 tools/rtla: fix collision with glibc sched_attr/sched_set_attr + +https://gitlab.com/cki-project/kernel-ark/-/commit/1b79c4eb0ef6136eab4b4bb79f9e260f5f7c02fc + 1b79c4eb0ef6136eab4b4bb79f9e260f5f7c02fc tools/rtla: drop __NR_sched_getattr + https://gitlab.com/cki-project/kernel-ark/-/commit/77e6d045cb6220934aef9b192b291466fd205d21 77e6d045cb6220934aef9b192b291466fd205d21 Revert "Merge branch 'drop_engine_api' into 'os-build'" diff --git a/kernel.spec b/kernel.spec index 11d8a153f..fcfc4ce98 100644 --- a/kernel.spec +++ b/kernel.spec @@ -4136,6 +4136,10 @@ fi\ # # %changelog +* Thu Oct 10 2024 Justin M. Forbes [6.12.0-0.rc2.20241010gitd3d1556696c1.27] +- tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek) +- tools/rtla: drop __NR_sched_getattr (Jan Stancek) + * Thu Oct 10 2024 Fedora Kernel Team [6.12.0-0.rc2.d3d1556696c1.27] - Linux v6.12.0-0.rc2.d3d1556696c1 diff --git a/patch-6.12-redhat.patch b/patch-6.12-redhat.patch index 13cbbe22e..697b2d758 100644 --- a/patch-6.12-redhat.patch +++ b/patch-6.12-redhat.patch @@ -81,7 +81,9 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 83 files changed, 2758 insertions(+), 216 deletions(-) + tools/tracing/rtla/src/utils.c | 36 +- + tools/tracing/rtla/src/utils.h | 2 + + 85 files changed, 2776 insertions(+), 236 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 1518343bbe22..c720321317ea 100644 @@ -4681,3 +4683,81 @@ index c5981e558bc2..431202cd09c1 100644 /** * security_bdev_alloc() - Allocate a block device LSM blob * @bdev: block device +diff --git a/tools/tracing/rtla/src/utils.c b/tools/tracing/rtla/src/utils.c +index 9ac71a66840c..c62044215a48 100644 +--- a/tools/tracing/rtla/src/utils.c ++++ b/tools/tracing/rtla/src/utils.c +@@ -211,29 +211,25 @@ long parse_ns_duration(char *val) + /* + * This is a set of helper functions to use SCHED_DEADLINE. + */ +-#ifdef __x86_64__ +-# define __NR_sched_setattr 314 +-# define __NR_sched_getattr 315 +-#elif __i386__ +-# define __NR_sched_setattr 351 +-# define __NR_sched_getattr 352 +-#elif __arm__ +-# define __NR_sched_setattr 380 +-# define __NR_sched_getattr 381 +-#elif __aarch64__ || __riscv +-# define __NR_sched_setattr 274 +-# define __NR_sched_getattr 275 +-#elif __powerpc__ +-# define __NR_sched_setattr 355 +-# define __NR_sched_getattr 356 +-#elif __s390x__ +-# define __NR_sched_setattr 345 +-# define __NR_sched_getattr 346 ++#ifndef __NR_sched_setattr ++# ifdef __x86_64__ ++# define __NR_sched_setattr 314 ++# elif __i386__ ++# define __NR_sched_setattr 351 ++# elif __arm__ ++# define __NR_sched_setattr 380 ++# elif __aarch64__ || __riscv ++# define __NR_sched_setattr 274 ++# elif __powerpc__ ++# define __NR_sched_setattr 355 ++# elif __s390x__ ++# define __NR_sched_setattr 345 ++# endif + #endif + + #define SCHED_DEADLINE 6 + +-static inline int sched_setattr(pid_t pid, const struct sched_attr *attr, ++static inline int rtla_sched_setattr(pid_t pid, const struct sched_attr *attr, + unsigned int flags) { + return syscall(__NR_sched_setattr, pid, attr, flags); + } +@@ -243,7 +239,7 @@ int __set_sched_attr(int pid, struct sched_attr *attr) + int flags = 0; + int retval; + +- retval = sched_setattr(pid, attr, flags); ++ retval = rtla_sched_setattr(pid, attr, flags); + if (retval < 0) { + err_msg("Failed to set sched attributes to the pid %d: %s\n", + pid, strerror(errno)); +diff --git a/tools/tracing/rtla/src/utils.h b/tools/tracing/rtla/src/utils.h +index d44513e6c66a..99c9cf81bcd0 100644 +--- a/tools/tracing/rtla/src/utils.h ++++ b/tools/tracing/rtla/src/utils.h +@@ -46,6 +46,7 @@ update_sum(unsigned long long *a, unsigned long long *b) + *a += *b; + } + ++#ifndef SCHED_ATTR_SIZE_VER0 + struct sched_attr { + uint32_t size; + uint32_t sched_policy; +@@ -56,6 +57,7 @@ struct sched_attr { + uint64_t sched_deadline; + uint64_t sched_period; + }; ++#endif /* SCHED_ATTR_SIZE_VER0 */ + + int parse_prio(char *arg, struct sched_attr *sched_param); + int parse_cpu_set(char *cpu_list, cpu_set_t *set); diff --git a/sources b/sources index 072c9a59c..6cd4cd68b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-6.12-rc2-74-gd3d1556696c1.tar.xz) = 4308e1329369780c84c30b3180f1b0adc7823242eb05220c7af4c2e34fe4c5a84c10ceb5be256111c3d11870c3898669ab9b23936a93ca4b484f791dcf114b01 -SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 4512f84dd6cb0087334c8fcfb9c36403a4ceeb4dd93078d1953e9d9ed7f513840f3c53e19b9a91a1576c3547adef3b2250997bffdc7f9467a139f44a3194c791 +SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 9c6afe0576f7435f564862d4af88295b7bad1ce0bc0ee0198ad6539673b926fee9bdf49e11261dc8c040257c57f07499996901dbcf19d746ad896ed28a2f81a5 SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = ae8ff80fe00b602d2073c3b2c4ea480a68b5b4c06c42483c4ddcd4cc2a66a14581290e451b87df87e247e6916f42fff60100bfe54b15587843452b6627809c00