From nobody Tue Feb 14 07:29:14 2023 X-Original-To: dev-commits-src-main@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 4PGCWZ4slmz3rL8D; Tue, 14 Feb 2023 07:29:14 +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 4PGCWZ45JPz4PBJ; Tue, 14 Feb 2023 07:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676359754; 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=majAo9FNHCGpUDPQgNCAgQVWKqHm+VxY+YOIXayr+h4=; b=i+m1QiTtJP3nnNVX1YAgxQSMg1fNS5aWY7LFRvcTkD03YqQJuo2hp0AL7j+F7GT3rzmswz 1lhtb/pIwZi/mMZTN+H/zrpE9pmsXU3WFalCHvcQULsNQJWyWOeVjtHBYiCTSFEj7Y5NPG l9umYwhNvmESIyi57b+2oGd435aRb4DMllKW6jgQI6kBqAGE6bCObRt4/clN0bXq/x/U2R 5bUGpYlm8uQHezZJUGZOewq5JxCbvuqYyeKSmTOOIJHn4QTiS4jtEZQAJuBebJHGzBJxxP szfqBHyMwBiHXrX9eqKOo04QAxb7ZGw2p8DGxDAZqdMAUFc8tGyheRuYbidQNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676359754; 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=majAo9FNHCGpUDPQgNCAgQVWKqHm+VxY+YOIXayr+h4=; b=hewU5TXREVloGdSSDKsE+xFSh3auggZmnriQ9G1B+tu1+vfomsJ1mM+5vJ++rnxgcQkdjO 8mM96cn0siItjYkbwyhKB6XWC8CN2lIxAQX+5KTKLQbRqKZWzI8d7EhDz58D1JycmPdSYN +OcFW1irqUk1EbmWANrvcv75bC5hwTpw50pkTN2/0yNYsx/j/P+6SZi2Jb83/lHv7XR+Hr BuiLHUSxzdTcc9lAggdkmTHMt7cXoBMwD5T/3S6rvoyPFkgaSw8DFH2trw9WNiVJfVV0Tm lJhSG/uYTF/eIaXbVMHLIY1L1bLlkTo/s0vxp1n9vGdi+1wlWIgwV3nXZCrliQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676359754; a=rsa-sha256; cv=none; b=soaHdX0qMy+a89E4rWAYmfsZ9oLb5/Lz01M3eOf/2mgd7/8s4rMJrGtIjLds7LvAHX+fqU 8/jNlUKn+gz3kSFG7yFW+XSdr3SDSoE3C4mvjo1iUl+u3A9c8eRQv63musqVzWvOmDL+Td MpyoHyzUPO+tcbpTsNLNtNA0Z7DkTZZCnIon5k8Q4rIkrTHuYsajkKJO+tG7zftZyvzY7A vn9p8m233tTZ2gPAi8lLw2nmNSdtiGLoV8QRcy3G94Q1pZYWxk1hYqTG1XZ1In1h+sOvJT 5y//nGG5k+fBe01cfEiwsqosZPNQOEGKrInrKIKr42YD2bBgcOQBE02268vvYQ== 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 4PGCWZ38XwzqnY; Tue, 14 Feb 2023 07:29:14 +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 31E7TE3N044135; Tue, 14 Feb 2023 07:29:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31E7TEUv044134; Tue, 14 Feb 2023 07:29:14 GMT (envelope-from git) Date: Tue, 14 Feb 2023 07:29:14 GMT Message-Id: <202302140729.31E7TEUv044134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: b11081dca76b - main - bhyve: add emulation for qemu's fwcfg data port List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b11081dca76b8e283495632b86b41539ee013857 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=b11081dca76b8e283495632b86b41539ee013857 commit b11081dca76b8e283495632b86b41539ee013857 Author: Corvin Köhne AuthorDate: 2021-08-11 08:00:34 +0000 Commit: Corvin Köhne CommitDate: 2023-02-14 07:28:49 +0000 bhyve: add emulation for qemu's fwcfg data port The data port returns the data of the fwcfg item. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38333 --- usr.sbin/bhyve/qemu_fwcfg.c | 40 ++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/qemu_fwcfg.h | 8 ++++++++ 2 files changed, 48 insertions(+) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index dec3fa83c493..13e21daca7ff 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -56,6 +56,8 @@ struct qemu_fwcfg_softc { uint32_t data_offset; union qemu_fwcfg_selector selector; + struct qemu_fwcfg_item items[QEMU_FWCFG_MAX_ARCHS] + [QEMU_FWCFG_MAX_ENTRIES]; }; static struct qemu_fwcfg_softc fwcfg_sc; @@ -87,6 +89,44 @@ qemu_fwcfg_data_port_handler(struct vmctx *const ctx __unused, const int in, const int port __unused, const int bytes, uint32_t *const eax, void *const arg __unused) { + if (bytes != sizeof(uint8_t)) { + warnx("%s: invalid size (%d) of IO port access", __func__, + bytes); + return (-1); + } + + if (!in) { + warnx("%s: Writes to qemu fwcfg data port aren't allowed", + __func__); + return (-1); + } + + /* get fwcfg item */ + struct qemu_fwcfg_item *const item = + &fwcfg_sc.items[fwcfg_sc.selector.architecture] + [fwcfg_sc.selector.index]; + if (item->data == NULL) { + warnx( + "%s: qemu fwcfg item doesn't exist (architecture %s index 0x%x)", + __func__, + fwcfg_sc.selector.architecture ? "specific" : "generic", + fwcfg_sc.selector.index); + *eax = 0x00; + return (0); + } else if (fwcfg_sc.data_offset >= item->size) { + warnx( + "%s: qemu fwcfg item read exceeds size (architecture %s index 0x%x size 0x%x offset 0x%x)", + __func__, + fwcfg_sc.selector.architecture ? "specific" : "generic", + fwcfg_sc.selector.index, item->size, fwcfg_sc.data_offset); + *eax = 0x00; + return (0); + } + + /* return item data */ + *eax = item->data[fwcfg_sc.data_offset]; + fwcfg_sc.data_offset++; + return (0); } diff --git a/usr.sbin/bhyve/qemu_fwcfg.h b/usr.sbin/bhyve/qemu_fwcfg.h index 26c4db0ff71e..58ef5ed3c6bf 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.h +++ b/usr.sbin/bhyve/qemu_fwcfg.h @@ -9,4 +9,12 @@ #include +#define QEMU_FWCFG_MAX_ARCHS 0x2 +#define QEMU_FWCFG_MAX_ENTRIES 0x4000 + +struct qemu_fwcfg_item { + uint32_t size; + uint8_t *data; +}; + int qemu_fwcfg_init(struct vmctx *const ctx);