Skip to contentSkip to conversation

vhost: add kconfig dependencies

PATCH In review Michael S. Tsirkin 3 participants 9 messages Apr 6, 2020

Subsystems (6)
lore
Share & tools
lore

Michael S. Tsirkin

author maintainer
#0 lore raw

v2 cover vhost: add kconfig dependencies

Add kconfig dependencies to disable vhost on configs where build currently fails. It might be worth it to go back and fix the build there down the road.

Changes from v1:
add patch to disable build with ARM OABI

Michael S. Tsirkin (2):
vdpa-sim: depend on HAS_DMA
vhost: disable for OABI

 drivers/misc/mic/Kconfig |  2 +-
 drivers/net/caif/Kconfig |  2 +-
 drivers/vdpa/Kconfig     |  2 +-
 drivers/vhost/Kconfig    | 17 +++++++++++++----
 4 files changed, 16 insertions(+), 7 deletions(-)
Signature · 1 line
MST
author maintainer
#1 lore raw

PATCH v2 1/2 vdpa-sim: depend on HAS_DMA

set_dma_ops isn't available on all architectures:

make ARCH=um
...

drivers/vdpa/vdpa_sim/vdpa_sim.c: In function 'vdpasim_create':

Quoted 1 line
Quoted 1 line

drivers/vdpa/vdpa_sim/vdpa_sim.c:324:2: error: implicit declaration of function 'set_dma_ops'; did you mean 'set_groups'?

+[-Werror=implicit-function-declaration]

     set_dma_ops(dev, &vdpasim_dma_ops);
     ^~~~~~~~~~~
     set_groups
---
 drivers/vdpa/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vdpa/Kconfig +1 -1
index 08b615f2da39..d0cb0e583a5d 100644
@@ -14,7 +14,7 @@ if VDPA_MENU
 
 config VDPA_SIM
 	tristate "vDPA device simulator"
-	depends on RUNTIME_TESTING_MENU
+	depends on RUNTIME_TESTING_MENU && HAS_DMA
 	select VDPA
 	select VHOST_RING
 	select VHOST_IOTLB
Signature · 1 line
MST
author maintainer
#2 lore raw

PATCH v2 2/2 vhost: disable for OABI

In reply to Michael S. Tsirkin

vhost is currently broken on the default ARM config.

The reason is that that uses apcs-gnu which is the ancient OABI that is been deprecated for a long time.

Given that virtio support on such ancient systems is not needed in the first place, let's just add something along the lines of

	depends on !ARM || AEABI

to the virtio Kconfig declaration, and add a comment that it has to do with struct member alignment.

Note: we can't make VHOST and VHOST_RING themselves have a dependency since these are selected. Add a new symbol for that.

---
 drivers/misc/mic/Kconfig |  2 +-
 drivers/net/caif/Kconfig |  2 +-
 drivers/vdpa/Kconfig     |  2 +-
 drivers/vhost/Kconfig    | 17 +++++++++++++----
 4 files changed, 16 insertions(+), 7 deletions(-)
drivers/misc/mic/Kconfig +1 -1
index 8f201d019f5a..3bfe72c59864 100644
@@ -116,7 +116,7 @@ config MIC_COSM
 
 config VOP
 	tristate "VOP Driver"
-	depends on VOP_BUS
+	depends on VOP_BUS && VHOST_DPN
 	select VHOST_RING
 	select VIRTIO
 	help
drivers/net/caif/Kconfig +1 -1
index 9db0570c5beb..661c25eb1c46 100644
@@ -50,7 +50,7 @@ config CAIF_HSI
 
 config CAIF_VIRTIO
 	tristate "CAIF virtio transport driver"
-	depends on CAIF && HAS_DMA
+	depends on CAIF && HAS_DMA && VHOST_DPN
 	select VHOST_RING
 	select VIRTIO
 	select GENERIC_ALLOCATOR
drivers/vdpa/Kconfig +1 -1
index d0cb0e583a5d..aee28def466b 100644
@@ -14,7 +14,7 @@ if VDPA_MENU
 
 config VDPA_SIM
 	tristate "vDPA device simulator"
