From owner-dev-commits-src-main@freebsd.org Mon Jun 21 03:29:06 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id EE84665E8C6;
Mon, 21 Jun 2021 03:29: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 4G7Zkp6C8Hz3n9t;
Mon, 21 Jun 2021 03:29:06 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 B294215EA2;
Mon, 21 Jun 2021 03:29:06 +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 15L3T6pa076221;
Mon, 21 Jun 2021 03:29:06 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15L3T6vX076220;
Mon, 21 Jun 2021 03:29:06 GMT (envelope-from git)
Date: Mon, 21 Jun 2021 03:29:06 GMT
Message-Id: <202106210329.15L3T6vX076220@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Colin Percival <cperciva@FreeBSD.org>
Subject: git: 60a978bec912 - main - stand/common: Add file_addbuf()
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: 60a978bec9123fcb9c74bd925e06dd3f4faddac6
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for the main branch of the src repository
<dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Jun 2021 03:29:07 -0000
The branch main has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=60a978bec9123fcb9c74bd925e06dd3f4faddac6
commit 60a978bec9123fcb9c74bd925e06dd3f4faddac6
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2021-05-30 20:17:11 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2021-06-21 03:09:41 +0000
stand/common: Add file_addbuf()
This provides an interface for a memory buffer to be passed from the loader
to the kernel as a "preloaded module".
Reviewed by: kevans
---
stand/common/bootstrap.h | 1 +
stand/common/module.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/stand/common/bootstrap.h b/stand/common/bootstrap.h
index f671dba96e63..d94d35b555e4 100644
--- a/stand/common/bootstrap.h
+++ b/stand/common/bootstrap.h
@@ -260,6 +260,7 @@ void file_addmetadata(struct preloaded_file *, int, size_t, void *);
int file_addmodule(struct preloaded_file *, char *, int,
struct kernel_module **);
void file_removemetadata(struct preloaded_file *fp);
+int file_addbuf(const char *name, const char *type, size_t len, void *buf);
vm_offset_t build_font_module(vm_offset_t);
diff --git a/stand/common/module.c b/stand/common/module.c
index 34ffc10cded3..8bddd9f56f52 100644
--- a/stand/common/module.c
+++ b/stand/common/module.c
@@ -1042,6 +1042,57 @@ file_removemetadata(struct preloaded_file *fp)
fp->f_metadata = NULL;
}
+/*
+ * Add a buffer to the list of preloaded "files".
+ */
+int
+file_addbuf(const char *name, const char *type, size_t len, void *buf)
+{
+ struct preloaded_file *fp;
+ vm_offset_t dest;
+
+ /* We can't load first */
+ if ((file_findfile(NULL, NULL)) == NULL) {
+ command_errmsg = "can't load file before kernel";
+ return (-1);
+ }
+
+ /* Figure out where to load the data. */
+ dest = loadaddr;
+ if (archsw.arch_loadaddr != NULL)
+ dest = archsw.arch_loadaddr(LOAD_RAW, (void *)name, dest);
+
+ /* Create & populate control structure */
+ fp = file_alloc();
+ if (fp == NULL) {
+ snprintf(command_errbuf, sizeof (command_errbuf),
+ "no memory to load %s", name);
+ return (-1);
+ }
+ fp->f_name = strdup(name);
+ fp->f_type = strdup(type);
+ fp->f_args = NULL;
+ fp->f_metadata = NULL;
+ fp->f_loader = -1;
+ fp->f_addr = dest;
+ fp->f_size = len;
+ if ((fp->f_name == NULL) || (fp->f_type == NULL)) {
+ snprintf(command_errbuf, sizeof (command_errbuf),
+ "no memory to load %s", name);
+ free(fp->f_name);
+ free(fp->f_type);
+ return (-1);
+ }
+
+ /* Copy the data in. */
+ archsw.arch_copyin(buf, fp->f_addr, len);
+ loadaddr = fp->f_addr + len;
+
+ /* Add to the list of loaded files */
+ file_insert_tail(fp);
+ return(0);
+}
+
struct file_metadata *
metadata_next(struct file_metadata *md, int type)
{