From nobody Mon Feb 9 19:29:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600442219; cv=none; d=zohomail.com; s=zohoarc; b=jmYhSGmlSQ65xJSdIVFqa+9jvTtTyXMj+sxW/gq+g+fY3+pT01mUs8CzuvI2pUVQ83a/7xNig7XowOXDolyfI57xmkzfuSjca3Im7aM2G8lQ3hN/dZHEE68iAPmUpWqSAJ4JyoJRPD1MuDbsSIBC7jMtZ2ReSmbNznzKSqcfXoI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600442219; h=Content-Type: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=3P+XMPk5537Wkf305VRwwfomGxBN6MfFgoWb0HRFKr4=; b=fnfZVmyBkcgV5yxCyxUAOozjGw+HR7ItU0xSqIlTdP1JqcqxXpDV3ygm9eul0EjfLoS3d83FNFzhDnBvl8a3o9v0CFKxDvlvOfHMMcN1LXwDRsfZ8G5SyI2+k1ThuyWzzPEPiNZPgb2+p2mmRDjJ5ec85CsesC8yMkhuMRS1+8U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 1600442219157633.9188022674338; Fri, 18 Sep 2020 08:16:59 -0700 (PDT) Received: from localhost ([::1]:53934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJI89-0000tZ-LL for importer@patchew.org; Fri, 18 Sep 2020 11:16:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJHxz-0006b6-FU for qemu-devel@nongnu.org; Fri, 18 Sep 2020 11:06:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:47699) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJHxq-0000Ys-P8 for qemu-devel@nongnu.org; Fri, 18 Sep 2020 11:06:27 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-456-yQwdJLkEOKaPM7Dd9OqfPQ-1; Fri, 18 Sep 2020 11:06:14 -0400 Received: by mail-wm1-f71.google.com with SMTP id a7so2171115wmc.2 for ; Fri, 18 Sep 2020 08:06:14 -0700 (PDT) Received: from redhat.com (bzq-109-65-116-225.red.bezeqint.net. [109.65.116.225]) by smtp.gmail.com with ESMTPSA id h76sm5957739wme.10.2020.09.18.08.06.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2020 08:06:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600441578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3P+XMPk5537Wkf305VRwwfomGxBN6MfFgoWb0HRFKr4=; b=VK0cKf26mn5NvaOhGRutwcaCt/No0shWsNUt0ATN0fmVoko156uk6QLZ0ul6lnIUin/4cK 9n2W+ITHjczNpRqhU3MCS8V5+AZ4FzzDR3TRh07kBMgMtekJ6mPBeqTiKgFPQWsGTYjo1O fO11ufYFNyIR5XLCesXmaV3dr2+Ihgo= X-MC-Unique: yQwdJLkEOKaPM7Dd9OqfPQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=3P+XMPk5537Wkf305VRwwfomGxBN6MfFgoWb0HRFKr4=; b=ZzQUOoLgW7p3FuEwM2K66UfCl7KaxPccJQG8pTT2ptUfHjtU0yjjxnpjRf86tN9mi0 TOazuXaNth0Lnymjk4Z3UKqEVbAe4steoh2yu22eOeFSKG9q0pwYuKV8Lt5Ew1CRE1dn jbhIcPOqNPYUMB/evH4uJ6tBaZZubT2hqgheCmCr7IYtYdk+4VCV5f0q5UlY4+ancv8j Hnr7mFbuAoAhBHSlMyISzrhuaA3pAu33IwvtHag02IBOKsmQ2X9FFDTNPZpcF3kTaihI KwvTCu5WpjtfIblKMTZ4PBSW0qR65S6llwEzjnDHX+H7DXZttiA+UifkTfMz+WiKdPQ2 SrTQ== X-Gm-Message-State: AOAM53303EWZKxSEM2QYN+LTuALFsvpozqm3kJ6nO2dkCAw1U/0q1pWU EhSvc0utzyBienV8UqokYaRH+MgmH6HYCHjbNuRWS68gH6OeGVliCV2kaLjIjpBHncaqcTeTwd3 mdFgXkyNIH0pfjA0= X-Received: by 2002:a1c:66c4:: with SMTP id a187mr15662388wmc.148.1600441572907; Fri, 18 Sep 2020 08:06:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyk5IohHlvRly8hh6HHGrHX4ch0SlzNDYRaaxskehlsuAsuqixXSvkK/1jMPaie8XQTNqTJsg== X-Received: by 2002:a1c:66c4:: with SMTP id a187mr15662361wmc.148.1600441572662; Fri, 18 Sep 2020 08:06:12 -0700 (PDT) Date: Fri, 18 Sep 2020 11:06:10 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 08/15] tests/qtest/vhost-user-test: prepare the tests for adding new dev class Message-ID: <20200918150506.286890-9-mst@redhat.com> References: <20200918150506.286890-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200918150506.286890-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline 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=63.128.21.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/18 00:20:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Peter Maydell , Thomas Huth , Dima Stepanov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Dima Stepanov For now only vhost-user-net device is supported by the test. Other vhost-user devices are not tested. As a first step make source code refactoring so new devices can reuse the same test routines. To make this provide a new vhost_user_ops structure with the methods to initialize device, its command line or make a proper vhost-user responses. Signed-off-by: Dima Stepanov Message-Id: <769cf817bad80e2534093e5887837b1c5e4675e2.1598865610.git.dimast= ep@yandex-team.ru> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/qtest/vhost-user-test.c | 105 ++++++++++++++++++++++++---------- 1 file changed, 76 insertions(+), 29 deletions(-) diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c index 9ee0f1e4fd..3df5322614 100644 --- a/tests/qtest/vhost-user-test.c +++ b/tests/qtest/vhost-user-test.c @@ -135,6 +135,10 @@ enum { TEST_FLAGS_END, }; =20 +enum { + VHOST_USER_NET, +}; + typedef struct TestServer { gchar *socket_path; gchar *mig_path; @@ -154,10 +158,25 @@ typedef struct TestServer { bool test_fail; int test_flags; int queues; + struct vhost_user_ops *vu_ops; } TestServer; =20 +struct vhost_user_ops { + /* Device types. */ + int type; + void (*append_opts)(TestServer *s, GString *cmd_line, + const char *chr_opts); + + /* VHOST-USER commands. */ + void (*set_features)(TestServer *s, CharBackend *chr, + VhostUserMsg *msg); + void (*get_protocol_features)(TestServer *s, + CharBackend *chr, VhostUserMsg *msg); +}; + static const char *init_hugepagefs(void); -static TestServer *test_server_new(const gchar *name); +static TestServer *test_server_new(const gchar *name, + struct vhost_user_ops *ops); static void test_server_free(TestServer *server); static void test_server_listen(TestServer *server); =20 @@ -167,7 +186,7 @@ enum test_memfd { TEST_MEMFD_NO, }; =20 -static void append_vhost_opts(TestServer *s, GString *cmd_line, +static void append_vhost_net_opts(TestServer *s, GString *cmd_line, const char *chr_opts) { g_string_append_printf(cmd_line, QEMU_CMD_CHR QEMU_CMD_NETDEV, @@ -332,25 +351,15 @@ static void chr_read(void *opaque, const uint8_t *buf= , int size) break; =20 case VHOST_USER_SET_FEATURES: - g_assert_cmpint(msg.payload.u64 & (0x1ULL << VHOST_USER_F_PROTOCOL= _FEATURES), - !=3D, 0ULL); - if (s->test_flags =3D=3D TEST_FLAGS_DISCONNECT) { - qemu_chr_fe_disconnect(chr); - s->test_flags =3D TEST_FLAGS_BAD; + if (s->vu_ops->set_features) { + s->vu_ops->set_features(s, chr, &msg); } break; =20 case VHOST_USER_GET_PROTOCOL_FEATURES: - /* send back features to qemu */ - msg.flags |=3D VHOST_USER_REPLY_MASK; - msg.size =3D sizeof(m.payload.u64); - msg.payload.u64 =3D 1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD; - msg.payload.u64 |=3D 1 << VHOST_USER_PROTOCOL_F_CROSS_ENDIAN; - if (s->queues > 1) { - msg.payload.u64 |=3D 1 << VHOST_USER_PROTOCOL_F_MQ; + if (s->vu_ops->get_protocol_features) { + s->vu_ops->get_protocol_features(s, chr, &msg); } - p =3D (uint8_t *) &msg; - qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size); break; =20 case VHOST_USER_GET_VRING_BASE: @@ -467,7 +476,8 @@ static const char *init_hugepagefs(void) #endif } =20 -static TestServer *test_server_new(const gchar *name) +static TestServer *test_server_new(const gchar *name, + struct vhost_user_ops *ops) { TestServer *server =3D g_new0(TestServer, 1); char template[] =3D "/tmp/vhost-test-XXXXXX"; @@ -495,6 +505,7 @@ static TestServer *test_server_new(const gchar *name) =20 server->log_fd =3D -1; server->queues =3D 1; + server->vu_ops =3D ops; =20 return server; } @@ -669,11 +680,11 @@ static void vhost_user_test_cleanup(void *s) =20 static void *vhost_user_test_setup(GString *cmd_line, void *arg) { - TestServer *server =3D test_server_new("vhost-user-test"); + TestServer *server =3D test_server_new("vhost-user-test", arg); test_server_listen(server); =20 append_mem_opts(server, cmd_line, 256, TEST_MEMFD_AUTO); - append_vhost_opts(server, cmd_line, ""); + server->vu_ops->append_opts(server, cmd_line, ""); =20 g_test_queue_destroy(vhost_user_test_cleanup, server); =20 @@ -682,11 +693,11 @@ static void *vhost_user_test_setup(GString *cmd_line,= void *arg) =20 static void *vhost_user_test_setup_memfd(GString *cmd_line, void *arg) { - TestServer *server =3D test_server_new("vhost-user-test"); + TestServer *server =3D test_server_new("vhost-user-test", arg); test_server_listen(server); =20 append_mem_opts(server, cmd_line, 256, TEST_MEMFD_YES); - append_vhost_opts(server, cmd_line, ""); + server->vu_ops->append_opts(server, cmd_line, ""); =20 g_test_queue_destroy(vhost_user_test_cleanup, server); =20 @@ -720,7 +731,7 @@ static void test_migrate(void *obj, void *arg, QGuestAl= locator *alloc) return; } =20 - dest =3D test_server_new("dest"); + dest =3D test_server_new("dest", s->vu_ops); dest_cmdline =3D g_string_new(qos_get_current_command_line()); uri =3D g_strdup_printf("%s%s", "unix:", dest->mig_path); =20 @@ -730,7 +741,7 @@ static void test_migrate(void *obj, void *arg, QGuestAl= locator *alloc) test_server_listen(dest); g_string_append_printf(dest_cmdline, " -incoming %s", uri); append_mem_opts(dest, dest_cmdline, 256, TEST_MEMFD_AUTO); - append_vhost_opts(dest, dest_cmdline, ""); + dest->vu_ops->append_opts(dest, dest_cmdline, ""); to =3D qtest_init(dest_cmdline->str); =20 /* This would be where you call qos_allocate_objects(to, NULL), if you= want @@ -831,11 +842,11 @@ connect_thread(gpointer data) =20 static void *vhost_user_test_setup_reconnect(GString *cmd_line, void *arg) { - TestServer *s =3D test_server_new("reconnect"); + TestServer *s =3D test_server_new("reconnect", arg); =20 g_thread_new("connect", connect_thread, s); append_mem_opts(s, cmd_line, 256, TEST_MEMFD_AUTO); - append_vhost_opts(s, cmd_line, ",server"); + s->vu_ops->append_opts(s, cmd_line, ",server"); =20 g_test_queue_destroy(vhost_user_test_cleanup, s); =20 @@ -866,13 +877,13 @@ static void test_reconnect(void *obj, void *arg, QGue= stAllocator *alloc) =20 static void *vhost_user_test_setup_connect_fail(GString *cmd_line, void *a= rg) { - TestServer *s =3D test_server_new("connect-fail"); + TestServer *s =3D test_server_new("connect-fail", arg); =20 s->test_fail =3D true; =20 g_thread_new("connect", connect_thread, s); append_mem_opts(s, cmd_line, 256, TEST_MEMFD_AUTO); - append_vhost_opts(s, cmd_line, ",server"); + s->vu_ops->append_opts(s, cmd_line, ",server"); =20 g_test_queue_destroy(vhost_user_test_cleanup, s); =20 @@ -881,13 +892,13 @@ static void *vhost_user_test_setup_connect_fail(GStri= ng *cmd_line, void *arg) =20 static void *vhost_user_test_setup_flags_mismatch(GString *cmd_line, void = *arg) { - TestServer *s =3D test_server_new("flags-mismatch"); + TestServer *s =3D test_server_new("flags-mismatch", arg); =20 s->test_flags =3D TEST_FLAGS_DISCONNECT; =20 g_thread_new("connect", connect_thread, s); append_mem_opts(s, cmd_line, 256, TEST_MEMFD_AUTO); - append_vhost_opts(s, cmd_line, ",server"); + s->vu_ops->append_opts(s, cmd_line, ",server"); =20 g_test_queue_destroy(vhost_user_test_cleanup, s); =20 @@ -924,11 +935,47 @@ static void test_multiqueue(void *obj, void *arg, QGu= estAllocator *alloc) wait_for_rings_started(s, s->queues * 2); } =20 +static void vu_net_set_features(TestServer *s, CharBackend *chr, + VhostUserMsg *msg) +{ + g_assert_cmpint(msg->payload.u64 & + (0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES), !=3D, 0ULL); + if (s->test_flags =3D=3D TEST_FLAGS_DISCONNECT) { + qemu_chr_fe_disconnect(chr); + s->test_flags =3D TEST_FLAGS_BAD; + } +} + +static void vu_net_get_protocol_features(TestServer *s, CharBackend *chr, + VhostUserMsg *msg) +{ + /* send back features to qemu */ + msg->flags |=3D VHOST_USER_REPLY_MASK; + msg->size =3D sizeof(m.payload.u64); + msg->payload.u64 =3D 1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD; + msg->payload.u64 |=3D 1 << VHOST_USER_PROTOCOL_F_CROSS_ENDIAN; + if (s->queues > 1) { + msg->payload.u64 |=3D 1 << VHOST_USER_PROTOCOL_F_MQ; + } + qemu_chr_fe_write_all(chr, (uint8_t *)msg, VHOST_USER_HDR_SIZE + msg->= size); +} + +/* Each VHOST-USER device should have its ops structure defined. */ +static struct vhost_user_ops g_vu_net_ops =3D { + .type =3D VHOST_USER_NET, + + .append_opts =3D append_vhost_net_opts, + + .set_features =3D vu_net_set_features, + .get_protocol_features =3D vu_net_get_protocol_features, +}; + static void register_vhost_user_test(void) { QOSGraphTestOptions opts =3D { .before =3D vhost_user_test_setup, .subprocess =3D true, + .arg =3D &g_vu_net_ops, }; =20 qemu_add_opts(&qemu_chardev_opts); --=20 MST