Skip to contentSkip to conversation

sched_attr: Do not define for glibc >= 2.41

PATCH In review Khem Raj 3 participants 5 messages Jan 28, 2025 – Jan 30, 2025

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 sched_attr: Do not define for glibc >= 2.41

glibc 2.41+ has added [1] definitions for sched_setattr and sched_getattr functions and struct sched_attr. Therefore, it needs to be checked for here as well before defining sched_attr

Define sched_attr conditionally on SCHED_ATTR_SIZE_VER0

Fixes builds with glibc/trunk

[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8

Cc Clark Williams <[email protected]>
Cc John Kacur <[email protected]>
Cc rt-users <[email protected]>
---
 src/include/rt-sched.h | 4 ++++
 1 file changed, 4 insertions(+)
src/include/rt-sched.h +4 -0
index 80171c7..9cf0e3a 100644
@@ -42,6 +42,8 @@
 #define __NR_sched_getattr		275
 #endif
 
+/* sched_attr is not defined in glibc < 2.41 */
+#ifndef SCHED_ATTR_SIZE_VER0
 struct sched_attr {
 	uint32_t size;
 	uint32_t sched_policy;
@@ -68,4 +70,6 @@ int sched_getattr(pid_t pid,
 		  unsigned int size,
 		  unsigned int flags);
 
+#endif /* SCHED_ATTR_SIZE_VER0 */
+
 #endif /* __RT_SCHED_H__ */
author
#1 lore raw

PATCH 1/1 sched_attr: Do not define for glibc >= 2.41

glibc 2.41+ has added [1] definitions for sched_setattr and sched_getattr functions and struct sched_attr. Therefore, it needs to be checked for here as well before defining sched_attr

Define sched_attr conditionally on SCHED_ATTR_SIZE_VER0

Fixes builds with glibc/trunk

[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8

Cc Clark Williams <[email protected]>
Cc John Kacur <[email protected]>
Cc rt-users <[email protected]>
---
 src/include/rt-sched.h | 4 ++++
 1 file changed, 4 insertions(+)
src/include/rt-sched.h +4 -0
index 80171c7..9cf0e3a 100644
@@ -42,6 +42,8 @@
 #define __NR_sched_getattr		275
 #endif
 
+/* sched_attr is not defined in glibc < 2.41 */
+#ifndef SCHED_ATTR_SIZE_VER0
 struct sched_attr {
 	uint32_t size;
 	uint32_t sched_policy;
@@ -68,4 +70,6 @@ int sched_getattr(pid_t pid,
 		  unsigned int size,
 		  unsigned int flags);
 
+#endif /* SCHED_ATTR_SIZE_VER0 */
+
 #endif /* __RT_SCHED_H__ */
#2 lore raw
In reply to Khem Raj
Quoted 34 lines · Khem Raj

glibc 2.41+ has added [1] definitions for sched_setattr and sched_getattr functions and struct sched_attr. Therefore, it needs to be checked for here as well before defining sched_attr

Define sched_attr conditionally on SCHED_ATTR_SIZE_VER0

Fixes builds with glibc/trunk

[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8

Cc Clark Williams <[email protected]>
Cc John Kacur <[email protected]>
Cc rt-users <[email protected]>
---
 src/include/rt-sched.h | 4 ++++
 1 file changed, 4 insertions(+)
src/include/rt-sched.h +2 -0
index 80171c7..9cf0e3a 100644
@@ -42,6 +42,8 @@
 #define __NR_sched_getattr		275
 #endif
 
+/* sched_attr is not defined in glibc < 2.41 */
+#ifndef SCHED_ATTR_SIZE_VER0
 struct sched_attr {
 	uint32_t size;
 	uint32_t sched_policy;

src/include/rt-sched.h int sched_getattr(pid_t pid, · line 75

Quoted 6 lines
src/include/rt-sched.h +2 -0
@@ -68,4 +70,6 @@ int sched_getattr(pid_t pid,
 		  unsigned int size,
 		  unsigned int flags);
 
+#endif /* SCHED_ATTR_SIZE_VER0 */
+
 #endif /* __RT_SCHED_H__ */

Does the following fix your problem?

From 280e198c39d1b17d0491d7c4e7afda97ae6c8e6f Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <[email protected]>
Date: Wed, 29 Jan 2025 16:46:11 -0500
Subject: [PATCH] Fix rt-tests build with glibc-2.41

The sched_*attr APIs were added to glibc
https://sourceware.org/git/?p=glibc.git;a=commit;h=21571ca0d70302909cf72707b2a7736cf12190a0

This fixes the build conflict in rt-tests with glibc-2.4

---
 src/include/rt-sched.h | 2 ++
 src/lib/rt-sched.c     | 2 ++
 2 files changed, 4 insertions(+)
src/include/rt-sched.h +2 -0
index 80171c76e0ee..dfd7f45f51cc 100644
@@ -42,6 +42,7 @@
 #define __NR_sched_getattr		275
 #endif
 
+#if ! __GLIBC_PREREQ(2, 41)
 struct sched_attr {
 	uint32_t size;
 	uint32_t sched_policy;
@@ -67,5 +68,6 @@ int sched_getattr(pid_t pid,
 		  struct sched_attr *attr,
 		  unsigned int size,
 		  unsigned int flags);
+#endif
 
 #endif /* __RT_SCHED_H__ */
src/lib/rt-sched.c +2 -0
index 8023bc70c473..2500abde26e4 100644
@@ -14,6 +14,7 @@
 
 #include "rt-sched.h"
 
+#if ! __GLIBC_PREREQ(2, 41)
 int sched_setattr(pid_t pid,
 		  const struct sched_attr *attr,
 		  unsigned int flags)
@@ -28,3 +29,4 @@ int sched_getattr(pid_t pid,
 {
 	return syscall(__NR_sched_getattr, pid, attr, size, flags);
 }
+#endif
Signature · 1 line
2.47.1
#3 lore raw
Quoted 45 lines · John Kacur
Quoted 34 lines · Khem Raj

glibc 2.41+ has added [1] definitions for sched_setattr and sched_getattr functions and struct sched_attr. Therefore, it needs to be checked for here as well before defining sched_attr

Define sched_attr conditionally on SCHED_ATTR_SIZE_VER0

Fixes builds with glibc/trunk

[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8

Cc Clark Williams <[email protected]>
Cc John Kacur <[email protected]>
Cc rt-users <[email protected]>
---
 src/include/rt-sched.h | 4 ++++
 1 file changed, 4 insertions(+)
src/include/rt-sched.h +2 -0
index 80171c7..9cf0e3a 100644
@@ -42,6 +42,8 @@
 #define __NR_sched_getattr		275
 #endif
 
+/* sched_attr is not defined in glibc < 2.41 */
+#ifndef SCHED_ATTR_SIZE_VER0
 struct sched_attr {
 	uint32_t size;
 	uint32_t sched_policy;

src/include/rt-sched.h int sched_getattr(pid_t pid, · line 75

Quoted 6 lines
src/include/rt-sched.h +2 -0
@@ -68,4 +70,6 @@ int sched_getattr(pid_t pid,
 		  unsigned int size,
 		  unsigned int flags);
 
+#endif /* SCHED_ATTR_SIZE_VER0 */
+
 #endif /* __RT_SCHED_H__ */

Does the following fix your problem?

[snip]

Quoted 1 line

+#if ! __GLIBC_PREREQ(2, 41)

I'm not familiar with the norms surrounding use of this macro, but it's generally better to test features than versions... what if this feature gets backported into some distro's earlier-version-numbered glibc?

FWIW, it looks like QEMU went with the feature test approach:
https://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/
https://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/

Also, was that patch posted anywhere? Just wondering if I've still got problems with email filtering.

-Crystal

#4 lore raw
Quoted 46 lines · Crystal Wood
Quoted 38 lines · John Kacur
Quoted 35 lines · Khem Raj

glibc 2.41+ has added [1] definitions for sched_setattr and sched_getattr functions and struct sched_attr. Therefore, it needs to be checked for here as well before defining sched_attr

Define sched_attr conditionally on SCHED_ATTR_SIZE_VER0

Fixes builds with glibc/trunk

[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8

Cc Clark Williams <[email protected]>
Cc John Kacur <[email protected]>
Cc rt-users <[email protected]>
---
 src/include/rt-sched.h | 4 ++++
 1 file changed, 4 insertions(+)
src/include/rt-sched.h +2 -0
index 80171c7..9cf0e3a 100644
@@ -42,6 +42,8 @@
 #define __NR_sched_getattr		275
 #endif
 
+/* sched_attr is not defined in glibc < 2.41 */
+#ifndef SCHED_ATTR_SIZE_VER0
 struct sched_attr {
 	uint32_t size;
 	uint32_t sched_policy;
@@ -68,4 +70,6 @@ int sched_getattr(pid_t pid,
 		  unsigned int size,
 		  unsigned int flags);
 
Quoted 7 lines

src/include/rt-sched.h int sched_getattr(pid_t pid, · line 75

Quoted 5 lines
src/include/rt-sched.h +2 -0
+#endif /* SCHED_ATTR_SIZE_VER0 */
+
 #endif /* __RT_SCHED_H__ */

Does the following fix your problem?

Quoted 7 lines

[snip]

Quoted 1 line

+#if ! __GLIBC_PREREQ(2, 41)

I'm not familiar with the norms surrounding use of this macro, but it's generally better to test features than versions... what if this feature gets backported into some distro's earlier-version-numbered glibc?

The macro is part of the glibc code in features.h
You make a good point about testing the features, but you could also argue that there is no guarantee that the implementation will always have SCHED_ATTR_SIZE_VER0 and that it could break in the future.

Quoted 5 lines

FWIW, it looks like QEMU went with the feature test approach:
https://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/
https://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/

Well, that's by the same author who sent this patch.

Quoted 2 lines

Also, was that patch posted anywhere? Just wondering if I've still got problems with email filtering.

No, a version of this was sent to me in fedora channels to fix a break in rawhide.

The version is more complete than the other patch because it also fixes src/lib/rt-sched.c

If this works for folks, lets just use it and move on, it's not worth endlessly hashing out.

John Kacur

Quoted 5 lines

-Crystal