iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vhost: revert "vhost: disable for OABI"

Browse Source 
This reverts commit d085eb8ce7 ("vhost: disable for OABI")
With commit "virtio: force spec specified alignment on types"
in place, we force proper alignment for all structures,
so there's no longer a reason to blacklist OABI.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2020-04-23 08:36:57 -04:00
parent a865e420b9
commit 213e772138
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/misc/mic/Kconfig
View File

@ -116,7 +116,7 @@ config MIC_COSM
config VOP config VOP
tristate "VOP Driver" tristate "VOP Driver"
depends on VOP_BUS && VHOST_DPN depends on VOP_BUS
select VHOST_RING select VHOST_RING
select VIRTIO select VIRTIO
help help

2
drivers/net/caif/Kconfig
View File

@ -50,7 +50,7 @@ config CAIF_HSI
config CAIF_VIRTIO config CAIF_VIRTIO
tristate "CAIF virtio transport driver" tristate "CAIF virtio transport driver"
depends on CAIF && HAS_DMA && VHOST_DPN depends on CAIF && HAS_DMA
select VHOST_RING select VHOST_RING
select VIRTIO select VIRTIO
select GENERIC_ALLOCATOR select GENERIC_ALLOCATOR

2
drivers/vdpa/Kconfig
View File

@ -10,7 +10,7 @@ if VDPA
config VDPA_SIM config VDPA_SIM
tristate "vDPA device simulator" tristate "vDPA device simulator"
depends on RUNTIME_TESTING_MENU && HAS_DMA && VHOST_DPN depends on RUNTIME_TESTING_MENU && HAS_DMA
select VHOST_RING select VHOST_RING
default n default n
help help

17
drivers/vhost/Kconfig
View File

@ -13,15 +13,6 @@ config VHOST_RING
This option is selected by any driver which needs to access This option is selected by any driver which needs to access
the host side of a virtio ring. the host side of a virtio ring.
config VHOST_DPN
bool
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 config VHOST
tristate tristate
select VHOST_IOTLB select VHOST_IOTLB
@ -37,7 +28,7 @@ if VHOST_MENU
config VHOST_NET config VHOST_NET
tristate "Host kernel accelerator for virtio net" tristate "Host kernel accelerator for virtio net"
depends on NET && EVENTFD && (TUN || !TUN) && (TAP || !TAP) && VHOST_DPN depends on NET && EVENTFD && (TUN || !TUN) && (TAP || !TAP)
select VHOST select VHOST
---help--- ---help---
This kernel module can be loaded in host kernel to accelerate This kernel module can be loaded in host kernel to accelerate
@ -49,7 +40,7 @@ config VHOST_NET
config VHOST_SCSI config VHOST_SCSI
tristate "VHOST_SCSI TCM fabric driver" tristate "VHOST_SCSI TCM fabric driver"
depends on TARGET_CORE && EVENTFD && VHOST_DPN depends on TARGET_CORE && EVENTFD
select VHOST select VHOST
default n default n
---help--- ---help---
@ -58,7 +49,7 @@ config VHOST_SCSI
config VHOST_VSOCK config VHOST_VSOCK
tristate "vhost virtio-vsock driver" tristate "vhost virtio-vsock driver"
depends on VSOCKETS && EVENTFD && VHOST_DPN depends on VSOCKETS && EVENTFD
select VHOST select VHOST
select VIRTIO_VSOCKETS_COMMON select VIRTIO_VSOCKETS_COMMON
default n default n
@ -72,7 +63,7 @@ config VHOST_VSOCK
config VHOST_VDPA config VHOST_VDPA
tristate "Vhost driver for vDPA-based backend" tristate "Vhost driver for vDPA-based backend"
depends on EVENTFD && VHOST_DPN depends on EVENTFD
select VHOST select VHOST
depends on VDPA depends on VDPA
help help