[v6] linux-headers: arch fixups

[Qemu-devel] [PATCH v6 0/3] linux-headers: arch fixups

Posted by Michael S. Tsirkin 7 years, 5 months ago

It turns out that we have unistd.h and kvm headers for some
architectures but not others.  We are thus unable to use e.g. usefaultfd
on these systems unless system headers have been updated.

Fix up update-linux-headers.sh to make sure we auto-updates
all architectures which have linux-headers/
(unfortunately this still does not mean "all linux systems").

Tested on x86 only.

Pls consider merging this through the ARM tree.

Changes from v5:
    rebase to master

Michael S. Tsirkin (3):
  update-linux-headers.sh: unistd.h, kvm consistency
  linux-headers: add unistd.h on all arches
  linux-headers: add kvm header for mips

 linux-headers/asm-arm/bitsperlong.h     |   1 +
 linux-headers/asm-arm64/bitsperlong.h   |  24 +
 linux-headers/asm-generic/bitsperlong.h |  16 +
 linux-headers/asm-generic/unistd.h      | 781 ++++++++++++++++++++++++++++++++
 linux-headers/asm-mips/bitsperlong.h    |   9 +
 linux-headers/asm-mips/kvm.h            |  25 +-
 linux-headers/asm-mips/sgidefs.h        |  45 ++
 linux-headers/asm-mips/unistd.h         |  44 +-
 linux-headers/asm-powerpc/bitsperlong.h |  13 +
 linux-headers/asm-s390/bitsperlong.h    |  14 +
 linux-headers/asm-s390/unistd_32.h      |   1 +
 linux-headers/asm-s390/unistd_64.h      |   1 +
 linux-headers/asm-x86/bitsperlong.h     |  14 +
 scripts/update-linux-headers.sh         |  18 +-
 14 files changed, 991 insertions(+), 15 deletions(-)
 create mode 100644 linux-headers/asm-arm/bitsperlong.h
 create mode 100644 linux-headers/asm-arm64/bitsperlong.h
 create mode 100644 linux-headers/asm-generic/bitsperlong.h
 create mode 100644 linux-headers/asm-generic/unistd.h
 create mode 100644 linux-headers/asm-mips/bitsperlong.h
 create mode 100644 linux-headers/asm-mips/sgidefs.h
 create mode 100644 linux-headers/asm-powerpc/bitsperlong.h
 create mode 100644 linux-headers/asm-s390/bitsperlong.h
 create mode 100644 linux-headers/asm-x86/bitsperlong.h

-- 
MST

Re: [Qemu-devel] [PATCH v6 0/3] linux-headers: arch fixups

Posted by Peter Maydell 7 years, 5 months ago

On 14 May 2018 at 14:07, Michael S. Tsirkin <mst@redhat.com> wrote:
> It turns out that we have unistd.h and kvm headers for some
> architectures but not others.  We are thus unable to use e.g. usefaultfd
> on these systems unless system headers have been updated.
>
> Fix up update-linux-headers.sh to make sure we auto-updates
> all architectures which have linux-headers/
> (unfortunately this still does not mean "all linux systems").
>
> Tested on x86 only.
>
> Pls consider merging this through the ARM tree.
>
> Changes from v5:
>     rebase to master

Still doesn't apply:

e104462:xenial:qemu$ patches apply -s
id:1526303228-486609-1-git-send-email-mst@redhat.com
Applying: update-linux-headers.sh: unistd.h, kvm consistency
error: sha1 information is lacking or useless (scripts/update-linux-headers.sh).
error: could not build fake ancestor
Patch failed at 0001 update-linux-headers.sh: unistd.h, kvm consistency
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
e104462:xenial:qemu$ patch --dry-run -p1 <.git/rebase-apply/patch
checking file scripts/update-linux-headers.sh
Hunk #1 succeeded at 83 (offset -1 lines).
Hunk #2 FAILED at 94.
Hunk #3 FAILED at 124.
2 out of 3 hunks FAILED

The copy of this script in master has code relating to kvm_para.h,
and whatever you've based this patchset on apparently does not,
hence the conflicts.

thanks
-- PMM

Re: [Qemu-devel] [PATCH v6 0/3] linux-headers: arch fixups

Posted by Michael S. Tsirkin 7 years, 5 months ago

On Mon, May 14, 2018 at 04:10:42PM +0100, Peter Maydell wrote:
> On 14 May 2018 at 14:07, Michael S. Tsirkin <mst@redhat.com> wrote:
> > It turns out that we have unistd.h and kvm headers for some
> > architectures but not others.  We are thus unable to use e.g. usefaultfd
> > on these systems unless system headers have been updated.
> >
> > Fix up update-linux-headers.sh to make sure we auto-updates
> > all architectures which have linux-headers/
> > (unfortunately this still does not mean "all linux systems").
> >
> > Tested on x86 only.
> >
> > Pls consider merging this through the ARM tree.
> >
> > Changes from v5:
> >     rebase to master
> 
> Still doesn't apply:

Against which commit?

