From: "Alex Bennée" <alex.bennee@linaro.org>
To: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Cc: "Akihiko Odaki" <akihiko.odaki@daynix.com>,
"Huang Rui" <ray.huang@amd.com>,
"Marc-André Lureau" <marcandre.lureau@gmail.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Anthony PERARD" <anthony.perard@citrix.com>,
"Antonio Caggiano" <quic_acaggian@quicinc.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
"Robert Beckett" <bob.beckett@collabora.com>,
"Gert Wollny" <gert.wollny@collabora.com>,
qemu-devel@nongnu.org,
"Gurchetan Singh" <gurchetansingh@chromium.org>,
ernunes@redhat.com, "Alyssa Ross" <hi@alyssa.is>,
"Roger Pau Monné" <roger.pau@citrix.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Stefano Stabellini" <stefano.stabellini@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"Xenia Ragiadakou" <xenia.ragiadakou@amd.com>,
"Pierre-Eric Pelloux-Prayer" <pierre-eric.pelloux-prayer@amd.com>,
"Honglei Huang" <honglei1.huang@amd.com>,
"Julia Zhang" <julia.zhang@amd.com>,
"Chen Jiqian" <Jiqian.Chen@amd.com>,
"Yiwei Zhang" <zzyiwei@chromium.org>
Subject: Re: [PATCH v8 01/11] linux-headers: Update to Linux v6.9-rc3
Date: Fri, 10 May 2024 11:46:04 +0100 [thread overview]
Message-ID: <87wmo2j66r.fsf@draig.linaro.org> (raw)
In-Reply-To: <20240418190040.1110210-2-dmitry.osipenko@collabora.com> (Dmitry Osipenko's message of "Thu, 18 Apr 2024 22:00:30 +0300")
Dmitry Osipenko <dmitry.osipenko@collabora.com> writes:
> Update kernel headers to get new VirtIO-GPU capsets, in particular the
> Venus capset.
>
> Signed-off-by: Huang Rui <ray.huang@amd.com>
> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> ---
> hw/i386/x86.c | 8 -
> include/standard-headers/asm-x86/bootparam.h | 17 +-
> include/standard-headers/asm-x86/kvm_para.h | 3 +-
> include/standard-headers/asm-x86/setup_data.h | 83 +++
> include/standard-headers/linux/ethtool.h | 48 ++
> include/standard-headers/linux/fuse.h | 39 +-
> .../linux/input-event-codes.h | 1 +
> include/standard-headers/linux/virtio_gpu.h | 2 +
> include/standard-headers/linux/virtio_pci.h | 10 +-
> include/standard-headers/linux/virtio_snd.h | 154 ++++
> linux-headers/asm-arm64/kvm.h | 15 +-
> linux-headers/asm-arm64/sve_context.h | 11 +
> linux-headers/asm-generic/bitsperlong.h | 4 +
> linux-headers/asm-loongarch/kvm.h | 2 -
> linux-headers/asm-mips/kvm.h | 2 -
> linux-headers/asm-powerpc/kvm.h | 45 +-
> linux-headers/asm-riscv/kvm.h | 3 +-
> linux-headers/asm-s390/kvm.h | 315 +++++++-
> linux-headers/asm-x86/kvm.h | 308 +++++++-
> linux-headers/linux/bits.h | 15 +
> linux-headers/linux/kvm.h | 689 +-----------------
> linux-headers/linux/psp-sev.h | 59 ++
> linux-headers/linux/vhost.h | 7 +
> scripts/update-linux-headers.sh | 5 +-
> 24 files changed, 1106 insertions(+), 739 deletions(-)
> create mode 100644 include/standard-headers/asm-x86/setup_data.h
> create mode 100644 linux-headers/linux/bits.h
>
> diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> index ffbda48917fd..84a48019770b 100644
> --- a/hw/i386/x86.c
> +++ b/hw/i386/x86.c
> @@ -679,14 +679,6 @@ DeviceState *ioapic_init_secondary(GSIState *gsi_state)
> return dev;
> }
>
> -struct setup_data {
> - uint64_t next;
> - uint32_t type;
> - uint32_t len;
> - uint8_t data[];
> -} __attribute__((packed));
> -
> -
This isn't part of the header import. I'd rather see
- import the current header set
- update to the script
- clean-ups and additions
why are we migrating to using the kernels non-uapi assembler headers?
<snip>
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -62,6 +62,7 @@ cp_portable() {
> -e 'linux/kernel' \
> -e 'linux/sysinfo' \
> -e 'asm-generic/kvm_para' \
> + -e 'asm-x86/setup_data.h' \
some justification for this/
> > /dev/null
> then
> echo "Unexpected #include in input file $f".
> @@ -149,9 +150,11 @@ for arch in $ARCHLIST; do
> cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
> cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
> cp_portable "$tmpdir/include/asm/kvm_para.h" "$output/include/standard-headers/asm-$arch"
> + cp_portable "$tmpdir/include/asm/setup_data.h" "$output/include/standard-headers/asm-$arch"
is there a portable setup_data.h? why is it asm-x86 above?
> # Remove everything except the macros from bootparam.h avoiding the
> # unnecessary import of several video/ist/etc headers
> sed -e '/__ASSEMBLY__/,/__ASSEMBLY__/d' \
> + -e 's/<asm\/\([^>]*\)>/"standard-headers\/asm-x86\/\1"/' \
> "$tmpdir/include/asm/bootparam.h" > "$tmpdir/bootparam.h"
> cp_portable "$tmpdir/bootparam.h" \
> "$output/include/standard-headers/asm-$arch"
> @@ -165,7 +168,7 @@ rm -rf "$output/linux-headers/linux"
> mkdir -p "$output/linux-headers/linux"
> for header in const.h stddef.h kvm.h vfio.h vfio_ccw.h vfio_zdev.h vhost.h \
> psci.h psp-sev.h userfaultfd.h memfd.h mman.h nvme_ioctl.h \
> - vduse.h iommufd.h; do
> + vduse.h iommufd.h bits.h; do
What do we need bits for here?
> cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux"
> done
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
next prev parent reply other threads:[~2024-05-10 10:47 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 19:00 [PATCH v8 00/11] Support blob memory and venus on qemu Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 01/11] linux-headers: Update to Linux v6.9-rc3 Dmitry Osipenko
2024-05-10 10:46 ` Alex Bennée [this message]
2024-05-10 16:23 ` Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 02/11] virtio-gpu: Use pkgconfig version to decide which virgl features are available Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 03/11] virtio-gpu: Support context-init feature with virglrenderer Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 04/11] virtio-gpu: Don't require udmabuf when blobs and virgl are enabled Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 05/11] virtio-gpu: Add virgl resource management Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 06/11] virtio-gpu: Support blob scanout using dmabuf fd Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 07/11] virtio-gpu: Support suspension of commands processing Dmitry Osipenko
2024-04-19 8:53 ` Akihiko Odaki
2024-04-24 9:43 ` Dmitry Osipenko
2024-04-27 5:48 ` Akihiko Odaki
2024-05-01 19:02 ` Dmitry Osipenko
2024-05-05 6:37 ` Akihiko Odaki
2024-05-09 12:39 ` Dmitry Osipenko
2024-05-10 10:56 ` Akihiko Odaki
2024-05-10 16:12 ` Dmitry Osipenko
2024-05-10 16:33 ` Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 08/11] virtio-gpu: Handle resource blob commands Dmitry Osipenko
2024-04-19 9:18 ` Akihiko Odaki
2024-04-24 10:30 ` Dmitry Osipenko
2024-04-27 5:52 ` Akihiko Odaki
2024-05-01 19:20 ` Dmitry Osipenko
2024-05-05 6:47 ` Akihiko Odaki
2024-05-09 12:29 ` Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 09/11] virtio-gpu: Resource UUID Dmitry Osipenko
2024-04-19 9:29 ` Akihiko Odaki
2024-04-23 17:43 ` Dmitry Osipenko
2024-04-24 12:52 ` Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 10/11] virtio-gpu: Register capsets dynamically Dmitry Osipenko
2024-04-19 9:35 ` Akihiko Odaki
2024-04-18 19:00 ` [PATCH v8 11/11] virtio-gpu: Support Venus context Dmitry Osipenko
2024-04-19 9:44 ` Akihiko Odaki
2024-04-23 8:30 ` [PATCH v8 00/11] Support blob memory and venus on qemu Alex Bennée
2024-04-23 17:37 ` Dmitry Osipenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wmo2j66r.fsf@draig.linaro.org \
--to=alex.bennee@linaro.org \
--cc=Jiqian.Chen@amd.com \
--cc=akihiko.odaki@daynix.com \
--cc=alexander.deucher@amd.com \
--cc=anthony.perard@citrix.com \
--cc=bob.beckett@collabora.com \
--cc=christian.koenig@amd.com \
--cc=dgilbert@redhat.com \
--cc=dmitry.osipenko@collabora.com \
--cc=ernunes@redhat.com \
--cc=gert.wollny@collabora.com \
--cc=gurchetansingh@chromium.org \
--cc=hi@alyssa.is \
--cc=honglei1.huang@amd.com \
--cc=julia.zhang@amd.com \
--cc=kraxel@redhat.com \
--cc=marcandre.lureau@gmail.com \
--cc=mst@redhat.com \
--cc=philmd@linaro.org \
--cc=pierre-eric.pelloux-prayer@amd.com \
--cc=qemu-devel@nongnu.org \
--cc=quic_acaggian@quicinc.com \
--cc=ray.huang@amd.com \
--cc=roger.pau@citrix.com \
--cc=sstabellini@kernel.org \
--cc=stefano.stabellini@amd.com \
--cc=xenia.ragiadakou@amd.com \
--cc=zzyiwei@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).