[GIT PULL v2] virtio,vhost: last minute fixes

[GIT PULL v2] virtio,vhost: last minute fixes

[Michael S. Tsirkin]

changes from v1:
drop Sean's patches as an issue was found there.

The following changes since commit 76eeb9b8de9880ca38696b2fb56ac45ac0a25c6c:

  Linux 6.17-rc5 (2025-09-07 14:22:57 -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 1cedefff4a75baba48b9e4cfba8a6832005f89fe:

  virtio_config: clarify output parameters (2025-09-18 11:05:32 -0400)

----------------------------------------------------------------
virtio,vhost: last minute fixes

More small fixes. Most notably this reverts a virtio console
change since we made it without considering compatibility
sufficiently.

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

----------------------------------------------------------------
Alok Tiwari (1):
      vhost-scsi: fix argument order in tport allocation error message

Alyssa Ross (1):
      virtio_config: clarify output parameters

Ashwini Sahu (1):
      uapi: vduse: fix typo in comment

Michael S. Tsirkin (1):
      Revert "virtio_console: fix order of fields cols and rows"

zhang jiao (1):
      vhost: vringh: Modify the return value check

 drivers/char/virtio_console.c |  2 +-
 drivers/vhost/scsi.c          |  2 +-
 drivers/vhost/vringh.c        |  7 ++++---
 include/linux/virtio_config.h | 11 ++++++-----
 include/uapi/linux/vduse.h    |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

Re: [GIT PULL v2] virtio,vhost: last minute fixes

[Filip Hejsek]

On Thu, 2025-09-18 at 11:09 -0400, Michael S. Tsirkin wrote:
> Most notably this reverts a virtio console
> change since we made it without considering compatibility
> sufficiently.

It seems that we are not in agreement about whether it should be
reverted or not. I think it should depend on whether the virtio spec
maintainers are willing to change it to agree with the Linux
implementation. I was under the impression that they aren't.

I will quote some conversation from the patch thread.

Maximilian Immanuel Brandtner wrote:
> On a related note, during the initial discussion of this changing the
> virtio spec was proposed as well (as can be read from the commit mgs),
> however at the time on the viritio mailing list people were resistent
> to the idea of changing the virtio spec to conform to the kernel
> implementation.
> I don't really care if this discrepancy is fixed one way or the other,
> but it should most definitely be fixed.

I wrote:
> I'm of the same opinion, but if it is fixed on the kernel side, then
> (assuming no device implementation with the wrong order exists) I think
> maybe the fix should be backported to all widely used kernels. It seems
> that the patch hasn't been backported to the longterm kernels [1],
> which I think Debian kernels are based on.
> 
> [1]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/log/drivers/char/virtio_console.c?h=v6.12.47

Maximilian Immanuel Brandtner wrote:
> Then I guess the patch-set should be backported

After that, I sent a backport request to stable@. Maybe I should have
waited some more time before doing that.

Anyway, I don't care which way this dilemma will be resolved, but the
discussion is currently scattered among too many places and it's hard
to determine what the consensus is.

Best regards,
Filip Hejsek

Re: [GIT PULL v2] virtio,vhost: last minute fixes

[Michael S. Tsirkin]

On Thu, Sep 18, 2025 at 05:45:05PM +0200, Filip Hejsek wrote:
> On Thu, 2025-09-18 at 11:09 -0400, Michael S. Tsirkin wrote:
> > Most notably this reverts a virtio console
> > change since we made it without considering compatibility
> > sufficiently.
> 
> It seems that we are not in agreement about whether it should be
> reverted or not. I think it should depend on whether the virtio spec
> maintainers are willing to change it to agree with the Linux
> implementation. I was under the impression that they aren't.

Ugh. OK I guess I'll drop this one too then.
That leaves nothing relevant for this pull request.


> I will quote some conversation from the patch thread.
> 
> Maximilian Immanuel Brandtner wrote:
> > On a related note, during the initial discussion of this changing the
> > virtio spec was proposed as well (as can be read from the commit mgs),
> > however at the time on the viritio mailing list people were resistent
> > to the idea of changing the virtio spec to conform to the kernel
> > implementation.
> > I don't really care if this discrepancy is fixed one way or the other,
> > but it should most definitely be fixed.
> 
> I wrote:
> > I'm of the same opinion, but if it is fixed on the kernel side, then
> > (assuming no device implementation with the wrong order exists) I think
> > maybe the fix should be backported to all widely used kernels. It seems
> > that the patch hasn't been backported to the longterm kernels [1],
> > which I think Debian kernels are based on.
> > 
> > [1]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/log/drivers/char/virtio_console.c?h=v6.12.47
> 
> Maximilian Immanuel Brandtner wrote:
> > Then I guess the patch-set should be backported
> 
> After that, I sent a backport request to stable@. Maybe I should have
> waited some more time before doing that.
> 
> Anyway, I don't care which way this dilemma will be resolved, but the
> discussion is currently scattered among too many places and it's hard
> to determine what the consensus is.
> 
> Best regards,
> Filip Hejsek

Re: [GIT PULL v2] virtio,vhost: last minute fixes

[Michael S. Tsirkin]

OK and now Filip asked me to drop this too.
I am really batting 100x.
Linus pls ignore all this.
Very sorry.

I judge rest of patches here aren't important enough for a pull,
I will want for more patches to land and get tested.
Thanks!

On Thu, Sep 18, 2025 at 11:09:49AM -0400, Michael S. Tsirkin wrote:
> changes from v1:
> drop Sean's patches as an issue was found there.
> 
> The following changes since commit 76eeb9b8de9880ca38696b2fb56ac45ac0a25c6c:
> 
>   Linux 6.17-rc5 (2025-09-07 14:22:57 -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 1cedefff4a75baba48b9e4cfba8a6832005f89fe:
> 
>   virtio_config: clarify output parameters (2025-09-18 11:05:32 -0400)
> 
> ----------------------------------------------------------------
> virtio,vhost: last minute fixes
> 
> More small fixes. Most notably this reverts a virtio console
> change since we made it without considering compatibility
> sufficiently.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> ----------------------------------------------------------------
> Alok Tiwari (1):
>       vhost-scsi: fix argument order in tport allocation error message
> 
> Alyssa Ross (1):
>       virtio_config: clarify output parameters
> 
> Ashwini Sahu (1):
>       uapi: vduse: fix typo in comment
> 
> Michael S. Tsirkin (1):
>       Revert "virtio_console: fix order of fields cols and rows"
> 
> zhang jiao (1):
>       vhost: vringh: Modify the return value check
> 
>  drivers/char/virtio_console.c |  2 +-
>  drivers/vhost/scsi.c          |  2 +-
>  drivers/vhost/vringh.c        |  7 ++++---
>  include/linux/virtio_config.h | 11 ++++++-----
>  include/uapi/linux/vduse.h    |  2 +-
>  5 files changed, 13 insertions(+), 11 deletions(-)

Re: [GIT PULL v2] virtio,vhost: last minute fixes

[Linus Torvalds]

On Thu, 18 Sept 2025 at 09:14, Michael S. Tsirkin <mst@redhat.com> wrote:
>
> OK and now Filip asked me to drop this too.
> I am really batting 100x.
> Linus pls ignore all this.
> Very sorry.

Lol, that makes it very easy for me - no need to be sorry, and thanks
for just reacting fast enough that I didn't have time to do a pull and
then have to revert later.

          Linus