-	depends on RUNTIME_TESTING_MENU && HAS_DMA
+	depends on RUNTIME_TESTING_MENU && HAS_DMA && VHOST_DPN
 	select VDPA
 	select VHOST_RING
 	select VHOST_IOTLB
drivers/vhost/Kconfig +13 -4
index cb6b17323eb2..b3486e218f62 100644
@@ -12,6 +12,15 @@ config VHOST_RING
 	  This option is selected by any driver which needs to access
 	  the host side of a virtio ring.
 
+config VHOST_DPN
+	bool "VHOST dependencies"
+	depends on !ARM || AEABI
+	default y
+	help
+	  Anything selecting VHOST or VHOST_RING must depend on VHOST_DPN.
+	  This excludes the deprecated ARM ABI since that forces a 4 byte
+	  alignment on all structs - incompatible with virtio spec requirements.
+
 config VHOST
 	tristate
 	select VHOST_IOTLB
@@ -27,7 +36,7 @@ if VHOST_MENU
 
 config VHOST_NET
 	tristate "Host kernel accelerator for virtio net"
-	depends on NET && EVENTFD && (TUN || !TUN) && (TAP || !TAP)
+	depends on NET && EVENTFD && (TUN || !TUN) && (TAP || !TAP) && VHOST_DPN
 	select VHOST
 	---help---
 	  This kernel module can be loaded in host kernel to accelerate
@@ -39,7 +48,7 @@ config VHOST_NET
 
 config VHOST_SCSI
 	tristate "VHOST_SCSI TCM fabric driver"
-	depends on TARGET_CORE && EVENTFD
+	depends on TARGET_CORE && EVENTFD && VHOST_DPN
 	select VHOST
 	default n
 	---help---
@@ -48,7 +57,7 @@ config VHOST_SCSI
 
 config VHOST_VSOCK
 	tristate "vhost virtio-vsock driver"
-	depends on VSOCKETS && EVENTFD
+	depends on VSOCKETS && EVENTFD && VHOST_DPN
 	select VHOST
 	select VIRTIO_VSOCKETS_COMMON
 	default n
@@ -62,7 +71,7 @@ config VHOST_VSOCK
 
 config VHOST_VDPA
 	tristate "Vhost driver for vDPA-based backend"
-	depends on EVENTFD
+	depends on EVENTFD && VHOST_DPN
 	select VHOST
 	select VDPA
 	help
Signature · 1 line
MST
#3 lore raw

Re: [PATCH v2 2/2] vhost: disable for OABI

Quoted 3 lines · Michael S. Tsirkin

vhost is currently broken on the default ARM config.

Where did you get this idea? The report from the robot was using a randconfig build, and in general, AEABI is required to run anything on any modern ARM system .

Quoted 8 lines

The reason is that that uses apcs-gnu which is the ancient OABI that is been deprecated for a long time.

Given that virtio support on such ancient systems is not needed in the first place, let's just add something along the lines of

        depends on !ARM || AEABI
Quoted 8 lines

to the virtio Kconfig declaration, and add a comment that it has to do with struct member alignment.

Note: we can't make VHOST and VHOST_RING themselves have a dependency since these are selected. Add a new symbol for that.

typo ^^^

Quoted 106 lines
---
 drivers/misc/mic/Kconfig |  2 +-
 drivers/net/caif/Kconfig |  2 +-
 drivers/vdpa/Kconfig     |  2 +-
 drivers/vhost/Kconfig    | 17 +++++++++++++----
 4 files changed, 16 insertions(+), 7 deletions(-)
drivers/misc/mic/Kconfig +1 -1
index 8f201d019f5a..3bfe72c59864 100644
@@ -116,7 +116,7 @@ config MIC_COSM
 
 config VOP
        tristate "VOP Driver"
-       depends on VOP_BUS
+       depends on VOP_BUS && VHOST_DPN
        select VHOST_RING
        select VIRTIO
        help
