From nobody Tue May 13 20:51:52 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1675225673; cv=none; d=zohomail.com; s=zohoarc; b=VNDb35ze/f1SuWwuCZsFOESViikzHFtYkulHIs3+wuFf6ocb0EUEL2MXuCkD8Fx9tUruo5BwTG1qqP6wjhLwOxkPWtpTMqxNhtyOdATDaGbqzpdnCqzoVpNGKIHcU/B+e6bN401gKt/NuuDixgXUAJE11SDtpSLb0KEqXpdx4tQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675225673; 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; bh=/nys2t0G7RD2ftML3eD4g9pOiP5E57MBuxl39+WQCyc=; b=b1+cE6xYMr6pbvLmmithdB4A5BGwpaZENl5mZ7bMzRZ1OsNjVlv+9VIb1IrqPkMy4dCjBZMkfMi7izPpvTuxafy9FdVSHMmg54AQz3dorqX0o6DLcTCmSL8Hd1BrWauFAQkSEKtlQRcbJZHssllUhNW+YcgdKgnjutBEYKF+oZA= 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+importer2=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675225673973282.3882798502741; Tue, 31 Jan 2023 20:27:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pN4hz-0003jj-9T; Tue, 31 Jan 2023 23:26:55 -0500 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 1pN4hx-0003i5-5c for qemu-devel@nongnu.org; Tue, 31 Jan 2023 23:26:53 -0500 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pN4hv-0003M4-HU for qemu-devel@nongnu.org; Tue, 31 Jan 2023 23:26:52 -0500 Received: by mail-pf1-x42e.google.com with SMTP id 144so11717429pfv.11 for ; Tue, 31 Jan 2023 20:26:51 -0800 (PST) Received: from alarm.flets-east.jp ([2400:4050:a840:1e00:4457:c267:5e09:481b]) by smtp.gmail.com with ESMTPSA id c62-20020a624e41000000b0058bb0fb6295sm9235316pfb.26.2023.01.31.20.26.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 20:26:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/nys2t0G7RD2ftML3eD4g9pOiP5E57MBuxl39+WQCyc=; b=w6gIHaIN+qRF7lX7CyGDkM0EBJHNKlp9dq/u76xK0KEmt+cvBDZ9aGGrj0JFc2b4/9 G56LIu00Met75POKMwC1h6SO+C/x3937iueKoQUu4kMn1+/7DSxxHlt2L3h8xO4PfSca yUXszggMOFo94aSQLO7qm6UfjtnbTfOsfQDPen5Dd2Adfqum9qp1vRaGBmNKBkPn7QwL 7xASJPDZJL34bs1in37kdBcKlgadqIgRi/w8Ru3NGSD37csAQmwGxXejoz7yso+M/N2F L9QwOjqNfH3IdQpvqrnkkmt4is7XpILbpekTjsygqAlcPqPWVyq89/jyKklffzKqzxNs Juhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/nys2t0G7RD2ftML3eD4g9pOiP5E57MBuxl39+WQCyc=; b=rk2OMK29g2N40l/T016DX2p3C564cm76KlLR1CMMlbyhzHcIUNCT+cCrAOrtlbFLYN 3njvB8JmlqdXKYOcaviQWLnXy7D0wb0yEMXHFo5XX8DuDLIBv4qEDNoQrIYNThMsgm2B qO2TUdE6cPUcrNJiTNi0X58Qh90A/LJfGiE8MTcrrshaSxZEDy43AKnBXEm7Nw/xPT+A DRFJuY4TlNE4+epZjf9EFTr4m3MorK4Ps8bu9ciEczJi30bFADasQFYfiDrhJN09hcTe YXv6XVZZVto3bG3gsZ+CGmDVLYPuyB7s8+hce05KSDtlKZndTSoZsvuW2Sx9OcD7jiPz Y9Xw== X-Gm-Message-State: AO0yUKUQOLIU0ccwg+o8dFBPE0V9vdRkHF+V7rO0Na4lsRIbuB1WFuO+ yEsndXB7cNW8pORkHX7HFrODEA== X-Google-Smtp-Source: AK7set+PM4qzqrn4BVUpeo4F9ynJkNvx+p4myrH5SulSxaga0lUoCFzG9W3ljdH9zhVrthN4ejryOA== X-Received: by 2002:aa7:8c48:0:b0:578:ac9f:79a9 with SMTP id e8-20020aa78c48000000b00578ac9f79a9mr1102419pfd.15.1675225610335; Tue, 31 Jan 2023 20:26:50 -0800 (PST) From: Akihiko Odaki To: Cc: Jason Wang , Dmitry Fleytman , "Michael S . Tsirkin" , Marcel Apfelbaum , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Cleber Rosa , Laurent Vivier , Paolo Bonzini , Alexander Bulekov , Bandan Das , Stefan Hajnoczi , Darren Kenny , Qiuhao Li , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, devel@daynix.com, Yan Vugenfirer , Yuri Benditovich , Sriram Yagnaraman , Gal Hammer , Akihiko Odaki Subject: [PATCH v7 5/9] tests/qtest/e1000e-test: Fabricate ethernet header Date: Wed, 1 Feb 2023 13:26:11 +0900 Message-Id: <20230201042615.34706-6-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230201042615.34706-1-akihiko.odaki@daynix.com> References: <20230201042615.34706-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::42e; envelope-from=akihiko.odaki@daynix.com; helo=mail-pf1-x42e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=unavailable 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20210112.gappssmtp.com) X-ZM-MESSAGEID: 1675225675983100003 Content-Type: text/plain; charset="utf-8" e1000e understands ethernet header so fabricate something convincing. Signed-off-by: Akihiko Odaki Reviewed-by: Thomas Huth --- tests/qtest/e1000e-test.c | 25 +++++++++++++++---------- tests/qtest/libqos/e1000e.h | 2 ++ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/tests/qtest/e1000e-test.c b/tests/qtest/e1000e-test.c index b63a4d3c91..de9738fdb7 100644 --- a/tests/qtest/e1000e-test.c +++ b/tests/qtest/e1000e-test.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "libqtest-single.h" #include "libqos/pci-pc.h" +#include "net/eth.h" #include "qemu/sockets.h" #include "qemu/iov.h" #include "qemu/module.h" @@ -35,9 +36,13 @@ #include "libqos/e1000e.h" #include "hw/net/e1000_regs.h" =20 +static const struct eth_header packet =3D { + .h_dest =3D E1000E_ADDRESS, + .h_source =3D E1000E_ADDRESS, +}; + static void e1000e_send_verify(QE1000E *d, int *test_sockets, QGuestAlloca= tor *alloc) { - static const char test[] =3D "TEST"; struct e1000_tx_desc descr; char buffer[64]; int ret; @@ -45,7 +50,7 @@ static void e1000e_send_verify(QE1000E *d, int *test_sock= ets, QGuestAllocator *a =20 /* Prepare test data buffer */ uint64_t data =3D guest_alloc(alloc, sizeof(buffer)); - memwrite(data, test, sizeof(test)); + memwrite(data, &packet, sizeof(packet)); =20 /* Prepare TX descriptor */ memset(&descr, 0, sizeof(descr)); @@ -71,7 +76,7 @@ static void e1000e_send_verify(QE1000E *d, int *test_sock= ets, QGuestAllocator *a g_assert_cmpint(ret, =3D=3D , sizeof(recv_len)); ret =3D recv(test_sockets[0], buffer, sizeof(buffer), 0); g_assert_cmpint(ret, =3D=3D, sizeof(buffer)); - g_assert_cmpstr(buffer, =3D=3D , test); + g_assert_false(memcmp(buffer, &packet, sizeof(packet))); =20 /* Free test data buffer */ guest_free(alloc, data); @@ -81,15 +86,15 @@ static void e1000e_receive_verify(QE1000E *d, int *test= _sockets, QGuestAllocator { union e1000_rx_desc_extended descr; =20 - char test[] =3D "TEST"; - int len =3D htonl(sizeof(test)); + struct eth_header test_iov =3D packet; + int len =3D htonl(sizeof(packet)); struct iovec iov[] =3D { { .iov_base =3D &len, .iov_len =3D sizeof(len), },{ - .iov_base =3D test, - .iov_len =3D sizeof(test), + .iov_base =3D &test_iov, + .iov_len =3D sizeof(packet), }, }; =20 @@ -97,8 +102,8 @@ static void e1000e_receive_verify(QE1000E *d, int *test_= sockets, QGuestAllocator int ret; =20 /* Send a dummy packet to device's socket*/ - ret =3D iov_send(test_sockets[0], iov, 2, 0, sizeof(len) + sizeof(test= )); - g_assert_cmpint(ret, =3D=3D , sizeof(test) + sizeof(len)); + ret =3D iov_send(test_sockets[0], iov, 2, 0, sizeof(len) + sizeof(pack= et)); + g_assert_cmpint(ret, =3D=3D , sizeof(packet) + sizeof(len)); =20 /* Prepare test data buffer */ uint64_t data =3D guest_alloc(alloc, sizeof(buffer)); @@ -119,7 +124,7 @@ static void e1000e_receive_verify(QE1000E *d, int *test= _sockets, QGuestAllocator =20 /* Check data sent to the backend */ memread(data, buffer, sizeof(buffer)); - g_assert_cmpstr(buffer, =3D=3D , test); + g_assert_false(memcmp(buffer, &packet, sizeof(packet))); =20 /* Free test data buffer */ guest_free(alloc, data); diff --git a/tests/qtest/libqos/e1000e.h b/tests/qtest/libqos/e1000e.h index 091ce139da..5e2b201aa7 100644 --- a/tests/qtest/libqos/e1000e.h +++ b/tests/qtest/libqos/e1000e.h @@ -25,6 +25,8 @@ #define E1000E_RX0_MSG_ID (0) #define E1000E_TX0_MSG_ID (1) =20 +#define E1000E_ADDRESS { 0x52, 0x54, 0x00, 0x12, 0x34, 0x56 } + typedef struct QE1000E QE1000E; typedef struct QE1000E_PCI QE1000E_PCI; =20 --=20 2.39.1