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

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Laurent Vivier <laurent@vivier.eu>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
v2: Use SCHED_ATTR_SIZE_VER0 instead of glibc version check

 linux-user/syscall.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 1354e75694..caecbb765d 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -359,7 +359,8 @@ _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len,
 #define __NR_sys_sched_setaffinity __NR_sched_setaffinity
 _syscall3(int, sys_sched_setaffinity, pid_t, pid, unsigned int, len,
           unsigned long *, user_mask_ptr);
-/* sched_attr is not defined in glibc */
+/* sched_attr is not defined in glibc < 2.41 */
+#ifndef SCHED_ATTR_SIZE_VER0
 struct sched_attr {
     uint32_t size;
     uint32_t sched_policy;
@@ -372,6 +373,7 @@ struct sched_attr {
     uint32_t sched_util_min;
     uint32_t sched_util_max;
 };
+#endif
 #define __NR_sys_sched_getattr __NR_sched_getattr
 _syscall4(int, sys_sched_getattr, pid_t, pid, struct sched_attr *, attr,
           unsigned int, size, unsigned int, flags);

ping: this patch hasn't been merged for 9.2.0 afaict, so I
presume we're broken with latest glibc...

On Fri, Oct 11, 2024 at 12:31:40PM -0700, Khem Raj wrote:
> 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
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Cc: Laurent Vivier <laurent@vivier.eu>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> ---
> v2: Use SCHED_ATTR_SIZE_VER0 instead of glibc version check
> 
>  linux-user/syscall.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 1354e75694..caecbb765d 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -359,7 +359,8 @@ _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len,
>  #define __NR_sys_sched_setaffinity __NR_sched_setaffinity
>  _syscall3(int, sys_sched_setaffinity, pid_t, pid, unsigned int, len,
>            unsigned long *, user_mask_ptr);
> -/* sched_attr is not defined in glibc */
> +/* sched_attr is not defined in glibc < 2.41 */
> +#ifndef SCHED_ATTR_SIZE_VER0
>  struct sched_attr {
>      uint32_t size;
>      uint32_t sched_policy;
> @@ -372,6 +373,7 @@ struct sched_attr {
>      uint32_t sched_util_min;
>      uint32_t sched_util_max;
>  };
> +#endif
>  #define __NR_sys_sched_getattr __NR_sched_getattr
>  _syscall4(int, sys_sched_getattr, pid_t, pid, struct sched_attr *, attr,
>            unsigned int, size, unsigned int, flags);
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

On Fri, 6 Dec 2024 at 16:16, Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> ping: this patch hasn't been merged for 9.2.0 afaict, so I
> presume we're broken with latest glibc...

Whoops, yes, we dropped the ball on this one (and now the new
glibc is in Arch Linux, and a user has reported the breakage:
https://gitlab.com/qemu-project/qemu/-/issues/2799 ).

I've picked up the patch since I'm doing a target-arm pullreq
this week anyway (and added a cc:stable so we can get it into
the stable branches).

> On Fri, Oct 11, 2024 at 12:31:40PM -0700, Khem Raj wrote:
> > 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
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > Cc: Laurent Vivier <laurent@vivier.eu>
> > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> > v2: Use SCHED_ATTR_SIZE_VER0 instead of glibc version check

thanks
-- PMM