[PATCH 0/1] KVM: s390: virtio-ccw: Fix config space values

[PATCH 0/1] KVM: s390: virtio-ccw: Fix config space values

[Christian Borntraeger]

Paolo,

here is fix targetted for kvm/master (4.2) that fixes an issue with
virtio config space on s390. It mostly manifests in vhost-scsi
not working properly on s390. The problem itself might affect other
things as well so cc stable/target 4.2.

@Michael FYI, sending this via Paolo as most virtio-ccw kernel
things went this way.

Cornelia Huck (1):
  KVM: s390: virtio-ccw: don't overwrite config space values

 drivers/s390/kvm/virtio_ccw.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

-- 
2.3.0

[PATCH 1/1] KVM: s390: virtio-ccw: don't overwrite config space values

[Christian Borntraeger]

From: Cornelia Huck <cornelia.huck@de.ibm.com>

Eric noticed problems with vhost-scsi and virtio-ccw: vhost-scsi
complained about overwriting values in the config space, which
was triggered by a broken implementation of virtio-ccw's config
get/set routines. It was probably sheer luck that we did not hit
this before.

When writing a value to the config space, the WRITE_CONF ccw will
always write from the beginning of the config space up to and
including the value to be set. If the config space up to the value
has not yet been retrieved from the device, however, we'll end up
overwriting values. Keep track of the known config space and update
if needed to avoid this.

Moreover, READ_CONF will only read the number of bytes it has been
instructed to retrieve, so we must not copy more than that to the
buffer, or we might overwrite trailing values.

Reported-by: Eric Farman <farman@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Eric Farman <farman@linux.vnet.ibm.com>
Tested-by: Eric Farman <farman@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: stable@vger.kernel.org
---
 drivers/s390/kvm/virtio_ccw.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
index 6f1fa17..f8d8fdb 100644
--- a/drivers/s390/kvm/virtio_ccw.c
+++ b/drivers/s390/kvm/virtio_ccw.c
@@ -65,6 +65,7 @@ struct virtio_ccw_device {
 	bool is_thinint;
 	bool going_away;
 	bool device_lost;
+	unsigned int config_ready;
 	void *airq_info;
 };
 