drivers/net/caif/Kconfig +1 -1
index 9db0570c5beb..661c25eb1c46 100644
@@ -50,7 +50,7 @@ config CAIF_HSI
 
 config CAIF_VIRTIO
        tristate "CAIF virtio transport driver"
-       depends on CAIF && HAS_DMA
+       depends on CAIF && HAS_DMA && VHOST_DPN
        select VHOST_RING
        select VIRTIO
        select GENERIC_ALLOCATOR
drivers/vdpa/Kconfig +1 -1
index d0cb0e583a5d..aee28def466b 100644
@@ -14,7 +14,7 @@ if VDPA_MENU
 
 config VDPA_SIM
        tristate "vDPA device simulator"
-       depends on RUNTIME_TESTING_MENU && HAS_DMA
+       depends on RUNTIME_TESTING_MENU && HAS_DMA && VHOST_DPN
        select VDPA
        select VHOST_RING
        select VHOST_IOTLB
drivers/vhost/Kconfig +13 -5
index cb6b17323eb2..b3486e218f62 100644
@@ -12,6 +12,15 @@ config VHOST_RING
          This option is selected by any driver which needs to access
          the host side of a virtio ring.
 
+config VHOST_DPN
+       bool "VHOST dependencies"
+       depends on !ARM || AEABI
+       default y
+       help
+         Anything selecting VHOST or VHOST_RING must depend on VHOST_DPN.
+         This excludes the deprecated ARM ABI since that forces a 4 byte
+         alignment on all structs - incompatible with virtio spec requirements.
+
 config VHOST
        tristate
        select VHOST_IOTLB
@@ -27,7 +36,7 @@ if VHOST_MENU
 
 config VHOST_NET
        tristate "Host kernel accelerator for virtio net"
-       depends on NET && EVENTFD && (TUN || !TUN) && (TAP || !TAP)
+       depends on NET && EVENTFD && (TUN || !TUN) && (TAP || !TAP) && VHOST_DPN
        select VHOST
        ---help---
          This kernel module can be loaded in host kernel to accelerate
@@ -39,7 +48,7 @@ config VHOST_NET
 
 config VHOST_SCSI
        tristate "VHOST_SCSI TCM fabric driver"
-       depends on TARGET_CORE && EVENTFD
+       depends on TARGET_CORE && EVENTFD && VHOST_DPN
        select VHOST
        default n
        ---help---
@@ -48,7 +57,7 @@ config VHOST_SCSI
 
 config VHOST_VSOCK
        tristate "vhost virtio-vsock driver"
-       depends on VSOCKETS && EVENTFD
+       depends on VSOCKETS && EVENTFD && VHOST_DPN
        select VHOST
        select VIRTIO_VSOCKETS_COMMON
        default n
@@ -62,7 +71,7 @@ config VHOST_VSOCK
 
 config VHOST_VDPA
        tristate "Vhost driver for vDPA-based backend"
-       depends on EVENTFD
+       depends on EVENTFD && VHOST_DPN
        select VHOST
        select VDPA
        help
--

MST

author maintainer
#4 lore raw

Re: [PATCH v2 2/2] vhost: disable for OABI

Quoted 8 lines · Ard Biesheuvel
Quoted 3 lines · Michael S. Tsirkin

vhost is currently broken on the default ARM config.

Where did you get this idea? The report from the robot was using a randconfig build, and in general, AEABI is required to run anything on any modern ARM system .

Oh - I forgot it's randconfig. This part is wrong, sorry. I decided to just force 2-byte alignment
instead (seems more robust) but I'll take this into account if we do decide to add this dependency.

Quoted 12 lines
Quoted 12 lines

The reason is that that uses apcs-gnu which is the ancient OABI that is been deprecated for a long time.

Given that virtio support on such ancient systems is not needed in the first place, let's just add something along the lines of

        depends on !ARM || AEABI

to the virtio Kconfig declaration, and add a comment that it has to do with struct member alignment.

Quoted 7 lines
Quoted 5 lines

