* [BUG] vhost: perf tools build error after syncing vhost.h
@ 2025-08-18 20:23 Namhyung Kim
2025-08-18 20:44 ` Arnaldo Carvalho de Melo
2025-08-19 2:56 ` Jason Wang
0 siblings, 2 replies; 6+ messages in thread
From: Namhyung Kim @ 2025-08-18 20:23 UTC (permalink / raw)
To: Michael S. Tsirkin, Jason Wang
Cc: kvm, virtualization, linux-perf-users, linux-kernel,
Arnaldo Carvalho de Melo
Hello,
I was sync'ing perf tools copy of kernel sources to apply recent
changes. But there's a build error when it converts vhost ioctl
commands due to a conflicting slot like below.
In file included from trace/beauty/ioctl.c:93:
tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c: In function ‘ioctl__scnprintf_vhost_virtio_cmd’:
tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c:36:18: error: initialized field overwritten [-Werror=override-init]
36 | [0x83] = "SET_FORK_FROM_OWNER",
| ^~~~~~~~~~~~~~~~~~~~~
tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c:36:18: note: (near initialization for ‘vhost_virtio_ioctl_cmds[131]’)
I think the following changes both added entries to 0x83.
7d9896e9f6d02d8a vhost: Reintroduce kthread API and add mode selection
333c515d189657c9 vhost-net: allow configuring extended features
The below patch fixes it for me.
Thanks,
Namhyung
---8<---
diff --git a/include/uapi/linux/vhost.h b/include/uapi/linux/vhost.h
index 283348b64af9ac59..c57674a6aa0dbbea 100644
--- a/include/uapi/linux/vhost.h
+++ b/include/uapi/linux/vhost.h
@@ -260,7 +260,7 @@
* When fork_owner is set to VHOST_FORK_OWNER_KTHREAD:
* - Vhost will create vhost workers as kernel threads.
*/
-#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x83, __u8)
+#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x84, __u8)
/**
* VHOST_GET_FORK_OWNER - Get the current fork_owner flag for the vhost device.
@@ -268,6 +268,6 @@
*
* @return: An 8-bit value indicating the current thread mode.
*/
-#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x84, __u8)
+#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x85, __u8)
#endif
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [BUG] vhost: perf tools build error after syncing vhost.h
2025-08-18 20:23 [BUG] vhost: perf tools build error after syncing vhost.h Namhyung Kim
@ 2025-08-18 20:44 ` Arnaldo Carvalho de Melo
2025-08-19 2:56 ` Jason Wang
1 sibling, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2025-08-18 20:44 UTC (permalink / raw)
To: Namhyung Kim
Cc: Michael S. Tsirkin, Jason Wang, kvm, virtualization,
linux-perf-users, linux-kernel
On Mon, Aug 18, 2025 at 01:23:10PM -0700, Namhyung Kim wrote:
> Hello,
>
> I was sync'ing perf tools copy of kernel sources to apply recent
> changes. But there's a build error when it converts vhost ioctl
> commands due to a conflicting slot like below.
I haven't looked at this specific case in detail, but in the past the
synchronization of tools/ copies did catch things like this, yes :-)
- Arnaldo
> In file included from trace/beauty/ioctl.c:93:
> tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c: In function ‘ioctl__scnprintf_vhost_virtio_cmd’:
> tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c:36:18: error: initialized field overwritten [-Werror=override-init]
> 36 | [0x83] = "SET_FORK_FROM_OWNER",
> | ^~~~~~~~~~~~~~~~~~~~~
> tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c:36:18: note: (near initialization for ‘vhost_virtio_ioctl_cmds[131]’)
>
> I think the following changes both added entries to 0x83.
>
> 7d9896e9f6d02d8a vhost: Reintroduce kthread API and add mode selection
> 333c515d189657c9 vhost-net: allow configuring extended features
>
> The below patch fixes it for me.
>
> Thanks,
> Namhyung
>
>
> ---8<---
> diff --git a/include/uapi/linux/vhost.h b/include/uapi/linux/vhost.h
> index 283348b64af9ac59..c57674a6aa0dbbea 100644
> --- a/include/uapi/linux/vhost.h
> +++ b/include/uapi/linux/vhost.h
> @@ -260,7 +260,7 @@
> * When fork_owner is set to VHOST_FORK_OWNER_KTHREAD:
> * - Vhost will create vhost workers as kernel threads.
> */
> -#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x83, __u8)
> +#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x84, __u8)
>
> /**
> * VHOST_GET_FORK_OWNER - Get the current fork_owner flag for the vhost device.
> @@ -268,6 +268,6 @@
> *
> * @return: An 8-bit value indicating the current thread mode.
> */
> -#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x84, __u8)
> +#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x85, __u8)
>
> #endif
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [BUG] vhost: perf tools build error after syncing vhost.h
2025-08-18 20:23 [BUG] vhost: perf tools build error after syncing vhost.h Namhyung Kim
2025-08-18 20:44 ` Arnaldo Carvalho de Melo
@ 2025-08-19 2:56 ` Jason Wang
2025-08-19 6:39 ` [PATCH] vhost: Fix ioctl # for VHOST_[GS]ET_FORK_FROM_OWNER Namhyung Kim
1 sibling, 1 reply; 6+ messages in thread
From: Jason Wang @ 2025-08-19 2:56 UTC (permalink / raw)
To: Namhyung Kim
Cc: Michael S. Tsirkin, kvm, virtualization, linux-perf-users,
linux-kernel, Arnaldo Carvalho de Melo
On Tue, Aug 19, 2025 at 4:23 AM Namhyung Kim <namhyung@kernel.org> wrote:
>
> Hello,
>
> I was sync'ing perf tools copy of kernel sources to apply recent
> changes. But there's a build error when it converts vhost ioctl
> commands due to a conflicting slot like below.
>
> In file included from trace/beauty/ioctl.c:93:
> tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c: In function ‘ioctl__scnprintf_vhost_virtio_cmd’:
> tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c:36:18: error: initialized field overwritten [-Werror=override-init]
> 36 | [0x83] = "SET_FORK_FROM_OWNER",
> | ^~~~~~~~~~~~~~~~~~~~~
> tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c:36:18: note: (near initialization for ‘vhost_virtio_ioctl_cmds[131]’)
>
> I think the following changes both added entries to 0x83.
>
> 7d9896e9f6d02d8a vhost: Reintroduce kthread API and add mode selection
> 333c515d189657c9 vhost-net: allow configuring extended features
>
> The below patch fixes it for me.
>
> Thanks,
> Namhyung
>
>
> ---8<---
> diff --git a/include/uapi/linux/vhost.h b/include/uapi/linux/vhost.h
> index 283348b64af9ac59..c57674a6aa0dbbea 100644
> --- a/include/uapi/linux/vhost.h
> +++ b/include/uapi/linux/vhost.h
> @@ -260,7 +260,7 @@
> * When fork_owner is set to VHOST_FORK_OWNER_KTHREAD:
> * - Vhost will create vhost workers as kernel threads.
> */
> -#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x83, __u8)
> +#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x84, __u8)
>
> /**
> * VHOST_GET_FORK_OWNER - Get the current fork_owner flag for the vhost device.
> @@ -268,6 +268,6 @@
> *
> * @return: An 8-bit value indicating the current thread mode.
> */
> -#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x84, __u8)
> +#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x85, __u8)
>
> #endif
>
Would you want to send a formal patch for this?
Thanks
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] vhost: Fix ioctl # for VHOST_[GS]ET_FORK_FROM_OWNER
2025-08-19 2:56 ` Jason Wang
@ 2025-08-19 6:39 ` Namhyung Kim
2025-08-19 11:22 ` Michael S. Tsirkin
0 siblings, 1 reply; 6+ messages in thread
From: Namhyung Kim @ 2025-08-19 6:39 UTC (permalink / raw)
To: Jason Wang
Cc: Michael S. Tsirkin, kvm, virtualization, linux-perf-users, LKML,
Arnaldo Carvalho de Melo
The VHOST_[GS]ET_FEATURES_ARRAY ioctl already took 0x83 and it would
result in a build error when the vhost uapi header is used for perf tool
build like below.
In file included from trace/beauty/ioctl.c:93:
tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c: In function ‘ioctl__scnprintf_vhost_virtio_cmd’:
tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c:36:18: error: initialized field overwritten [-Werror=override-init]
36 | [0x83] = "SET_FORK_FROM_OWNER",
| ^~~~~~~~~~~~~~~~~~~~~
tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c:36:18: note: (near initialization for ‘vhost_virtio_ioctl_cmds[131]’)
Fixes: 7d9896e9f6d02d8a ("vhost: Reintroduce kthread API and add mode selection")
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
include/uapi/linux/vhost.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/vhost.h b/include/uapi/linux/vhost.h
index 283348b64af9ac59..c57674a6aa0dbbea 100644
--- a/include/uapi/linux/vhost.h
+++ b/include/uapi/linux/vhost.h
@@ -260,7 +260,7 @@
* When fork_owner is set to VHOST_FORK_OWNER_KTHREAD:
* - Vhost will create vhost workers as kernel threads.
*/
-#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x83, __u8)
+#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x84, __u8)
/**
* VHOST_GET_FORK_OWNER - Get the current fork_owner flag for the vhost device.
@@ -268,6 +268,6 @@
*
* @return: An 8-bit value indicating the current thread mode.
*/
-#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x84, __u8)
+#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x85, __u8)
#endif
--
2.51.0.rc1.167.g924127e9c0-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] vhost: Fix ioctl # for VHOST_[GS]ET_FORK_FROM_OWNER
2025-08-19 6:39 ` [PATCH] vhost: Fix ioctl # for VHOST_[GS]ET_FORK_FROM_OWNER Namhyung Kim
@ 2025-08-19 11:22 ` Michael S. Tsirkin
2025-08-19 13:40 ` Lei Yang
0 siblings, 1 reply; 6+ messages in thread
From: Michael S. Tsirkin @ 2025-08-19 11:22 UTC (permalink / raw)
To: Namhyung Kim
Cc: Jason Wang, kvm, virtualization, linux-perf-users, LKML,
Arnaldo Carvalho de Melo
On Mon, Aug 18, 2025 at 11:39:57PM -0700, Namhyung Kim wrote:
> The VHOST_[GS]ET_FEATURES_ARRAY ioctl already took 0x83 and it would
> result in a build error when the vhost uapi header is used for perf tool
> build like below.
>
> In file included from trace/beauty/ioctl.c:93:
> tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c: In function ‘ioctl__scnprintf_vhost_virtio_cmd’:
> tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c:36:18: error: initialized field overwritten [-Werror=override-init]
> 36 | [0x83] = "SET_FORK_FROM_OWNER",
> | ^~~~~~~~~~~~~~~~~~~~~
> tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c:36:18: note: (near initialization for ‘vhost_virtio_ioctl_cmds[131]’)
>
> Fixes: 7d9896e9f6d02d8a ("vhost: Reintroduce kthread API and add mode selection")
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Applied, thanks a lot!
> ---
> include/uapi/linux/vhost.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/uapi/linux/vhost.h b/include/uapi/linux/vhost.h
> index 283348b64af9ac59..c57674a6aa0dbbea 100644
> --- a/include/uapi/linux/vhost.h
> +++ b/include/uapi/linux/vhost.h
> @@ -260,7 +260,7 @@
> * When fork_owner is set to VHOST_FORK_OWNER_KTHREAD:
> * - Vhost will create vhost workers as kernel threads.
> */
> -#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x83, __u8)
> +#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x84, __u8)
>
> /**
> * VHOST_GET_FORK_OWNER - Get the current fork_owner flag for the vhost device.
> @@ -268,6 +268,6 @@
> *
> * @return: An 8-bit value indicating the current thread mode.
> */
> -#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x84, __u8)
> +#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x85, __u8)
>
> #endif
> --
> 2.51.0.rc1.167.g924127e9c0-goog
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] vhost: Fix ioctl # for VHOST_[GS]ET_FORK_FROM_OWNER
2025-08-19 11:22 ` Michael S. Tsirkin
@ 2025-08-19 13:40 ` Lei Yang
0 siblings, 0 replies; 6+ messages in thread
From: Lei Yang @ 2025-08-19 13:40 UTC (permalink / raw)
To: Namhyung Kim
Cc: Jason Wang, kvm, virtualization, linux-perf-users, LKML,
Arnaldo Carvalho de Melo, Michael S. Tsirkin
Tested this patch with virtio-net regression tests, everything works fine.
Tested-by: Lei Yang <leiyang@redhat.com>
On Tue, Aug 19, 2025 at 7:25 PM Michael S. Tsirkin <mst@redhat.com> wrote:
>
> On Mon, Aug 18, 2025 at 11:39:57PM -0700, Namhyung Kim wrote:
> > The VHOST_[GS]ET_FEATURES_ARRAY ioctl already took 0x83 and it would
> > result in a build error when the vhost uapi header is used for perf tool
> > build like below.
> >
> > In file included from trace/beauty/ioctl.c:93:
> > tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c: In function ‘ioctl__scnprintf_vhost_virtio_cmd’:
> > tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c:36:18: error: initialized field overwritten [-Werror=override-init]
> > 36 | [0x83] = "SET_FORK_FROM_OWNER",
> > | ^~~~~~~~~~~~~~~~~~~~~
> > tools/perf/trace/beauty/generated/ioctl/vhost_virtio_ioctl_array.c:36:18: note: (near initialization for ‘vhost_virtio_ioctl_cmds[131]’)
> >
> > Fixes: 7d9896e9f6d02d8a ("vhost: Reintroduce kthread API and add mode selection")
> > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
>
> Applied, thanks a lot!
>
> > ---
> > include/uapi/linux/vhost.h | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/include/uapi/linux/vhost.h b/include/uapi/linux/vhost.h
> > index 283348b64af9ac59..c57674a6aa0dbbea 100644
> > --- a/include/uapi/linux/vhost.h
> > +++ b/include/uapi/linux/vhost.h
> > @@ -260,7 +260,7 @@
> > * When fork_owner is set to VHOST_FORK_OWNER_KTHREAD:
> > * - Vhost will create vhost workers as kernel threads.
> > */
> > -#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x83, __u8)
> > +#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x84, __u8)
> >
> > /**
> > * VHOST_GET_FORK_OWNER - Get the current fork_owner flag for the vhost device.
> > @@ -268,6 +268,6 @@
> > *
> > * @return: An 8-bit value indicating the current thread mode.
> > */
> > -#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x84, __u8)
> > +#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x85, __u8)
> >
> > #endif
> > --
> > 2.51.0.rc1.167.g924127e9c0-goog
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-08-19 13:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-18 20:23 [BUG] vhost: perf tools build error after syncing vhost.h Namhyung Kim
2025-08-18 20:44 ` Arnaldo Carvalho de Melo
2025-08-19 2:56 ` Jason Wang
2025-08-19 6:39 ` [PATCH] vhost: Fix ioctl # for VHOST_[GS]ET_FORK_FROM_OWNER Namhyung Kim
2025-08-19 11:22 ` Michael S. Tsirkin
2025-08-19 13:40 ` Lei Yang
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 NNTP newsgroup(s).