linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] vhost: cleanups and fixes
@ 2020-04-14 16:36 Michael S. Tsirkin
  2020-04-16  0:46 ` Linus Torvalds
  0 siblings, 1 reply; 10+ messages in thread
From: Michael S. Tsirkin @ 2020-04-14 16:36 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: kvm, virtualization, netdev, linux-kernel, andy.shevchenko, arnd,
	ashutosh.dixit, bjorn.andersson, elfring, eli, eperezma, gustavo,
	hulkci, jasowang, matej.genci, mst, sfr, yanaijie, yuehaibing

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@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


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [GIT PULL] vhost: cleanups and fixes
  2020-04-14 16:36 [GIT PULL] vhost: cleanups and fixes Michael S. Tsirkin
@ 2020-04-16  0:46 ` Linus Torvalds
  2020-04-16 12:20   ` Michael S. Tsirkin
  0 siblings, 1 reply; 10+ messages in thread
From: Linus Torvalds @ 2020-04-16  0:46 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: KVM list, virtualization, Netdev, Linux Kernel Mailing List,
	Andy Shevchenko, Arnd Bergmann, ashutosh.dixit, Bjorn Andersson,
	Markus Elfring, eli, eperezma, Gustavo A. R. Silva, hulkci,
	Cc: stable@vger.kernel.org, david@redhat.com,
	dverkamp@chromium.org, hch@lst.de, jasowang@redhat.com,
	liang.z.li@intel.com, mst@redhat.com, tiny.windzz@gmail.com,,
	matej.genci, Stephen Rothwell, yanaijie, YueHaibing

On Tue, Apr 14, 2020 at 9:36 AM Michael S. Tsirkin <mst@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.

              Linus

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [GIT PULL] vhost: cleanups and fixes
  2020-04-16  0:46 ` Linus Torvalds
@ 2020-04-16 12:20   ` Michael S. Tsirkin
  2020-04-16 17:01     ` Linus Torvalds
  0 siblings, 1 reply; 10+ messages in thread
From: Michael S. Tsirkin @ 2020-04-16 12:20 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: KVM list, virtualization, Netdev, Linux Kernel Mailing List,
	Andy Shevchenko, Arnd Bergmann, ashutosh.dixit, Bjorn Andersson,
	Markus Elfring, eli, eperezma, Gustavo A. R. Silva, hulkci,
	Cc: stable@vger.kernel.org, david@redhat.com,
	dverkamp@chromium.org, hch@lst.de, jasowang@redhat.com,
	liang.z.li@intel.com, mst@redhat.com, tiny.windzz@gmail.com,,
	matej.genci, Stephen Rothwell, yanaijie, YueHaibing

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@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.
> 
>               Linus

Well it's all just fallout from

	commit 61b89f23f854f458b8e23719978df58260f051ed
	Author: Michael S. Tsirkin <mst@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


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [GIT PULL] vhost: cleanups and fixes
  2020-04-16 12:20   ` Michael S. Tsirkin
@ 2020-04-16 17:01     ` Linus Torvalds
  2020-04-16 21:58       ` Michael S. Tsirkin
  0 siblings, 1 reply; 10+ messages in thread
From: Linus Torvalds @ 2020-04-16 17:01 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: KVM list, virtualization, Netdev, Linux Kernel Mailing List,
	Andy Shevchenko, Arnd Bergmann, ashutosh.dixit, Bjorn Andersson,
	Markus Elfring, eli, eperezma, Gustavo A. R. Silva, hulkci,
	Cc: stable@vger.kernel.org, david@redhat.com,
	dverkamp@chromium.org, hch@lst.de, jasowang@redhat.com,
	liang.z.li@intel.com, mst@redhat.com, tiny.windzz@gmail.com,,
	matej.genci, Stephen Rothwell, yanaijie, YueHaibing

On Thu, Apr 16, 2020 at 5:20 AM Michael S. Tsirkin <mst@redhat.com> wrote:
> Well it's all just fallout from

What? No. Half of it seems to be the moving of "struct vring" around
to other headers and stuff.

And then that is done very confusingly too, using two different
structures both called "struct vring".

No way can I pull that kind of craziness as a "fix".

                Linus

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [GIT PULL] vhost: cleanups and fixes
  2020-04-16 17:01     ` Linus Torvalds
