[PULL 0/1] Linux user for 5.0 patches

[PULL 0/1] Linux user for 5.0 patches

[Laurent Vivier]

The following changes since commit 20038cd7a8412feeb49c01f6ede89e36c8995472:

  Update version for v5.0.0-rc3 release (2020-04-15 20:51:54 +0100)

are available in the Git repository at:

  git://github.com/vivier/qemu.git tags/linux-user-for-5.0-pull-request

for you to fetch changes up to 386d38656889a40d29b514ee6f34997ca18f741e:

  linux-user/syscall.c: add target-to-host mapping for epoll_create1() (2020-04-16 09:24:22 +0200)

----------------------------------------------------------------
Fix epoll_create1() for qemu-alpha

----------------------------------------------------------------

Sergei Trofimovich (1):
  linux-user/syscall.c: add target-to-host mapping for epoll_create1()

 linux-user/syscall.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.25.2

[PULL 1/1] linux-user/syscall.c: add target-to-host mapping for epoll_create1()

[Laurent Vivier]

From: Sergei Trofimovich <slyfox@gentoo.org>

Noticed by Barnabás Virágh as a python-3.7 failue on qemu-alpha.

The bug shows up on alpha as it's one of the targets where
EPOLL_CLOEXEC differs from other targets:
    sysdeps/unix/sysv/linux/alpha/bits/epoll.h: EPOLL_CLOEXEC  = 01000000
    sysdeps/unix/sysv/linux/bits/epoll.h:        EPOLL_CLOEXEC = 02000000

Bug: https://bugs.gentoo.org/717548
Reported-by: Barnabás Virágh
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
CC: Riku Voipio <riku.voipio@iki.fi>
CC: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200415220508.5044-1-slyfox@gentoo.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/syscall.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 674f70e70a56..05f03919ff07 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -12012,7 +12012,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
 #endif
 #if defined(TARGET_NR_epoll_create1) && defined(CONFIG_EPOLL_CREATE1)
     case TARGET_NR_epoll_create1:
-        return get_errno(epoll_create1(arg1));
+        return get_errno(epoll_create1(target_to_host_bitmask(arg1, fcntl_flags_tbl)));
 #endif
 #if defined(TARGET_NR_epoll_ctl)
     case TARGET_NR_epoll_ctl:
-- 
2.25.2

Re: [PULL 0/1] Linux user for 5.0 patches

[Peter Maydell]

