From nobody Tue Nov 29 13:58:05 2022
X-Original-To: dev-commits-src-branches@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 4NM3np055Lz4htkF;
Tue, 29 Nov 2022 13:58:06 +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 4NM3nn6NHgz4CWC;
Tue, 29 Nov 2022 13:58:05 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1669730285;
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=0GP5Hvqw3dnldhcMpSewsKxj0vn77RrACEDiCHL3jMA=;
b=CmTb0r2coQefGLfW0q6HAcvcYr5Jt86zMz5dHYt5m8BT8MErZxBsjbl+6M7IWooLvuzs0g
Qg9+swl3CHxGAilhs5OWwLmHEnGeIIDtfegvXkXVXwm8MzpfDcuj0B7kltS4cq0on5HEwS
+TrkUyWYKjGJZioSEM2vfv5SEUcA4b2TR9ymXFbEXmCWTHrrrHMU3eGRMqEgrTnhTeN2DR
qbdz4x1SkTcD1K0AYS4J07dVcZeQUWEWFR1C5AeGBFVPkMBqj83vr9pFbIgBHGoRE80P6a
Z77pYLoqh8rKx3TCkm+8U0Ytn2SUPgR2hwAm/UMq8w6SYgHRC6qPuHqTS8SiAw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1669730285;
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=0GP5Hvqw3dnldhcMpSewsKxj0vn77RrACEDiCHL3jMA=;
b=Gll4WZaKS4Z1I7GCv3uXvCxcjBqtI6f9ZZA8pR9hQ0q3+dniH4fd9z3gcCRaR3VQZgrFS8
9h3oSto5T65xmD9S9txxBgfx7JdG8bZyDv4B44RXoMWLCdEOYJknlg4xsSzcQCDPcOkJqW
nW13htbFKuuskTmIrVz3UVjNpZus80+mAaEsV8bwioU5OXL1V9cUlaYBesJZqtlsjcXrXs
A1/HRO6Ech7AQX0KOVNMctatHWzcKz1yhhaHB+UmDZwmwdqyfgysagKoP3CqQ5lIQj5yaG
QlzXeLEB2q7godBeF9WnK6GAiyLpJN9aKCRekCGELC5vLV3OWpD7+BaiMzBEZw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669730285; a=rsa-sha256; cv=none;
b=b2lMlOXZIj7iAxCLLYsVDIVfDzlPN+OX1Q/K2wdIV7cDqxQ27Y9LLtXOJvxtEGK6fJHK3Y
cnF9XuQ5dPti0WFhuBoljgaITC7hW2zBQ/fsXQ9efu4woN7MFEY9otvMA+pTZMpnwne7KH
Kxd7WB0nhoylF494vrCDY9F5OZnd69s9NyL9ABqQ6KBVMPkSF6HZpXbMsJ0YnPT01SRFgh
Duc7mjJqsNQbJz+t0xq6DwidELzPtTo/4+4Orp1+sIa+mqwtUuOfQ5BbMWGGFpdXoNR9pi
HLn5zgZ/IjXURGu6BXMkRFyJCwYidMlouF1z1//1219j+7HKJ/k4yZfAiuvxww==
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 4NM3nn5CFGzKSt;
Tue, 29 Nov 2022 13:58: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 2ATDw5T5029533;
Tue, 29 Nov 2022 13:58:05 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ATDw5Wm029532;
Tue, 29 Nov 2022 13:58:05 GMT
(envelope-from git)
Date: Tue, 29 Nov 2022 13:58:05 GMT
Message-Id: <202211291358.2ATDw5Wm029532@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: =?utf-8?Q?Corvin=20K=C3=B6hne?= <corvink@FreeBSD.org>
Subject: git: 8b01c0e8b938 - stable/13 - bhyve: add basl support for pointers
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@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/stable/13
X-Git-Reftype: branch
X-Git-Commit: 8b01c0e8b9381b6724c0ee53c167eb75b175e081
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by corvink:
URL: https://cgit.FreeBSD.org/src/commit/?id=8b01c0e8b9381b6724c0ee53c167eb75b175e081
commit 8b01c0e8b9381b6724c0ee53c167eb75b175e081
Author: Corvin Köhne <corvink@FreeBSD.org>
AuthorDate: 2022-04-06 09:10:39 +0000
Commit: Corvin Köhne <corvink@FreeBSD.org>
CommitDate: 2022-11-29 13:53:52 +0000
bhyve: add basl support for pointers
Some ACPI tables like XSDT contain pointers to other ACPI tables. When
an ACPI table is loaded by qemu's loader, the address in the guest
memory is unknown. For that reason, the qemu loader supports patching
those pointers. Basl keeps track of all pointers and causes the qemu
loader to patch all pointers.
The qemu ACPI table loader is unsupport yet. However, in a future commit
bhyve will use dynamic ACPI table offsets based on the size and
alignment requirements of each ACPI table. Therefore, tracking ACPI
table pointer is required too.
Reviewed by: jhb
Approved by: manu (mentor)
MFC after: 2 weeks
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D36991
(cherry picked from commit 49b947c01db3efd7587b17d4d7f47675e91dc2ad)
---
usr.sbin/bhyve/basl.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++
usr.sbin/bhyve/basl.h | 2 +
2 files changed, 135 insertions(+)
diff --git a/usr.sbin/bhyve/basl.c b/usr.sbin/bhyve/basl.c
index 77f26a930b94..1da0a7028f57 100644
--- a/usr.sbin/bhyve/basl.c
+++ b/usr.sbin/bhyve/basl.c
@@ -34,6 +34,13 @@ struct basl_table_length {
uint8_t size;
};
+struct basl_table_pointer {
+ STAILQ_ENTRY(basl_table_pointer) chain;
+ uint8_t src_signature[ACPI_NAMESEG_SIZE];
+ uint32_t off;
+ uint8_t size;
+};
+
struct basl_table {
STAILQ_ENTRY(basl_table) chain;
struct vmctx *ctx;
@@ -45,10 +52,30 @@ struct basl_table {
STAILQ_HEAD(basl_table_checksum_list,
basl_table_checksum) checksums;
STAILQ_HEAD(basl_table_length_list, basl_table_length) lengths;
+ STAILQ_HEAD(basl_table_pointer_list, basl_table_pointer) pointers;
};
static STAILQ_HEAD(basl_table_list, basl_table) basl_tables = STAILQ_HEAD_INITIALIZER(
basl_tables);
+static __inline uint64_t
+basl_le_dec(void *pp, size_t len)
+{
+ assert(len <= 8);
+
+ switch (len) {
+ case 1:
+ return ((uint8_t *)pp)[0];
+ case 2:
+ return le16dec(pp);
+ case 4:
+ return le32dec(pp);
+ case 8:
+ return le64dec(pp);
+ }
+
+ return 0;
+}
+
static __inline void
basl_le_enc(void *pp, uint64_t val, size_t len)
{
@@ -176,6 +203,73 @@ basl_finish_patch_checksums(struct basl_table *const table)
return (0);
}
+static struct basl_table *
+basl_get_table_by_signature(const uint8_t signature[ACPI_NAMESEG_SIZE])
+{
+ struct basl_table *table;
+
+ STAILQ_FOREACH(table, &basl_tables, chain) {
+ const ACPI_TABLE_HEADER *const header =
+ (const ACPI_TABLE_HEADER *)table->data;
+
+ if (strncmp(header->Signature, signature,
+ sizeof(header->Signature)) == 0) {
+ return (table);
+ }
+ }
+
+ warnx("%s: %.4s not found", __func__, signature);
+ return (NULL);
+}
+
+static int
+basl_finish_patch_pointers(struct basl_table *const table)
+{
+ struct basl_table_pointer *pointer;
+
+ STAILQ_FOREACH(pointer, &table->pointers, chain) {
+ const struct basl_table *src_table;
+ uint8_t *gva;
+ uint64_t gpa, val;
+
+ assert(pointer->off < table->len);
+ assert(pointer->off + pointer->size <= table->len);
+
+ src_table = basl_get_table_by_signature(pointer->src_signature);
+ if (src_table == NULL) {
+ warnx("%s: could not find ACPI table %.4s", __func__,
+ pointer->src_signature);
+ return (EFAULT);
+ }
+
+ /*
+ * Install ACPI tables directly in guest memory for use by
+ * guests which do not boot via EFI. EFI ROMs provide a pointer
+ * to the firmware generated ACPI tables instead, but it doesn't
+ * hurt to install the tables always.
+ */
+ gpa = BHYVE_ACPI_BASE + table->off;
+ if (gpa < BHYVE_ACPI_BASE) {
+ warnx("%s: table offset of 0x%8x is too large",
+ __func__, table->off);
+ return (EFAULT);
+ }
+
+ gva = vm_map_gpa(table->ctx, gpa, table->len);
+ if (gva == NULL) {
+ warnx("%s: could not map gpa [ 0x%16lx, 0x%16lx ]",
+ __func__, gpa, gpa + table->len);
+ return (ENOMEM);
+ }
+
+ val = basl_le_dec(gva + pointer->off, pointer->size);
+ val += BHYVE_ACPI_BASE + src_table->off;
+ basl_le_enc(gva + pointer->off, val, pointer->size);
+ }
+
+ return (0);
+}
+
static int
basl_finish_set_length(struct basl_table *const table)
{
@@ -212,6 +306,8 @@ basl_finish(void)
BASL_EXEC(basl_finish_install_guest_tables(table));
}
STAILQ_FOREACH(table, &basl_tables, chain) {
+ BASL_EXEC(basl_finish_patch_pointers(table));
+
/*
* Calculate the checksum as last step!
*/
@@ -268,6 +364,29 @@ basl_table_add_length(struct basl_table *const table, const uint32_t off,
return (0);
}
+static int
+basl_table_add_pointer(struct basl_table *const table,
+ const uint8_t src_signature[ACPI_NAMESEG_SIZE], const uint32_t off,
+ const uint8_t size)
+{
+ struct basl_table_pointer *pointer;
+
+ pointer = calloc(1, sizeof(struct basl_table_pointer));
+ if (pointer == NULL) {
+ warnx("%s: failed to allocate pointer", __func__);
+ return (ENOMEM);
+ }
+
+ memcpy(pointer->src_signature, src_signature,
+ sizeof(pointer->src_signature));
+ pointer->off = off;
+ pointer->size = size;
+
+ STAILQ_INSERT_TAIL(&table->pointers, pointer, chain);
+
+ return (0);
+}
+
int
basl_table_append_bytes(struct basl_table *const table, const void *const bytes,
const uint32_t len)
@@ -351,6 +470,19 @@ basl_table_append_length(struct basl_table *const table, const uint8_t size)
return (0);
}
+int
+basl_table_append_pointer(struct basl_table *const table,
+ const uint8_t src_signature[ACPI_NAMESEG_SIZE], const uint8_t size)
+{
+ assert(table != NULL);
+ assert(size == 4 || size == 8);
+
+ BASL_EXEC(basl_table_add_pointer(table, src_signature, table->len, size));
+ BASL_EXEC(basl_table_append_int(table, 0, size));
+
+ return (0);
+}
+
int
basl_table_create(struct basl_table **const table, struct vmctx *ctx,
const uint8_t *const name, const uint32_t alignment,
@@ -376,6 +508,7 @@ basl_table_create(struct basl_table **const table, struct vmctx *ctx,
STAILQ_INIT(&new_table->checksums);
STAILQ_INIT(&new_table->lengths);
+ STAILQ_INIT(&new_table->pointers);
STAILQ_INSERT_TAIL(&basl_tables, new_table, chain);
diff --git a/usr.sbin/bhyve/basl.h b/usr.sbin/bhyve/basl.h
index b478780cb74d..978b2722acf9 100644
--- a/usr.sbin/bhyve/basl.h
+++ b/usr.sbin/bhyve/basl.h
@@ -48,5 +48,7 @@ int basl_table_append_gas(struct basl_table *table, uint8_t space_id,
uint64_t address);
int basl_table_append_int(struct basl_table *table, uint64_t val, uint8_t size);
int basl_table_append_length(struct basl_table *table, uint8_t size);
+int basl_table_append_pointer(struct basl_table *table,
+ const uint8_t src_signature[ACPI_NAMESEG_SIZE], uint8_t size);
int basl_table_create(struct basl_table **table, struct vmctx *ctx,
const uint8_t *name, uint32_t alignment, uint32_t off);