@ 2020-04-16 21:58       ` Michael S. Tsirkin
  0 siblings, 0 replies; 10+ messages in thread
From: Michael S. Tsirkin @ 2020-04-16 21:58 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: KVM list, virtualization, Netdev, Linux Kernel Mailing List,
	Andy Shevchenko, Arnd Bergmann, ashutosh.dixit, Bjorn Andersson,
	Markus Elfring, eli, eperezma, Gustavo A. R. Silva, hulkci,
	Cc: stable@vger.kernel.org, david@redhat.com,
	dverkamp@chromium.org, hch@lst.de, jasowang@redhat.com,
	liang.z.li@intel.com, mst@redhat.com, tiny.windzz@gmail.com,,
	matej.genci, Stephen Rothwell, yanaijie, YueHaibing

On Thu, Apr 16, 2020 at 10:01:51AM -0700, Linus Torvalds wrote:
> On Thu, Apr 16, 2020 at 5:20 AM Michael S. Tsirkin <mst@redhat.com> wrote:
> > Well it's all just fallout from
> 
> What? No. Half of it seems to be the moving of "struct vring" around
> to other headers and stuff.
> 
> And then that is done very confusingly too, using two different
> structures both called "struct vring".
> 
> No way can I pull that kind of craziness as a "fix".
> 
>                 Linus

OK, I'll just disable vhost on that config for now - it was
suggested previously. Thanks for the comment and sorry about geeting it
wrong!


-- 
MST


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [GIT PULL] vhost: cleanups and fixes
  2021-12-12 22:59 Michael S. Tsirkin
  2021-12-12 23:01 ` Michael S. Tsirkin
@ 2021-12-13 22:49 ` pr-tracker-bot
  1 sibling, 0 replies; 10+ messages in thread
From: pr-tracker-bot @ 2021-12-13 22:49 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: Linus Torvalds, kvm, virtualization, netdev, linux-kernel, arnd,
	dan.carpenter, hch, jasowang, jroedel, konrad.wilk, lkp, maz,
	mst, parav, qperret, robin.murphy, stable, steven.price,
	suzuki.poulose, wei.w.wang, will, xieyongji

The pull request you sent on Sun, 12 Dec 2021 17:59:51 -0500:

> https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/5472f14a37421d1bca3dddf33cabd3bd6dbefbbc

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [GIT PULL] vhost: cleanups and fixes
  2021-12-12 22:59 Michael S. Tsirkin
@ 2021-12-12 23:01 ` Michael S. Tsirkin
  2021-12-13 22:49 ` pr-tracker-bot
  1 sibling, 0 replies; 10+ messages in thread
From: Michael S. Tsirkin @ 2021-12-12 23:01 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: kvm, virtualization, netdev, linux-kernel, arnd, dan.carpenter,
	hch, jasowang, jroedel, konrad.wilk, lkp, maz, parav, qperret,
	robin.murphy, stable, steven.price, suzuki.poulose, wei.w.wang,
	will, xieyongji

The email subject is wrong. it's just bugfixes.
But the tag is ok, and that's what matters, right?

On Sun, Dec 12, 2021 at 05:59:58PM -0500, Michael S. Tsirkin wrote:
> The following changes since commit 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1:
> 
>   Linux 5.16-rc4 (2021-12-05 14:08:22 -0800)
> 
> 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 bb47620be322c5e9e372536cb6b54e17b3a00258:
> 
>   vdpa: Consider device id larger than 31 (2021-12-08 15:41:50 -0500)
> 
> ----------------------------------------------------------------
> virtio,vdpa: bugfixes
> 
> Misc bugfixes.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> ----------------------------------------------------------------
> Arnd Bergmann (1):
>       virtio: always enter drivers/virtio/
> 
> Dan Carpenter (3):
>       vduse: fix memory corruption in vduse_dev_ioctl()
>       vdpa: check that offsets are within bounds
>       vduse: check that offset is within bounds in get_config()
> 
> Parav Pandit (1):
>       vdpa: Consider device id larger than 31
> 
> Wei Wang (1):
>       virtio/vsock: fix the transport to work with VMADDR_CID_ANY
> 
> Will Deacon (1):
>       virtio_ring: Fix querying of maximum DMA mapping size for virtio device
> 
>  drivers/Makefile                        | 3 +--
>  drivers/vdpa/vdpa.c                     | 3 ++-
>  drivers/vdpa/vdpa_user/vduse_dev.c      | 6 ++++--
>  drivers/vhost/vdpa.c                    | 2 +-
>  drivers/virtio/virtio_ring.c            | 2 +-
>  net/vmw_vsock/virtio_transport_common.c | 3 ++-
>  6 files changed, 11 insertions(+), 8 deletions(-)


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [GIT PULL] vhost: cleanups and fixes
@ 2021-12-12 22:59 Michael S. Tsirkin
  2021-12-12 23:01 ` Michael S. Tsirkin
  2021-12-13 22:49 ` pr-tracker-bot
  0 siblings, 2 replies; 10+ messages in thread
From: Michael S. Tsirkin @ 2021-12-12 22:59 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: kvm, virtualization, netdev, linux-kernel, arnd, dan.carpenter,
	hch, jasowang, jroedel, konrad.wilk, lkp, maz, mst, parav,
	qperret, robin.murphy, stable, steven.price, suzuki.poulose,
	wei.w.wang, will, xieyongji

The following changes since commit 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1:

  Linux 5.16-rc4 (2021-12-05 14:08:22 -0800)

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 bb47620be322c5e9e372536cb6b54e17b3a00258:

  vdpa: Consider device id larger than 31 (2021-12-08 15:41:50 -0500)

----------------------------------------------------------------
virtio,vdpa: bugfixes

Misc bugfixes.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

----------------------------------------------------------------
Arnd Bergmann (1):
      virtio: always enter drivers/virtio/

Dan Carpenter (3):
      vduse: fix memory corruption in vduse_dev_ioctl()
      vdpa: check that offsets are within bounds
      vduse: check that offset is within bounds in get_config()

Parav Pandit (1):
      vdpa: Consider device id larger than 31

Wei Wang (1):
      virtio/vsock: fix the transport to work with VMADDR_CID_ANY

Will Deacon (1):
      virtio_ring: Fix querying of maximum DMA mapping size for virtio device

 drivers/Makefile                        | 3 +--
 drivers/vdpa/vdpa.c                     | 3 ++-
 drivers/vdpa/vdpa_user/vduse_dev.c      | 6 ++++--
 drivers/vhost/vdpa.c                    | 2 +-
 drivers/virtio/virtio_ring.c            | 2 +-
 net/vmw_vsock/virtio_transport_common.c | 3 ++-
 6 files changed, 11 insertions(+), 8 deletions(-)


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [GIT PULL] vhost: cleanups and fixes
  2021-03-18 18:11 Michael S. Tsirkin
@ 2021-03-18 18:24 ` pr-tracker-bot
  0 siblings, 0 replies; 10+ messages in thread
