From nobody Sat Nov 15 22:22:44 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1746019775; cv=none; d=zohomail.com; s=zohoarc; b=f7U6OesgkJqzG85+obiLB1jswqouRpX7LLQLvsMuKZDJMnVEAvRg1/cZFGMJOI1j8RHFy0DSTrYSm00rCXEHaiiPBCA5Y2xhtsjcDfb1P7S1ILxXGAsgg4Ko4xKGOZZ0RSF0+nW46D/BE1d2o45/A63oDwm6oeO5NqQmISMvuuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746019775; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=sZUqjv6NHQDFhbJvDlQXjpxbq5MUlzwY9kDRkDPNF50=; b=Eg1usICY/ZHIcPcd02qlKGjwr7vd2PeS4UwJ8DEd2jdrW0EdA7s+WV4Q0nRfnnYbCJzuc8mJKr6aQPtGLPmkOUUhzc3kIJFUmqBNGZVfrKPUJ2Aw/AqviP0HmxjM8MUCmVQ3EFXVDowdr7KjNxoOejbrt3kjAxe6RYWD5a/5zJA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746019775394295.2485320768893; Wed, 30 Apr 2025 06:29:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uA7UL-0007r1-Lh; Wed, 30 Apr 2025 09:28:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uA7UI-0007p8-Hn for qemu-devel@nongnu.org; Wed, 30 Apr 2025 09:28:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uA7UE-00081C-0y for qemu-devel@nongnu.org; Wed, 30 Apr 2025 09:28:34 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-594-upRXOxQNMKao8ZLAOJlxpg-1; Wed, 30 Apr 2025 09:28:24 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7581919560AA; Wed, 30 Apr 2025 13:28:21 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.225.195]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C56DD19560A3; Wed, 30 Apr 2025 13:28:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746019707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=sZUqjv6NHQDFhbJvDlQXjpxbq5MUlzwY9kDRkDPNF50=; b=RbIUMTbituQaD7g5UTxECFo+2SJYfhjZk5klaBZ41T7thqes8hudoXrXA8D10Zf92HNlxd O0BeAihSIGiV8TlUWDivXX4fuEak4ScIWnebGGfU8bC6ICxikhSBtKNUxI6oCtoS8oKbHj WGIWWJI2PzRnriI8G6rTcVKsgbabhB4= X-MC-Unique: upRXOxQNMKao8ZLAOJlxpg-1 X-Mimecast-MFC-AGG-ID: upRXOxQNMKao8ZLAOJlxpg_1746019701 From: Thomas Huth To: Fabiano Rosas , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Cc: Laurent Vivier , Paolo Bonzini , Pierrick Bouvier Subject: [PATCH v2] tests/qtest/libqos: Avoid double swapping when using modern virtio Date: Wed, 30 Apr 2025 15:28:17 +0200 Message-ID: <20250430132817.610903-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.483, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1746019780011019100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The logic in the qvirtio_read/write function is rather a headache, involving byte-swapping when the target is big endian, just to maybe involve another byte-swapping in the qtest_read/write function immediately afterwards (on the QEMU side). Let's do it in a more obvious way here: For virtio 1.0, we know that the values have to be little endian, so let's read/write the bytes in that well known order here. Signed-off-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Alex Benn=C3=A9e --- This also decreases our usage of qtest_big_endian() which might (or might not) get helpful for the universal binary one day... v2: Use leXX_to_cpu() / cpu_to_leXX() instead of doing it manually tests/qtest/libqos/virtio.c | 44 ++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/tests/qtest/libqos/virtio.c b/tests/qtest/libqos/virtio.c index 2e7979652fd..5a709d0bc59 100644 --- a/tests/qtest/libqos/virtio.c +++ b/tests/qtest/libqos/virtio.c @@ -25,49 +25,63 @@ */ static uint16_t qvirtio_readw(QVirtioDevice *d, QTestState *qts, uint64_t = addr) { - uint16_t val =3D qtest_readw(qts, addr); + uint16_t val; =20 - if (d->features & (1ull << VIRTIO_F_VERSION_1) && qtest_big_endian(qts= )) { - val =3D bswap16(val); + if (d->features & (1ull << VIRTIO_F_VERSION_1)) { + qtest_memread(qts, addr, &val, sizeof(val)); + val =3D le16_to_cpu(val); + } else { + val =3D qtest_readw(qts, addr); } + return val; } =20 static uint32_t qvirtio_readl(QVirtioDevice *d, QTestState *qts, uint64_t = addr) { - uint32_t val =3D qtest_readl(qts, addr); + uint32_t val; =20 - if (d->features & (1ull << VIRTIO_F_VERSION_1) && qtest_big_endian(qts= )) { - val =3D bswap32(val); + if (d->features & (1ull << VIRTIO_F_VERSION_1)) { + qtest_memread(qts, addr, &val, sizeof(val)); + val =3D le32_to_cpu(val); + } else { + val =3D qtest_readl(qts, addr); } + return val; } =20 static void qvirtio_writew(QVirtioDevice *d, QTestState *qts, uint64_t addr, uint16_t val) { - if (d->features & (1ull << VIRTIO_F_VERSION_1) && qtest_big_endian(qts= )) { - val =3D bswap16(val); + if (d->features & (1ull << VIRTIO_F_VERSION_1)) { + val =3D cpu_to_le16(val); + qtest_memwrite(qts, addr, &val, sizeof(val)); + } else { + qtest_writew(qts, addr, val); } - qtest_writew(qts, addr, val); } =20 static void qvirtio_writel(QVirtioDevice *d, QTestState *qts, uint64_t addr, uint32_t val) { - if (d->features & (1ull << VIRTIO_F_VERSION_1) && qtest_big_endian(qts= )) { - val =3D bswap32(val); + if (d->features & (1ull << VIRTIO_F_VERSION_1)) { + val =3D cpu_to_le32(val); + qtest_memwrite(qts, addr, &val, sizeof(val)); + } else { + qtest_writel(qts, addr, val); } - qtest_writel(qts, addr, val); } =20 static void qvirtio_writeq(QVirtioDevice *d, QTestState *qts, uint64_t addr, uint64_t val) { - if (d->features & (1ull << VIRTIO_F_VERSION_1) && qtest_big_endian(qts= )) { - val =3D bswap64(val); + if (d->features & (1ull << VIRTIO_F_VERSION_1)) { + val =3D cpu_to_le64(val); + qtest_memwrite(qts, addr, &val, sizeof(val)); + } else { + qtest_writeq(qts, addr, val); } - qtest_writeq(qts, addr, val); } =20 uint8_t qvirtio_config_readb(QVirtioDevice *d, uint64_t addr) --=20 2.49.0