[Announce] CRIU 3.5 "Clay Jay" is out

Submitted by Adrian Reber on Sept. 28, 2017, 9:19 a.m.

Details

Message ID 20170928091920.GC8720@lisas.de
State Accepted
Series "CRIU 3.5 "Clay Jay" is out"
Commit 545acaf42fdc0a8832741af381da3645cceabe1a
Headers show

Commit Message

Adrian Reber Sept. 28, 2017, 9:19 a.m.
On Wed, Sep 27, 2017 at 03:35:02PM +0300, Pavel Emelyanov wrote:
> Please, join me in honoring Mike and Adrian for lazy restore and Dima for VDSO rework!
> Both features are finally released and ... are ready to get fixed :)
> 
> Full changelog is https://criu.org/Download/criu/3.5
> Sources http://download.openvz.org/criu/criu-3.5.tar.bz2
> 
> Have fun!

I already had fun with this release ;-) It does not build on any
architecture on Fedora's development branch rawhide:

In file included from /usr/include/linux/aio_abi.h:31:0,
                 from criu/cr-check.c:24:
/usr/include/sys/mount.h:35:3: error: expected identifier before numeric constant
   MS_RDONLY = 1,  /* Mount read-only.  */
   ^
make[2]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:111: criu/cr-check.o] Error 1
make[1]: *** [criu/Makefile:73: criu/built-in.o] Error 2
make: *** [Makefile:233: criu] Error 2

See the attached patch for a simple fix.

		Adrian
From cb21b73e859de77804dde8579c6d1d1f84eec3a6 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 28 Sep 2017 09:13:33 +0000
Subject: [PATCH] fix building on newest glibc and kernel

On Fedora rawhide with kernel-headers-4.14.0-0.rc2.git0.1.fc28.x86_64
glibc-devel-2.26.90-15.fc28.x86_64 criu does not build any more:

In file included from /usr/include/linux/aio_abi.h:31:0,
                 from criu/cr-check.c:24:
/usr/include/sys/mount.h:35:3: error: expected identifier before numeric constant
   MS_RDONLY = 1,  /* Mount read-only.  */
   ^
make[2]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:111: criu/cr-check.o] Error 1
make[1]: *** [criu/Makefile:73: criu/built-in.o] Error 2
make: *** [Makefile:233: criu] Error 2

This simple re-ordering of includes fixes it for me.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cr-check.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/criu/cr-check.c b/criu/cr-check.c
index 5dd448b..8986ec4 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -21,8 +21,8 @@ 
 #include <netinet/in.h>
 #include <sys/prctl.h>
 #include <sched.h>
-#include <linux/aio_abi.h>
 #include <sys/mount.h>
+#include <linux/aio_abi.h>
 
 #include "../soccr/soccr.h"
 

Comments

Adrian Reber Sept. 28, 2017, 11:16 a.m.
On Thu, Sep 28, 2017 at 11:19:20AM +0200, Adrian Reber wrote:
> On Wed, Sep 27, 2017 at 03:35:02PM +0300, Pavel Emelyanov wrote:
> > Please, join me in honoring Mike and Adrian for lazy restore and Dima for VDSO rework!
> > Both features are finally released and ... are ready to get fixed :)
> > 
> > Full changelog is https://criu.org/Download/criu/3.5
> > Sources http://download.openvz.org/criu/criu-3.5.tar.bz2
> > 
> > Have fun!
> 
> I already had fun with this release ;-) It does not build on any
> architecture on Fedora's development branch rawhide:
> 
> In file included from /usr/include/linux/aio_abi.h:31:0,
>                  from criu/cr-check.c:24:
> /usr/include/sys/mount.h:35:3: error: expected identifier before numeric constant
>    MS_RDONLY = 1,  /* Mount read-only.  */
>    ^
> make[2]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:111: criu/cr-check.o] Error 1
> make[1]: *** [criu/Makefile:73: criu/built-in.o] Error 2
> make: *** [Makefile:233: criu] Error 2
> 
> See the attached patch for a simple fix.

And one more failure on aarch64:

In file included from compel/include/uapi/compel/infect.h:6:0,
                 from compel/include/uapi/compel/compel.h:12,
                 from compel/include/log.h:4,
                 from compel/arch/aarch64/src/lib/infect.c:8:
