From patchwork Wed May 8 07:44:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Garzarella X-Patchwork-Id: 13658206 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4F67EC25B4F for ; Wed, 8 May 2024 07:47:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4c0o-0005eF-KI; Wed, 08 May 2024 03:46:50 -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 1s4c0U-0004hs-C3 for qemu-devel@nongnu.org; Wed, 08 May 2024 03:46:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s4c0R-0001GG-Vb for qemu-devel@nongnu.org; Wed, 08 May 2024 03:46:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715154384; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wxCuZszVHlCJxUpW/lwQjeZcg0cjYRwA7TwhfqaB2hk=; b=RFgT3GVGAeO4TT7edpNAJuf7ztu/7bh+JlSbG9rOOczivnNWQUvribIw7dvI0Qzvucdh2Z mklzwoVdrFjAy0YHMfrE26xkhWp9O2dDMYlx9qwE90FChWzZV9LA5AVV4QlQL9eoobAqAq ovt9/Nr8n3ezJ/2y1yTmpYAuZAy13VU= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-591-WnFK9LrEP9W3FfiPzTx5fQ-1; Wed, 08 May 2024 03:46:23 -0400 X-MC-Unique: WnFK9LrEP9W3FfiPzTx5fQ-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a59a63a1f78so245707966b.0 for ; Wed, 08 May 2024 00:46:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715154380; x=1715759180; 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=wxCuZszVHlCJxUpW/lwQjeZcg0cjYRwA7TwhfqaB2hk=; b=D6j1P/GT0ebUOW5xRyDELFniF93IMCBWujP97HS1zDrtFuQFVMnr1a9zhyL5WEWuxs rCpU1QRW81MRHgr3I0cxOYolEWauDb+bIZiu1rBhSu6R7WGqHBz22r/lkC41h4PDASgK /A5zuzLTdXZofFu9dAonX8Olji5g61FBV4y/x0FK6daYpL2osWkiubIj+B0ike+IebQ5 MWbWyHgNq1qYsX//E4AKbuXh2FCaYlFfTAtGV2+F+j9rasL8fKTK2lNGIvXpzocr/V3q 76HIPxA7zLQurWWGBRBnXO4Y5UXWuJCfgBCpXQzzFdzLNgQdu/4BF1rEOP14RyIcdPGZ yNrw== X-Gm-Message-State: AOJu0YwpbhTRKFwrt9fek6UX3eLSyoOL+FLL9JhJmsPuhWWaxv5/MFeP 0YjTGSYjXrWflbEkQ2mYFbgLHTJ/lIaV+73j2taCvSfywzzBxhL1gw7zc/mIy3ka+I1jZ+SNcrE +8g/syI/gGfsrrlgiXmAXANSc7ghOxLYSDkxUeO3t/2WN3kboZl8WNd68wE4BJTZCl8PHGEhqhU ZdTByz+n4OKJmXWNngzNQ2YYwZWbqg/o0v/OK+ X-Received: by 2002:a17:907:eaa:b0:a52:2441:99c with SMTP id a640c23a62f3a-a59fb9d1f69mr135816966b.69.1715154380132; Wed, 08 May 2024 00:46:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGWyYRBqilqM3dbWzsFmhbu0xPiCPjxZK5N0n+7HJjel3NTnWPz6rJ1rQ4L727i2rMqwriRmg== X-Received: by 2002:a17:907:eaa:b0:a52:2441:99c with SMTP id a640c23a62f3a-a59fb9d1f69mr135812166b.69.1715154379698; Wed, 08 May 2024 00:46:19 -0700 (PDT) Received: from localhost.localdomain (host-87-12-25-56.business.telecomitalia.it. [87.12.25.56]) by smtp.gmail.com with ESMTPSA id ov10-20020a170906fc0a00b00a599ec95792sm5727217ejb.162.2024.05.08.00.46.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 00:46:17 -0700 (PDT) From: Stefano Garzarella To: qemu-devel@nongnu.org Cc: Jason Wang , Coiby Xu , Paolo Bonzini , qemu-block@nongnu.org, =?utf-8?q?Danie?= =?utf-8?q?l_P=2E_Berrang=C3=A9?= , Gerd Hoffmann , slp@redhat.com, =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Brad Smith , Eduardo Habkost , Thomas Huth , Eric Blake , Kevin Wolf , Markus Armbruster , Raphael Norwitz , gmaglione@redhat.com, Laurent Vivier , stefanha@redhat.com, David Hildenbrand , Hanna Reitz , "Michael S. Tsirkin" , Igor Mammedov , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Stefano Garzarella Subject: [PATCH v4 12/12] tests/qtest/vhost-user-test: add a test case for memory-backend-shm Date: Wed, 8 May 2024 09:44:56 +0200 Message-ID: <20240508074457.12367-13-sgarzare@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240508074457.12367-1-sgarzare@redhat.com> References: <20240508074457.12367-1-sgarzare@redhat.com> MIME-Version: 1.0 Content-type: text/plain Received-SPF: pass client-ip=170.10.129.124; envelope-from=sgarzare@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.581, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org `memory-backend-shm` can be used with vhost-user devices, so let's add a new test case for it. Signed-off-by: Stefano Garzarella Acked-by: Thomas Huth --- tests/qtest/vhost-user-test.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c index d4e437265f..8c1d903b2a 100644 --- a/tests/qtest/vhost-user-test.c +++ b/tests/qtest/vhost-user-test.c @@ -44,6 +44,8 @@ "mem-path=%s,share=on -numa node,memdev=mem" #define QEMU_CMD_MEMFD " -m %d -object memory-backend-memfd,id=mem,size=%dM," \ " -numa node,memdev=mem" +#define QEMU_CMD_SHM " -m %d -object memory-backend-shm,id=mem,size=%dM," \ + " -numa node,memdev=mem" #define QEMU_CMD_CHR " -chardev socket,id=%s,path=%s%s" #define QEMU_CMD_NETDEV " -netdev vhost-user,id=hs0,chardev=%s,vhostforce=on" @@ -195,6 +197,7 @@ enum test_memfd { TEST_MEMFD_AUTO, TEST_MEMFD_YES, TEST_MEMFD_NO, + TEST_MEMFD_SHM, }; static void append_vhost_net_opts(TestServer *s, GString *cmd_line, @@ -228,6 +231,8 @@ static void append_mem_opts(TestServer *server, GString *cmd_line, if (memfd == TEST_MEMFD_YES) { g_string_append_printf(cmd_line, QEMU_CMD_MEMFD, size, size); + } else if (memfd == TEST_MEMFD_SHM) { + g_string_append_printf(cmd_line, QEMU_CMD_SHM, size, size); } else { const char *root = init_hugepagefs() ? : server->tmpfs; @@ -788,6 +793,19 @@ static void *vhost_user_test_setup_memfd(GString *cmd_line, void *arg) return server; } +static void *vhost_user_test_setup_shm(GString *cmd_line, void *arg) +{ + TestServer *server = test_server_new("vhost-user-test", arg); + test_server_listen(server); + + append_mem_opts(server, cmd_line, 256, TEST_MEMFD_SHM); + server->vu_ops->append_opts(server, cmd_line, ""); + + g_test_queue_destroy(vhost_user_test_cleanup, server); + + return server; +} + static void test_read_guest_mem(void *obj, void *arg, QGuestAllocator *alloc) { TestServer *server = arg; @@ -1081,6 +1099,11 @@ static void register_vhost_user_test(void) "virtio-net", test_read_guest_mem, &opts); + opts.before = vhost_user_test_setup_shm; + qos_add_test("vhost-user/read-guest-mem/shm", + "virtio-net", + test_read_guest_mem, &opts); + if (qemu_memfd_check(MFD_ALLOW_SEALING)) { opts.before = vhost_user_test_setup_memfd; qos_add_test("vhost-user/read-guest-mem/memfd",