From nobody Tue Oct 18 06:03:05 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ms3F55sBhz4g81l; Tue, 18 Oct 2022 06:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ms3F5551Pz3bgt; Tue, 18 Oct 2022 06:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666072985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qfvYvCKgSShj9+PJT6J3i8RjnJ/5L1fm8Syfl0E+Rig=; b=a5kzuY1dCEZ6GSYXXi9eRgMAasfh4Q/d139HRzw+13OmXJR+4RT6zmeuKYl7j9GtbraJfG bI9xKGxprB+v5i/pIXOqj6OHC9xSGXBmKGaG3wPXZ49dMgx4RgQ9egoaGu580Yf0R/+IAb eOIYMweRMdCOzCGa8TAQbFPM/2PwY9Qp6t2B5Xlsd/+xznq4dl9fphaTBv+xosxt7Ik7iN K9WdBlp6171jqjT3Pu9Ic8C5odW1KZITK1zrNRYTyHZ5XP68PHbPpNMPLaeqOooW7oAKXJ qSpXQZtNg8sEIe6ntjxgg3TUY6YP2/cvJOSAENXAk2z64gR/uxxJ4gW5+wnoNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ms3F53n0jz150x; Tue, 18 Oct 2022 06:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29I635VJ097282; Tue, 18 Oct 2022 06:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29I635Zd097281; Tue, 18 Oct 2022 06:03:05 GMT (envelope-from git) Date: Tue, 18 Oct 2022 06:03:05 GMT Message-Id: <202210180603.29I635Zd097281@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 0e1f5ab7db2c - main - virtio_mmio: Support command-line parameters List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e1f5ab7db2cd2837f97f169122897b19c185dbd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666072985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qfvYvCKgSShj9+PJT6J3i8RjnJ/5L1fm8Syfl0E+Rig=; b=FosB54JfTF8NMnliYr5hgZEq3JikDoT2Y2NZ2kTCT3/R+/FbjG7tpoecthkvDbzMg+vAQx 7sSB6YVx5cVF5YHTauuBvzjDkmZfpZU6sp2oMDa3MpM/bv+siQVstTIrWoBiIZT1FXNaWt jjuyXtMpecGER5XWHJoT8t3nHpaqwe9LnGWeDsmAjCthe0PVsWAON+xQSfELak7+wj1pmg IvUdYbnrhIDsTiLZox97rZT1bPvpD2GUkz7D/GCPNoncVGSb0+B+0ZVFcE83yLf1tAGsAL EHFbEPcgqFatT4f212ZkDuNrchAKmsFV/fNG7RpSEYuQuQLuArqRN/b8bxujOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666072985; a=rsa-sha256; cv=none; b=gCQOe/dpwmra1d7qOXuyTQoklNfSprJiGylI6LuDrFLgXogFh+N9zwgWS0/PAL/zAtEjc7 X7ZiPiWMTHSJIgVMtE8RqPi2pz+sR5ax7rgEVk0Vcxatbzp6JGxvVk4cnhoj8iIZQwsMBR o8LGQQ0ZNsjgBFKmetFVI+KOhWoNift2ByXEkfRWFGgs7erWjuzmmc290Mn6APyeUwYgy1 e32SRJSOO+J+t/jay1E5UFwjxjHlOyFRPRAEOtXhlhkOs7pileHDusJmzjBqQ4vJDAQBmf Tuy8cyrYOZS5tigfiSg9mNQBvilqSezm3oJEmVYGLd1up5tIrpq4T7EN+omImw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0e1f5ab7db2cd2837f97f169122897b19c185dbd commit 0e1f5ab7db2cd2837f97f169122897b19c185dbd Author: Colin Percival AuthorDate: 2022-08-13 00:54:26 +0000 Commit: Colin Percival CommitDate: 2022-10-18 06:02:21 +0000 virtio_mmio: Support command-line parameters The Virtio MMIO bus driver was added in 2014 with support for devices exposed via FDT; in 2018 support was added to discover Virtio MMIO devices via ACPI tables, as in QEMU. The Firecracker VMM eschews both FDT and ACPI, instead presenting device information via kernel command line arguments of the form virtio_mmio.device=. These command line parameters get converted into kernel environment variables; this adds support for parsing those variables and attaching virtio_mmio children to nexus. There is a case to be made that it would be cleaner to have a new "cmdlinebus" attached to nexus and virtio_mmio children attached to that. A future commit might do that. Discussed with: imp, jrtc27 Sponsored by: https://patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D36189 --- sys/conf/files | 1 + sys/dev/virtio/mmio/virtio_mmio_cmdline.c | 150 ++++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+) diff --git a/sys/conf/files b/sys/conf/files index b7da3626111d..39e6d4aaf0a8 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3437,6 +3437,7 @@ dev/virtio/pci/virtio_pci_legacy.c optional virtio_pci dev/virtio/pci/virtio_pci_modern.c optional virtio_pci dev/virtio/mmio/virtio_mmio.c optional virtio_mmio dev/virtio/mmio/virtio_mmio_acpi.c optional virtio_mmio acpi +dev/virtio/mmio/virtio_mmio_cmdline.c optional virtio_mmio dev/virtio/mmio/virtio_mmio_fdt.c optional virtio_mmio fdt dev/virtio/mmio/virtio_mmio_if.m optional virtio_mmio dev/virtio/network/if_vtnet.c optional vtnet diff --git a/sys/dev/virtio/mmio/virtio_mmio_cmdline.c b/sys/dev/virtio/mmio/virtio_mmio_cmdline.c new file mode 100644 index 000000000000..cb4762adc964 --- /dev/null +++ b/sys/dev/virtio/mmio/virtio_mmio_cmdline.c @@ -0,0 +1,150 @@ +/*- + * Copyright (c) 2022 Colin Percival + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include + +/* Parse @:[:] and add a child. */ +static void +parsearg(driver_t *driver, device_t parent, char * arg) +{ + device_t child; + char * p; + unsigned long sz; + unsigned long baseaddr; + unsigned long irq; + unsigned long id; + + /* */ + sz = strtoul(arg, &p, 0); + if ((sz == 0) || (sz == ULONG_MAX)) + goto bad; + switch (*p) { + case 'E': case 'e': + sz <<= 10; + /* FALLTHROUGH */ + case 'P': case 'p': + sz <<= 10; + /* FALLTHROUGH */ + case 'T': case 't': + sz <<= 10; + /* FALLTHROUGH */ + case 'G': case 'g': + sz <<= 10; + /* FALLTHROUGH */ + case 'M': case 'm': + sz <<= 10; + /* FALLTHROUGH */ + case 'K': case 'k': + sz <<= 10; + p++; + break; + } + + /* @ */ + if (*p++ != '@') + goto bad; + baseaddr = strtoul(p, &p, 0); + if ((baseaddr == 0) || (baseaddr == ULONG_MAX)) + goto bad; + + /* : */ + if (*p++ != ':') + goto bad; + irq = strtoul(p, &p, 0); + if ((irq == 0) || (irq == ULONG_MAX)) + goto bad; + + /* Optionally, : */ + if (*p) { + if (*p++ != ':') + goto bad; + id = strtoul(p, &p, 0); + if ((id == 0) || (id == ULONG_MAX)) + goto bad; + } else { + id = 0; + } + + /* Should have reached the end of the string. */ + if (*p) + goto bad; + + /* Create the child and assign its resources. */ + child = BUS_ADD_CHILD(parent, 0, driver->name, id ? id : -1); + bus_set_resource(child, SYS_RES_MEMORY, 0, baseaddr, sz); + bus_set_resource(child, SYS_RES_IRQ, 0, irq, 1); + device_set_driver(child, driver); + + return; + +bad: + printf("Error parsing virtio_mmio parameter: %s\n", arg); +} + +static void +vtmmio_cmdline_identify(driver_t *driver, device_t parent) +{ + size_t n; + char name[] = "virtio_mmio.device_XXXX"; + char * val; + + /* First variable just has its own name. */ + if ((val = kern_getenv("virtio_mmio.device")) == NULL) + return; + parsearg(driver, parent, val); + freeenv(val); + + /* The rest have _%zu suffixes. */ + for (n = 1; n <= 9999; n++) { + sprintf(name, "virtio_mmio.device_%zu", n); + if ((val = kern_getenv(name)) == NULL) + return; + parsearg(driver, parent, val); + freeenv(val); + } +} + +static device_method_t vtmmio_cmdline_methods[] = { + /* Device interface. */ + DEVMETHOD(device_identify, vtmmio_cmdline_identify), + DEVMETHOD(device_probe, vtmmio_probe), + + DEVMETHOD_END +}; +DEFINE_CLASS_1(virtio_mmio, vtmmio_cmdline_driver, vtmmio_cmdline_methods, + sizeof(struct vtmmio_softc), vtmmio_driver); +DRIVER_MODULE(vtmmio_cmdline, nexus, vtmmio_cmdline_driver, 0, 0);