@@ -833,8 +834,11 @@ static void virtio_ccw_get_config(struct virtio_device *vdev,
 	if (ret)
 		goto out_free;
 
-	memcpy(vcdev->config, config_area, sizeof(vcdev->config));
-	memcpy(buf, &vcdev->config[offset], len);
+	memcpy(vcdev->config, config_area, offset + len);
+	if (buf)
+		memcpy(buf, &vcdev->config[offset], len);
+	if (vcdev->config_ready < offset + len)
+		vcdev->config_ready = offset + len;
 
 out_free:
 	kfree(config_area);
@@ -857,6 +861,9 @@ static void virtio_ccw_set_config(struct virtio_device *vdev,
 	if (!config_area)
 		goto out_free;
 
+	/* Make sure we don't overwrite fields. */
+	if (vcdev->config_ready < offset)
+		virtio_ccw_get_config(vdev, 0, NULL, offset);
 	memcpy(&vcdev->config[offset], buf, len);
 	/* Write the config area to the host. */
 	memcpy(config_area, vcdev->config, sizeof(vcdev->config));
-- 
2.3.0

Re: [PATCH 1/1] KVM: s390: virtio-ccw: don't overwrite config space values

[Paolo Bonzini]

On 29/06/2015 16:44, Christian Borntraeger wrote:
> From: Cornelia Huck <cornelia.huck@de.ibm.com>
> 
> Eric noticed problems with vhost-scsi and virtio-ccw: vhost-scsi
> complained about overwriting values in the config space, which
> was triggered by a broken implementation of virtio-ccw's config
> get/set routines. It was probably sheer luck that we did not hit
> this before.
> 
> When writing a value to the config space, the WRITE_CONF ccw will
> always write from the beginning of the config space up to and
> including the value to be set. If the config space up to the value
> has not yet been retrieved from the device, however, we'll end up
> overwriting values. Keep track of the known config space and update
> if needed to avoid this.
> 
> Moreover, READ_CONF will only read the number of bytes it has been
> instructed to retrieve, so we must not copy more than that to the
> buffer, or we might overwrite trailing values.
> 
> Reported-by: Eric Farman <farman@linux.vnet.ibm.com>
> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> Reviewed-by: Eric Farman <farman@linux.vnet.ibm.com>
> Tested-by: Eric Farman <farman@linux.vnet.ibm.com>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: stable@vger.kernel.org
> ---
>  drivers/s390/kvm/virtio_ccw.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
> index 6f1fa17..f8d8fdb 100644
> --- a/drivers/s390/kvm/virtio_ccw.c
> +++ b/drivers/s390/kvm/virtio_ccw.c
> @@ -65,6 +65,7 @@ struct virtio_ccw_device {
>  	bool is_thinint;
>  	bool going_away;
>  	bool device_lost;
> +	unsigned int config_ready;
>  	void *airq_info;
>  };
>  
> @@ -833,8 +834,11 @@ static void virtio_ccw_get_config(struct virtio_device *vdev,
>  	if (ret)
>  		goto out_free;
>  
> -	memcpy(vcdev->config, config_area, sizeof(vcdev->config));
> -	memcpy(buf, &vcdev->config[offset], len);
> +	memcpy(vcdev->config, config_area, offset + len);
> +	if (buf)
> +		memcpy(buf, &vcdev->config[offset], len);
> +	if (vcdev->config_ready < offset + len)
> +		vcdev->config_ready = offset + len;
>  
>  out_free:
>  	kfree(config_area);
> @@ -857,6 +861,9 @@ static void virtio_ccw_set_config(struct virtio_device *vdev,
>  	if (!config_area)
>  		goto out_free;
>  
> +	/* Make sure we don't overwrite fields. */
> +	if (vcdev->config_ready < offset)
> +		virtio_ccw_get_config(vdev, 0, NULL, offset);
>  	memcpy(&vcdev->config[offset], buf, len);
>  	/* Write the config area to the host. */
>  	memcpy(config_area, vcdev->config, sizeof(vcdev->config));
> 

Applied (but I think in general virtio-ccw patches should go through
mst---the exception is when matching changes to KVM are needed, and of
course the exception was almost always the rule during bringup).

Thanks,

Paolo

Re: [PATCH 0/1] KVM: s390: virtio-ccw: Fix config space values

[Michael S. Tsirkin]

On Mon, Jun 29, 2015 at 04:44:00PM +0200, Christian Borntraeger wrote:
> Paolo,
> 
> here is fix targetted for kvm/master (4.2) that fixes an issue with
> virtio config space on s390. It mostly manifests in vhost-scsi
> not working properly on s390. The problem itself might affect other
> things as well so cc stable/target 4.2.
> 
> @Michael FYI, sending this via Paolo as most virtio-ccw kernel
> things went this way.

OK but virtio patches should be Cc'd to the virtualization mailing
list. So I think we need a separate MAINTAINERS entry for
s390/virtio.

> Cornelia Huck (1):
>   KVM: s390: virtio-ccw: don't overwrite config space values
> 
>  drivers/s390/kvm/virtio_ccw.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> -- 
> 2.3.0

Re: [PATCH 0/1] KVM: s390: virtio-ccw: Fix config space values

[Paolo Bonzini]

On 01/07/2015 15:45, Michael S. Tsirkin wrote:
> > Paolo,
> > 
> > here is fix targetted for kvm/master (4.2) that fixes an issue with
> > virtio config space on s390. It mostly manifests in vhost-scsi
> > not working properly on s390. The problem itself might affect other
> > things as well so cc stable/target 4.2.
> > 
> > @Michael FYI, sending this via Paolo as most virtio-ccw kernel
> > things went this way.
>
> OK but virtio patches should be Cc'd to the virtualization mailing
> list. So I think we need a separate MAINTAINERS entry for
> s390/virtio.

See my other email---I think no special case is necessary.

Paolo

Re: [PATCH 0/1] KVM: s390: virtio-ccw: Fix config space values

[Michael S. Tsirkin]

On Wed, Jul 01, 2015 at 04:05:27PM +0200, Paolo Bonzini wrote:
> 
> 
> On 01/07/2015 15:45, Michael S. Tsirkin wrote:
> > > Paolo,
> > > 
> > > here is fix targetted for kvm/master (4.2) that fixes an issue with
> > > virtio config space on s390. It mostly manifests in vhost-scsi
> > > not working properly on s390. The problem itself might affect other
> > > things as well so cc stable/target 4.2.
> > > 
> > > @Michael FYI, sending this via Paolo as most virtio-ccw kernel
> > > things went this way.
> >
> > OK but virtio patches should be Cc'd to the virtualization mailing
> > list. So I think we need a separate MAINTAINERS entry for
> > s390/virtio.
> 
> See my other email---I think no special case is necessary.
> 
> Paolo

Hmm but MAINTAINERS doesn't tell people they should Cc virtio ML -
isn't that a problem?

Re: [PATCH 0/1] KVM: s390: virtio-ccw: Fix config space values

[Paolo Bonzini]

On 01/07/2015 16:18, Michael S. Tsirkin wrote:
> On Wed, Jul 01, 2015 at 04:05:27PM +0200, Paolo Bonzini wrote:
>>
>>
>> On 01/07/2015 15:45, Michael S. Tsirkin wrote:
>>>> Paolo,
>>>>
>>>> here is fix targetted for kvm/master (4.2) that fixes an issue with
>>>> virtio config space on s390. It mostly manifests in vhost-scsi
>>>> not working properly on s390. The problem itself might affect other
>>>> things as well so cc stable/target 4.2.
>>>>
>>>> @Michael FYI, sending this via Paolo as most virtio-ccw kernel
>>>> things went this way.
>>>
>>> OK but virtio patches should be Cc'd to the virtualization mailing
>>> list. So I think we need a separate MAINTAINERS entry for
>>> s390/virtio.
>>
>> See my other email---I think no special case is necessary.
>>
>> Paolo
> 
> Hmm but MAINTAINERS doesn't tell people they should Cc virtio ML -
> isn't that a problem?

Ah that's because ccw isn't under drivers/virtio.  Yes, that should be
fixed and the old pre-ccw drivers should also get a stanza in MAINTAINERS.

Paolo

[PATCH] MAINTAINERS: separate section for s390 virtio drivers

[Cornelia Huck]

The s390-specific virtio drivers have probably more to do with virtio
than with kvm today; let's move them out into a separate section to
reflect this and to be able to add relevant mailing lists.

CC: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
 MAINTAINERS | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 246d9d8..fca5c00 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5766,7 +5766,6 @@ S:	Supported
 F:	Documentation/s390/kvm.txt
 F:	arch/s390/include/asm/kvm*
 F:	arch/s390/kvm/
-F:	drivers/s390/kvm/
 
 KERNEL VIRTUAL MACHINE (KVM) FOR ARM
 M:	Christoffer Dall <christoffer.dall@linaro.org>
@@ -10671,6 +10670,15 @@ F:	drivers/block/virtio_blk.c
 F:	include/linux/virtio_*.h
 F:	include/uapi/linux/virtio_*.h
 
+VIRTIO DRIVERS FOR S390
+M:	Christian Borntraeger <borntraeger@de.ibm.com>
+M:	Cornelia Huck <cornelia.huck@de.ibm.com>
+L:	linux-s390@vger.kernel.org
+L:	virtualization@lists.linux-foundation.org
+L:	kvm@vger.kernel.org
+S:	Supported
+F:	drivers/s390/kvm/
+
 VIRTIO HOST (VHOST)
 M:	"Michael S. Tsirkin" <mst@redhat.com>
 L:	kvm@vger.kernel.org
-- 
2.3.8

Re: [PATCH] MAINTAINERS: separate section for s390 virtio drivers

[Paolo Bonzini]

On 01/07/2015 17:15, Cornelia Huck wrote:
> The s390-specific virtio drivers have probably more to do with virtio
> than with kvm today; let's move them out into a separate section to
> reflect this and to be able to add relevant mailing lists.
> 
> CC: Christian Borntraeger <borntraeger@de.ibm.com>
> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> ---
>  MAINTAINERS | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 246d9d8..fca5c00 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -5766,7 +5766,6 @@ S:	Supported
>  F:	Documentation/s390/kvm.txt
>  F:	arch/s390/include/asm/kvm*
>  F:	arch/s390/kvm/
> -F:	drivers/s390/kvm/
>  
>  KERNEL VIRTUAL MACHINE (KVM) FOR ARM
>  M:	Christoffer Dall <christoffer.dall@linaro.org>
> @@ -10671,6 +10670,15 @@ F:	drivers/block/virtio_blk.c
>  F:	include/linux/virtio_*.h
>  F:	include/uapi/linux/virtio_*.h
>  
> +VIRTIO DRIVERS FOR S390
> +M:	Christian Borntraeger <borntraeger@de.ibm.com>
> +M:	Cornelia Huck <cornelia.huck@de.ibm.com>
> +L:	linux-s390@vger.kernel.org
> +L:	virtualization@lists.linux-foundation.org
> +L:	kvm@vger.kernel.org

Keeping the KVM mailing list is probably a good idea.

> +S:	Supported
> +F:	drivers/s390/kvm/

Since we are at it, do we want to rename the directory to
drivers/s390/virtio?  Anyway:

Acked-by: Paolo Bonzini <pbonzini@redhat.com>

Paolo

>  VIRTIO HOST (VHOST)
>  M:	"Michael S. Tsirkin" <mst@redhat.com>
>  L:	kvm@vger.kernel.org
> 

Re: [PATCH] MAINTAINERS: separate section for s390 virtio drivers

[Christian Borntraeger]

Am 01.07.2015 um 17:15 schrieb Cornelia Huck:
> The s390-specific virtio drivers have probably more to do with virtio
> than with kvm today; let's move them out into a separate section to
> reflect this and to be able to add relevant mailing lists.
> 
> CC: Christian Borntraeger <borntraeger@de.ibm.com>
> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>

> ---
>  MAINTAINERS | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 246d9d8..fca5c00 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -5766,7 +5766,6 @@ S:	Supported
>  F:	Documentation/s390/kvm.txt
>  F:	arch/s390/include/asm/kvm*
>  F:	arch/s390/kvm/
> -F:	drivers/s390/kvm/
> 
>  KERNEL VIRTUAL MACHINE (KVM) FOR ARM
>  M:	Christoffer Dall <christoffer.dall@linaro.org>
> @@ -10671,6 +10670,15 @@ F:	drivers/block/virtio_blk.c
>  F:	include/linux/virtio_*.h
>  F:	include/uapi/linux/virtio_*.h
> 
> +VIRTIO DRIVERS FOR S390
> +M:	Christian Borntraeger <borntraeger@de.ibm.com>
> +M:	Cornelia Huck <cornelia.huck@de.ibm.com>
> +L:	linux-s390@vger.kernel.org
> +L:	virtualization@lists.linux-foundation.org
> +L:	kvm@vger.kernel.org
> +S:	Supported
> +F:	drivers/s390/kvm/
> +
>  VIRTIO HOST (VHOST)
>  M:	"Michael S. Tsirkin" <mst@redhat.com>
>  L:	kvm@vger.kernel.org
> 

[PATCH] virtio/s390: rename drivers/s390/kvm -> drivers/s390/virtio

[Cornelia Huck]

This more accurately reflects what these drivers actually do.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
 MAINTAINERS                               | 2 +-
 drivers/s390/Makefile                     | 2 +-
 drivers/s390/{kvm => virtio}/Makefile     | 0
 drivers/s390/{kvm => virtio}/kvm_virtio.c | 0
 drivers/s390/{kvm => virtio}/virtio_ccw.c | 0
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename drivers/s390/{kvm => virtio}/Makefile (100%)
 rename drivers/s390/{kvm => virtio}/kvm_virtio.c (100%)
 rename drivers/s390/{kvm => virtio}/virtio_ccw.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 280a568..fbef7d0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10577,7 +10577,7 @@ L:	linux-s390@vger.kernel.org
 L:	virtualization@lists.linux-foundation.org
 L:	kvm@vger.kernel.org
 S:	Supported
-F:	drivers/s390/kvm/
+F:	drivers/s390/virtio/
 
 VIRTIO HOST (VHOST)
 M:	"Michael S. Tsirkin" <mst@redhat.com>
diff --git a/drivers/s390/Makefile b/drivers/s390/Makefile
index 95bccfd..e5225ad 100644
--- a/drivers/s390/Makefile
+++ b/drivers/s390/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the S/390 specific device drivers
 #
 
-obj-y += cio/ block/ char/ crypto/ net/ scsi/ kvm/
+obj-y += cio/ block/ char/ crypto/ net/ scsi/ virtio/
 
 drivers-y += drivers/s390/built-in.o
 
diff --git a/drivers/s390/kvm/Makefile b/drivers/s390/virtio/Makefile
similarity index 100%
rename from drivers/s390/kvm/Makefile
rename to drivers/s390/virtio/Makefile
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/virtio/kvm_virtio.c
similarity index 100%
rename from drivers/s390/kvm/kvm_virtio.c
rename to drivers/s390/virtio/kvm_virtio.c
diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
similarity index 100%
rename from drivers/s390/kvm/virtio_ccw.c
rename to drivers/s390/virtio/virtio_ccw.c
-- 
2.3.8

Re: [PATCH] MAINTAINERS: separate section for s390 virtio drivers

[Cornelia Huck]

On Wed, 1 Jul 2015 17:17:41 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:

> 
> 
> On 01/07/2015 17:15, Cornelia Huck wrote:
> > The s390-specific virtio drivers have probably more to do with virtio
> > than with kvm today; let's move them out into a separate section to
> > reflect this and to be able to add relevant mailing lists.
> > 
> > CC: Christian Borntraeger <borntraeger@de.ibm.com>
> > Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> > ---
> >  MAINTAINERS | 10 +++++++++-
> >  1 file changed, 9 insertions(+), 1 deletion(-)
> > 
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 246d9d8..fca5c00 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -5766,7 +5766,6 @@ S:	Supported
> >  F:	Documentation/s390/kvm.txt
> >  F:	arch/s390/include/asm/kvm*
> >  F:	arch/s390/kvm/
> > -F:	drivers/s390/kvm/
> >  
> >  KERNEL VIRTUAL MACHINE (KVM) FOR ARM
> >  M:	Christoffer Dall <christoffer.dall@linaro.org>
> > @@ -10671,6 +10670,15 @@ F:	drivers/block/virtio_blk.c
> >  F:	include/linux/virtio_*.h
> >  F:	include/uapi/linux/virtio_*.h
> >  
> > +VIRTIO DRIVERS FOR S390
> > +M:	Christian Borntraeger <borntraeger@de.ibm.com>
> > +M:	Cornelia Huck <cornelia.huck@de.ibm.com>
> > +L:	linux-s390@vger.kernel.org
> > +L:	virtualization@lists.linux-foundation.org
> > +L:	kvm@vger.kernel.org
> 
> Keeping the KVM mailing list is probably a good idea.
> 
> > +S:	Supported
> > +F:	drivers/s390/kvm/
> 
> Since we are at it, do we want to rename the directory to
> drivers/s390/virtio?  

Makes sense, just sent a patch.

> Anyway:
> 
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> 
> Paolo
> 
> >  VIRTIO HOST (VHOST)
> >  M:	"Michael S. Tsirkin" <mst@redhat.com>
> >  L:	kvm@vger.kernel.org

OK, how does this go upstream (I guess through the virtio tree)?
Michael, will you pick the patches or should I prepare a branch?

Re: [PATCH] MAINTAINERS: separate section for s390 virtio drivers

[Michael S. Tsirkin]

On Tue, Jul 07, 2015 at 11:44:44AM +0200, Cornelia Huck wrote:
> On Wed, 1 Jul 2015 17:17:41 +0200
> Paolo Bonzini <pbonzini@redhat.com> wrote:
> 
> > 
> > 
> > On 01/07/2015 17:15, Cornelia Huck wrote:
> > > The s390-specific virtio drivers have probably more to do with virtio
> > > than with kvm today; let's move them out into a separate section to
> > > reflect this and to be able to add relevant mailing lists.
> > > 
> > > CC: Christian Borntraeger <borntraeger@de.ibm.com>
> > > Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> > > ---
> > >  MAINTAINERS | 10 +++++++++-
> > >  1 file changed, 9 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/MAINTAINERS b/MAINTAINERS
> > > index 246d9d8..fca5c00 100644
> > > --- a/MAINTAINERS
> > > +++ b/MAINTAINERS
> > > @@ -5766,7 +5766,6 @@ S:	Supported
> > >  F:	Documentation/s390/kvm.txt
> > >  F:	arch/s390/include/asm/kvm*
> > >  F:	arch/s390/kvm/
> > > -F:	drivers/s390/kvm/
> > >  
> > >  KERNEL VIRTUAL MACHINE (KVM) FOR ARM
> > >  M:	Christoffer Dall <christoffer.dall@linaro.org>
> > > @@ -10671,6 +10670,15 @@ F:	drivers/block/virtio_blk.c
> > >  F:	include/linux/virtio_*.h
> > >  F:	include/uapi/linux/virtio_*.h
> > >  
> > > +VIRTIO DRIVERS FOR S390
> > > +M:	Christian Borntraeger <borntraeger@de.ibm.com>
> > > +M:	Cornelia Huck <cornelia.huck@de.ibm.com>
> > > +L:	linux-s390@vger.kernel.org
> > > +L:	virtualization@lists.linux-foundation.org
> > > +L:	kvm@vger.kernel.org
> > 
> > Keeping the KVM mailing list is probably a good idea.
> > 
> > > +S:	Supported
> > > +F:	drivers/s390/kvm/
> > 
> > Since we are at it, do we want to rename the directory to
> > drivers/s390/virtio?  
> 
> Makes sense, just sent a patch.
> 
> > Anyway:
> > 
> > Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> > 
> > Paolo
> > 
> > >  VIRTIO HOST (VHOST)
> > >  M:	"Michael S. Tsirkin" <mst@redhat.com>
> > >  L:	kvm@vger.kernel.org
> 
> OK, how does this go upstream (I guess through the virtio tree)?
> Michael, will you pick the patches or should I prepare a branch?

I'll pick these up.

-- 
MST