From: pr-tracker-bot @ 2021-03-18 18:24 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: Linus Torvalds, kvm, virtualization, netdev, linux-kernel,
	gdawar.xilinx, jasowang, lingshan.zhu, lvivier, mst, parav,
	sgarzare, stable, tangbin, xianting_tian

The pull request you sent on Thu, 18 Mar 2021 14:11:35 -0400:

> https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/bf152b0b41dc141c8d32eb6e974408f5804f4d00

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [GIT PULL] vhost: cleanups and fixes
@ 2021-03-18 18:11 Michael S. Tsirkin
  2021-03-18 18:24 ` pr-tracker-bot
  0 siblings, 1 reply; 10+ messages in thread
From: Michael S. Tsirkin @ 2021-03-18 18:11 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: kvm, virtualization, netdev, linux-kernel, gdawar.xilinx,
	jasowang, lingshan.zhu, lvivier, mst, parav, sgarzare, stable,
	tangbin, xianting_tian

The following changes since commit 16c10bede8b3d8594279752bf53153491f3f944f:

  virtio-input: add multi-touch support (2021-02-23 07:52:59 -0500)

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 0bde59c1723a29e294765c96dbe5c7fb639c2f96:

  vhost-vdpa: set v->config_ctx to NULL if eventfd_ctx_fdget() fails (2021-03-14 18:10:07 -0400)

----------------------------------------------------------------
virtio: fixes, cleanups

Some fixes and cleanups all over the place.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

----------------------------------------------------------------
Gautam Dawar (1):
      vhost_vdpa: fix the missing irq_bypass_unregister_producer() invocation

Jason Wang (1):
      vdpa: set the virtqueue num during register

Laurent Vivier (1):
      vhost: Fix vhost_vq_reset()

Parav Pandit (1):
      vdpa_sim: Skip typecasting from void*

Stefano Garzarella (2):
      vhost-vdpa: fix use-after-free of v->config_ctx
      vhost-vdpa: set v->config_ctx to NULL if eventfd_ctx_fdget() fails

Tang Bin (1):
      virtio-mmio: Use to_virtio_mmio_device() to simply code

Xianting Tian (1):
      virtio: remove export for virtio_config_{enable, disable}

 drivers/vdpa/ifcvf/ifcvf_main.c      |  5 ++---
 drivers/vdpa/mlx5/net/mlx5_vnet.c    |  4 ++--
 drivers/vdpa/vdpa.c                  | 18 ++++++++++--------
 drivers/vdpa/vdpa_sim/vdpa_sim.c     |  2 +-
 drivers/vdpa/vdpa_sim/vdpa_sim_net.c |  5 ++---
 drivers/vhost/vdpa.c                 | 20 +++++++++++---------
 drivers/vhost/vhost.c                |  2 +-
 drivers/virtio/virtio.c              |  6 ++----
 drivers/virtio/virtio_mmio.c         |  3 +--
 include/linux/vdpa.h                 | 10 +++++-----
 include/linux/virtio.h               |  2 --
 11 files changed, 37 insertions(+), 40 deletions(-)


^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-12-13 22:50 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-14 16:36 [GIT PULL] vhost: cleanups and fixes Michael S. Tsirkin
2020-04-16  0:46 ` Linus Torvalds
2020-04-16 12:20   ` Michael S. Tsirkin
2020-04-16 17:01     ` Linus Torvalds
2020-04-16 21:58       ` Michael S. Tsirkin
2021-03-18 18:11 Michael S. Tsirkin
2021-03-18 18:24 ` pr-tracker-bot
2021-12-12 22:59 Michael S. Tsirkin
2021-12-12 23:01 ` Michael S. Tsirkin
2021-12-13 22:49 ` pr-tracker-bot

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).