On Thu, 16 Apr 2020 at 16:29, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 20038cd7a8412feeb49c01f6ede89e36c8995472:
>
>   Update version for v5.0.0-rc3 release (2020-04-15 20:51:54 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/linux-user-for-5.0-pull-request
>
> for you to fetch changes up to 386d38656889a40d29b514ee6f34997ca18f741e:
>
>   linux-user/syscall.c: add target-to-host mapping for epoll_create1() (2020-04-16 09:24:22 +0200)
>
> ----------------------------------------------------------------
> Fix epoll_create1() for qemu-alpha
>
> ----------------------------------------------------------------

How critical is this bug fix? After rc3, I really don't want
to have to create an rc4 unless it's unavoidable...

thanks
-- PMM

Re: [PULL 0/1] Linux user for 5.0 patches

[Laurent Vivier]

Le 16/04/2020 à 18:03, Peter Maydell a écrit :
> On Thu, 16 Apr 2020 at 16:29, Laurent Vivier <laurent@vivier.eu> wrote:
>>
>> The following changes since commit 20038cd7a8412feeb49c01f6ede89e36c8995472:
>>
>>   Update version for v5.0.0-rc3 release (2020-04-15 20:51:54 +0100)
>>
>> are available in the Git repository at:
>>
>>   git://github.com/vivier/qemu.git tags/linux-user-for-5.0-pull-request
>>
>> for you to fetch changes up to 386d38656889a40d29b514ee6f34997ca18f741e:
>>
>>   linux-user/syscall.c: add target-to-host mapping for epoll_create1() (2020-04-16 09:24:22 +0200)
>>
>> ----------------------------------------------------------------
>> Fix epoll_create1() for qemu-alpha
>>
>> ----------------------------------------------------------------
> 
> How critical is this bug fix? After rc3, I really don't want
> to have to create an rc4 unless it's unavoidable...

See the launchpad bug (https://bugs.gentoo.org/717548): on alpha, it
prevents the use of python3 in gentoo chroot, and thus we can't use
emerge to install packages. It also impacts cmake on debian (see
https://bugs.launchpad.net/bugs/1860553).

But it's not a regression, so up to you to reject it. It appears now
because most of the distro have switched from python2 to python3.

It's a low risk change, only in linux-user and for archs that have a
different EPOLL_CLOEXEC value.

Thanks,
Laurent

Re: [PULL 0/1] Linux user for 5.0 patches

[Peter Maydell]

On Thu, 16 Apr 2020 at 18:16, Laurent Vivier <laurent@vivier.eu> wrote:
>
> Le 16/04/2020 à 18:03, Peter Maydell a écrit :
> > On Thu, 16 Apr 2020 at 16:29, Laurent Vivier <laurent@vivier.eu> wrote:
> >>
> >> The following changes since commit 20038cd7a8412feeb49c01f6ede89e36c8995472:
> >>
> >>   Update version for v5.0.0-rc3 release (2020-04-15 20:51:54 +0100)
> >>
> >> are available in the Git repository at:
> >>
> >>   git://github.com/vivier/qemu.git tags/linux-user-for-5.0-pull-request
> >>
> >> for you to fetch changes up to 386d38656889a40d29b514ee6f34997ca18f741e:
> >>
> >>   linux-user/syscall.c: add target-to-host mapping for epoll_create1() (2020-04-16 09:24:22 +0200)
> >>
> >> ----------------------------------------------------------------
> >> Fix epoll_create1() for qemu-alpha
> >>
> >> ----------------------------------------------------------------
> >
> > How critical is this bug fix? After rc3, I really don't want
> > to have to create an rc4 unless it's unavoidable...
>
> See the launchpad bug (https://bugs.gentoo.org/717548): on alpha, it
> prevents the use of python3 in gentoo chroot, and thus we can't use
> emerge to install packages. It also impacts cmake on debian (see
> https://bugs.launchpad.net/bugs/1860553).
>
> But it's not a regression, so up to you to reject it. It appears now
> because most of the distro have switched from python2 to python3.
>
> It's a low risk change, only in linux-user and for archs that have a
> different EPOLL_CLOEXEC value.

Thanks for the explanation. I think that I'll put it to one
side and if we need an rc4 for some other reason it can go in,
but it's not sufficiently major to merit an rc4 by itself.

-- PMM

Re: [PULL 0/1] Linux user for 5.0 patches

[Laurent Vivier]

Le 16/04/2020 à 21:08, Peter Maydell a écrit :
> On Thu, 16 Apr 2020 at 18:16, Laurent Vivier <laurent@vivier.eu> wrote:
>>
>> Le 16/04/2020 à 18:03, Peter Maydell a écrit :
>>> On Thu, 16 Apr 2020 at 16:29, Laurent Vivier <laurent@vivier.eu> wrote:
>>>>
>>>> The following changes since commit 20038cd7a8412feeb49c01f6ede89e36c8995472:
>>>>
>>>>   Update version for v5.0.0-rc3 release (2020-04-15 20:51:54 +0100)
>>>>
>>>> are available in the Git repository at:
>>>>
>>>>   git://github.com/vivier/qemu.git tags/linux-user-for-5.0-pull-request
>>>>
>>>> for you to fetch changes up to 386d38656889a40d29b514ee6f34997ca18f741e:
>>>>
>>>>   linux-user/syscall.c: add target-to-host mapping for epoll_create1() (2020-04-16 09:24:22 +0200)
>>>>
>>>> ----------------------------------------------------------------
>>>> Fix epoll_create1() for qemu-alpha
>>>>
>>>> ----------------------------------------------------------------
>>>
>>> How critical is this bug fix? After rc3, I really don't want
>>> to have to create an rc4 unless it's unavoidable...
>>
>> See the launchpad bug (https://bugs.gentoo.org/717548): on alpha, it
>> prevents the use of python3 in gentoo chroot, and thus we can't use
>> emerge to install packages. It also impacts cmake on debian (see
>> https://bugs.launchpad.net/bugs/1860553).
>>
>> But it's not a regression, so up to you to reject it. It appears now
>> because most of the distro have switched from python2 to python3.
>>
>> It's a low risk change, only in linux-user and for archs that have a
>> different EPOLL_CLOEXEC value.
> 
> Thanks for the explanation. I think that I'll put it to one
> side and if we need an rc4 for some other reason it can go in,
> but it's not sufficiently major to merit an rc4 by itself.
> 

Thank you, I agree.

Laurent

Re: [PULL 0/1] Linux user for 5.0 patches

[Peter Maydell]

On Thu, 16 Apr 2020 at 20:08, Peter Maydell <peter.maydell@linaro.org> wrote:
>
> On Thu, 16 Apr 2020 at 18:16, Laurent Vivier <laurent@vivier.eu> wrote:
> >
> > Le 16/04/2020 à 18:03, Peter Maydell a écrit :
> > > On Thu, 16 Apr 2020 at 16:29, Laurent Vivier <laurent@vivier.eu> wrote:
> > >>
> > >> The following changes since commit 20038cd7a8412feeb49c01f6ede89e36c8995472:
> > >>
> > >>   Update version for v5.0.0-rc3 release (2020-04-15 20:51:54 +0100)
> > >>
> > >> are available in the Git repository at:
> > >>
> > >>   git://github.com/vivier/qemu.git tags/linux-user-for-5.0-pull-request
> > >>
> > >> for you to fetch changes up to 386d38656889a40d29b514ee6f34997ca18f741e:
> > >>
> > >>   linux-user/syscall.c: add target-to-host mapping for epoll_create1() (2020-04-16 09:24:22 +0200)
> > >>
> > >> ----------------------------------------------------------------
> > >> Fix epoll_create1() for qemu-alpha
> > >>
> > >> ----------------------------------------------------------------
> > >
> > > How critical is this bug fix? After rc3, I really don't want
> > > to have to create an rc4 unless it's unavoidable...
> >
> > See the launchpad bug (https://bugs.gentoo.org/717548): on alpha, it
> > prevents the use of python3 in gentoo chroot, and thus we can't use
> > emerge to install packages. It also impacts cmake on debian (see
> > https://bugs.launchpad.net/bugs/1860553).
> >
> > But it's not a regression, so up to you to reject it. It appears now
> > because most of the distro have switched from python2 to python3.
> >
> > It's a low risk change, only in linux-user and for archs that have a
> > different EPOLL_CLOEXEC value.
>
> Thanks for the explanation. I think that I'll put it to one
> side and if we need an rc4 for some other reason it can go in,
> but it's not sufficiently major to merit an rc4 by itself.

We needed an rc4 for the iscsi fix, so I have applied this pullreq.

thanks
-- PMM

Re: [PULL 0/1] Linux user for 5.0 patches

[Peter Maydell]

On Mon, 30 Mar 2020 at 11:31, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit cfe68ae025f704f336d7dd3d1903ce37b445831d:
>
>   Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.0-pull-request' into staging (2020-03-26 20:55:54 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/linux-user-for-5.0-pull-request
>
> for you to fetch changes up to 146902964d66881da797e45a5950732e38532e3e:
>
>   linux-user: Support futex_time64 (2020-03-30 12:28:30 +0200)
>
> ----------------------------------------------------------------
> Add support for futex_time64
>
> ----------------------------------------------------------------
>
> Alistair Francis (1):
>   linux-user: Support futex_time64
>
>  linux-user/syscall.c | 140 ++++++++++++++++++++++++++++++++++++++-----
>  1 file changed, 126 insertions(+), 14 deletions(-)


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.

-- PMM

Re: [PULL 0/1] Linux user for 5.0 patches

[no-reply]

Patchew URL: https://patchew.org/QEMU/20200330102945.2388294-1-laurent@vivier.eu/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Subject: [PULL 0/1] Linux user for 5.0 patches
Message-id: 20200330102945.2388294-1-laurent@vivier.eu
Type: series

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Switched to a new branch 'test'
68faea1 linux-user: Support futex_time64

=== OUTPUT BEGIN ===
WARNING: architecture specific defines should be avoided
#27: FILE: linux-user/syscall.c:248:
+#if defined(__NR_futex)

WARNING: architecture specific defines should be avoided
#30: FILE: linux-user/syscall.c:251:
+#if defined(__NR_futex_time64)

WARNING: architecture specific defines should be avoided
#41: FILE: linux-user/syscall.c:303:
+#if defined(__NR_futex)

WARNING: architecture specific defines should be avoided
#45: FILE: linux-user/syscall.c:307:
+#if defined(__NR_futex_time64)

ERROR: space required after that ',' (ctx:VxV)
#46: FILE: linux-user/syscall.c:308:
+_syscall6(int,sys_futex_time64,int *,uaddr,int,op,int,val,
              ^

ERROR: space required after that ',' (ctx:VxV)
#46: FILE: linux-user/syscall.c:308:
+_syscall6(int,sys_futex_time64,int *,uaddr,int,op,int,val,
                               ^

ERROR: space required after that ',' (ctx:OxV)
#46: FILE: linux-user/syscall.c:308:
+_syscall6(int,sys_futex_time64,int *,uaddr,int,op,int,val,
                                     ^

ERROR: space required after that ',' (ctx:VxV)
#46: FILE: linux-user/syscall.c:308:
+_syscall6(int,sys_futex_time64,int *,uaddr,int,op,int,val,
                                           ^

ERROR: space required after that ',' (ctx:VxV)
#46: FILE: linux-user/syscall.c:308:
+_syscall6(int,sys_futex_time64,int *,uaddr,int,op,int,val,
                                               ^

ERROR: space required after that ',' (ctx:VxV)
#46: FILE: linux-user/syscall.c:308:
+_syscall6(int,sys_futex_time64,int *,uaddr,int,op,int,val,
                                                  ^

ERROR: space required after that ',' (ctx:VxV)
#46: FILE: linux-user/syscall.c:308:
+_syscall6(int,sys_futex_time64,int *,uaddr,int,op,int,val,
                                                      ^

ERROR: space required after that ',' (ctx:OxV)
#47: FILE: linux-user/syscall.c:309:
+          const struct timespec *,timeout,int *,uaddr2,int,val3)
                                  ^

ERROR: space required after that ',' (ctx:VxV)
#47: FILE: linux-user/syscall.c:309:
+          const struct timespec *,timeout,int *,uaddr2,int,val3)
                                          ^

ERROR: space required after that ',' (ctx:OxV)
#47: FILE: linux-user/syscall.c:309:
+          const struct timespec *,timeout,int *,uaddr2,int,val3)
                                                ^

ERROR: space required after that ',' (ctx:VxV)
#47: FILE: linux-user/syscall.c:309:
+          const struct timespec *,timeout,int *,uaddr2,int,val3)
                                                       ^

ERROR: space required after that ',' (ctx:VxV)
#47: FILE: linux-user/syscall.c:309:
+          const struct timespec *,timeout,int *,uaddr2,int,val3)
                                                           ^

WARNING: architecture specific defines should be avoided
#57: FILE: linux-user/syscall.c:774:
+#if defined(__NR_futex)

WARNING: architecture specific defines should be avoided
#61: FILE: linux-user/syscall.c:778:
+#if defined(__NR_futex_time64)

ERROR: space required after that ',' (ctx:VxV)
#62: FILE: linux-user/syscall.c:779:
+safe_syscall6(int,futex_time64,int *,uaddr,int,op,int,val, \
                  ^

ERROR: space required after that ',' (ctx:VxV)
#62: FILE: linux-user/syscall.c:779:
+safe_syscall6(int,futex_time64,int *,uaddr,int,op,int,val, \
                               ^

ERROR: space required after that ',' (ctx:OxV)
#62: FILE: linux-user/syscall.c:779:
+safe_syscall6(int,futex_time64,int *,uaddr,int,op,int,val, \
                                     ^

ERROR: space required after that ',' (ctx:VxV)
#62: FILE: linux-user/syscall.c:779:
+safe_syscall6(int,futex_time64,int *,uaddr,int,op,int,val, \
                                           ^

ERROR: space required after that ',' (ctx:VxV)
#62: FILE: linux-user/syscall.c:779:
+safe_syscall6(int,futex_time64,int *,uaddr,int,op,int,val, \
                                               ^

ERROR: space required after that ',' (ctx:VxV)
#62: FILE: linux-user/syscall.c:779:
+safe_syscall6(int,futex_time64,int *,uaddr,int,op,int,val, \
                                                  ^

ERROR: space required after that ',' (ctx:VxV)
#62: FILE: linux-user/syscall.c:779:
+safe_syscall6(int,futex_time64,int *,uaddr,int,op,int,val, \
                                                      ^

ERROR: space required after that ',' (ctx:OxV)
#63: FILE: linux-user/syscall.c:780:
+              const struct timespec *,timeout,int *,uaddr2,int,val3)
                                      ^

ERROR: space required after that ',' (ctx:VxV)
#63: FILE: linux-user/syscall.c:780:
+              const struct timespec *,timeout,int *,uaddr2,int,val3)
                                              ^

ERROR: space required after that ',' (ctx:OxV)
#63: FILE: linux-user/syscall.c:780:
+              const struct timespec *,timeout,int *,uaddr2,int,val3)
                                                    ^

ERROR: space required after that ',' (ctx:VxV)
#63: FILE: linux-user/syscall.c:780:
+              const struct timespec *,timeout,int *,uaddr2,int,val3)
                                                           ^

ERROR: space required after that ',' (ctx:VxV)
#63: FILE: linux-user/syscall.c:780:
+              const struct timespec *,timeout,int *,uaddr2,int,val3)
                                                               ^

WARNING: architecture specific defines should be avoided
#86: FILE: linux-user/syscall.c:6937:
+#if defined(__NR_futex)

WARNING: architecture specific defines should be avoided
#92: FILE: linux-user/syscall.c:6943:
+#if defined(__NR_futex_time64)

WARNING: architecture specific defines should be avoided
#98: FILE: linux-user/syscall.c:6949:
+#if defined(__NR_futex)

WARNING: architecture specific defines should be avoided
#111: FILE: linux-user/syscall.c:6962:
+#if defined(__NR_futex)

WARNING: architecture specific defines should be avoided
#116: FILE: linux-user/syscall.c:6967:
+#if defined(__NR_futex_time64)

WARNING: architecture specific defines should be avoided
#123: FILE: linux-user/syscall.c:6974:
+#if defined(__NR_futex)

WARNING: line over 80 characters
#169: FILE: linux-user/syscall.c:7035:
+static int do_futex_time64(target_ulong uaddr, int op, int val, target_ulong timeout,

WARNING: Block comments use a leading /* on a separate line
#175: FILE: linux-user/syscall.c:7041:
+    /* ??? We assume FUTEX_* constants are the same on both host

WARNING: Block comments use * on subsequent lines
#176: FILE: linux-user/syscall.c:7042:
+    /* ??? We assume FUTEX_* constants are the same on both host
+       and target.  */

WARNING: Block comments use a trailing */ on a separate line
#176: FILE: linux-user/syscall.c:7042:
+       and target.  */

WARNING: Block comments use a leading /* on a separate line
#199: FILE: linux-user/syscall.c:7065:
+        /* For FUTEX_REQUEUE, FUTEX_CMP_REQUEUE, and FUTEX_WAKE_OP, the

WARNING: Block comments use * on subsequent lines
#200: FILE: linux-user/syscall.c:7066:
+        /* For FUTEX_REQUEUE, FUTEX_CMP_REQUEUE, and FUTEX_WAKE_OP, the
+           TIMEOUT parameter is interpreted as a uint32_t by the kernel.

WARNING: Block comments use a trailing */ on a separate line
#203: FILE: linux-user/syscall.c:7069:
+           since it's not compared to guest memory.  */

total: 24 errors, 19 warnings, 207 lines checked

Commit 68faea14e7cf (linux-user: Support futex_time64) has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20200330102945.2388294-1-laurent@vivier.eu/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

[PULL 0/1] Linux user for 5.0 patches

[Laurent Vivier]

The following changes since commit cfe68ae025f704f336d7dd3d1903ce37b445831d:

  Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.0-pull-request' into staging (2020-03-26 20:55:54 +0000)

are available in the Git repository at:

  git://github.com/vivier/qemu.git tags/linux-user-for-5.0-pull-request

for you to fetch changes up to 146902964d66881da797e45a5950732e38532e3e:

  linux-user: Support futex_time64 (2020-03-30 12:28:30 +0200)

----------------------------------------------------------------
Add support for futex_time64

----------------------------------------------------------------

Alistair Francis (1):
  linux-user: Support futex_time64

 linux-user/syscall.c | 140 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 126 insertions(+), 14 deletions(-)

-- 
2.25.1