* [GIT PULL v2] vhost: cleanups and fixes
@ 2020-04-07 9:53 Michael S. Tsirkin
2020-04-07 9:56 ` David Hildenbrand
2020-04-09 4:05 ` pr-tracker-bot
0 siblings, 2 replies; 6+ messages in thread
From: Michael S. Tsirkin @ 2020-04-07 9:53 UTC (permalink / raw)
To: Linus Torvalds
Cc: kvm, virtualization, netdev, linux-kernel, alexander.h.duyck,
david, eperezma, jasowang, lingshan.zhu, mhocko, mst, namit,
rdunlap, rientjes, tiwei.bie, tysand, wei.w.wang, xiao.w.wang,
yuri.benditovich
Changes from PULL v1:
reverted a commit that was also in Andrew Morton's tree,
to resolve a merge conflict:
this is what Stephen Rothwell was doing to resolve it
in linux-next.
Now that many more architectures build vhost, a couple of these (um, and
arm with deprecated oabi) have reported build failures with randconfig,
however fixes for that need a bit more discussion/testing and will be
merged separately.
Not a regression - these previously simply didn't have vhost at all.
Also, there's some DMA API code in the vdpa simulator is hacky - if no
solution surfaces soon we can always disable it before release:
it's not a big deal either way as it's just test code.
The following changes since commit 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e:
Linux 5.6-rc7 (2020-03-22 18:31:56 -0700)
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 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)
----------------------------------------------------------------
virtio: fixes, vdpa
Some bug fixes.
The new vdpa subsystem with two first drivers.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
----------------------------------------------------------------
David Hildenbrand (1):
virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
Jason Wang (7):
vhost: refine vhost and vringh kconfig
vhost: allow per device message handler
vhost: factor out IOTLB
vringh: IOTLB support
vDPA: introduce vDPA bus
virtio: introduce a vDPA based transport
vdpasim: vDPA device simulator
Michael S. Tsirkin (3):
tools/virtio: option to build an out of tree module
vdpa: move to drivers/vdpa
virtio-balloon: Revert "virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM"
Tiwei Bie (1):
vhost: introduce vDPA-based backend
Yuri Benditovich (3):
virtio-net: Introduce extended RSC feature
virtio-net: Introduce RSS receive steering feature
virtio-net: Introduce hash report feature
Zhu Lingshan (1):
virtio: Intel IFC VF driver for VDPA
MAINTAINERS | 3 +
arch/arm/kvm/Kconfig | 2 -
arch/arm64/kvm/Kconfig | 2 -
arch/mips/kvm/Kconfig | 2 -
arch/powerpc/kvm/Kconfig | 2 -
arch/s390/kvm/Kconfig | 4 -
arch/x86/kvm/Kconfig | 4 -
drivers/Kconfig | 4 +
drivers/Makefile | 1 +
drivers/misc/mic/Kconfig | 4 -
drivers/net/caif/Kconfig | 4 -
drivers/vdpa/Kconfig | 37 ++
drivers/vdpa/Makefile | 4 +
drivers/vdpa/ifcvf/Makefile | 3 +
drivers/vdpa/ifcvf/ifcvf_base.c | 389 +++++++++++++++++
drivers/vdpa/ifcvf/ifcvf_base.h | 118 ++++++
drivers/vdpa/ifcvf/ifcvf_main.c | 435 +++++++++++++++++++
drivers/vdpa/vdpa.c | 180 ++++++++
drivers/vdpa/vdpa_sim/Makefile | 2 +
drivers/vdpa/vdpa_sim/vdpa_sim.c | 629 ++++++++++++++++++++++++++++
drivers/vhost/Kconfig | 45 +-
drivers/vhost/Kconfig.vringh | 6 -
drivers/vhost/Makefile | 6 +
drivers/vhost/iotlb.c | 177 ++++++++
drivers/vhost/net.c | 5 +-
drivers/vhost/scsi.c | 2 +-
drivers/vhost/vdpa.c | 883 +++++++++++++++++++++++++++++++++++++++
drivers/vhost/vhost.c | 233 ++++-------
drivers/vhost/vhost.h | 45 +-
drivers/vhost/vringh.c | 421 ++++++++++++++++++-
drivers/vhost/vsock.c | 2 +-
drivers/virtio/Kconfig | 13 +
drivers/virtio/Makefile | 1 +
drivers/virtio/virtio_vdpa.c | 396 ++++++++++++++++++
include/linux/vdpa.h | 253 +++++++++++
include/linux/vhost_iotlb.h | 47 +++
include/linux/vringh.h | 36 ++
include/uapi/linux/vhost.h | 24 ++
include/uapi/linux/vhost_types.h | 8 +
include/uapi/linux/virtio_net.h | 102 ++++-
tools/virtio/Makefile | 27 +-
41 files changed, 4310 insertions(+), 251 deletions(-)
create mode 100644 drivers/vdpa/Kconfig
create mode 100644 drivers/vdpa/Makefile
create mode 100644 drivers/vdpa/ifcvf/Makefile
create mode 100644 drivers/vdpa/ifcvf/ifcvf_base.c
create mode 100644 drivers/vdpa/ifcvf/ifcvf_base.h
create mode 100644 drivers/vdpa/ifcvf/ifcvf_main.c
create mode 100644 drivers/vdpa/vdpa.c
create mode 100644 drivers/vdpa/vdpa_sim/Makefile
create mode 100644 drivers/vdpa/vdpa_sim/vdpa_sim.c
delete mode 100644 drivers/vhost/Kconfig.vringh
create mode 100644 drivers/vhost/iotlb.c
create mode 100644 drivers/vhost/vdpa.c
create mode 100644 drivers/virtio/virtio_vdpa.c
create mode 100644 include/linux/vdpa.h
create mode 100644 include/linux/vhost_iotlb.h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL v2] vhost: cleanups and fixes
2020-04-07 9:53 [GIT PULL v2] vhost: cleanups and fixes Michael S. Tsirkin
@ 2020-04-07 9:56 ` David Hildenbrand
2020-04-07 10:08 ` Michael S. Tsirkin
2020-04-09 4:05 ` pr-tracker-bot
1 sibling, 1 reply; 6+ messages in thread
From: David Hildenbrand @ 2020-04-07 9:56 UTC (permalink / raw)
To: Michael S. Tsirkin, Linus Torvalds
Cc: kvm, virtualization, netdev, linux-kernel, alexander.h.duyck,
eperezma, jasowang, lingshan.zhu, mhocko, namit, rdunlap,
rientjes, tiwei.bie, tysand, wei.w.wang, xiao.w.wang,
yuri.benditovich
On 07.04.20 11:53, Michael S. Tsirkin wrote:
> Changes from PULL v1:
> reverted a commit that was also in Andrew Morton's tree,
> to resolve a merge conflict:
> this is what Stephen Rothwell was doing to resolve it
> in linux-next.
>
>
> Now that many more architectures build vhost, a couple of these (um, and
> arm with deprecated oabi) have reported build failures with randconfig,
> however fixes for that need a bit more discussion/testing and will be
> merged separately.
>
> Not a regression - these previously simply didn't have vhost at all.
> Also, there's some DMA API code in the vdpa simulator is hacky - if no
> solution surfaces soon we can always disable it before release:
> it's not a big deal either way as it's just test code.
>
>
> The following changes since commit 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e:
>
> Linux 5.6-rc7 (2020-03-22 18:31:56 -0700)
>
> 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 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)
>
> ----------------------------------------------------------------
> virtio: fixes, vdpa
>
> Some bug fixes.
> The new vdpa subsystem with two first drivers.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> ----------------------------------------------------------------
> David Hildenbrand (1):
> virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
^ stale leftover in this message only I assume
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL v2] vhost: cleanups and fixes
2020-04-07 9:56 ` David Hildenbrand
@ 2020-04-07 10:08 ` Michael S. Tsirkin
0 siblings, 0 replies; 6+ messages in thread
From: Michael S. Tsirkin @ 2020-04-07 10:08 UTC (permalink / raw)
To: David Hildenbrand
Cc: Linus Torvalds, kvm, virtualization, netdev, linux-kernel,
alexander.h.duyck, eperezma, jasowang, lingshan.zhu, mhocko,
namit, rdunlap, rientjes, tiwei.bie, tysand, wei.w.wang,
xiao.w.wang, yuri.benditovich
On Tue, Apr 07, 2020 at 11:56:59AM +0200, David Hildenbrand wrote:
> On 07.04.20 11:53, Michael S. Tsirkin wrote:
> > Changes from PULL v1:
> > reverted a commit that was also in Andrew Morton's tree,
> > to resolve a merge conflict:
> > this is what Stephen Rothwell was doing to resolve it
> > in linux-next.
> >
> >
> > Now that many more architectures build vhost, a couple of these (um, and
> > arm with deprecated oabi) have reported build failures with randconfig,
> > however fixes for that need a bit more discussion/testing and will be
> > merged separately.
> >
> > Not a regression - these previously simply didn't have vhost at all.
> > Also, there's some DMA API code in the vdpa simulator is hacky - if no
> > solution surfaces soon we can always disable it before release:
> > it's not a big deal either way as it's just test code.
> >
> >
> > The following changes since commit 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e:
> >
> > Linux 5.6-rc7 (2020-03-22 18:31:56 -0700)
> >
> > 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 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)
> >
> > ----------------------------------------------------------------
> > virtio: fixes, vdpa
> >
> > Some bug fixes.
> > The new vdpa subsystem with two first drivers.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> >
> > ----------------------------------------------------------------
> > David Hildenbrand (1):
> > virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
>
> ^ stale leftover in this message only I assume
No - I did not rebase since I did not want to invalidate all the testing
people did, just tacked a revert on top. So this commit is there
together with its revert.
>
> --
> Thanks,
>
> David / dhildenb
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL v2] vhost: cleanups and fixes
2020-04-07 9:53 [GIT PULL v2] vhost: cleanups and fixes Michael S. Tsirkin
2020-04-07 9:56 ` David Hildenbrand
@ 2020-04-09 4:05 ` pr-tracker-bot
1 sibling, 0 replies; 6+ messages in thread
From: pr-tracker-bot @ 2020-04-09 4:05 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Linus Torvalds, kvm, virtualization, netdev, linux-kernel,
alexander.h.duyck, david, eperezma, jasowang, lingshan.zhu,
mhocko, mst, namit, rdunlap, rientjes, tiwei.bie, tysand,
wei.w.wang, xiao.w.wang, yuri.benditovich
The pull request you sent on Tue, 7 Apr 2020 05:53:34 -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/9bb715260ed4cef6948cb2e05cf670462367da71
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL v2] vhost: cleanups and fixes
2020-04-20 20:00 Michael S. Tsirkin
@ 2020-04-21 19:40 ` pr-tracker-bot
0 siblings, 0 replies; 6+ messages in thread
From: pr-tracker-bot @ 2020-04-21 19:40 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Linus Torvalds, kvm, virtualization, netdev, linux-kernel,
alexander.h.duyck, arnd, bjorn.andersson, eli, eperezma, gustavo,
hulkci, jasowang, mst, sfr, yanaijie, yuehaibing
The pull request you sent on Mon, 20 Apr 2020 16:00:01 -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/189522da8b3a796d56d802e067d591d2ffff7f40
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL v2] vhost: cleanups and fixes
@ 2020-04-20 20:00 Michael S. Tsirkin
2020-04-21 19:40 ` pr-tracker-bot
0 siblings, 1 reply; 6+ messages in thread
From: Michael S. Tsirkin @ 2020-04-20 20:00 UTC (permalink / raw)
To: Linus Torvalds
Cc: kvm, virtualization, netdev, linux-kernel, alexander.h.duyck,
arnd, bjorn.andersson, eli, eperezma, gustavo, hulkci, jasowang,
mst, sfr, yanaijie, yuehaibing
The following changes since commit 8f3d9f354286745c751374f5f1fcafee6b3f3136:
Linux 5.7-rc1 (2020-04-12 12:35:55 -0700)
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 d085eb8ce727e581abf8145244eaa3339021be2f:
vhost: disable for OABI (2020-04-20 10:19:22 -0400)
Changes from v1:
Dropped a bunch of cleanups which turned out to be controversial
This has been in next for a while, though I tweaked some commit
logs so the hashes differ.
----------------------------------------------------------------
virtio: fixes, cleanups
Some bug fixes.
Cleanup a couple of issues that surfaced meanwhile.
Disable vhost on ARM with OABI for now - to be fixed
fully later in the cycle or in the next release.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
----------------------------------------------------------------
Alexander Duyck (1):
virtio-balloon: Avoid using the word 'report' when referring to free page hinting
Eugenio Pérez (1):
vhost: Create accessors for virtqueues private_data
Gustavo A. R. Silva (1):
vhost: vdpa: remove unnecessary null check
Jason Wang (1):
vdpa: fix comment of vdpa_register_device()
Jason Yan (2):
vhost: remove set but not used variable 'status'
virtio-balloon: make virtballoon_free_page_report() static
Michael S. Tsirkin (15):
vdpa-sim: depend on HAS_DMA
virtio/test: fix up after IOTLB changes
tools/virtio: define aligned attribute
tools/virtio: make asm/barrier.h self contained
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
vdpa: allow a 32 bit vq alignment
vdpa: make vhost, virtio depend on menu
virtio_blk: add a missing include
virtio: drop vringh.h dependency
vhost: disable for OABI
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/Kconfig | 2 +-
drivers/net/caif/Kconfig | 2 +-
drivers/remoteproc/remoteproc_sysfs.c | 1 +
drivers/remoteproc/stm32_rproc.c | 1 +
drivers/rpmsg/mtk_rpmsg.c | 1 +
drivers/vdpa/Kconfig | 18 ++++++------------
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 | 21 ++++++++++++++++-----
drivers/vhost/net.c | 28 +++++++++++++++-------------
drivers/vhost/scsi.c | 14 +++++++-------
drivers/vhost/test.c | 14 +++++++-------
drivers/vhost/vdpa.c | 5 -----
drivers/vhost/vhost.h | 27 +++++++++++++++++++++++++++
drivers/vhost/vringh.c | 5 +++++
drivers/vhost/vsock.c | 14 +++++++-------
drivers/virtio/Kconfig | 2 +-
drivers/virtio/virtio_balloon.c | 4 ++--
drivers/virtio/virtio_input.c | 1 +
include/linux/vdpa.h | 2 +-
include/linux/virtio.h | 1 -
include/linux/vringh.h | 6 ++++++
include/uapi/linux/virtio_balloon.h | 11 +++++++++--
tools/virtio/Makefile | 5 +++--
tools/virtio/asm/barrier.h | 1 +
tools/virtio/generated/autoconf.h | 0
tools/virtio/linux/compiler.h | 1 +
33 files changed, 128 insertions(+), 75 deletions(-)
create mode 100644 tools/virtio/generated/autoconf.h
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-04-21 19:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-07 9:53 [GIT PULL v2] vhost: cleanups and fixes Michael S. Tsirkin
2020-04-07 9:56 ` David Hildenbrand
2020-04-07 10:08 ` Michael S. Tsirkin
2020-04-09 4:05 ` pr-tracker-bot
2020-04-20 20:00 Michael S. Tsirkin
2020-04-21 19:40 ` 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).