The following changes since commit 835a6a649d0dd1b1f46759eb60fff2f63ed253a7: virtio-balloon: Revert "virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM" (2020-04-07 05:44:57 -0400) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus for you to fetch changes up to d4a85c2ace895a58dcab687ff49c76719011f58d: vdpa: fix comment of vdpa_register_device() (2020-04-13 07:16:41 -0400) ---------------------------------------------------------------- virtio: fixes, cleanups Some bug fixes. Cleanup a couple of issues that surfaced meanwhile. Signed-off-by: Michael S. Tsirkin <mst at redhat.com> ---------------------------------------------------------------- Eugenio P?rez (4): vhost: Create accessors for virtqueues private_data tools/virtio: Add --batch option tools/virtio: Add --batch=random option tools/virtio: Add --reset=random Gustavo A. R. Silva (1): vhost: vdpa: remove unnecessary null check Jason Wang (1): vdpa: fix comment of vdpa_register_device() Jason Yan (1): vhost: remove set but not used variable 'status' Markus Elfring (1): virtio-mmio: Delete an error message in vm_find_vqs() Matej Genci (1): virtio: add VIRTIO_RING_NO_LEGACY Michael S. Tsirkin (22): vdpa-sim: depend on HAS_DMA virtio/test: fix up after IOTLB changes vhost: drop vring dependency on iotlb tools/virtio: define aligned attribute tools/virtio: make asm/barrier.h self contained tools/virtio: define __KERNEL__ virtgpu: pull in uaccess.h virtio-rng: pull in slab.h remoteproc: pull in slab.h virtio_input: pull in slab.h rpmsg: pull in slab.h remoteproc: pull in slab.h virtio: stop using legacy struct vring in kernel vhost: force spec specified alignment on types virtio: add legacy init/size APIs virtio_ring: switch to virtio_legacy_init/size tools/virtio: switch to virtio_legacy_init/size vop: switch to virtio_legacy_init/size remoteproc: switch to virtio_legacy_init/size mellanox: switch to virtio_legacy_init/size vdpa: allow a 32 bit vq alignment vdpa: make vhost, virtio depend on menu Stephen Rothwell (1): drm/virtio: fix up for include file changes YueHaibing (2): vdpa: remove unused variables 'ifcvf' and 'ifcvf_lm' vdpasim: Return status in vdpasim_get_status drivers/block/virtio_blk.c | 1 + drivers/char/hw_random/virtio-rng.c | 1 + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 1 + drivers/gpu/drm/virtio/virtgpu_kms.c | 1 + drivers/misc/mic/vop/vop_main.c | 5 +- drivers/misc/mic/vop/vop_vringh.c | 8 ++- drivers/platform/mellanox/mlxbf-tmfifo.c | 6 +- drivers/remoteproc/remoteproc_core.c | 2 +- drivers/remoteproc/remoteproc_sysfs.c | 1 + drivers/remoteproc/remoteproc_virtio.c | 2 +- drivers/remoteproc/stm32_rproc.c | 1 + drivers/rpmsg/mtk_rpmsg.c | 1 + drivers/vdpa/Kconfig | 19 +++--- drivers/vdpa/ifcvf/ifcvf_base.c | 2 - drivers/vdpa/ifcvf/ifcvf_main.c | 4 +- drivers/vdpa/vdpa.c | 2 +- drivers/vdpa/vdpa_sim/vdpa_sim.c | 4 +- drivers/vhost/Kconfig | 5 +- drivers/vhost/net.c | 28 +++++---- drivers/vhost/scsi.c | 14 ++--- drivers/vhost/test.c | 71 +++++++++++++++++++--- drivers/vhost/test.h | 1 + drivers/vhost/vdpa.c | 5 -- drivers/vhost/vhost.h | 33 +++++++++- drivers/vhost/vringh.c | 5 ++ drivers/vhost/vsock.c | 14 ++--- drivers/virtio/Kconfig | 2 +- drivers/virtio/virtio_input.c | 1 + drivers/virtio/virtio_mmio.c | 4 +- drivers/virtio/virtio_pci_modern.c | 1 + drivers/virtio/virtio_ring.c | 15 +++-- include/linux/vdpa.h | 2 +- include/linux/virtio.h | 1 - include/linux/virtio_ring.h | 46 ++++++++++++++ include/linux/vringh.h | 7 +++ include/uapi/linux/virtio_ring.h | 30 ++++++--- tools/virtio/Makefile | 5 +- tools/virtio/asm/barrier.h | 1 + tools/virtio/generated/autoconf.h | 0 tools/virtio/linux/compiler.h | 1 + tools/virtio/ringtest/virtio_ring_0_9.c | 6 +- tools/virtio/virtio_test.c | 101 ++++++++++++++++++++++++++----- tools/virtio/vringh_test.c | 18 +++--- 43 files changed, 354 insertions(+), 124 deletions(-) create mode 100644 tools/virtio/generated/autoconf.h
On Tue, Apr 14, 2020 at 9:36 AM Michael S. Tsirkin <mst at redhat.com> wrote:> > virtio: fixes, cleanupsLooking at this, about 75% of it looks like it should have come in during the merge window, not now. Linus
On Wed, Apr 15, 2020 at 05:46:33PM -0700, Linus Torvalds wrote:> On Tue, Apr 14, 2020 at 9:36 AM Michael S. Tsirkin <mst at redhat.com> wrote: > > > > virtio: fixes, cleanups > > Looking at this, about 75% of it looks like it should have come in > during the merge window, not now. > > LinusWell it's all just fallout from commit 61b89f23f854f458b8e23719978df58260f051ed Author: Michael S. Tsirkin <mst at redhat.com> Date: Mon Apr 6 08:42:55 2020 -0400 vhost: force spec specified alignment on types which I didn't know we need until things landed upstream and people started testing with weird configs. That forced changes to a header file and the rest followed. We could just ignore -mabi=apcs-gnu build being broken for this release - is that preferable? Pls let me know. -- MST