compel/arch/aarch64/src/lib/infect.c: In function 'sigreturn_prep_regs_plain':
compel/include/uapi/compel/asm/sigframe.h:47:99: error: 'mcontext_t {aka struct <anonymous>}' has no member named '__reserved'; did you mean '__glibc_reserved1'?
 #define RT_SIGFRAME_AUX_CONTEXT(rt_sigframe) ((struct aux_context*)&(rt_sigframe)->uc.uc_mcontext.__reserved)
                                                                                                   ^
compel/include/uapi/compel/asm/sigframe.h:48:41: note: in expansion of macro 'RT_SIGFRAME_AUX_CONTEXT'
 #define RT_SIGFRAME_FPU(rt_sigframe)  (&RT_SIGFRAME_AUX_CONTEXT(rt_sigframe)->fpsimd)
                                         ^~~~~~~~~~~~~~~~~~~~~~~
compel/arch/aarch64/src/lib/infect.c:34:34: note: in expansion of macro 'RT_SIGFRAME_FPU'
  struct fpsimd_context *fpsimd = RT_SIGFRAME_FPU(sigframe);
                                  ^~~~~~~~~~~~~~~
make[1]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:209: compel/arch/aarch64/src/lib/infect.o] Error 1
make: *** [Makefile.compel:36: compel/libcompel.a] Error 2
error: Bad exit status from /var/tmp/rpm-tmp.IExY9K (%build)

This seems to be related to the following glibc changes:

https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4fa9b3bfe6759c82beb4b043a54a3598ca467289

		Adrian
Pavel Emelianov Sept. 28, 2017, 1:38 p.m.
On 09/28/2017 12:19 PM, Adrian Reber wrote:
> On Wed, Sep 27, 2017 at 03:35:02PM +0300, Pavel Emelyanov wrote:
>> Please, join me in honoring Mike and Adrian for lazy restore and Dima for VDSO rework!
>> Both features are finally released and ... are ready to get fixed :)
>>
>> Full changelog is https://criu.org/Download/criu/3.5
>> Sources http://download.openvz.org/criu/criu-3.5.tar.bz2
>>
>> Have fun!
> 
> I already had fun with this release ;-) It does not build on any
> architecture on Fedora's development branch rawhide:
> 
> In file included from /usr/include/linux/aio_abi.h:31:0,
>                  from criu/cr-check.c:24:
> /usr/include/sys/mount.h:35:3: error: expected identifier before numeric constant
>    MS_RDONLY = 1,  /* Mount read-only.  */
>    ^
> make[2]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:111: criu/cr-check.o] Error 1
> make[1]: *** [criu/Makefile:73: criu/built-in.o] Error 2
> make: *** [Makefile:233: criu] Error 2

Heh, but that's ... not a regression, is it? Or -- how did we manage to miss that
and what would be the options not do it in the future?

> See the attached patch for a simple fix.
> 
> 		Adrian
>
Pavel Emelianov Sept. 28, 2017, 1:40 p.m.
On 09/28/2017 02:16 PM, Adrian Reber wrote:
> On Thu, Sep 28, 2017 at 11:19:20AM +0200, Adrian Reber wrote:
>> On Wed, Sep 27, 2017 at 03:35:02PM +0300, Pavel Emelyanov wrote:
>>> Please, join me in honoring Mike and Adrian for lazy restore and Dima for VDSO rework!
>>> Both features are finally released and ... are ready to get fixed :)
>>>
>>> Full changelog is https://criu.org/Download/criu/3.5
>>> Sources http://download.openvz.org/criu/criu-3.5.tar.bz2
>>>
>>> Have fun!
>>
>> I already had fun with this release ;-) It does not build on any
>> architecture on Fedora's development branch rawhide:
>>
>> In file included from /usr/include/linux/aio_abi.h:31:0,
>>                  from criu/cr-check.c:24:
>> /usr/include/sys/mount.h:35:3: error: expected identifier before numeric constant
>>    MS_RDONLY = 1,  /* Mount read-only.  */
>>    ^
>> make[2]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:111: criu/cr-check.o] Error 1
>> make[1]: *** [criu/Makefile:73: criu/built-in.o] Error 2
>> make: *** [Makefile:233: criu] Error 2
>>
>> See the attached patch for a simple fix.
> 
> And one more failure on aarch64:
> 
> In file included from compel/include/uapi/compel/infect.h:6:0,
>                  from compel/include/uapi/compel/compel.h:12,
>                  from compel/include/log.h:4,
>                  from compel/arch/aarch64/src/lib/infect.c:8:
> compel/arch/aarch64/src/lib/infect.c: In function 'sigreturn_prep_regs_plain':
> compel/include/uapi/compel/asm/sigframe.h:47:99: error: 'mcontext_t {aka struct <anonymous>}' has no member named '__reserved'; did you mean '__glibc_reserved1'?
>  #define RT_SIGFRAME_AUX_CONTEXT(rt_sigframe) ((struct aux_context*)&(rt_sigframe)->uc.uc_mcontext.__reserved)
>                                                                                                    ^
> compel/include/uapi/compel/asm/sigframe.h:48:41: note: in expansion of macro 'RT_SIGFRAME_AUX_CONTEXT'
>  #define RT_SIGFRAME_FPU(rt_sigframe)  (&RT_SIGFRAME_AUX_CONTEXT(rt_sigframe)->fpsimd)
>                                          ^~~~~~~~~~~~~~~~~~~~~~~
> compel/arch/aarch64/src/lib/infect.c:34:34: note: in expansion of macro 'RT_SIGFRAME_FPU'
>   struct fpsimd_context *fpsimd = RT_SIGFRAME_FPU(sigframe);
>                                   ^~~~~~~~~~~~~~~
> make[1]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:209: compel/arch/aarch64/src/lib/infect.o] Error 1
> make: *** [Makefile.compel:36: compel/libcompel.a] Error 2
> error: Bad exit status from /var/tmp/rpm-tmp.IExY9K (%build)
> 
> This seems to be related to the following glibc changes:
> 
> https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4fa9b3bfe6759c82beb4b043a54a3598ca467289