Note: we can't make VHOST and VHOST_RING themselves have a dependency since these are selected. Add a new symbol for that.

typo ^^^

Thanks!

Quoted 107 lines
Quoted 107 lines
---
 drivers/misc/mic/Kconfig |  2 +-
 drivers/net/caif/Kconfig |  2 +-
 drivers/vdpa/Kconfig     |  2 +-
 drivers/vhost/Kconfig    | 17 +++++++++++++----
 4 files changed, 16 insertions(+), 7 deletions(-)
drivers/misc/mic/Kconfig +1 -1
index 8f201d019f5a..3bfe72c59864 100644
@@ -116,7 +116,7 @@ config MIC_COSM
 
 config VOP
        tristate "VOP Driver"
-       depends on VOP_BUS
+       depends on VOP_BUS && VHOST_DPN
        select VHOST_RING
        select VIRTIO
        help
drivers/net/caif/Kconfig +1 -1
index 9db0570c5beb..661c25eb1c46 100644
@@ -50,7 +50,7 @@ config CAIF_HSI
 
 config CAIF_VIRTIO
        tristate "CAIF virtio transport driver"
-       depends on CAIF && HAS_DMA
+       depends on CAIF && HAS_DMA && VHOST_DPN
        select VHOST_RING
        select VIRTIO
        select GENERIC_ALLOCATOR
drivers/vdpa/Kconfig +1 -1
index d0cb0e583a5d..aee28def466b 100644
@@ -14,7 +14,7 @@ if VDPA_MENU
 
 config VDPA_SIM
        tristate "vDPA device simulator"
-       depends on RUNTIME_TESTING_MENU && HAS_DMA
+       depends on RUNTIME_TESTING_MENU && HAS_DMA && VHOST_DPN
        select VDPA
        select VHOST_RING
        select VHOST_IOTLB
drivers/vhost/Kconfig +13 -5
index cb6b17323eb2..b3486e218f62 100644
@@ -12,6 +12,15 @@ config VHOST_RING
          This option is selected by any driver which needs to access
          the host side of a virtio ring.
 
+config VHOST_DPN
+       bool "VHOST dependencies"
+       depends on !ARM || AEABI
+       default y
+       help
+         Anything selecting VHOST or VHOST_RING must depend on VHOST_DPN.
+         This excludes the deprecated ARM ABI since that forces a 4 byte
+         alignment on all structs - incompatible with virtio spec requirements.
+
 config VHOST
        tristate
        select VHOST_IOTLB
@@ -27,7 +36,7 @@ if VHOST_MENU
 
 config VHOST_NET
        tristate "Host kernel accelerator for virtio net"
-       depends on NET && EVENTFD && (TUN || !TUN) && (TAP || !TAP)
+       depends on NET && EVENTFD && (TUN || !TUN) && (TAP || !TAP) && VHOST_DPN
        select VHOST
        ---help---
          This kernel module can be loaded in host kernel to accelerate
@@ -39,7 +48,7 @@ config VHOST_NET
 
 config VHOST_SCSI
        tristate "VHOST_SCSI TCM fabric driver"
-       depends on TARGET_CORE && EVENTFD
+       depends on TARGET_CORE && EVENTFD && VHOST_DPN
        select VHOST
        default n
        ---help---
@@ -48,7 +57,7 @@ config VHOST_SCSI
 
 config VHOST_VSOCK
        tristate "vhost virtio-vsock driver"
-       depends on VSOCKETS && EVENTFD
+       depends on VSOCKETS && EVENTFD && VHOST_DPN
        select VHOST
        select VIRTIO_VSOCKETS_COMMON
        default n
@@ -62,7 +71,7 @@ config VHOST_VSOCK
 
 config VHOST_VDPA
        tristate "Vhost driver for vDPA-based backend"
-       depends on EVENTFD
+       depends on EVENTFD && VHOST_DPN
        select VHOST
        select VDPA
        help
--

MST

maintainer
#5 lore raw

Re: [PATCH v2 2/2] vhost: disable for OABI

