From nobody Wed Nov 12 16:42:01 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571467351; cv=none; d=zoho.com; s=zohoarc; b=G/bCoIbCZ1ida/0zYzu+DgfzJUMxVoSFov3GMYYhijrLOlS0VmrUJRPKVS5O3IR08HIF/d0sJKHocafm8N+McB0z/tZUYkjeI3OZaPXSceLamC25F7p6O2qdWb9DyQQ0SmLr1QuiiGHjqlC5uEGsx47yAZbsXA83IZHZ4Lx4Hyw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571467351; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bfmy9Kx4fngEVXmc8e9EN3YvNxlI31b+WmAg1EY6lbI=; b=mY3NLAdRCHuckXOLddgtEq+/GXpZx+20jl7dhfDtfL5mZOPwufvz8xhBEmnTLE12/xR+KL+7MBWQhBPvMMEwv42qBodLN8OQx94QVn7gNQGE21EYHfmFowQNTKCox7lI7wgiglT4wZbu0sJvWN9xOdOXWNj8fuy3wtrYKeybaFc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571467351933517.1917402701665; Fri, 18 Oct 2019 23:42:31 -0700 (PDT) Received: from localhost ([::1]:49924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLiRa-000709-JY for importer@patchew.org; Sat, 19 Oct 2019 02:42:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59603) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLiNm-0002CZ-8C for qemu-devel@nongnu.org; Sat, 19 Oct 2019 02:38:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLiNl-00039j-2N for qemu-devel@nongnu.org; Sat, 19 Oct 2019 02:38:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46492) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iLiNi-00037V-0X; Sat, 19 Oct 2019 02:38:30 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 46BE83082A8B; Sat, 19 Oct 2019 06:38:29 +0000 (UTC) Received: from localhost (ovpn-116-50.ams2.redhat.com [10.36.116.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id CBEDC600C8; Sat, 19 Oct 2019 06:38:21 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v3 01/16] tests/virtio-blk-test: read config space after feature negotiation Date: Sat, 19 Oct 2019 07:37:55 +0100 Message-Id: <20191019063810.6944-2-stefanha@redhat.com> In-Reply-To: <20191019063810.6944-1-stefanha@redhat.com> References: <20191019063810.6944-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Sat, 19 Oct 2019 06:38:29 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Laurent Vivier , Thomas Huth , qemu-block@nongnu.org, slp@redhat.com, "Michael S. Tsirkin" , Stefan Hajnoczi , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The VIRTIO Configuration Space cannot be accessed before device feature bits have been read because a driver doesn't know the endianness until it has checked VIRTIO_F_VERSION_1. Fix this problem in preparation for VIRTIO 1.0 support. Signed-off-by: Stefan Hajnoczi Reviewed-by: Thomas Huth --- tests/virtio-blk-test.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c index ed13167392..f6674fb233 100644 --- a/tests/virtio-blk-test.c +++ b/tests/virtio-blk-test.c @@ -125,10 +125,6 @@ static void test_basic(QVirtioDevice *dev, QGuestAlloc= ator *alloc, char *data; QTestState *qts =3D global_qtest; =20 - capacity =3D qvirtio_config_readq(dev, 0); - - g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); - features =3D qvirtio_get_features(dev); features =3D features & ~(QVIRTIO_F_BAD_FEATURE | (1u << VIRTIO_RING_F_INDIRECT_DESC) | @@ -136,6 +132,9 @@ static void test_basic(QVirtioDevice *dev, QGuestAlloca= tor *alloc, (1u << VIRTIO_BLK_F_SCSI)); qvirtio_set_features(dev, features); =20 + capacity =3D qvirtio_config_readq(dev, 0); + g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); + qvirtio_set_driver_ok(dev); =20 /* Write and read with 3 descriptor layout */ @@ -359,9 +358,6 @@ static void indirect(void *obj, void *u_data, QGuestAll= ocator *t_alloc) char *data; QTestState *qts =3D global_qtest; =20 - capacity =3D qvirtio_config_readq(dev, 0); - g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); - features =3D qvirtio_get_features(dev); g_assert_cmphex(features & (1u << VIRTIO_RING_F_INDIRECT_DESC), !=3D, = 0); features =3D features & ~(QVIRTIO_F_BAD_FEATURE | @@ -369,6 +365,9 @@ static void indirect(void *obj, void *u_data, QGuestAll= ocator *t_alloc) (1u << VIRTIO_BLK_F_SCSI)); qvirtio_set_features(dev, features); =20 + capacity =3D qvirtio_config_readq(dev, 0); + g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); + vq =3D qvirtqueue_setup(dev, t_alloc, 0); qvirtio_set_driver_ok(dev); =20 @@ -434,8 +433,16 @@ static void config(void *obj, void *data, QGuestAlloca= tor *t_alloc) QVirtioBlk *blk_if =3D obj; QVirtioDevice *dev =3D blk_if->vdev; int n_size =3D TEST_IMAGE_SIZE / 2; + uint64_t features; uint64_t capacity; =20 + features =3D qvirtio_get_features(dev); + features =3D features & ~(QVIRTIO_F_BAD_FEATURE | + (1u << VIRTIO_RING_F_INDIRECT_DESC) | + (1u << VIRTIO_RING_F_EVENT_IDX) | + (1u << VIRTIO_BLK_F_SCSI)); + qvirtio_set_features(dev, features); + capacity =3D qvirtio_config_readq(dev, 0); g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); =20 @@ -475,9 +482,6 @@ static void msix(void *obj, void *u_data, QGuestAllocat= or *t_alloc) qpci_msix_enable(pdev->pdev); qvirtio_pci_set_msix_configuration_vector(pdev, t_alloc, 0); =20 - capacity =3D qvirtio_config_readq(dev, 0); - g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); - features =3D qvirtio_get_features(dev); features =3D features & ~(QVIRTIO_F_BAD_FEATURE | (1u << VIRTIO_RING_F_INDIRECT_DESC) | @@ -485,6 +489,9 @@ static void msix(void *obj, void *u_data, QGuestAllocat= or *t_alloc) (1u << VIRTIO_BLK_F_SCSI)); qvirtio_set_features(dev, features); =20 + capacity =3D qvirtio_config_readq(dev, 0); + g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); + vq =3D qvirtqueue_setup(dev, t_alloc, 0); qvirtqueue_pci_msix_setup(pdev, (QVirtQueuePCI *)vq, t_alloc, 1); =20 @@ -584,9 +591,6 @@ static void idx(void *obj, void *u_data, QGuestAllocato= r *t_alloc) qpci_msix_enable(pdev->pdev); qvirtio_pci_set_msix_configuration_vector(pdev, t_alloc, 0); =20 - capacity =3D qvirtio_config_readq(dev, 0); - g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); - features =3D qvirtio_get_features(dev); features =3D features & ~(QVIRTIO_F_BAD_FEATURE | (1u << VIRTIO_RING_F_INDIRECT_DESC) | @@ -594,6 +598,9 @@ static void idx(void *obj, void *u_data, QGuestAllocato= r *t_alloc) (1u << VIRTIO_BLK_F_SCSI)); qvirtio_set_features(dev, features); =20 + capacity =3D qvirtio_config_readq(dev, 0); + g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); + vq =3D qvirtqueue_setup(dev, t_alloc, 0); qvirtqueue_pci_msix_setup(pdev, (QVirtQueuePCI *)vq, t_alloc, 1); =20 --=20 2.21.0