From the changelog:
   Use __glibc_reserved1 instead of __reserved.

And it's not a macro, so we cannot check it with #ifdef :\ IIRC we've seen smth like that
before, again with uc_mcontext.

-- Pavel
Adrian Reber Sept. 28, 2017, 1:45 p.m.
On Thu, Sep 28, 2017 at 04:38:42PM +0300, Pavel Emelyanov wrote:
> On 09/28/2017 12:19 PM, Adrian Reber wrote:
> > On Wed, Sep 27, 2017 at 03:35:02PM +0300, Pavel Emelyanov wrote:
> >> Please, join me in honoring Mike and Adrian for lazy restore and Dima for VDSO rework!
> >> Both features are finally released and ... are ready to get fixed :)
> >>
> >> Full changelog is https://criu.org/Download/criu/3.5
> >> Sources http://download.openvz.org/criu/criu-3.5.tar.bz2
> >>
> >> Have fun!
> > 
> > I already had fun with this release ;-) It does not build on any
> > architecture on Fedora's development branch rawhide:
> > 
> > In file included from /usr/include/linux/aio_abi.h:31:0,
> >                  from criu/cr-check.c:24:
> > /usr/include/sys/mount.h:35:3: error: expected identifier before numeric constant
> >    MS_RDONLY = 1,  /* Mount read-only.  */
> >    ^
> > make[2]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:111: criu/cr-check.o] Error 1
> > make[1]: *** [criu/Makefile:73: criu/built-in.o] Error 2
> > make: *** [Makefile:233: criu] Error 2
> 
> Heh, but that's ... not a regression, is it? Or -- how did we manage to miss that
> and what would be the options not do it in the future?

I guess this is also related to glibc changes and as Fedora rawhide
follows glibc development versions very closely I am always hitting this
when I try to build the latest CRIU release for rawhide.

I do not know how travis/jenkins works, but if you could build against
Fedora rawhide you would catch those glibc changes. The problem is, that
rawhide is not always installable so you might get false errors just
because rawhide is broken for a few days.

		Adrian
Adrian Reber Sept. 28, 2017, 1:47 p.m.
On Thu, Sep 28, 2017 at 04:40:22PM +0300, Pavel Emelyanov wrote:
> On 09/28/2017 02:16 PM, Adrian Reber wrote:
> > On Thu, Sep 28, 2017 at 11:19:20AM +0200, Adrian Reber wrote:
> >> On Wed, Sep 27, 2017 at 03:35:02PM +0300, Pavel Emelyanov wrote:
> >>> Please, join me in honoring Mike and Adrian for lazy restore and Dima for VDSO rework!
> >>> Both features are finally released and ... are ready to get fixed :)
> >>>
> >>> Full changelog is https://criu.org/Download/criu/3.5
> >>> Sources http://download.openvz.org/criu/criu-3.5.tar.bz2
> >>>
> >>> Have fun!
> >>
> >> I already had fun with this release ;-) It does not build on any
> >> architecture on Fedora's development branch rawhide:
> >>
> >> In file included from /usr/include/linux/aio_abi.h:31:0,
> >>                  from criu/cr-check.c:24:
> >> /usr/include/sys/mount.h:35:3: error: expected identifier before numeric constant
> >>    MS_RDONLY = 1,  /* Mount read-only.  */
> >>    ^
> >> make[2]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:111: criu/cr-check.o] Error 1
> >> make[1]: *** [criu/Makefile:73: criu/built-in.o] Error 2
> >> make: *** [Makefile:233: criu] Error 2
> >>
> >> See the attached patch for a simple fix.
> > 
> > And one more failure on aarch64:
> > 
> > In file included from compel/include/uapi/compel/infect.h:6:0,
> >                  from compel/include/uapi/compel/compel.h:12,
> >                  from compel/include/log.h:4,
> >                  from compel/arch/aarch64/src/lib/infect.c:8:
> > compel/arch/aarch64/src/lib/infect.c: In function 'sigreturn_prep_regs_plain':
> > compel/include/uapi/compel/asm/sigframe.h:47:99: error: 'mcontext_t {aka struct <anonymous>}' has no member named '__reserved'; did you mean '__glibc_reserved1'?
> >  #define RT_SIGFRAME_AUX_CONTEXT(rt_sigframe) ((struct aux_context*)&(rt_sigframe)->uc.uc_mcontext.__reserved)
> >                                                                                                    ^
> > compel/include/uapi/compel/asm/sigframe.h:48:41: note: in expansion of macro 'RT_SIGFRAME_AUX_CONTEXT'
> >  #define RT_SIGFRAME_FPU(rt_sigframe)  (&RT_SIGFRAME_AUX_CONTEXT(rt_sigframe)->fpsimd)
> >                                          ^~~~~~~~~~~~~~~~~~~~~~~
> > compel/arch/aarch64/src/lib/infect.c:34:34: note: in expansion of macro 'RT_SIGFRAME_FPU'
> >   struct fpsimd_context *fpsimd = RT_SIGFRAME_FPU(sigframe);
> >                                   ^~~~~~~~~~~~~~~
> > make[1]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:209: compel/arch/aarch64/src/lib/infect.o] Error 1
> > make: *** [Makefile.compel:36: compel/libcompel.a] Error 2
> > error: Bad exit status from /var/tmp/rpm-tmp.IExY9K (%build)
> > 
> > This seems to be related to the following glibc changes:
> > 
> > https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4fa9b3bfe6759c82beb4b043a54a3598ca467289
> 
> 
> >From the changelog:
>    Use __glibc_reserved1 instead of __reserved.
> 
> And it's not a macro, so we cannot check it with #ifdef :\ IIRC we've seen smth like that
> before, again with uc_mcontext.

Yes, see my commit:

commit f2899a728cf2baf79655b5b2559f826af7c8452d
Author: Adrian Reber <areber@redhat.com>
Date:   Thu Jul 20 12:08:34 2017 -0400

    compel/aarch64: glibc renamed ucontext to ucontext_t
    
    The upcoming glibc release renamed 'struct ucontext' to
    'struct ucontext_t':
    
    https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=251287734e89a52da3db682a8241eb6bccc050c9;hp=c86ed71d633c22d6f638576f7660c52a5f783d66
    
    Instead of using 'struct ucontext' this patch changes it
    to the typedef ucontext_t which already exists in older and
    new versions of glibc.
    
    Signed-off-by: Adrian Reber <areber@redhat.com>
    Reviewed-by: Dmitry Safonov <dsafonov@virtuozzo.com>
    Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

That was possible to fix to work with the old and new glibc at the same time.

This change might require a feature test.

		Adrian
