From nobody Fri Dec 19 19:18:00 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1744129935377798.0782821814923; Tue, 8 Apr 2025 09:32:15 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 639641708; Tue, 8 Apr 2025 12:32:14 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 8BE551563; Tue, 8 Apr 2025 12:31:18 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 181B0B31; Tue, 8 Apr 2025 12:31:14 -0400 (EDT) Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id EE300148D for ; Tue, 8 Apr 2025 12:31:10 -0400 (EDT) Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-aaf0f1adef8so925157266b.3 for ; Tue, 08 Apr 2025 09:31:10 -0700 (PDT) Received: from tulp.my.domain (80-115-115-199.cable.dynamic.v4.ziggo.nl. [80.115.115.199]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac7bfe5c5ffsm937295966b.23.2025.04.08.09.31.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 09:31:07 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744129869; x=1744734669; darn=lists.libvirt.org; 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=+MPW9bNhk2K/bfgVih0f3D2gARXOzs6pHDYWG/KQH38=; b=YY9jY1KDLViNddhe2pLisYiv1qKN8/8eu/WNGG/K1LHqQP1f/pbma+HTvao2bgA0rm vD0P+KzwYFFpskYAlehxz0+NiPrElHQDAr/ZT1/xynlL0x43N958aSjzJRNrP+OPAnfy fjSDUtFekTsPYv+OPpnsJ2q+TrtMEXlow54hzAdmaA1WuBpD9bBV7nl52byuA3a3JD2K DqC8wVKiJ94EAHtqiQswpxP7LacEJG7Kvd43Qf6CD6hRf4jY8lgRH03kMfj7rmeM5U1J c5yT0XDM+bGsf2lBsJvSYgh2u+q8DdK0MCssKqTTJPtUR+YyxxwkHgtOTD8rwAineHAl vWGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744129869; x=1744734669; 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=+MPW9bNhk2K/bfgVih0f3D2gARXOzs6pHDYWG/KQH38=; b=xJPhvs/kVF7HwDdPS2Hn17edK5T/MGhGse9sQlmys6RkWdi1DwynYRoBr670UUdhHa rKHYLvZT/ICz1cO8FEfYVUFPqpFnB4bFioBuy0EjFI7y0JsuezTLLTJE1PF7K3D2pBLm kfc5e4AJaaVud4EJf1EQvj4QuAn4GhYaAUS4tGc7xf6FofNR6WWsZcgUoar1SKSOyO/L ORGkpTBa/+YzIKDQRv1ooDvhnuCMJMJTYH2TCtSbVusJrT0Ub8EfCbt57P+B5Jrcn0LD uVwJQpu4p+mbKgCoNVS6zNBvBNx6/sLMSzXPj0FTe31OrdmOQV/2Co6kS3wSYQXyQxMY y77w== X-Gm-Message-State: AOJu0Yw8MxhzKilzy0t5imMJYXChG7wFntf6UdeT9pyp6Z+3I4dvolMj vEKdShA6mRo15XNUXySIt5fDgE9Q434mPHC5oUq3iHcd92JbYSR1sYxVc7zdXt2v1g== X-Gm-Gg: ASbGncv4uHGJhzfyqyMh0pNexP2JGan1HnAjXBrQmuqNFpiK6IvTkPd0wBDKe1skmRY 2HxkGZBV7Zqb2fc7R4gpQU8bCcM1xbEthcH7GhOY+feS4BK2wrnRyo3R+EwTJJaMoZN/o2pKP2T SpBtIyeWwNNwytCXe8rSpxE8hD1hNHDdzLVLM//4hDbKLL/7IZnYGiIf3qnjvp8GS3Z5/3wooG6 xWDCQd7usO2sryPaplviDLymQtc7fRtIHjnDRlsj1EChoIQ3AgD8pOSIAnJp+nyj7vwrCk5BpDF 7fyFcXzjqCfZS8KJrB5eIXjqdb6u141CBcBSwnAmcC7mI+3Tw225pW3kMn0IfGllZH1BK4ah0O9 twoh8xSV0uf1mWJn1kg== X-Google-Smtp-Source: AGHT+IHPrtKcbM4Nu+yAQxrUAFDPdOfIsg77JfkVAfZNPDXYS2FzpkiUD6+cIqaMtLXstqhcqXtCRg== X-Received: by 2002:a17:907:9728:b0:ac2:87b0:e4a5 with SMTP id a640c23a62f3a-ac7d6c9e900mr1372051266b.2.1744129869167; Tue, 08 Apr 2025 09:31:09 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 1/3] bhyve: support random number generator device Date: Tue, 8 Apr 2025 18:27:28 +0200 Message-ID: <20250408162730.67891-2-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408162730.67891-1-bogorodskiy@gmail.com> References: <20250408162730.67891-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 2BWL2YZ4YHARRR4I3FYIWMLXIKPNXERX X-Message-ID-Hash: 2BWL2YZ4YHARRR4I3FYIWMLXIKPNXERX X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1744129939440019100 Content-Type: text/plain; charset="utf-8" Bhyve supports the Virtio RNG interface. It's always using the /dev/random device and doesn't have any configuration options. Thus, in XML it's represented as: So extend the bhyve driver to support that and add a set of tests for this feature. Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- src/bhyve/bhyve_capabilities.c | 15 ++++++++ src/bhyve/bhyve_capabilities.h | 2 + src/bhyve/bhyve_command.c | 23 ++++++++++++ src/bhyve/bhyve_device.c | 11 ++++++ .../bhyvexml2argv-virtio-rnd.args | 11 ++++++ .../bhyvexml2argv-virtio-rnd.ldargs | 4 ++ .../bhyvexml2argv-virtio-rnd.xml | 26 +++++++++++++ tests/bhyvexml2argvtest.c | 3 ++ .../bhyvexml2xmlout-virtio-rnd.xml | 37 +++++++++++++++++++ tests/bhyvexml2xmltest.c | 1 + 10 files changed, 133 insertions(+) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-virtio-rnd.xml diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index b065256cf0..37ae5d2872 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -4,6 +4,7 @@ * Copyright (C) 2014 Roman Bogorodskiy * Copyright (C) 2014 Semihalf * Copyright (C) 2020 Fabian Freyer + * Copyright (C) 2025 The FreeBSD Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -327,6 +328,17 @@ bhyveProbeCapsVirtio9p(unsigned int *caps, char *binar= y) } =20 =20 +static int +bhyveProbeCapsVirtioRnd(unsigned int *caps, char *binary) +{ + return bhyveProbeCapsDeviceHelper(caps, binary, + "-s", + "0,virtio-rnd", + "pci slot 0:0: unknown device \"virt= io-rnd\"", + BHYVE_CAP_VIRTIO_RND); +} + + int virBhyveProbeCaps(unsigned int *caps) { @@ -364,6 +376,9 @@ virBhyveProbeCaps(unsigned int *caps) if ((ret =3D bhyveProbeCapsVirtio9p(caps, binary))) goto out; =20 + if ((ret =3D bhyveProbeCapsVirtioRnd(caps, binary))) + goto out; + out: VIR_FREE(binary); return ret; diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h index 582eae083d..9b24241dc1 100644 --- a/src/bhyve/bhyve_capabilities.h +++ b/src/bhyve/bhyve_capabilities.h @@ -2,6 +2,7 @@ * bhyve_capabilities.h: bhyve capabilities module * * Copyright (C) 2014 Semihalf + * Copyright (C) 2025 The FreeBSD Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -52,6 +53,7 @@ typedef enum { BHYVE_CAP_SOUND_HDA =3D 1 << 7, BHYVE_CAP_VNC_PASSWORD =3D 1 << 8, BHYVE_CAP_VIRTIO_9P =3D 1 << 9, + BHYVE_CAP_VIRTIO_RND =3D 1 << 10, } virBhyveCapsFlags; =20 int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps); diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index bc287307c8..50de3e1660 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -2,6 +2,7 @@ * bhyve_command.c: bhyve command generation * * Copyright (C) 2014 Roman Bogorodskiy + * Copyright (C) 2025 The FreeBSD Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -152,6 +153,24 @@ bhyveBuildConsoleArgStr(const virDomainDef *def, virCo= mmand *cmd) return 0; } =20 +static int +bhyveBuildRNGArgStr(const virDomainDef *def G_GNUC_UNUSED, + virDomainRNGDef *rng, + virCommand *cmd) +{ + if (rng->backend !=3D VIR_DOMAIN_RNG_BACKEND_RANDOM) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("RNG backend is not supported")); + return -1; + } + + virCommandAddArg(cmd, "-s"); + virCommandAddArgFormat(cmd, "%d:%d,virtio-rnd", + rng->info.addr.pci.slot, + rng->info.addr.pci.function); + return 0; +} + static int bhyveBuildAHCIControllerArgStr(const virDomainDef *def, virDomainControllerDef *controller, @@ -807,6 +826,10 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver= , virDomainDef *def, if (bhyveBuildConsoleArgStr(def, cmd) < 0) return NULL; =20 + for (i =3D 0; i < def->nrngs; i++) + if (bhyveBuildRNGArgStr(def, def->rngs[i], cmd) < 0) + return NULL; + if (def->namespaceData) { bhyveDomainCmdlineDef *bhyvecmd; =20 diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c index e4d14c4102..68983d5bc4 100644 --- a/src/bhyve/bhyve_device.c +++ b/src/bhyve/bhyve_device.c @@ -2,6 +2,7 @@ * bhyve_device.c: bhyve device management * * Copyright (C) 2014 Roman Bogorodskiy + * Copyright (C) 2025 The FreeBSD Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -184,6 +185,16 @@ bhyveAssignDevicePCISlots(virDomainDef *def, return -1; } =20 + for (i =3D 0; i < def->nrngs; i++) { + if (!virDeviceInfoPCIAddressIsWanted(&def->rngs[i]->info)) + continue; + if (virDomainPCIAddressReserveNextAddr(addrs, + &def->rngs[i]->info, + VIR_PCI_CONNECT_TYPE_PCI_DE= VICE, + -1) < 0) + return -1; + } + return 0; } =20 diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.args b/tests/= bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.args new file mode 100644 index 0000000000..849e4599f8 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.args @@ -0,0 +1,11 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 \ +-s 4:0,virtio-rnd \ +bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.ldargs b/test= s/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.ldargs new file mode 100644 index 0000000000..5905f4b3e6 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.ldargs @@ -0,0 +1,4 @@ +bhyveload \ +-m 214 \ +-d /tmp/freebsd.img \ +bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.xml b/tests/b= hyvexml2argvdata/bhyvexml2argv-virtio-rnd.xml new file mode 100644 index 0000000000..78a4e3f400 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.xml @@ -0,0 +1,26 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + + + +
+ + + + + +
+ + + + + + diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index cdaa32f65c..74d9ba4f70 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -243,6 +243,9 @@ mymain(void) DO_TEST_FAILURE("fs-9p-unsupported-accessmode"); driver.bhyvecaps &=3D ~BHYVE_CAP_VIRTIO_9P; DO_TEST_FAILURE("fs-9p"); + DO_TEST("virtio-rnd"); + driver.bhyvecaps &=3D ~BHYVE_CAP_VIRTIO_RND; + DO_TEST_FAILURE("virtio-rnd"); =20 /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-virtio-rnd.xml b/tes= ts/bhyvexml2xmloutdata/bhyvexml2xmlout-virtio-rnd.xml new file mode 100644 index 0000000000..61645c719d --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-virtio-rnd.xml @@ -0,0 +1,37 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + + + + +
+ + + +
+ + + + + +
+ + + /dev/random +
+ + + diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 428f1b47bb..98006dac04 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -114,6 +114,7 @@ mymain(void) DO_TEST_DIFFERENT("sound"); DO_TEST_DIFFERENT("isa-controller"); DO_TEST_DIFFERENT("fs-9p"); + DO_TEST_DIFFERENT("virtio-rnd"); =20 /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); --=20 2.49.0 From nobody Fri Dec 19 19:18:00 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1744129970894612.4431833447401; Tue, 8 Apr 2025 09:32:50 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 22197168A; Tue, 8 Apr 2025 12:32:43 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 171EC1523; Tue, 8 Apr 2025 12:31:22 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 98D4B148D; Tue, 8 Apr 2025 12:31:14 -0400 (EDT) Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 80B4014AF for ; Tue, 8 Apr 2025 12:31:12 -0400 (EDT) Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-aca99fc253bso12755066b.0 for ; Tue, 08 Apr 2025 09:31:12 -0700 (PDT) Received: from tulp.my.domain (80-115-115-199.cable.dynamic.v4.ziggo.nl. [80.115.115.199]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac7bfe5c5ffsm937295966b.23.2025.04.08.09.31.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 09:31:09 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744129871; x=1744734671; darn=lists.libvirt.org; 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=ItS4OjjGslG2IlZdUzwGIYWRz/yGSvIJYUNM1i/3CpQ=; b=h6wcXgCmmooFOwtDiCponB85zohHucPGnq5DzIzMow/4Z46LKsG2TJR19MUGVovlFA ocZfujAVmBrK0hWkUZ85+++tk5DVLN/1t48Svc+L04KqCJGlmTeL+27VknbRsOzCKalK uFb47WTEcVvXH/l0/+RtJp2GlX5C/OtVWmCuVNinGGNUXhQKFAbZUSHd13EgP9JbTA+O HstQDAHEl8cO81VAT9hVFQ68BAM05TVboEYpRYgTWzHwBeO4P2NX5b8OLEAjSMa5ixD5 D9TF0qevTL8boYm3CfX/XOMZtPu6e5HFnaMw/l2HLdQR/BCRaSbTNZ/SCTdjMuVuwsVc y3Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744129871; x=1744734671; 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=ItS4OjjGslG2IlZdUzwGIYWRz/yGSvIJYUNM1i/3CpQ=; b=qJ/HtiljaAQVe1fnGZMgEVqvMu9zX7k+ebeQozp4ZiX2jZZQjuBQJrEuXWLCcao+7A VuGvk7scby42eQW9QoTd6mnCcCoPHnD5+QbBveERzLnkugJqKfTkQ78x1jiOoyvNP9nI caQidw6ZjCFJblWo4XV+6isapceWGDJl7Mshm03ohGXt5vU0ImALVwdHvuS8KLMbdMmq gM6ezqNZ/nD6/6yiUhug8a0pPh+OJZFOC5Boidq7rFvKlpIX+xlNVKpwzWim5k6DHpuz lDY/Vcy4LrDWbVaxCtmcVcAikByXgVEFKaGu2oqyFrQ3kWatHgp8oQiwlHNYkgsQmXFl XPPg== X-Gm-Message-State: AOJu0YypuQY2ISzJscWvFEWZnm6IbkG2sBTyDF/k0wg9Ej1yohWFdS8j 3NHWc+cEUrnVv049B6YMBkH+ZYba2U6607oWi3rWUoqVryaZp+QHkKDGxm03ZyWfSg== X-Gm-Gg: ASbGncv/hHcwuXljAn1buEE2+HIjfY7NE+8/K2+0LE0VbqzJOrgT4G6YHAppVbxf1a/ GG21BLRtmEk/QyLRACQ3W2whxHEcBMQ8uyptMrR4jWa0gHklZ8hWBTs0TQoeWqqlI3BnbLgxp8b BaRfV2ovY0Un5CiuzXjlnv8Hlc+Pm/pTIGdBkFbDdJhnjoPVhF6B11xHVwJzfuiBbhmAopCcU2K VbdQD99rLmNCwVDzcyt9BgkF7q+5Suv5v2Ct6LVSf0EnWfdGUOZi5C3GaJB4w1Xuj509u7HADUm iee4ICsk9HV10DFYn89KQN0Uh2XUNPsqJCW15EwEyqD/jf7VLOowIeV/BH0W0v7Lguin8BuK5LD kncw1wM/WTSLZfeJKng== X-Google-Smtp-Source: AGHT+IG4Ac5lJ+nvoFHm0OQvdlh5IxPUdYuOjJPI62aDZCRjqvsvjCW5rGJgktXeFfi4j8w4mu+UfQ== X-Received: by 2002:a17:906:797:b0:ac8:1142:a9e5 with SMTP id a640c23a62f3a-ac81142b8c5mr482447666b.47.1744129870511; Tue, 08 Apr 2025 09:31:10 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 2/3] bhyve: argv2xml: support virtio-rnd devices Date: Tue, 8 Apr 2025 18:27:29 +0200 Message-ID: <20250408162730.67891-3-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408162730.67891-1-bogorodskiy@gmail.com> References: <20250408162730.67891-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: W76WC34GG2YWN3B6VU5SDCR6TT2EMCM2 X-Message-ID-Hash: W76WC34GG2YWN3B6VU5SDCR6TT2EMCM2 X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1744129971487019000 Content-Type: text/plain; charset="utf-8" Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- src/bhyve/bhyve_parse_command.c | 29 +++++++++++++++++++ .../bhyveargv2xml-virtio-rnd.args | 8 +++++ .../bhyveargv2xml-virtio-rnd.xml | 20 +++++++++++++ tests/bhyveargv2xmltest.c | 1 + 4 files changed, 58 insertions(+) create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-virtio-rnd.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-virtio-rnd.xml diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman= d.c index 29d3a678bf..7a4e48fbf8 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -5,6 +5,7 @@ * Copyright (C) 2006 Daniel P. Berrange * Copyright (c) 2011 NetApp, Inc. * Copyright (C) 2020 Fabian Freyer + * Copyright (C) 2025 The FreeBSD Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -639,6 +640,32 @@ bhyveParsePCIFbuf(virDomainDef *def, return -1; } =20 +static int +bhyveParsePCIRND(virDomainDef *def, + virDomainXMLOption *xmlopt G_GNUC_UNUSED, + unsigned caps G_GNUC_UNUSED, + unsigned bus, + unsigned slot, + unsigned function, + const char *config G_GNUC_UNUSED) +{ + /* -s slot,virtio-rnd */ + virDomainRNGDef *rng =3D g_new0(virDomainRNGDef, 1); + + rng->model =3D VIR_DOMAIN_RNG_MODEL_VIRTIO; + rng->backend =3D VIR_DOMAIN_RNG_BACKEND_RANDOM; + + rng->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; + rng->info.addr.pci.bus =3D bus; + rng->info.addr.pci.slot =3D slot; + rng->info.addr.pci.function =3D function; + rng->source.file =3D g_strdup("/dev/random"); + + VIR_APPEND_ELEMENT(def->rngs, def->nrngs, rng); + + return 0; +} + static int bhyveParseBhyvePCIArg(virDomainDef *def, virDomainXMLOption *xmlopt, @@ -703,6 +730,8 @@ bhyveParseBhyvePCIArg(virDomainDef *def, VIR_DOMAIN_NET_MODEL_E1000, conf); else if (STREQ(emulation, "fbuf")) bhyveParsePCIFbuf(def, xmlopt, caps, bus, slot, function, conf); + else if (STREQ(emulation, "virtio-rnd")) + bhyveParsePCIRND(def, xmlopt, caps, bus, slot, function, conf); =20 VIR_FREE(emulation); VIR_FREE(slotdef); diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-rnd.args b/tests/= bhyveargv2xmldata/bhyveargv2xml-virtio-rnd.args new file mode 100644 index 0000000000..7e4b27eb77 --- /dev/null +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-rnd.args @@ -0,0 +1,8 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 1:0,virtio-rnd \ +bhyve diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-rnd.xml b/tests/b= hyveargv2xmldata/bhyveargv2xml-virtio-rnd.xml new file mode 100644 index 0000000000..c6b2620f9e --- /dev/null +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-rnd.xml @@ -0,0 +1,20 @@ + + bhyve + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + destroy + destroy + destroy + + + /dev/random +
+ + + diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c index 92189a2e58..82abce5b8f 100644 --- a/tests/bhyveargv2xmltest.c +++ b/tests/bhyveargv2xmltest.c @@ -188,6 +188,7 @@ mymain(void) DO_TEST("vnc-vga-io"); DO_TEST("vnc-resolution"); DO_TEST("vnc-password"); + DO_TEST("virtio-rnd"); =20 virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); --=20 2.49.0 From nobody Fri Dec 19 19:18:00 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 174412998814745.71393745980765; Tue, 8 Apr 2025 09:33:08 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 34645CEF; Tue, 8 Apr 2025 12:33:07 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D587DA4A; Tue, 8 Apr 2025 12:31:23 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A7466B31; Tue, 8 Apr 2025 12:31:14 -0400 (EDT) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 0E35114D7 for ; Tue, 8 Apr 2025 12:31:13 -0400 (EDT) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-ac298c8fa50so964812266b.1 for ; Tue, 08 Apr 2025 09:31:13 -0700 (PDT) Received: from tulp.my.domain (80-115-115-199.cable.dynamic.v4.ziggo.nl. [80.115.115.199]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac7bfe5c5ffsm937295966b.23.2025.04.08.09.31.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 09:31:10 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744129872; x=1744734672; darn=lists.libvirt.org; 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=iGYjF3BnbXfDtcBMVESIpOHW69CezbR4H1H9DENHVEQ=; b=fFETZcrvFOrg7VwG/8iWxgXc49FJPL1gbSFD0uT/9EOFcjKsuHXSBp18CVkcwhtPMF ZmuZKVMClAA4LAkDgNNtbkt37wf5TtbogUph/fy3kWxfzXgNpOoqQRSIxWOntPahxOcp plV9iFsGSfk09IJ4UBcdLcN1emQwtHoV08vL3Sr2fA34RdDVuLjOO7dHY9PZWyvA8Ot6 MsY3xw+zTUwG8tnHfU+TuXorgmskVpt2k3glU942jWGMwCGRqKk0XZoTq1RVORnThcVF zmdVIzqxVgd1hx22ZCqp06kZMqG6Moq9786OspcwsBw6cNfmXWuHH4UT3QGtAxOeraLo Ke2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744129872; x=1744734672; 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=iGYjF3BnbXfDtcBMVESIpOHW69CezbR4H1H9DENHVEQ=; b=ELaXqTEBkxAyuXualqHvPvrPu6NPlqPi9AINgSaU/Ar/5iGz93mFWBiY1SEhwzYTYV AE9QzswEou/FWcqN1hvvZHyFEAy8RAqiMDLVUxHI0KBL4NXTENT4v7V/vEjY/z3BmOoL C7m4puvImIFtRzvDf6cf5c7XsbryMxn/1qoOdU4ccqcMDZ+KQ7WklQjLqb3OssLwYKZl 510VALZvhODSXR1THjvDvlVGlyEoMt1AyFDW/OM/ssThXb1A35QL/BoFxN76tjhkYsuH obJGNV6lvmydwpN/aXo5xySQJsv4BIaz9kC76TgAWrgPl3kwMyNx96R5LF4gdY1QeFn2 nR7Q== X-Gm-Message-State: AOJu0Yz+tNizqLuQSs1CB3iI3S2+tjrzm+il2FEk/TYZY5Sskh6f47mz pfgcoFWXt5pPeS5HYgNj8HPGwX8XKE3EX9Izvr8+XaH4ZUoWdb/ffiP7uYmbYCWzAg== X-Gm-Gg: ASbGncuB2qJ9ZHOP07DEb2PJ0MIcViDJ5YKJ5QeqcCv89rxiYMnZ1obe/qAV9maMld4 tnhHe8RvGnPVhKSbwO10qDoJKgTUp+4ZZ63sqTUwZHrCdHF0iO0CGNGwNYjIadMl8V6qIMMXORf PqW/VJSyz0MoIofXmL3BgbFwiLNqyvS3sGEsil9AP+yxAun3dG+9+GfnMwkE5kjuFNyEOQT/YuS PV1LpzcMYlO4NMHig+21xd0mGYVl2H87RpXwNOGvkhWo581wMs/nfJzcw8zHv6DuN5R9PSDt3p8 mVygexwwpFSagNypDs5yz0zGf2aEnxPWVuk0UsNmmW0lNaQrV92l4lOa5QUMaQuBsbNKnB+7+XM 5MNb3jQ05+SNYmVCwGUSyjHhvO1Up X-Google-Smtp-Source: AGHT+IGdKYQMu31LULPglkHgiqgdjMFvBu63oJQRbSy4Dnnzjv9uKfXtur0Mdsup12st30P7mraFmg== X-Received: by 2002:a17:907:9443:b0:ac6:ba91:ca4d with SMTP id a640c23a62f3a-ac7d17da774mr1492552466b.31.1744129871444; Tue, 08 Apr 2025 09:31:11 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 3/3] bhyve: extend RNG device validation Date: Tue, 8 Apr 2025 18:27:30 +0200 Message-ID: <20250408162730.67891-4-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408162730.67891-1-bogorodskiy@gmail.com> References: <20250408162730.67891-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6L4WDURLELHAUYHNNLL54MYCNIY4I4EF X-Message-ID-Hash: 6L4WDURLELHAUYHNNLL54MYCNIY4I4EF X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1744130007640019100 Content-Type: text/plain; charset="utf-8" Add a bunch of device def validation to catch unsupported RNG device configurations early. Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- src/bhyve/bhyve_domain.c | 21 +++++++++++++++ ...yvexml2argv-virtio-rnd-backend-builtin.xml | 26 +++++++++++++++++++ ...io-rnd-backend-random-non-default-file.xml | 26 +++++++++++++++++++ .../bhyvexml2argv-virtio-rnd-transitional.xml | 26 +++++++++++++++++++ tests/bhyvexml2argvtest.c | 3 +++ 5 files changed, 102 insertions(+) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-backen= d-builtin.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-backen= d-random-non-default-file.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-transi= tional.xml diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 7d1ea7f1b1..ca5176885a 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -2,6 +2,7 @@ * bhyve_domain.c: bhyve domain private state * * Copyright (C) 2014 Roman Bogorodskiy + * Copyright (C) 2025 The FreeBSD Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -243,6 +244,26 @@ bhyveDomainDeviceDefValidate(const virDomainDeviceDef = *dev, return -1; } =20 + if (dev->type =3D=3D VIR_DOMAIN_DEVICE_RNG) { + if (dev->data.rng->model =3D=3D VIR_DOMAIN_RNG_MODEL_VIRTIO) { + if (dev->data.rng->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_RANDO= M) { + if (STRNEQ(dev->data.rng->source.file, "/dev/random")) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only /dev/random source is supported= ")); + return -1; + } + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only 'random' backend model is supported= ")); + return -1; + } + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only 'virio' RNG device model is supported")= ); + return -1; + } + } + return 0; } =20 diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-backend-built= in.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-backend-builtin.x= ml new file mode 100644 index 0000000000..ffca72d120 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-backend-builtin.xml @@ -0,0 +1,26 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + + + +
+ + + + + +
+ + + + + + diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-backend-rando= m-non-default-file.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-b= ackend-random-non-default-file.xml new file mode 100644 index 0000000000..08457df89a --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-backend-random-non-d= efault-file.xml @@ -0,0 +1,26 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + + + +
+ + + + + +
+ + + /random/dev + + + diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-transitional.= xml b/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-transitional.xml new file mode 100644 index 0000000000..abcb7182ed --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-transitional.xml @@ -0,0 +1,26 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + + + +
+ + + + + +
+ + + + + + diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 74d9ba4f70..3831f0c65d 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -244,6 +244,9 @@ mymain(void) driver.bhyvecaps &=3D ~BHYVE_CAP_VIRTIO_9P; DO_TEST_FAILURE("fs-9p"); DO_TEST("virtio-rnd"); + DO_TEST_FAILURE("virtio-rnd-backend-random-non-default-file"); + DO_TEST_FAILURE("virtio-rnd-backend-builtin"); + DO_TEST_FAILURE("virtio-rnd-transitional"); driver.bhyvecaps &=3D ~BHYVE_CAP_VIRTIO_RND; DO_TEST_FAILURE("virtio-rnd"); =20 --=20 2.49.0