Skip to content

Commit f4f5d7c

Browse files
committed
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio updates from Michael Tsirkin: - vdpa generic device type support - more virtio hardening for broken devices (but on the same theme, revert some virtio hotplug hardening patches - they were misusing some interrupt flags and had to be reverted) - RSS support in virtio-net - max device MTU support in mlx5 vdpa - akcipher support in virtio-crypto - shared IRQ support in ifcvf vdpa - a minor performance improvement in vhost - enable virtio mem for ARM64 - beginnings of advance dma support - cleanups, fixes all over the place * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (33 commits) vdpa/mlx5: Avoid processing works if workqueue was destroyed vhost: handle error while adding split ranges to iotlb vdpa: support exposing the count of vqs to userspace vdpa: change the type of nvqs to u32 vdpa: support exposing the config size to userspace vdpa/mlx5: re-create forwarding rules after mac modified virtio: pci: check bar values read from virtio config space Revert "virtio_pci: harden MSI-X interrupts" Revert "virtio-pci: harden INTX interrupts" drivers/net/virtio_net: Added RSS hash report control. drivers/net/virtio_net: Added RSS hash report. drivers/net/virtio_net: Added basic RSS support. drivers/net/virtio_net: Fixed padded vheader to use v1 with hash. virtio: use virtio_device_ready() in virtio_device_restore() tools/virtio: compile with -pthread tools/virtio: fix after premapped buf support virtio_ring: remove flags check for unmap packed indirect desc virtio_ring: remove flags check for unmap split indirect desc virtio_ring: rename vring_unmap_state_packed() to vring_unmap_extra_packed() net/mlx5: Add support for configuring max device MTU ...
2 parents e729dbe + ad6dc1d commit f4f5d7c

32 files changed

+1628
-286
lines changed

drivers/crypto/virtio/Kconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ config CRYPTO_DEV_VIRTIO
33
tristate "VirtIO crypto driver"
44
depends on VIRTIO
55
select CRYPTO_AEAD
6+
select CRYPTO_AKCIPHER2
67
select CRYPTO_SKCIPHER
78
select CRYPTO_ENGINE
9+
select CRYPTO_RSA
10+
select MPILIB
811
help
912
This driver provides support for virtio crypto device. If you
1013
choose 'M' here, this module will be called virtio_crypto.

drivers/crypto/virtio/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
obj-$(CONFIG_CRYPTO_DEV_VIRTIO) += virtio_crypto.o
33
virtio_crypto-objs := \
4-
virtio_crypto_algs.o \
4+
virtio_crypto_skcipher_algs.o \
5+
virtio_crypto_akcipher_algs.o \
56
virtio_crypto_mgr.o \
67
virtio_crypto_core.o

0 commit comments

Comments
 (0)