kernel-6.12.0-0.rc3.20241014git6485cf5ea253.31

* Mon Oct 14 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.6485cf5ea253.31]
- Linux v6.12.0-0.rc3.6485cf5ea253
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

Patchlist.changelog

@@ -1,3 +1,9 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/ee5a6112b7c3e6f44209cc2b98bc8c244e1f6542
+ ee5a6112b7c3e6f44209cc2b98bc8c244e1f6542 tools/rtla: fix collision with glibc sched_attr/sched_set_attr
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/5eff4a6e9c806e8d9fe14898bd30b730a681fcf8
+ 5eff4a6e9c806e8d9fe14898bd30b730a681fcf8 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'"
 

kernel.spec

@@ -4136,6 +4136,10 @@ fi\
 #
 #
 %changelog
+* Mon Oct 14 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.12.0-0.rc3.20241014git6485cf5ea253.31]
+- tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek)
+- tools/rtla: drop __NR_sched_getattr (Jan Stancek)
+
 * Mon Oct 14 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.6485cf5ea253.31]
 - Linux v6.12.0-0.rc3.6485cf5ea253
 

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);

sources

@@ -1,3 +1,3 @@
 SHA512 (linux-6.12-rc3-7-g6485cf5ea253.tar.xz) = 523accaf3f0db8650da7b54aba744e8b70d459387179e4029ea0c34840a8ea6e3ae13cb4772debd96d85cf4900efb704f722bf64ae15afc9144f4f0065efb4dc
-SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 943c03cd135caf85d456092e1be13f7b5d5b4d04a40a710f63307aa181c0c1b25763bc8473060e4d2737b5f1b5da000c1ac575fe3bb697524ff1d6c6e96c0623
+SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 804379856c709c93310456a772495a4233ef93a06bdc6b347462ae65adca5ebfcf73e37f48ed95bd12db30271b981d446e7e6f1bd38ac52c20e44e0e7367fa79
 SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 4dc51129c9e8997abc50dc19ddcff7886f752de2889a6f07ac6318f4013c20055994fdf30b961739d3a19cd0f4f5896ff75f3ba92ec73447abcfea048302b00b