Andrey Vagin Sept. 28, 2017, 10:54 p.m.
On Thu, Sep 28, 2017 at 03:45:55PM +0200, Adrian Reber wrote:
> On Thu, Sep 28, 2017 at 04:38:42PM +0300, Pavel Emelyanov wrote:
> > On 09/28/2017 12:19 PM, Adrian Reber wrote:
> > > On Wed, Sep 27, 2017 at 03:35:02PM +0300, Pavel Emelyanov wrote:
> > >> Please, join me in honoring Mike and Adrian for lazy restore and Dima for VDSO rework!
> > >> Both features are finally released and ... are ready to get fixed :)
> > >>
> > >> Full changelog is https://criu.org/Download/criu/3.5
> > >> Sources http://download.openvz.org/criu/criu-3.5.tar.bz2
> > >>
> > >> Have fun!
> > > 
> > > I already had fun with this release ;-) It does not build on any
> > > architecture on Fedora's development branch rawhide:
> > > 
> > > In file included from /usr/include/linux/aio_abi.h:31:0,
> > >                  from criu/cr-check.c:24:
> > > /usr/include/sys/mount.h:35:3: error: expected identifier before numeric constant
> > >    MS_RDONLY = 1,  /* Mount read-only.  */
> > >    ^
> > > make[2]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:111: criu/cr-check.o] Error 1
> > > make[1]: *** [criu/Makefile:73: criu/built-in.o] Error 2
> > > make: *** [Makefile:233: criu] Error 2
> > 
> > Heh, but that's ... not a regression, is it? Or -- how did we manage to miss that
> > and what would be the options not do it in the future?
> 
> I guess this is also related to glibc changes and as Fedora rawhide
> follows glibc development versions very closely I am always hitting this
> when I try to build the latest CRIU release for rawhide.
> 
> I do not know how travis/jenkins works, but if you could build against
> Fedora rawhide you would catch those glibc changes. The problem is, that
> rawhide is not always installable so you might get false errors just
> because rawhide is broken for a few days.

https://travis-ci.org/avagin/criu/jobs/281086086

> 
> 		Adrian
> _______________________________________________
> CRIU mailing list
> CRIU@openvz.org
> https://lists.openvz.org/mailman/listinfo/criu
Adrian Reber Oct. 17, 2017, 12:37 p.m.
On Thu, Sep 28, 2017 at 03:47:20PM +0200, Adrian Reber wrote:
> > > And one more failure on aarch64:
> > > 
> > > In file included from compel/include/uapi/compel/infect.h:6:0,
> > >                  from compel/include/uapi/compel/compel.h:12,
> > >                  from compel/include/log.h:4,
> > >                  from compel/arch/aarch64/src/lib/infect.c:8:
> > > compel/arch/aarch64/src/lib/infect.c: In function 'sigreturn_prep_regs_plain':
> > > compel/include/uapi/compel/asm/sigframe.h:47:99: error: 'mcontext_t {aka struct <anonymous>}' has no member named '__reserved'; did you mean '__glibc_reserved1'?
> > >  #define RT_SIGFRAME_AUX_CONTEXT(rt_sigframe) ((struct aux_context*)&(rt_sigframe)->uc.uc_mcontext.__reserved)
> > >                                                                                                    ^
> > > compel/include/uapi/compel/asm/sigframe.h:48:41: note: in expansion of macro 'RT_SIGFRAME_AUX_CONTEXT'
> > >  #define RT_SIGFRAME_FPU(rt_sigframe)  (&RT_SIGFRAME_AUX_CONTEXT(rt_sigframe)->fpsimd)
> > >                                          ^~~~~~~~~~~~~~~~~~~~~~~
> > > compel/arch/aarch64/src/lib/infect.c:34:34: note: in expansion of macro 'RT_SIGFRAME_FPU'
> > >   struct fpsimd_context *fpsimd = RT_SIGFRAME_FPU(sigframe);
> > >                                   ^~~~~~~~~~~~~~~
> > > make[1]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:209: compel/arch/aarch64/src/lib/infect.o] Error 1
> > > make: *** [Makefile.compel:36: compel/libcompel.a] Error 2
> > > error: Bad exit status from /var/tmp/rpm-tmp.IExY9K (%build)
> > > 
> > > This seems to be related to the following glibc changes:
> > > 
> > > https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4fa9b3bfe6759c82beb4b043a54a3598ca467289
> > 
> > 
> > >From the changelog:
> >    Use __glibc_reserved1 instead of __reserved.
> > 
> > And it's not a macro, so we cannot check it with #ifdef :\ IIRC we've seen smth like that
> > before, again with uc_mcontext.

Has this been fixed? I see that you are preparing for the next release
and have not seen and follow-up discussion on this.

		Adrian