> e104462:xenial:qemu$ patches apply -s
> id:1526303228-486609-1-git-send-email-mst@redhat.com
> Applying: update-linux-headers.sh: unistd.h, kvm consistency
> error: sha1 information is lacking or useless (scripts/update-linux-headers.sh).
> error: could not build fake ancestor
> Patch failed at 0001 update-linux-headers.sh: unistd.h, kvm consistency
> Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> e104462:xenial:qemu$ patch --dry-run -p1 <.git/rebase-apply/patch
> checking file scripts/update-linux-headers.sh
> Hunk #1 succeeded at 83 (offset -1 lines).
> Hunk #2 FAILED at 94.
> Hunk #3 FAILED at 124.
> 2 out of 3 hunks FAILED
> 
> The copy of this script in master has code relating to kvm_para.h,
> and whatever you've based this patchset on apparently does not,
> hence the conflicts.
> 
> thanks
> -- PMM

Re: [Qemu-devel] [PATCH v6 0/3] linux-headers: arch fixups

Posted by Peter Maydell 7 years, 5 months ago

On 14 May 2018 at 19:29, Michael S. Tsirkin <mst@redhat.com> wrote:
> On Mon, May 14, 2018 at 04:10:42PM +0100, Peter Maydell wrote:
>> On 14 May 2018 at 14:07, Michael S. Tsirkin <mst@redhat.com> wrote:
>> > It turns out that we have unistd.h and kvm headers for some
>> > architectures but not others.  We are thus unable to use e.g. usefaultfd
>> > on these systems unless system headers have been updated.
>> >
>> > Fix up update-linux-headers.sh to make sure we auto-updates
>> > all architectures which have linux-headers/
>> > (unfortunately this still does not mean "all linux systems").
>> >
>> > Tested on x86 only.
>> >
>> > Pls consider merging this through the ARM tree.
>> >
>> > Changes from v5:
>> >     rebase to master
>>
>> Still doesn't apply:
>
> Against which commit?

bbd87423ea0c436c55bb, but the last change in master
to scripts/update-linux-headers.sh is 7afcfd32a65688 a
month ago, so this won't apply to anything since then
and wouldn't have applied before that either. I think you
have based your patchset on some other changes to the script
which are not in master (at a guess, your "move kvm_para.h
to standard-headers" series).

thanks
-- PMM

Re: [Qemu-devel] [PATCH v6 0/3] linux-headers: arch fixups

Posted by Michael S. Tsirkin 7 years, 5 months ago

On Mon, May 14, 2018 at 07:37:49PM +0100, Peter Maydell wrote:
> On 14 May 2018 at 19:29, Michael S. Tsirkin <mst@redhat.com> wrote:
> > On Mon, May 14, 2018 at 04:10:42PM +0100, Peter Maydell wrote:
> >> On 14 May 2018 at 14:07, Michael S. Tsirkin <mst@redhat.com> wrote:
> >> > It turns out that we have unistd.h and kvm headers for some
> >> > architectures but not others.  We are thus unable to use e.g. usefaultfd
> >> > on these systems unless system headers have been updated.
> >> >
> >> > Fix up update-linux-headers.sh to make sure we auto-updates
> >> > all architectures which have linux-headers/
> >> > (unfortunately this still does not mean "all linux systems").
> >> >
> >> > Tested on x86 only.
> >> >
> >> > Pls consider merging this through the ARM tree.
> >> >
> >> > Changes from v5:
> >> >     rebase to master
> >>
> >> Still doesn't apply:
> >
> > Against which commit?
> 
> bbd87423ea0c436c55bb, but the last change in master
> to scripts/update-linux-headers.sh is 7afcfd32a65688 a
> month ago, so this won't apply to anything since then
> and wouldn't have applied before that either. I think you
> have based your patchset on some other changes to the script
> which are not in master (at a guess, your "move kvm_para.h
> to standard-headers" series).
> 
> thanks
> -- PMM

Oh. That's right. I forgot about that, sorry.  These patches are
supposed to be in the kvm tree now.  So need to wait for kvm to be
merged, and this can go on top.

-- 
MST

Re: [Qemu-devel] [PATCH v6 0/3] linux-headers: arch fixups

Posted by Michael S. Tsirkin 7 years, 5 months ago

On Mon, May 14, 2018 at 07:37:49PM +0100, Peter Maydell wrote:
> On 14 May 2018 at 19:29, Michael S. Tsirkin <mst@redhat.com> wrote:
> > On Mon, May 14, 2018 at 04:10:42PM +0100, Peter Maydell wrote:
> >> On 14 May 2018 at 14:07, Michael S. Tsirkin <mst@redhat.com> wrote:
> >> > It turns out that we have unistd.h and kvm headers for some
> >> > architectures but not others.  We are thus unable to use e.g. usefaultfd
> >> > on these systems unless system headers have been updated.
> >> >
> >> > Fix up update-linux-headers.sh to make sure we auto-updates
> >> > all architectures which have linux-headers/
> >> > (unfortunately this still does not mean "all linux systems").
> >> >
> >> > Tested on x86 only.
> >> >
> >> > Pls consider merging this through the ARM tree.
> >> >
> >> > Changes from v5:
> >> >     rebase to master
> >>
> >> Still doesn't apply:
> >
> > Against which commit?
> 
> bbd87423ea0c436c55bb, but the last change in master
> to scripts/update-linux-headers.sh is 7afcfd32a65688 a
> month ago, so this won't apply to anything since then
> and wouldn't have applied before that either. I think you
> have based your patchset on some other changes to the script
> which are not in master (at a guess, your "move kvm_para.h
> to standard-headers" series).
> 
> thanks
> -- PMM

OK I will just do a pull with these + kvm headers since it was
approved by Paolo.

-- 
MST