In reply to Michael S. Tsirkin

drivers/vhost/Kconfig config VHOST_RING · line 23

Quoted 10 lines · Michael S. Tsirkin
drivers/vhost/Kconfig +9 -0
+config VHOST_DPN
+       bool "VHOST dependencies"
+       depends on !ARM || AEABI
+       default y
+       help
+         Anything selecting VHOST or VHOST_RING must depend on VHOST_DPN.
+         This excludes the deprecated ARM ABI since that forces a 4 byte
+         alignment on all structs - incompatible with virtio spec requirements.
+

This should not be a user-visible option, so just make this 'def_bool !ARM || AEABI'

Arnd

author maintainer
#6 lore raw

Re: [PATCH v2 2/2] vhost: disable for OABI

Quoted 16 lines · Arnd Bergmann

drivers/vhost/Kconfig config VHOST_RING · line 23

Quoted 10 lines · Michael S. Tsirkin
drivers/vhost/Kconfig +9 -0
+config VHOST_DPN
+       bool "VHOST dependencies"
+       depends on !ARM || AEABI
+       default y
+       help
+         Anything selecting VHOST or VHOST_RING must depend on VHOST_DPN.
+         This excludes the deprecated ARM ABI since that forces a 4 byte
+         alignment on all structs - incompatible with virtio spec requirements.
+

This should not be a user-visible option, so just make this 'def_bool !ARM || AEABI'

Quoted 1 line

Arnd

I like keeping some kind of hint around for when one tries to understand why is a specific symbol visible.

Signature · 1 line
MST
maintainer
#7 lore raw

Re: [PATCH v2 2/2] vhost: disable for OABI

Quoted 19 lines · Michael S. Tsirkin
Quoted 16 lines · Arnd Bergmann

drivers/vhost/Kconfig config VHOST_RING · line 23

Quoted 10 lines · Michael S. Tsirkin
drivers/vhost/Kconfig +9 -0
+config VHOST_DPN
+       bool "VHOST dependencies"
+       depends on !ARM || AEABI
+       default y
+       help
+         Anything selecting VHOST or VHOST_RING must depend on VHOST_DPN.
+         This excludes the deprecated ARM ABI since that forces a 4 byte
+         alignment on all structs - incompatible with virtio spec requirements.
+

This should not be a user-visible option, so just make this 'def_bool !ARM || AEABI'

Quoted 2 lines

I like keeping some kind of hint around for when one tries to understand why is a specific symbol visible.

I meant you should remove the "VHOST dependencies" prompt, not the help text, which is certainly useful here. You can also use the three lines

     bool
     depends on !ARM || AEABI
     default y

in front of the help text, but those are equivalent to the one-line version I suggested.

Arnd

author maintainer
#8 lore raw

Re: [PATCH v2 2/2] vhost: disable for OABI

Quoted 26 lines · Arnd Bergmann
Quoted 19 lines · Michael S. Tsirkin
Quoted 16 lines · Arnd Bergmann

drivers/vhost/Kconfig config VHOST_RING · line 23

Quoted 10 lines · Michael S. Tsirkin
drivers/vhost/Kconfig +9 -0
+config VHOST_DPN
+       bool "VHOST dependencies"
+       depends on !ARM || AEABI
+       default y
+       help
+         Anything selecting VHOST or VHOST_RING must depend on VHOST_DPN.
+         This excludes the deprecated ARM ABI since that forces a 4 byte
+         alignment on all structs - incompatible with virtio spec requirements.
+

This should not be a user-visible option, so just make this 'def_bool !ARM || AEABI'

Quoted 2 lines

I like keeping some kind of hint around for when one tries to understand why is a specific symbol visible.

I meant you should remove the "VHOST dependencies" prompt, not the help text, which is certainly useful here. You can also use the three lines

Quoted 8 lines
     bool
     depends on !ARM || AEABI
     default y

in front of the help text, but those are equivalent to the one-line version I suggested.

Arnd

Oh right. Good point. Thanks!

Signature · 1 line
MST