From nobody Sun Dec 04 20:55:29 2022 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 4NQJq61fZxz4jX8w; Sun, 4 Dec 2022 20:55:30 +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 4NQJq6172dz3rmP; Sun, 4 Dec 2022 20:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670187330; 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=7hObj8f95Lyx2aeRt/GufvGKl+j4H0rVBHulQk4HGOQ=; b=w7Si+19OAME9vOYMnUOSp+tLpNTUHvuxyC2dcSx+2nscV13JNX/SN8NlaS73q3Kz86GYqw zf70FKTmzLkuIP8QVSd8Y5OGTL4Vg6SR4Y/Xhr9w31OdHyRLcRbfnxJ+/VsD33Tl81/9bR bRabkCfDdBUeZ1KG3aQWnz3ePjKjx7vPHRp8T0Hx/mjDI76vOy1cfObAHWHFGX9UwEk6vH gUgMYcYbrG3t5T7lgy9NX8eKnd81KT2R+WEWkZSCoWKHkbVr06oB+13pF9inh6T+/2sa5P 45b+3epctzJdxFZXuZMMgwOb4I4woP1Ge1fUXmFY3/FEDtC3baxZjYeURTohTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670187330; 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=7hObj8f95Lyx2aeRt/GufvGKl+j4H0rVBHulQk4HGOQ=; b=WqHJD74Ttz0T/qbjc6HMO6YuBzRrqmmZA6TIBaV09OodNajjVdPqYG6uKF0s37Tg/rOpE0 hyCeR8dnrlYoGJWWXc5FbUwHxuoiy8hT1Nxqwu7PGbnnFTxxNUtmAcIIxMkD4webV+LXig BoeD8wP0sLfi91rZRb4O1/JmZ5Zs6rR0t3flZb68Z8SWoo9e92zSW1n/DTOl2MigIQXVE+ DqoT4XXeMssXE/WfoIU044DFtoEamtq8A1VIX2HhLYNlj/X6wBd6YhBKxpYAnoNfJd0WhT YYyXNZh7IWATnNb/ezKGwn2ORfy0WaZPI5o+yj18Qqx+z97pQWykzIcBZi1JQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670187330; a=rsa-sha256; cv=none; b=DT4Jq8y1xTPOf7Vx9oHl9bgF2K+vSh4gf08k0lgl0BxqrgvemvyWjs5aOxnsykQqUjkhJ5 XMcHkzA46fmq/Eop7O3qUoKy5j2ho4wRXP27Bq9liqC1lamEzKW4g5/sQxjnUgh0IYk3Vq M55uBnJNK8//sB/Y6hCeT6MFqIIoQvfihYWDEkx5usfJoCgqjWn1P3BULJe5cckVjZIM9A QcZWTOqGa9nlclIabM4X1FxtXVIkm9C2NL1bZiov9Ss1OUi4a+g0DVQgiNRBm2LSE+LlWG kICFoWEeNZoTH7/Oy1rqfk//UC+bRD6AjNespBwsg+zUwm2oJ/HOhJsMmCqDUA== 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 4NQJq608BFzX7H; Sun, 4 Dec 2022 20:55:30 +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 2B4KtTkK062267; Sun, 4 Dec 2022 20:55:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B4KtTlo062266; Sun, 4 Dec 2022 20:55:29 GMT (envelope-from git) Date: Sun, 4 Dec 2022 20:55:29 GMT Message-Id: <202212042055.2B4KtTlo062266@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 9f7269677c5e - main - kboot: Add md_addr to metadata 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f7269677c5e70283a16887e1e4b4a1ed95a96fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9f7269677c5e70283a16887e1e4b4a1ed95a96fb commit 9f7269677c5e70283a16887e1e4b4a1ed95a96fb Author: Warner Losh AuthorDate: 2022-12-04 20:52:22 +0000 Commit: Warner Losh CommitDate: 2022-12-04 20:52:22 +0000 kboot: Add md_addr to metadata Save the address of where the metadata is loaded. Sponsored by: Netflix --- stand/common/bootstrap.h | 1 + stand/common/modinfo.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/stand/common/bootstrap.h b/stand/common/bootstrap.h index cb1c96dc3b69..bbe97e80323b 100644 --- a/stand/common/bootstrap.h +++ b/stand/common/bootstrap.h @@ -201,6 +201,7 @@ struct file_metadata { size_t md_size; uint16_t md_type; + vm_offset_t md_addr; /* Valid after copied to kernel space */ struct file_metadata *md_next; char md_data[1]; /* data are immediately appended */ }; diff --git a/stand/common/modinfo.c b/stand/common/modinfo.c index 0c00b2070274..381bd9dfd719 100644 --- a/stand/common/modinfo.c +++ b/stand/common/modinfo.c @@ -95,8 +95,10 @@ #define MOD_METADATA(a, mm, c) { \ COPY32(MODINFO_METADATA | mm->md_type, a, c);\ COPY32(mm->md_size, a, c); \ - if (c) \ + if (c) { \ archsw.arch_copyin(mm->md_data, a, mm->md_size);\ + mm->md_addr = a; \ + } \ a += MOD_ALIGN(mm->md_size); \ }