From owner-dev-commits-src-main@freebsd.org Mon Jun 21 03:29:14 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 3405365E798;
Mon, 21 Jun 2021 03: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 4G7Zkx4bmBz3nDX;
Mon, 21 Jun 2021 03:29:13 +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 7AE1215E5A;
Mon, 21 Jun 2021 03:29:13 +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 15L3TDBe076372;
Mon, 21 Jun 2021 03:29:13 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15L3TD10076371;
Mon, 21 Jun 2021 03:29:13 GMT (envelope-from git)
Date: Mon, 21 Jun 2021 03:29:13 GMT
Message-Id: <202106210329.15L3TD10076371@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: fe51b5a76de3 - main - kern_tslog: Include tslog data from loader
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: fe51b5a76de38d20cddc05a4c6cb1103d1a0547e
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:14 -0000
The branch main has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=fe51b5a76de38d20cddc05a4c6cb1103d1a0547e
commit fe51b5a76de38d20cddc05a4c6cb1103d1a0547e
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2021-05-30 23:25:01 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2021-06-21 03:09:47 +0000
kern_tslog: Include tslog data from loader
The i386 loader (and hopefully others to come) now passes tslog data
as a "preloaded module". Include this in the data returned by the
debug.tslog sysctl.
Reviewed by: kevans
---
sys/kern/kern_tslog.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/sys/kern/kern_tslog.c b/sys/kern/kern_tslog.c
index a0cb230f191c..dd3b25158340 100644
--- a/sys/kern/kern_tslog.c
+++ b/sys/kern/kern_tslog.c
@@ -28,6 +28,8 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/linker.h>
#include <sys/sbuf.h>
#include <sys/sysctl.h>
#include <sys/systm.h>
@@ -74,6 +76,9 @@ sysctl_debug_tslog(SYSCTL_HANDLER_ARGS)
int error;
struct sbuf *sb;
size_t i, limit;
+ caddr_t loader_tslog;
+ void * loader_tslog_buf;
+ size_t loader_tslog_len;
/*
* This code can race against the code in tslog() which stores
@@ -84,6 +89,16 @@ sysctl_debug_tslog(SYSCTL_HANDLER_ARGS)
* anyone will ever experience this race.
*/
sb = sbuf_new_for_sysctl(NULL, NULL, 1024, req);
+
+ /* Get data from the boot loader, if it provided any. */
+ loader_tslog = preload_search_by_type("TSLOG data");
+ if (loader_tslog != NULL) {
+ loader_tslog_buf = preload_fetch_addr(loader_tslog);
+ loader_tslog_len = preload_fetch_size(loader_tslog);
+ sbuf_bcat(sb, loader_tslog_buf, loader_tslog_len);
+ }
+
+ /* Add data logged within the kernel. */
limit = MIN(nrecs, nitems(timestamps));
for (i = 0; i < limit; i++) {
sbuf_printf(sb, "%p", timestamps[i].td);