linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] virtio,vdpa,vhost: features, fixes
@ 2021-09-09 13:56 Michael S. Tsirkin
  2021-09-11 21:56 ` Linus Torvalds
  2021-09-12  0:42 ` pr-tracker-bot
  0 siblings, 2 replies; 6+ messages in thread
From: Michael S. Tsirkin @ 2021-09-09 13:56 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: kvm, virtualization, netdev, linux-kernel, arseny.krasnov,
	caihuoqing, elic, jasowang, lingshan.zhu, mgurtovoy, mst,
	viresh.kumar, will, wsa, xianting.tian, xieyongji

The following changes since commit 7d2a07b769330c34b4deabeed939325c77a7ec2f:

  Linux 5.14 (2021-08-29 15:04:50 -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 7bc7f61897b66bef78bb5952e3d1e9f3aaf9ccca:

  Documentation: Add documentation for VDUSE (2021-09-06 07:20:58 -0400)

----------------------------------------------------------------
virtio,vdpa,vhost: features, fixes

vduse driver supporting blk
virtio-vsock support for end of record with SEQPACKET
vdpa: mac and mq support for ifcvf and mlx5
vdpa: management netlink for ifcvf
virtio-i2c, gpio dt bindings

misc fixes, cleanups

NB: when merging this with
b542e383d8c0 ("eventfd: Make signal recursion protection a task bit")
from Linus' tree, replace eventfd_signal_count with
eventfd_signal_allowed, and drop the export of eventfd_wake_count from
("eventfd: Export eventfd_wake_count to modules").

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

----------------------------------------------------------------
Arseny Krasnov (6):
      virtio/vsock: rename 'EOR' to 'EOM' bit.
      virtio/vsock: add 'VIRTIO_VSOCK_SEQ_EOR' bit.
      vhost/vsock: support MSG_EOR bit processing
      virtio/vsock: support MSG_EOR bit processing
      af_vsock: rename variables in receive loop
      vsock_test: update message bounds test for MSG_EOR

Cai Huoqing (2):
      vhost scsi: Convert to SPDX identifier
      vdpa: Make use of PFN_PHYS/PFN_UP/PFN_DOWN helper macro

Eli Cohen (6):
      vdpa/mlx5: Remove redundant header file inclusion
      vdpa/mlx5: function prototype modifications in preparation to control VQ
      vdpa/mlx5: Decouple virtqueue callback from struct mlx5_vdpa_virtqueue
      vdpa/mlx5: Ensure valid indices are provided
      vdpa/mlx5: Add support for control VQ and MAC setting
      vdpa/mlx5: Add multiqueue support

Max Gurtovoy (1):
      virtio-blk: remove unneeded "likely" statements

Viresh Kumar (5):
      dt-bindings: virtio: Add binding for virtio devices
      dt-bindings: i2c: Add bindings for i2c-virtio
      dt-bindings: gpio: Add bindings for gpio-virtio
      uapi: virtio_ids: Sync ids with specification
      virtio: Bind virtio device to device-tree node

Xianting Tian (1):
      virtio-balloon: Use virtio_find_vqs() helper

Xie Yongji (14):
      vdpa_sim: Use iova_shift() for the size passed to alloc_iova()
      iova: Export alloc_iova_fast() and free_iova_fast()
      eventfd: Export eventfd_wake_count to modules
      file: Export receive_fd() to modules
      vdpa: Fix some coding style issues
      vdpa: Add reset callback in vdpa_config_ops
      vhost-vdpa: Handle the failure of vdpa_reset()
      vhost-iotlb: Add an opaque pointer for vhost IOTLB
      vdpa: Add an opaque pointer for vdpa_config_ops.dma_map()
      vdpa: factor out vhost_vdpa_pa_map() and vhost_vdpa_pa_unmap()
      vdpa: Support transferring virtual addressing during DMA mapping
      vduse: Implement an MMU-based software IOTLB
      vduse: Introduce VDUSE - vDPA Device in Userspace
      Documentation: Add documentation for VDUSE

Zhu Lingshan (4):
      vDPA/ifcvf: introduce get_dev_type() which returns virtio dev id
      vDPA/ifcvf: implement management netlink framework for ifcvf
      vDPA/ifcvf: detect and use the onboard number of queues directly
      vDPA/ifcvf: enable multiqueue and control vq

 .../devicetree/bindings/gpio/gpio-virtio.yaml      |   59 +
 .../devicetree/bindings/i2c/i2c-virtio.yaml        |   51 +
 Documentation/devicetree/bindings/virtio/mmio.yaml |    3 +-
 .../devicetree/bindings/virtio/virtio-device.yaml  |   41 +
 Documentation/userspace-api/index.rst              |    1 +
 Documentation/userspace-api/ioctl/ioctl-number.rst |    1 +
 Documentation/userspace-api/vduse.rst              |  233 +++
 drivers/block/virtio_blk.c                         |    4 +-
 drivers/iommu/iova.c                               |    2 +
 drivers/vdpa/Kconfig                               |   11 +
 drivers/vdpa/Makefile                              |    1 +
 drivers/vdpa/ifcvf/ifcvf_base.c                    |    8 +-
 drivers/vdpa/ifcvf/ifcvf_base.h                    |   25 +-
 drivers/vdpa/ifcvf/ifcvf_main.c                    |  257 ++-
 drivers/vdpa/mlx5/core/mlx5_vdpa.h                 |   26 +-
 drivers/vdpa/mlx5/core/mr.c                        |   81 +-
 drivers/vdpa/mlx5/core/resources.c                 |   35 +
 drivers/vdpa/mlx5/net/mlx5_vnet.c                  |  555 ++++++-
 drivers/vdpa/vdpa.c                                |    9 +-
 drivers/vdpa/vdpa_sim/vdpa_sim.c                   |   29 +-
 drivers/vdpa/vdpa_user/Makefile                    |    5 +
 drivers/vdpa/vdpa_user/iova_domain.c               |  545 +++++++
 drivers/vdpa/vdpa_user/iova_domain.h               |   73 +
 drivers/vdpa/vdpa_user/vduse_dev.c                 | 1641 ++++++++++++++++++++
 drivers/vdpa/virtio_pci/vp_vdpa.c                  |   17 +-
 drivers/vhost/iotlb.c                              |   20 +-
 drivers/vhost/scsi.c                               |   14 +-
 drivers/vhost/vdpa.c                               |  188 ++-
 drivers/vhost/vsock.c                              |   28 +-
 drivers/virtio/virtio.c                            |   57 +-
 drivers/virtio/virtio_balloon.c                    |    4 +-
 fs/eventfd.c                                       |    1 +
 fs/file.c                                          |    6 +
 include/linux/file.h                               |    7 +-
 include/linux/vdpa.h                               |   62 +-
 include/linux/vhost_iotlb.h                        |    3 +
 include/uapi/linux/vduse.h                         |  306 ++++
 include/uapi/linux/virtio_ids.h                    |   12 +
 include/uapi/linux/virtio_vsock.h                  |    3 +-
 net/vmw_vsock/af_vsock.c                           |   10 +-
 net/vmw_vsock/virtio_transport_common.c            |   23 +-
 tools/testing/vsock/vsock_test.c                   |    8 +-
 42 files changed, 4136 insertions(+), 329 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-virtio.yaml
 create mode 100644 Documentation/devicetree/bindings/i2c/i2c-virtio.yaml
 create mode 100644 Documentation/devicetree/bindings/virtio/virtio-device.yaml
 create mode 100644 Documentation/userspace-api/vduse.rst
 create mode 100644 drivers/vdpa/vdpa_user/Makefile
 create mode 100644 drivers/vdpa/vdpa_user/iova_domain.c
 create mode 100644 drivers/vdpa/vdpa_user/iova_domain.h
 create mode 100644 drivers/vdpa/vdpa_user/vduse_dev.c
 create mode 100644 include/uapi/linux/vduse.h


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

* Re: [GIT PULL] virtio,vdpa,vhost: features, fixes
  2021-09-09 13:56 [GIT PULL] virtio,vdpa,vhost: features, fixes Michael S. Tsirkin
@ 2021-09-11 21:56 ` Linus Torvalds
  2021-09-11 23:51   ` Yongji Xie
  2021-09-12  0:11   ` Michael S. Tsirkin
  2021-09-12  0:42 ` pr-tracker-bot
  1 sibling, 2 replies; 6+ messages in thread
From: Linus Torvalds @ 2021-09-11 21:56 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: KVM list, virtualization, Netdev, Linux Kernel Mailing List,
	arseny.krasnov, caihuoqing, elic, Jason Wang, lingshan.zhu,
	mgurtovoy, Viresh Kumar, Will Deacon, Wolfram Sang,
	xianting.tian, xieyongji

On Thu, Sep 9, 2021 at 6:56 AM Michael S. Tsirkin <mst@redhat.com> wrote:
>
> NB: when merging this with
> b542e383d8c0 ("eventfd: Make signal recursion protection a task bit")
> from Linus' tree, replace eventfd_signal_count with
> eventfd_signal_allowed, and drop the export of eventfd_wake_count from
> ("eventfd: Export eventfd_wake_count to modules").

What? No. That can't be right.

Do you mean "replace eventfd_signal_count with !eventfd_signal_allowed()"?

Because if I read the logic correctly, the issue is that
'vduse_vq_kick()' will call eventfd_signal().

Which it must not do it eventfd_signal_allowed() returns false.

So if eventfd_signal_allowed() is _not_ set, the code needs to defer
it to the workqueue.

No?

Side note: I was _this_ close to just not pulling this. The commits
were all from after the merge window opened, and I got this pull
request in the latter half of the second week of the merge window.

Your "explanations"  for this pull are also not any language I
recognize, or even remotely human-readable.

WTF does "vduse driver supporting blk" mean, and how is that supposed
to explain anything at all?

That is NOT how these things are supposed to work. AT ALL.

So you are hereby put on notice: next time I get this kind of
half-arsed garbage pull request, I won't spend the energy on trying to
figure out what is actually going on. I will just throw it in the
trash.

Because honestly, that's where this pull request belonged.

              Linus

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

* Re: [GIT PULL] virtio,vdpa,vhost: features, fixes
  2021-09-11 21:56 ` Linus Torvalds
@ 2021-09-11 23:51   ` Yongji Xie
  2021-09-12  0:11   ` Michael S. Tsirkin
  1 sibling, 0 replies; 6+ messages in thread
From: Yongji Xie @ 2021-09-11 23:51 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: Michael S. Tsirkin, KVM list, virtualization, Netdev,
	Linux Kernel Mailing List, arseny.krasnov, caihuoqing, Eli Cohen,
	Jason Wang, Zhu, Lingshan, Max Gurtovoy, Viresh Kumar,
	Will Deacon, Wolfram Sang, xianting.tian

On Sun, Sep 12, 2021 at 5:56 AM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> On Thu, Sep 9, 2021 at 6:56 AM Michael S. Tsirkin <mst@redhat.com> wrote:
> >
> > NB: when merging this with
> > b542e383d8c0 ("eventfd: Make signal recursion protection a task bit")
> > from Linus' tree, replace eventfd_signal_count with
> > eventfd_signal_allowed, and drop the export of eventfd_wake_count from
> > ("eventfd: Export eventfd_wake_count to modules").
>
> What? No. That can't be right.
>
> Do you mean "replace eventfd_signal_count with !eventfd_signal_allowed()"?
>
> Because if I read the logic correctly, the issue is that
> 'vduse_vq_kick()' will call eventfd_signal().
>
> Which it must not do it eventfd_signal_allowed() returns false.
>
> So if eventfd_signal_allowed() is _not_ set, the code needs to defer
> it to the workqueue.
>
> No?
>

Yes, that's my fault. I just check how the eventfd_signal_allowed()
works in fs/aio.c (also needs a fix) when I see the fix for the merge
conflicts. Sorry for that.

Thanks,
Yongji

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

* Re: [GIT PULL] virtio,vdpa,vhost: features, fixes
  2021-09-11 21:56 ` Linus Torvalds
  2021-09-11 23:51   ` Yongji Xie
@ 2021-09-12  0:11   ` Michael S. Tsirkin
  2021-09-12  0:43     ` Linus Torvalds
  1 sibling, 1 reply; 6+ messages in thread
From: Michael S. Tsirkin @ 2021-09-12  0:11 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: KVM list, virtualization, Netdev, Linux Kernel Mailing List,
	arseny.krasnov, caihuoqing, elic, Jason Wang, lingshan.zhu,
	mgurtovoy, Viresh Kumar, Will Deacon, Wolfram Sang,
	xianting.tian, xieyongji

On Sat, Sep 11, 2021 at 02:56:12PM -0700, Linus Torvalds wrote:
> So you are hereby put on notice: next time I get this kind of
> half-arsed garbage pull request, I won't spend the energy on trying to
> figure out what is actually going on. I will just throw it in the
> trash.
> 
> Because honestly, that's where this pull request belonged.
> 
>               Linus

OK so I was worrying about these patches anyway, and that
is why I put them on top. So I just sent GIT PULL V2 which
includes all the same commits except for the last 13 patches,
so they all have been in linux-next.

It's in the tag for_linus_v2 - the point of keeping for_linus
intact was so anyone can compare these two.

Hope that clarifies rather than confuses things even more.

Mea culpa, etc.

-- 
MST


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

* Re: [GIT PULL] virtio,vdpa,vhost: features, fixes
  2021-09-09 13:56 [GIT PULL] virtio,vdpa,vhost: features, fixes Michael S. Tsirkin
  2021-09-11 21:56 ` Linus Torvalds
@ 2021-09-12  0:42 ` pr-tracker-bot
  1 sibling, 0 replies; 6+ messages in thread
From: pr-tracker-bot @ 2021-09-12  0:42 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: Linus Torvalds, kvm, virtualization, netdev, linux-kernel,
	arseny.krasnov, caihuoqing, elic, jasowang, lingshan.zhu,
	mgurtovoy, mst, viresh.kumar, will, wsa, xianting.tian,
	xieyongji

The pull request you sent on Thu, 9 Sep 2021 09:56:08 -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/78e709522d2c012cb0daad2e668506637bffb7c2

Thank you!

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

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

* Re: [GIT PULL] virtio,vdpa,vhost: features, fixes
  2021-09-12  0:11   ` Michael S. Tsirkin
@ 2021-09-12  0:43     ` Linus Torvalds
  0 siblings, 0 replies; 6+ messages in thread
From: Linus Torvalds @ 2021-09-12  0:43 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: KVM list, virtualization, Netdev, Linux Kernel Mailing List,
	arseny.krasnov, caihuoqing, elic, Jason Wang, lingshan.zhu,
	mgurtovoy, Viresh Kumar, Will Deacon, Wolfram Sang,
	xianting.tian, xieyongji

On Sat, Sep 11, 2021 at 5:11 PM Michael S. Tsirkin <mst@redhat.com> wrote:
>
> It's in the tag for_linus_v2 - the point of keeping for_linus
> intact was so anyone can compare these two.

Well, since I had already spent the effort in trying to figure things
out, I had merged the original branch.

I just didn't _like_ having to spend that effort, particularly not the
weekend before I do rc1.

This has not been one of those smooth merge windows that we occasionally have.

             Linus

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

end of thread, other threads:[~2021-09-12  0:49 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-09 13:56 [GIT PULL] virtio,vdpa,vhost: features, fixes Michael S. Tsirkin
2021-09-11 21:56 ` Linus Torvalds
2021-09-11 23:51   ` Yongji Xie
2021-09-12  0:11   ` Michael S. Tsirkin
2021-09-12  0:43     ` Linus Torvalds
2021-09-12  0:42 ` 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).