> Yes, see my commit:
> 
> commit f2899a728cf2baf79655b5b2559f826af7c8452d
> Author: Adrian Reber <areber@redhat.com>
> Date:   Thu Jul 20 12:08:34 2017 -0400
> 
>     compel/aarch64: glibc renamed ucontext to ucontext_t
>     
>     The upcoming glibc release renamed 'struct ucontext' to
>     'struct ucontext_t':
>     
>     https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=251287734e89a52da3db682a8241eb6bccc050c9;hp=c86ed71d633c22d6f638576f7660c52a5f783d66
>     
>     Instead of using 'struct ucontext' this patch changes it
>     to the typedef ucontext_t which already exists in older and
>     new versions of glibc.
>     
>     Signed-off-by: Adrian Reber <areber@redhat.com>
>     Reviewed-by: Dmitry Safonov <dsafonov@virtuozzo.com>
>     Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
> 
> That was possible to fix to work with the old and new glibc at the same time.
> 
> This change might require a feature test.
> 
> 		Adrian
> _______________________________________________
> CRIU mailing list
> CRIU@openvz.org
> https://lists.openvz.org/mailman/listinfo/criu

		Adrian
Pavel Emelianov Oct. 17, 2017, 12:44 p.m.
On 10/17/2017 03:37 PM, Adrian Reber wrote:

>>> >From the changelog:
>>>    Use __glibc_reserved1 instead of __reserved.
>>>
>>> And it's not a macro, so we cannot check it with #ifdef :\ IIRC we've seen smth like that
>>> before, again with uc_mcontext.
> 
> Has this been fixed? I see that you are preparing for the next release
> and have not seen and follow-up discussion on this.

Andrey, I thought we had patches about it and they've been pushed to master :)
Have we?

-- Pavel
Adrian Reber Oct. 17, 2017, 1:36 p.m.
On Tue, Oct 17, 2017 at 03:44:57PM +0300, Pavel Emelyanov wrote:
> >>> >From the changelog:
> >>>    Use __glibc_reserved1 instead of __reserved.
> >>>
> >>> And it's not a macro, so we cannot check it with #ifdef :\ IIRC we've seen smth like that
> >>> before, again with uc_mcontext.
> > 
> > Has this been fixed? I see that you are preparing for the next release
> > and have not seen and follow-up discussion on this.
> 
> Andrey, I thought we had patches about it and they've been pushed to master :)
> Have we?

There is only this:

https://github.com/checkpoint-restore/criu/commit/f41e386d4d40e3e26b0cfdc85a812b7edb337f1d

Which is not arch specific. I see no fix for aarch64 on criu-dev.

		Adrian
Pavel Emelianov Oct. 17, 2017, 1:56 p.m.
On 10/17/2017 04:36 PM, Adrian Reber wrote:
> On Tue, Oct 17, 2017 at 03:44:57PM +0300, Pavel Emelyanov wrote:
>>>>> >From the changelog:
>>>>>    Use __glibc_reserved1 instead of __reserved.
>>>>>
>>>>> And it's not a macro, so we cannot check it with #ifdef :\ IIRC we've seen smth like that
>>>>> before, again with uc_mcontext.
>>>
>>> Has this been fixed? I see that you are preparing for the next release
>>> and have not seen and follow-up discussion on this.
>>
>> Andrey, I thought we had patches about it and they've been pushed to master :)
>> Have we?
> 
> There is only this:
> 
> https://github.com/checkpoint-restore/criu/commit/f41e386d4d40e3e26b0cfdc85a812b7edb337f1d
> 
> Which is not arch specific. I see no fix for aarch64 on criu-dev.

Was there a patch for it in the ML?

-- Pavel
Adrian Reber Oct. 17, 2017, 2:05 p.m.
On Tue, Oct 17, 2017 at 04:56:37PM +0300, Pavel Emelyanov wrote:
> On 10/17/2017 04:36 PM, Adrian Reber wrote:
> > On Tue, Oct 17, 2017 at 03:44:57PM +0300, Pavel Emelyanov wrote:
> >>>>> >From the changelog:
> >>>>>    Use __glibc_reserved1 instead of __reserved.
> >>>>>
> >>>>> And it's not a macro, so we cannot check it with #ifdef :\ IIRC we've seen smth like that
> >>>>> before, again with uc_mcontext.
> >>>
> >>> Has this been fixed? I see that you are preparing for the next release
> >>> and have not seen and follow-up discussion on this.
> >>
> >> Andrey, I thought we had patches about it and they've been pushed to master :)
> >> Have we?
> > 
> > There is only this:
> > 
> > https://github.com/checkpoint-restore/criu/commit/f41e386d4d40e3e26b0cfdc85a812b7edb337f1d
> > 
> > Which is not arch specific. I see no fix for aarch64 on criu-dev.
> 
> Was there a patch for it in the ML?

Not from me, as I am not sure how to properly fix it. It probably needs
a feature detection macro to select the right structure name. But I was
not able to get access to the combination of hardware and really new
glibc.

		Adrian