From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Rusty Russell <rusty@rustcorp.com.au>,
Cornelia Huck <cornelia.huck@de.ibm.com>,
David Hildenbrand <dahi@linux.vnet.ibm.com>,
virtualization@lists.linux-foundation.org,
Christian Borntraeger <borntraeger@de.ibm.com>,
linux390@de.ibm.com, Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
linux-s390@vger.kernel.org
Subject: [PATCH RFC 3/3] virtio_ccw: rev 1 devices set VIRTIO_F_VERSION_1
Date: Thu, 4 Dec 2014 19:26:50 +0200 [thread overview]
Message-ID: <1417713984-23771-3-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1417713984-23771-1-git-send-email-mst@redhat.com>
What does it mean if rev 1 device does not set
VIRTIO_F_VERSION_1? E.g. is it native endian?
Let's not even try to drive such devices:
skip attempts to finalize features or set status.
virtio core will detect this and bail out.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/s390/kvm/virtio_ccw.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
index 088bdf1..0ceeb25 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;
+ bool features_invalid;
void *airq_info;
};
@@ -746,6 +747,12 @@ static u64 virtio_ccw_get_features(struct virtio_device *vdev)
if (ret == 0)
rc |= (u64)le32_to_cpu(features->features) << 32;
+ /* Devices MUST set VIRTIO_F_VERSION_1 */
+ if (!(rc & BIT_ULL(VIRTIO_F_VERSION_1))) {
+ vcdev->features_invalid = true;
+ rc |= BIT_ULL(VIRTIO_F_VERSION_1);
+ }
+
out_free:
kfree(features);
kfree(ccw);
@@ -758,6 +765,10 @@ static void virtio_ccw_finalize_features(struct virtio_device *vdev)
struct virtio_feature_desc *features;
struct ccw1 *ccw;
+ /* Invalid features? Let's not try to drive this device. */
+ if (vcdev->features_invalid)
+ return;
+
ccw = kzalloc(sizeof(*ccw), GFP_DMA | GFP_KERNEL);
if (!ccw)
return;
@@ -869,6 +880,10 @@ static void virtio_ccw_set_status(struct virtio_device *vdev, u8 status)
struct ccw1 *ccw;
int ret;
+ /* Invalid features? Let's not try to drive this device. */
+ if (vcdev->features_invalid)
+ return;
+
ccw = kzalloc(sizeof(*ccw), GFP_DMA | GFP_KERNEL);
if (!ccw)
return;
--
MST
next prev parent reply other threads:[~2014-12-04 17:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-04 17:26 [PATCH RFC 1/3] virtio: add API to detect legacy devices Michael S. Tsirkin
2014-12-04 17:26 ` [PATCH RFC 2/3] virtio_ccw: legacy: don't negotiate rev 1/features Michael S. Tsirkin
2014-12-04 17:56 ` Cornelia Huck
2014-12-04 18:09 ` Michael S. Tsirkin
2014-12-04 17:26 ` Michael S. Tsirkin [this message]
2014-12-04 17:59 ` [PATCH RFC 3/3] virtio_ccw: rev 1 devices set VIRTIO_F_VERSION_1 Cornelia Huck
2014-12-04 18:09 ` Michael S. Tsirkin
2014-12-04 18:15 ` Michael S. Tsirkin
2014-12-04 17:54 ` [PATCH RFC 1/3] virtio: add API to detect legacy devices Cornelia Huck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1417713984-23771-3-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cornelia.huck@de.ibm.com \
--cc=dahi@linux.vnet.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux390@de.ibm.com \
--cc=rusty@rustcorp.com.au \
--cc=schwidefsky@de.ibm.com \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome