From nobody Sun May 7 17:59:52 2023
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 4QDsdN5tsqz49JC4;
Sun, 7 May 2023 17:59:52 +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 4QDsdN5LG7z47yh;
Sun, 7 May 2023 17:59:52 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683482392;
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=AU3wLN1AIGlCFehkj40L+hfXgPOOqq8c7jnIieoyUEU=;
b=vRrzt4y2xRHZoltKGHDNUFLQvNNMRdeoByIhQTbzQVxbE3u8yptSHJ9Z1oqpsmgHh8qPjX
VU5TOObMBG64N40VjeXReVslO5qDG6gM64BfAQ6ArvVdUrNQ/EiByGjMNEKA74EL9kJvHI
/E7Z/Uc0BY0E1fSDqfkHRPNXdtDbxqvlYtcLAnKWw1a4iwLQYHkDGAVGzzBgmgiuMPfQQ3
w3qlvUWrVYPJUhTxumLMgptq/m/QCopu0Yx2yCshfp5NuRnAptDPSr8R95B+0BOunC6y/8
LzrjNdq6+V89XVIJ5oeqLV5GZcT66HrydVQOE8072DnkMD154QIGGsBd+0MLIg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683482392;
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=AU3wLN1AIGlCFehkj40L+hfXgPOOqq8c7jnIieoyUEU=;
b=GUUc10CQyS9bB1lxmP9SSM2Z8CMGs8TnqkN+sKNJd7AuFxAxoXH+HnUa3H6JVXOR0XNn9k
kvVF7UJ3Ma4+8I2cwnX4poRWDaLsdHx6bI7j/0uYVuaT41Ct5WUGAvgZoZCReOR9jrGCiV
kBZ7ve4J0Avz5Y006c8blvY8AkbIiW5FJhXBDa0etU/vobx+rCYIXcf6GPYw3XTeWlRoJA
UQpSLmKuXVddWzo4sCgU572M6zNrIQMKtr5Sr6DQpjTj/86BwfbcpMuPyUmyuhwo7WzNbh
tXYwVo7Pgpq7+dfahPy8Ewl+Hm/5Gg0cHA0kWcQyMPtOysG0vtwyqJOnnVsU0A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683482392; a=rsa-sha256; cv=none;
b=rVxYdOpEQQDWooW2Yt9YdJe2/g91JY9RbHfkvgusupblqWK3o3Yo8C9cWwDMmOW8GW81Ui
wdlFcUpVDkWi0mJ2YQWjKa86E9NU5A8mfoTrXcZvJV8cz4BIxlSDTBMB5U9XQbwIHe9JzF
AMgPHyEeADkHc6Cu7O7tt5wLvgFmA5meHYvCoz4k1pWmWBRDyy9x5LN59sDDHQJXaNiAoY
QlLv+SHgioKTR58XzEJbEealpYSZ7clfSbDDOGKHn7h3tMi0lGwAdE5Gi5zHgEkM5UicOX
QEeRx5sWA6hFwXnIDPTVQidN3Q/NgASNog9BIqH2mCnEMrDHFxyfhws7hXUqxw==
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 4QDsdN4LjPzSMX;
Sun, 7 May 2023 17:59:52 +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 347HxqkG007745;
Sun, 7 May 2023 17:59:52 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347Hxq5l007744;
Sun, 7 May 2023 17:59:52 GMT
(envelope-from git)
Date: Sun, 7 May 2023 17:59:52 GMT
Message-Id: <202305071759.347Hxq5l007744@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: a2f6734d9d5d - stable/13 - dtrace: get rid of uchar_t types
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a2f6734d9d5da7d5407d8b61b926967920fec4d4
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=a2f6734d9d5da7d5407d8b61b926967920fec4d4
commit a2f6734d9d5da7d5407d8b61b926967920fec4d4
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2023-04-20 16:19:42 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-07 17:54:08 +0000
dtrace: get rid of uchar_t types
Callers are specifying uint8_t anyway and this slightly reduces
dependencies on compatibility typedefs. No functional change intended.
Reviewed by: markj, mhorne
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D39490
(cherry picked from commit 1a149d65baed31b90a0b8abe2d6c5a568122a5ec)
---
sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h | 4 ++--
sys/cddl/dev/dtrace/amd64/dtrace_subr.c | 4 ++--
sys/cddl/dev/dtrace/i386/dtrace_subr.c | 4 ++--
sys/cddl/dev/dtrace/x86/instr_size.c | 12 ++++++------
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
index 5cad5a3b18c9..d3d8fbca6164 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
@@ -2399,8 +2399,8 @@ extern void dtrace_safe_synchronous_signal(void);
extern int dtrace_mach_aframes(void);
#if defined(__i386) || defined(__amd64)
-extern int dtrace_instr_size(uchar_t *instr);
-extern int dtrace_instr_size_isa(uchar_t *, model_t, int *);
+extern int dtrace_instr_size(uint8_t *instr);
+extern int dtrace_instr_size_isa(uint8_t *, model_t, int *);
extern void dtrace_invop_callsite(void);
#endif
extern void dtrace_invop_add(int (*)(uintptr_t, struct trapframe *, uintptr_t));
diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
index 2521afc7b443..c4a36e851c3f 100644
--- a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
+++ b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
@@ -449,7 +449,7 @@ dtrace_trap(struct trapframe *frame, u_int type)
* Offset the instruction pointer to the instruction
* following the one causing the fault.
*/
- frame->tf_rip += dtrace_instr_size((u_char *) frame->tf_rip);
+ frame->tf_rip += dtrace_instr_size((uint8_t *) frame->tf_rip);
return (1);
/* Page fault. */
case T_PAGEFLT:
@@ -461,7 +461,7 @@ dtrace_trap(struct trapframe *frame, u_int type)
* Offset the instruction pointer to the instruction
* following the one causing the fault.
*/
- frame->tf_rip += dtrace_instr_size((u_char *) frame->tf_rip);
+ frame->tf_rip += dtrace_instr_size((uint8_t *) frame->tf_rip);
return (1);
default:
/* Handle all other traps in the usual way. */
diff --git a/sys/cddl/dev/dtrace/i386/dtrace_subr.c b/sys/cddl/dev/dtrace/i386/dtrace_subr.c
index 69a07e8ee968..dedc1ffe84c8 100644
--- a/sys/cddl/dev/dtrace/i386/dtrace_subr.c
+++ b/sys/cddl/dev/dtrace/i386/dtrace_subr.c
@@ -449,7 +449,7 @@ dtrace_trap(struct trapframe *frame, u_int type)
* Offset the instruction pointer to the instruction
* following the one causing the fault.
*/
- frame->tf_eip += dtrace_instr_size((u_char *) frame->tf_eip);
+ frame->tf_eip += dtrace_instr_size((uint8_t *) frame->tf_eip);
return (1);
/* Page fault. */
case T_PAGEFLT:
@@ -461,7 +461,7 @@ dtrace_trap(struct trapframe *frame, u_int type)
* Offset the instruction pointer to the instruction
* following the one causing the fault.
*/
- frame->tf_eip += dtrace_instr_size((u_char *) frame->tf_eip);
+ frame->tf_eip += dtrace_instr_size((uint8_t *) frame->tf_eip);
return (1);
default:
/* Handle all other traps in the usual way. */
diff --git a/sys/cddl/dev/dtrace/x86/instr_size.c b/sys/cddl/dev/dtrace/x86/instr_size.c
index 6eea987244b1..a2a9b9342566 100644
--- a/sys/cddl/dev/dtrace/x86/instr_size.c
+++ b/sys/cddl/dev/dtrace/x86/instr_size.c
@@ -49,8 +49,8 @@
typedef u_int model_t;
#define DATAMODEL_NATIVE 0
-int dtrace_instr_size(uchar_t *);
-int dtrace_instr_size_isa(uchar_t *, model_t, int *);
+int dtrace_instr_size(uint8_t *);
+int dtrace_instr_size_isa(uint8_t *, model_t, int *);
#endif
#include <dis_tables.h>
@@ -83,7 +83,7 @@ static int
dtrace_dis_get_byte(void *p)
{
int ret;
- uchar_t **instr = p;
+ uint8_t **instr = p;
ret = **instr;
*instr += 1;
@@ -101,7 +101,7 @@ dtrace_dis_get_byte(void *p)
*/
/* ARGSUSED2 */
static int
-dtrace_dis_isize(uchar_t *instr, dis_isize_t which, model_t model, int *rmindex)
+dtrace_dis_isize(uint8_t *instr, dis_isize_t which, model_t model, int *rmindex)
{
int sz;
dis86_t x;
@@ -127,13 +127,13 @@ dtrace_dis_isize(uchar_t *instr, dis_isize_t which, model_t model, int *rmindex)
}
int
-dtrace_instr_size_isa(uchar_t *instr, model_t model, int *rmindex)
+dtrace_instr_size_isa(uint8_t *instr, model_t model, int *rmindex)
{
return (dtrace_dis_isize(instr, DIS_ISIZE_INSTR, model, rmindex));
}
int
-dtrace_instr_size(uchar_t *instr)
+dtrace_instr_size(uint8_t *instr)
{
return (dtrace_dis_isize(instr, DIS_ISIZE_INSTR, DATAMODEL_NATIVE,
NULL));
From nobody Sun May 7 17:59:53 2023
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 4QDsdQ0qLjz49J6F;
Sun, 7 May 2023 17:59:54 +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 4QDsdP6hPxz48gm;
Sun, 7 May 2023 17:59:53 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683482394;
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=+dRd7aDM2wfavjqqgjoTpTdJ1HbsD2jOihI2f4/EJBc=;
b=dwcGlBNpAMaf5mwBym6Aqg6RL8Yg9/ttJ3bh/z13/jA4Oo0UCS/Q52ceToT/Q9+uuLzqea
lnp4EayUnCw7ovc7cvohaCI7LYNBhQXnWWVjVh8wnRYjWpx+O2ug/eEl/mFIogJGWACnFh
xw2xUVy/JuqlGpOHd49dmZ3H/U9djStRr99J2oStABOriKQ6tz/fJgoZRFfNPbnij14qRN
i1r0UslPP6LLOXrleUS7oV7FDvoe9jdMbkBIZtocuwF73rbP0gSo6rn4ns6FcS/HlRm5Mk
pczaGpS6KpBil6il0LLxxgpSUlAgwx9oaHqQtSR7Mylpf1ofmSG2QfI0wCqgUA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683482394;
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=+dRd7aDM2wfavjqqgjoTpTdJ1HbsD2jOihI2f4/EJBc=;
b=n6wIRJIQuXy7yZvedzkVMZ3UiGmXLbHy/Y4I5tPsYSv4f/PqvsSXLsvZz+E73s+plQhtMc
8LHKfbalRvVo1Zw1KAeJ1YOm/RgKX6iFncNFmahYYraL2uHRx7gWHnL1bnN2tceYk1xW+P
f7+HncLE012fbC17Uv6G4YswZBRIedknMYF2UG5nUjl67tcDIAYb4LTXcwhXMaPHck2u92
4JE3THisMYQvGa0NK16WiSVUb5iUBQE2hAERGCkeHd35nuiwLY5CqzUWgipHQe90nkDQ7Y
gJniMCCWqpILbOzouD1bAagUm4gsdxpNbig3WzXHx8+cNv6x3G6kT5fiYACiTA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683482394; a=rsa-sha256; cv=none;
b=qyFIFe4B/NW1dZi1gHyfG4i1K0S7ZNMqTpxB4oxWrI9fijBb/2JQucSMk49Wsaa8htQajs
YS7worf9BsbvsQmm65CwcN6Ss1rkEuHYPEd0QFXZrUmh2UsiXYyMTxh2pkUNxQGBzmNeWa
7f0xObEWS75WT4JxFbpN2HyHbjz1JubVfdjS6t1HQES9AxESsot5wmrY0oSs3cl+67n3Xu
9R9Ut95wcdEBE9Dd71QZRbVX/tkQyYexRpaR9nVn/NgOGwE6Y/fXoPG6wHQ1cGhaW7GaNt
gORvcq/5CXnCmgS/Cp//kYe78bdOfeVh00UUoVTMkkD0bmxgTydNEnUGPCgFXw==
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 4QDsdP5TkqzSbS;
Sun, 7 May 2023 17:59:53 +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 347HxrQT007764;
Sun, 7 May 2023 17:59:53 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347HxrUq007763;
Sun, 7 May 2023 17:59:53 GMT
(envelope-from git)
Date: Sun, 7 May 2023 17:59:53 GMT
Message-Id: <202305071759.347HxrUq007763@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 4d9000cb22a9 - stable/13 - dtrace: expose dtrace_instr_size() to userland and implement it for riscv
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 4d9000cb22a9b17df4815df5f34773cf8862383a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=4d9000cb22a9b17df4815df5f34773cf8862383a
commit 4d9000cb22a9b17df4815df5f34773cf8862383a
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2023-04-20 16:21:46 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-07 17:54:08 +0000
dtrace: expose dtrace_instr_size() to userland and implement it for riscv
dtrace_instr_size() is needed by the forthcoming RISC-V port of kinst,
as well as by libdtrace in D38825 for both amd64 and RISC-V.
Reviewed by: markj, mhorne
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D39489
(cherry picked from commit 080e56a6c98c7e7a241a4260d4c19d3cad5b22af)
---
cddl/lib/libdtrace/Makefile | 6 +++++-
.../contrib/opensolaris/uts/common/sys/dtrace.h | 5 ++++-
sys/cddl/dev/dtrace/riscv/instr_size.c | 22 ++++++++++++++++++++++
sys/modules/dtrace/dtrace/Makefile | 4 ++++
4 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
index 05b183215f4c..3fb0ec0bafb0 100644
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@@ -125,10 +125,14 @@ CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
.endif
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
-SRCS+= dis_tables.c
+SRCS+= dis_tables.c instr_size.c
DSRCS+= regs_x86.d
.endif
+.if ${MACHINE_CPUARCH} == "riscv"
+SRCS+= instr_size.c
+.endif
+
YFLAGS+=-d
LIBADD= ctf elf proc pthread rtld_db
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
index d3d8fbca6164..7b8da08e9ae9 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
@@ -2399,7 +2399,6 @@ extern void dtrace_safe_synchronous_signal(void);
extern int dtrace_mach_aframes(void);
#if defined(__i386) || defined(__amd64)
-extern int dtrace_instr_size(uint8_t *instr);
extern int dtrace_instr_size_isa(uint8_t *, model_t, int *);
extern void dtrace_invop_callsite(void);
#endif
@@ -2428,6 +2427,10 @@ extern void dtrace_helpers_destroy(proc_t *);
#endif /* _KERNEL */
+#if defined(__i386) || defined(__amd64) || defined (__riscv)
+extern int dtrace_instr_size(uint8_t *instr);
+#endif
+
#endif /* _ASM */
#if defined(__i386) || defined(__amd64)
diff --git a/sys/cddl/dev/dtrace/riscv/instr_size.c b/sys/cddl/dev/dtrace/riscv/instr_size.c
new file mode 100644
index 000000000000..bfdc962f4aa9
--- /dev/null
+++ b/sys/cddl/dev/dtrace/riscv/instr_size.c
@@ -0,0 +1,22 @@
+/*
+ * SPDX-License-Identifier: CDDL 1.0
+ *
+ * Copyright 2023 Christos Margiolis <christos@FreeBSD.org>
+ */
+
+#include <sys/types.h>
+#include <sys/dtrace.h>
+
+#include <machine/riscvreg.h>
+
+#define RVC_MASK 0x03
+
+int
+dtrace_instr_size(uint8_t *instr)
+{
+ /* Detect compressed instructions. */
+ if ((~(*instr) & RVC_MASK) == 0)
+ return (INSN_SIZE);
+ else
+ return (INSN_C_SIZE);
+}
diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile
index 0bd81bb39db0..1513418281ad 100644
--- a/sys/modules/dtrace/dtrace/Makefile
+++ b/sys/modules/dtrace/dtrace/Makefile
@@ -22,8 +22,12 @@ SRCS+= dis_tables.c \
instr_size.c
CFLAGS+= -I${SYSDIR}/cddl/contrib/opensolaris/uts/intel \
-I${SYSDIR}/cddl/dev/dtrace/x86
+.endif
+.if ${MACHINE_CPUARCH} == "riscv"
+SRCS+= instr_size.c
.endif
+
CFLAGS+= ${OPENZFS_CFLAGS}
SRCS+= bus_if.h device_if.h vnode_if.h
From nobody Sun May 7 17:59:54 2023
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 4QDsdR18f0z49J0g;
Sun, 7 May 2023 17:59:55 +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 4QDsdR0RXkz48tP;
Sun, 7 May 2023 17:59:55 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683482395;
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=bHluKRCNIuVKxqxaecsq5mxIUD64zLn2BzL4c3nS0W8=;
b=u6C6J/SiA1xmfg5GvnkQwFDuxLbrONIy9SBKsgdkWM87RFwJD6yghAQuxvnDreoOTr8ML6
M/ZEmgwPwPOn7NowwfCavyFAiKzg3xhQvDHPMEKxyAU/ruIXJHPmGl4bvPeMg//mXax5NM
X3kcI/Bqx94VmsY4Y3jAIybsk4LPkTHeS+H7giBQqtgbwXEVbQtcw40SSz/yfIjiEq/ZXq
BMdjptbs73Uqh6cXW60jcDCqqFeV1UHrGiUxk85Om4O/6wzogViQc2GpUlXxo3QHVEItfK
/JhVzwmySghV9+C9JOglqcwxwjDL1fzdOIqPComLYmtcq07K6JJw4zTIzFgwzQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683482395;
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=bHluKRCNIuVKxqxaecsq5mxIUD64zLn2BzL4c3nS0W8=;
b=uV7+uWZgktBxvf2ffS8936zfRFjIHh8837f9kjGM9KNw942Ky9I5+RFL25E27xNzquEOJR
M7X8fARQ8ARko0vzVa3EGiF/PxySgVA/Z6WDBsFtvqIi8vengK8BRjPpWIseaBQBLWQP5z
FnEmHKAN+BkLomXty2FrPxTrewuiJmtTU24/DWqGIUIDrDtJGhk010pKV4xMvFwzG/BwSK
6Cgh1A84Ch39NpMZ6Pw5f4D2mleDtAmAU4zMHhVdOT4X6bs9eQBQUFCJh/sffK6EErVOii
kCJCF+XTE8Tk+7ahlEGkuNCak9eEVtPRGRnJwu6gs5QYHZ4YaDNpquZQIAcaTg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683482395; a=rsa-sha256; cv=none;
b=hTuBP/5eoImAEJPQGjMlHKDrcBxYAX/XRKlQlbhZRjmGMqGFaFZTyMsiSDh1PWWu5lnsOD
bQODXKL35cZy/GquFH8+kh9rtN/JQlcNxxKF7l0dGBNgY5ScKODHnkvDsVp0LPs1hfCHAi
ra8r4dNLBLUz5rEkeyfO8+I6FcQOqU1baUpc9lhSWCvGMG4CpDD4F5YnCoxWlyiu1F7w64
6q5POYImS7KwZX14ibeKWVdrA8WUuSSuNxF7YaVjJDKnBOINY+yVc/GJ2CuHez3hREdXxl
MByra3Ui15l+BBpWPsQR53D9/NFqjOWyp3JU2Q2I0L83JpTMvjVlXI0/POPxkA==
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 4QDsdQ6P8qzSGc;
Sun, 7 May 2023 17:59:54 +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 347HxsXV007785;
Sun, 7 May 2023 17:59:54 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347HxsYY007784;
Sun, 7 May 2023 17:59:54 GMT
(envelope-from git)
Date: Sun, 7 May 2023 17:59:54 GMT
Message-Id: <202305071759.347HxsYY007784@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: facd3a41d9d1 - stable/13 - dtrace: use dtrace_instr_size() in the riscv dtrace_subr.c
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: facd3a41d9d1d27a2cd96ba855fc73b702caa3db
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=facd3a41d9d1d27a2cd96ba855fc73b702caa3db
commit facd3a41d9d1d27a2cd96ba855fc73b702caa3db
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2023-04-20 16:24:03 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-07 17:54:08 +0000
dtrace: use dtrace_instr_size() in the riscv dtrace_subr.c
No functional change intended.
Reviewed by: mhorne, markj
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D39652
(cherry picked from commit 75081b9ed8e67c8443551828f1b5ccf3d449b41b)
---
sys/cddl/dev/dtrace/riscv/dtrace_subr.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/sys/cddl/dev/dtrace/riscv/dtrace_subr.c b/sys/cddl/dev/dtrace/riscv/dtrace_subr.c
index f32bb3a2343e..3d43adb8a92f 100644
--- a/sys/cddl/dev/dtrace/riscv/dtrace_subr.c
+++ b/sys/cddl/dev/dtrace/riscv/dtrace_subr.c
@@ -190,8 +190,6 @@ dtrace_gethrestime(void)
int
dtrace_trap(struct trapframe *frame, u_int type)
{
- uint16_t insn;
-
/*
* A trap can occur while DTrace executes a probe. Before
* executing the probe, DTrace blocks re-scheduling and sets
@@ -219,15 +217,10 @@ dtrace_trap(struct trapframe *frame, u_int type)
/*
* Offset the instruction pointer to the instruction
- * following the one causing the fault. Check if the
- * instruction is compressed or not. Standard
- * instructions always have bits [1:0] == 11.
+ * following the one causing the fault.
*/
- insn = *(uint16_t *)frame->tf_sepc;
- if (match_opcode(insn, 0x3, 0x3))
- frame->tf_sepc += INSN_SIZE;
- else
- frame->tf_sepc += INSN_C_SIZE;
+ frame->tf_sepc +=
+ dtrace_instr_size((uint8_t *)frame->tf_sepc);
return (1);
default:
From nobody Sun May 7 17:59:55 2023
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 4QDsdS3VMtz49J2p;
Sun, 7 May 2023 17:59:56 +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 4QDsdS1Jf3z48vj;
Sun, 7 May 2023 17:59:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683482396;
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=iYXKeCIdobdKPq+T9dSzF/SrCgpEKnJYUtvaXjbdGVU=;
b=jpxC+zc1l8MIg508MaPlM6ix+6SVgIJ3N/6SAEcrq0FB9ujAhYh0qBGKDWC0eAw/lJwUq5
ANF+iaaa42alHP58m9cCu/sMRRdGWj9MjAjw3KP/rY00f3UOfdxTiQ9C99v6pVm5ygoGpW
Or3mRSZUAaj43wOsBA9hQaTzcPN5oKz6/wt0wQj/mtW55Ohe22aDdvDIpnHNObMyCJv25d
QXpkTBkwIqxEQDwt/G9FatzIbCizOUwg5/cjoKSGMjep3yxdcnTlwm54HzPDWjPTeLXHQc
86zUYmJReE1wqS6kyUW/tJeHI6Y/Oh8+lrPo13/SArKYQcJ/jDqVm9PoHE4AwQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683482396;
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=iYXKeCIdobdKPq+T9dSzF/SrCgpEKnJYUtvaXjbdGVU=;
b=ccwPhlokC5NzHz4jLC83mTMy9PHKtO9heoyUoX7A8orWjUTT4XjHdVrhAFRkziICBmSIHq
cTnQTjSZ8Pq2TjdV/9Jnhb8+5UamDxcOQrgw33NBYBWleqEq7LlJ/no1OFGV4nSn3uBDOz
RtgSHRkhM6YlPaHGx89oHQ+0uFqMnp653Y9i8S55QXC7GUKNh/beYDqV+RUuAIOMguGZRK
hRK0sFYSyEvAUHQJXU7cR4EcGY26k+Q+MQHDllXQW/busUmT7Cp7Rp7FjXGXVMyARIJS7U
6HX/YcyH1L2VGtISVzf8VZYwOG8Aq/aoq+NefFnFpBRgvwbo60ibGNjIwWJE9g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683482396; a=rsa-sha256; cv=none;
b=UB85BsAC4TBriNIrFBBtdVxkEP5tqw1xr9hld9UxQl/W9UzXUTuNdMBASpgylVlQ4uNORw
Kpj1C/V/TRuci/ckA4JHDjkeG0H6i5htjr5G9uVisTrLWdqAi1ABNRPvvB+SvmktM88xq6
HcoYvhGoi1jhm0/+G7fIyosWr8ZVoqDcFk2fGjcmGRl65kWZ6RtAoqegMLaLxaLAagukjs
ZbsxLYPC2MhqT60jDn89689PqRZmon7shwq5iEteHDU1d5nONv0sfZ5FD9u6yz63MUbqtt
2VZDY5G+6YNDX+OiCbGprpL+By5IQ1qlDnx6i/dnBCP7SJyIK3ZgX7s1iatnxw==
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 4QDsdS0CW6zSMZ;
Sun, 7 May 2023 17:59:56 +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 347Hxtjj007816;
Sun, 7 May 2023 17:59:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347Hxt2Q007815;
Sun, 7 May 2023 17:59:55 GMT
(envelope-from git)
Date: Sun, 7 May 2023 17:59:55 GMT
Message-Id: <202305071759.347Hxt2Q007815@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: de552718943b - stable/13 - dtrace: add register bindings for RISC-V
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: de552718943b5ead511048d4e7b4b9f33c33d01a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=de552718943b5ead511048d4e7b4b9f33c33d01a
commit de552718943b5ead511048d4e7b4b9f33c33d01a
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2023-04-20 16:25:37 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-07 17:54:08 +0000
dtrace: add register bindings for RISC-V
Reviewed by: mhorne, markj
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D39611
(cherry picked from commit 1fef7abdc76bd6f0c93775bd0c1b62b523abd20d)
---
cddl/lib/libdtrace/Makefile | 1 +
cddl/lib/libdtrace/regs_riscv.d | 74 ++++++++++++++++++++++++++++++++++
sys/cddl/dev/dtrace/riscv/dtrace_isa.c | 32 +++++++++++++--
sys/cddl/dev/dtrace/riscv/regset.h | 35 +++++++++++++++-
4 files changed, 137 insertions(+), 5 deletions(-)
diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
index 3fb0ec0bafb0..71b6e8c5d57d 100644
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@@ -131,6 +131,7 @@ DSRCS+= regs_x86.d
.if ${MACHINE_CPUARCH} == "riscv"
SRCS+= instr_size.c
+DSRCS+= regs_riscv.d
.endif
YFLAGS+=-d
diff --git a/cddl/lib/libdtrace/regs_riscv.d b/cddl/lib/libdtrace/regs_riscv.d
new file mode 100644
index 000000000000..e8a9667d2efd
--- /dev/null
+++ b/cddl/lib/libdtrace/regs_riscv.d
@@ -0,0 +1,74 @@
+/*
+ * SPDX-License-Identifier: CDDL 1.0
+ *
+ * Copyright 2023 Christos Margiolis <christos@FreeBSD.org>
+ */
+
+inline int R_ZERO = 0;
+#pragma D binding "1.13" R_ZERO
+inline int R_RA = 1;
+#pragma D binding "1.13" R_RA
+inline int R_SP = 2;
+#pragma D binding "1.13" R_SP
+inline int R_GP = 3;
+#pragma D binding "1.13" R_GP
+inline int R_TP = 4;
+#pragma D binding "1.13" R_TP
+inline int R_T0 = 5;
+#pragma D binding "1.13" R_T0
+inline int R_T1 = 6;
+#pragma D binding "1.13" R_T1
+inline int R_T2 = 7;
+#pragma D binding "1.13" R_T2
+inline int R_S0 = 8;
+#pragma D binding "1.13" R_S0
+inline int R_FP = 8;
+#pragma D binding "1.13" R_FP
+inline int R_S1 = 9;
+#pragma D binding "1.13" R_S1
+inline int R_A0 = 10;
+#pragma D binding "1.13" R_A0
+inline int R_A1 = 11;
+#pragma D binding "1.13" R_A1
+inline int R_A2 = 12;
+#pragma D binding "1.13" R_A2
+inline int R_A3 = 13;
+#pragma D binding "1.13" R_A3
+inline int R_A4 = 14;
+#pragma D binding "1.13" R_A4
+inline int R_A5 = 15;
+#pragma D binding "1.13" R_A5
+inline int R_A6 = 16;
+#pragma D binding "1.13" R_A6
+inline int R_A7 = 17;
+#pragma D binding "1.13" R_A7
+inline int R_S2 = 18;
+#pragma D binding "1.13" R_S2
+inline int R_S3 = 19;
+#pragma D binding "1.13" R_S3
+inline int R_S4 = 20;
+#pragma D binding "1.13" R_S4
+inline int R_S5 = 21;
+#pragma D binding "1.13" R_S5
+inline int R_S6 = 22;
+#pragma D binding "1.13" R_S6
+inline int R_S7 = 23;
+#pragma D binding "1.13" R_S7
+inline int R_S8 = 24;
+#pragma D binding "1.13" R_S8
+inline int R_S9 = 25;
+#pragma D binding "1.13" R_S9
+inline int R_S10 = 26;
+#pragma D binding "1.13" R_S10
+inline int R_S11 = 27;
+#pragma D binding "1.13" R_S11
+inline int R_T3 = 28;
+#pragma D binding "1.13" R_T3
+inline int R_T4 = 29;
+#pragma D binding "1.13" R_T4
+inline int R_T5 = 30;
+#pragma D binding "1.13" R_T5
+inline int R_T6 = 31;
+#pragma D binding "1.13" R_T6
+inline int R_PC = 32;
+#pragma D binding "1.13" R_PC
diff --git a/sys/cddl/dev/dtrace/riscv/dtrace_isa.c b/sys/cddl/dev/dtrace/riscv/dtrace_isa.c
index 6e6459a8ce74..61743c42d9b7 100644
--- a/sys/cddl/dev/dtrace/riscv/dtrace_isa.c
+++ b/sys/cddl/dev/dtrace/riscv/dtrace_isa.c
@@ -311,10 +311,34 @@ dtrace_getstackdepth(int aframes)
ulong_t
dtrace_getreg(struct trapframe *rp, uint_t reg)
{
-
- printf("IMPLEMENT ME: %s\n", __func__);
-
- return (0);
+ switch (reg) {
+ case REG_ZERO:
+ return (0);
+ case REG_RA:
+ return (rp->tf_ra);
+ case REG_SP:
+ return (rp->tf_sp);
+ case REG_GP:
+ return (rp->tf_gp);
+ case REG_TP:
+ return (rp->tf_tp);
+ case REG_T0 ... REG_T2:
+ return (rp->tf_t[reg - REG_T0]);
+ case REG_S0 ... REG_S1:
+ return (rp->tf_s[reg - REG_S0]);
+ case REG_A0 ... REG_A7:
+ return (rp->tf_a[reg - REG_A0]);
+ case REG_S2 ... REG_S11:
+ return (rp->tf_s[reg - REG_S2 + 2]);
+ case REG_T3 ... REG_T6:
+ return (rp->tf_t[reg - REG_T3 + 3]);
+ case REG_PC:
+ return (rp->tf_sepc);
+ default:
+ DTRACE_CPUFLAG_SET(CPU_DTRACE_ILLOP);
+ return (0);
+ }
+ /* NOTREACHED */
}
static int
diff --git a/sys/cddl/dev/dtrace/riscv/regset.h b/sys/cddl/dev/dtrace/riscv/regset.h
index f99b48f8354f..034781f11238 100644
--- a/sys/cddl/dev/dtrace/riscv/regset.h
+++ b/sys/cddl/dev/dtrace/riscv/regset.h
@@ -42,7 +42,40 @@
extern "C" {
#endif
-/* Place here */
+#define REG_ZERO 0
+#define REG_RA 1
+#define REG_SP 2
+#define REG_GP 3
+#define REG_TP 4
+#define REG_T0 5
+#define REG_T1 6
+#define REG_T2 7
+#define REG_S0 8
+#define REG_FP 8
+#define REG_S1 9
+#define REG_A0 10
+#define REG_A1 11
+#define REG_A2 12
+#define REG_A3 13
+#define REG_A4 14
+#define REG_A5 15
+#define REG_A6 16
+#define REG_A7 17
+#define REG_S2 18
+#define REG_S3 19
+#define REG_S4 20
+#define REG_S5 21
+#define REG_S6 22
+#define REG_S7 23
+#define REG_S8 24
+#define REG_S9 25
+#define REG_S10 26
+#define REG_S11 27
+#define REG_T3 28
+#define REG_T4 29
+#define REG_T5 30
+#define REG_T6 31
+#define REG_PC 32
#ifdef __cplusplus
}
From nobody Sun May 7 17:59:57 2023
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 4QDsdT2S4Zz49J2s;
Sun, 7 May 2023 17:59:57 +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 4QDsdT207Hz49W9;
Sun, 7 May 2023 17:59:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683482397;
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=esXEcAMctLtNJ8CIjTGG51fjbcUyb6d00/3R3U3nzM8=;
b=Ey4t+NV9s/nhNLA9KLz3RNqd74H6n1hTgG5HgFPeRKU8j8aOVp+QTbWtytoBwdsjK7/qlw
Z+vcNyhCybQzoBDED2G6w6yB1YftVI/v+iwGKO+t1BXkQOf200oQCXhXKVrAncVfGssrl3
wYjzyF4/iYYzt6154Dd6CFUdrs3T5viV1EfYSXvK9wycsRHvOg6gVZgNIXsgLl4D8L7uG1
qsFBvY2DrRUve/aRS4euJ4GMgCCZ5WF57ckHFcO4tlCaFK8Ma7SQl+LUZCRNEOEH/ZTBXi
rc/z7WZOBoS7OhwYiOdgyUF+LkAX1DGuWOsjdatFdt5YRsximrQirXDhn8kCCA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683482397;
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=esXEcAMctLtNJ8CIjTGG51fjbcUyb6d00/3R3U3nzM8=;
b=NQQtmbOY74HgAqgHCoTZAOc0g/oYVZXtSQzMzrMYL2oIoOnjkZTU6g1liR6skqe3mjdxkA
3A4xv/pAPLRQx/+OnqlnRQNoAQsPmQHwo45WT6UjvdIuIvWoZREwrYmeV/5P89M8TrrnVy
8AyDb6rfmolZkWBEVv9yI5Y8yISVO9BsgDsrH86VsM2q7Q4tD4OsN8AhbGhvA2oHW5GOTj
yt8R+YRUs1UO0Irj6V5lkKC5VRyZECpmZ579RJ33yzCaiFQPCPf+0d7mCqVywg9B9pX9Rl
zAjh2Xbk642LKKr/jhCuqnhxB9pe/SpX7xYlF88wBzmz4KRJzJ+Z0p8SbbNuqA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683482397; a=rsa-sha256; cv=none;
b=SYqCuDYjMqw1u2pNmcLtZuxpw/CzjeJxVau0FhJ8igMP2RmXZ08ly3GPBPbDBYCzKGrsd9
0jJEK4w7CSUeTDGO9mjTfObuERK77Spr1deOcGMoq0vP51CSrLPTJt4wnkRObvLUcCrE3c
pwS5qrhDIQ52QVnve60U8OFRhSmL9L/oA0OlqwQVdQTm4Zf/R6Q+aC8KShB+tycift1md+
/ywXjBXbIgGyAp7I2dbyVKwpT968t98LVDyAXikYscRm/LDoXsLTWIrf+Qj+fpN8C/Io1X
ARMLsQYkd6BNoIdBPhnUmQHl4qMa6mEgZ6EsOrfoEL3TyGkXb0ZAlIxCwKJrtg==
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 4QDsdT11bZzSMb;
Sun, 7 May 2023 17:59:57 +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 347Hxvgl007841;
Sun, 7 May 2023 17:59:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347Hxv1M007840;
Sun, 7 May 2023 17:59:57 GMT
(envelope-from git)
Date: Sun, 7 May 2023 17:59:57 GMT
Message-Id: <202305071759.347Hxv1M007840@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 504b5a1378ab - stable/13 - riscv: Compile instr_size.c into the kernel when DTrace is configured
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 504b5a1378ab2cf8a50e034c1c407e7ecfe5db9c
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=504b5a1378ab2cf8a50e034c1c407e7ecfe5db9c
commit 504b5a1378ab2cf8a50e034c1c407e7ecfe5db9c
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-04-21 13:26:17 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-07 17:54:09 +0000
riscv: Compile instr_size.c into the kernel when DTrace is configured
Reported by: Jenkins
Fixes: 080e56a6c98c ("dtrace: expose dtrace_instr_size() to userland and implement it for riscv")
(cherry picked from commit 92fa22c6a5c41303e3ad98096c9ebe8202418d81)
---
sys/conf/files.riscv | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys/conf/files.riscv b/sys/conf/files.riscv
index 82beedfd03a2..6ad44193cec0 100644
--- a/sys/conf/files.riscv
+++ b/sys/conf/files.riscv
@@ -1,6 +1,7 @@
# $FreeBSD$
cddl/dev/dtrace/riscv/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}"
cddl/dev/dtrace/riscv/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}"
+cddl/dev/dtrace/riscv/instr_size.c optional dtrace compile-with "${DTRACE_C}"
cddl/dev/fbt/riscv/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
crypto/des/des_enc.c optional netsmb
dev/ofw/ofw_cpu.c optional fdt
From nobody Sun May 7 17:59:58 2023
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 4QDsdV36zVz49Hcy;
Sun, 7 May 2023 17:59:58 +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 4QDsdV2ftnz49NN;
Sun, 7 May 2023 17:59:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683482398;
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=Xa1ujOFx5ay8FrYp1fk2UVVgPfkLVLi1PlPijkp8iX4=;
b=hgNoIZlwfZzzB0PzricUkW0AJ69z8EdSBnmjR7fXxwemtMIc1un1suS1+v7C9pFtAZik+p
VmYkaXuSAxWOsRdmrdzue8WVb/mlypQaHpbSoT5U3D6vfhBU8PM+PX/OUhr4Ts9plPn+O4
CEz1rJM/zk4wLznXoZdy5yk3pEUzwZv2uBvkFg99/RiTz/zVwNCCxZSGLWDaqSKpTco4nd
7Ks/sd91Bq08YMz6lWpk/VP488geRwTV5m209FS0Bxs6T/dkH4OFA1tJ+Vqz23QgyLHhwO
I9NWANz3iMRSBw3JDVvEialfsBuv7K0Ol3jjtkpetYRur56zysKIgztOZmA7+Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683482398;
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=Xa1ujOFx5ay8FrYp1fk2UVVgPfkLVLi1PlPijkp8iX4=;
b=VV10PjrWPDvazjqpBIeeveWiO5vIHvKeitc2/5mLDEGnXU8UQsmu/zFcPvee7D0YscMpXL
JMPgEZkuef7GKL0wZ2xaGPLLqOKamjZChDIQ7rxHl3DswfLitPB9r06x1d7l83u+UI93pO
GgUmb4SF2G56aSIIlsJjJi3Yvie4mV5Ja4BcGe9DNps4eiMQBOLPFVHA9TjFfACuXtiP6x
F4OKedj026yr+WoU9V3ITpqoIYSpCjYHc23ah9pcvTQcFrDRb3CVWc5FHD6lIRoJRb4xUG
wh+vG/bNRGucsi+YrUrMvApYB3+b1ez42+LUiVVMvJKrjbsMXsXdLxgMJEZ3tA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683482398; a=rsa-sha256; cv=none;
b=sF2e/vVplQV5saY90YR38cMGSzPUWxktq2VBdmU52MF26YmR73gEo5rtbVlKa+THD4xSJK
Wa0wmgb9hI4T1ywPf4EOkHvJJpTyTk/EBBmq9GyxRC4SFDByXcxBPWaeK8KDsD5jlngR4K
TtLc00LSi14xf9r3UFvSQr7L95qStyYLrWDYtBK7aEiGpdntRAINx/HJAI0HkYS+LE+B1E
XnBAqEwr55XidgqPxdImHRB+T0gwMmHfaMmnbs4a+JsFj3x9ylnkK4r19s7omG4+qJygK+
Io0GNfc0d1fLNgv3p37k6ZyCpbBBZ7fvr1dg5igljVC1+CfqXo7eC5zgMq0Dyg==
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 4QDsdV1gzNzShJ;
Sun, 7 May 2023 17:59:58 +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 347HxwVx007864;
Sun, 7 May 2023 17:59:58 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347HxwZ1007863;
Sun, 7 May 2023 17:59:58 GMT
(envelope-from git)
Date: Sun, 7 May 2023 17:59:58 GMT
Message-Id: <202305071759.347HxwZ1007863@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 888071fb560a - stable/13 - arm64: Implement bus_describe_intr() for nexus
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 888071fb560a46c5e6aaa1027c18feead686026f
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=888071fb560a46c5e6aaa1027c18feead686026f
commit 888071fb560a46c5e6aaa1027c18feead686026f
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-04-23 17:30:44 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-07 17:54:09 +0000
arm64: Implement bus_describe_intr() for nexus
Prompted by a compiler warning introduced by
e582d4a2b09e ("arm64: nexus code tidy-up").
Reviewed by: mhorne, andrew
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D39749
(cherry picked from commit 7623cc8f65ab1b28690d4a6580ae87b7926ed008)
---
sys/arm64/arm64/nexus.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c
index bc7e8e881dab..8f768de18cd9 100644
--- a/sys/arm64/arm64/nexus.c
+++ b/sys/arm64/arm64/nexus.c
@@ -139,6 +139,7 @@ static device_method_t nexus_methods[] = {
DEVMETHOD(bus_bind_intr, nexus_bind_intr),
#endif
DEVMETHOD(bus_config_intr, nexus_config_intr),
+ DEVMETHOD(bus_describe_intr, nexus_describe_intr),
DEVMETHOD(bus_setup_intr, nexus_setup_intr),
DEVMETHOD(bus_teardown_intr, nexus_teardown_intr),
DEVMETHOD(bus_get_bus_tag, nexus_get_bus_tag),
@@ -341,6 +342,14 @@ nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih)
return (intr_teardown_irq(child, r, ih));
}
+static int
+nexus_describe_intr(device_t dev, device_t child, struct resource *irq,
+ void *cookie, const char *descr)
+{
+
+ return (intr_describe_irq(child, irq, cookie, descr));
+}
+
#ifdef SMP
static int
nexus_bind_intr(device_t dev, device_t child, struct resource *irq, int cpu)
From nobody Sun May 7 17:59:59 2023
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 4QDsdW4QQ5z49HhS;
Sun, 7 May 2023 17:59:59 +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 4QDsdW3p5Bz49c4;
Sun, 7 May 2023 17:59:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683482399;
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=egb5jAq7OnrQEAArPiSIBudPNQxQe9UL5fpUbpCDl6w=;
b=t81eY0k4J9LweYB/ewSMMHVle1W/wMktSlLGcDT+CYJOsIHsgp6Hq0KjdYKSjWRonPUk19
B1sbyIKdBD5uuNiOJ823JV8IPVZgP3oCrprcrMLonLmYjj4kjeYl8nMrFqLdh4p/mu9kG1
y/s6meXialC1ImvTiXbGZ5FbnRtqI73V5Mo6KMTZL2mZuhho48U0Wvh/YTFUTVsKBzaYGo
EcTiyxkUbuqTShCN9vQtrZqIWvXKtUWHBCadvTa3qsDXSpFaWPLva1Aw0LzW6pm6ikvavH
/BmAm1N1FhQBUnsT2SbzP9sWsdofODf1rl+tSJuXWowCc5VKdziIw9ZGz88QtA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683482399;
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=egb5jAq7OnrQEAArPiSIBudPNQxQe9UL5fpUbpCDl6w=;
b=sHdraQqIwKsE5nC6JFzGBRFwF+2hKUy1I5+5ZLSW5QxNEwMlbJHpGsPYRRwNIJIAgYJw79
RtewNtoeIAiyK19v94yrz1GMbuVSA0Xfm09h/OCpOmZ+CGGw3JYPuNjDR1IV2q03e0U6tS
1vpMJCMwInB0RGJS9v/HdF/KRkEHDwtLOIK2/iYIm137uM1kMMOvqJGPOlrISG9h0kcQ3/
tEkqa+U9ZT7zY1i2iiMfj6Dgy1vu9d8gP5xTO9ebx/B0EFiWjmdr8WAxFFtSNcaNugPJTW
D2d3cgVJn0ovSWGt96R8HftPdVUiiJY4GcEc7ZFER0V/oFk1vm2UcRjczcmVag==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683482399; a=rsa-sha256; cv=none;
b=E/1YXxoNpdVE3mXLHtwXDFjSUpWoWiJ4lCBk5O2FuBLK8Ub7oNF+qMcY+mYN66noVyq4Oc
/KAVw5c/OerB8mEeSS3nS6gsHdJWSptODe0raSMN7E6+YlCH5sE0NQ9+fLsJg896QM2st8
vyhNQo6KAC8QddO+v4ep9fqc1fdpMPkm4vg/Nr4ydovIqax70J31hMZblXuxNwO/LQVleJ
RW0+Sg+L21LkwfD27ZNvZI436N3TTc1aNUFrGepgFPpZDY4hyoWZbrTaxB+WUPn7idMb8Q
7ln7MZl+xeAv8ujC3nnl42/jaEjqo2pFF5kohy9/hwsoPO2ghpYW8goD8+RARg==
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 4QDsdW2snnzSbT;
Sun, 7 May 2023 17:59:59 +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 347HxxDt007883;
Sun, 7 May 2023 17:59:59 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347HxxdM007882;
Sun, 7 May 2023 17:59:59 GMT
(envelope-from git)
Date: Sun, 7 May 2023 17:59:59 GMT
Message-Id: <202305071759.347HxxdM007882@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 42729357a23f - stable/13 - riscv: Implement bus_describe_intr() for nexus
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 42729357a23fb889904600fed5714425f64fb652
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=42729357a23fb889904600fed5714425f64fb652
commit 42729357a23fb889904600fed5714425f64fb652
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-04-23 17:31:01 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-07 17:54:09 +0000
riscv: Implement bus_describe_intr() for nexus
Reviewed by: mhorne
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D39750
(cherry picked from commit ff13b924751489efed1c6a42dbca8f236902d6fb)
---
sys/riscv/riscv/nexus.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/sys/riscv/riscv/nexus.c b/sys/riscv/riscv/nexus.c
index 38c11b13aff6..5a397efe14a8 100644
--- a/sys/riscv/riscv/nexus.c
+++ b/sys/riscv/riscv/nexus.c
@@ -92,6 +92,7 @@ static bus_set_resource_t nexus_set_resource;
static bus_release_resource_t nexus_release_resource;
static bus_config_intr_t nexus_config_intr;
+static bus_describe_intr_t nexus_describe_intr;
static bus_setup_intr_t nexus_setup_intr;
static bus_teardown_intr_t nexus_teardown_intr;
@@ -119,6 +120,7 @@ static device_method_t nexus_methods[] = {
DEVMETHOD(bus_set_resource, nexus_set_resource),
DEVMETHOD(bus_release_resource, nexus_release_resource),
DEVMETHOD(bus_config_intr, nexus_config_intr),
+ DEVMETHOD(bus_describe_intr, nexus_describe_intr),
DEVMETHOD(bus_setup_intr, nexus_setup_intr),
DEVMETHOD(bus_teardown_intr, nexus_teardown_intr),
DEVMETHOD(bus_get_bus_tag, nexus_get_bus_tag),
@@ -337,6 +339,14 @@ nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih)
return (intr_teardown_irq(child, r, ih));
}
+static int
+nexus_describe_intr(device_t dev, device_t child, struct resource *irq,
+ void *cookie, const char *descr)
+{
+
+ return (intr_describe_irq(child, irq, cookie, descr));
+}
+
static bus_space_tag_t
nexus_get_bus_tag(device_t bus __unused, device_t child __unused)
{
From nobody Sun May 7 18:00:00 2023
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 4QDsdX6qJvz49J8b;
Sun, 7 May 2023 18:00:00 +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 4QDsdX4SmBz49RY;
Sun, 7 May 2023 18:00:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683482400;
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=UcIu1+NuhPVGGWGPA3pGAcdKdO5IqaNsgf5p9km5OFM=;
b=Q7pZvI2pz4j+2+lhXy/vG4AuV4HwCA7HBSiM7eAe0RIR1E8VODDdfH17UmhAuwwdOH/X3S
8cDnuq0oX+01lvU4itwsM+lf+6vYVCyugs7GlqHURWwN2a/8IRS0h9mGBG1Br2n98Zejhh
cIKjB/hl2SfKf+IoFcdq1q9pLkZfjOf/rxNWm2kqwtMsPbpF1A33OPwzJgMHlGVkzSUy5h
18CTj94Mj8dXbRmBRq/v8cz2YdKDk5t2rPuLaSpw7wIec/pulmYy2n9aXVwJaZMEVd6m88
WGQOdeFQFnroNzfI2JYR7MLEIOBuqi3Kg+iXlBpKeAXVH4ez78zpmXs40B22UQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683482400;
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=UcIu1+NuhPVGGWGPA3pGAcdKdO5IqaNsgf5p9km5OFM=;
b=jomU/lUqPYz3vt1aAqMVkF3bRL4nuogqUMj+4NyCTOWIbSqmboyxkrTs4IPrZQiRgqKZr1
MBz/vFESEHsbYz93/nSZ5tVLfHucu+HAGhUhVBtnO28RiYxfF+XKg9sLrGxhfO20Np0T36
J9LKdm7vU74wQL96Ue5+mIEKjdThNPTX2G+Y6ZDf8g3WjEZSNLmekcLgKIObx0PpfR+oEh
A+XiKZhusI/jHkxxEZfk53GON8Mwr6Kk1nq+EXe+o02jj55H0RKfdTSE3lQ7ERYTKeNJMX
dPn9AEgJuMqhh2FdMdVdVWcQhOg+Eu7N2Z1xrWhjvibT1SLjunj2IfefFR5E8w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683482400; a=rsa-sha256; cv=none;
b=bkqG54hQBNuMpHWmCEBS0MVj+qFwWfSzaejS38Ac7AF0r4jukupyBqcB5u4MsdGNQpUsKw
77r/gRY1utbxr9ZecdJD+RANz5V6yvJvMef/CSo9m6UtgXwsmbpMqhQOIcrSdCigwHzGku
gA7dCdwcUYte11OZCYE5tIUTCds6eRttIs6/s5L9i2FWGPRcJP8/1hXdvHYZagiGBvPhcT
sGLKkcUBlvNzMGVaqL43PEkk8fTqaj1xbHpvc/ivxXgjCFevzXCd8BhIsMAuOtwO5JqfX6
AsMIkBheTMY/jdHfgz9LHX4dhWpj93MXLv116ynSu1JAdG+9ELaPVg0t/bfTBw==
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 4QDsdX3YqgzShK;
Sun, 7 May 2023 18:00:00 +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 347I00g1008785;
Sun, 7 May 2023 18:00:00 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347I00dS008763;
Sun, 7 May 2023 18:00:00 GMT
(envelope-from git)
Date: Sun, 7 May 2023 18:00:00 GMT
Message-Id: <202305071800.347I00dS008763@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: a9732ce7b904 - stable/13 - tests: Add ATF_REQUIRE_SYSCTL_BOOL
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a9732ce7b904f5f52fce4bba4a52a2898ca97782
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=a9732ce7b904f5f52fce4bba4a52a2898ca97782
commit a9732ce7b904f5f52fce4bba4a52a2898ca97782
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-04-25 13:54:23 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-07 17:54:09 +0000
tests: Add ATF_REQUIRE_SYSCTL_BOOL
Modify a capability mode test to use it for kern.trap_enotcap, to avoid
false positives.
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 8a271827e7b5d5310e06df1f9f49ba0ef9efd263)
---
tests/freebsd_test_suite/macros.h | 17 +++++++++++++++--
tests/sys/vfs/lookup_cap_dotdot.c | 2 +-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/tests/freebsd_test_suite/macros.h b/tests/freebsd_test_suite/macros.h
index c5a3a3838ff7..dfce2fb810e1 100644
--- a/tests/freebsd_test_suite/macros.h
+++ b/tests/freebsd_test_suite/macros.h
@@ -53,6 +53,18 @@
} \
} while(0)
+#define ATF_REQUIRE_SYSCTL_BOOL(_mib_name, _required_value) do { \
+ bool value; \
+ size_t size = sizeof(value); \
+ if (sysctlbyname(_mib_name, &value, &size, NULL, 0) == -1) { \
+ atf_tc_skip("sysctl for %s failed: %s", _mib_name, \
+ strerror(errno)); \
+ } \
+ if (value != (_required_value)) \
+ atf_tc_skip("requires %s=%d, =%d", (_mib_name), \
+ (_required_value), value); \
+} while (0)
+
#define ATF_REQUIRE_SYSCTL_INT(_mib_name, _required_value) do { \
int value; \
size_t size = sizeof(value); \
@@ -60,8 +72,9 @@
atf_tc_skip("sysctl for %s failed: %s", _mib_name, \
strerror(errno)); \
} \
- if (value != _required_value) \
- atf_tc_skip("requires %s=%d", _mib_name, _required_value); \
+ if (value != (_required_value)) \
+ atf_tc_skip("requires %s=%d, =%d", (_mib_name), \
+ (_required_value), value); \
} while(0)
#define PLAIN_REQUIRE_FEATURE(_feature_name, _exit_code) do { \
diff --git a/tests/sys/vfs/lookup_cap_dotdot.c b/tests/sys/vfs/lookup_cap_dotdot.c
index dee1e0b11780..e023a50f8152 100644
--- a/tests/sys/vfs/lookup_cap_dotdot.c
+++ b/tests/sys/vfs/lookup_cap_dotdot.c
@@ -80,7 +80,7 @@ check_capsicum(void)
{
ATF_REQUIRE_FEATURE("security_capabilities");
ATF_REQUIRE_FEATURE("security_capability_mode");
- ATF_REQUIRE_SYSCTL_INT("kern.trap_enotcap", 0);
+ ATF_REQUIRE_SYSCTL_BOOL("kern.trap_enotcap", false);
}
/*
From nobody Mon May 8 00:57:38 2023
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 4QF2vQ3D37z49p6L;
Mon, 8 May 2023 00:57:38 +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 4QF2vQ2g89z43qP;
Mon, 8 May 2023 00:57:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683507458;
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=mOICYXoQn1gVnAq8++GGLEMSQwVTpvxs1+xgAMfztVk=;
b=QYZsTlkErRwLdNoIIywL2QTEGw6KVSmT4HB9cKkVI4iDSwbtE870gz1hqWg7c2bEch7tCx
JQ//qaAcCjVKEm1+GBnfbrr6KnHOfqsJ7ATanmUZqYPGS6vQ3O/WElRIEPEz8QvnBD+bkH
OYwu50IgHqTdIm3Pw+Wg0j+erqdkoxX8D9ACuDiC+XMPNJylXCLmPVCS9ZwkjPKuJzGUXl
pA244chSE6AGnMLIVe7w2mY8/Ivc0ygvvXqM44HRu9lD9EX+vQDBASsGOvxeRlf4clAXLH
RgBvPGAjcAWjln+L8pylu2XZHVWQXWdwNSZEP4Vo3vZkLYSu1eKaZUw6HKP3FA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683507458;
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=mOICYXoQn1gVnAq8++GGLEMSQwVTpvxs1+xgAMfztVk=;
b=G3l7RaambjXB+nkc4js39rn9S6KaOSj8Ty35AcVGiZvZqxiwhiWoytHqtgm/FJYfFf6ByY
yQQ1vx0je4+A0AOMsUMIoAkKr8Y6MZbz/BXnNSko1572IEiniyiTxLkoSrUs4aPbWRNeJ3
Z2zy5OsPLieaMDO4jn3mBIBc02mTy4qpuzPVRzARNWpj4m9WP4w83Beh7lb2NAcHrrOGEi
kpPy3h9EiKF2vYmXKDPKww77K5lihPKqRgmNiYNcqfwISkRRyPdi6DQifmi8+zXwJKq92e
Q97vz04QOxVzvrfmrBNf9OWDsCvOUme60bGDSz1uok8Q9mINfHdOm/5YJEpJdg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683507458; a=rsa-sha256; cv=none;
b=nQTdOHAO3lpdkDmJ4ruQlbQCxejTqqT059gfJ0kjRNzErknjFEVwjTU+e0cmGOGg4jdbkW
me2hUYv8W9jJN+oepQ+qS3jGKJCms6nJS2qHnZN96iNgqQh2qOaM8zsLbBieNWIoEhjqW7
HyogpZYxFsa968JGBVJ2UIG8Azo1SwIC4XugghYl+GGmamElOARY/wyLZDoz8sjltSph8S
pjSUiH3hxhCHBTvloSDNGKTywrLAqeNP5/8MmKBHKZG3xzDbrUYw60XdEiK5Bn5UD2na5M
KqJt5PFJOTmGOf9kjOH1mihHkm9kBaxflzP1YE4IYjwGJExvybd873dKcltjoA==
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 4QF2vQ1jyDzgTY;
Mon, 8 May 2023 00:57:38 +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 3480vcqv004728;
Mon, 8 May 2023 00:57:38 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3480vcw5004727;
Mon, 8 May 2023 00:57:38 GMT
(envelope-from git)
Date: Mon, 8 May 2023 00:57:38 GMT
Message-Id: <202305080057.3480vcw5004727@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Piotr Kubaj <pkubaj@FreeBSD.org>
Subject: git: f37a2ade7730 - stable/13 - share/mk/bsd.cpu.mk: add AltiVec / VSX to powerpc*'s MACHINE_CPU
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: pkubaj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: f37a2ade7730cfcdaf754a6b4b9201002ba46730
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by pkubaj:
URL: https://cgit.FreeBSD.org/src/commit/?id=f37a2ade7730cfcdaf754a6b4b9201002ba46730
commit f37a2ade7730cfcdaf754a6b4b9201002ba46730
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-05-05 14:19:19 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-05-08 00:58:05 +0000
share/mk/bsd.cpu.mk: add AltiVec / VSX to powerpc*'s MACHINE_CPU
MFC after: 3 days
Approved by: jhibbits
Differential revision: https://reviews.freebsd.org/D39240
(cherry picked from commit 448045e4a7873f4733cebda56df002acabb2aef1)
---
share/mk/bsd.cpu.mk | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index cc907d79d03e..ed8040d1c192 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -284,6 +284,25 @@ MACHINE_CPU = mips
. elif ${MACHINE_ARCH} == "powerpc"
. if ${CPUTYPE} == "e500"
MACHINE_CPU = booke softfp
+. elif ${CPUTYPE} == "g4"
+MACHINE_CPU = altivec
+. endif
+. elif ${MACHINE_ARCH} == "powerpc64"
+. if ${CPUTYPE} == "e5500"
+MACHINE_CPU = booke
+. elif ${CPUTYPE} == power7
+MACHINE_CPU = altivec vsx
+. elif ${CPUTYPE} == power8
+MACHINE_CPU = altivec vsx vsx2
+. elif ${CPUTYPE} == power9
+MACHINE_CPU = altivec vsx vsx2 vsx3
+. else
+MACHINE_CPU = altivec
+. endif
+. elif ${MACHINE_ARCH} == "powerpc64le"
+MACHINE_CPU = altivec vsx vsx2
+. if ${CPUTYPE} == power9
+MACHINE_CPU += vsx3
. endif
########## riscv
. elif ${MACHINE_CPUARCH} == "riscv"
From nobody Mon May 8 01:20:41 2023
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 4QF3Q21LhWz49qSl;
Mon, 8 May 2023 01:20:42 +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 4QF3Q20vmfz44sG;
Mon, 8 May 2023 01:20:42 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683508842;
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=YV/ZuBFf5iVeskKq8+0/I9LK8pcPHZIdD3bwTX3BXzQ=;
b=wAf0Cmf7qE8GiktfV3zBu6bMDdin9BJZ072+jOJjbsCVcbTA+28KL64OVUWdr+N1uVW2bd
ZWvxDm3kBskmRP/Lfc0rYHEKocBsAQPut4jWxC3kAaktxj57Jt2T1JRHKmn33DjraYPeSv
rM3E7zc81bxnLDNV5JuYwqL+hLWKvZheb9Ja9czFtg5adsowvRh6RHTE1WWkflq5rAURC1
KCxgt0BLJW7dYqCIT+r+HoBVoUPNIf5J+6Glm71u0xJZxeIPNdMcni+ZFjFcLjM5hMTSCe
V8yvjb93IQgft/gcbfL/PDF+4lxAOjvp9jWPzoYlrGuvax0tMDO7NV+ulD1fsQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683508842;
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=YV/ZuBFf5iVeskKq8+0/I9LK8pcPHZIdD3bwTX3BXzQ=;
b=ogMWQeJU0PK5go8AsDk6AFZA7ZYBoLlRu60POdp5NgMpQ6gn45FI4Yjo/0Qgkfq6O4SohO
k2DA556HG4mydUnK3A1lI8g9HTTxTmdBZ5LSC+sTRJTStIne1fnx64nqFIS06RXAbNzn4d
mHTn+yqlevLQAKBg8yjtc7MP3UEPUIUB9/q6fGwV80FJO37ePzdduMigrQDSeBcVNnwpvB
3b3dpRbqJY0a/obSiJvXy8ufotQG+oJhMUOxUipuQT/Z4Yw28xh2/z8B0IJ1RCklHuUbFx
WwdItMdm3xJsYhmd8n5v0vhNolaOyKq54V6MlQvC5Kp3g3muSCs4nFy+Lnx3fQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683508842; a=rsa-sha256; cv=none;
b=HQ1xSVg1VNbWL8BfcV5/AJrsge4q5t43MDapRFEbZIPwy0D5YyKfesdCwheVQghzH2kSGt
dJ/Swxa+LtuUQngXjG3dCPV4hwL0KoWb2MeKUc3W4GkSChxHORk4b1y5mITIlFUZPZ/88p
t1IwsU0habwoK1YMB/oxlMYB7aKm4/E+t4Tqg6almI1yfCCVhThehlLffTMsetE7m3pTL/
H54htfgxA0fSNYTRs7rINl9FuZUqGurf+EJ9+dul3PLzX9kX7pW+/W2rPPpBTJvfeGlBYk
ZTEG8OdNRrRj8D4eOlhfiTdYEQnXCECscayBzEg4J2MJKSjBqfiudRgzpAEHlg==
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 4QF3Q174SZzh8n;
Mon, 8 May 2023 01:20:41 +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 3481KfPo052015;
Mon, 8 May 2023 01:20:41 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3481Kflx052014;
Mon, 8 May 2023 01:20:41 GMT
(envelope-from git)
Date: Mon, 8 May 2023 01:20:41 GMT
Message-Id: <202305080120.3481Kflx052014@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: 609cc7f1c7d9 - stable/13 - ObsoleteFiles: Complete 20201025: Remove cal data files
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: lwhsu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 609cc7f1c7d9a1ca15f29409d6bdc031076f9792
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by lwhsu:
URL: https://cgit.FreeBSD.org/src/commit/?id=609cc7f1c7d9a1ca15f29409d6bdc031076f9792
commit 609cc7f1c7d9a1ca15f29409d6bdc031076f9792
Author: Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2023-05-04 04:28:52 +0000
Commit: Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2023-05-08 01:20:16 +0000
ObsoleteFiles: Complete 20201025: Remove cal data files
Fixes: d20d6550187a calendar: remove all datafiles except freebsd one
MFC after: 3 days
(cherry picked from commit 5282ada06bbc6727b467d6f6530fa19114143c61)
---
ObsoleteFiles.inc | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 9340f00e9e29..115ddff93fe9 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -2817,6 +2817,18 @@ OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.all
OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.holiday
OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.misc
OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.orthodox
+OLD_DIRS+=usr/share/calendar/de_AT.ISO_8859-15
+OLD_DIRS+=usr/share/calendar/de_DE.ISO8859-1
+OLD_FILES+=usr/share/calendar/de_DE.ISO8859-15
+OLD_DIRS+=usr/share/calendar/fr_FR.ISO8859-1
+OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-15
+OLD_DIRS+=usr/share/calendar/hr_HR.ISO8859-2
+OLD_DIRS+=usr/share/calendar/hu_HU.ISO8859-2
+OLD_DIRS+=usr/share/calendar/pt_BR.ISO8859-1
+OLD_DIRS+=usr/share/calendar/pt_BR.UTF-8
+OLD_DIRS+=usr/share/calendar/ru_RU.KOI8-R
+OLD_DIRS+=usr/share/calendar/ru_RU.UTF-8
+OLD_DIRS+=usr/share/calendar/uk_UA.KOI8-U
# 20201004: logo files renamed to type-agnostic gfx-*.lua
OLD_FILES+=boot/lua/logo-beastie.lua
From nobody Mon May 8 08:25:25 2023
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 4QFDr60WKdz49Z8B;
Mon, 8 May 2023 08:25:26 +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 4QFDr574b3z3l8p;
Mon, 8 May 2023 08:25:25 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683534326;
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=6zp96DrePx3dy47XjNTaIwJZnZkg9PNr1Z+md2FaK5c=;
b=ath9jmQAaGl7BTJ3K7EW0m5pCV5BrcwcS5uPF4XzTvwrloUZ5xC4ZEs2T2Uq43vDMsnY2r
Axtww1XG5GdE9GQgPYGmqXAoXonE6Ds281zXiKmiGLGB5E51GV1RkIxInfCbsRi+d75w0g
UYJmBxYV29x830MNKJMadxbAWTbUsw4mmuMLlmV7wq33kyePPilo2xmbU0V6Nj2j5TQonp
URJdwvLi5e6aQ7D817Jo49u1Njl6qbjJ3hwWOARmBGlXqsTIuEBw9KzXehfhRoTLXjqVRX
137UHPLWYPHnYCUxtk84xNjuSOVd9jAi8qzaANjatFoB4XEgA+VZiTQpkc7XkA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683534326;
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=6zp96DrePx3dy47XjNTaIwJZnZkg9PNr1Z+md2FaK5c=;
b=VkNL0TfsrhtDKghszVG2ma2NShqzDmS/DClekvyk8plrs7P5dWxpKcaxxaVFaFe5NdT5+V
QVe39AkGF+l0N14ej0+krwpqdoDCWl++4A1cWqMrjQbOCh4xCpLUCBxD0i43n1nhRNjTbL
+8DiRnxR9kjuoImt0on4Os3N+igsZIn35taHlC6eQZIlO3Vc0+Xfm9JIEFkSsFoBR+TMtS
D9kmg0LRXnokp/qfWlIgGDUyGuTU0k0B+ftZUM3eHFYHRNJXuHtk47O8gimX26KVRnm9uj
BbecTbn3oodSNvTUFLVcQ7I6eaVnZwH23ihUYfJAqDhW7xiQoWXXI9UYWut1Kg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683534326; a=rsa-sha256; cv=none;
b=sSlQOPcjlwDqG6LobHEdpK3nIWTpASObjNWv+GiofixA9lD+n829y0FIoYYlNB1MmrYUR0
wI4IYBX+pwF9Yiw7PohRgJPcIbMlUDg1FKjti9YHXpVhcs8ddbaMT7eJ1+gXrct0AppQIA
DznyU+1P4s8gPILaayox0dwUGb2DfXyDlAkfWsfdqqqVYDiNikLVLZUJjxQuSxASm1cjjw
OnmwOlgK2DkLmiDtWi72odUNm2+v0lm5H17Ku0GDQxiP5dOEdKtD5+sO5Ezx9HMYLUfpPY
hGtpkJPEeKrheQNPYDBCY9vvVxEkb7Gq5fV5peDPTH1ypT5QQfMwMLM7Ezcu6w==
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 4QFDr567QDztLb;
Mon, 8 May 2023 08:25:25 +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 3488PPFg050305;
Mon, 8 May 2023 08:25:25 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3488PP3x050304;
Mon, 8 May 2023 08:25:25 GMT
(envelope-from git)
Date: Mon, 8 May 2023 08:25:25 GMT
Message-Id: <202305080825.3488PP3x050304@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: d71c3dd112f6 - stable/13 - bhyve: add helper struct for qemus acpi table loader
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: d71c3dd112f68dc581e9053ffbe44e264a835d0f
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by corvink:
URL: https://cgit.FreeBSD.org/src/commit/?id=d71c3dd112f68dc581e9053ffbe44e264a835d0f
commit d71c3dd112f68dc581e9053ffbe44e264a835d0f
Author: Corvin Köhne <corvink@FreeBSD.org>
AuthorDate: 2022-04-06 09:10:36 +0000
Commit: Corvin Köhne <corvink@FreeBSD.org>
CommitDate: 2023-05-08 08:21:29 +0000
bhyve: add helper struct for qemus acpi table loader
The hypervisor is aware of all system properties. For the guest bios
it's hard and complex to detect all system properties. For that reason,
it would be better if the hypervisor creates acpi tables instead of the
guest. Therefore, the hypervisor has to send the acpi tables to the
guest. At the moment, bhyve just copies the acpi tables into the guest
memory. This approach has some restrictions. You have to keep sure that
the guest doesn't overwrite them accidentally. Additionally, the size of
acpi tables is limited.
Providing a plain copy of all acpi tables by fwcfg isn't possible. Acpi
tables have to point to each other. So, if the guest copies the acpi
tables into memory by it's own, it has to patch the tables. Due to
different layouts for different acpi tables, there's no generic way to
do that. For that reason, qemu created a table loader interface. It
contains commands for the guest for loading specific blobs into guest
memory and patching those blobs.
This commit adds a qemu_loader class which handles the creation of qemu
loader commands. At the moment, the WRITE_POINTER command isn't
implement. It won't be required by bhyve's acpi table generation yet.
Reviewed by: markj
MFC after: 1 week
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D38438
(cherry picked from commit f565b4d6303f4798a2cb0dc51ef88de9e4a24047)
---
usr.sbin/bhyve/Makefile | 1 +
usr.sbin/bhyve/qemu_loader.c | 274 +++++++++++++++++++++++++++++++++++++++++++
usr.sbin/bhyve/qemu_loader.h | 77 ++++++++++++
3 files changed, 352 insertions(+)
diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
index 967ea790caa5..f5031a5bae07 100644
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -64,6 +64,7 @@ SRCS= \
ps2kbd.c \
ps2mouse.c \
qemu_fwcfg.c \
+ qemu_loader.c \
rfb.c \
rtc.c \
smbiostbl.c \
diff --git a/usr.sbin/bhyve/qemu_loader.c b/usr.sbin/bhyve/qemu_loader.c
new file mode 100644
index 000000000000..b0e1197a4b6b
--- /dev/null
+++ b/usr.sbin/bhyve/qemu_loader.c
@@ -0,0 +1,274 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2022 Beckhoff Automation GmbH & Co. KG
+ * Author: Corvin Köhne <c.koehne@beckhoff.com>
+ */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/endian.h>
+#include <sys/queue.h>
+
+#include <machine/vmm.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vmmapi.h>
+
+#include "qemu_fwcfg.h"
+#include "qemu_loader.h"
+
+struct qemu_loader_entry {
+ uint32_t cmd_le;
+ union {
+ struct {
+ uint8_t name[QEMU_FWCFG_MAX_NAME];
+ uint32_t alignment_le;
+ uint8_t zone;
+ } alloc;
+ struct {
+ uint8_t dest_name[QEMU_FWCFG_MAX_NAME];
+ uint8_t src_name[QEMU_FWCFG_MAX_NAME];
+ uint32_t off_le;
+ uint8_t size;
+ } add_pointer;
+ struct {
+ uint8_t name[QEMU_FWCFG_MAX_NAME];
+ uint32_t off_le;
+ uint32_t start_le;
+ uint32_t len_le;
+ } add_checksum;
+ struct {
+ uint8_t dest_name[QEMU_FWCFG_MAX_NAME];
+ uint8_t src_name[QEMU_FWCFG_MAX_NAME];
+ uint32_t dest_off_le;
+ uint32_t src_off_le;
+ uint8_t size;
+ } write_pointer;
+
+ /* padding */
+ uint8_t pad[124];
+ };
+} __packed;
+
+enum qemu_loader_command {
+ QEMU_LOADER_CMD_ALLOC = 0x1,
+ QEMU_LOADER_CMD_ADD_POINTER = 0x2,
+ QEMU_LOADER_CMD_ADD_CHECKSUM = 0x3,
+ QEMU_LOADER_CMD_WRITE_POINTER = 0x4,
+};
+
+struct qemu_loader_element {
+ STAILQ_ENTRY(qemu_loader_element) chain;
+ struct qemu_loader_entry entry;
+};
+
+struct qemu_loader {
+ uint8_t fwcfg_name[QEMU_FWCFG_MAX_NAME];
+ STAILQ_HEAD(qemu_loader_list, qemu_loader_element) list;
+};
+
+int
+qemu_loader_alloc(struct qemu_loader *const loader, const uint8_t *name,
+ const uint32_t alignment, const enum qemu_loader_zone zone)
+{
+ struct qemu_loader_element *element;
+
+ if (strlen(name) >= QEMU_FWCFG_MAX_NAME)
+ return (EINVAL);
+
+ element = calloc(1, sizeof(struct qemu_loader_element));
+ if (element == NULL) {
+ warnx("%s: failed to allocate command", __func__);
+ return (ENOMEM);
+ }
+
+ element->entry.cmd_le = htole32(QEMU_LOADER_CMD_ALLOC);
+ strncpy(element->entry.alloc.name, name, QEMU_FWCFG_MAX_NAME);
+ element->entry.alloc.alignment_le = htole32(alignment);
+ element->entry.alloc.zone = zone;
+
+ /*
+ * The guest always works on copies of the fwcfg item, which where
+ * loaded into guest memory. Loading a fwcfg item is caused by ALLOC.
+ * For that reason, ALLOC should be scheduled in front of any other
+ * commands.
+ */
+ STAILQ_INSERT_HEAD(&loader->list, element, chain);
+
+ return (0);
+}
+
+int
+qemu_loader_add_checksum(struct qemu_loader *const loader, const uint8_t *name,
+ const uint32_t off, const uint32_t start, const uint32_t len)
+{
+ struct qemu_loader_element *element;
+
+ if (strlen(name) >= QEMU_FWCFG_MAX_NAME)
+ return (EINVAL);
+
+ element = calloc(1, sizeof(struct qemu_loader_element));
+ if (element == NULL) {
+ warnx("%s: failed to allocate command", __func__);
+ return (ENOMEM);
+ }
+
+ element->entry.cmd_le = htole32(QEMU_LOADER_CMD_ADD_CHECKSUM);
+ strncpy(element->entry.add_checksum.name, name, QEMU_FWCFG_MAX_NAME);
+ element->entry.add_checksum.off_le = htole32(off);
+ element->entry.add_checksum.start_le = htole32(start);
+ element->entry.add_checksum.len_le = htole32(len);
+
+ STAILQ_INSERT_TAIL(&loader->list, element, chain);
+
+ return (0);
+}
+
+int
+qemu_loader_add_pointer(struct qemu_loader *const loader,
+ const uint8_t *dest_name, const uint8_t *src_name, const uint32_t off,
+ const uint8_t size)
+{
+ struct qemu_loader_element *element;
+
+ if (strlen(dest_name) >= QEMU_FWCFG_MAX_NAME ||
+ strlen(src_name) >= QEMU_FWCFG_MAX_NAME)
+ return (EINVAL);
+
+ element = calloc(1, sizeof(struct qemu_loader_element));
+ if (element == NULL) {
+ warnx("%s: failed to allocate command", __func__);
+ return (ENOMEM);
+ }
+
+ element->entry.cmd_le = htole32(QEMU_LOADER_CMD_ADD_POINTER);
+ strncpy(element->entry.add_pointer.dest_name, dest_name,
+ QEMU_FWCFG_MAX_NAME);
+ strncpy(element->entry.add_pointer.src_name, src_name,
+ QEMU_FWCFG_MAX_NAME);
+ element->entry.add_pointer.off_le = htole32(off);
+ element->entry.add_pointer.size = size;
+
+ STAILQ_INSERT_TAIL(&loader->list, element, chain);
+
+ return (0);
+}
+
+int
+qemu_loader_create(struct qemu_loader **const new_loader,
+ const uint8_t *fwcfg_name)
+{
+ struct qemu_loader *loader;
+
+ if (new_loader == NULL || strlen(fwcfg_name) >= QEMU_FWCFG_MAX_NAME) {
+ return (EINVAL);
+ }
+
+ loader = calloc(1, sizeof(struct qemu_loader));
+ if (loader == NULL) {
+ warnx("%s: failed to allocate loader", __func__);
+ return (ENOMEM);
+ }
+
+ strncpy(loader->fwcfg_name, fwcfg_name, QEMU_FWCFG_MAX_NAME);
+ STAILQ_INIT(&loader->list);
+
+ *new_loader = loader;
+
+ return (0);
+}
+
+static const uint8_t *
+qemu_loader_get_zone_name(const enum qemu_loader_zone zone)
+{
+ switch (zone) {
+ case QEMU_LOADER_ALLOC_HIGH:
+ return ("HIGH");
+ case QEMU_LOADER_ALLOC_FSEG:
+ return ("FSEG");
+ default:
+ return ("Unknown");
+ }
+}
+
+static void __unused
+qemu_loader_dump_entry(const struct qemu_loader_entry *const entry)
+{
+ switch (le32toh(entry->cmd_le)) {
+ case QEMU_LOADER_CMD_ALLOC:
+ printf("CMD_ALLOC\n\r");
+ printf(" name : %s\n\r", entry->alloc.name);
+ printf(" alignment: %8x\n\r",
+ le32toh(entry->alloc.alignment_le));
+ printf(" zone : %s\n\r",
+ qemu_loader_get_zone_name(entry->alloc.zone));
+ break;
+ case QEMU_LOADER_CMD_ADD_POINTER:
+ printf("CMD_ADD_POINTER\n\r");
+ printf(" dest_name: %s\n\r", entry->add_pointer.dest_name);
+ printf(" src_name : %s\n\r", entry->add_pointer.src_name);
+ printf(" off : %8x\n\r",
+ le32toh(entry->add_pointer.off_le));
+ printf(" size : %8x\n\r", entry->add_pointer.size);
+ break;
+ case QEMU_LOADER_CMD_ADD_CHECKSUM:
+ printf("CMD_ADD_CHECKSUM\n\r");
+ printf(" name : %s\n\r", entry->add_checksum.name);
+ printf(" off : %8x\n\r",
+ le32toh(entry->add_checksum.off_le));
+ printf(" start : %8x\n\r",
+ le32toh(entry->add_checksum.start_le));
+ printf(" length : %8x\n\r",
+ le32toh(entry->add_checksum.len_le));
+ break;
+ case QEMU_LOADER_CMD_WRITE_POINTER:
+ printf("CMD_WRITE_POINTER\n\r");
+ printf(" dest_name: %s\n\r", entry->write_pointer.dest_name);
+ printf(" src_name : %s\n\r", entry->write_pointer.src_name);
+ printf(" dest_off : %8x\n\r",
+ le32toh(entry->write_pointer.dest_off_le));
+ printf(" src_off : %8x\n\r",
+ le32toh(entry->write_pointer.src_off_le));
+ printf(" size : %8x\n\r", entry->write_pointer.size);
+ break;
+ default:
+ printf("UNKNOWN\n\r");
+ break;
+ }
+}
+
+int
+qemu_loader_finish(struct qemu_loader *const loader)
+{
+ struct qemu_loader_element *element;
+ struct qemu_loader_entry *data;
+ size_t len = 0;
+
+ STAILQ_FOREACH(element, &loader->list, chain) {
+ len += sizeof(struct qemu_loader_entry);
+ }
+ if (len == 0) {
+ warnx("%s: bios loader empty", __func__);
+ return (EFAULT);
+ }
+
+ data = calloc(1, len);
+ if (data == NULL) {
+ warnx("%s: failed to allocate fwcfg data", __func__);
+ return (ENOMEM);
+ }
+
+ int i = 0;
+ STAILQ_FOREACH(element, &loader->list, chain) {
+ memcpy(&data[i], &element->entry,
+ sizeof(struct qemu_loader_entry));
+ ++i;
+ }
+
+ return (qemu_fwcfg_add_file(loader->fwcfg_name, len, data));
+}
diff --git a/usr.sbin/bhyve/qemu_loader.h b/usr.sbin/bhyve/qemu_loader.h
new file mode 100644
index 000000000000..b6ce48ad0871
--- /dev/null
+++ b/usr.sbin/bhyve/qemu_loader.h
@@ -0,0 +1,77 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2022 Beckhoff Automation GmbH & Co. KG
+ * Author: Corvin Köhne <c.koehne@beckhoff.com>
+ */
+
+#pragma once
+
+#include "qemu_fwcfg.h"
+
+struct qemu_loader;
+
+/*
+ * Some guest bios like seabios assume the RSDP to be located in the FSEG. Bhyve
+ * only supports OVMF which has no such requirement.
+ */
+enum qemu_loader_zone {
+ QEMU_LOADER_ALLOC_HIGH = 1,
+ QEMU_LOADER_ALLOC_FSEG, /* 0x0F000000 - 0x100000 */
+};
+
+/**
+ * Loads a fwcfg item into guest memory. This command has to be issued before
+ * any subsequent command can be used.
+ *
+ * @param loader Qemu loader instance the command should be added to.
+ * @param name Name of the fwcfg item which should be allocated.
+ * @param alignment Alignment required by the data.
+ * @param zone Memory zone in which it should be loaded.
+ */
+int qemu_loader_alloc(struct qemu_loader *loader, const uint8_t *name,
+ uint32_t alignment, enum qemu_loader_zone zone);
+/**
+ * Calculates a checksum for @p name and writes it to @p name + @p off . The
+ * checksum calculation ranges from @p start to @p start + @p len. The checksum
+ * field is always one byte large and all bytes in the specified range,
+ * including the checksum, have to sum up to 0.
+ *
+ * @param loader Qemu loader instance the command should be added to.
+ * @param name Name of the fwcfg item which should be patched.
+ * @param off Offset into @p name .
+ * @param start Start offset of checksum calculation.
+ * @param len Length of the checksum calculation.
+ */
+int qemu_loader_add_checksum(struct qemu_loader *loader, const uint8_t *name,
+ uint32_t off, uint32_t start, uint32_t len);
+/**
+ * Adds the address of @p src_name to the value at @p dest_name + @p off . The
+ * size of the pointer is determined by @p dest_size and should be 1, 2, 4 or 8.
+ *
+ * @param loader Qemu loader instance the command should be added to.
+ * @param dest_name Name of the fwcfg item which should be patched.
+ * @param src_name Name of the fwcfg item which address should be written to
+ * @p dest_name + @p off.
+ * @param off Offset into @p dest_name .
+ * @param size Size of the pointer (1, 2, 4 or 8).
+ */
+int qemu_loader_add_pointer(struct qemu_loader *loader,
+ const uint8_t *dest_name, const uint8_t *src_name, uint32_t off,
+ uint8_t size);
+
+/**
+ * Creates a qemu loader instance.
+ *
+ * @param new_loader Returns the newly created qemu loader instance.
+ * @param fwcfg_name Name of the FwCfg item which represents the qemu loader
+ */
+int qemu_loader_create(struct qemu_loader **new_loader,
+ const uint8_t *fwcfg_name);
+/**
+ * Signals that all commands are written to the qemu loader. This function
+ * creates a proper FwCfg item and registers it.
+ *
+ * @param loader Qemu loader instance which should be finished.
+ */
+int qemu_loader_finish(struct qemu_loader *loader);
From nobody Mon May 8 08:25:26 2023
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 4QFDr72Wr8z49ZT2;
Mon, 8 May 2023 08:25:27 +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 4QFDr71LXvz3lJK;
Mon, 8 May 2023 08:25:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683534327;
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=42N8ALR0PSlufZfS0m6OX2CDdguICEwF73FxPH8caC0=;
b=jyQ4TqLstZCaBWmqIFNSihlvZTL1vfgzzgHqhHARPw12BXzKhPaXNh0QvPvgYc1tGQ2w7u
HKmh4p4J+O+gR1Jnfe+JjZYCHuDdoxct4JI/jUQ6FxOSl0T3ZgW+Zk7h7ydmGnLkCS5fOm
cvra/UZu1+aF8oJvd69NOu/7Xa0gO/rSOMfIqMRZsPfEwWpi2/SMDcAGWD0iK0B4PboHUi
DCwbYDOSQBuzXgux9L3tTp2KnIK2ut0ztAwpVdfNqBXOKxXup0/jXvf+g9p71FuOn4E/WF
Uet+EmUMuloybfDOA4tcOyiGjR5ru3n/m44N0YVXXV6aQHMM8/F6KpR/FUxQqA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683534327;
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=42N8ALR0PSlufZfS0m6OX2CDdguICEwF73FxPH8caC0=;
b=CkhmXvO6VGjMLLTCBpHk+MBYeKBF3UA2i2kb1LVfOHTjKksRdGjG8NoYmwtu9dSDjssx48
MVctuuTRZVXvVXDeKTxex6Fvy9f1UQ1ODPhr7+apob2g5xQCk5OYgdQGgEiLe6OvNgMpjC
+6x6JxWMuRaUdG3mQuEsrcdEG8wrhDQQgGDSrJlP+zUiBvtreadbMX7pj7Qnq9HX+F7jBT
cxburvXp41Zg0oeoOGLGhzb81c2nzaflXsIYL2hpcbpfFA9b3P114fT1lZaTyFsm8K/61M
1PklT/aZGlLa/xeGPkKhZ9fpNcozVjkcBfPGKcQZoXf6mq3gk51nMJkzAVsF3g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683534327; a=rsa-sha256; cv=none;
b=KiipD4i4Zro5QxYdyhEodqU34yvwZHibFAq79U8c4/JHXkqtoKV/DjQldQH4/6nJtJr3vb
toFXj+/wZKHp032o6y3lSt6McziKjeuGYX3Uj3WfCZpQHOR5RJWKjmzCRNCRnl/DvDER4m
aRGleZkavlvTOs1mFJMsyMF6Q0HMVmO90HPpmN4LHaUid49ZaG781uE/bw4KPfB0c+FWy2
i3Lt1u0DYnIw4RDMshx9TIW0ZNr0q54deVVC1k27xBskYI9YBSNrtiR+XkZ1TyYDFvpRMb
yeMdlNgfRR3TrcPHZJ3klt3GB4KpQUjxK973NXPn7JDubKVT0YaTh3Adl7If4w==
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 4QFDr67444zsyH;
Mon, 8 May 2023 08:25:26 +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 3488PQX3050329;
Mon, 8 May 2023 08:25:26 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3488PQCg050328;
Mon, 8 May 2023 08:25:26 GMT
(envelope-from git)
Date: Mon, 8 May 2023 08:25:26 GMT
Message-Id: <202305080825.3488PQCg050328@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: a02d136df0bc - stable/13 - bhyve: make use of qemus acpi table loader
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: a02d136df0bc48e7d33e43c4f754e58ec63f5629
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by corvink:
URL: https://cgit.FreeBSD.org/src/commit/?id=a02d136df0bc48e7d33e43c4f754e58ec63f5629
commit a02d136df0bc48e7d33e43c4f754e58ec63f5629
Author: Corvin Köhne <corvink@FreeBSD.org>
AuthorDate: 2022-04-06 09:10:37 +0000
Commit: Corvin Köhne <corvink@FreeBSD.org>
CommitDate: 2023-05-08 08:21:30 +0000
bhyve: make use of qemus acpi table loader
Add all acpi tables to qemus acpi table loader. This passes the acpi
tables by fwcfg to the guest.
Reviewed by: markj
MFC after: 1 week
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D38439
(cherry picked from commit 7959d80d99ae06ba06cbe7a206ef9bc513e4109b)
---
usr.sbin/bhyve/basl.c | 21 ++++++++++++++++++++-
usr.sbin/bhyve/basl.h | 4 ++--
usr.sbin/bhyve/qemu_fwcfg.h | 2 ++
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/usr.sbin/bhyve/basl.c b/usr.sbin/bhyve/basl.c
index e002c3724ef0..348174c6520d 100644
--- a/usr.sbin/bhyve/basl.c
+++ b/usr.sbin/bhyve/basl.c
@@ -20,6 +20,7 @@
#include <vmmapi.h>
#include "basl.h"
+#include "qemu_loader.h"
struct basl_table_checksum {
STAILQ_ENTRY(basl_table_checksum) chain;
@@ -56,6 +57,8 @@ struct basl_table {
static STAILQ_HEAD(basl_table_list, basl_table) basl_tables = STAILQ_HEAD_INITIALIZER(
basl_tables);
+static struct qemu_loader *basl_loader;
+
static __inline uint64_t
basl_le_dec(void *pp, size_t len)
{
@@ -163,6 +166,12 @@ basl_finish_install_guest_tables(struct basl_table *const table, uint32_t *const
}
memcpy(gva, table->data, table->len);
+ /* Cause guest bios to copy the ACPI table into guest memory. */
+ BASL_EXEC(
+ qemu_fwcfg_add_file(table->fwcfg_name, table->len, table->data));
+ BASL_EXEC(qemu_loader_alloc(basl_loader, table->fwcfg_name,
+ table->alignment, QEMU_LOADER_ALLOC_HIGH));
+
return (0);
}
@@ -219,6 +228,10 @@ basl_finish_patch_checksums(struct basl_table *const table)
sum += *(gva + i);
}
*checksum_gva = -sum;
+
+ /* Cause guest bios to patch the checksum. */
+ BASL_EXEC(qemu_loader_add_checksum(basl_loader,
+ table->fwcfg_name, checksum->off, checksum->start, len));
}
return (0);
@@ -286,6 +299,11 @@ basl_finish_patch_pointers(struct basl_table *const table)
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);
+
+ /* Cause guest bios to patch the pointer. */
+ BASL_EXEC(
+ qemu_loader_add_pointer(basl_loader, table->fwcfg_name,
+ src_table->fwcfg_name, pointer->off, pointer->size));
}
return (0);
@@ -335,6 +353,7 @@ basl_finish(void)
*/
BASL_EXEC(basl_finish_patch_checksums(table));
}
+ BASL_EXEC(qemu_loader_finish(basl_loader));
return (0);
}
@@ -342,7 +361,7 @@ basl_finish(void)
int
basl_init(void)
{
- return (0);
+ return (qemu_loader_create(&basl_loader, QEMU_FWCFG_FILE_TABLE_LOADER));
}
int
diff --git a/usr.sbin/bhyve/basl.h b/usr.sbin/bhyve/basl.h
index c7fdd783a9d5..4d9ab4c589a8 100644
--- a/usr.sbin/bhyve/basl.h
+++ b/usr.sbin/bhyve/basl.h
@@ -11,6 +11,8 @@
#include <contrib/dev/acpica/include/acpi.h>
#pragma GCC diagnostic pop
+#include "qemu_fwcfg.h"
+
#define ACPI_GAS_ACCESS_WIDTH_LEGACY 0
#define ACPI_GAS_ACCESS_WIDTH_UNDEFINED 0
#define ACPI_GAS_ACCESS_WIDTH_BYTE 1
@@ -59,8 +61,6 @@
} \
} while (0)
-#define QEMU_FWCFG_MAX_NAME 56
-
struct basl_table;
void basl_fill_gas(ACPI_GENERIC_ADDRESS *gas, uint8_t space_id,
diff --git a/usr.sbin/bhyve/qemu_fwcfg.h b/usr.sbin/bhyve/qemu_fwcfg.h
index f3846d64085a..d318d0434285 100644
--- a/usr.sbin/bhyve/qemu_fwcfg.h
+++ b/usr.sbin/bhyve/qemu_fwcfg.h
@@ -13,6 +13,8 @@
#define QEMU_FWCFG_MAX_ENTRIES 0x4000
#define QEMU_FWCFG_MAX_NAME 56
+#define QEMU_FWCFG_FILE_TABLE_LOADER "etc/table-loader"
+
struct qemu_fwcfg_item {
uint32_t size;
uint8_t *data;
From nobody Mon May 8 08:25:28 2023
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 4QFDr83Vphz49Z63;
Mon, 8 May 2023 08:25:28 +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 4QFDr82Zy1z3lK4;
Mon, 8 May 2023 08:25:28 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683534328;
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=4c4sa24V+btVB/J4N8eLCSoSGHptmGAQPqdvd6S7/PU=;
b=ETr/FeEGIQyzrv8BXvcQTOo4j0CXv56uopG0bKobC2qIaTY09qwPBRFkiNfRZzt2Yxe65i
UbUk9B89qCsbu3RkxVxttPtRz9rfDMXWmPoFBNxRP4+ssoHF3+jIwPZShbSYh8KQlv8Ep8
eWIJHB9k3xRWq8YY79QK8SsL0zS6F4vMTtT2eIaSTKpSy1q8NxnuZS3rQS3nUUFUKCm8YQ
6neqKR1mqwfZ5BfMusipfRK2qbEOfhDR3ZtzkQ0xqzoN/wNIS8ft/W+5ydYLDOwWLEBypI
wvJRwppI15YaTwRL3h9QRkIz4R3OWp5Q6tzzEW1YoV0xSygqY182FLJnRFsEZQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683534328;
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=4c4sa24V+btVB/J4N8eLCSoSGHptmGAQPqdvd6S7/PU=;
b=mHrGlOIDla+EKS4qUuaH5OJmsPrC6H/DqSJ3EIhxt0xzEAQ8JVWEW95KU6F3KzxRLIi6kR
eBcRpjW9jBDT/5ulfl50PZfbaF6+k8a588BNof7/RM74HriABGiXQH44va1qNtJKy19jDZ
m5FlKoSgIx9JuXszJ5lFHfGb0zANtB1415o3N2ML7mr9XSAkHMkG3rnshR3g9mB/jq+zx/
know451wRFkzvbJBqFw+6+HoO0T7ubgxr2zbcwJa8NR+xOsWhjAlApNo55RD1BvmXpEHJH
U0iZtKfczuguA0pThOCHXbaoqk4gdJfIBL2/IXsmoVH+lGcOedL+jneK/5WruQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683534328; a=rsa-sha256; cv=none;
b=R8+vHDkLYBX5dDuk7FJpmSiSOyFb3jPTtRAWoiSesuPcyLxnbE7xAi7LKVbuiRl4hYlUW0
y60paEYCEadr/c4pC0JPNXMdYvEOXiyqlI9JECNpVWKxdYrKEkO43860UvqHOCZWeD8fwt
pOJBsEn+zUdiasTOx73dWZFkQLP8/aUGZf8dfSh1Ma71Ci57K0sFDZeix9ZR+D3l3wVMKj
xseK3X0F//msT9wHT7jI55siPTngayV4ZBFKkci8ajDST4lKQenOPNGw33aaomVZADTtLt
UglxCxUgzLrw19jFb4PGHkUaMTAGOqGZiiHpBYfgjUDiVQaNKIAhClVQ/CcR/Q==
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 4QFDr80rwfzsnS;
Mon, 8 May 2023 08:25:28 +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 3488PS3F050356;
Mon, 8 May 2023 08:25:28 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3488PSiw050355;
Mon, 8 May 2023 08:25:28 GMT
(envelope-from git)
Date: Mon, 8 May 2023 08:25:28 GMT
Message-Id: <202305080825.3488PSiw050355@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: 694f2c9d354e - stable/13 - bhyve: add basic E820 implementation
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: 694f2c9d354e9938f7ab10376e04e5ee1c04940b
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by corvink:
URL: https://cgit.FreeBSD.org/src/commit/?id=694f2c9d354e9938f7ab10376e04e5ee1c04940b
commit 694f2c9d354e9938f7ab10376e04e5ee1c04940b
Author: Corvin Köhne <corvink@FreeBSD.org>
AuthorDate: 2021-09-09 09:37:03 +0000
Commit: Corvin Köhne <corvink@FreeBSD.org>
CommitDate: 2023-05-08 08:21:30 +0000
bhyve: add basic E820 implementation
There are some use cases where bhyve has to prepare some special memory
regions. E.g. GPU passthrough for Intel integrated graphic devices needs
to reserve some memory for the graphic device. So, bhyve has to inform
the guest about those memory regions. This information can be passed by
the qemu fwcfg interface. As qemu creates an E820 table, we can reuse
the existing fwcfg item "etc/e820".
This commit is the first one of a series. It only adds a basic
implementation for the creation of the E820 table. Some subsequent
commits will add more items to the E820 table and register it as fwcfg
item.
Reviewed by: markj
MFC after: 1 week
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D39545
(cherry picked from commit 9180daa1e34577aaccf3ff64cc63a5179c4f09d8)
---
usr.sbin/bhyve/e820.c | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++
usr.sbin/bhyve/e820.h | 28 ++++++
2 files changed, 261 insertions(+)
diff --git a/usr.sbin/bhyve/e820.c b/usr.sbin/bhyve/e820.c
new file mode 100644
index 000000000000..746d34d6521c
--- /dev/null
+++ b/usr.sbin/bhyve/e820.c
@@ -0,0 +1,233 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2021 Beckhoff Automation GmbH & Co. KG
+ * Author: Corvin Köhne <c.koehne@beckhoff.com>
+ */
+
+#include <sys/types.h>
+#include <sys/queue.h>
+
+#include <machine/vmm.h>
+
+#include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "e820.h"
+#include "qemu_fwcfg.h"
+
+#define E820_FWCFG_FILE_NAME "etc/e820"
+
+#define KB (1024UL)
+#define MB (1024 * KB)
+#define GB (1024 * MB)
+
+struct e820_element {
+ TAILQ_ENTRY(e820_element) chain;
+ uint64_t base;
+ uint64_t end;
+ enum e820_memory_type type;
+};
+static TAILQ_HEAD(e820_table, e820_element) e820_table = TAILQ_HEAD_INITIALIZER(
+ e820_table);
+
+static struct e820_element *
+e820_element_alloc(uint64_t base, uint64_t end, enum e820_memory_type type)
+{
+ struct e820_element *element;
+
+ element = calloc(1, sizeof(*element));
+ if (element == NULL) {
+ return (NULL);
+ }
+
+ element->base = base;
+ element->end = end;
+ element->type = type;
+
+ return (element);
+}
+
+struct qemu_fwcfg_item *
+e820_get_fwcfg_item(void)
+{
+ struct qemu_fwcfg_item *fwcfg_item;
+ struct e820_element *element;
+ struct e820_entry *entries;
+ int count, i;
+
+ count = 0;
+ TAILQ_FOREACH(element, &e820_table, chain) {
+ ++count;
+ }
+ if (count == 0) {
+ warnx("%s: E820 table empty", __func__);
+ return (NULL);
+ }
+
+ fwcfg_item = calloc(1, sizeof(struct qemu_fwcfg_item));
+ if (fwcfg_item == NULL) {
+ return (NULL);
+ }
+
+ fwcfg_item->size = count * sizeof(struct e820_entry);
+ fwcfg_item->data = calloc(count, sizeof(struct e820_entry));
+ if (fwcfg_item->data == NULL) {
+ free(fwcfg_item);
+ return (NULL);
+ }
+
+ i = 0;
+ entries = (struct e820_entry *)fwcfg_item->data;
+ TAILQ_FOREACH(element, &e820_table, chain) {
+ struct e820_entry *entry = &entries[i];
+
+ entry->base = element->base;
+ entry->length = element->end - element->base;
+ entry->type = element->type;
+
+ ++i;
+ }
+
+ return (fwcfg_item);
+}
+
+static int
+e820_add_entry(const uint64_t base, const uint64_t end,
+ const enum e820_memory_type type)
+{
+ struct e820_element *new_element;
+ struct e820_element *element;
+ struct e820_element *ram_element;
+
+ assert(end >= base);
+
+ new_element = e820_element_alloc(base, end, type);
+ if (new_element == NULL) {
+ return (ENOMEM);
+ }
+
+ /*
+ * E820 table should always be sorted in ascending order. Therefore,
+ * search for a range whose end is larger than the base parameter.
+ */
+ TAILQ_FOREACH(element, &e820_table, chain) {
+ if (element->end > base) {
+ break;
+ }
+ }
+
+ /*
+ * System memory requires special handling.
+ */
+ if (type == E820_TYPE_MEMORY) {
+ /*
+ * base is larger than of any existing element. Add new system
+ * memory at the end of the table.
+ */
+ if (element == NULL) {
+ TAILQ_INSERT_TAIL(&e820_table, new_element, chain);
+ return (0);
+ }
+
+ /*
+ * System memory shouldn't overlap with any existing element.
+ */
+ assert(end >= element->base);
+
+ TAILQ_INSERT_BEFORE(element, new_element, chain);
+
+ return (0);
+ }
+
+ assert(element != NULL);
+ /* Non system memory should be allocated inside system memory. */
+ assert(element->type == E820_TYPE_MEMORY);
+ /* New element should fit into existing system memory element. */
+ assert(base >= element->base && end <= element->end);
+
+ if (base == element->base) {
+ /*
+ * New element at system memory base boundary. Add new
+ * element before current and adjust the base of the old
+ * element.
+ *
+ * Old table:
+ * [ 0x1000, 0x4000] RAM <-- element
+ * New table:
+ * [ 0x1000, 0x2000] Reserved
+ * [ 0x2000, 0x4000] RAM <-- element
+ */
+ TAILQ_INSERT_BEFORE(element, new_element, chain);
+ element->base = end;
+ } else if (end == element->end) {
+ /*
+ * New element at system memory end boundary. Add new
+ * element after current and adjust the end of the
+ * current element.
+ *
+ * Old table:
+ * [ 0x1000, 0x4000] RAM <-- element
+ * New table:
+ * [ 0x1000, 0x3000] RAM <-- element
+ * [ 0x3000, 0x4000] Reserved
+ */
+ TAILQ_INSERT_AFTER(&e820_table, element, new_element, chain);
+ element->end = base;
+ } else {
+ /*
+ * New element inside system memory entry. Split it by
+ * adding a system memory element and the new element
+ * before current.
+ *
+ * Old table:
+ * [ 0x1000, 0x4000] RAM <-- element
+ * New table:
+ * [ 0x1000, 0x2000] RAM
+ * [ 0x2000, 0x3000] Reserved
+ * [ 0x3000, 0x4000] RAM <-- element
+ */
+ ram_element = e820_element_alloc(element->base, base,
+ E820_TYPE_MEMORY);
+ if (ram_element == NULL) {
+ return (ENOMEM);
+ }
+ TAILQ_INSERT_BEFORE(element, ram_element, chain);
+ TAILQ_INSERT_BEFORE(element, new_element, chain);
+ element->base = end;
+ }
+
+ return (0);
+}
+
+int
+e820_init(struct vmctx *const ctx)
+{
+ uint64_t lowmem_size, highmem_size;
+ int error;
+
+ TAILQ_INIT(&e820_table);
+
+ lowmem_size = vm_get_lowmem_size(ctx);
+ error = e820_add_entry(0, lowmem_size, E820_TYPE_MEMORY);
+ if (error) {
+ warnx("%s: Could not add lowmem", __func__);
+ return (error);
+ }
+
+ highmem_size = vm_get_highmem_size(ctx);
+ if (highmem_size != 0) {
+ error = e820_add_entry(4 * GB, 4 * GB + highmem_size,
+ E820_TYPE_MEMORY);
+ if (error) {
+ warnx("%s: Could not add highmem", __func__);
+ return (error);
+ }
+ }
+
+ return (0);
+}
diff --git a/usr.sbin/bhyve/e820.h b/usr.sbin/bhyve/e820.h
new file mode 100644
index 000000000000..6843ad5dc736
--- /dev/null
+++ b/usr.sbin/bhyve/e820.h
@@ -0,0 +1,28 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2021 Beckhoff Automation GmbH & Co. KG
+ * Author: Corvin Köhne <c.koehne@beckhoff.com>
+ */
+
+#pragma once
+
+#include <vmmapi.h>
+
+#include "qemu_fwcfg.h"
+
+enum e820_memory_type {
+ E820_TYPE_MEMORY = 1,
+ E820_TYPE_RESERVED = 2,
+ E820_TYPE_ACPI = 3,
+ E820_TYPE_NVS = 4
+};
+
+struct e820_entry {
+ uint64_t base;
+ uint64_t length;
+ uint32_t type;
+} __packed;
+
+struct qemu_fwcfg_item *e820_get_fwcfg_item(void);
+int e820_init(struct vmctx *const ctx);
From nobody Mon May 8 08:25:29 2023
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 4QFDr93Gtkz49ZQb;
Mon, 8 May 2023 08:25:29 +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 4QFDr92Jvfz3l6B;
Mon, 8 May 2023 08:25:29 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683534329;
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=rs3M5HeUzN3y8599aOllIivoDuqgZAPAZ8bEYwcmU2g=;
b=AIHH/sQjAEknrl/r6g9wBVF+6gDrTo7HessqA2pFVDRzl/lxJYeYmiX0CBjoz3PwbJRyV8
yBeioI3N6PnLDUsrerjFbCTm/99MCdJzPQTCH537uYvBbVb9bWM0o6b5z2mGM/WYNvPuRR
cpsnqkT0kcMKowM5s3Pfgnv22vA7pQLfWkIbnF96Z1Q3KDczWCvm4HY/9ruL2FLMtz8yPI
sNXF1jdRu9LBOnqWFMty6gxz6XIIsqWdQDvGvHGmK7cwPz73IGvJ4BlYpXbGaqMrkC/OGC
xkgO15H2wBvnOEepM8R5aE6KMEVhUbMDvyr+uM5w7TuGzWbdgxc4I5OJ4WBt8Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683534329;
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=rs3M5HeUzN3y8599aOllIivoDuqgZAPAZ8bEYwcmU2g=;
b=Y7nclbK8zt99LM8vbPmUJEeDGrKlkzl6S5SDzmGkQb7PUmDjoEx0og0QGwr/Mn+qVsJOPR
iqHvqJdXv71am6U13nRYIwCirRV5V1nn1Q2VjqT3p3oXvL9RZs6SxeSWUDJSh/qCMh6GBw
LQ5zz/3cXmofVyKUZoRNfJ2moI1S7vB8VGMUjJZ3ZAvQp4vT3pv8NoOUVOgdDufsZEgkxj
ivd+BTr4wfYo5f0w4LfdFKFOMChpmMd3Y2FizJ48zCGzOH7YcLFVfT0OHwPO/w0UMTuhKh
soU3bJCO9rMQKnYPYqfqt/t+ndmY0AG17aTp6Dngbj6dJEOVk1lSm9TR+hMH8Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683534329; a=rsa-sha256; cv=none;
b=eA8F+lcFOqqrnyWMp/ypN8X4vt/f5iIB2rVlpLX0kONH3djlb7Jy3y0OoOey+jMAexKiVZ
+M2eQEGdnuOuqs8hBy/KXzE59Gh72HfhCF8/ZLiy3l+r9Wu5cMqpEtpepYOCQniIs/ltwT
m6U7xAvEAYhc5BhKBgugD+Gfcd5IxdUmHUsfjBOfDqqbF4SQ6HeLS0uVkYmtOIpksgkTsw
QolezLp8pvN6CHr43W44Ck9avBBIbl9rbaumR+KuvZI9VlMFdvbr5HiYyyuDRDNKgsEt50
aSB0FztNBtmqUYe6ltMqszZk4AOyyaGxEXkF+xLJz73mlf3nsCdGKhXXxmtVOw==
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 4QFDr91PwFzt6T;
Mon, 8 May 2023 08:25:29 +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 3488PTvh050382;
Mon, 8 May 2023 08:25:29 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3488PTJK050381;
Mon, 8 May 2023 08:25:29 GMT
(envelope-from git)
Date: Mon, 8 May 2023 08:25:29 GMT
Message-Id: <202305080825.3488PTJK050381@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: 951ca31bf66b - stable/13 - bhyve: add common memory holes to E820 table
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: 951ca31bf66bdc3eea8cf1a8d4262a9d5db61904
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by corvink:
URL: https://cgit.FreeBSD.org/src/commit/?id=951ca31bf66bdc3eea8cf1a8d4262a9d5db61904
commit 951ca31bf66bdc3eea8cf1a8d4262a9d5db61904
Author: Corvin Köhne <corvink@FreeBSD.org>
AuthorDate: 2021-09-09 09:37:03 +0000
Commit: Corvin Köhne <corvink@FreeBSD.org>
CommitDate: 2023-05-08 08:21:31 +0000
bhyve: add common memory holes to E820 table
The VGA and the ROM memory ranges can't be used as system memory. For
that reason, remove them from the E820 table.
Reviewed by: markj
MFC after: 1 week
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D39546
(cherry picked from commit 059af92a300f76653048c042559f7d7d8fd8f99c)
---
usr.sbin/bhyve/e820.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 90 insertions(+)
diff --git a/usr.sbin/bhyve/e820.c b/usr.sbin/bhyve/e820.c
index 746d34d6521c..95b83c056b9b 100644
--- a/usr.sbin/bhyve/e820.c
+++ b/usr.sbin/bhyve/e820.c
@@ -26,6 +26,16 @@
#define MB (1024 * KB)
#define GB (1024 * MB)
+/*
+ * Fix E820 memory holes:
+ * [ A0000, C0000) VGA
+ * [ C0000, 100000) ROM
+ */
+#define E820_VGA_MEM_BASE 0xA0000
+#define E820_VGA_MEM_END 0xC0000
+#define E820_ROM_MEM_BASE 0xC0000
+#define E820_ROM_MEM_END 0x100000
+
struct e820_element {
TAILQ_ENTRY(e820_element) chain;
uint64_t base;
@@ -204,6 +214,74 @@ e820_add_entry(const uint64_t base, const uint64_t end,
return (0);
}
+static int
+e820_add_memory_hole(const uint64_t base, const uint64_t end)
+{
+ struct e820_element *element;
+ struct e820_element *ram_element;
+
+ assert(end >= base);
+
+ /*
+ * E820 table should be always sorted in ascending order. Therefore,
+ * search for an element which end is larger than the base parameter.
+ */
+ TAILQ_FOREACH(element, &e820_table, chain) {
+ if (element->end > base) {
+ break;
+ }
+ }
+
+ if (element == NULL || end <= element->base) {
+ /* Nothing to do. Hole already exists */
+ return (0);
+ }
+
+ /* Memory holes are only allowed in system memory */
+ assert(element->type == E820_TYPE_MEMORY);
+
+ if (base == element->base) {
+ /*
+ * New hole at system memory base boundary.
+ *
+ * Old table:
+ * [ 0x1000, 0x4000] RAM
+ * New table:
+ * [ 0x2000, 0x4000] RAM
+ */
+ element->base = end;
+ } else if (end == element->end) {
+ /*
+ * New hole at system memory end boundary.
+ *
+ * Old table:
+ * [ 0x1000, 0x4000] RAM
+ * New table:
+ * [ 0x1000, 0x3000] RAM
+ */
+ element->end = base;
+ } else {
+ /*
+ * New hole inside system memory entry. Split the system memory.
+ *
+ * Old table:
+ * [ 0x1000, 0x4000] RAM <-- element
+ * New table:
+ * [ 0x1000, 0x2000] RAM
+ * [ 0x3000, 0x4000] RAM <-- element
+ */
+ ram_element = e820_element_alloc(element->base, base,
+ E820_TYPE_MEMORY);
+ if (ram_element == NULL) {
+ return (ENOMEM);
+ }
+ TAILQ_INSERT_BEFORE(element, ram_element, chain);
+ element->base = end;
+ }
+
+ return (0);
+}
+
int
e820_init(struct vmctx *const ctx)
{
@@ -229,5 +307,17 @@ e820_init(struct vmctx *const ctx)
}
}
+ error = e820_add_memory_hole(E820_VGA_MEM_BASE, E820_VGA_MEM_END);
+ if (error) {
+ warnx("%s: Could not add VGA memory", __func__);
+ return (error);
+ }
+
+ error = e820_add_memory_hole(E820_ROM_MEM_BASE, E820_ROM_MEM_END);
+ if (error) {
+ warnx("%s: Could not add ROM area", __func__);
+ return (error);
+ }
+
return (0);
}
From nobody Mon May 8 08:25:30 2023
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 4QFDrB6JgBz49Z8H;
Mon, 8 May 2023 08:25: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 4QFDrB4NwKz3lDs;
Mon, 8 May 2023 08:25:30 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683534330;
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=ocVc9dUK2rN8dhPfS56RsW3xl34He6gw+TRYWsamAgc=;
b=ud3YrVlSDwaELs0kGg/E0gfEDw6G9RTkBG6AHROx9upDr+YImMFTZ5tERtq+6krwzJFWju
QBqt8roi8sskGhiSs8DKXtAHopoBynFDESidr5x2Ns5f72+GI+xq6RL5FiHIW3x3iv91td
Wh6fT+G1JmMRWFaS5GSHxTeJj0TSuc05TZfnplyluhC9P8Vs00KGeNCILjSZWih0pSyu9w
aZix955aBYzxviLzZl1cMWZ5ZAYICj9AJPIg7j78G+lav+50qyLuB3LxMKUAXNgMS9AemS
gV79LZy2hPOzf1Pdz5C9q0FtLHDEHECJlmUyBbi8ZYs/XrqCYnRAKZFOJHEIgw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683534330;
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=ocVc9dUK2rN8dhPfS56RsW3xl34He6gw+TRYWsamAgc=;
b=wAsSiJt7Tnt+tSMqSDHvzdWFNoK/hb+QLOQptHLprhIkAFe1ixfsrM/mrazVALDMuvqSqt
tNcWid7+5KHvPZVWNAfAb0foFSFhaXdUZVsfJATS2OKvB0EHE1bCjgSI/Y/9LxNMCjbe+L
f2MWstXdG5gp6TXIg8boG6zym2s7Sz05DeXv7i44/m0Y9wiJRh7CdNxXebyKy2yKy30LJ/
GKdjJhJ+ppQdxNuQlFxpb1noffnIuH73dey8DuYBPbYqW13LlOUUoK/bvIPnyatCyn2LGd
3MNXhyCazliUYWqKUWG3Bnu0IcRsgpAV829n8psGCh7Wq5INNy74rGpl0LjvfA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683534330; a=rsa-sha256; cv=none;
b=tIj0ijyCjckbF1ApCYVMg/tfCHJ7zTrC5bcq4mQg9abxLJkWXKh5tIuQJ8VamCnOJsR135
taUySLB1du0zQkIX7/4dzwzEXlqQpzQoUyK2SnWqOe6UL8fU6QqB4ArVYpqAzvRWRvTLLy
0kgz+Yn9l3ktYFyPXuFXeo+yr1IBcXZxWQkB4cYdP3GPO+242pd7u7F7+8uXUyoGzeqUpn
WCA2Yj1CAjrdr8OXXWvka2FCC/MPbZrdWnTIuEp+4bZ+eEQ1BHNkqC7kiwXy70/qfPuRIX
XZR5as9H/zdC0qklDfTFlnMeOcbuIq2UpdKyVQU+5pnCnESfbTB/tjqeK2ottg==
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 4QFDrB29kMztJ1;
Mon, 8 May 2023 08:25: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 3488PUDv050411;
Mon, 8 May 2023 08:25:30 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3488PUep050410;
Mon, 8 May 2023 08:25:30 GMT
(envelope-from git)
Date: Mon, 8 May 2023 08:25:30 GMT
Message-Id: <202305080825.3488PUep050410@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: 0f8a17795d21 - stable/13 - bhyve: add allocation function to E820
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: 0f8a17795d21bbd90eda7e17e98847adca011176
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by corvink:
URL: https://cgit.FreeBSD.org/src/commit/?id=0f8a17795d21bbd90eda7e17e98847adca011176
commit 0f8a17795d21bbd90eda7e17e98847adca011176
Author: Corvin Köhne <corvink@FreeBSD.org>
AuthorDate: 2021-09-09 09:37:03 +0000
Commit: Corvin Köhne <corvink@FreeBSD.org>
CommitDate: 2023-05-08 08:21:31 +0000
bhyve: add allocation function to E820
This function makes it easy to allocate new E820 entries. It will be
used to allocate graphics memory for Intel integrated graphic devices.
Reviewed by: markj
MFC after: 1 week
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D39547
(cherry picked from commit 5597f564870e94d56111dec638b8859423c936a9)
---
usr.sbin/bhyve/e820.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++
usr.sbin/bhyve/e820.h | 16 ++++++++
2 files changed, 120 insertions(+)
diff --git a/usr.sbin/bhyve/e820.c b/usr.sbin/bhyve/e820.c
index 95b83c056b9b..922381d032ce 100644
--- a/usr.sbin/bhyve/e820.c
+++ b/usr.sbin/bhyve/e820.c
@@ -20,6 +20,14 @@
#include "e820.h"
#include "qemu_fwcfg.h"
+/*
+ * E820 always uses 64 bit entries. Emulation code will use vm_paddr_t since it
+ * works on physical addresses. If vm_paddr_t is larger than uint64_t E820 can't
+ * hold all possible physical addresses and we can get into trouble.
+ */
+static_assert(sizeof(vm_paddr_t) <= sizeof(uint64_t),
+ "Unable to represent physical memory by E820 table");
+
#define E820_FWCFG_FILE_NAME "etc/e820"
#define KB (1024UL)
@@ -282,6 +290,102 @@ e820_add_memory_hole(const uint64_t base, const uint64_t end)
return (0);
}
+static uint64_t
+e820_alloc_highest(const uint64_t max_address, const uint64_t length,
+ const uint64_t alignment, const enum e820_memory_type type)
+{
+ struct e820_element *element;
+
+ TAILQ_FOREACH_REVERSE(element, &e820_table, e820_table, chain) {
+ uint64_t address, base, end;
+
+ end = MIN(max_address, element->end);
+ base = roundup2(element->base, alignment);
+
+ /*
+ * If end - length == 0, we would allocate memory at address 0. This
+ * address is mostly unusable and we should avoid allocating it.
+ * Therefore, search for another block in that case.
+ */
+ if (element->type != E820_TYPE_MEMORY || end < base ||
+ end - base < length || end - length == 0) {
+ continue;
+ }
+
+ address = rounddown2(end - length, alignment);
+
+ if (e820_add_entry(address, address + length, type) != 0) {
+ return (0);
+ }
+
+ return (address);
+ }
+
+ return (0);
+}
+
+static uint64_t
+e820_alloc_lowest(const uint64_t min_address, const uint64_t length,
+ const uint64_t alignment, const enum e820_memory_type type)
+{
+ struct e820_element *element;
+
+ TAILQ_FOREACH(element, &e820_table, chain) {
+ uint64_t base, end;
+
+ end = element->end;
+ base = MAX(min_address, roundup2(element->base, alignment));
+
+ /*
+ * If base == 0, we would allocate memory at address 0. This
+ * address is mostly unusable and we should avoid allocating it.
+ * Therefore, search for another block in that case.
+ */
+ if (element->type != E820_TYPE_MEMORY || end < base ||
+ end - base < length || base == 0) {
+ continue;
+ }
+
+ if (e820_add_entry(base, base + length, type) != 0) {
+ return (0);
+ }
+
+ return (base);
+ }
+
+ return (0);
+}
+
+uint64_t
+e820_alloc(const uint64_t address, const uint64_t length,
+ const uint64_t alignment, const enum e820_memory_type type,
+ const enum e820_allocation_strategy strategy)
+{
+ assert(powerof2(alignment));
+ assert((address & (alignment - 1)) == 0);
+
+ switch (strategy) {
+ case E820_ALLOCATE_ANY:
+ /*
+ * Allocate any address. Therefore, ignore the address parameter
+ * and reuse the code path for allocating the lowest address.
+ */
+ return (e820_alloc_lowest(0, length, alignment, type));
+ case E820_ALLOCATE_LOWEST:
+ return (e820_alloc_lowest(address, length, alignment, type));
+ case E820_ALLOCATE_HIGHEST:
+ return (e820_alloc_highest(address, length, alignment, type));
+ case E820_ALLOCATE_SPECIFIC:
+ if (e820_add_entry(address, address + length, type) != 0) {
+ return (0);
+ }
+
+ return (address);
+ }
+
+ return (0);
+}
+
int
e820_init(struct vmctx *const ctx)
{
diff --git a/usr.sbin/bhyve/e820.h b/usr.sbin/bhyve/e820.h
index 6843ad5dc736..8b8e23422e1f 100644
--- a/usr.sbin/bhyve/e820.h
+++ b/usr.sbin/bhyve/e820.h
@@ -18,11 +18,27 @@ enum e820_memory_type {
E820_TYPE_NVS = 4
};
+enum e820_allocation_strategy {
+ /* allocate any address */
+ E820_ALLOCATE_ANY,
+ /* allocate lowest address larger than address */
+ E820_ALLOCATE_LOWEST,
+ /* allocate highest address lower than address */
+ E820_ALLOCATE_HIGHEST,
+ /* allocate a specific address */
+ E820_ALLOCATE_SPECIFIC
+};
+
struct e820_entry {
uint64_t base;
uint64_t length;
uint32_t type;
} __packed;
+#define E820_ALIGNMENT_NONE 1
+
+uint64_t e820_alloc(const uint64_t address, const uint64_t length,
+ const uint64_t alignment, const enum e820_memory_type type,
+ const enum e820_allocation_strategy strategy);
struct qemu_fwcfg_item *e820_get_fwcfg_item(void);
int e820_init(struct vmctx *const ctx);
From nobody Mon May 8 08:25:31 2023
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 4QFDrC4j7Tz49ZBd;
Mon, 8 May 2023 08:25:31 +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 4QFDrC3wrYz3lLK;
Mon, 8 May 2023 08:25:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683534331;
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=4msUovhD98NHfWL5Acmtpi95PrsMgtdhD2SOpATx/ec=;
b=GmBu2MxmDVzNl70dOr2cQYpu/x3pHC8qPLKkP8S5Ux4SffLTuFX/ONgfpUHXYjFGzLfB/x
jeHepyWGVllXSzbKM53YELdGrfhKgCPV1ZmHXNxdBIOT3aZao40xdmT5GI6ENhf8e7wntZ
jrqYT5WJUEHPQCrXxLhT1jFdQE52K6Gd6iyupq35xbpj9aePKhh7iE1KPGXGXmEKEf1QnV
hJswQFlRelAKViwXJ7+EiTuzHvzCB2LJnaL4UTLI4NuiAfNLIdLJ7BBakzFq+heQMna80r
55IwJpqHzTywVeIGt4uzMo+r6ED9yEO1XOnF3FMpyI2yxr+rKU1RnwlCcNU5XA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683534331;
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=4msUovhD98NHfWL5Acmtpi95PrsMgtdhD2SOpATx/ec=;
b=mQcjO0PHfasg0c96gsmpCmIXrdVCicYBK9rGhUI+km6yF4JWc3P1HCFpr3q2dKQ/ZQ0LBV
I1zykUUkZlIzyhNQQr3ylE2PC9A90MQ/Z0SsrUIpzN9qEiKK5G8eT8KBac7gz9wlLICRfM
sXIsNkR6erTRRYrw8zSNjixYxKogdel305eMJFh+tE37ba83SkSa9io90g+A0uRMFfbU+K
74ubjLmYCQMdsicT6lCG9Cts1mkHKGWNuoDp82R0Z6jqHepI8f0IfCDxR7k2nWsY8y+2Pi
Bkm8aZY17oFMpwVfesXKhRL8zLKdI588io+rcTP3CRHfKfEXyTvI//7j2NE5xA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683534331; a=rsa-sha256; cv=none;
b=lZ+J3beqgZV9IMnJqjZcG/XWUjkuRdgmhxknF1BMs8uWRYEd6j0n30bqGizQUMteajDyz7
DZa6PaWaGMhlR7XY0W6qiaxwCAtzqPCnl5XiizkNR5M55/9EnAydZxKGdlSZheblqkP8Ug
JLYEUwNHUR6XvZiGal8VsqqEF7nlyVHP44iMHgE4XmVxDQrp8mzMUR1e65F20ReqyV9nrS
eWmwUQd3vH9NSxGRl1PtBLyhp6h89ikaKDSudQ5txD0VIS6TNjuSHQQtnkjhE5B4fRCmZJ
i2xdK5QvYED/5Vy6P5HaKllrd01kHRDhHMUlEXcJSvSFEnxhiZKT9YJmY2tYeA==
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 4QFDrC2n01ztLc;
Mon, 8 May 2023 08:25:31 +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 3488PVw1050435;
Mon, 8 May 2023 08:25:31 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3488PVxt050434;
Mon, 8 May 2023 08:25:31 GMT
(envelope-from git)
Date: Mon, 8 May 2023 08:25:31 GMT
Message-Id: <202305080825.3488PVxt050434@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: f1b5ce0d1d75 - stable/13 - bhyve: add E820 dump function
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: f1b5ce0d1d75a46dfad65a6f2079376d506e9913
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by corvink:
URL: https://cgit.FreeBSD.org/src/commit/?id=f1b5ce0d1d75a46dfad65a6f2079376d506e9913
commit f1b5ce0d1d75a46dfad65a6f2079376d506e9913
Author: Corvin Köhne <corvink@FreeBSD.org>
AuthorDate: 2021-09-09 09:37:03 +0000
Commit: Corvin Köhne <corvink@FreeBSD.org>
CommitDate: 2023-05-08 08:21:32 +0000
bhyve: add E820 dump function
For debugging purposes it is helpful to dump the E820 table.
Reviewed by: markj
MFC after: 1 week
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D39549
(cherry picked from commit a8a8e9af574c63fbecf4719e3bf184795dc98c51)
---
usr.sbin/bhyve/e820.c | 35 +++++++++++++++++++++++++++++++++++
usr.sbin/bhyve/e820.h | 1 +
2 files changed, 36 insertions(+)
diff --git a/usr.sbin/bhyve/e820.c b/usr.sbin/bhyve/e820.c
index 922381d032ce..6c43e6eda3a5 100644
--- a/usr.sbin/bhyve/e820.c
+++ b/usr.sbin/bhyve/e820.c
@@ -70,6 +70,41 @@ e820_element_alloc(uint64_t base, uint64_t end, enum e820_memory_type type)
return (element);
}
+static const char *
+e820_get_type_name(const enum e820_memory_type type)
+{
+ switch (type) {
+ case E820_TYPE_MEMORY:
+ return ("RAM");
+ case E820_TYPE_RESERVED:
+ return ("Reserved");
+ case E820_TYPE_ACPI:
+ return ("ACPI");
+ case E820_TYPE_NVS:
+ return ("NVS");
+ default:
+ return ("Unknown");
+ }
+}
+
+void
+e820_dump_table(void)
+{
+ struct e820_element *element;
+ uint64_t i;
+
+ fprintf(stderr, "E820 map:\n");
+
+ i = 0;
+ TAILQ_FOREACH(element, &e820_table, chain) {
+ fprintf(stderr, " (%4lu) [%16lx, %16lx] %s\n", i,
+ element->base, element->end,
+ e820_get_type_name(element->type));
+
+ ++i;
+ }
+}
+
struct qemu_fwcfg_item *
e820_get_fwcfg_item(void)
{
diff --git a/usr.sbin/bhyve/e820.h b/usr.sbin/bhyve/e820.h
index 8b8e23422e1f..8703a55115cd 100644
--- a/usr.sbin/bhyve/e820.h
+++ b/usr.sbin/bhyve/e820.h
@@ -40,5 +40,6 @@ struct e820_entry {
uint64_t e820_alloc(const uint64_t address, const uint64_t length,
const uint64_t alignment, const enum e820_memory_type type,
const enum e820_allocation_strategy strategy);
+void e820_dump_table(void);
struct qemu_fwcfg_item *e820_get_fwcfg_item(void);
int e820_init(struct vmctx *const ctx);
From nobody Mon May 8 08:25:32 2023
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 4QFDrD5fRzz49YyJ;
Mon, 8 May 2023 08:25:32 +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 4QFDrD572Dz3lQk;
Mon, 8 May 2023 08:25:32 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683534332;
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=l6rEFtcsRF+nrdrduRw6ojGB1ilJk+Ydo8HbkrNNgfU=;
b=JGkQ+/Tju/ke4D5teUI9/CO6O1eS+eUhSUMzfdb21ZpAkNzdYC/nGZRF0XP37dfBCqJXZh
qRSxPQzXT8BOAiACFmD35nF3I+/dDezW7OrbcOYRH0fHlbamJdP0gp8BsjKHZac4sUTNB2
5MFD0xTM2D+hHaScjY3ke15Y7taNA7WoItMaF6gM7DoRnRDzmHVZ+2WL4Ht1BN+xeE+K1H
yggst61XgO9zyLKiqKM2L0CmqIDMfPVzZzsilpz8YaXVy+A4+lbd3uYhnF2i+yhdQ4SuMQ
6ZazSFW/ruGPPAKeFSH/QapmzY3VjG5K8yQDNJHM5RmJwi2/LNS3yiBnuHClng==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683534332;
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=l6rEFtcsRF+nrdrduRw6ojGB1ilJk+Ydo8HbkrNNgfU=;
b=J11Z2bzq/WZmCSdaF42taEyUQG+VeDjvKJ1N+NaT1JH4qMUO0yOo5fHdSVhOSClvAirqxf
uglITbs0MXHbiPYhfg390Tpdy54siQaf4CSEzVd5CS8Ik7ss0zxmdAaxBZT4Iw/JRzaYNX
Yza/IoT1KSfl4bCsc+MopC/h23mzSiU5F1ZyNvxJrZQQ3uhWyks8kjdyRnhI6o/RNQFXBj
XPmznJNIZZ0u0AO0AI+3gXc0Js9rzoB83PfXwRNrjKuzcj78pGb6qefMHgWMo9kDhHvw2/
ECsgqGf7y54mlxktp1BfmAk8WeFQ8CONfsmtN7BjKULMqyktXS3P10TG2R9TWQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683534332; a=rsa-sha256; cv=none;
b=ZcQRtTM2YXPulo8Mz/Id0jzB9LnSI6juz8qJn007p7y1+0ASUIN1+D1ZkkNUYR40XC/YRF
z0t6HdGXnfJL991teE6QrdEf1v22+cIenqjTx1nKIPUJHxM7/4NiYPPDxWk+9sqK326XKZ
9QJKN2LDzrqPVSY2n/4SVTUe3xeUuPkVUc8RlsBj5Wu2LB7GfgZMdJ7/SefBP8YfXVDM+r
HRE+PjkOH3lKj5f905v6VsBrM/iNL/3QbWEI3zwQcQIxLaxbCi6BoK7jthcHU3/A/x8qBz
/+fVouMJxXxIPp9yq7wXsepaTHfCTqktgcdiFMOR9zhFdmaDvTOLyIK81HphGg==
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 4QFDrD3jmqztJ2;
Mon, 8 May 2023 08:25:32 +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 3488PWpV050459;
Mon, 8 May 2023 08:25:32 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3488PWLK050458;
Mon, 8 May 2023 08:25:32 GMT
(envelope-from git)
Date: Mon, 8 May 2023 08:25:32 GMT
Message-Id: <202305080825.3488PWLK050458@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: 03d8264dcaf4 - stable/13 - bhyve: pass E820 table to guest
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: 03d8264dcaf4c529011d2a4577a540ae4eb9c11f
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by corvink:
URL: https://cgit.FreeBSD.org/src/commit/?id=03d8264dcaf4c529011d2a4577a540ae4eb9c11f
commit 03d8264dcaf4c529011d2a4577a540ae4eb9c11f
Author: Corvin Köhne <corvink@FreeBSD.org>
AuthorDate: 2021-09-09 09:37:04 +0000
Commit: Corvin Köhne <corvink@FreeBSD.org>
CommitDate: 2023-05-08 08:21:32 +0000
bhyve: pass E820 table to guest
E820 table will be used to report valid RAM ranges and reserve special
memory areas like graphics memory for GPU passthrough.
Reviewed by: markj
MFC after: 1 week
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D39550
(cherry picked from commit 16f23f75432915e64a34357e7d5f26bca82f8219)
---
usr.sbin/bhyve/Makefile | 1 +
usr.sbin/bhyve/bhyverun.c | 19 +++++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
index f5031a5bae07..c2b426359c22 100644
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -28,6 +28,7 @@ SRCS= \
console.c \
ctl_util.c \
ctl_scsi_all.c \
+ e820.c \
fwctl.c \
gdb.c \
hda_codec.c \
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
index dd30eb4405ef..fbc1fd99ea59 100644
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -91,6 +91,7 @@ __FBSDID("$FreeBSD$");
#include "config.h"
#include "inout.h"
#include "debug.h"
+#include "e820.h"
#include "fwctl.h"
#include "gdb.h"
#include "ioapic.h"
@@ -1246,6 +1247,7 @@ main(int argc, char *argv[])
int c, error;
int max_vcpus, memflags;
struct vmctx *ctx;
+ struct qemu_fwcfg_item *e820_fwcfg_item;
uint64_t rip;
size_t memsize;
const char *optstr, *value, *vmname;
@@ -1478,6 +1480,11 @@ main(int argc, char *argv[])
exit(4);
}
+ if (e820_init(ctx) != 0) {
+ fprintf(stderr, "Unable to setup E820");
+ exit(4);
+ }
+
/*
* Exit if a device emulation finds an error in its initilization
*/
@@ -1572,6 +1579,18 @@ main(int argc, char *argv[])
assert(error == 0);
}
+ e820_fwcfg_item = e820_get_fwcfg_item();
+ if (e820_fwcfg_item == NULL) {
+ fprintf(stderr, "invalid e820 table");
+ exit(4);
+ }
+ if (qemu_fwcfg_add_file("etc/e820", e820_fwcfg_item->size,
+ e820_fwcfg_item->data) != 0) {
+ fprintf(stderr, "could not add qemu fwcfg etc/e820");
+ exit(4);
+ }
+ free(e820_fwcfg_item);
+
if (lpc_bootrom() && strcmp(lpc_fwcfg(), "bhyve") == 0) {
fwctl_init();
}
From nobody Mon May 8 08:25:33 2023
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 4QFDrF61wGz49Z8N;
Mon, 8 May 2023 08:25:33 +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 4QFDrF5YTzz3lYd;
Mon, 8 May 2023 08:25:33 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683534333;
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=/yXBniBrR4gU4CoArDD3fXPg9/6BhJd8nUf3Xzs5uzg=;
b=tmKWfe3ZKLDzccOf9EVCblvAWeKZo9qKnyG3xqeJwBziwJ9CXbftUm6vZo4jQz0kDQdmKS
XKOJvjsmmnc2YPrgl+Gi0KwTsmRo24kskgQkcjLVBTnMASanXg+mIAxkMlSXLoRJkAl4zf
NxZTc7nHK84N8eAJ+Nx/DJnZ8nunofODF6cL39sbfeIcyTW68HK0ZXn5xG0Lyf9S8QbZI/
IVgtpa7Hg25+58iNBeJbs5qFYaxw9I/zuHeGoOfRfAU4o2A2CQ13CTYaKwy/ey5ALFsztb
eatVVVZb3/q8fLJf8TBPh7UuRvPG1WQGzYd+a0I0aS5lL8ZSRLUsK3SEivXRCw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683534333;
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=/yXBniBrR4gU4CoArDD3fXPg9/6BhJd8nUf3Xzs5uzg=;
b=Vxq21aw6Ytyuk7lcDN87uCIyDTIf1N9qWhxAnDCpiz0DYyoWrZkxYlYdKW2tMuYt/Qr/xt
RicMbFR1PZysYJusyfES5b/i/rSWewVGbiP+vCRZpTgJfQPykQ80ho7DVO7cL4RI/rSF9F
tEa3EtG8Cpjkx9z6C59JUyoeG/uZ592OqJkE0PbPThiRR5RzjeZbfvGlGFHSK3qbsMdcd6
gWQomDPCBtrwrO02xgrMZl38WfDorjdDOhSChWPt08AZbN2aKfSjqxZDmUCTZXXIRVtx5V
N60aBfnKgHZq3KwvtfcpnbsVG/oh0EjCg8t9gZVeJ6yvFDnHt9D8lBadLOotNg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683534333; a=rsa-sha256; cv=none;
b=kt/JxF04MAdF8g8oOvanRpyngQLxQSqgK7g8vJk8l+4Qxbj3el52jmLz6X6kd8aXJlEhDl
hTA25c9lANiaD1GnOeSw1PgM9LgF1G7+wZLr6ulNMYLI5LXN9baIiFKJoNsLsrSZXyAqbT
KcirollvFTJFWPZOw36QdlD2IEm0j0leJpl3nc1qP8nn1Z1LUvwsHxrFUkBNAi/TtG1dub
v3fNiQpVq8PaLqmPXOgXQ+9oq9QadsI2YdzyqBgFsHI5LWOlVSa1bdE2jZSijt9PVXQxRi
C/ixMKqF3Au0d8iQjZuq59lv987leLzbS+/+lB3xxVaj4QAd+ozRYaBH/AUAog==
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 4QFDrF4fmkztJ3;
Mon, 8 May 2023 08:25:33 +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 3488PXcx050483;
Mon, 8 May 2023 08:25:33 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3488PXx6050482;
Mon, 8 May 2023 08:25:33 GMT
(envelope-from git)
Date: Mon, 8 May 2023 08:25:33 GMT
Message-Id: <202305080825.3488PXx6050482@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: 743938876959 - stable/13 - vmm: fix HLT loop while vcpu has requested virtual interrupts
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: 74393887695971d59e108b950e27d21b3070e1fc
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by corvink:
URL: https://cgit.FreeBSD.org/src/commit/?id=74393887695971d59e108b950e27d21b3070e1fc
commit 74393887695971d59e108b950e27d21b3070e1fc
Author: Vitaliy Gusev <gusev.vitaliy@gmail.com>
AuthorDate: 2023-04-26 08:17:50 +0000
Commit: Corvin Köhne <corvink@FreeBSD.org>
CommitDate: 2023-05-08 08:21:32 +0000
vmm: fix HLT loop while vcpu has requested virtual interrupts
This fixes the detection of pending interrupts when pirval is 0 and the
pending bit is set
More information how this situation occurs, can be found here:
https://github.com/freebsd/freebsd-src/blob/c5b5f2d8086f540fefe4826da013dd31d4e45fe8/sys/amd64/vmm/intel/vmx.c#L4016-L4031
Reviewed by: corvink, markj
Fixes: 02cc877968bbcd57695035c67114a67427f54549 ("Recognize a pending virtual interrupt while emulating the halt instruction.")
MFC after: 1 week
Sponsored by: vStack
Differential Revision: https://reviews.freebsd.org/D39620
(cherry picked from commit 0912408a281f203c43d0b3f73c38117336588342)
---
sys/amd64/vmm/intel/vmx.c | 44 +++++++++++++++++++-------------------------
1 file changed, 19 insertions(+), 25 deletions(-)
diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c
index 91406f0614ce..32e53de4e8ee 100644
--- a/sys/amd64/vmm/intel/vmx.c
+++ b/sys/amd64/vmm/intel/vmx.c
@@ -3763,7 +3763,8 @@ vmx_pending_intr(struct vlapic *vlapic, int *vecptr)
struct pir_desc *pir_desc;
struct LAPIC *lapic;
uint64_t pending, pirval;
- uint32_t ppr, vpr;
+ uint8_t ppr, vpr, rvi;
+ struct vm_exit *vmexit;
int i;
/*
@@ -3774,31 +3775,26 @@ vmx_pending_intr(struct vlapic *vlapic, int *vecptr)
vlapic_vtx = (struct vlapic_vtx *)vlapic;
pir_desc = vlapic_vtx->pir_desc;
+ lapic = vlapic->apic_page;
- pending = atomic_load_acq_long(&pir_desc->pending);
- if (!pending) {
- /*
- * While a virtual interrupt may have already been
- * processed the actual delivery maybe pending the
- * interruptibility of the guest. Recognize a pending
- * interrupt by reevaluating virtual interrupts
- * following Section 29.2.1 in the Intel SDM Volume 3.
- */
- struct vm_exit *vmexit;
- uint8_t rvi, ppr;
-
- vmexit = vm_exitinfo(vlapic->vcpu);
- KASSERT(vmexit->exitcode == VM_EXITCODE_HLT,
- ("vmx_pending_intr: exitcode not 'HLT'"));
- rvi = vmexit->u.hlt.intr_status & APIC_TPR_INT;
- lapic = vlapic->apic_page;
- ppr = lapic->ppr & APIC_TPR_INT;
- if (rvi > ppr) {
- return (1);
- }
+ /*
+ * While a virtual interrupt may have already been
+ * processed the actual delivery maybe pending the
+ * interruptibility of the guest. Recognize a pending
+ * interrupt by reevaluating virtual interrupts
+ * following Section 30.2.1 in the Intel SDM Volume 3.
+ */
+ vmexit = vm_exitinfo(vlapic->vcpu);
+ KASSERT(vmexit->exitcode == VM_EXITCODE_HLT,
+ ("vmx_pending_intr: exitcode not 'HLT'"));
+ rvi = vmexit->u.hlt.intr_status & APIC_TPR_INT;
+ ppr = lapic->ppr & APIC_TPR_INT;
+ if (rvi > ppr)
+ return (1);
+ pending = atomic_load_acq_long(&pir_desc->pending);
+ if (!pending)
return (0);
- }
/*
* If there is an interrupt pending then it will be recognized only
@@ -3807,8 +3803,6 @@ vmx_pending_intr(struct vlapic *vlapic, int *vecptr)
* Special case: if the processor priority is zero then any pending
* interrupt will be recognized.
*/
- lapic = vlapic->apic_page;
- ppr = lapic->ppr & APIC_TPR_INT;
if (ppr == 0)
return (1);
From nobody Mon May 8 16:34:55 2023
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 4QFRhw1McPz4B6Hg;
Mon, 8 May 2023 16:34:56 +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 4QFRhw0sJDz3jDv;
Mon, 8 May 2023 16:34:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683563696;
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=BRwIKixkEwkPqynJM58re2B78r3ltDC0e/TqGkmpjyE=;
b=AGGH3SJLK9l9n5RiVjQiXXFdSkE1A5uDAWpsRT4UVYBknigYSkzE42qEb73uMm/UWMb33T
Gr0yd54kPCKX4k7gFfjjfJTlzQQMjIxsfG2DbdwLxy3GLsXLGLKIAJq1M3Olg4thLI98hl
iXx7YZBMarLwzwsufy461Y453ViBkhGp8mA6fNSAeLOGfaiT7h55Jbl0WWiTd+3652Usls
GCA7KjmmxKOsElZh9mj71zoTm3au03Q9GoC4cgUavq1kcI1+yzRLSltIXJIOvl7vBGa4FN
aEElLUBFkxzGeVgetlVpPoMTccDFfD1/EiRUlqdh3ooCZu6fkOMhdjlGrYWFkA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683563696;
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=BRwIKixkEwkPqynJM58re2B78r3ltDC0e/TqGkmpjyE=;
b=akPRC7rL/yyjP1P/3vbh74WF94avPJ9KkKh3xiX9U9Po4BW2zhB01sbX7Gk3iQ3Rk/kuJm
TBYNr7QBgW26N72zOQa1z7ObpRKi0Wla6gJ2yfBgxoPRTOLCFBKAJ3wcHhFUDgFcuw+1Uc
Zuz8Op4rWJkR729hF8N66jKTlIGKo8AhMO8e85Gy35/Zgg2a8l1kzDXg1ffI09MnhPZKIF
NYra3CCVpNjkBzAyU6/la3I/JMcsmq4J1Tvh2lA+7Cd1es+t+Ta567/sfXNnQKjBss5aCg
gs58vzk6sdCXpx0XlDq5qiY+/w3MIaG8wY5Lwvyl5hMMB0Gp1KLaJmUZgtg0qA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683563696; a=rsa-sha256; cv=none;
b=le9kAZeKMcVIN7EBMR45kqHrJeTqx9fP2TDSMq8DPtKVWgyM59fUG568Ap7NNeEANsHwkt
cEianxOyDAJu71havwlwW+y6aaRRGe9vuuFlQ5jwikuPZvvdJXvRRMHqgK8xb/QZTcd0BW
p0fBqTVJ/DZJuIKi1vKwPGK3iJvsMu+mkmaF7egi+uvrTsuNdimC7khLjx+MFosgtuLHEU
FN/gjDpwZEe88w3IIfnB1LSMPeHVavbaGrz/QbiSiTMQo2sid32c+pU7DwNfKUSRA9Jmja
y2itDG9XXhmsLc4YDdKoU7Ry5grHE/mol0UI4T1gdjkhz+4qvgJr70K7wvYHTQ==
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 4QFRhv72z2z17JP;
Mon, 8 May 2023 16:34:55 +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 348GYtOf058762;
Mon, 8 May 2023 16:34:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 348GYtfC058761;
Mon, 8 May 2023 16:34:55 GMT
(envelope-from git)
Date: Mon, 8 May 2023 16:34:55 GMT
Message-Id: <202305081634.348GYtfC058761@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: a89f1ce51b6d - stable/13 - riscv: remove unused string from swtch.S
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: mhorne
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a89f1ce51b6de6b070563d8cc4913ab3bc1b7644
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=a89f1ce51b6de6b070563d8cc4913ab3bc1b7644
commit a89f1ce51b6de6b070563d8cc4913ab3bc1b7644
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-01-23 17:11:16 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-05-08 16:34:44 +0000
riscv: remove unused string from swtch.S
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
(cherry picked from commit f5d39047b094d5164b85ae7e2a6a9a8342269815)
---
sys/riscv/riscv/swtch.S | 2 --
1 file changed, 2 deletions(-)
diff --git a/sys/riscv/riscv/swtch.S b/sys/riscv/riscv/swtch.S
index 2176d2a181be..d2e23784c994 100644
--- a/sys/riscv/riscv/swtch.S
+++ b/sys/riscv/riscv/swtch.S
@@ -369,8 +369,6 @@ ENTRY(cpu_switch)
#endif
ret
-.Lcpu_switch_panic_str:
- .asciz "cpu_switch: %p\0"
END(cpu_switch)
/*
From nobody Mon May 8 17:00:56 2023
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 4QFSGx14nsz4B7N4;
Mon, 8 May 2023 17:00:57 +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 4QFSGx0bNRz3kYZ;
Mon, 8 May 2023 17:00:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683565257;
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=2hdaIhdZNkZpI44A/E7K7+fFRfQvuQ7b+tEVxoGP5ms=;
b=e7aP6Jnov+fmYCnJHDJMUI7Ttml27LHcUD1Sr2O5ysFRqTPNZ+1AeL+QrEeGe0U2uHoQJ2
1rM7BIS/e5FJ/4SJ8QtA3Gwi8W5sew4gjD6wUZSdwNPT1RvvASieaNy2NMD5LltX6CVmi2
HgAcqM8zBDHzutcLHcLLnB3pOgOjVrW1V53vJa/GQDygeHWtnzXSvJ9cjbxC9alo+dxK6C
Jigfw2dqH0R6US5LRbrguIRblnVffNRWgEx9wuuoBuMC/W6IJm9DeCyqL+NZ26cInq8lgQ
MTHTAyJw6zLnN/IqI1EF8qytyE7DuSzwAbhni+h9QWKAM6OBx6f9A7vdgRvl/Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683565257;
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=2hdaIhdZNkZpI44A/E7K7+fFRfQvuQ7b+tEVxoGP5ms=;
b=PtDWY/yELrMvq+X2f/OZHvcHFB7TsGisyFlCcWEBQE2XG7sZrkiLb7MvZLU7vLvpvMVCsF
I5e/xBfbv2fC2gVIuWnJFfrZxTLnjRA50T0QGxSE38BARIxTfBv5yA5c3+QLT7X6wLb50Q
J2sakQwvFssUd7pyS9SlScE+cY+s6BCQaAkGYqYeZeqg0Xq3Al/HkfoY/yb6PnC2YzX9xT
piHsrlz2YJZ0A3KrIGxnnJuTUfgYhiZoZ5NjAD0tq5mXPVR0OmwTe88V8rhLqXcGxmOL9H
Mj2HtlOMzPNjuaW1sy0fJlTtMAiR3CbiVc/pn8dfeETnBLgpDzgdoS6yBvgIEg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683565257; a=rsa-sha256; cv=none;
b=wCm75Bf97S3J0NwtkdczDwI2NRYYPLD6+S6nx3orOtUUWGZdJeA86bAgyde14d8cuMeuxt
todFcH4bUu+ys1+wH+oeCnIAyla47KYMYC2OfeOqfsRaBrBSRpRpzkAotqvuVWLj6zIHOm
fzMETB6OZFvdzMgoXoMFUOnvA+j63+KsUXCSz2rRXsulf9IEmvUJPg/bpq7wde78VmBVV/
g6JyEmI33OosBvFAXcQDN/FuHvusX+nmr/Ua78eDbYszFDxu1l1BtXryL4pOD1eeFJJTEu
IDOFCpotuGdukl0fsCqFkiegCr8VGNO1qngmHCsfpor3SxQQr8VNA+OwXhfAqA==
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 4QFSGw6q5qz175c;
Mon, 8 May 2023 17:00:56 +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 348H0uPt002345;
Mon, 8 May 2023 17:00:56 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 348H0uCu002344;
Mon, 8 May 2023 17:00:56 GMT
(envelope-from git)
Date: Mon, 8 May 2023 17:00:56 GMT
Message-Id: <202305081700.348H0uCu002344@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Dimitry Andric <dim@FreeBSD.org>
Subject: git: 148ae1880038 - stable/13 - Apply libc++ fix for compiling <type_traits> with gcc 13
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: dim
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 148ae1880038c1f349e00484310fbbd79f0a3e87
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=148ae1880038c1f349e00484310fbbd79f0a3e87
commit 148ae1880038c1f349e00484310fbbd79f0a3e87
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2023-05-05 16:19:40 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2023-05-08 16:53:07 +0000
Apply libc++ fix for compiling <type_traits> with gcc 13
Merge commit 484e64f7e7b2 from llvm-project (by Roland McGrath):
[libc++] Use __is_convertible built-in when available
https://github.com/llvm/llvm-project/issues/62396 reports that
GCC 13 barfs on parsing <type_traits> because of the declarations
of `struct __is_convertible`. In GCC 13, `__is_convertible` is a
built-in, but `__is_convertible_to` is not. Clang has both, so
using either should be fine.
Reviewed By: #libc, philnik
Differential Revision: https://reviews.llvm.org/D149313
Reported by: Mark Millard <marklmi@yahoo.com>
MFC after: 3 days
(cherry picked from commit 2df58f190731634be67e90b7c453dee587b4ea27)
---
.../llvm-project/libcxx/include/__type_traits/is_convertible.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h b/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h
index 7e49cd4e6a31..7ce3c38b76de 100644
--- a/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h
+++ b/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h
@@ -24,11 +24,18 @@
_LIBCPP_BEGIN_NAMESPACE_STD
-#if __has_builtin(__is_convertible_to) && !defined(_LIBCPP_USE_IS_CONVERTIBLE_FALLBACK)
+#if __has_builtin(__is_convertible) && !defined(_LIBCPP_USE_IS_CONVERTIBLE_FALLBACK)
+
+template <class _T1, class _T2>
+struct _LIBCPP_TEMPLATE_VIS is_convertible : public integral_constant<bool, __is_convertible(_T1, _T2)> {};
+
+#elif __has_builtin(__is_convertible_to) && !defined(_LIBCPP_USE_IS_CONVERTIBLE_FALLBACK)
template <class _T1, class _T2> struct _LIBCPP_TEMPLATE_VIS is_convertible
: public integral_constant<bool, __is_convertible_to(_T1, _T2)> {};
+// TODO: Remove this fallback when GCC < 13 support is no longer required.
+// GCC 13 has the __is_convertible built-in.
#else // __has_builtin(__is_convertible_to) && !defined(_LIBCPP_USE_IS_CONVERTIBLE_FALLBACK)
namespace __is_convertible_imp
From nobody Mon May 8 17:33:45 2023
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 4QFT0p1FGdz4B9Ts;
Mon, 8 May 2023 17:33:46 +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 4QFT0p0nsKz3nmq;
Mon, 8 May 2023 17:33:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683567226;
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=W4Y/DBdowni97zty4Y3tpMgGdyl6gLCYu9pxPkxKej8=;
b=OUozg4wjpUtPKwbWr0Jw9Q9g1NJaz+B1KQe8tQx46cbSbBMcR7QkCg3ZW7+fuhfMnwy2ip
wVNT/SVSmOlI8ppdgBMI4KH6hi/p6ZeDbHfb7UzDEQ9Y8yykgmLsKx7l/g7RuMywQh9THw
Crxm3zIxrpIg/noP5KY/6EBFEs1xnn1lXaAgRFFG3OmesR1xy/JAFCGtr2zy2c0sBNOxou
AIVrjnQCEvZWspeGb+pXUAluODfxdAAmCGhqrT03SQ0lxGoI0CHj+9iZ9l3FA7FHiyGFws
plpnUqNka3TAT7dmanioVua06FQk7PTMJt3Xp2VDwjRXA12I8+dyo5ssoI5ypA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683567226;
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=W4Y/DBdowni97zty4Y3tpMgGdyl6gLCYu9pxPkxKej8=;
b=Fe45CaHQA89f2Ad8mhfxSnZzLozjf50vt9iZwfFF0ItwefBvToZHVW7xW0+oqArXXBBmxF
ObLYWBwVtK8dEL2M7YsGMgnwG6+Qh/G+VMOpNrqaAhSlpw7tYQYSTLO/pSe+PI31TfKTtK
nJ2tCMRJw30Ueo2kJ1Hh6SdG78OZglGt0fAaKRwnzLq2oRRt0O3hddHSF41Mk+z9Iss4ec
BChUBxIyqYOuT9YRwEsCRob6ZSBokLt+LKVif55NsXD1ix4eIwP2NHg3A63tzHEdHMd3iu
uRzmxGxV86Dl5z1MFSw5ch30E6yXKkCAnZ4WMrtBSoVXRD39ap2SMDvHJWsOrw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683567226; a=rsa-sha256; cv=none;
b=LEwit5mTRTRWrh5F6BWMPOiZkw3zfVSD2lGjVh0xYilGUyOt6QpBxPhfq4zV/FYhpEJJP0
EEn/fl5q1luKK+GK55y5yIO+dGyNMNOfxwmQ2QlPAhJk2p72sUUNKm1hacL2m5+1aVkp02
gsnQVXuDh0/ZcgsVEX6P3zygAA3al3Lkvf6RIgsHJSYyByx27a6RUJW88GWE63DJmyyQis
aBXjTgNP8yFpUgPvpqaUVdl/R8srliFkP3CSEpJZq2X+/6Sf2EtSgYZ9wAXp6X4FLQ6V8/
6Rq96Byd7wpolEhVvvPs0BvAjKDFoqUvLTmYdefsSk+6KlzGpcAFLNURQBtduw==
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 4QFT0n6yGXz18Gh;
Mon, 8 May 2023 17:33:45 +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 348HXjLO057862;
Mon, 8 May 2023 17:33:45 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 348HXjW2057861;
Mon, 8 May 2023 17:33:45 GMT
(envelope-from git)
Date: Mon, 8 May 2023 17:33:45 GMT
Message-Id: <202305081733.348HXjW2057861@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Cy Schubert <cy@FreeBSD.org>
Subject: git: 3f39a2a83945 - stable/13 - ntpd: Support IPv6-only hosts
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: cy
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 3f39a2a83945c31d17e609dd6e2adcfb099ae7f0
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=3f39a2a83945c31d17e609dd6e2adcfb099ae7f0
commit 3f39a2a83945c31d17e609dd6e2adcfb099ae7f0
Author: Mina Galic <freebsd_igalic.co>
AuthorDate: 2023-05-05 04:33:18 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-05-08 17:33:24 +0000
ntpd: Support IPv6-only hosts
0.pool.* returns only IPv4 addresses.
2.pool.* returns both, IPv6 and IPv4 addresses.
conservatively extend our IPv4 only pool configuration by adding a
second pool, which also returns IPv6 addresses.
PR: 270536
Reported by: Lapo Luchini <lapo@lapo.it>
Pull Request: https://github.com/freebsd/freebsd-src/pull/731
Differential Revision: https://reviews.freebsd.org/D39954
(cherry picked from commit fff1551c0357cc43f6138fecfad1d79d8d8baa15)
---
usr.sbin/ntp/ntpd/ntp.conf | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/usr.sbin/ntp/ntpd/ntp.conf b/usr.sbin/ntp/ntpd/ntp.conf
index ae0a3d0e6cad..3a56ec9f599c 100644
--- a/usr.sbin/ntp/ntpd/ntp.conf
+++ b/usr.sbin/ntp/ntpd/ntp.conf
@@ -20,24 +20,27 @@
tos minclock 3 maxclock 6
#
-# The following pool statement will give you a random set of NTP servers
-# geographically close to you. A single pool statement adds multiple
-# servers from the pool, according to the tos minclock/maxclock targets.
+# The following pool statements will give you a random set of IPv4 and IPv6
+# NTP servers geographically close to you. A single pool statement adds
+# multiple servers from the pool, according to the tos minclock/maxclock
+# targets.
# See http://www.pool.ntp.org/ for details. Note, pool.ntp.org encourages
# users with a static IP and good upstream NTP servers to add a server
-# to the pool. See http://www.pool.ntp.org/join.html if you are interested.
+# to the pool. See http://www.pool.ntp.org/join.html if you are interested.
#
# The option `iburst' is used for faster initial synchronization.
#
pool 0.freebsd.pool.ntp.org iburst
+pool 2.freebsd.pool.ntp.org iburst
#
# If you want to pick yourself which country's public NTP server
-# you want to sync against, comment out the above pool, uncomment
-# the next one, and replace CC with the country's abbreviation.
-# Make sure that the hostname resolves to a proper IP address!
+# you want to sync against, comment out the above pool statements,
+# uncomment the next ones, and replace CC with the country's abbreviation.
+# Make sure that the hostnames resolves to a proper IP address!
#
# pool 0.CC.pool.ntp.org iburst
+# pool 2.CC.pool.ntp.org iburst
#
# To configure a specific server, such as an organization-wide local
From nobody Mon May 8 17:34:09 2023
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 4QFT1F2sGKz4B984;
Mon, 8 May 2023 17:34:09 +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 4QFT1F2CNbz3p9x;
Mon, 8 May 2023 17:34:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683567249;
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=AWiTrdUu7iTIepp9I0IW8fM6o7CwEDHSIGEtRyf6rN8=;
b=Fm1hbgWQhT0GryLweFWguGcJNLCkPT6QaAK1M7epjmmqb46Fw/5KJNRKTS1v1yKvT9nIyi
lykpnKO9mIE0NemlO0LWvlKJPVSs76BTnCMEwBisd/O5G2qVkPrzYZuvMt/eN1ezWBwSsN
fjdpJC7be1qoR0ircxThRs63RUPMGeQPig3Qdju1qymsIM9e5Fe34UrToggUDTH4dQpf2+
gPv1msIxMZdi+Dsnw45dyoqIT+IE4Ykp+zGYBJHxm/eYeiX+IlYpqq6fwG/AHVUnF5MPb1
X9Cp9Tg+EiQ/UBqWmpokFKfR16EKvakET/J3XRZQwL6Pb2C4n4GmCK5zo2Y3yg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683567249;
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=AWiTrdUu7iTIepp9I0IW8fM6o7CwEDHSIGEtRyf6rN8=;
b=MzYa+F/Chntoc+YjzGZT+bwtqmp6Aetnw2FdpyTDkEewS7yylfLCioQxhh0WkUrN2v8kJL
TT70f43YoFabGUcl+kc1bwYhJ8vv03PE15WSLsGMRY1BtIXEGQlx2hghJSrwkJdIr2rjzf
QCkWh7ENaAJzPuwgDB2CPvceqpb3D7qHIdijWGHTcEJbPoJUXvYtwvfChCUdTZc8/OFLsU
97jD3HD0AXmMaRGdAct9j3BpCl3TuwIlm4rq0Xhvf8n/fqDTSEeczEhAZhgjB2QJ7GARqm
yGJO7Etn8ZJibznm6MQHiqrSxJLEc3mdfFM1uCJw8s72GUJrgG0ZpuKbRCvEYQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683567249; a=rsa-sha256; cv=none;
b=xMaPnaLRMuETcFWOiz3ynwdU5s7NIHaBZT3jM6TXgWGwATBYmWsGa/mM0M25xDkXqG2PHw
0aMPqYwVFyNSfNQditSBYj1EN17a7Di49hF7yotvnNPD60Ij4ap9EE+Y2mlJQi6ho/QSJx
2iYigCQccF3mbozI/nbGzGxKAlHowFnyG+94k3okaxhfXPzbED2oKuzdDMen2fIOC8Pff+
Ygi3KwOs19Bc8R8vhDgdqPi0V8Kjmfz6ZBwhVW7cnWziIw5IDI6rtEZZdGPe/SnJClC+9T
pOGssba/Sr573UC6zXnvNTiRDr/XSEKmw83OJ23s17+z1VyRUXCHRHbgRAsJQQ==
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 4QFT1F1Fncz18Y5;
Mon, 8 May 2023 17:34:09 +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 348HY96H058016;
Mon, 8 May 2023 17:34:09 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 348HY9Eg058015;
Mon, 8 May 2023 17:34:09 GMT
(envelope-from git)
Date: Mon, 8 May 2023 17:34:09 GMT
Message-Id: <202305081734.348HY9Eg058015@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Cy Schubert <cy@FreeBSD.org>
Subject: git: d3ee609cf29e - stable/12 - ntpd: Support IPv6-only hosts
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: cy
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: d3ee609cf29eca3abc81db231a2f4afba42f5bb1
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=d3ee609cf29eca3abc81db231a2f4afba42f5bb1
commit d3ee609cf29eca3abc81db231a2f4afba42f5bb1
Author: Mina Galic <freebsd_igalic.co>
AuthorDate: 2023-05-05 04:33:18 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-05-08 04:17:59 +0000
ntpd: Support IPv6-only hosts
0.pool.* returns only IPv4 addresses.
2.pool.* returns both, IPv6 and IPv4 addresses.
conservatively extend our IPv4 only pool configuration by adding a
second pool, which also returns IPv6 addresses.
PR: 270536
Reported by: Lapo Luchini <lapo@lapo.it>
Pull Request: https://github.com/freebsd/freebsd-src/pull/731
Differential Revision: https://reviews.freebsd.org/D39954
(cherry picked from commit fff1551c0357cc43f6138fecfad1d79d8d8baa15)
---
usr.sbin/ntp/ntpd/ntp.conf | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/usr.sbin/ntp/ntpd/ntp.conf b/usr.sbin/ntp/ntpd/ntp.conf
index ae0a3d0e6cad..3a56ec9f599c 100644
--- a/usr.sbin/ntp/ntpd/ntp.conf
+++ b/usr.sbin/ntp/ntpd/ntp.conf
@@ -20,24 +20,27 @@
tos minclock 3 maxclock 6
#
-# The following pool statement will give you a random set of NTP servers
-# geographically close to you. A single pool statement adds multiple
-# servers from the pool, according to the tos minclock/maxclock targets.
+# The following pool statements will give you a random set of IPv4 and IPv6
+# NTP servers geographically close to you. A single pool statement adds
+# multiple servers from the pool, according to the tos minclock/maxclock
+# targets.
# See http://www.pool.ntp.org/ for details. Note, pool.ntp.org encourages
# users with a static IP and good upstream NTP servers to add a server
-# to the pool. See http://www.pool.ntp.org/join.html if you are interested.
+# to the pool. See http://www.pool.ntp.org/join.html if you are interested.
#
# The option `iburst' is used for faster initial synchronization.
#
pool 0.freebsd.pool.ntp.org iburst
+pool 2.freebsd.pool.ntp.org iburst
#
# If you want to pick yourself which country's public NTP server
-# you want to sync against, comment out the above pool, uncomment
-# the next one, and replace CC with the country's abbreviation.
-# Make sure that the hostname resolves to a proper IP address!
+# you want to sync against, comment out the above pool statements,
+# uncomment the next ones, and replace CC with the country's abbreviation.
+# Make sure that the hostnames resolves to a proper IP address!
#
# pool 0.CC.pool.ntp.org iburst
+# pool 2.CC.pool.ntp.org iburst
#
# To configure a specific server, such as an organization-wide local
From nobody Mon May 8 18:34:04 2023
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 4QFVLN3DQkz4BD7C;
Mon, 8 May 2023 18:34:04 +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 4QFVLN2JZFz3wKM;
Mon, 8 May 2023 18:34:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683570844;
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=iCqAmx8MoC9v7J3+USjUi93lIUl3UaVkkw6Eg89cUlA=;
b=dcZgb/hJYgUURduEp2XX2RovFO2ksNzJ/VUFiDLwgwp/Nk9C2wCFUPcTYLQh7ZDCAUnMB4
9eFTFfJHQle7D2YYBH3PGfNjX4u7jgtHmfLthBight2xIuyL6Hu8UssoYe5IgUxvpaD8Sl
7LboFUk/mNR4lq0NySu7SUbGgA+RGyApxqAONM3P56lYvrfcKxSKSSk/KHTh2eNjd87Tx9
+BcgZFRa1Yql3P7WEU6J69s2JsiRyICJbbmGHaDW/j6uKM8oFbTEE8fYwb6S2JaDjffCEo
0XLAy2rV73Zik6mwcwx71WWmkRL/eXoAhCRnpXrwZyMBuNViziqk7832TK8Kaw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683570844;
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=iCqAmx8MoC9v7J3+USjUi93lIUl3UaVkkw6Eg89cUlA=;
b=MesCHSCnwPRAFUMvh0UYNQyAAXaCzNP0I1SmX5Wd/qgEXKt1vy6hb4Nz6Pic2U2RS3ILiu
mjHl/zcPWtEFEFJ72TqYS8Xvf/GTYMLnF6qd5su+9jWLx8Yq+wn77GbioxnIHyGH2ug435
aK3zmlBT9JRosUwKZRo1AiDWf7QzLd0RGAtFE/XfBsfzVNmf0OfG2PXrH4NKrcRQuZ9q19
DMvHkdjlYpMMAPJ6AY2LbHp+NpmNrTlPtN3Ovb6BEk8k9b0rXvTC37ICRsxEcxh0jIDM2V
V7+XuBs5wK8e1PKvDxCHt2N9xh0KxrOFfpAmhXJYIczfMY8mIZQ9pQDmHFvRGg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683570844; a=rsa-sha256; cv=none;
b=wWRCCE73sdHzcPj06RfXvulVpNYRp+BaRJjPzoX2V3YyZ0TTUOqpdNg6F7hgxj3jJqatAr
xqz0oVTGYyaBu+gWRtcmCVpL5U6LXGu+z/2YLiKQVfyJhCEN5cvaD8OvuYFD6DEoBq/zFY
PREskfjgXupI8FrAG2VtxOdh+dgmLFT3otthSI51ruMX/BJ0EwYGUNx3yrbxQIzZQgexPx
Z+Yy+oidKhQoZTisZQ28BbS6iBC2coJ9sVAdXWXCnPpKychki1UMDDHBAO8hXHe8JiOiwg
DobUyisF7p0/8GrCYN1YIi1qPqr7BQ7lSAKE8XkS0tvNRLorn5Rh0Ksey/ENyA==
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 4QFVLN1NK8z19lM;
Mon, 8 May 2023 18:34:04 +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 348IY4jg056128;
Mon, 8 May 2023 18:34:04 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 348IY4Mi056127;
Mon, 8 May 2023 18:34:04 GMT
(envelope-from git)
Date: Mon, 8 May 2023 18:34:04 GMT
Message-Id: <202305081834.348IY4Mi056127@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Chuck Silvers <chs@FreeBSD.org>
Subject: git: db1a4d9c4569 - stable/13 - fsck_ffs: fix the previous change that skipped pass 5 in some cases
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: chs
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: db1a4d9c45698daf19e2d6372083820a1a09d4da
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by chs:
URL: https://cgit.FreeBSD.org/src/commit/?id=db1a4d9c45698daf19e2d6372083820a1a09d4da
commit db1a4d9c45698daf19e2d6372083820a1a09d4da
Author: Chuck Silvers <chs@FreeBSD.org>
AuthorDate: 2023-05-03 20:21:19 +0000
Commit: Chuck Silvers <chs@FreeBSD.org>
CommitDate: 2023-05-08 17:57:16 +0000
fsck_ffs: fix the previous change that skipped pass 5 in some cases
The previous change involved calling check_cgmagic() twice in a row
for the same CG in order to differentiate when the CG was already ok vs.
when the CG was rebuilt, but that doesn't work because the second call
(which was supposed to rebuild the CG) returns 0 (indicating that
the CG was not rebuilt) due to the prevfailcg check causing an early
failure return. Fix this by moving the rebuild part of check_cgmagic()
out into a separate function which is called by pass1() when it wants to
rebuild a CG.
Fixes: da86e7a20dc4a4b17e8d9e7630ed9b675cf71702
Reported by: pho
Discussed with: mckusick
Sponsored by: Netflix
(cherry picked from commit 406475581246360faa7af9891dc8ad2423284e18)
---
sbin/fsck_ffs/fsck.h | 3 ++-
sbin/fsck_ffs/fsutil.c | 28 +++++++++++++---------------
sbin/fsck_ffs/gjournal.c | 2 +-
sbin/fsck_ffs/inode.c | 2 +-
sbin/fsck_ffs/main.c | 2 +-
sbin/fsck_ffs/pass1.c | 12 +++++++++---
sbin/fsck_ffs/suj.c | 4 ++--
7 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index 12a06e69b5fc..4e5878b0b12f 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -467,7 +467,8 @@ void cgdirty(struct bufarea *);
struct bufarea *cglookup(int cg);
int changeino(ino_t dir, const char *name, ino_t newnum, int depth);
void check_blkcnt(struct inode *ip);
-int check_cgmagic(int cg, struct bufarea *cgbp, int requestrebuild);
+int check_cgmagic(int cg, struct bufarea *cgbp);
+void rebuild_cg(int cg, struct bufarea *cgbp);
void check_dirdepth(struct inoinfo *inp);
int chkrange(ufs2_daddr_t blk, int cnt);
void ckfini(int markclean);
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 974dba4be79b..b5ca478fbc46 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -988,9 +988,7 @@ blzero(int fd, ufs2_daddr_t blk, long size)
* Verify cylinder group's magic number and other parameters. If the
* test fails, offer an option to rebuild the whole cylinder group.
*
- * Return 1 if the cylinder group is good or if repair is requested
- * and is completed successfully. Return 0 if it is bad or if a repair
- * has been requested but is not completed successfully.
+ * Return 1 if the cylinder group is good or return 0 if it is bad.
*/
#undef CHK
#define CHK(lhs, op, rhs, fmt) \
@@ -1002,7 +1000,7 @@ blzero(int fd, ufs2_daddr_t blk, long size)
error = 1; \
}
int
-check_cgmagic(int cg, struct bufarea *cgbp, int request_rebuild)
+check_cgmagic(int cg, struct bufarea *cgbp)
{
struct cg *cgp = cgbp->b_un.b_cg;
uint32_t cghash, calchash;
@@ -1076,15 +1074,16 @@ check_cgmagic(int cg, struct bufarea *cgbp, int request_rebuild)
return (0);
prevfailcg = cg;
pfatal("CYLINDER GROUP %d: INTEGRITY CHECK FAILED", cg);
- if (!request_rebuild) {
- printf("\n");
- return (0);
- }
- if (!reply("REBUILD CYLINDER GROUP")) {
- printf("YOU WILL NEED TO RERUN FSCK.\n");
- rerun = 1;
- return (0);
- }
+ printf("\n");
+ return (0);
+}
+
+void
+rebuild_cg(int cg, struct bufarea *cgbp)
+{
+ struct cg *cgp = cgbp->b_un.b_cg;
+ long start;
+
/*
* Zero out the cylinder group and then initialize critical fields.
* Bit maps and summaries will be recalculated by later passes.
@@ -1126,7 +1125,6 @@ check_cgmagic(int cg, struct bufarea *cgbp, int request_rebuild)
}
cgp->cg_ckhash = calculate_crc32c(~0L, (void *)cgp, sblock.fs_cgsize);
cgdirty(cgbp);
- return (1);
}
/*
@@ -1190,7 +1188,7 @@ std_checkblkavail(ufs2_daddr_t blkno, long frags)
cg = dtog(&sblock, blkno + j);
cgbp = cglookup(cg);
cgp = cgbp->b_un.b_cg;
- if (!check_cgmagic(cg, cgbp, 0))
+ if (!check_cgmagic(cg, cgbp))
return (-((cg + 1) * sblock.fs_fpg - sblock.fs_frag));
baseblk = dtogd(&sblock, blkno + j);
for (k = 0; k < frags; k++) {
diff --git a/sbin/fsck_ffs/gjournal.c b/sbin/fsck_ffs/gjournal.c
index b65589b5bd08..cd2c9df878a8 100644
--- a/sbin/fsck_ffs/gjournal.c
+++ b/sbin/fsck_ffs/gjournal.c
@@ -97,7 +97,7 @@ gjournal_check(const char *filesys)
}
cgbp = cglookup(cg);
cgp = cgbp->b_un.b_cg;
- if (!check_cgmagic(cg, cgbp, 0)) {
+ if (!check_cgmagic(cg, cgbp)) {
rerun = 1;
ckfini(0);
return;
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index 2d563f617a56..04891447254e 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -1394,7 +1394,7 @@ retry:
cg = ino_to_cg(&sblock, ino);
cgbp = cglookup(cg);
cgp = cgbp->b_un.b_cg;
- if (!check_cgmagic(cg, cgbp, 0)) {
+ if (!check_cgmagic(cg, cgbp)) {
if (anyino == 0)
return (0);
request = (cg + 1) * sblock.fs_ipg;
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index e559f6cb4ea6..df86cb5fb107 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -492,7 +492,7 @@ checkfilesys(char *filesys)
snapflush(std_checkblkavail);
if (cgheader_corrupt) {
printf("PHASE 5 SKIPPED DUE TO CORRUPT CYLINDER GROUP "
- "HEADER(S)\n");
+ "HEADER(S)\n\n");
} else {
pass5();
IOstats("Pass5");
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 55233e0bc4f4..e784fd29dc1c 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -100,11 +100,17 @@ pass1(void)
cgbp = cglookup(c);
cgp = cgbp->b_un.b_cg;
rebuiltcg = 0;
- if (!check_cgmagic(c, cgbp, 0)) {
- if (!check_cgmagic(c, cgbp, 1))
+ if (!check_cgmagic(c, cgbp)) {
+ if (!reply("REBUILD CYLINDER GROUP")) {
cgheader_corrupt = 1;
- else
+ if (!nflag) {
+ printf("YOU WILL NEED TO RERUN FSCK.\n");
+ rerun = 1;
+ }
+ } else {
+ rebuild_cg(c, cgbp);
rebuiltcg = 1;
+ }
}
if (!rebuiltcg && sblock.fs_magic == FS_UFS2_MAGIC) {
inosused = cgp->cg_initediblk;
diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c
index a1d624392fcf..8bcee7c54c85 100644
--- a/sbin/fsck_ffs/suj.c
+++ b/sbin/fsck_ffs/suj.c
@@ -181,7 +181,7 @@ cg_lookup(int cgx)
if (lastcg && lastcg->sc_cgx == cgx)
return (lastcg);
cgbp = cglookup(cgx);
- if (!check_cgmagic(cgx, cgbp, 0))
+ if (!check_cgmagic(cgx, cgbp))
err_suj("UNABLE TO REBUILD CYLINDER GROUP %d", cgx);
hd = &cghash[HASH(cgx)];
LIST_FOREACH(sc, hd, sc_next)
@@ -394,7 +394,7 @@ suj_checkblkavail(ufs2_daddr_t blkno, long frags)
cg = dtog(&sblock, blkno);
cgbp = cglookup(cg);
cgp = cgbp->b_un.b_cg;
- if (!check_cgmagic(cg, cgbp, 0))
+ if (!check_cgmagic(cg, cgbp))
return (-((cg + 1) * sblock.fs_fpg - sblock.fs_frag));
baseblk = dtogd(&sblock, blkno);
for (j = 0; j <= sblock.fs_frag - frags; j++) {
From nobody Tue May 9 14:02:59 2023
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 4QG0H75R7Gz4BDf7;
Tue, 9 May 2023 14:02:59 +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 4QG0H72tBKz3N1G;
Tue, 9 May 2023 14:02:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683640979;
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=THbkv2z03684ddnsqq4yZMfmlCMDMMOjqKRp+jb9QNg=;
b=CHwExxUh9lPaCFrOmeJ0n2eLOGASvpxOKL4TD5yfAzlrQUZNUl1Swe8t9xSZzVzrjw8oVz
kwRL61YzkJe6GS+RsGwBc620nMQNHUcPiBvJPGzr7AnL5PnRIbQ7bWTPyrIETwI19alViF
Skh9AZKMIgL8LjiuCp9VGM3zQ4erye06wp5c88I2bHaps25P2q5aVvV0Vxs1DWWq5cfoBP
xTzhrXeC/jE/XEm66h2LX0PaZ7jVQHEeNFdF/I8hw+ONTlTjm8OcmlOyIIZGE7dVUJHvTG
luf2mlcsWYTxdSZ3H+8gl7qXnk5f8Meiwjy4E0PtRji84cPZtb6gaj4nSX5Aaw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683640979;
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=THbkv2z03684ddnsqq4yZMfmlCMDMMOjqKRp+jb9QNg=;
b=t2MKzK6Y/77nhABqX1HtCh1+rG6hBHzvXIebE5EW1E80r52rpa/DdA1coDmAMZvVw43Jo3
iEvVScnKgQ6DTS2IpKG+PH9ubyC6KJdAN5Cw2xinlO6UKCbKiSlQUU/PWkFfvJYGvrkIaB
ZbegUDD1e3eRPHyEl5hv1TWAb1nUSfkVAhGnOwO+dzhaEbiMjKULlrDZunz/YplzpxEBrZ
ew/GibB8Q9DAfp3jF5T8ftHenTk6Yjzudy8yotrM+e823Y7sAnE7Qp1NNLJuPxBq3cLP5X
4f5mmvj4bPeh4iZrV9OqlHdmgzp/Vyc2cfITQT0BMZZV/A1PuO3/3Xxr4VETRg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683640979; a=rsa-sha256; cv=none;
b=OuuKWuL31zuIounCzEHZCAuxRv4csRmjWe9qn+D414TXkzZHCvgaMs8Z9tJhlMtGrTDR8x
UvzK1Zfj6xEb7PBOwgHkUpevF5tbUTOldVWgppM6E2okMmOWG0I/dM4uLsK0FL6rvWYGWZ
9iQrYBrVd4uaqcy8XaHJvyrBcTnENCPsTF5AZZDqzgDYexRtCb+y8eOwiM5hq62biNrAzM
I+o329kI90WgsUDXmOLld2lO9zpIHG3Mhzc4qDvCRTTdRvXj2RY6CUGHW1VO+CZRDYxT6S
hHaZhIRphZvufDQOoa5CARDjbtQQ/A8rd3hKux6N9ikwmdstTa/fJ4h4KWfgzw==
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 4QG0H71yJLzWRq;
Tue, 9 May 2023 14:02:59 +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 349E2xUu082848;
Tue, 9 May 2023 14:02:59 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349E2x14082847;
Tue, 9 May 2023 14:02:59 GMT
(envelope-from git)
Date: Tue, 9 May 2023 14:02:59 GMT
Message-Id: <202305091402.349E2x14082847@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 16f43ccd0c69 - stable/13 - fbt: get rid of redundant defines
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 16f43ccd0c69195d1a753da73913ba63e9cad950
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=16f43ccd0c69195d1a753da73913ba63e9cad950
commit 16f43ccd0c69195d1a753da73913ba63e9cad950
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2023-05-01 15:20:34 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-09 14:01:03 +0000
fbt: get rid of redundant defines
No functional change intended.
Reviewed by: markj
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D39882
(cherry picked from commit aad1685066fc2430d6ee9b3025369ba6bd513333)
---
sys/cddl/dev/fbt/aarch64/fbt_isa.c | 2 --
sys/cddl/dev/fbt/arm/fbt_isa.c | 3 ---
sys/cddl/dev/fbt/fbt.h | 3 +++
sys/cddl/dev/fbt/powerpc/fbt_isa.c | 2 --
sys/cddl/dev/fbt/riscv/fbt_isa.c | 2 --
sys/cddl/dev/fbt/x86/fbt_isa.c | 3 ---
6 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c
index 07f02e2edb72..26d750bf540c 100644
--- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c
+++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c
@@ -42,8 +42,6 @@
#define AARCH64_BRK_IMM16_SHIFT 5
#define AARCH64_BRK_IMM16_VAL (0x40d << AARCH64_BRK_IMM16_SHIFT)
#define FBT_PATCHVAL (AARCH64_BRK | AARCH64_BRK_IMM16_VAL)
-#define FBT_ENTRY "entry"
-#define FBT_RETURN "return"
#define FBT_AFRAMES 4
int
diff --git a/sys/cddl/dev/fbt/arm/fbt_isa.c b/sys/cddl/dev/fbt/arm/fbt_isa.c
index 0be28b56aa6a..d52809c9f227 100644
--- a/sys/cddl/dev/fbt/arm/fbt_isa.c
+++ b/sys/cddl/dev/fbt/arm/fbt_isa.c
@@ -45,9 +45,6 @@
#define FBT_JUMP 0xea000000
#define FBT_SUBSP 0xe24dd000
-#define FBT_ENTRY "entry"
-#define FBT_RETURN "return"
-
int
fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t rval)
{
diff --git a/sys/cddl/dev/fbt/fbt.h b/sys/cddl/dev/fbt/fbt.h
index aa9bce564fa0..2816eec992ff 100644
--- a/sys/cddl/dev/fbt/fbt.h
+++ b/sys/cddl/dev/fbt/fbt.h
@@ -34,6 +34,9 @@
#include "fbt_isa.h"
+#define FBT_ENTRY "entry"
+#define FBT_RETURN "return"
+
/*
* fbt_probe is a bit of a misnomer. One of these structures is created for
* each trace point of an FBT probe. A probe might have multiple trace points
diff --git a/sys/cddl/dev/fbt/powerpc/fbt_isa.c b/sys/cddl/dev/fbt/powerpc/fbt_isa.c
index eb7feceb269d..7f52308e1f76 100644
--- a/sys/cddl/dev/fbt/powerpc/fbt_isa.c
+++ b/sys/cddl/dev/fbt/powerpc/fbt_isa.c
@@ -46,8 +46,6 @@
#define FBT_BR_MASK 0x03fffffc
#define FBT_IS_JUMP(instr) ((instr & ~FBT_BR_MASK) == FBT_BRANCH)
-#define FBT_ENTRY "entry"
-#define FBT_RETURN "return"
#define FBT_AFRAMES 5
int
diff --git a/sys/cddl/dev/fbt/riscv/fbt_isa.c b/sys/cddl/dev/fbt/riscv/fbt_isa.c
index baf268028988..5c8340d9f001 100644
--- a/sys/cddl/dev/fbt/riscv/fbt_isa.c
+++ b/sys/cddl/dev/fbt/riscv/fbt_isa.c
@@ -43,8 +43,6 @@
#define FBT_C_PATCHVAL MATCH_C_EBREAK
#define FBT_PATCHVAL MATCH_EBREAK
-#define FBT_ENTRY "entry"
-#define FBT_RETURN "return"
#define FBT_AFRAMES 5
int
diff --git a/sys/cddl/dev/fbt/x86/fbt_isa.c b/sys/cddl/dev/fbt/x86/fbt_isa.c
index 05ec87ab437f..da3eaf26f788 100644
--- a/sys/cddl/dev/fbt/x86/fbt_isa.c
+++ b/sys/cddl/dev/fbt/x86/fbt_isa.c
@@ -57,9 +57,6 @@
#define FBT_PATCHVAL 0xf0
#endif
-#define FBT_ENTRY "entry"
-#define FBT_RETURN "return"
-
int
fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t scratch __unused)
{
From nobody Tue May 9 14:03:00 2023
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 4QG0H85ZDlz4BDZW;
Tue, 9 May 2023 14:03:00 +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 4QG0H845Rqz3NVv;
Tue, 9 May 2023 14:03:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683640980;
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=sf5SqYrdLj0gfZhOdvWKuu8ImbC5ZOB/ARtG/pRhqsE=;
b=V0rz5R5S5d8egN6JIiZ5FTde1AcBn7blLk7ezAvQGablh8k/CuOzzwkL7dwqdn6adNUWK1
vGHh5Zy6yVY/ky3UuP4WyMvY3+YQoBLt7uBxqro4A83p72cOEXiTprKK1BgU5T//su7tJi
8g1YXWfTi1mHf249E70E5zsjzodgKdy63B9FTkEu1+VeAdt/TJsRp1lH7mKt1FefkGG/61
aZJ8Yti2fEeOAnPZuN3gECozKnFxttyEQliMb8wdBux31amC3pMdVmo+5+LSHJTOEMEgyD
6rkc7QDOlt1rCI+maOs3NhGGF8Rl3BEG9IDiC3H1Ml2bBG2vkjs+JDkKR2J/Zw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683640980;
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=sf5SqYrdLj0gfZhOdvWKuu8ImbC5ZOB/ARtG/pRhqsE=;
b=Zn/K8UO/u7VOn2O2QeYh5K1v5BuE7KEqsAqd3P29EyAccW9NAfbNNvPZOePR0KpAKM7yLS
GGYscoF4rIDlUgz8Dy/L71eYCe5XdIBUxjAYFjN1uMYUGfPsgUBv1VGv2AqrqZxZR3GfoF
69OfEfdUM/35RKjmFfhd4FCc2WiDmmeJvLYoQGxAs1S+eavasVKkWqWb2ezVI8v7IXa/ze
dSi2MvAmao5OtN2XhkO27SfxeXO7LlZ7bdWLHgwnYPlyL6ys6OZ4TAmLbkGcMyW8Mjngkj
IoWe90oiYYnoh1XSlEyxAgSVMNPbia5l3Pn84PhA5la+YsSHvypr4WGNoThEiA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683640980; a=rsa-sha256; cv=none;
b=mLtLcTri+J0sOS3XLFfDwwcPhsiO9KsNN20UB6xL81EA9KPYHuiO2vcaeE9pjUfXRsNgdD
r3AcW2CNab+tF14+dYXI9B4PZ+h2RN1r067dFESaGBCmpim3vlAM9gkxucgauqvjjfFzbQ
sDv7JFWnggWPVebmhC+a5GmLOhVgT992cOtlu78KSmcjqaezKacVrIqIrDr2g0WnkPKkz4
INUBrhVhbS/rLII/qm2jeVebvQbbjsxmmw7PJeiveBwGNnGnRSAAQAvyL3KTTOH+DMb2ba
rdGsAiUg0JDBIB13te/uq9Fv3VVjxM3O64na4pagXHXaOHY8SJE1prnZjL4Iww==
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 4QG0H838XHzWRr;
Tue, 9 May 2023 14:03:00 +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 349E30wf082869;
Tue, 9 May 2023 14:03:00 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349E30dF082868;
Tue, 9 May 2023 14:03:00 GMT
(envelope-from git)
Date: Tue, 9 May 2023 14:03:00 GMT
Message-Id: <202305091403.349E30dF082868@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: cb5ea040be73 - stable/13 - hwpmc: Fix a typo
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: cb5ea040be733fbd3da6490c545c0b4eae43f624
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=cb5ea040be733fbd3da6490c545c0b4eae43f624
commit cb5ea040be733fbd3da6490c545c0b4eae43f624
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-05-01 15:19:25 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-09 14:01:03 +0000
hwpmc: Fix a typo
MFC after: 1 week
(cherry picked from commit 56da525b535f8537205bccd1f4b25b3ce354ca62)
---
sys/dev/hwpmc/hwpmc_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c
index ff6bfbd4322f..5d29931c90f0 100644
--- a/sys/dev/hwpmc/hwpmc_core.c
+++ b/sys/dev/hwpmc/hwpmc_core.c
@@ -1248,7 +1248,7 @@ pmc_core_initialize(struct pmc_mdep *md, int maxcpu, int version_override)
if (core_version < 1 || core_version > 5 ||
(core_cputype != PMC_CPU_INTEL_CORE && core_version == 1)) {
/* Unknown PMC architecture. */
- printf("hwpc_core: unknown PMC architecture: %d\n",
+ printf("hwpmc_core: unknown PMC architecture: %d\n",
core_version);
return (EPROGMISMATCH);
}
From nobody Tue May 9 14:03:01 2023
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 4QG0HB0yFlz4BDwf;
Tue, 9 May 2023 14:03:02 +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 4QG0H95FMMz3Nbj;
Tue, 9 May 2023 14:03:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683640981;
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=aN1gdYgeam4lgXuCOAXMgc2LZuCpJXQOqBPKgBk0Lk0=;
b=xMClVyqusAYYCn7LOnCH43XaIwQF/S7FdWv9UDSgssIDHNNPIQtAcNptCTD2Vc4jJtlqYK
P4YflK8JU/hV4gPnSx1ecK5v0ixJgKQrnfJiBFWxqHBfkypVtWMDTgrbAOqjd35kOGBFs+
yiMcaR63RJoJJ/qZ6+80trLtI2EJwY6eAEnhRg2BsSJZX5y4QiRlQaxDt5wKkucMhznQlb
lPPLCpVQCiB03z4bMgvjYNr8Vuy8Rb04VHaeSIU9zgsR7GDGFfemKMQ5/+VxWilYEwPCXJ
z/KmYqm6lSBC3z46EaK2aeJkRIAA3Hp7Ld70ghB4BPIgDCBSsybHfVId8lULtg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683640981;
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=aN1gdYgeam4lgXuCOAXMgc2LZuCpJXQOqBPKgBk0Lk0=;
b=V6ZXRTFz33+kg4FJbg1KoXJ6gWnZaIhbxE+WVN7kvMJcqLVTzboVfXc9wzYqK5QEfeERBn
k0BQUrwbRSziOKeZbzZ7Chq08/wI0Vf/yEFm6SpIy4+/nwEUtrzoiyaFSL4q53Of5arLSg
XnRG0yN0CxlpH2IqBG+HHWHW0vvMk13DqMSNLTcptkHHxAfMyMOpiLmYZCcCdUS5hb5Ngo
7tDAPGf1bbYIcg6S6skLb3EikmpLZ11fhPLB9Tm2qXjKTOZIxdmfCekKZ/YtTkIzu9/umi
9CvRFHz1a8GBCy7gUQ1Wk0ZV1nrKk+zx+iGeSCYBL7tG9Cj39gl4qm7zINaqRA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683640981; a=rsa-sha256; cv=none;
b=qH/vKIKkYmr4TpeKGugu+JXuKem3Eq/MYrjZdZCQIg1Rwy3A/lSO6dvlpxLElPg0u/NJdQ
mKiHLEP1CvU2krJWFM1TAyWQt8+29GASP5MGQhWMCCHc+D4TuUeuPaKvZJFn8RsGejHdjx
5+v8u0tYcOnURJD66p2FaMyQ2owX3fjl9uJ65e4xdeSFCZEZyV+SWE7/ttvpihxrgoYFD/
62pv9FHv7GUzNlOd18DtQeZRuVgNl0O5v5dtIMsz46tM/JwdJIFbYBOxsC0GjvGr47yEXx
66xLsHN0b+tJku8zBedlo7vmdrjH522OLg9SQAKtX/n34m8OUED5sJ7yOS8kOQ==
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 4QG0H944HLzWXl;
Tue, 9 May 2023 14:03:01 +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 349E31fE082894;
Tue, 9 May 2023 14:03:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349E31px082893;
Tue, 9 May 2023 14:03:01 GMT
(envelope-from git)
Date: Tue, 9 May 2023 14:03:01 GMT
Message-Id: <202305091403.349E31px082893@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 7e06b2f3ecd7 - stable/13 - vmm: Expose some more AVX512 CPUID bits to guests
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 7e06b2f3ecd7001014115f66f53406b9cfee6e19
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=7e06b2f3ecd7001014115f66f53406b9cfee6e19
commit 7e06b2f3ecd7001014115f66f53406b9cfee6e19
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-04-25 17:33:08 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-09 14:01:05 +0000
vmm: Expose some more AVX512 CPUID bits to guests
This is required to announce support for some accelerated AES
operations. AVX512BW indicates support for the AVX512-FP16 extension
and AVX512VL indicates support for the use of AVX512 instructions with
vector lengths smaller than 512 bits.
VAES and VPCLMULQDQ extensions indicate that VEX-prefixed AES-NI and
pclmulqdq instructions are supported.
All of these bits are needed for OpenSSL to use VAES to accelerate
AES-GCM transforms.
Reviewed by: corvink, kib, jhb
MFC after: 2 weeks
Sponsored by: Stormshield
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D39781
(cherry picked from commit 47cf1b37f42d2acb24fa3a1e6106374dddb3edbf)
---
sys/amd64/vmm/x86.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c
index d99fb391afba..265d9f6951a0 100644
--- a/sys/amd64/vmm/x86.c
+++ b/sys/amd64/vmm/x86.c
@@ -441,18 +441,22 @@ x86_emulate_cpuid(struct vcpu *vcpu, uint64_t *rax, uint64_t *rbx,
/*
* Expose known-safe features.
*/
- regs[1] &= (CPUID_STDEXT_FSGSBASE |
+ regs[1] &= CPUID_STDEXT_FSGSBASE |
CPUID_STDEXT_BMI1 | CPUID_STDEXT_HLE |
CPUID_STDEXT_AVX2 | CPUID_STDEXT_SMEP |
CPUID_STDEXT_BMI2 |
CPUID_STDEXT_ERMS | CPUID_STDEXT_RTM |
CPUID_STDEXT_AVX512F |
+ CPUID_STDEXT_AVX512DQ |
CPUID_STDEXT_RDSEED |
CPUID_STDEXT_SMAP |
CPUID_STDEXT_AVX512PF |
CPUID_STDEXT_AVX512ER |
- CPUID_STDEXT_AVX512CD | CPUID_STDEXT_SHA);
- regs[2] = 0;
+ CPUID_STDEXT_AVX512CD | CPUID_STDEXT_SHA |
+ CPUID_STDEXT_AVX512BW |
+ CPUID_STDEXT_AVX512VL;
+ regs[2] &= CPUID_STDEXT2_VAES |
+ CPUID_STDEXT2_VPCLMULQDQ;
regs[3] &= CPUID_STDEXT3_MD_CLEAR;
/* Advertise RDPID if it is enabled. */
From nobody Tue May 9 14:03:02 2023
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 4QG0HB6QRNz4BDnP;
Tue, 9 May 2023 14:03:02 +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 4QG0HB5dv0z3NFn;
Tue, 9 May 2023 14:03:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683640982;
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=KqImr8usEKAnMX2iF0KevepiEUFc133kHZ5gFVXrvEM=;
b=E1p22xukhWg7jy5Zl96ET0F6dq2BVusb7YaRC7zi1jL8CJT/IM52oWx+el6k2SFKBX7/j+
PAAKquB3VQ2JGiu/kIJs0SFAHpQxdcv8mN6n10Z994IC6gVcxLgf6Xqgq1UZS6lFCNt9Ru
NO8V2henjD0RDMyAqd9h8K0bf0UJNM4UGIGGsOaeIBAP8oCuFbYsqT/xxKiOCMEbCTBXJE
FVeM5bM5rvbxD+e3V3GMBMfXCLwwWkgk9cNYC+wC+mmD/nMVZ2qRYq2fKeWWt1K8U1Wyig
Yg1xxreQ+kzIM8W7tjDsbwtr8+AcondpUIUqLUdAAcnaaV5aIHNEAX9aGE6BgA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683640982;
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=KqImr8usEKAnMX2iF0KevepiEUFc133kHZ5gFVXrvEM=;
b=DuEfdjtyEllgADr2vhyKOwpA1V27Sii0dlSY3UXpk8TgbEl0JbdEJSj7GXvsUlzn9jV+cm
xInvTcUkMhIcim5MTrfwi2N+8KSGR2dfA5sjCcHM7tld5nIR2dv5KnYane7qBGw5dhpnn6
nHjnc2dyIqpEiLioFD8WNFPM/xWCC+zldjMQ2tFuc13vYszCPrQebesL0XJD7zRvMk6Nhf
H/ESbqyqO7o78DQ239PQoNqGKAgAA01oKQzDjtRGdO6dKrDYpNAYC1Yf900QubHweeH2+m
1T/nY8rLbY2a68Li8heHIWrjZA7RiVAPQq7hNkAK5s90GQoGg/rcq9ILe0L1OQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683640982; a=rsa-sha256; cv=none;
b=xRWTXv3iA83CM2LYuo6qsKZxIDANK/FTRKp7I/rXfyMjKU3+ZasQZ4CFVSyzdzolVAsoGr
WyLeGk0l5Kn0hXj0PJNtvQntwezLFGdxE9aFOvXu13yt3lk+f6m5Hw2suY/DBuLqPrSdzz
QzXrmXHShxfdDmf2iB12uHf98XvkH1mJF76/TiMc1uKQ/VQFGnX7kXRnfArV1M5Z/tgtuU
M8Sy2J2B/1g6H5p+C2QBjyAG5SIoGd4n8hXL53nrYI62PIb+FlXdznvjwT9QOEAZZ3weqb
SANL4IWi1KfrS4OdaDJkJ8/FzXPLB6Q1zB0XR6cXb5kVM0WVYVlHtBfO++ZubQ==
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 4QG0HB4g21zWCt;
Tue, 9 May 2023 14:03:02 +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 349E32jU082918;
Tue, 9 May 2023 14:03:02 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349E3228082916;
Tue, 9 May 2023 14:03:02 GMT
(envelope-from git)
Date: Tue, 9 May 2023 14:03:02 GMT
Message-Id: <202305091403.349E3228082916@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 5000c6519a87 - stable/13 - dtrace: Sync dis_tables.c with illumos
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 5000c6519a87c9d46ce62c8d406919b582978fc3
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=5000c6519a87c9d46ce62c8d406919b582978fc3
commit 5000c6519a87c9d46ce62c8d406919b582978fc3
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-03-21 13:36:58 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-09 14:01:15 +0000
dtrace: Sync dis_tables.c with illumos
This brings in the following commits:
commit 584b574a3b16c6772c8204ec1d1c957c56f22a87
12174 i86pc: variable may be used uninitialized
Author: Toomas Soome <tsoome@me.com>
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Andrew Stormont <astormont@racktopsystems.com>
Approved by: Dan McDonald <danmcd@joyent.com>
commit a25e615d76804404e5fc63897a9196d4f92c3f5e
12371 dis x86 EVEX prefix mishandled
12372 dis EVEX encoding SIB mishandled
12373 dis support for EVEX vaes instructions
12374 dis support for EVEX vpclmulqdq instructions
12375 dis support for gfni instructions
Author: Robert Mustacchi <rm@fingolfin.org>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Joshua M. Clulow <josh@sysmgr.org>
commit c1e9bf00765d7ac9cf1986575e4489dd8710d9b1
12369 dis WBNOINVD support
Author: Robert Mustacchi <rm@joyent.com>
Reviewed by: Hans Rosenfeld <hans.rosenfeld@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
commit e4f6ce7088a7dd335b9edf4774325f888692e5fb
10893 Need support for new Cascade Lake Instructions
Author: Robert Mustacchi <rm@joyent.com>
Reviewed by: Hans Rosenfeld <hans.rosenfeld@joyent.com>
Reviewed by: Dan McDonald <danmcd@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Gordon Ross <gwr@nexenta.com>
commit cff040f3ef42d16ae655969398f5a5e6e700b85e
10226 Need support for new EPYC ISA extensions
Author: Robert Mustacchi <rm@joyent.com>
Reviewed by: Hans Rosenfeld <hans.rosenfeld@joyent.com>
Reviewed by: Jason King <jason.king@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@joyent.com>
commit d242cdf5288b86d9070d88791c8ee696612becdc
8492 AVX512 dis - legacy logical instructions
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
commit 81b505b772ab015c588c56bb116239ee549b6eee
8384 AVX512 dis - EVEX prefix support
8385 32-bit avx dis test mishandles EVEX prefix
8386 32-bit bound dis is incorrect
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
commit 92381362ae635a3bea638d87b7119f1623b6212e
8319 dis support for new xsave instructions
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
commit a4e73d5d60e566669c550027fae2b1d87b4be2b4
8240 AVX512 dis - opmask instruction support
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
959b2dfd39979fe8a9a315a52741d009eb168822
7825 want avx dis tests
7826 PCLMULQDQ psuedo-ops aren't properly described in dis
7827 dis tests for f16c, movbe, cpuid, msr, tsc, fence instrs
7828 sysenter and sysexit dis should be allowed in 64-bit x86
Author: Robert Mustacchi <rm@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
MFC after: 2 weeks
(cherry picked from commit 722b2e2f9aa64e6ff4dec346951bd4b56cd27a8d)
---
sys/cddl/dev/dtrace/x86/dis_tables.c | 1604 +++++++++++++++++++++++++++++-----
1 file changed, 1370 insertions(+), 234 deletions(-)
diff --git a/sys/cddl/dev/dtrace/x86/dis_tables.c b/sys/cddl/dev/dtrace/x86/dis_tables.c
index d130b3ac335e..ad3b453f8845 100644
--- a/sys/cddl/dev/dtrace/x86/dis_tables.c
+++ b/sys/cddl/dev/dtrace/x86/dis_tables.c
@@ -21,7 +21,8 @@
*/
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2016 Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
+ * Copyright 2020 Robert Mustacchi
*/
/*
@@ -30,7 +31,7 @@
*/
/* Copyright (c) 1988 AT&T */
-/* All Rights Reserved */
+/* All Rights Reserved */
/*
* $FreeBSD$
@@ -48,8 +49,8 @@
*
* The behavior of this file can be controlled by one of the following flags:
*
- * DIS_TEXT Include text for disassembly
- * DIS_MEM Include memory-size calculations
+ * DIS_TEXT Include text for disassembly
+ * DIS_MEM Include memory-size calculations
*
* Either or both of these can be defined.
*
@@ -69,7 +70,7 @@ extern size_t strlcat(char *, const char *, size_t);
#endif
-#define TERM 0 /* used to indicate that the 'indirect' */
+#define TERM 0 /* used to indicate that the 'indirect' */
/* field terminates - no pointer. */
/* Used to decode instructions. */
@@ -88,7 +89,8 @@ typedef struct instable {
uint_t it_invalid32:1; /* invalid in IA32 */
uint_t it_stackop:1; /* push/pop stack operation */
uint_t it_vexwoxmm:1; /* VEX instructions that don't use XMM/YMM */
- uint_t it_avxsuf:1; /* AVX suffix required */
+ uint_t it_avxsuf:2; /* AVX2/AVX512 suffix rqd. */
+ uint_t it_vexopmask:1; /* VEX inst. that use opmask */
} instable_t;
/*
@@ -118,7 +120,7 @@ enum {
SEG,
MR,
RM,
- RM_66r, /* RM, but with a required 0x66 prefix */
+ RM_66r, /* RM, but with a required 0x66 prefix */
IA,
MA,
SD,
@@ -137,7 +139,7 @@ enum {
NORM, /* instructions w/o ModR/M byte, no memory access */
IMPLMEM, /* instructions w/o ModR/M byte, implicit mem access */
O, /* for call */
- JTAB, /* jump table */
+ JTAB, /* jump table */
IMUL, /* for 186 iimul instr */
CBW, /* so data16 can be evaluated for cbw and variants */
MvI, /* for 186 logicals */
@@ -172,7 +174,7 @@ enum {
MMO, /* Prefixable MMX/SIMD-Int mm/mem -> mm */
MMOIMPL, /* Prefixable MMX/SIMD-Int mm -> mm (mem) */
MMO3P, /* Prefixable MMX/SIMD-Int mm -> r32,imm8 */
- MMOM3, /* Prefixable MMX/SIMD-Int mm -> r32 */
+ MMOM3, /* Prefixable MMX/SIMD-Int mm -> r32 */
MMOS, /* Prefixable MMX/SIMD-Int mm -> mm/mem */
MMOMS, /* Prefixable MMX/SIMD-Int mm -> mem */
MMOPM, /* MMX/SIMD-Int mm/mem -> mm,imm8 */
@@ -190,33 +192,34 @@ enum {
XMMOXMM, /* Prefixable SIMD xmm/mem -> mm */
XMMOM, /* Prefixable SIMD xmm -> mem */
XMMOMS, /* Prefixable SIMD mem -> xmm */
- XMM, /* SIMD xmm/mem -> xmm */
+ XMM, /* SIMD xmm/mem -> xmm */
XMM_66r, /* SIMD 0x66 prefix required xmm/mem -> xmm */
- XMM_66o, /* SIMD 0x66 prefix optional xmm/mem -> xmm */
+ XMM_66o, /* SIMD 0x66 prefix optional xmm/mem -> xmm */
XMMXIMPL, /* SIMD xmm -> xmm (mem) */
XMM3P, /* SIMD xmm -> r32,imm8 */
XMM3PM_66r, /* SIMD 0x66 prefix required xmm -> r32/mem,imm8 */
- XMMP, /* SIMD xmm/mem w/to xmm,imm8 */
+ XMMP, /* SIMD xmm/mem w/to xmm,imm8 */
XMMP_66o, /* SIMD 0x66 prefix optional xmm/mem w/to xmm,imm8 */
XMMP_66r, /* SIMD 0x66 prefix required xmm/mem w/to xmm,imm8 */
- XMMPRM, /* SIMD r32/mem -> xmm,imm8 */
+ XMMPRM, /* SIMD r32/mem -> xmm,imm8 */
XMMPRM_66r, /* SIMD 0x66 prefix required r32/mem -> xmm,imm8 */
XMMS, /* SIMD xmm -> xmm/mem */
- XMMM, /* SIMD mem -> xmm */
+ XMMM, /* SIMD mem -> xmm */
XMMM_66r, /* SIMD 0x66 prefix required mem -> xmm */
XMMMS, /* SIMD xmm -> mem */
- XMM3MX, /* SIMD r32/mem -> xmm */
- XMM3MXS, /* SIMD xmm -> r32/mem */
- XMMSH, /* SIMD xmm,imm8 */
- XMMXM3, /* SIMD xmm/mem -> r32 */
- XMMX3, /* SIMD xmm -> r32 */
- XMMXMM, /* SIMD xmm/mem -> mm */
- XMMMX, /* SIMD mm -> xmm */
- XMMXM, /* SIMD xmm -> mm */
- XMMX2I, /* SIMD xmm -> xmm, imm, imm */
- XMM2I, /* SIMD xmm, imm, imm */
+ XMM3MX, /* SIMD r32/mem -> xmm */
+ XMM3MXS, /* SIMD xmm -> r32/mem */
+ XMMSH, /* SIMD xmm,imm8 */
+ XMMXM3, /* SIMD xmm/mem -> r32 */
+ XMMX3, /* SIMD xmm -> r32 */
+ XMMXMM, /* SIMD xmm/mem -> mm */
+ XMMMX, /* SIMD mm -> xmm */
+ XMMXM, /* SIMD xmm -> mm */
+ XMMX2I, /* SIMD xmm -> xmm, imm, imm */
+ XMM2I, /* SIMD xmm, imm, imm */
XMMFENCE, /* SIMD lfence or mfence */
XMMSFNC, /* SIMD sfence (none or mem) */
+ FSGS, /* FSGSBASE if reg */
XGETBV_XSETBV,
VEX_NONE, /* VEX no operand */
VEX_MO, /* VEX mod_rm -> implicit reg */
@@ -224,25 +227,32 @@ enum {
VEX_VRMrX, /* VEX mod_rm, VEX.vvvv -> mod_rm */
VEX_RRX, /* VEX VEX.vvvv, mod_reg -> mod_rm */
VEX_RMRX, /* VEX VEX.vvvv, mod_rm, imm8[7:4] -> mod_reg */
- VEX_MX, /* VEX mod_rm -> mod_reg */
- VEX_MXI, /* VEX mod_rm, imm8 -> mod_reg */
- VEX_XXI, /* VEX mod_rm, imm8 -> VEX.vvvv */
- VEX_MR, /* VEX mod_rm -> mod_reg */
- VEX_RRI, /* VEX mod_reg, mod_rm -> implicit(eflags/r32) */
- VEX_RX, /* VEX mod_reg -> mod_rm */
- VEX_RR, /* VEX mod_rm -> mod_reg */
- VEX_RRi, /* VEX mod_rm, imm8 -> mod_reg */
- VEX_RM, /* VEX mod_reg -> mod_rm */
+ VEX_MX, /* VEX mod_rm -> mod_reg */
+ VEX_MXI, /* VEX mod_rm, imm8 -> mod_reg */
+ VEX_XXI, /* VEX mod_rm, imm8 -> VEX.vvvv */
+ VEX_MR, /* VEX mod_rm -> mod_reg */
+ VEX_RRI, /* VEX mod_reg, mod_rm -> implicit(eflags/r32) */
+ VEX_RX, /* VEX mod_reg -> mod_rm */
+ VEX_KRR, /* VEX mod_rm -> mod_reg */
+ VEX_KMR, /* VEX mod_reg -> mod_rm */
+ VEX_KRM, /* VEX mod_rm -> mod_reg */
+ VEX_RR, /* VEX mod_rm -> mod_reg */
+ VEX_RRi, /* VEX mod_rm, imm8 -> mod_reg */
+ VEX_RM, /* VEX mod_reg -> mod_rm */
VEX_RIM, /* VEX mod_reg, imm8 -> mod_rm */
- VEX_RRM, /* VEX VEX.vvvv, mod_reg -> mod_rm */
- VEX_RMX, /* VEX VEX.vvvv, mod_rm -> mod_reg */
+ VEX_RRM, /* VEX VEX.vvvv, mod_reg -> mod_rm */
+ VEX_RMX, /* VEX VEX.vvvv, mod_rm -> mod_reg */
VEX_SbVM, /* VEX SIB, VEX.vvvv -> mod_rm */
VMx, /* vmcall/vmlaunch/vmresume/vmxoff */
VMxo, /* VMx instruction with optional prefix */
SVM, /* AMD SVM instructions */
BLS, /* BLSR, BLSMSK, BLSI */
FMA, /* FMA instructions, all VEX_RMrX */
- ADX /* ADX instructions, support REX.w, mod_rm->mod_reg */
+ ADX, /* ADX instructions, support REX.w, mod_rm->mod_reg */
+ EVEX_RX, /* EVEX mod_reg -> mod_rm */
+ EVEX_MX, /* EVEX mod_rm -> mod_reg */
+ EVEX_RMrX, /* EVEX EVEX.vvvv, mod_rm -> mod_reg */
+ EVEX_RMRX /* EVEX EVEX.vvvv, mod_rm, imm8 -> mod_reg */
};
/*
@@ -280,7 +290,9 @@ enum {
* IND - indirect to another to another table
* "T" - means to Terminate indirections (this is the final opcode)
* "S" - means "operand length suffix required"
- * "Sa" - means AVX2 suffix (d/q) required
+ * "Sa" - means AVX2 suffix (q/d) required
+ * "Sq" - means AVX512 suffix (q/d) required
+ * "Sd" - means AVX512 suffix (d/s) required
* "NS" - means "no suffix" which is the operand length suffix of the opcode
* "Z" - means instruction size arg required
* "u" - means the opcode is invalid in IA32 but valid in amd64
@@ -288,8 +300,13 @@ enum {
* "y" - means the operand size is always 64 bits in 64 bit mode
* "p" - means push/pop stack operation
* "vr" - means VEX instruction that operates on normal registers, not fpu
+ * "vo" - means VEX instruction that operates on opmask registers, not fpu
*/
+#define AVS2 (uint_t)1 /* it_avxsuf: AVX2 q/d suffix handling */
+#define AVS5Q (uint_t)2 /* it_avxsuf: AVX512 q/d suffix handling */
+#define AVS5D (uint_t)3 /* it_avxsuf: AVX512 d/s suffix handling */
+
#if defined(DIS_TEXT) && defined(DIS_MEM)
#define IND(table) {(instable_t *)table, 0, "", 0, 0, 0, 0, 0, 0}
#define INDx(table) {(instable_t *)table, 0, "", 0, 0, 1, 0, 0, 0}
@@ -301,12 +318,15 @@ enum {
#define TNSZ(name, amode, sz) {TERM, amode, name, 0, sz, 0, 0, 0, 0}
#define TNSZy(name, amode, sz) {TERM, amode, name, 0, sz, 0, 1, 0, 0}
#define TNSZvr(name, amode, sz) {TERM, amode, name, 0, sz, 0, 0, 0, 0, 1}
+#define TSvo(name, amode) {TERM, amode, name, 1, 0, 0, 0, 0, 0, 0, 0, 1}
#define TS(name, amode) {TERM, amode, name, 1, 0, 0, 0, 0, 0}
#define TSx(name, amode) {TERM, amode, name, 1, 0, 1, 0, 0, 0}
#define TSy(name, amode) {TERM, amode, name, 1, 0, 0, 1, 0, 0}
#define TSp(name, amode) {TERM, amode, name, 1, 0, 0, 0, 0, 1}
#define TSZ(name, amode, sz) {TERM, amode, name, 1, sz, 0, 0, 0, 0}
-#define TSaZ(name, amode, sz) {TERM, amode, name, 1, sz, 0, 0, 0, 0, 0, 1}
+#define TSaZ(name, amode, sz) {TERM, amode, name, 1, sz, 0, 0, 0, 0, 0, AVS2}
+#define TSq(name, amode) {TERM, amode, name, 0, 0, 0, 0, 0, 0, 0, AVS5Q}
+#define TSd(name, amode) {TERM, amode, name, 0, 0, 0, 0, 0, 0, 0, AVS5D}
#define TSZx(name, amode, sz) {TERM, amode, name, 1, sz, 1, 0, 0, 0}
#define TSZy(name, amode, sz) {TERM, amode, name, 1, sz, 0, 1, 0, 0}
#define INVALID {TERM, UNKNOWN, "", 0, 0, 0, 0, 0}
@@ -321,12 +341,14 @@ enum {
#define TNSZ(name, amode, sz) {TERM, amode, name, 0, 0, 0, 0, 0}
#define TNSZy(name, amode, sz) {TERM, amode, name, 0, 0, 1, 0, 0}
#define TNSZvr(name, amode, sz) {TERM, amode, name, 0, 0, 0, 0, 0, 1}
+#define TSvo(name, amode) {TERM, amode, name, 1, 0, 0, 0, 0, 0, 0, 1}
#define TS(name, amode) {TERM, amode, name, 1, 0, 0, 0, 0}
#define TSx(name, amode) {TERM, amode, name, 1, 1, 0, 0, 0}
#define TSy(name, amode) {TERM, amode, name, 1, 0, 1, 0, 0}
#define TSp(name, amode) {TERM, amode, name, 1, 0, 0, 0, 1}
#define TSZ(name, amode, sz) {TERM, amode, name, 1, 0, 0, 0, 0}
-#define TSaZ(name, amode, sz) {TERM, amode, name, 1, 0, 0, 0, 0, 0, 1}
+#define TSaZ(name, amode, sz) {TERM, amode, name, 1, 0, 0, 0, 0, 0, AVS2}
+#define TSq(name, amode) {TERM, amode, name, 0, 0, 0, 0, 0, 0, AVS5Q}
#define TSZx(name, amode, sz) {TERM, amode, name, 1, 1, 0, 0, 0}
#define TSZy(name, amode, sz) {TERM, amode, name, 1, 0, 1, 0, 0}
#define INVALID {TERM, UNKNOWN, "", 0, 0, 0, 0, 0}
@@ -341,12 +363,14 @@ enum {
#define TNSZ(name, amode, sz) {TERM, amode, sz, 0, 0, 0, 0}
#define TNSZy(name, amode, sz) {TERM, amode, sz, 0, 1, 0, 0}
#define TNSZvr(name, amode, sz) {TERM, amode, sz, 0, 0, 0, 0, 1}
+#define TSvo(name, amode) {TERM, amode, 0, 0, 0, 0, 0, 0, 0, 1}
#define TS(name, amode) {TERM, amode, 0, 0, 0, 0, 0}
#define TSx(name, amode) {TERM, amode, 0, 1, 0, 0, 0}
#define TSy(name, amode) {TERM, amode, 0, 0, 1, 0, 0}
#define TSp(name, amode) {TERM, amode, 0, 0, 0, 0, 1}
#define TSZ(name, amode, sz) {TERM, amode, sz, 0, 0, 0, 0}
-#define TSaZ(name, amode, sz) {TERM, amode, sz, 0, 0, 0, 0, 0, 1}
+#define TSaZ(name, amode, sz) {TERM, amode, sz, 0, 0, 0, 0, 0, AVS2}
+#define TSq(name, amode) {TERM, amode, 0, 0, 0, 0, 0, 0, AVS5Q}
#define TSZx(name, amode, sz) {TERM, amode, sz, 1, 0, 0, 0}
#define TSZy(name, amode, sz) {TERM, amode, sz, 0, 1, 0, 0}
#define INVALID {TERM, UNKNOWN, 0, 0, 0, 0, 0}
@@ -361,12 +385,15 @@ enum {
#define TNSZ(name, amode, sz) {TERM, amode, 0, 0, 0, 0}
#define TNSZy(name, amode, sz) {TERM, amode, 0, 1, 0, 0}
#define TNSZvr(name, amode, sz) {TERM, amode, 0, 0, 0, 0, 1}
+#define TSvo(name, amode) {TERM, amode, 0, 0, 0, 0, 0, 0, 1}
#define TS(name, amode) {TERM, amode, 0, 0, 0, 0}
#define TSx(name, amode) {TERM, amode, 1, 0, 0, 0}
#define TSy(name, amode) {TERM, amode, 0, 1, 0, 0}
#define TSp(name, amode) {TERM, amode, 0, 0, 0, 1}
#define TSZ(name, amode, sz) {TERM, amode, 0, 0, 0, 0}
-#define TSaZ(name, amode, sz) {TERM, amode, 0, 0, 0, 0, 0, 1}
+#define TSaZ(name, amode, sz) {TERM, amode, 0, 0, 0, 0, 0, AVS2}
+#define TSq(name, amode) {TERM, amode, 0, 0, 0, 0, 0, AVS5Q}
+#define TSd(name, amode) {TERM, amode, 0, 0, 0, 0, 0, AVS5D}
#define TSZx(name, amode, sz) {TERM, amode, 1, 0, 0, 0}
#define TSZy(name, amode, sz) {TERM, amode, 0, 1, 0, 0}
#define INVALID {TERM, UNKNOWN, 0, 0, 0, 0}
@@ -470,14 +497,41 @@ const char *const dis_MMREG[16] = {
"%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7"
};
-const char *const dis_XMMREG[16] = {
- "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7",
- "%xmm8", "%xmm9", "%xmm10", "%xmm11", "%xmm12", "%xmm13", "%xmm14", "%xmm15"
+const char *const dis_XMMREG[32] = {
+ "%xmm0", "%xmm1", "%xmm2", "%xmm3",
+ "%xmm4", "%xmm5", "%xmm6", "%xmm7",
+ "%xmm8", "%xmm9", "%xmm10", "%xmm11",
+ "%xmm12", "%xmm13", "%xmm14", "%xmm15",
+ "%xmm16", "%xmm17", "%xmm18", "%xmm19",
+ "%xmm20", "%xmm21", "%xmm22", "%xmm23",
+ "%xmm24", "%xmm25", "%xmm26", "%xmm27",
+ "%xmm28", "%xmm29", "%xmm30", "%xmm31",
+};
+
+const char *const dis_YMMREG[32] = {
+ "%ymm0", "%ymm1", "%ymm2", "%ymm3",
+ "%ymm4", "%ymm5", "%ymm6", "%ymm7",
+ "%ymm8", "%ymm9", "%ymm10", "%ymm11",
+ "%ymm12", "%ymm13", "%ymm14", "%ymm15",
+ "%ymm16", "%ymm17", "%ymm18", "%ymm19",
+ "%ymm20", "%ymm21", "%ymm22", "%ymm23",
+ "%ymm24", "%ymm25", "%ymm26", "%ymm27",
+ "%ymm28", "%ymm29", "%ymm30", "%ymm31",
+};
+
+const char *const dis_ZMMREG[32] = {
+ "%zmm0", "%zmm1", "%zmm2", "%zmm3",
+ "%zmm4", "%zmm5", "%zmm6", "%zmm7",
+ "%zmm8", "%zmm9", "%zmm10", "%zmm11",
+ "%zmm12", "%zmm13", "%zmm14", "%zmm15",
+ "%zmm16", "%zmm17", "%zmm18", "%zmm19",
+ "%zmm20", "%zmm21", "%zmm22", "%zmm23",
+ "%zmm24", "%zmm25", "%zmm26", "%zmm27",
+ "%zmm28", "%zmm29", "%zmm30", "%zmm31",
};
-const char *const dis_YMMREG[16] = {
- "%ymm0", "%ymm1", "%ymm2", "%ymm3", "%ymm4", "%ymm5", "%ymm6", "%ymm7",
- "%ymm8", "%ymm9", "%ymm10", "%ymm11", "%ymm12", "%ymm13", "%ymm14", "%ymm15"
+const char *const dis_KOPMASKREG[8] = {
+ "%k0", "%k1", "%k2", "%k3", "%k4", "%k5", "%k6", "%k7"
};
const char *const dis_SEGREG[16] = {
@@ -511,12 +565,17 @@ const instable_t dis_opMOVSLD = TNS("movslq",MOVSXZ);
*/
const instable_t dis_opPause = TNS("pause", NORM);
+/*
+ * "decode table" for wbnoinvd instruction
+ */
+const instable_t dis_opWbnoinvd = TNS("wbnoinvd", NORM);
+
/*
* Decode table for 0x0F00 opcodes
*/
const instable_t dis_op0F00[8] = {
-/* [0] */ TNS("sldt",M), TNS("str",M), TNSy("lldt",M), TNSy("ltr",M),
+/* [0] */ TNS("sldt",M), TNS("str",M), TNSy("lldt",M), TNSy("ltr",M),
/* [4] */ TNSZ("verr",M,2), TNSZ("verw",M,2), INVALID, INVALID,
};
@@ -527,7 +586,7 @@ const instable_t dis_op0F00[8] = {
const instable_t dis_op0F01[8] = {
/* [0] */ TNSZ("sgdt",VMx,6), TNSZ("sidt",MONITOR_MWAIT,6), TNSZ("lgdt",XGETBV_XSETBV,6), TNSZ("lidt",SVM,6),
-/* [4] */ TNSZ("smsw",M,2), INVALID, TNSZ("lmsw",M,2), TNS("invlpg",SWAPGS_RDTSCP),
+/* [4] */ TNSZ("smsw",M,2), INVALID, TNSZ("lmsw",M,2), TNS("invlpg",SWAPGS_RDTSCP),
};
/*
@@ -540,13 +599,21 @@ const instable_t dis_op0F18[8] = {
};
/*
- * Decode table for 0x0FAE opcodes -- SIMD state save/restore
+ * Decode table for 0x0FAE opcodes -- SIMD state save/restore
*/
const instable_t dis_op0FAE[8] = {
-/* [0] */ TNSZ("fxsave",M,512), TNSZ("fxrstor",M,512), TNS("ldmxcsr",M), TNS("stmxcsr",M),
+/* [0] */ TNSZ("fxsave",FSGS,512),TNSZ("fxrstor",FSGS,512),TNS("ldmxcsr",FSGS), TNS("stmxcsr",FSGS),
/* [4] */ TNSZ("xsave",M,512), TNS("lfence",XMMFENCE), TNS("mfence",XMMFENCE), TNS("sfence",XMMSFNC),
};
+/*
+ * Decode table for 0xF30FAE opcodes -- FSGSBASE
+ */
+const instable_t dis_opF30FAE[8] = {
+/* [0] */ TNSx("rdfsbase",FSGS), TNSx("rdgsbase",FSGS), TNSx("wrfsbase",FSGS), TNSx("wrgsbase",FSGS),
+/* [4] */ INVALID, INVALID, INVALID, INVALID,
+};
+
/*
* Decode table for 0x0FBA opcodes
*/
@@ -558,17 +625,17 @@ const instable_t dis_op0FBA[8] = {
};
/*
- * Decode table for 0x0FC7 opcode (group 9)
+ * Decode table for 0x0FC7 opcode (group 9)
*/
const instable_t dis_op0FC7[8] = {
-/* [0] */ INVALID, TNS("cmpxchg8b",M), INVALID, INVALID,
-/* [4] */ INVALID, INVALID, TNS("vmptrld",MG9), TNS("vmptrst",MG9),
+/* [0] */ INVALID, TNS("cmpxchg8b",M), INVALID, TNS("xrstors",MG9),
+/* [4] */ TNS("xsavec",MG9), TNS("xsaves",MG9), TNS("vmptrld",MG9), TNS("vmptrst",MG9),
};
/*
- * Decode table for 0x0FC7 opcode (group 9) mode 3
+ * Decode table for 0x0FC7 opcode (group 9) mode 3
*/
const instable_t dis_op0FC7m3[8] = {
@@ -578,7 +645,7 @@ const instable_t dis_op0FC7m3[8] = {
};
/*
- * Decode table for 0x0FC7 opcode with 0x66 prefix
+ * Decode table for 0x0FC7 opcode with 0x66 prefix
*/
const instable_t dis_op660FC7[8] = {
@@ -588,7 +655,7 @@ const instable_t dis_op660FC7[8] = {
};
/*
- * Decode table for 0x0FC7 opcode with 0xF3 prefix
+ * Decode table for 0x0FC7 opcode with 0xF3 prefix
*/
const instable_t dis_opF30FC7[8] = {
@@ -621,7 +688,7 @@ const instable_t dis_op0F7123[4][8] = {
/* .4 */ TNS("psrad",MMOSH), INVALID, TNS("pslld",MMOSH), INVALID,
}, {
/* [73].0 */ INVALID, INVALID, TNS("psrlq",MMOSH), TNS("INVALID",MMOSH),
-/* .4 */ INVALID, INVALID, TNS("psllq",MMOSH), TNS("INVALID",MMOSH),
+/* .4 */ INVALID, INVALID, TNS("psllq",MMOSH), TNS("INVALID",MMOSH),
} };
/*
@@ -757,9 +824,9 @@ const instable_t dis_opAVX660F[256] = {
/* [38] */ INVALID, INVALID, INVALID, INVALID,
/* [3C] */ INVALID, INVALID, INVALID, INVALID,
-/* [40] */ INVALID, INVALID, INVALID, INVALID,
-/* [44] */ INVALID, INVALID, INVALID, INVALID,
-/* [48] */ INVALID, INVALID, INVALID, INVALID,
+/* [40] */ INVALID, TSvo("kand",VEX_RMX), TSvo("kandn",VEX_RMX), INVALID,
+/* [44] */ TSvo("knot",VEX_MX), TSvo("kor",VEX_RMX), TSvo("kxnor",VEX_RMX), TSvo("kxor",VEX_RMX),
+/* [48] */ INVALID, INVALID, TSvo("kadd",VEX_RMX), TSvo("kunpck",VEX_RMX),
/* [4C] */ INVALID, INVALID, INVALID, INVALID,
/* [50] */ TNS("vmovmskpd",VEX_MR), TNSZ("vsqrtpd",VEX_MX,16), INVALID, INVALID,
@@ -782,9 +849,9 @@ const instable_t dis_opAVX660F[256] = {
/* [88] */ INVALID, INVALID, INVALID, INVALID,
/* [8C] */ INVALID, INVALID, INVALID, INVALID,
-/* [90] */ INVALID, INVALID, INVALID, INVALID,
+/* [90] */ TSvo("kmov",VEX_KRM), TSvo("kmov",VEX_KMR), TSvo("kmov",VEX_KRR), TSvo("kmov",VEX_MR),
/* [94] */ INVALID, INVALID, INVALID, INVALID,
-/* [98] */ INVALID, INVALID, INVALID, INVALID,
+/* [98] */ TSvo("kortest",VEX_MX), TSvo("ktest",VEX_MX), INVALID, INVALID,
/* [9C] */ INVALID, INVALID, INVALID, INVALID,
/* [A0] */ INVALID, INVALID, INVALID, INVALID,
@@ -812,30 +879,524 @@ const instable_t dis_opAVX660F[256] = {
/* [E8] */ TNSZ("vpsubsb",VEX_RMrX,16), TNSZ("vpsubsw",VEX_RMrX,16), TNSZ("vpminsw",VEX_RMrX,16), TNSZ("vpor",VEX_RMrX,16),
/* [EC] */ TNSZ("vpaddsb",VEX_RMrX,16), TNSZ("vpaddsw",VEX_RMrX,16), TNSZ("vpmaxsw",VEX_RMrX,16), TNSZ("vpxor",VEX_RMrX,16),
-/* [F0] */ INVALID, TNSZ("vpsllw",VEX_RMrX,16), TNSZ("vpslld",VEX_RMrX,16), TNSZ("vpsllq",VEX_RMrX,16),
-/* [F4] */ TNSZ("vpmuludq",VEX_RMrX,16), TNSZ("vpmaddwd",VEX_RMrX,16), TNSZ("vpsadbw",VEX_RMrX,16), TNS("vmaskmovdqu",VEX_MX),
-/* [F8] */ TNSZ("vpsubb",VEX_RMrX,16), TNSZ("vpsubw",VEX_RMrX,16), TNSZ("vpsubd",VEX_RMrX,16), TNSZ("vpsubq",VEX_RMrX,16),
-/* [FC] */ TNSZ("vpaddb",VEX_RMrX,16), TNSZ("vpaddw",VEX_RMrX,16), TNSZ("vpaddd",VEX_RMrX,16), INVALID,
+/* [F0] */ INVALID, TNSZ("vpsllw",VEX_RMrX,16), TNSZ("vpslld",VEX_RMrX,16), TNSZ("vpsllq",VEX_RMrX,16),
+/* [F4] */ TNSZ("vpmuludq",VEX_RMrX,16), TNSZ("vpmaddwd",VEX_RMrX,16), TNSZ("vpsadbw",VEX_RMrX,16), TNS("vmaskmovdqu",VEX_MX),
+/* [F8] */ TNSZ("vpsubb",VEX_RMrX,16), TNSZ("vpsubw",VEX_RMrX,16), TNSZ("vpsubd",VEX_RMrX,16), TNSZ("vpsubq",VEX_RMrX,16),
+/* [FC] */ TNSZ("vpaddb",VEX_RMrX,16), TNSZ("vpaddw",VEX_RMrX,16), TNSZ("vpaddd",VEX_RMrX,16), INVALID,
+};
+
+/*
+ * Decode table for SIMD instructions with the repnz (0xf2) prefix.
+ */
+const instable_t dis_opSIMDrepnz[256] = {
+/* [00] */ INVALID, INVALID, INVALID, INVALID,
+/* [04] */ INVALID, INVALID, INVALID, INVALID,
+/* [08] */ INVALID, INVALID, INVALID, INVALID,
+/* [0C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [10] */ TNSZ("movsd",XMM,8), TNSZ("movsd",XMMS,8), TNSZ("movddup",XMM,8), INVALID,
+/* [14] */ INVALID, INVALID, INVALID, INVALID,
+/* [18] */ INVALID, INVALID, INVALID, INVALID,
+/* [1C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [20] */ INVALID, INVALID, INVALID, INVALID,
+/* [24] */ INVALID, INVALID, INVALID, INVALID,
+/* [28] */ INVALID, INVALID, TNSZ("cvtsi2sd",XMM3MX,4),TNSZ("movntsd",XMMMS,8),
+/* [2C] */ TNSZ("cvttsd2si",XMMXM3,8),TNSZ("cvtsd2si",XMMXM3,8),INVALID, INVALID,
+
+/* [30] */ INVALID, INVALID, INVALID, INVALID,
+/* [34] */ INVALID, INVALID, INVALID, INVALID,
+/* [38] */ INVALID, INVALID, INVALID, INVALID,
+/* [3C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [40] */ INVALID, INVALID, INVALID, INVALID,
+/* [44] */ INVALID, INVALID, INVALID, INVALID,
+/* [48] */ INVALID, INVALID, INVALID, INVALID,
+/* [4C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [50] */ INVALID, TNSZ("sqrtsd",XMM,8), INVALID, INVALID,
+/* [54] */ INVALID, INVALID, INVALID, INVALID,
+/* [58] */ TNSZ("addsd",XMM,8), TNSZ("mulsd",XMM,8), TNSZ("cvtsd2ss",XMM,8), INVALID,
+/* [5C] */ TNSZ("subsd",XMM,8), TNSZ("minsd",XMM,8), TNSZ("divsd",XMM,8), TNSZ("maxsd",XMM,8),
+
+/* [60] */ INVALID, INVALID, INVALID, INVALID,
+/* [64] */ INVALID, INVALID, INVALID, INVALID,
+/* [68] */ INVALID, INVALID, INVALID, INVALID,
+/* [6C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [70] */ TNSZ("pshuflw",XMMP,16),INVALID, INVALID, INVALID,
+/* [74] */ INVALID, INVALID, INVALID, INVALID,
+/* [78] */ TNSZ("insertq",XMMX2I,16),TNSZ("insertq",XMM,8),INVALID, INVALID,
+/* [7C] */ TNSZ("haddps",XMM,16), TNSZ("hsubps",XMM,16), INVALID, INVALID,
+
+/* [80] */ INVALID, INVALID, INVALID, INVALID,
+/* [84] */ INVALID, INVALID, INVALID, INVALID,
+/* [88] */ INVALID, INVALID, INVALID, INVALID,
+/* [0C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [90] */ INVALID, INVALID, INVALID, INVALID,
+/* [94] */ INVALID, INVALID, INVALID, INVALID,
+/* [98] */ INVALID, INVALID, INVALID, INVALID,
+/* [9C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [A0] */ INVALID, INVALID, INVALID, INVALID,
+/* [A4] */ INVALID, INVALID, INVALID, INVALID,
+/* [A8] */ INVALID, INVALID, INVALID, INVALID,
+/* [AC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [B0] */ INVALID, INVALID, INVALID, INVALID,
+/* [B4] */ INVALID, INVALID, INVALID, INVALID,
+/* [B8] */ INVALID, INVALID, INVALID, INVALID,
+/* [BC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [C0] */ INVALID, INVALID, TNSZ("cmpsd",XMMP,8), INVALID,
+/* [C4] */ INVALID, INVALID, INVALID, INVALID,
+/* [C8] */ INVALID, INVALID, INVALID, INVALID,
+/* [CC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [D0] */ TNSZ("addsubps",XMM,16),INVALID, INVALID, INVALID,
+/* [D4] */ INVALID, INVALID, TNS("movdq2q",XMMXM), INVALID,
+/* [D8] */ INVALID, INVALID, INVALID, INVALID,
+/* [DC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [E0] */ INVALID, INVALID, INVALID, INVALID,
+/* [E4] */ INVALID, INVALID, TNSZ("cvtpd2dq",XMM,16),INVALID,
+/* [E8] */ INVALID, INVALID, INVALID, INVALID,
+/* [EC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [F0] */ TNS("lddqu",XMMM), INVALID, INVALID, INVALID,
+/* [F4] */ INVALID, INVALID, INVALID, INVALID,
+/* [F8] */ INVALID, INVALID, INVALID, INVALID,
+/* [FC] */ INVALID, INVALID, INVALID, INVALID,
+};
+
+const instable_t dis_opAVXF20F[256] = {
+/* [00] */ INVALID, INVALID, INVALID, INVALID,
+/* [04] */ INVALID, INVALID, INVALID, INVALID,
+/* [08] */ INVALID, INVALID, INVALID, INVALID,
+/* [0C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [10] */ TNSZ("vmovsd",VEX_RMrX,8), TNSZ("vmovsd",VEX_RRX,8), TNSZ("vmovddup",VEX_MX,8), INVALID,
+/* [14] */ INVALID, INVALID, INVALID, INVALID,
+/* [18] */ INVALID, INVALID, INVALID, INVALID,
+/* [1C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [20] */ INVALID, INVALID, INVALID, INVALID,
+/* [24] */ INVALID, INVALID, INVALID, INVALID,
+/* [28] */ INVALID, INVALID, TNSZ("vcvtsi2sd",VEX_RMrX,4),INVALID,
+/* [2C] */ TNSZ("vcvttsd2si",VEX_MR,8),TNSZ("vcvtsd2si",VEX_MR,8),INVALID, INVALID,
+
+/* [30] */ INVALID, INVALID, INVALID, INVALID,
+/* [34] */ INVALID, INVALID, INVALID, INVALID,
+/* [38] */ INVALID, INVALID, INVALID, INVALID,
+/* [3C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [40] */ INVALID, INVALID, INVALID, INVALID,
+/* [44] */ INVALID, INVALID, INVALID, INVALID,
+/* [48] */ INVALID, INVALID, INVALID, INVALID,
+/* [4C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [50] */ INVALID, TNSZ("vsqrtsd",VEX_RMrX,8), INVALID, INVALID,
+/* [54] */ INVALID, INVALID, INVALID, INVALID,
+/* [58] */ TNSZ("vaddsd",VEX_RMrX,8), TNSZ("vmulsd",VEX_RMrX,8), TNSZ("vcvtsd2ss",VEX_RMrX,8), INVALID,
+/* [5C] */ TNSZ("vsubsd",VEX_RMrX,8), TNSZ("vminsd",VEX_RMrX,8), TNSZ("vdivsd",VEX_RMrX,8), TNSZ("vmaxsd",VEX_RMrX,8),
+
+/* [60] */ INVALID, INVALID, INVALID, INVALID,
+/* [64] */ INVALID, INVALID, INVALID, INVALID,
+/* [68] */ INVALID, INVALID, INVALID, INVALID,
+/* [6C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [70] */ TNSZ("vpshuflw",VEX_MXI,16),INVALID, INVALID, INVALID,
+/* [74] */ INVALID, INVALID, INVALID, INVALID,
+/* [78] */ INVALID, INVALID, INVALID, INVALID,
+/* [7C] */ TNSZ("vhaddps",VEX_RMrX,8), TNSZ("vhsubps",VEX_RMrX,8), INVALID, INVALID,
+
+/* [80] */ INVALID, INVALID, INVALID, INVALID,
+/* [84] */ INVALID, INVALID, INVALID, INVALID,
+/* [88] */ INVALID, INVALID, INVALID, INVALID,
+/* [0C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [90] */ INVALID, INVALID, TSvo("kmov",VEX_KRR), TSvo("kmov",VEX_MR),
+/* [94] */ INVALID, INVALID, INVALID, INVALID,
+/* [98] */ INVALID, INVALID, INVALID, INVALID,
+/* [9C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [A0] */ INVALID, INVALID, INVALID, INVALID,
+/* [A4] */ INVALID, INVALID, INVALID, INVALID,
+/* [A8] */ INVALID, INVALID, INVALID, INVALID,
+/* [AC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [B0] */ INVALID, INVALID, INVALID, INVALID,
+/* [B4] */ INVALID, INVALID, INVALID, INVALID,
+/* [B8] */ INVALID, INVALID, INVALID, INVALID,
+/* [BC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [C0] */ INVALID, INVALID, TNSZ("vcmpsd",VEX_RMRX,8), INVALID,
+/* [C4] */ INVALID, INVALID, INVALID, INVALID,
+/* [C8] */ INVALID, INVALID, INVALID, INVALID,
+/* [CC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [D0] */ TNSZ("vaddsubps",VEX_RMrX,8), INVALID, INVALID, INVALID,
+/* [D4] */ INVALID, INVALID, INVALID, INVALID,
+/* [D8] */ INVALID, INVALID, INVALID, INVALID,
+/* [DC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [E0] */ INVALID, INVALID, INVALID, INVALID,
+/* [E4] */ INVALID, INVALID, TNSZ("vcvtpd2dq",VEX_MX,16),INVALID,
+/* [E8] */ INVALID, INVALID, INVALID, INVALID,
+/* [EC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [F0] */ TNSZ("vlddqu",VEX_MX,16), INVALID, INVALID, INVALID,
+/* [F4] */ INVALID, INVALID, INVALID, INVALID,
+/* [F8] */ INVALID, INVALID, INVALID, INVALID,
+/* [FC] */ INVALID, INVALID, INVALID, INVALID,
+};
+
+const instable_t dis_opAVXF20F3A[256] = {
+/* [00] */ INVALID, INVALID, INVALID, INVALID,
+/* [04] */ INVALID, INVALID, INVALID, INVALID,
+/* [08] */ INVALID, INVALID, INVALID, INVALID,
+/* [0C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [10] */ INVALID, INVALID, INVALID, INVALID,
+/* [14] */ INVALID, INVALID, INVALID, INVALID,
+/* [18] */ INVALID, INVALID, INVALID, INVALID,
+/* [1C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [20] */ INVALID, INVALID, INVALID, INVALID,
+/* [24] */ INVALID, INVALID, INVALID, INVALID,
+/* [28] */ INVALID, INVALID, INVALID, INVALID,
+/* [2C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [30] */ INVALID, INVALID, INVALID, INVALID,
+/* [34] */ INVALID, INVALID, INVALID, INVALID,
+/* [38] */ INVALID, INVALID, INVALID, INVALID,
+/* [3C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [40] */ INVALID, INVALID, INVALID, INVALID,
+/* [44] */ INVALID, INVALID, INVALID, INVALID,
+/* [48] */ INVALID, INVALID, INVALID, INVALID,
+/* [4C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [50] */ INVALID, INVALID, INVALID, INVALID,
+/* [54] */ INVALID, INVALID, INVALID, INVALID,
+/* [58] */ INVALID, INVALID, INVALID, INVALID,
+/* [5C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [60] */ INVALID, INVALID, INVALID, INVALID,
+/* [64] */ INVALID, INVALID, INVALID, INVALID,
+/* [68] */ INVALID, INVALID, INVALID, INVALID,
+/* [6C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [70] */ INVALID, INVALID, INVALID, INVALID,
+/* [74] */ INVALID, INVALID, INVALID, INVALID,
+/* [78] */ INVALID, INVALID, INVALID, INVALID,
+/* [7C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [80] */ INVALID, INVALID, INVALID, INVALID,
+/* [84] */ INVALID, INVALID, INVALID, INVALID,
+/* [88] */ INVALID, INVALID, INVALID, INVALID,
+/* [0C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [90] */ INVALID, INVALID, INVALID, INVALID,
+/* [94] */ INVALID, INVALID, INVALID, INVALID,
+/* [98] */ INVALID, INVALID, INVALID, INVALID,
+/* [9C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [A0] */ INVALID, INVALID, INVALID, INVALID,
+/* [A4] */ INVALID, INVALID, INVALID, INVALID,
+/* [A8] */ INVALID, INVALID, INVALID, INVALID,
+/* [AC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [B0] */ INVALID, INVALID, INVALID, INVALID,
+/* [B4] */ INVALID, INVALID, INVALID, INVALID,
+/* [B8] */ INVALID, INVALID, INVALID, INVALID,
+/* [BC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [C0] */ INVALID, INVALID, INVALID, INVALID,
+/* [C4] */ INVALID, INVALID, INVALID, INVALID,
+/* [C8] */ INVALID, INVALID, INVALID, INVALID,
+/* [CC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [D0] */ INVALID, INVALID, INVALID, INVALID,
+/* [D4] */ INVALID, INVALID, INVALID, INVALID,
+/* [D8] */ INVALID, INVALID, INVALID, INVALID,
+/* [DC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [E0] */ INVALID, INVALID, INVALID, INVALID,
+/* [E4] */ INVALID, INVALID, INVALID, INVALID,
+/* [E8] */ INVALID, INVALID, INVALID, INVALID,
+/* [EC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [F0] */ TNSZvr("rorx",VEX_MXI,6),INVALID, INVALID, INVALID,
+/* [F4] */ INVALID, INVALID, INVALID, INVALID,
+/* [F8] */ INVALID, INVALID, INVALID, INVALID,
+/* [FC] */ INVALID, INVALID, INVALID, INVALID,
+};
+
+const instable_t dis_opAVXF20F38[256] = {
+/* [00] */ INVALID, INVALID, INVALID, INVALID,
+/* [04] */ INVALID, INVALID, INVALID, INVALID,
+/* [08] */ INVALID, INVALID, INVALID, INVALID,
+/* [0C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [10] */ INVALID, INVALID, INVALID, INVALID,
+/* [14] */ INVALID, INVALID, INVALID, INVALID,
+/* [18] */ INVALID, INVALID, INVALID, INVALID,
+/* [1C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [20] */ INVALID, INVALID, INVALID, INVALID,
+/* [24] */ INVALID, INVALID, INVALID, INVALID,
+/* [28] */ INVALID, INVALID, INVALID, INVALID,
+/* [2C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [30] */ INVALID, INVALID, INVALID, INVALID,
+/* [34] */ INVALID, INVALID, INVALID, INVALID,
+/* [38] */ INVALID, INVALID, INVALID, INVALID,
+/* [3C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [40] */ INVALID, INVALID, INVALID, INVALID,
+/* [44] */ INVALID, INVALID, INVALID, INVALID,
+/* [48] */ INVALID, INVALID, INVALID, INVALID,
+/* [4C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [50] */ INVALID, INVALID, INVALID, INVALID,
+/* [54] */ INVALID, INVALID, INVALID, INVALID,
+/* [58] */ INVALID, INVALID, INVALID, INVALID,
+/* [5C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [60] */ INVALID, INVALID, INVALID, INVALID,
+/* [64] */ INVALID, INVALID, INVALID, INVALID,
+/* [68] */ INVALID, INVALID, INVALID, INVALID,
+/* [6C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [70] */ INVALID, INVALID, INVALID, INVALID,
+/* [74] */ INVALID, INVALID, INVALID, INVALID,
+/* [78] */ INVALID, INVALID, INVALID, INVALID,
+/* [7C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [80] */ INVALID, INVALID, INVALID, INVALID,
+/* [84] */ INVALID, INVALID, INVALID, INVALID,
+/* [88] */ INVALID, INVALID, INVALID, INVALID,
+/* [0C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [90] */ INVALID, INVALID, INVALID, INVALID,
+/* [94] */ INVALID, INVALID, INVALID, INVALID,
+/* [98] */ INVALID, INVALID, INVALID, INVALID,
+/* [9C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [A0] */ INVALID, INVALID, INVALID, INVALID,
+/* [A4] */ INVALID, INVALID, INVALID, INVALID,
+/* [A8] */ INVALID, INVALID, INVALID, INVALID,
+/* [AC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [B0] */ INVALID, INVALID, INVALID, INVALID,
+/* [B4] */ INVALID, INVALID, INVALID, INVALID,
+/* [B8] */ INVALID, INVALID, INVALID, INVALID,
+/* [BC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [C0] */ INVALID, INVALID, INVALID, INVALID,
+/* [C4] */ INVALID, INVALID, INVALID, INVALID,
+/* [C8] */ INVALID, INVALID, INVALID, INVALID,
+/* [CC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [D0] */ INVALID, INVALID, INVALID, INVALID,
+/* [D4] */ INVALID, INVALID, INVALID, INVALID,
+/* [D8] */ INVALID, INVALID, INVALID, INVALID,
+/* [DC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [E0] */ INVALID, INVALID, INVALID, INVALID,
+/* [E4] */ INVALID, INVALID, INVALID, INVALID,
+/* [E8] */ INVALID, INVALID, INVALID, INVALID,
+/* [EC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [F0] */ INVALID, INVALID, INVALID, INVALID,
+/* [F4] */ INVALID, TNSZvr("pdep",VEX_RMrX,5),TNSZvr("mulx",VEX_RMrX,5),TNSZvr("shrx",VEX_VRMrX,5),
+/* [F8] */ INVALID, INVALID, INVALID, INVALID,
+/* [FC] */ INVALID, INVALID, INVALID, INVALID,
+};
+
+const instable_t dis_opAVXF30F38[256] = {
+/* [00] */ INVALID, INVALID, INVALID, INVALID,
+/* [04] */ INVALID, INVALID, INVALID, INVALID,
+/* [08] */ INVALID, INVALID, INVALID, INVALID,
+/* [0C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [10] */ INVALID, INVALID, INVALID, INVALID,
+/* [14] */ INVALID, INVALID, INVALID, INVALID,
+/* [18] */ INVALID, INVALID, INVALID, INVALID,
+/* [1C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [20] */ INVALID, INVALID, INVALID, INVALID,
+/* [24] */ INVALID, INVALID, INVALID, INVALID,
+/* [28] */ INVALID, INVALID, INVALID, INVALID,
+/* [2C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [30] */ INVALID, INVALID, INVALID, INVALID,
+/* [34] */ INVALID, INVALID, INVALID, INVALID,
+/* [38] */ INVALID, INVALID, INVALID, INVALID,
+/* [3C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [40] */ INVALID, INVALID, INVALID, INVALID,
+/* [44] */ INVALID, INVALID, INVALID, INVALID,
+/* [48] */ INVALID, INVALID, INVALID, INVALID,
+/* [4C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [50] */ INVALID, INVALID, INVALID, INVALID,
+/* [54] */ INVALID, INVALID, INVALID, INVALID,
+/* [58] */ INVALID, INVALID, INVALID, INVALID,
+/* [5C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [60] */ INVALID, INVALID, INVALID, INVALID,
+/* [64] */ INVALID, INVALID, INVALID, INVALID,
+/* [68] */ INVALID, INVALID, INVALID, INVALID,
+/* [6C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [70] */ INVALID, INVALID, INVALID, INVALID,
+/* [74] */ INVALID, INVALID, INVALID, INVALID,
+/* [78] */ INVALID, INVALID, INVALID, INVALID,
+/* [7C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [80] */ INVALID, INVALID, INVALID, INVALID,
+/* [84] */ INVALID, INVALID, INVALID, INVALID,
+/* [88] */ INVALID, INVALID, INVALID, INVALID,
+/* [0C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [90] */ INVALID, INVALID, INVALID, INVALID,
+/* [94] */ INVALID, INVALID, INVALID, INVALID,
+/* [98] */ INVALID, INVALID, INVALID, INVALID,
+/* [9C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [A0] */ INVALID, INVALID, INVALID, INVALID,
+/* [A4] */ INVALID, INVALID, INVALID, INVALID,
+/* [A8] */ INVALID, INVALID, INVALID, INVALID,
+/* [AC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [B0] */ INVALID, INVALID, INVALID, INVALID,
+/* [B4] */ INVALID, INVALID, INVALID, INVALID,
+/* [B8] */ INVALID, INVALID, INVALID, INVALID,
+/* [BC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [C0] */ INVALID, INVALID, INVALID, INVALID,
+/* [C4] */ INVALID, INVALID, INVALID, INVALID,
+/* [C8] */ INVALID, INVALID, INVALID, INVALID,
+/* [CC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [D0] */ INVALID, INVALID, INVALID, INVALID,
+/* [D4] */ INVALID, INVALID, INVALID, INVALID,
+/* [D8] */ INVALID, INVALID, INVALID, INVALID,
+/* [DC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [E0] */ INVALID, INVALID, INVALID, INVALID,
+/* [E4] */ INVALID, INVALID, INVALID, INVALID,
+/* [E8] */ INVALID, INVALID, INVALID, INVALID,
+/* [EC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [F0] */ INVALID, INVALID, INVALID, INVALID,
+/* [F4] */ INVALID, TNSZvr("pext",VEX_RMrX,5),INVALID, TNSZvr("sarx",VEX_VRMrX,5),
+/* [F8] */ INVALID, INVALID, INVALID, INVALID,
+/* [FC] */ INVALID, INVALID, INVALID, INVALID,
+};
+/*
+ * Decode table for SIMD instructions with the repz (0xf3) prefix.
+ */
+const instable_t dis_opSIMDrepz[256] = {
+/* [00] */ INVALID, INVALID, INVALID, INVALID,
+/* [04] */ INVALID, INVALID, INVALID, INVALID,
+/* [08] */ INVALID, INVALID, INVALID, INVALID,
+/* [0C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [10] */ TNSZ("movss",XMM,4), TNSZ("movss",XMMS,4), TNSZ("movsldup",XMM,16),INVALID,
+/* [14] */ INVALID, INVALID, TNSZ("movshdup",XMM,16),INVALID,
+/* [18] */ INVALID, INVALID, INVALID, INVALID,
+/* [1C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [20] */ INVALID, INVALID, INVALID, INVALID,
+/* [24] */ INVALID, INVALID, INVALID, INVALID,
+/* [28] */ INVALID, INVALID, TNSZ("cvtsi2ss",XMM3MX,4),TNSZ("movntss",XMMMS,4),
+/* [2C] */ TNSZ("cvttss2si",XMMXM3,4),TNSZ("cvtss2si",XMMXM3,4),INVALID, INVALID,
+
*** 1650 LINES SKIPPED ***
From nobody Tue May 9 14:03:03 2023
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 4QG0HD0HFDz4BDWn;
Tue, 9 May 2023 14:03:04 +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 4QG0HC6WPDz3NLh;
Tue, 9 May 2023 14:03:03 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683640984;
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=SRSxbDQ+YHjBVN9rv9mgWp8Y3qF3Lcj3+ESkXSlNLbA=;
b=lbEiwOQcrLuQbtSNT9nZxbzz6buhQM9XygY/xxTH5vE2+sTfyZ8GtHbu3wx5klP2SIGAlb
KvEAmqJ9Fe1JvtQjHWbFSS166uKWnPovYq61NAppgAbfmKTYUhrOqpeh9F0sPxb8QGJHdd
/xD/vSH70yPtzcVsPUurIWxffzFvu5izXQtT/zI4Ktcr0GlFpf5FyuWu0opZLvmQRJSv+O
pActzkpn9vUdFy7OWrl1TrSCd/ZpeBcwY9QFb53k41zT51oDyTr8pFT2jsZoOdmioL3RJ/
k4Hql9iK55ONwEap4To5H79jqhpMurEn5hG68OnD+zu3MgbLfP0hAhb8rWY1ow==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683640984;
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=SRSxbDQ+YHjBVN9rv9mgWp8Y3qF3Lcj3+ESkXSlNLbA=;
b=fmhrO0atwe+HKV0zGgKhkpf9Ht7EPxQuIBksEysEVk0hfsdA4FTLUVRoC+8xfbl1NyxE15
7vXp2ox/oxvMCxQx7FXJvWpxKzBtyM/9koE4dBS0oBioGKAQF43aKmGurSqfmoe0cLE+0A
uI8MpuCUcFdoFvgFyZ6rdSiWGfZBR76G2G3jucAHgM+oa2oVP34mvqS1l1RoEBDOT74M5n
6VZ5oa913RyBZ0b0TsHc6e5bW8GNaZEUJRTEu8L+NKve1lVAx1jyRFiXAoRjpc0QiFReFb
TMZ5GgfJDfxySCunIYVBUGuGj4XYyxO5pLtAj+4O6E3YlzJwXDlkACtb9nd0oA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683640984; a=rsa-sha256; cv=none;
b=YFRvH4IkecPtyh0W/V5vphzm3IPnaMB7Zaij53mJ9kI5Llt+5KVFqASr1FNg3diFFrKqY1
IituB4qLhm9I6696P6uAWsWhWTOJAY54GVIw6VI6iz35b+oWtfKvDJ8aZ3BA35mDXPfjUX
0QmiC2PsgotzXfPVkDfobg5PfDO+8IVzdtH26fboSLkIFXq6d/Wor/4JxCRzCURsrinU91
T0hQZFzakgjEuzk33iHWky8imlm5ENQswuUcaZg3xbMsPmY7rIevm9cwhmop5pTKwwXI8E
c4lhvWgXjifF0cN7j3HCdGsTQBMfZhEK9cpAqFUh4TBdeCu1d0yOFastrmtqyw==
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 4QG0HC5bCkzWQ3;
Tue, 9 May 2023 14:03:03 +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 349E33gB082940;
Tue, 9 May 2023 14:03:03 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349E33Lb082939;
Tue, 9 May 2023 14:03:03 GMT
(envelope-from git)
Date: Tue, 9 May 2023 14:03:03 GMT
Message-Id: <202305091403.349E33Lb082939@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 352a06f049e0 - stable/13 - vmrun.sh: mention new edk2 package
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 352a06f049e05bc2b57e54216f00d2396f7048a2
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=352a06f049e05bc2b57e54216f00d2396f7048a2
commit 352a06f049e05bc2b57e54216f00d2396f7048a2
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2023-05-02 19:19:08 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-09 14:01:23 +0000
vmrun.sh: mention new edk2 package
uefi-edk2-bhyve no longer exists.
Reviewed by: markj
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D39937
(cherry picked from commit 0ebc92bf3db1685fbcd023e42b683f4b10464095)
---
share/examples/bhyve/vmrun.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh
index 1ef310b07e92..3ab16b58afb4 100755
--- a/share/examples/bhyve/vmrun.sh
+++ b/share/examples/bhyve/vmrun.sh
@@ -249,7 +249,7 @@ fi
if [ ${efi_mode} -gt 0 ]; then
if [ ! -f ${efi_firmware} ]; then
echo "Error: EFI Firmware ${efi_firmware} doesn't exist." \
- "Try: pkg install uefi-edk2-bhyve"
+ "Try: pkg install edk2-bhyve"
exit 1
fi
fi
From nobody Tue May 9 17:09:25 2023
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 4QG4QG2fRGz49Cgk;
Tue, 9 May 2023 17:09:26 +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 4QG4QG0yhbz466p;
Tue, 9 May 2023 17:09:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683652166;
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=dXrQK78aqEn5nrQgzcwDomk0Hkdpd4cDMnnEtHQKFaI=;
b=QwGsYug+FHd+YCG+eRE1IsInAOS6wXKVHqvjimX2NA7GSPr7xRTLdsRBueH6rS6NqKcI0r
wIFneJ0I2J2MH7XqrLsSreSG/ESSo86FLQEy6HUusgNKddlpkPiqLL5UF1XAl5UPiNr8zj
4fOXJ90a6y/Th3rCSMZUOrKJcuZG7CqTXSqfwkC3eR5JJISYFiRt1ELkDXhP/8ctr/sd6P
6lqv4APR9ZndpVMQiRmsOkLowVzo7q7Jfdz1uYBnNGetqC/sIb4zS86Q7atJZRn/fWK2FF
+T3YY57vJPTJTkqP1CE4sTskvOMnJrzcwQ3fl6RXJY7qDMihG4pdDS3wSfMeNw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683652166;
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=dXrQK78aqEn5nrQgzcwDomk0Hkdpd4cDMnnEtHQKFaI=;
b=BT1LrKuAgL/GZDEqGeMdSESiBIfwP3L1HoXPGVBCDFTqUSUM/T3aBKPIlo4wlNwXnQHpb3
cCLj0Hehr9Jd1D3uP/8vRsgi9WbetZd97COXtYgTUs2zQkoQQgRbylOYLt7OSUQBsoO/LR
abMT3RdORpQXAmV7lGtRt7nrGUsgqnAICc7W27SyBt+vicV13swW5DqPEEIKZ+FTV6Y2RA
0L1pmpKLn03gMUep/Dv+dW8rBf5eoT4GwzTY2y545HtBRJKTFUMyX6oZK+Z5+dpb1ZiArz
NK0PnRLZBIXsC0yNKs3wpsRPZcrcFvIP465kzqPTCwDLLYZ/TQ0QjuuWKBm+Qw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683652166; a=rsa-sha256; cv=none;
b=Afyrhd8H0SmJYkZy/+sPQFMgrLEelSmhK338ss1d9+Y25AhhceUZk0mrvC0/QlK97btvQo
sXy5F8KYLQlVElAvAqyveaNIUIa6UI0z+umi0Iq3yqhyq0QTB6QYvCShqLhgEvIOfVs5kq
HmP6Iio+/uCLrHfo0dG8nJlfSKTNvR/q3s2ijP7FMgBQvydt6/c52C6lLyliwipVLOGBiK
8t6YaGGeowlEH5jvcqZRWBoWWZIWcqxINQVi7+Rh2EmiVW+vxXPK2X6+YURV3M2BoxS+Y8
5JbCkCnj+kEy/IIJ2VCGTMtMhQFEZRAJc9qophKk3SPFjlJKFwUgyFMh4DRq2w==
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 4QG4QG03F1zc9m;
Tue, 9 May 2023 17:09:26 +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 349H9PvI080668;
Tue, 9 May 2023 17:09:25 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349H9PMM080667;
Tue, 9 May 2023 17:09:25 GMT
(envelope-from git)
Date: Tue, 9 May 2023 17:09:25 GMT
Message-Id: <202305091709.349H9PMM080667@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 26ad093fb017 - stable/13 - Cirrus-CI: Switch to llvm14 toolchain package
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: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 26ad093fb0178633eea7833bd5df03270c95c69e
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=26ad093fb0178633eea7833bd5df03270c95c69e
commit 26ad093fb0178633eea7833bd5df03270c95c69e
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-05-24 20:12:48 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-05-09 17:08:28 +0000
Cirrus-CI: Switch to llvm14 toolchain package
Follow base system update to LLVM 14
Sponsored by: The FreeBSD Foundation
(cherry picked from commit daed785d6fe0a6cfdbfab92af9ee9afd7451c7aa)
---
.cirrus.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index 81f049d7db46..fff58cbba262 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -20,13 +20,13 @@ task:
env:
TARGET: amd64
TARGET_ARCH: amd64
- TOOLCHAIN_PKG: llvm13
+ TOOLCHAIN_PKG: llvm14
- name: World and kernel arm64 build and boot smoke test
trigger_type: manual
env:
TARGET: arm64
TARGET_ARCH: aarch64
- TOOLCHAIN_PKG: llvm13
+ TOOLCHAIN_PKG: llvm14
- name: World and kernel gcc9 amd64 build and boot smoke test
trigger_type: manual
env:
From nobody Tue May 9 17:09:27 2023
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 4QG4QH2Lc6z49CVw;
Tue, 9 May 2023 17:09:27 +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 4QG4QH1t2Vz46Sq;
Tue, 9 May 2023 17:09:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683652167;
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=rByGCZdWgus+fvf3zhyY/5NEWbzEKAIKYKXnYZtO9NY=;
b=P4NnM6D1O1kp6Z7XMrDIM3KfkxIIMsfM5wTsryQgLacFDbBf3EUN+uuYLTujoP9YH+70AM
Tc39pb/uL7YTMfwB9rTD5YD6onp6IZ+aGg7a/ny9XIqV4NGrXh2dui3onoenhfg8wI03P4
RSh2ghWZNar7qeuxl3fpiK3MnD5XqkCnWPxXf7f2lNHnqxs8uxCie2TmU+kOl9EFMuHRbY
OyomzVEsOa4aq3qq5o6RRQ1MCPccthFZGVDXgbpP85b+/1yjdEisSWNPLmE5Sk3zIOmdit
tcsYrYPOknqB+8ZWAjTASYpKg7r04RgGZc6mZxztEePEIBRR27qqI1YsQf/wzQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683652167;
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=rByGCZdWgus+fvf3zhyY/5NEWbzEKAIKYKXnYZtO9NY=;
b=JNDh5EqryC/Rzf/LsvvgoTyYBiDhI8Sxbcs4I3qKC5PaB4Bvnp/BWr2k1LD4Zetd7lWiaC
gwlJVcNhEWNWU8XXx4BIWfBAad64rF/oCyt/1eQJxtBMBtVJBf1OkayLw4VJL0GQubOGjZ
QmobwMD9gIkTLr1lfMGnGq9WY9LzI3CY0GpaWMMW8GwoPBZOxAk87yOi/3rE2pWDKHxoT7
GCS1mOMGUoC0f4qNLBqrQm6KPJZ8DnOCCq6qLkCJyJUEPWUB9QbZHDupojOc2ryYM8lyzk
V8g128wvMVr1kLZabKCUnieZhmLcbCOZITk9g1SPgAqOMsE69Ug11VsoEN+fPQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683652167; a=rsa-sha256; cv=none;
b=gfh/q5C+yHsqMqeHSzMgJmQMNtJjhbEfohqDFejJwxlul16oG04bPVH9W89rdB7TdoY+2t
kwT+Iufo4YqGrl2PumHi2RRxrt6+v/BOULUrXFrn1VmvF99P7L5T3MXWAZJJ7kV7LHO1e7
DYEyybCriyLZY6Kaxp8rBMRpN6IAwkLHuHUOD+avI2sx2IPDC9E+K/FMowePVytJEXZNpe
FPaMm6frp60b1kujbI4yjEtXIS2ImZzHw5bR5QzWnGSgP2xr20Bgag7pJ5/QaxtxZ6rPHe
Uq1ijMX6Oe2ZeWfbMXZ0EJf1ABhm0pkOIIxQ1obKtTK/Kj1LRqTbjUiij9RQRQ==
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 4QG4QH0q3Lzc9n;
Tue, 9 May 2023 17:09:27 +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 349H9Ru2080687;
Tue, 9 May 2023 17:09:27 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349H9RKO080686;
Tue, 9 May 2023 17:09:27 GMT
(envelope-from git)
Date: Tue, 9 May 2023 17:09:27 GMT
Message-Id: <202305091709.349H9RKO080686@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 7f98e64ba708 - stable/13 - Cirrus-CI: switch GCC job to GCC 12
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: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 7f98e64ba7081dc16cf4cb359b83dbce437159ed
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=7f98e64ba7081dc16cf4cb359b83dbce437159ed
commit 7f98e64ba7081dc16cf4cb359b83dbce437159ed
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-01-27 17:15:01 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-05-09 17:08:28 +0000
Cirrus-CI: switch GCC job to GCC 12
We need a C++20 or later compiler.
Sponsored by: The FreeBSD Foundation
(cherry picked from commit e7f9bdb4a6fb976770c0d2bbe31d34e964dc167f)
---
.cirrus.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index fff58cbba262..80eb8564add8 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -27,12 +27,12 @@ task:
TARGET: arm64
TARGET_ARCH: aarch64
TOOLCHAIN_PKG: llvm14
- - name: World and kernel gcc9 amd64 build and boot smoke test
+ - name: World and kernel gcc12 amd64 build and boot smoke test
trigger_type: manual
env:
TARGET: amd64
TARGET_ARCH: amd64
- TOOLCHAIN_PKG: amd64-gcc9
+ TOOLCHAIN_PKG: amd64-gcc12
timeout_in: 120m
install_script:
- sh .cirrus-ci/pkg-install.sh qemu-nox11 ${TOOLCHAIN_PKG}
From nobody Tue May 9 17:09:28 2023
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 4QG4QJ334Zz49Cgw;
Tue, 9 May 2023 17:09:28 +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 4QG4QJ2bFrz46J8;
Tue, 9 May 2023 17:09:28 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683652168;
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=4TtSVClqLsQDkwZ2QriCp5WtNX+tHnhUCRAM9m6Qh3I=;
b=QjKzNeS+1ltrLhMpg5cxFMjX6FCV0TFSBX7m787oxkfHdYc9kpYBju7UMuPrT+voHLKctH
pJu2D/MO0Lrp4BY1CgpleYRipRu+q7oTy5XpGxC0DQFDcmr1aEjBOEZFJ+swMgxexLzgJB
iBUfoy44tqYLNwkiA15XzywleDCjomtVGNK35eEEaCh/jt1pJudUDWERaCF+8DGc/wS9XO
Zvg4HfsyCf7O1tja5wWZJ/ULy42o8Dev9dBkqSKJoXdXEs+D9KtoMUFtOXtj9M/6dbgBbF
6A7yw1ncpAS10dN2do9alc2FFskgqCjcgIlnqbJ9OdVkm1C8g20y9/yNyJtJCQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683652168;
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=4TtSVClqLsQDkwZ2QriCp5WtNX+tHnhUCRAM9m6Qh3I=;
b=FqxGDzhJniLuyw/8aG5fSr1+ZkYwNbdfGRvz7PIEv1A5Jbn8Q5g9p6mYBdf5i0etaGoj/N
XCDYJ9G2SyxcPFKhyDv//n2R18e8hmvKsRbaN5SA4+SO8JxijmleiCIwYeuPGAICtJIAjf
QRQLBAK2jEzC4aT4i83M7PA63q7EdDaMqkSKFBEG5gqogaqwNsM3YHEdSTkspQMKgQKx1S
LUTt0Go/dm5Nf3w5J3in62QUDzIySruhNSHB/5r7y1F5LZaj+9FOJ/5xjFAJpIiptsxcms
eAtyPIdRnI18dlW8H442fhvKtGKDBqrGYPSzWbD8Nq+2FoReI+Gf4VmVZWwVpw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683652168; a=rsa-sha256; cv=none;
b=bco5gG4JVxC28ekZaeLeosABUx+Q5Bo9i8N6i+Hw6loj0aTl6J2AcTIvaOHh/fBthvjXlR
V8kw7zmd+Uuz+tcpels87VmvQMSw3fkZ+5pJrgbuOl08p8BvCGgw7xoESmhnIXFwkAieKD
UzqNKHTtJEA86GOZ3y8o8TSU0DZukWecgV/hBMLquBK46m0LFsBLfeidWHYC/Qpj64HqWq
CDlQEiqxIZegeyW9OkRI6f9KXa82C7odPlJn9x7br20gdM3ML4J9jhXf/tNyDNtgxL/4JW
ScodE/itRlgMUPcGDzlD/UnIionPeEKY/WcbDP7HvJvLnf3RZf0ent9luKekKQ==
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 4QG4QJ1hTPzbjd;
Tue, 9 May 2023 17:09:28 +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 349H9Stf080706;
Tue, 9 May 2023 17:09:28 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349H9SJF080705;
Tue, 9 May 2023 17:09:28 GMT
(envelope-from git)
Date: Tue, 9 May 2023 17:09:28 GMT
Message-Id: <202305091709.349H9SJF080705@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: e118e3c41bdc - stable/13 - Cirrus-CI: use llvm15 toolchain packages
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: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: e118e3c41bdc5111b06225064433e34d7a0a205e
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=e118e3c41bdc5111b06225064433e34d7a0a205e
commit e118e3c41bdc5111b06225064433e34d7a0a205e
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-02-13 14:28:35 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-05-09 17:08:46 +0000
Cirrus-CI: use llvm15 toolchain packages
As of commit 50d7464c3fe6 we use llvm15 as the system toolchain, and
commit eca005d8531f added compiler options incompatible with earlier
versions. Switch to llvm15 packages.
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 67fca20eb2cea55fb2eaacc22807ee4741894796)
---
.cirrus.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index 80eb8564add8..57ff4a3b271f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -20,13 +20,13 @@ task:
env:
TARGET: amd64
TARGET_ARCH: amd64
- TOOLCHAIN_PKG: llvm14
+ TOOLCHAIN_PKG: llvm15
- name: World and kernel arm64 build and boot smoke test
trigger_type: manual
env:
TARGET: arm64
TARGET_ARCH: aarch64
- TOOLCHAIN_PKG: llvm14
+ TOOLCHAIN_PKG: llvm15
- name: World and kernel gcc12 amd64 build and boot smoke test
trigger_type: manual
env:
From nobody Tue May 9 17:34:04 2023
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 4QG4yh4jYcz49FFZ;
Tue, 9 May 2023 17:34:04 +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 4QG4yh24MTz4Ctg;
Tue, 9 May 2023 17:34:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683653644;
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=KpZGEzGFjBlq5wf/srFGW+xVgHEwHptzGjIpj+Hmvww=;
b=tlY+hQFITkqjnYDBxcW4fyxhQXGbhqbScUQvkAmWofiSFJDq/iSiDGRV3w2CHtpP+5HVr+
cOMiZ5Z5h1U8AmplfQXYTM4UT1r8MUIxKXkcYm0FrEXG5WsKZ/Hkfr0Jp7B+wrjACwfpcL
7CLX+UYzW4VjqDJWk1dtc6FerMicWgnXaZBR9rNYkhH0/KML+Jh0o4lCdOMoSNQwt7XxFZ
0lqTdRSZx3G6KjzzWZufogDPwrxx8YKfk/X/G1htcLIGJCgW/shJSgySUt7b2dOz0RGVq7
7AGvElrCG6Pe+ePs/vT9yb1Mf7AAJxN3Wh0dOlYQNMoO9BW0Ar937s4Rgp6tNg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683653644;
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=KpZGEzGFjBlq5wf/srFGW+xVgHEwHptzGjIpj+Hmvww=;
b=dSNQpvonCJPVi9t8YW4iuQkn5c9AeBNCQa3phkmvwUhtvVfbExBdIoTrVF6W0Wi28QlMcX
VMAxrVINOkmFbMgysXrrNea32uQ2bpPIUAK8oHEDt2anPQv0PAN+14+Epdde/ut65aSRUn
YM2g3lT6DxNsSlUQL7HqhSt80ABOVnTHi0LyvgkTMbe9reQcVUcc/cYVMTHy/pHT9RKz/9
8t9dLIPCmSH3TrhWwMQLv/jYsMwFILwliyovem8lh08O8Jl9B77ajQEu6LvFkwTZMfDwhf
a5IMh5uC5CRUGueIYjuN7AI0/atZqREYyyl7r/jQQzMQEPG0HAO/dYDg6eqSfA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683653644; a=rsa-sha256; cv=none;
b=gUCEUAGP/m59mdQwgKQOt9tm0GamAh8ESXn0ONc+vS6fGLkJjiHP9dGb2KArfB6I8kvfwl
1m53zh3Dv0ycV6je6VpDVnUo3W3hXZoGjyiiteVd+ytqO15cvohsLh9XXSBrivLObQ5l+q
UaPUouJY4Dhg5VX9cRBic7ZxD+FfPkb02Hfwp79zFhCC+Dbs7BbnZBawywElRwjq7IsPs4
tdF17bXLxCFM3pNqPHh2a0dJCfcARfXHxKemI9GV7EIgkJYrNykFOpycB03oLgXpguf4/R
esw1EGNTidhZK768l0CZKyJzw8j9bWuK9ePg0yo8NsWFDtCUhxZd6yugHjVq0w==
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 4QG4yh17z7zcql;
Tue, 9 May 2023 17:34:04 +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 349HY4TU028970;
Tue, 9 May 2023 17:34:04 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349HY4bJ028969;
Tue, 9 May 2023 17:34:04 GMT
(envelope-from git)
Date: Tue, 9 May 2023 17:34:04 GMT
Message-Id: <202305091734.349HY4bJ028969@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kyle Evans <kevans@FreeBSD.org>
Subject: git: 780466256114 - stable/13 - Revert "uart(4): add Sunrise Point UART controllers"
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: kevans
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 780466256114fccaed8ae2547675c74d5f82d99c
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kevans:
URL: https://cgit.FreeBSD.org/src/commit/?id=780466256114fccaed8ae2547675c74d5f82d99c
commit 780466256114fccaed8ae2547675c74d5f82d99c
Author: Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2023-05-09 06:38:32 +0000
Commit: Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2023-05-09 17:33:45 +0000
Revert "uart(4): add Sunrise Point UART controllers"
This reverts commit d1b6271118188dd25a18f2372ab1d3004335ea3c.
I've received multiple reports of machines failing to boot with
this hardware; back it out for now until we can fix it.
PR: 271147
(cherry picked from commit 20d8d9809a8c0a3ddd1d0156e77ec53a1ed95747)
---
sys/dev/uart/uart_bus_pci.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c
index eaf4fde27236..cf7fbb99b3d5 100644
--- a/sys/dev/uart/uart_bus_pci.c
+++ b/sys/dev/uart/uart_bus_pci.c
@@ -178,8 +178,6 @@ static const struct pci_id pci_ns8250_ids[] = {
{ 0x8086, 0x8d3d, 0xffff, 0,
"Intel Corporation C610/X99 series chipset KT Controller", 0x10 },
{ 0x8086, 0x9c3d, 0xffff, 0, "Intel Lynx Point-LP HECI KT", 0x10 },
-{ 0x8086, 0x9d27, 0xffff, 0, "Intel Sunrise Point Controller 0", 0x10, 0, 2 },
-{ 0x8086, 0x9d66, 0xffff, 0, "Intel Sunrise Point Controller 2", 0x10, 0, 2 },
{ 0x8086, 0xa13d, 0xffff, 0,
"100 Series/C230 Series Chipset Family KT Redirection", 0x10 },
{ 0x9710, 0x9820, 0x1000, 1, "NetMos NM9820 Serial Port", 0x10 },
From nobody Tue May 9 20:39:42 2023
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 4QG94v2KZyz49TLk;
Tue, 9 May 2023 20:39:43 +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 4QG94v1Xq6z3Gjf;
Tue, 9 May 2023 20:39:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683664783;
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=baDicdsrLWBdFjmh6ZHiABkwt+wsGWMxhR5b5Gl/3pc=;
b=sLGeGCUqgkl1wiYZ3i9iocjJaAcGBAxCP6O86mK1QjDR/RQ2L4ch4VVW46R+XKiOgODieF
hsKrzYllbrG/ED2Uw8i/aFGgWTvFWBlirtwYqKmirt7IwIVoMd6AMH4AQl6MUu7+cucm5J
Ix39Xck2v7OYrPG6HCggjoSLeX+RmCaP1ZElh/eAgMUjK3yPMAzMXw8zIZrMAuTmQRZHtI
/5g6NwwFadqfbdLbqmP+W8/iZgVyRg/8clg1v3BHF4/caXrBDsNJdJoQU6EaD+hMveeNvt
648pvs5OIkLxe2HiXMzES5XuTZ7N/k/OLQzkZkXJjp5o2DMvcY9jBnHrAOwlHg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683664783;
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=baDicdsrLWBdFjmh6ZHiABkwt+wsGWMxhR5b5Gl/3pc=;
b=ARIY7LQY+8nXOj2epP8MfCk58EpLqI20twITQHRM0wnXLtUENkoijsZdHGp6AVNQxmgH6w
7Pl3iyHXJWaZZNtKIXZEVxqLXe1AGGQOvIGrAai+wX2lGcislbFjdIz699HCWJu6f05rat
O7ZBjutuyC/h9ni/qijioK6O2j6sdSfuiCCPlvzWt4XU8mXLTG27TLTb4x7DQn1+xrK/ot
qlS95PLF3rM02OTxIv9lwURIqgt1EVoFJ30zVcft4SJ+Frnf8kTdRCpoPWa7LRj+HUnWpH
HzY3RYqgg0l82RiY/4fYBXFURqFYL37H7a89MgEOatVe7Vs34QiKaEkvecDW2Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683664783; a=rsa-sha256; cv=none;
b=AUb02qjjv/rXxbp8V1OCH5Zuo6mMgbREc8p5DWOQV4TlDq6LgUHs3USPnxzORkbr6NLNvO
SsvPVj+UsixLQvuCL0zdZOXlXY9gAEMf6IQYDJ3rY3wQn7th9TDeAm5ombXdAJ4oe/zhw+
csswKsfjyA7KPZagOj690H9/Dos5Tu+XUojckO2LhgHDw2d+EIPGHMr2D3O8OWnF9JhsKQ
iqm1Td5FzxK7cfGUwUkg+ANdLP/PMmdYqpKAZ1Gj/Yd2uPE8nuoYHZrgvigvNdWkeXQ32h
YET57wgIyGD84ikISv0HfgQEOo8KhOMeHNuFwsrAuK/8qPU6I3q/lXdQbYEu2w==
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 4QG94v0XNHzhh2;
Tue, 9 May 2023 20:39:43 +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 349Kdgji025735;
Tue, 9 May 2023 20:39:42 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349Kdgi2025734;
Tue, 9 May 2023 20:39:42 GMT
(envelope-from git)
Date: Tue, 9 May 2023 20:39:42 GMT
Message-Id: <202305092039.349Kdgi2025734@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Vincenzo Maffione <vmaffione@FreeBSD.org>
Subject: git: b4e9bfd51c2d - stable/13 - netmap: pkt-gen: sync with upstream
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: vmaffione
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: b4e9bfd51c2d6f66291c89c3e8f4c5809f1be447
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by vmaffione:
URL: https://cgit.FreeBSD.org/src/commit/?id=b4e9bfd51c2d6f66291c89c3e8f4c5809f1be447
commit b4e9bfd51c2d6f66291c89c3e8f4c5809f1be447
Author: Vincenzo Maffione <vmaffione@FreeBSD.org>
AuthorDate: 2023-04-26 20:32:24 +0000
Commit: Vincenzo Maffione <vmaffione@FreeBSD.org>
CommitDate: 2023-05-09 20:39:36 +0000
netmap: pkt-gen: sync with upstream
Keep in sync with the recent upstream changes:
Fix compilation on 32-bit architectures
Update IP length, UDP length/checksum when size changes
Man page fixes
Submitted by: jlduran@gmail.com
MFC after: 7 days
Differential Revision: https://reviews.freebsd.org/D39760
(cherry picked from commit 8c3b8c838674239538682b914bc1d7059255f116)
---
tools/tools/netmap/pkt-gen.8 | 7 ++--
tools/tools/netmap/pkt-gen.c | 86 ++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 88 insertions(+), 5 deletions(-)
diff --git a/tools/tools/netmap/pkt-gen.8 b/tools/tools/netmap/pkt-gen.8
index c3f0330e46ba..2a80f160bb9d 100644
--- a/tools/tools/netmap/pkt-gen.8
+++ b/tools/tools/netmap/pkt-gen.8
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 21, 2020
+.Dd April 21, 2023
.Dt PKT-GEN 8
.Os
.Sh NAME
@@ -150,7 +150,7 @@ mode), a single RX ring (in
mode), or a TX/RX ring pair.
The number of
.Ar threads
-must be less than or equal to the number of TX (or RX) ring available
+must be less than or equal to the number of TX (or RX) rings available
in the device specified by
.Ar interface .
.It Fl T Ar report_ms
@@ -288,7 +288,8 @@ length of 128 bytes.
You must set the destination MAC address for
packets to be received by the target host.
.Bd -literal -offset indent
-pkt-gen -i netmap:ncxl0 -f tx -s 172.16.0.1:53 -d 172.16.1.3:53 -D 00:07:43:29:2a:e0
+pkt-gen -i netmap:ncxl0 -f tx -s 172.16.0.1:53 -d 172.16.1.3:53 \e
+-D 00:07:43:29:2a:e0
.Ed
.Sh SEE ALSO
.Xr netmap 4 ,
diff --git a/tools/tools/netmap/pkt-gen.c b/tools/tools/netmap/pkt-gen.c
index 296208018fd4..621e3e215118 100644
--- a/tools/tools/netmap/pkt-gen.c
+++ b/tools/tools/netmap/pkt-gen.c
@@ -283,6 +283,7 @@ struct glob_arg {
#define OPT_RANDOM_SRC 512
#define OPT_RANDOM_DST 1024
#define OPT_PPS_STATS 2048
+#define OPT_UPDATE_CSUM 4096
int dev_type;
#ifndef NO_PCAP
pcap_t *p;
@@ -1005,6 +1006,85 @@ update_addresses(struct pkt *pkt, struct targ *t)
else
update_ip6(pkt, t);
}
+
+static void
+update_ip_size(struct pkt *pkt, int size)
+{
+ struct ip ip;
+ struct udphdr udp;
+ uint16_t oiplen, niplen;
+ uint16_t nudplen;
+ uint16_t ip_sum = 0;
+
+ memcpy(&ip, &pkt->ipv4.ip, sizeof(ip));
+ memcpy(&udp, &pkt->ipv4.udp, sizeof(udp));
+
+ oiplen = ntohs(ip.ip_len);
+ niplen = size - sizeof(struct ether_header);
+ ip.ip_len = htons(niplen);
+ nudplen = niplen - sizeof(struct ip);
+ udp.uh_ulen = htons(nudplen);
+ ip_sum = new_udp_sum(ip_sum, oiplen, niplen);
+
+ /* update checksums */
+ if (ip_sum != 0)
+ ip.ip_sum = ~cksum_add(~ip.ip_sum, htons(ip_sum));
+
+ udp.uh_sum = 0;
+ /* Magic: taken from sbin/dhclient/packet.c */
+ udp.uh_sum = wrapsum(
+ checksum(&udp, sizeof(udp), /* udp header */
+ checksum(pkt->ipv4.body, /* udp payload */
+ nudplen - sizeof(udp),
+ checksum(&ip.ip_src, /* pseudo header */
+ 2 * sizeof(ip.ip_src),
+ IPPROTO_UDP + (u_int32_t)ntohs(udp.uh_ulen)))));
+
+ memcpy(&pkt->ipv4.ip, &ip, sizeof(ip));
+ memcpy(&pkt->ipv4.udp, &udp, sizeof(udp));
+}
+
+static void
+update_ip6_size(struct pkt *pkt, int size)
+{
+ struct ip6_hdr ip6;
+ struct udphdr udp;
+ uint16_t niplen, nudplen;
+ uint32_t csum;
+
+ memcpy(&ip6, &pkt->ipv6.ip, sizeof(ip6));
+ memcpy(&udp, &pkt->ipv6.udp, sizeof(udp));
+
+ nudplen = niplen = size - sizeof(struct ether_header) - sizeof(ip6);
+ ip6.ip6_plen = htons(niplen);
+ udp.uh_ulen = htons(nudplen);
+
+ /* Save part of pseudo header checksum into csum */
+ udp.uh_sum = 0;
+ csum = IPPROTO_UDP << 24;
+ csum = checksum(&csum, sizeof(csum), nudplen);
+ udp.uh_sum = wrapsum(
+ checksum(&udp, sizeof(udp), /* udp header */
+ checksum(pkt->ipv6.body, /* udp payload */
+ nudplen - sizeof(udp),
+ checksum(&pkt->ipv6.ip.ip6_src, /* pseudo header */
+ 2 * sizeof(pkt->ipv6.ip.ip6_src), csum))));
+
+ memcpy(&pkt->ipv6.ip, &ip6, sizeof(ip6));
+ memcpy(&pkt->ipv6.udp, &udp, sizeof(udp));
+}
+
+static void
+update_size(struct pkt *pkt, struct targ *t, int size)
+{
+ if (t->g->options & OPT_UPDATE_CSUM) {
+ if (t->g->af == AF_INET)
+ update_ip_size(pkt, size);
+ else
+ update_ip6_size(pkt, size);
+ }
+}
+
/*
* initialize one packet and prepare for the next one.
* The copy could be done better instead of repeating it each time.
@@ -1744,6 +1824,7 @@ sender_body(void *data)
size = nrand48(targ->seed) %
(targ->g->pkt_size - targ->g->pkt_min_size) +
targ->g->pkt_min_size;
+ update_size(pkt, targ, size);
}
m = send_packets(txring, pkt, frame, size, targ,
limit, options);
@@ -2528,6 +2609,7 @@ usage(int errcode)
" OPT_RANDOM_SRC 512\n"
" OPT_RANDOM_DST 1024\n"
" OPT_PPS_STATS 2048\n"
+" OPT_UPDATE_CSUM 4096\n"
"",
cmd);
exit(errcode);
@@ -3284,8 +3366,8 @@ out:
g.tx_period.tv_nsec = g.tx_period.tv_nsec % 1000000000;
}
if (g.td_type == TD_TYPE_SENDER)
- D("Sending %d packets every %ld.%09ld s",
- g.burst, g.tx_period.tv_sec, g.tx_period.tv_nsec);
+ D("Sending %d packets every %jd.%09ld s",
+ g.burst, (intmax_t)g.tx_period.tv_sec, g.tx_period.tv_nsec);
/* Install ^C handler. */
global_nthreads = g.nthreads;
sigemptyset(&ss);
From nobody Thu May 11 04:12:29 2023
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 4QGz4s3DTDz49cb1;
Thu, 11 May 2023 04:12:29 +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 4QGz4s2ksvz49pW;
Thu, 11 May 2023 04:12:29 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683778349;
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=JgPmET4eY3yO4OjRtRZR4joW+Xx7Oh08NTliq7GlA5g=;
b=qyxj6aTzOdvBM92DZMXCKOGO2nZ5jttO5YDj8878SVQuaFDNvGPke1ILqncjs5jhimfmt4
l7ulrQYq2u3mKV9AgFxifr2Us4cD0x1VYG2j2d/6SKAcyqKJa+1oX6vWLaiZ45+qhPkP0B
FewvqTz6vg99hN4+h6ZFn0XDWX9MEJG+XfeqxQg6691SNJDqMGUfNj176A0A549cyE4btG
IOFjx1hDEJth7zVVH60cPP4OK9255BPPf5T3q3vikS9uOK2U0l14IVEeDH848uqFJq07IH
l5jY67VNV3sVye7qHTmhMj5XMlx4wUvxH9tf7koCUQGM8r3ISswBJC+IjxdShQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683778349;
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=JgPmET4eY3yO4OjRtRZR4joW+Xx7Oh08NTliq7GlA5g=;
b=x/y8OCJqkPAqPYl615BI8P9BJ/BjZ2NYv0IjtUftt29NPxvilhlgiIW9i4EO4BHxUgHcOj
eZ3xqSQLhM03WMlXM7JOpnk6akHESdshpPYSeg0utJstn2F0nrIg5w6HufmUjwbRt0Gem4
inTA/drVZeldWDHxw1Fn6CVECq8MpWLseIKRx5UubnfSjqsr7PAK+et3DOt/gFRy52CTw+
gBMLe/zJbz/PS/p4MLoeq4yesjgPl7e7Du7s2EPuPbrYcz5XKzrJlYXJVKKMo7SrkH1D+4
DP1G9EqfAeORcLWzyNtShY5dl7+Ee7Y7cV857Qd5+v0O++b/u9fHgwNaUNskRw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683778349; a=rsa-sha256; cv=none;
b=qXBn+/JF8Xk+p62j3A4pYIhAILD1Au3myIzNT6w58+wE59Cxvddz3iRsI1hCY1grgimMZQ
WgIqfm7D8e8RszLUOsgWUCJrCXHMFPSCbhO7BSob0h4lVpI32who1Q5TrcmROHvch7dDAo
2wdZN6BttcYx2Ao1qGM8qwa3cUY2wexY9xRyMkN3WGQD0C9fkOigpQ1Ae/LBm227MeIvdC
NcsmlriPbWiVRyIdaGS6kjOVPZ3Z+p1xKFmdEaCA5qfQLKVQBwnzI9uei9INk3r7x7EfZO
BXek8M+w9AC4oZrFbThD5StgHXV6THMPLwzuL30ObPDd2n7VvUj5NMEXEaZPtA==
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 4QGz4s1pPyzdWf;
Thu, 11 May 2023 04:12:29 +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 34B4CTka052763;
Thu, 11 May 2023 04:12:29 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34B4CTRT052762;
Thu, 11 May 2023 04:12:29 GMT
(envelope-from git)
Date: Thu, 11 May 2023 04:12:29 GMT
Message-Id: <202305110412.34B4CTRT052762@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 6bb56ad277f5 - stable/13 - twe: Add deprecation notice
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: imp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 6bb56ad277f57bf19ba8dd11a775c9ac57a747b3
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=6bb56ad277f57bf19ba8dd11a775c9ac57a747b3
commit 6bb56ad277f57bf19ba8dd11a775c9ac57a747b3
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-05-11 04:09:10 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-05-11 04:11:28 +0000
twe: Add deprecation notice
This was flagged for removal in 14 over a year ago. Add deprecation to
man page.
MFC After: 3 days
(cherry picked from commit f710a4de92c142fddde636e3610d525bc237ff6d)
---
share/man/man4/twe.4 | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/share/man/man4/twe.4 b/share/man/man4/twe.4
index 9f2eadfb2662..520e4b0a20af 100644
--- a/share/man/man4/twe.4
+++ b/share/man/man4/twe.4
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 15, 2004
+.Dd May 7, 2023
.Dt TWE 4
.Os
.Sh NAME
@@ -45,6 +45,11 @@ module at boot time, place the following line in
.Bd -literal -offset indent
twe_load="YES"
.Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 14.0 .
.Sh DESCRIPTION
The
.Nm
From nobody Thu May 11 13:32:57 2023
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 4QHCWY588Fz4BFTw;
Thu, 11 May 2023 13:32:57 +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 4QHCWY4gYdz4GTm;
Thu, 11 May 2023 13:32:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683811977;
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=oDRRomhDTYPHd4V5yr/wY+8KMhkGjNFXsZTHZaAVxgM=;
b=NNtGdr0x1KgFyVCNrSrojuZTS65p0yCTyc63wj3ZlpacceINEA0jgru2vPBrtvbfbqUo3X
INuRrIBEkw4jlC6Er3MxBypaLCR2J5YOV5MoLZAC6lOd9x7HmS6Wsln8Q2TIHN6OX3CTeQ
dc+mMXhmCJDKHDUSztWmk3nVdPFRcD9z75xw2Gx7pEQE9hK9wylIvEkTDdbd+cZpI8Al90
9rPa9thq1+4mzFJEzj9evZ6WHNOojxLhWZ7rmp0bHmTEls6m3Adwq+5CGcUX6NGFa6IR4M
Mq05NbtJcCi9K0E90hhaFk2Rhc4LFHDRYa3t11NXHLrKgEt4T7BrYPg2AIERxA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683811977;
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=oDRRomhDTYPHd4V5yr/wY+8KMhkGjNFXsZTHZaAVxgM=;
b=Gs5U+dnlEeSzwqqbqFwlByxvM25n7qhLer03rwgenbH+OiSBWydkYmDl4HZVPNbLzX8KPN
/QxFMRY1ic5uG9K9m00/IjRvokFJ1eVBvPpZaqjLbQMRO5kPpZ3iq+n3Hw6OsKJbTFfrRF
hSeDqsOX30aNSMmZ6pJsQs7w3mxjL6gj+gnKBRpR8htAwiFXWHYx6vRpPnZG57Ub86xOUD
FBHAYQPZ33uY96BE3XYTQDS+cac+a2O7ioOCLlKtCjzLe31twr4HvKF6Tqtpojmw6O0YJH
TzCEZULr0VTFrPFTLHeqZLJXHTUa28eTttEUtwlxz47Tvqk6zJBK4FedhcEINA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683811977; a=rsa-sha256; cv=none;
b=wcxXKbYPZ4ShfF9GanB4DR9uIB+eRt3V/JK8QMFtkehWhSkhKvP4yeYGWX7ldLg2kioo4i
AqCJs1YN6q16jboIZ4w3jypAOkWR1bX1BJAWAyinlJ1C4fqm7wyg8LNf8Pn0da5NuZC6UQ
xtBjky2uAbgijTHZUZ2n4pb5sbwXTNr1wLYYmufeCJS3eg2YF36rISFpwAhN5tMASe18ZA
raTn2HZ5ozzPpHVg21lIJnxGpqE53ybvS4HBR19WfPleocH/ZMjJPj2gQ8KvvCc5YpKivE
ykIk23+xD/8l66fNMB9SX4A86Neycjct/FAGjByzfmL6tQSLjyxkkHdAIllFUg==
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 4QHCWY3dfkzv4h;
Thu, 11 May 2023 13:32:57 +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 34BDWvw2076733;
Thu, 11 May 2023 13:32:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BDWv7U076732;
Thu, 11 May 2023 13:32:57 GMT
(envelope-from git)
Date: Thu, 11 May 2023 13:32:57 GMT
Message-Id: <202305111332.34BDWv7U076732@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: dba2eb1dc02d - stable/13 - unix: Fix locking in uipc_peeraddr()
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: dba2eb1dc02d6ef876aa38b7b9612703dde5d635
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=dba2eb1dc02d6ef876aa38b7b9612703dde5d635
commit dba2eb1dc02d6ef876aa38b7b9612703dde5d635
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-05-10 13:18:16 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-11 13:32:32 +0000
unix: Fix locking in uipc_peeraddr()
After the locking protocol changed in commit 75a67bf3d00d ("AF_UNIX:
make unix socket locking finer grained"), uipc_peeraddr() was not
updated accordingly.
The link lock now only protects global socket lists. The PCB lock is
used to protect the link between connected PCBs, so use that. Remove an
old comment which appears to be noting that unp_conn is not set for
connected SOCK_DGRAM sockets (in one direction anyway).
Reviewed by: glebius
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D39855
(cherry picked from commit e8f6e5b2d969fdf7e8f0a9a0a87eede357618fe9)
---
sys/kern/uipc_usrreq.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 9c46e8588ed4..4d602341f514 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -921,15 +921,10 @@ uipc_peeraddr(struct socket *so, struct sockaddr **nam)
KASSERT(unp != NULL, ("uipc_peeraddr: unp == NULL"));
*nam = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK);
- UNP_LINK_RLOCK();
- /*
- * XXX: It seems that this test always fails even when connection is
- * established. So, this else clause is added as workaround to
- * return PF_LOCAL sockaddr.
- */
- unp2 = unp->unp_conn;
+
+ UNP_PCB_LOCK(unp);
+ unp2 = unp_pcb_lock_peer(unp);
if (unp2 != NULL) {
- UNP_PCB_LOCK(unp2);
if (unp2->unp_addr != NULL)
sa = (struct sockaddr *) unp2->unp_addr;
else
@@ -940,7 +935,7 @@ uipc_peeraddr(struct socket *so, struct sockaddr **nam)
sa = &sun_noname;
bcopy(sa, *nam, sa->sa_len);
}
- UNP_LINK_RUNLOCK();
+ UNP_PCB_UNLOCK(unp);
return (0);
}
From nobody Thu May 11 13:32:58 2023
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 4QHCWZ6BTdz4BFKH;
Thu, 11 May 2023 13:32:58 +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 4QHCWZ55lKz4GMF;
Thu, 11 May 2023 13:32:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683811978;
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=GTa6a2eauZ6GG/IHWd8snoqDW1CfWJ+6oiXPFTyVHBo=;
b=enaQ2EXC7iM6DNyGbB4VSjZiXSMtPcYGQN/6vHYauCkv/BmT+DVmw3vMNUWurUOP9CuLeC
QwbA34Tj6Uk5iwsU9kL09O6Oo+RqRNih1xts+lJldMhyTYQGZf7OFwtKSwa4LQh7sUz3rc
hJBMJL7eAztQZ8xMKDmFFRt7HxNERvQ4csfUSR8w2u3ERzGUFnNgMbEh9hxnuKUUiF+FVP
uBl7CTIJmq5wOX7kNUplAqP7dpG2o7xhExTWXcKW+TfAb036jJOQccZk9Q/N8cR8tGQ5vd
kQFg+TgkBmMSQcRGb+ooLRnZNT1Vw/gktdd5DMrTVqmuD7JexTwW5EstS+fjbA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683811978;
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=GTa6a2eauZ6GG/IHWd8snoqDW1CfWJ+6oiXPFTyVHBo=;
b=Dji3krBSTVGrCZG1sCq0MZ6okUjKY6E/9ot+4vFINQWk9mg7smeM5qqUoe7JE+2eVzkEaS
9yNDkAb/yFYqXefICxq8Oa4ifJCZJgBqal7V6EsLxkaLXCj+lyNSz+Nr5Ul2SFjd8sMi8v
jdyvtXuY5bawpyIlzKJjpt2GyM55dLct99f3HTsA9LiT+++L/0a+BOkc/OiyN8fLJcLcQ8
vHbGLsGcEHXdB7aXCjjqg5VtrQ1e0S0Zd7MeKbIjkf0R3wZu8anWL89Jf7lZ+JFGenrlXg
3kc30+g5+0WIYQejPY3X6vdasyZZxvohcLeg+ovc16KJORtq8FSJitt2RcV6Cw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683811978; a=rsa-sha256; cv=none;
b=DDiIz7hA02u3TsEhbDOGtrzdej4QS3pJBFBmsiHYJpZxqs0B41X6mZBD3mlvFFTPGcXBMS
Ru8GzRvwJjuCMqBNJKvC2ZrDoypRb6HRrE6qIYPL1l9LvuVe+2TsMi//PmCpGFFJzdAgIC
3BDCCpZF3yo+5xzGFCmmIeNB+FTbDxMbCQNhLmi+Gc+88Mt0QDfWJwv2icux4Lk/QVi66R
HXYJqjZj/zfUOHA6f4sOwx+U+TBLzTR/CPSv9Xpirlpw09weWkKOC59YUIZIeJsJSTj6K9
nom+YbDuzpDhoVJlTBxzKZAZ6WRNIxAwV4TizCIsTqXaQ+RXAh7eeE773bFFWA==
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 4QHCWZ49z4zvHj;
Thu, 11 May 2023 13:32:58 +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 34BDWw8t076752;
Thu, 11 May 2023 13:32:58 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BDWwwK076751;
Thu, 11 May 2023 13:32:58 GMT
(envelope-from git)
Date: Thu, 11 May 2023 13:32:58 GMT
Message-Id: <202305111332.34BDWwwK076751@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 0a300a95c10f - stable/13 - vmm: Dynamically allocate a couple of per-CPU state save areas
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 0a300a95c10f079d4735c9c13bd6bea90402a87a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=0a300a95c10f079d4735c9c13bd6bea90402a87a
commit 0a300a95c10f079d4735c9c13bd6bea90402a87a
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-05-10 13:19:09 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-11 13:32:32 +0000
vmm: Dynamically allocate a couple of per-CPU state save areas
This avoids bloating the BSS when MAXCPU is large.
No functional change intended.
PR: 269572
Reviewed by: corvink, rew
Tested by: rew
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D39805
(cherry picked from commit 74ac712f72cfd6d7b3db3c9d3b72ccf2824aa183)
---
sys/amd64/vmm/amd/svm.c | 11 ++++++-----
sys/amd64/vmm/intel/vmx.c | 12 ++++++++----
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c
index d995b68ebdc6..0af7342128f2 100644
--- a/sys/amd64/vmm/amd/svm.c
+++ b/sys/amd64/vmm/amd/svm.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#include <vm/vm.h>
+#include <vm/vm_extern.h>
#include <vm/pmap.h>
#include <machine/cpufunc.h>
@@ -123,10 +124,8 @@ SYSCTL_UINT(_hw_vmm_svm, OID_AUTO, num_asids, CTLFLAG_RDTUN, &nasid, 0,
/* Current ASID generation for each host cpu */
static struct asid asid[MAXCPU];
-/*
- * SVM host state saved area of size 4KB for each core.
- */
-static uint8_t hsave[MAXCPU][PAGE_SIZE] __aligned(PAGE_SIZE);
+/* SVM host state saved area of size 4KB for each physical core. */
+static uint8_t *hsave;
static VMM_STAT_AMD(VCPU_EXITINTINFO, "VM exits during event delivery");
static VMM_STAT_AMD(VCPU_INTINFO_INJECTED, "Events pending at VM entry");
@@ -167,6 +166,7 @@ svm_modcleanup(void)
{
smp_rendezvous(NULL, svm_disable, NULL, NULL);
+ kmem_free(hsave, (mp_maxid + 1) * PAGE_SIZE);
return (0);
}
@@ -214,7 +214,7 @@ svm_enable(void *arg __unused)
efer |= EFER_SVM;
wrmsr(MSR_EFER, efer);
- wrmsr(MSR_VM_HSAVE_PA, vtophys(hsave[curcpu]));
+ wrmsr(MSR_VM_HSAVE_PA, vtophys(&hsave[curcpu * PAGE_SIZE]));
}
/*
@@ -269,6 +269,7 @@ svm_modinit(int ipinum)
svm_npt_init(ipinum);
/* Enable SVM on all CPUs */
+ hsave = kmem_malloc((mp_maxid + 1) * PAGE_SIZE, M_WAITOK | M_ZERO);
smp_rendezvous(NULL, svm_enable, NULL, NULL);
return (0);
diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c
index 32e53de4e8ee..55ed5fdf1a00 100644
--- a/sys/amd64/vmm/intel/vmx.c
+++ b/sys/amd64/vmm/intel/vmx.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#include <vm/vm.h>
+#include <vm/vm_extern.h>
#include <vm/pmap.h>
#include <machine/psl.h>
@@ -134,7 +135,7 @@ SYSCTL_NODE(_hw_vmm, OID_AUTO, vmx, CTLFLAG_RW | CTLFLAG_MPSAFE, NULL,
NULL);
int vmxon_enabled[MAXCPU];
-static char vmxon_region[MAXCPU][PAGE_SIZE] __aligned(PAGE_SIZE);
+static uint8_t *vmxon_region;
static uint32_t pinbased_ctls, procbased_ctls, procbased_ctls2;
static uint32_t exit_ctls, entry_ctls;
@@ -618,6 +619,7 @@ vmx_modcleanup(void)
nmi_flush_l1d_sw = 0;
smp_rendezvous(NULL, vmx_disable, NULL, NULL);
+ kmem_free(vmxon_region, (mp_maxid + 1) * PAGE_SIZE);
return (0);
}
@@ -638,8 +640,8 @@ vmx_enable(void *arg __unused)
load_cr4(rcr4() | CR4_VMXE);
- *(uint32_t *)vmxon_region[curcpu] = vmx_revision();
- error = vmxon(vmxon_region[curcpu]);
+ *(uint32_t *)&vmxon_region[curcpu * PAGE_SIZE] = vmx_revision();
+ error = vmxon(&vmxon_region[curcpu * PAGE_SIZE]);
if (error == 0)
vmxon_enabled[curcpu] = 1;
}
@@ -649,7 +651,7 @@ vmx_modresume(void)
{
if (vmxon_enabled[curcpu])
- vmxon(vmxon_region[curcpu]);
+ vmxon(&vmxon_region[curcpu * PAGE_SIZE]);
}
static int
@@ -953,6 +955,8 @@ vmx_modinit(int ipinum)
vmx_msr_init();
/* enable VMX operation */
+ vmxon_region = kmem_malloc((mp_maxid + 1) * PAGE_SIZE,
+ M_WAITOK | M_ZERO);
smp_rendezvous(NULL, vmx_enable, NULL, NULL);
vmx_initialized = 1;
From nobody Thu May 11 13:32:59 2023
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 4QHCWc0LDQz4BFV2;
Thu, 11 May 2023 13:33:00 +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 4QHCWb6dPSz4GXx;
Thu, 11 May 2023 13:32:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683811979;
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=76EVMUi8HpCYJs0jLnc39b1k1uqjp/dqoLzXbJuQDek=;
b=ZppnNv26PRmRTi7qZuo7eFiiBr3MrA05XYI5F3zcvYa6IKgLopqluLTb/IWdGCMToPbiL6
JoxFzSgeTgRx7eLXbHBuJiIbrPtnKwIjvitW+qyu6qezGwhUaKb+vP/Agh+gWi2VNb00ja
NGfZe6p7fleyp3p2AwmILgZFSGkrSD8vGSAlKOy5YtEDA1wTnvDk3FaYZQKpw2bfvLyF4r
yyqSfawArvDwBW+MqyJ9qOx7f4xnaywqiiTo2Lj/K1ZdlBXB1GRv6ReoSxbcXy3vsdl2Km
NHk05+pSgpUGgWC3y57xj0WGAVNqkdV0oEvnoch63h7BunvV1DXyvccWzlOByA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683811979;
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=76EVMUi8HpCYJs0jLnc39b1k1uqjp/dqoLzXbJuQDek=;
b=gJpVO9oa63rNTrqYaNuhhtn2Dx3erEKWZAQUdNy5ECMrZ4W6boRtWTpH5Z1qwGsKC3M3Lq
Ny7IgWNzXWovh7ngv8IfY227Kzwo/wsB3pmmhulp3M/5tEP85ShDB67tnEoesj/9Dq5DIi
Itv72OTHc0gitaHm9cNjQUvAhncgvRf3QZXwvNRxfzSjyaoDC+Q/c/ZaXp/FycPQX0oRgv
z/ARYsCXDkJtRn1bmfcync9jY99grs6hManOyT5JMdffb+KfNePBDNjfsjDrgVfKjmjGGN
EXsFniH70kgmU7XKM20pSbQcoeSZMcVrYzjun6K/L71nCf2XcrkcWA3PaWUopQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683811979; a=rsa-sha256; cv=none;
b=fl7uS2U3qYWXuebTK+MomFR4+CHKomzJjBpGmEQOKn8NXjMz6rwHU6MHGDAb40gf72/E5o
3y4r87PILYpTJn+YFYXdrzjVO7VM/Ievu62A1bxaEad+O4SO/OuJCtaIALbUFqLWom9Hvr
+b9F21tl4LmH636mJF6WwKSri4MtsE1ZcfrQJgR73rFqxaTXb6BmwGO9O7nG0wiZw/4/n5
1NXRIQt3uAJQJ3zFRz/0gmPomlurx+wmgA+XqVWDaoSgR/f7sE1lcM5+kav/iz37uoTmck
OgArkBNoOnaaLexRyFe1d+5pdtYEY4YQ+RoqZzTWOYUmM+qrp6NW/2GHmXDXqA==
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 4QHCWb5ZMGzvZ3;
Thu, 11 May 2023 13:32:59 +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 34BDWxLq076771;
Thu, 11 May 2023 13:32:59 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BDWxd1076770;
Thu, 11 May 2023 13:32:59 GMT
(envelope-from git)
Date: Thu, 11 May 2023 13:32:59 GMT
Message-Id: <202305111332.34BDWxd1076770@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: be14baa34b82 - stable/13 - vmm: don't free unallocated memory
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: be14baa34b82e3ca50d0a2b61ddb05b355616c93
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=be14baa34b82e3ca50d0a2b61ddb05b355616c93
commit be14baa34b82e3ca50d0a2b61ddb05b355616c93
Author: Corvin Köhne <corvink@FreeBSD.org>
AuthorDate: 2023-05-10 13:19:25 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-11 13:32:32 +0000
vmm: don't free unallocated memory
If vmx or svm is disabled in BIOS or the device isn't supported by vmm,
modinit won't allocate these state save areas. As kmem_free panics when
passing a NULL pointer to it, loading the vmm kernel module causes a
panic too.
PR: 271251
Reviewed by: markj
Fixes: 74ac712f72cfd6d7b3db3c9d3b72ccf2824aa183 ("vmm: Dynamically allocate a couple of per-CPU state save areas")
MFC after: 1 week
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D39974
(cherry picked from commit b10e100d1696782cfebef09b5870dfc6d1b3217b)
---
sys/amd64/vmm/amd/svm.c | 5 ++++-
sys/amd64/vmm/intel/vmx.c | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c
index 0af7342128f2..d295401a9043 100644
--- a/sys/amd64/vmm/amd/svm.c
+++ b/sys/amd64/vmm/amd/svm.c
@@ -166,7 +166,10 @@ svm_modcleanup(void)
{
smp_rendezvous(NULL, svm_disable, NULL, NULL);
- kmem_free(hsave, (mp_maxid + 1) * PAGE_SIZE);
+
+ if (hsave != NULL)
+ kmem_free(hsave, (mp_maxid + 1) * PAGE_SIZE);
+
return (0);
}
diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c
index 55ed5fdf1a00..8b8f8fe6cb25 100644
--- a/sys/amd64/vmm/intel/vmx.c
+++ b/sys/amd64/vmm/intel/vmx.c
@@ -619,7 +619,9 @@ vmx_modcleanup(void)
nmi_flush_l1d_sw = 0;
smp_rendezvous(NULL, vmx_disable, NULL, NULL);
- kmem_free(vmxon_region, (mp_maxid + 1) * PAGE_SIZE);
+
+ if (vmxon_region != NULL)
+ kmem_free(vmxon_region, (mp_maxid + 1) * PAGE_SIZE);
return (0);
}
From nobody Thu May 11 13:33:00 2023
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 4QHCWd36vWz4BFKM;
Thu, 11 May 2023 13:33:01 +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 4QHCWd0Hqlz4GZh;
Thu, 11 May 2023 13:33:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683811981;
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=YY18BV+QGSZOWPU3l6j43DiYpeJVPKE815M04wWedyE=;
b=JjGVunU+Hl/PqBfoR+MF0xcIJUe5JI1dFazmreGliVJ70w/WfvaSC1w4rxb7sLw5YLVXxS
qCtGL4hMZyqRITDqZPLIiMQjvqfZpZF52MJLfPMWRODZKDwYYH+gVvlERkOv7fNY8xcfuK
LOi/cAL256Mr4SbNntYpSy6y27qaqa1/mVlK3WdfqhbpPgg2GTpWatJTzuWTc8coN5Vog8
1n+dSo+2/7Q1oCPeCnax86zIEM4cuT+iwtEuEqKVBiq9Vhce2KuXYhXFDkFJ/5NaAXU0Cs
xx03u6/CFxZllgVLPyXbC/rIDpNIKnxzgKsgllHYAsoXnwt+VQTuK+b5GRFL0A==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683811981;
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=YY18BV+QGSZOWPU3l6j43DiYpeJVPKE815M04wWedyE=;
b=VsOKI6/PjDgA9glQaDt5ePSu1LOw6aeLM7Vb7tmNafp1t+aKj7OEWsMalqb3XgEGq5OZBv
TWd6lvOFGFYV2C94B9jhGqXbJ5/Mma7lP1CXrXPZ6+7IYLFUhBIM9maaOJluSXzUQ4zSMj
R11KWqBEQZLKl3l7x/0+5OEVhQ7Xrd5shT62hhjdajPzD86hNDEu6Vlb0VX7Szj7y9owtl
FO82HcF3ER2SGCwXhYxAxl9MLAtNRKdKBJ80uMiUxGsTKZOSppxuWro0yU5Jt2bsOcpAWr
pBFq17bIOeGaPGtxGz267CtYiDvcCW1tAlONB66VSgdLa52xdj+lvIyXoHG7/w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683811981; a=rsa-sha256; cv=none;
b=Xy+qcpBWd2Eu1gL65cj7LVCw4AVmOIhB4Hp740zoVJUJMIfuAmhf4YOEjCxy7CragZvuAA
TNcXztU9DKtoLjNlhDVTQS8DUEliX6i+QjoGmLyQ4dPvKHOaToPj1rWZEKQ7ReBzhUE2CC
RH8EWqS3UVNcS2rRJ3YscRZXbZ+ZvnbmVeFnQOeNwh73Nx8DHXwv53A2E4ojcSHGkTxTWZ
Gp1Wf5ct4sxwIqkGTf2Xiu5mbaKATAKJlpe7t3Ffi+FaX+dOkpBNQXuX7KXFd4Bas4t3J8
xx0gqyzuVtxsMTBzEWYN1AOSOrfwGWsYlqVWSxzO9r1PgyacgzO+bxNB9tKX7w==
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 4QHCWc6PFyzv4j;
Thu, 11 May 2023 13:33:00 +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 34BDX0Rr076811;
Thu, 11 May 2023 13:33:00 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BDX0wX076810;
Thu, 11 May 2023 13:33:00 GMT
(envelope-from git)
Date: Thu, 11 May 2023 13:33:00 GMT
Message-Id: <202305111333.34BDX0wX076810@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: aec3c884057a - stable/13 - buf: Dynamically allocate per-CPU buffer queues
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: aec3c884057ab3f95e8c88a346694966df637303
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=aec3c884057ab3f95e8c88a346694966df637303
commit aec3c884057ab3f95e8c88a346694966df637303
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-05-10 14:05:32 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-11 13:32:32 +0000
buf: Dynamically allocate per-CPU buffer queues
To reduce static bloat. No functional change intended.
PR: 269572
Reviewed by: mjg, kib, emaste
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D39808
(cherry picked from commit e72f7ed43eefaf305c33c232bc2c33d997427f58)
---
sys/kern/vfs_bio.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 174a6e0b556a..cb94dbd81021 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -116,7 +116,7 @@ struct bufqueue {
#define BQ_ASSERT_LOCKED(bq) mtx_assert(BQ_LOCKPTR((bq)), MA_OWNED)
struct bufdomain {
- struct bufqueue bd_subq[MAXCPU + 1]; /* Per-cpu sub queues + global */
+ struct bufqueue *bd_subq;
struct bufqueue bd_dirtyq;
struct bufqueue *bd_cleanq;
struct mtx_padalign bd_run_lock;
@@ -1901,6 +1901,9 @@ bd_init(struct bufdomain *bd)
{
int i;
+ /* Per-CPU clean buf queues, plus one global queue. */
+ bd->bd_subq = mallocarray(mp_maxid + 2, sizeof(struct bufqueue),
+ M_BIOBUF, M_WAITOK | M_ZERO);
bd->bd_cleanq = &bd->bd_subq[mp_maxid + 1];
bq_init(bd->bd_cleanq, QUEUE_CLEAN, mp_maxid + 1, "bufq clean lock");
bq_init(&bd->bd_dirtyq, QUEUE_DIRTY, -1, "bufq dirty lock");
From nobody Thu May 11 13:33:01 2023
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 4QHCWf1gnGz4BFRm;
Thu, 11 May 2023 13:33:02 +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 4QHCWf0gqcz4Gb1;
Thu, 11 May 2023 13:33:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683811982;
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=H8qJZ4utWBx9IyVVPFhQHNc4h/gx/hoO1SlnMg/XLK0=;
b=NiQ4+P6KOjncOxefhbI9j+OdM5BD5K6Bp/Y7ypyLfP7q+n1HgJLs/M4YNOkVa50Yve4Zdw
7Z7kZpI+c+YC62r9q+t6hzRN4YQVeQA44l+9fBDJJzE5ws9wC0VFol+f+XAC4EcDd9nzdV
Zu/ZEctNIPhGZ311EKSj7nUab07lUnZQeENu49uv5Wny12rV9CKLKH4HZQXwnbjGbiND8k
j3ZYB34dHsSk942nW9jDm8qEUk5yenETZFmeuaK5sgWyPyzDr/mv0RpTZVDU+Wm3XvpR8l
utqB/S3Yrj37vvTnHe/yqQD0rHVM2YJQju+5RLePTBpU4EzqgCxfAslBMpUInw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683811982;
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=H8qJZ4utWBx9IyVVPFhQHNc4h/gx/hoO1SlnMg/XLK0=;
b=Dlzk/4hhs4atdn1oJTnP5cn9NVG8LIu1aJE0c8CZtHvpXOaJpsdPYG9D0S4kT+j3iqzUyQ
1CqRfEI6FEPvSgUEV33PztS7Qrn0U5cxQWFeszH7wEkgbeUL1Njeb3QPhk+55HVQVEbmB2
H0BMFLiB9ve1ID3M5rW7C9CtjSqobGFlZdezRKrEVqpuTALFEWYdPC4ythOFC2+exMoD5G
EWnSQAIZyvJUflhif9KF6TEBWcxKKtVkUFgXgLZ/vT50uu/fBwTskfgG54mN1Of7csJ8cK
ENI3ZkPN07xDEK1rQeplZwMj2Zl9olcg5RwfifHbwHrzyJr9bP4SU6Xs3OmYBQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683811982; a=rsa-sha256; cv=none;
b=TI6n2/4S1IZxeJ9PemUbTVwCk9czZD6EnZ0Uv2RCoyOX5mZbmFkdhurEA2cu3bzKeNm2AB
rSV2ZBAWQ7OBk0FJZa9+nJNuYh8nCuaRCh0u01NkGKYsp5sOKPlU3xrA9tVtSvmWVeY+6z
GNTayYVbSlNtWTwe/W8Pi16arryphQsyW1g5q3zGsBb5STxcfMkx7p0TJJ7DYQqGjF8hmx
wLtzsBkj+b1IuE2qAnaRDLYvLog83xOsqB08AbdpACfUullxsVkWfLWXc0iOObT695IrQ9
DZs8MSOkWv86+aNIoeMt3qmFGtuMjF/cIDXXwRK7QGxJ0w+MngBGlITW69fxnA==
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 4QHCWd6tN3zvHk;
Thu, 11 May 2023 13:33:01 +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 34BDX1HM076840;
Thu, 11 May 2023 13:33:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BDX1GN076839;
Thu, 11 May 2023 13:33:01 GMT
(envelope-from git)
Date: Thu, 11 May 2023 13:33:01 GMT
Message-Id: <202305111333.34BDX1GN076839@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 04622b63cde8 - stable/13 - cap_net tests: Skip tests if there is no connectivity
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 04622b63cde823ee844f8d076fd207e979591889
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=04622b63cde823ee844f8d076fd207e979591889
commit 04622b63cde823ee844f8d076fd207e979591889
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-05-11 13:31:30 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-11 13:32:32 +0000
cap_net tests: Skip tests if there is no connectivity
When testing cap_connect() and name/addr lookup functions, skip tests if
we fail and the error is not ENOTCAPABLE. This makes the tests amenable
to running in CI without Internet connectivity.
Reviewed by: oshogbo
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D39242
(cherry picked from commit 7ee4066db1295fe3660964c2561bef87da7431f8)
---
lib/libcasper/services/cap_net/tests/net_test.c | 129 ++++++++++++++++--------
1 file changed, 86 insertions(+), 43 deletions(-)
diff --git a/lib/libcasper/services/cap_net/tests/net_test.c b/lib/libcasper/services/cap_net/tests/net_test.c
index 49cb0da44a4e..8397cf028bd6 100644
--- a/lib/libcasper/services/cap_net/tests/net_test.c
+++ b/lib/libcasper/services/cap_net/tests/net_test.c
@@ -66,21 +66,24 @@ test_getnameinfo_v4(cap_channel_t *chan, int family, const char *ip)
struct sockaddr_in ipaddr;
char capfn[MAXHOSTNAMELEN];
char origfn[MAXHOSTNAMELEN];
- int ret;
+ int capret, sysret;
memset(&ipaddr, 0, sizeof(ipaddr));
ipaddr.sin_family = family;
inet_pton(family, ip, &ipaddr.sin_addr);
- ret = cap_getnameinfo(chan, (struct sockaddr *)&ipaddr, sizeof(ipaddr),
+ capret = cap_getnameinfo(chan, (struct sockaddr *)&ipaddr, sizeof(ipaddr),
capfn, sizeof(capfn), NULL, 0, NI_NAMEREQD);
- if (ret != 0) {
- return (ret);
- }
+ if (capret != 0 && capret == ENOTCAPABLE)
+ return (ENOTCAPABLE);
- ret = getnameinfo((struct sockaddr *)&ipaddr, sizeof(ipaddr), origfn,
+ sysret = getnameinfo((struct sockaddr *)&ipaddr, sizeof(ipaddr), origfn,
sizeof(origfn), NULL, 0, NI_NAMEREQD);
- ATF_REQUIRE(ret == 0);
+ if (sysret != 0) {
+ atf_tc_skip("getnameinfo(%s) failed: %s",
+ ip, gai_strerror(sysret));
+ }
+ ATF_REQUIRE(capret == 0);
ATF_REQUIRE(strcmp(origfn, capfn) == 0);
return (0);
@@ -92,21 +95,24 @@ test_getnameinfo_v6(cap_channel_t *chan, const char *ip)
struct sockaddr_in6 ipaddr;
char capfn[MAXHOSTNAMELEN];
char origfn[MAXHOSTNAMELEN];
- int ret;
+ int capret, sysret;
memset(&ipaddr, 0, sizeof(ipaddr));
ipaddr.sin6_family = AF_INET6;
inet_pton(AF_INET6, ip, &ipaddr.sin6_addr);
- ret = cap_getnameinfo(chan, (struct sockaddr *)&ipaddr, sizeof(ipaddr),
+ capret = cap_getnameinfo(chan, (struct sockaddr *)&ipaddr, sizeof(ipaddr),
capfn, sizeof(capfn), NULL, 0, NI_NAMEREQD);
- if (ret != 0) {
- return (ret);
- }
+ if (capret != 0 && capret == ENOTCAPABLE)
+ return (ENOTCAPABLE);
- ret = getnameinfo((struct sockaddr *)&ipaddr, sizeof(ipaddr), origfn,
+ sysret = getnameinfo((struct sockaddr *)&ipaddr, sizeof(ipaddr), origfn,
sizeof(origfn), NULL, 0, NI_NAMEREQD);
- ATF_REQUIRE(ret == 0);
+ if (sysret != 0) {
+ atf_tc_skip("getnameinfo(%s) failed: %s",
+ ip, gai_strerror(sysret));
+ }
+ ATF_REQUIRE(capret == 0);
ATF_REQUIRE(strcmp(origfn, capfn) == 0);
return (0);
@@ -133,13 +139,14 @@ test_gethostbyaddr_v4(cap_channel_t *chan, int family, const char *ip)
inet_pton(AF_INET, ip, &ipaddr);
caphp = cap_gethostbyaddr(chan, &ipaddr, sizeof(ipaddr), family);
- if (caphp == NULL) {
- return (h_errno);
- }
+ if (caphp == NULL && h_errno == ENOTCAPABLE)
+ return (ENOTCAPABLE);
orighp = gethostbyaddr(&ipaddr, sizeof(ipaddr), family);
- ATF_REQUIRE(orighp != NULL);
- ATF_REQUIRE(strcmp(caphp->h_name, caphp->h_name) == 0);
+ if (orighp == NULL)
+ atf_tc_skip("gethostbyaddr(%s) failed", ip);
+ ATF_REQUIRE(caphp != NULL);
+ ATF_REQUIRE(strcmp(orighp->h_name, caphp->h_name) == 0);
return (0);
}
@@ -154,12 +161,14 @@ test_gethostbyaddr_v6(cap_channel_t *chan, const char *ip)
inet_pton(AF_INET6, ip, &ipaddr);
caphp = cap_gethostbyaddr(chan, &ipaddr, sizeof(ipaddr), AF_INET6);
- if (caphp == NULL)
- return (h_errno);
+ if (caphp == NULL && h_errno == ENOTCAPABLE)
+ return (ENOTCAPABLE);
orighp = gethostbyaddr(&ipaddr, sizeof(ipaddr), AF_INET6);
- ATF_REQUIRE(orighp != NULL);
- ATF_REQUIRE(strcmp(caphp->h_name, caphp->h_name) == 0);
+ if (orighp == NULL)
+ atf_tc_skip("gethostbyaddr(%s) failed", ip);
+ ATF_REQUIRE(caphp != NULL);
+ ATF_REQUIRE(strcmp(orighp->h_name, caphp->h_name) == 0);
return (0);
}
@@ -181,19 +190,21 @@ test_getaddrinfo(cap_channel_t *chan, int family, const char *domain,
{
struct addrinfo hints, *capres, *origres, *res0, *res1;
bool found;
- int ret;
+ int capret, sysret;
memset(&hints, 0, sizeof(hints));
hints.ai_family = family;
hints.ai_socktype = SOCK_STREAM;
- ret = cap_getaddrinfo(chan, domain, servname, &hints, &capres);
- if (ret != 0) {
- return (ret);
- }
+ capret = cap_getaddrinfo(chan, domain, servname, &hints, &capres);
+ if (capret != 0 && capret == ENOTCAPABLE)
+ return (capret);
- ret = getaddrinfo(domain, servname, &hints, &origres);
- ATF_REQUIRE(ret == 0);
+ sysret = getaddrinfo(domain, servname, &hints, &origres);
+ if (sysret != 0)
+ atf_tc_skip("getaddrinfo(%s) failed: %s",
+ domain, gai_strerror(sysret));
+ ATF_REQUIRE(capret == 0);
for (res0 = capres; res0 != NULL; res0 = res0->ai_next) {
found = false;
@@ -219,14 +230,15 @@ test_gethostbyname(cap_channel_t *chan, int family, const char *domain)
struct hostent *caphp, *orighp;
caphp = cap_gethostbyname2(chan, domain, family);
- if (caphp == NULL) {
+ if (caphp == NULL && h_errno == ENOTCAPABLE)
return (h_errno);
- }
orighp = gethostbyname2(domain, family);
- ATF_REQUIRE(orighp != NULL);
- ATF_REQUIRE(strcmp(caphp->h_name, orighp->h_name) == 0);
+ if (orighp == NULL)
+ atf_tc_skip("gethostbyname2(%s) failed", domain);
+ ATF_REQUIRE(caphp != NULL);
+ ATF_REQUIRE(strcmp(caphp->h_name, orighp->h_name) == 0);
return (0);
}
@@ -257,7 +269,7 @@ test_connect(cap_channel_t *chan, const char *ip, unsigned short port)
int capfd, ret, serrno;
capfd = socket(AF_INET, SOCK_STREAM, 0);
- ATF_REQUIRE(capfd > 0);
+ ATF_REQUIRE(capfd >= 0);
memset(&ipv4, 0, sizeof(ipv4));
ipv4.sin_family = AF_INET;
@@ -266,7 +278,31 @@ test_connect(cap_channel_t *chan, const char *ip, unsigned short port)
ret = cap_connect(chan, capfd, (struct sockaddr *)&ipv4, sizeof(ipv4));
serrno = errno;
- close(capfd);
+ ATF_REQUIRE(close(capfd) == 0);
+
+ if (ret < 0 && serrno != ENOTCAPABLE) {
+ int sd;
+
+ /*
+ * If the connection failed, it might be because we can't reach
+ * the destination host. To check, try a plain connect() and
+ * see if it fails with the same error.
+ */
+ sd = socket(AF_INET, SOCK_STREAM, 0);
+ ATF_REQUIRE(sd >= 0);
+
+ memset(&ipv4, 0, sizeof(ipv4));
+ ipv4.sin_family = AF_INET;
+ ipv4.sin_port = htons(port);
+ inet_pton(AF_INET, ip, &ipv4.sin_addr);
+ ret = connect(sd, (struct sockaddr *)&ipv4, sizeof(ipv4));
+ ATF_REQUIRE(ret < 0);
+ ATF_REQUIRE_MSG(errno == serrno, "errno %d != serrno %d",
+ errno, serrno);
+ ATF_REQUIRE(close(sd) == 0);
+ atf_tc_skip("connect(%s:%d) failed: %s",
+ ip, port, strerror(serrno));
+ }
return (ret < 0 ? serrno : 0);
}
@@ -1151,6 +1187,7 @@ ATF_TC_BODY(capnet__limits_connecttodns, tc)
cap_net_limit_t *limit;
struct addrinfo hints, *capres, *res;
int family[] = { AF_INET };
+ int error;
capnet = create_network_service();
@@ -1179,9 +1216,12 @@ ATF_TC_BODY(capnet__limits_connecttodns, tc)
s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
ATF_REQUIRE(s >= 0);
- ATF_REQUIRE(cap_connect(capnet, s, res->ai_addr,
- res->ai_addrlen) == 0);
- close(s);
+ error = cap_connect(capnet, s, res->ai_addr,
+ res->ai_addrlen);
+ if (error != 0 && errno != ENOTCAPABLE)
+ atf_tc_skip("unable to connect: %s", strerror(errno));
+ ATF_REQUIRE(error == 0);
+ ATF_REQUIRE(close(s) == 0);
}
freeaddrinfo(capres);
@@ -1198,7 +1238,7 @@ ATF_TC_BODY(capnet__limits_deprecated_connecttodns, tc)
struct in_addr ipaddr;
struct sockaddr_in connaddr;
int family[] = { AF_INET };
- int i;
+ int error, i;
capnet = create_network_service();
@@ -1230,9 +1270,12 @@ ATF_TC_BODY(capnet__limits_deprecated_connecttodns, tc)
(char *)caphp->h_addr_list[i], caphp->h_length);
connaddr.sin_port = htons(80);
- ATF_REQUIRE(cap_connect(capnet, s, (struct sockaddr *)&connaddr,
- sizeof(connaddr)) == 0);
- close(s);
+ error = cap_connect(capnet, s, (struct sockaddr *)&connaddr,
+ sizeof(connaddr));
+ if (error != 0 && errno != ENOTCAPABLE)
+ atf_tc_skip("unable to connect: %s", strerror(errno));
+ ATF_REQUIRE(error == 0);
+ ATF_REQUIRE(close(s) == 0);
}
cap_close(capnet);
From nobody Thu May 11 15:04:26 2023
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 4QHFY71sgBz4BLSB;
Thu, 11 May 2023 15:04:27 +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 4QHFY71LBBz4YBG;
Thu, 11 May 2023 15:04:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683817467;
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=L4o4/83hSALBLvaG1wIw8H5M2OPxZ4M77U7T9Vg/wx4=;
b=iZOFC1/QedsOMjN/H8Hdnd8gksjFo4ZLhdp58LlFQeexNoci2OCR6To6PXHsUPGQBsw8sD
NaYWr0oD/k8v5+OkgmjgVr6i7mjeNwfaJZgBvMUvaKA1cfhBV/C0UYKEQk/dZua1TmXos6
PJjRwe/GSTn2bfCj5DfrRNUrBcvB2OWHJp6BHxhD/lunK0DAYO3eaRpWK+IBBwvNfGVANI
VlqPjSUHYroSTVrpgVClBNc1hGG0cVlZGqVmZzmxoRoXndhb+NK69pt3+4Fyf7GtMS59UE
uYxTx8vVe0HTOv3qiLVZkS89zpNilOB0kbjnMgfzJCDgjCnLjUlFFktfKdBBBw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683817467;
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=L4o4/83hSALBLvaG1wIw8H5M2OPxZ4M77U7T9Vg/wx4=;
b=je4SNApD4ORgVWP5cEe51cbLxjQ5izjkIcInzOV8LFRSk6Ks9GStMk5F2aqHdXdi17FRR1
gEQMBnCqi2OFVvzGtMF4iHzEfCzyy6JyTuec5WwdR8HlBK7kgM1BF8cjH+4O0Cb+CJ1KWX
p+IPGuqlWkPLOc+Cm1EhC7eF5A/E2SJ9EAMmqLnMlz2kSPHsV4ct5SCzic+kyAw+lKOSUg
WE9ejoH3llo9fLCijcc+52XGkX8sJZXvOaZRYT0qs79a0jz9OCP/N7dCujxPacGWKSrTbC
AjOltYOad38PG8912AcMYLDkkv6Ifj5rI4LtvQRWnoBVwH9B3VtwD4HTRIAfUQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683817467; a=rsa-sha256; cv=none;
b=EzD3TDp1xo+lcpQfFs+eunDWOHOQls6g3Se+UfCs7EOPyf4Wsm1P/8I/bG7sgT6QNMl6k8
B73bhYvGYUMpADkue9nm3Kg7FXNXcVKPMCYN9Ovis35sMUwHiKSTF3xbsVaFQNe7hQwkny
0PdSXYX4+z+wYrqxkg3/hLWztZdv4AnL7K7ZOAnsOrtSGJ5zqvjO8VMHPJpDEjuHlKkgyW
OujnUCq4ZMy/TjOBOhcHdbEVHuMN2IPG+MNFa+Emi3zGWv5DSPXo6QiiN6VRs9DqefTWGM
xyZr1/Ox5N4tsYc/7fYrDrVh4wLU+N9hCSb5/c78dYtqDEvOqUrxhc3EBGDrpg==
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 4QHFY70NxyzxTD;
Thu, 11 May 2023 15:04:27 +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 34BF4QA2025871;
Thu, 11 May 2023 15:04:26 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BF4QNg025870;
Thu, 11 May 2023 15:04:26 GMT
(envelope-from git)
Date: Thu, 11 May 2023 15:04:26 GMT
Message-Id: <202305111504.34BF4QNg025870@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 272525b73b65 - stable/13 - vmm: Fix casts around kmem_malloc/free() calls
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 272525b73b6548d84b3cea84579c6dd9a1e0a961
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=272525b73b6548d84b3cea84579c6dd9a1e0a961
commit 272525b73b6548d84b3cea84579c6dd9a1e0a961
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-05-11 15:00:53 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-11 15:00:53 +0000
vmm: Fix casts around kmem_malloc/free() calls
This is a direct commit to stable/13.
Reported by: Jenkins
---
sys/amd64/vmm/amd/svm.c | 4 ++--
sys/amd64/vmm/intel/vmx.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c
index d295401a9043..bd0c4db20b3d 100644
--- a/sys/amd64/vmm/amd/svm.c
+++ b/sys/amd64/vmm/amd/svm.c
@@ -168,7 +168,7 @@ svm_modcleanup(void)
smp_rendezvous(NULL, svm_disable, NULL, NULL);
if (hsave != NULL)
- kmem_free(hsave, (mp_maxid + 1) * PAGE_SIZE);
+ kmem_free((vm_offset_t)hsave, (mp_maxid + 1) * PAGE_SIZE);
return (0);
}
@@ -272,7 +272,7 @@ svm_modinit(int ipinum)
svm_npt_init(ipinum);
/* Enable SVM on all CPUs */
- hsave = kmem_malloc((mp_maxid + 1) * PAGE_SIZE, M_WAITOK | M_ZERO);
+ hsave = (void *)kmem_malloc((mp_maxid + 1) * PAGE_SIZE, M_WAITOK | M_ZERO);
smp_rendezvous(NULL, svm_enable, NULL, NULL);
return (0);
diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c
index 8b8f8fe6cb25..fe8f9b40a7d0 100644
--- a/sys/amd64/vmm/intel/vmx.c
+++ b/sys/amd64/vmm/intel/vmx.c
@@ -621,7 +621,7 @@ vmx_modcleanup(void)
smp_rendezvous(NULL, vmx_disable, NULL, NULL);
if (vmxon_region != NULL)
- kmem_free(vmxon_region, (mp_maxid + 1) * PAGE_SIZE);
+ kmem_free((vm_offset_t)vmxon_region, (mp_maxid + 1) * PAGE_SIZE);
return (0);
}
@@ -957,7 +957,7 @@ vmx_modinit(int ipinum)
vmx_msr_init();
/* enable VMX operation */
- vmxon_region = kmem_malloc((mp_maxid + 1) * PAGE_SIZE,
+ vmxon_region = (void *)kmem_malloc((mp_maxid + 1) * PAGE_SIZE,
M_WAITOK | M_ZERO);
smp_rendezvous(NULL, vmx_enable, NULL, NULL);
From nobody Fri May 12 10:11:54 2023
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 4QHl170vq4z4BpVH;
Fri, 12 May 2023 10:11:55 +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 4QHl170G5Nz3MwY;
Fri, 12 May 2023 10:11:55 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683886315;
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=GB1SAusSALN5yyn+3xxv/S/h7w+uOmZ74HRxvyA+Dfs=;
b=DKscM6wpKarwBlP8vmBi7+YKULhF2usJInj44tCCmLXOIw2RkZYrmS2rkpH5mE+R1/0cco
VCEVvMkE5y+5MxxXduCHuYYTnz6tdB627atbkuMQJrzXp1b1GvxQ8PGaE+CgLxbPRHWmYU
mQi7S58UVALi3c9c9LOxVZ1T/NuuJRpSu02fAWNth3pr2VFrslJZ6LIwKk17P2CgSf36YQ
v2Ct8+cKqcOiQDAMYO+oeFnauqvfEdxminu6VfbkS1hjC2ULswAn0ZUUTmK2pGQK2zSwK4
WETbAjoC3sLwTBB1qelPXYhMQH88knHp7cRH6iZgyC9SvNfxxm8U71ruE4F2rQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683886315;
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=GB1SAusSALN5yyn+3xxv/S/h7w+uOmZ74HRxvyA+Dfs=;
b=vjQdUfvU+XNLiXzMXSQQwDpEIE5S61u0fOS9wV9aZMomDfI2h62002vm7KBNXss2mFnglU
RfH9kNA9H7/JTFkEOANFQVCroD7654b/jvBAv5HpVIi5itCyxFiTUKn4SNykRWdyfpg6LI
j1PL2sr8MdSxAlrW2wRUKKbO4r6KwM6dSxfVV2g0gQuJZeOqCWfMI7uja+yM+kgQduMKo/
4f2GlhM2aBeW5fAzhID/WX1x+bFmek54D6KnqLYe15zmuwQkqyTCHVYg/qGu1sAxou+U3g
VnE5kMTJPP7TVzFecuTCCmOpmZUmUgDZsQAQZVbXtaPRp3sOvIv01mbFc+AGGQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683886315; a=rsa-sha256; cv=none;
b=J9GKf3JVHKduLh3zl8V3fU+bhoPOHyQ5/99bLNJnd0A8avpWJnPXr/xbefpr8Sdvgh/hSq
FYBcLfKwf3S6qn0IYrEkzXK+NRNH4RuNzJH28dU5nVO/8KeAOKKBYXMmLWAvbFQOuXIz6F
BcZjbaLrjm/boDzUG+0vX/HDDhk/0el/tYmGhkwzDIvNr/Mmf+FWohDb49t0MRfiXexXWt
LN4uenkXFun1KiKd1QY30MMt4ucuq+XjMKKUsczXnk39cT9+cdARNC816PMX11B5yl7HOC
4//EIHc6Hv1/NMVgN5/WU8rZhsy1JMgiPRfLgm/PSsM/lZvVVNsXEWwiUmEtAA==
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 4QHl166RSzzWHW;
Fri, 12 May 2023 10:11:54 +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 34CABsFF017085;
Fri, 12 May 2023 10:11:54 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CABs8Q017084;
Fri, 12 May 2023 10:11:54 GMT
(envelope-from git)
Date: Fri, 12 May 2023 10:11:54 GMT
Message-Id: <202305121011.34CABs8Q017084@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mateusz Piotrowski <0mp@FreeBSD.org>
Subject: git: c33f8c595255 - stable/13 - geom.8: Fix typos and wordsmith
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: 0mp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: c33f8c595255f5b6c15cbed0e84d1dd4ef7508b1
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by 0mp:
URL: https://cgit.FreeBSD.org/src/commit/?id=c33f8c595255f5b6c15cbed0e84d1dd4ef7508b1
commit c33f8c595255f5b6c15cbed0e84d1dd4ef7508b1
Author: Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2023-05-09 13:46:00 +0000
Commit: Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2023-05-12 10:10:59 +0000
geom.8: Fix typos and wordsmith
MFC after: 3 days
(cherry picked from commit 794f5122bb0c9bad1c3dfedbf373a728b6689297)
---
sbin/geom/core/geom.8 | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/sbin/geom/core/geom.8 b/sbin/geom/core/geom.8
index 779bfb34cc82..898796faa220 100644
--- a/sbin/geom/core/geom.8
+++ b/sbin/geom/core/geom.8
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 12, 2022
+.Dd May 9, 2023
.Dt GEOM 8
.Os
.Sh NAME
@@ -127,8 +127,9 @@ When a class-specific shared library exists, a direct utility should also be
available under the name of
.Nm g Ns Ar class .
.Pp
-Currently available classes which are aware of
-.Nm :
+Currently, classes aware of
+.Nm
+are:
.Pp
.Bl -bullet -offset indent -compact
.It
@@ -182,7 +183,10 @@ The following example shows how to set up a stripe on three disks for automatic
configuration:
.Bd -literal -offset indent
geom stripe label -v -s 65536 data /dev/da0 /dev/da1 /dev/da2
+.Ed
+.Pp
or:
+.Bd -literal -offset indent
gstripe label -v -s 65536 data /dev/da0 /dev/da1 /dev/da2
.Ed
.Pp
From nobody Fri May 12 18:15:04 2023
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 4QHxkc5BXFz4BJQr;
Fri, 12 May 2023 18:15:04 +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 4QHxkc4jK7z4lLg;
Fri, 12 May 2023 18:15:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683915304;
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=X0W2YrBUKBD38LyClDCPu1cg30row4AjntwsUNu9OYU=;
b=b7+xkSudwaNU99G+Vwui2k0IlfAms0Sdiau4/b7LHurNHJICWbXmugNn+hc2x5FCuCABII
BmQirUJNGuxSgp++kUE8hFTSXkXrCJFogq2fuc3uJvcB9UlS1kFCIF3hieFjgt6tIDSLZL
OeyvoP6pX6H+JzUJNgWJNDKobBBna7RoKUIK1PM2DgDcxYiEa4eFv4V6+2KyWA56KMLo9g
uSzgYeFDZ7rg3yLA59V+C7MGfkITPyDag6HBBFNEItmGG00Budkr2M+8C25OlBHWr1ARAQ
cafK5HXq9aMgTvzl6qCW2G1GVIVmg+vDu44prCL6K7RPTgwPBYpqvSsvtNnsXw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683915304;
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=X0W2YrBUKBD38LyClDCPu1cg30row4AjntwsUNu9OYU=;
b=Egb6cYAWacOz0uCqydWQsEfd/gqsHuCdChrCWIlTMDE9t84+ZQB3xlS7yFQtUHHZkPJtuC
EA6mUoZSFyFywMj7lERHiRPWSc553p54EjxVToLLNxtRpRbRfJGQhtpjb0FWA7z39pWkYM
Wj3LyCJm/dZVK62FejhHsfcYbcKvR4DWexyKsc0wYmNW7wG9PIkxO/Pv09GP+tmsVYvQpr
2CXjPyf1zF9CMEm+qP/a2S1RsVfl8D1q5SvN9fEU9sJbKLZz9xLczr1tktIkaTwxPXP1i6
pbgx8GgRXAl2GJa+pyJIUK1KhV9AmD54TKGYdqcDcw4uSwA/tOUCJGdx5x9w/g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683915304; a=rsa-sha256; cv=none;
b=rTYXvw6zdV3CgJ/J6wZ6qh9Ufy0N038wjN6xnpqsxjEmmsFoQe+OWsqiHgimd0IsX6AKkI
P+74np5zQ1Y08vRQtvntqEAzfgh9EuHx4mbXfjx+qrJE5up8lONe31GH0at/jfYKr9SsrY
VVjyGs3N7Ofs3GRLklw0AQZ0Fsj9aqEKNoEAIapSpvr/GysL2QrzFSwwS3tqp6noYFfE1C
wozVcdOuMhQtNNj8Tmk3o8sU3Wb+VVK/VXY57O7VkuP4NzHB249f2zcfNZOZhGVD8ghyh8
PvcmK/b+Evkizd7MV/EA7f5lGXwcKf6JnOIrV0rgZSklqyuKay7fn43ClbiW9g==
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 4QHxkc3nbfzm0m;
Fri, 12 May 2023 18:15:04 +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 34CIF4W7012123;
Fri, 12 May 2023 18:15:04 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CIF4OY012122;
Fri, 12 May 2023 18:15:04 GMT
(envelope-from git)
Date: Fri, 12 May 2023 18:15:04 GMT
Message-Id: <202305121815.34CIF4OY012122@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: b9fc1e9077ce - stable/13 - ktls.4: Remove an obsolete statement
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: b9fc1e9077ced09a0eb85a09f5f21e0b7b9877d1
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=b9fc1e9077ced09a0eb85a09f5f21e0b7b9877d1
commit b9fc1e9077ced09a0eb85a09f5f21e0b7b9877d1
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2021-05-22 16:12:30 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-12 18:14:35 +0000
ktls.4: Remove an obsolete statement
The default mb_use_ext_pgs value was toggled in commit 52cd25eb1aa.
Reviewed by: jhb
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D30393
(cherry picked from commit c235059bb7e600b7bb88234836102fa9911addc2)
---
share/man/man4/ktls.4 | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/share/man/man4/ktls.4 b/share/man/man4/ktls.4
index 5e7ed1590aa9..e88895ab7fa9 100644
--- a/share/man/man4/ktls.4
+++ b/share/man/man4/ktls.4
@@ -31,7 +31,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 8, 2021
+.Dd May 20, 2021
.Dt KTLS 4
.Os
.Sh NAME
@@ -131,12 +131,6 @@ application data (for example, handshake messages) or to send
application data records with specific contents (for example, empty
fragments).
.Pp
-TLS transmit requires the use of unmapped mbufs.
-Unmapped mbufs are not enabled by default, but can be enabled by
-setting the
-.Va kern.ipc.mb_use_ext_pgs
-sysctl node to 1.
-.Pp
The current TLS transmit mode of a socket can be queried via the
.Dv TCP_TXTLS_MODE
socket option.
From nobody Fri May 12 18:15:05 2023
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 4QHxkd6VShz4BK0f;
Fri, 12 May 2023 18:15:05 +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 4QHxkd5TSFz4lMt;
Fri, 12 May 2023 18:15:05 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683915305;
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=76wDiG5MSkMaDgYX2RbTKLTBJn9aTbmT40GbJkClT/s=;
b=AqAVta2Fq7CC0CsPHexjcjKmc3qFN0oi5yhCbdxZ/1BOBw7W1E1nkJ/vSc2p7Khukk3V+s
StTHidejS3ciKgzVwSfIIVvg5hC+3RBKXPFj3e1/1m15vJhbyEMrp961qoBPGuq0hyuhg/
7vf7QlPDABkPoPlf17eJmCg2wK4FegQuuwVqtO4SJ9WbZJPm/XorZOpaTrGDKy/AD8MTG8
v0X+wCOdeAzlEG7T/ZhO5cykdIH67AdUE5nj5PXs/lFy36nYc8NgCnBc14ABghwASz/d/6
BmhCbGN0AHyQBMrltittmaxQ04EqoVK9HS13bggnqXV4ET9nabnUaw9YSBMmlw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683915305;
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=76wDiG5MSkMaDgYX2RbTKLTBJn9aTbmT40GbJkClT/s=;
b=UR8TAZYIfPz8hNQOymSZkVKGseoPuWLbExE7k49IdFSu35CRNdDRAkxpJ6I+2yC/kAyWhi
Q9Ngr/yXmGRiYdTzO3I2b5RwglIzKvBpXM2SP8RPbJEexHMonDfCjKPHwIa+2o2aJ8GOxo
dPBpIgUhmtFdWg20yQejKtfhy1OsBaJ8qA35nGVk0LF0OesJNXhRx2KgMs0fFOMIqNMO8O
2t26IHo2tCyU+jdyKaZbS0lZEMRQ7tb8jzKGpRu2quljQ/dM9J72VvCoRwjk2XCiSClZZi
kfQq0v+AVvh0Lk45K+ksKw2cN+gKoeCz5hWVryzBHGzTR8kXn7cRn5iKyshIfA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683915305; a=rsa-sha256; cv=none;
b=b0GZzaDs3lCyR4j3Nkj7U19dp7Pa82vVdrrdtkK2C2AvC0WQ1LNnpwXhxajJYsdLvPe8ge
JXTPvSiPkGtykpMmEOYDF/BZam7VVuJkCLun7lwDM+7bRtu9IxhORuu26+dZG5W6X0/9nT
OhwBQ6PiO0wdRXCFC76SOevhy0uX9Z8EF9ufA5XVh9l5wZHizAuLxE80ZJ/J3VQeh93Brf
XQc1ggT857m1rSvTTKuq7W2pfT5uXVSHN0VWJ9YraJwZf/nKMLmZnZlPYA5puC6fmDRwEF
sjedNmdLh0f/Ud3mIQ0pZ2eHWOqknTMD98JYMtU9aNX70R/rLxokT+rKwXkKRw==
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 4QHxkd4MZZzm0n;
Fri, 12 May 2023 18:15: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 34CIF5fK012142;
Fri, 12 May 2023 18:15:05 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CIF5Z4012141;
Fri, 12 May 2023 18:15:05 GMT
(envelope-from git)
Date: Fri, 12 May 2023 18:15:05 GMT
Message-Id: <202305121815.34CIF5Z4012141@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 443c6bcffe08 - stable/13 - ktls.4: Mention mb_use_ext_pgs in the "sysctl nodes" section
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: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 443c6bcffe089e4d0c80de2c69745751636e51bc
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=443c6bcffe089e4d0c80de2c69745751636e51bc
commit 443c6bcffe089e4d0c80de2c69745751636e51bc
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2021-05-26 14:20:37 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-12 18:14:48 +0000
ktls.4: Mention mb_use_ext_pgs in the "sysctl nodes" section
Reviewed by: rmacklem, jhb
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D30403
(cherry picked from commit 27130028a583273071a14a3256f8ea0a131f2dd4)
---
share/man/man4/ktls.4 | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/share/man/man4/ktls.4 b/share/man/man4/ktls.4
index e88895ab7fa9..876e9fa57ac0 100644
--- a/share/man/man4/ktls.4
+++ b/share/man/man4/ktls.4
@@ -31,7 +31,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 20, 2021
+.Dd May 26, 2021
.Dt KTLS 4
.Os
.Sh NAME
@@ -199,6 +199,11 @@ A tree of nodes containing statistics for TLS sessions using
.It Va kern.ipc.tls.stats
A tree of nodes containing various kernel TLS statistics.
.El
+.Pp
+The
+.Va kern.ipc.mb_use_ext_pgs
+sysctl controls whether the kernel may use unmapped mbufs.
+They are required for TLS transmit.
.Ss Backends
The base system includes a software backend for the
.Dv TCP_TLS_MODE_SW
From nobody Sat May 13 00:54:19 2023
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 4QJ6bH4gzyz4BftQ;
Sat, 13 May 2023 00:54:19 +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 4QJ6bH4BQKz3tbT;
Sat, 13 May 2023 00:54:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683939259;
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=hCsdZxXRoOkXXAm1W4AQ2fMUAlHiIvNKVLKttsKRyGs=;
b=BfjRsJ4aq1rcFIYNyRlwp5Yi3YUV1NHh6oEz+3loudcgsXvsmG2VJXP+xNnfm+amhMBroU
1ydl8MWDnylipt1J14qp+5OP5qJfeICuPbqwQRdJ+Lxvj3acImGjgNN3aKCpeX/E+DDDH4
0lj19bAL6dZCBUYpvlCQ8vgG6mpBlgggiAuCMbaB2UcdVBbY8cWKjhNSj1itqyqogv4M2l
zQBA0xoBKi3D60jvNgP7hjue96SX6ZtX093NM1J7dsQZyWnERdZ72Lt0ItBMm821LLP6Y3
MAqd6yQgbDZZffGmSbzMJCeaYPCXJN8CY66tSZS94AYkvD1+GamDZyZOVaj8Lg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683939259;
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=hCsdZxXRoOkXXAm1W4AQ2fMUAlHiIvNKVLKttsKRyGs=;
b=Dm4ZCxJbWfHSxcxZwnFHbZrXAvK9BiWpaHitll1g3H1j1qdA9cyKxziMCuar7QyJ8Wgo69
Xt53kPKLs/MYn367uCEKeqskrKdbMZeKYQzukb+Sv8TsFtjfq6vftHa7mMRGkIbkP7RKg+
ti3Z47O/BpC8jass+pZe70sC/dVR+Il5uB+TxfBIMEtbQJ0+CUtn3nPPv6r9bPDYbM8QsG
OB0aGc6N68YXafyUpd1fN58v3zcaxrTGRr9ETea6UVMzsXhQk2+HuKHLXkUmJxHsqSW5Er
bpMQcq7sO+9u2wQ/UAqVB0uF3PP9yPQsEGe0siUkcZNEP6syQuF5p0oZ/7fTww==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683939259; a=rsa-sha256; cv=none;
b=PURQicuXYa3u+XAknwpNkkN+EEIcsML6qOXW7fuG1jOKU4dYGw5p5ipArctHds0Z//rHum
50zJrQsJd+M7ziylX8kr0k6pLD/FL5+/SWyB0uvAmpkYX3HVefaRIBcCGWjbO8Ir/7H4cS
4Gr2o/imiTiltO3I/wmdRHIK4HWr8NpEnRcQcba/KA6msbrorFSBWP/AsqhbXKeSBr15I0
PTcEp9SttsYeC/d1zoKaWtFbMxaZN/d/SMBTTnX+4nv/KmwfjWPLyMa7Quugsmeu0SMHF+
FiyZTKp4BB6rPj8aj/0IDKeS/1Kx+aCNc2O6iszq/yYygUFUVxIKb6J0oIFbEA==
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 4QJ6bH3FG9zx6Z;
Sat, 13 May 2023 00:54:19 +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 34D0sJIN067651;
Sat, 13 May 2023 00:54:19 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34D0sJKM067650;
Sat, 13 May 2023 00:54:19 GMT
(envelope-from git)
Date: Sat, 13 May 2023 00:54:19 GMT
Message-Id: <202305130054.34D0sJKM067650@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 3e5696773795 - stable/13 - net/pfkeyv2.h: fix typo, meNber
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: kib
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 3e5696773795c31eabecc2eae1161157b34a41a3
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=3e5696773795c31eabecc2eae1161157b34a41a3
commit 3e5696773795c31eabecc2eae1161157b34a41a3
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-05-10 23:52:39 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-05-13 00:53:44 +0000
net/pfkeyv2.h: fix typo, meNber
(cherry picked from commit b6d3a9644d5c73a1903dc39f79fe306b42b86b35)
---
sys/net/pfkeyv2.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h
index 4d607a4d8b13..36c618a62e4b 100644
--- a/sys/net/pfkeyv2.h
+++ b/sys/net/pfkeyv2.h
@@ -431,7 +431,7 @@ _Static_assert(sizeof(struct sadb_x_sa_replay) == 8, "struct size mismatch");
/* SPI size for PF_KEYv2 */
#define PFKEY_SPI_SIZE sizeof(u_int32_t)
-/* Identifier for menber of lifetime structure */
+/* Identifier for member of lifetime structure */
#define SADB_X_LIFETIME_ALLOCATIONS 0
#define SADB_X_LIFETIME_BYTES 1
#define SADB_X_LIFETIME_ADDTIME 2
From nobody Sat May 13 00:54:20 2023
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 4QJ6bJ5KlSz4Bg90;
Sat, 13 May 2023 00:54:20 +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 4QJ6bJ4kfLz3tbx;
Sat, 13 May 2023 00:54:20 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683939260;
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=SXVPXtb0d7su93UzC/0K0LSawleA6xl5Ll+d6fw08oA=;
b=P8GuqU/AcvKV6p6jpyiIiiQtY/utlF3oapCNzc6I3tKxdvjBBW/q5XCeG2rZ8RfR/uA8hc
OSqAQdOdNxx4vARcMYhCS0pcmYhIkyc4TnpP1VQ0WCcBxn4nlR4+qa0j/nRoN9m/O0/fh8
z/J7KKNPBD9arei8xI8x81cfPoAWoux33iHshSEdJgmIWA8Pi1CuKvaZfN1amhT3owF2PC
5SpMmvdKPsD/EzDY/JYdc31eGcHbnr6+TuMOxipuxfSnCOFa89sbvGUitDap0QWuuaDu7W
8ukQC1XQSjJ4xLrKKMuAHfotGGwzlA5sQxZz4eAuZOtG2OkipuxOfHceM5dt9Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683939260;
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=SXVPXtb0d7su93UzC/0K0LSawleA6xl5Ll+d6fw08oA=;
b=J3KIs09Y6DEQgI0po6Wmpo4gjT2k9tUa3b+JJo+vMCJO7IYyoyx7MVwdAqxzerVRceRYmP
+r0bTMDA6ZG2GqnmprB4PuseT9tjwK81U2uKy/7YFdJSB3/Cacy3c4u4dyC+j0NM2818re
+bWGeKPTsbEtMIyYQIVqmqADuqsirExqohOjO49hNGdc+DBATlsCdVqW01yvRj2MyggjYk
Gx8PlbJbgh3MD1mN7o3QV0QaztPs6NEMM6Ko+DEbVFmhC3SEkkjiFcEVZ0e4eGyIVIYv5r
FuQ7JVI3bvjMhYcsmcrlni+1XhhYmK6HaiYVzkt7fDnCRfn6PB7YwlH65e/KcQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683939260; a=rsa-sha256; cv=none;
b=MsZaepVDoMJCAhxQaGrgFRBzuKPOKTBCj3AxIr8+sT2fTZEmCuYTPjb08Ser7CWFxnMMjD
YlIEsSa14w/CFZ/VNfZFYBRo2URHDcklzK9E8MvrEZovocbwm4jUcfWp9UT7MXYhtwtH4r
44EmCNV9eZyEfPoFva9b5mpeJ5tmEhqP6cGSyFJcbGoiTyQ1fWad7eWad6ncANcSAlrd6B
lawEzeQdICoIZoX17LaFPOHtiEFbWs3dEIB3atyYxCTFoDlcm1DyFMLOdz0miQR7ZQ9hW/
6OMOfDu/8stad4flMg8iciANhE9bcizxSwdCRh5mW7Vx+E0Yp3kWXyYAeliPlg==
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 4QJ6bJ3rWyzwt9;
Sat, 13 May 2023 00:54:20 +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 34D0sKkL067670;
Sat, 13 May 2023 00:54:20 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34D0sKVw067669;
Sat, 13 May 2023 00:54:20 GMT
(envelope-from git)
Date: Sat, 13 May 2023 00:54:20 GMT
Message-Id: <202305130054.34D0sKVw067669@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 9bff554c25ac - stable/13 - amd64 MINIMAL config: remove sentence about acpi
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: kib
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 9bff554c25acf6b0a846688461a4e238c8f079a5
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=9bff554c25acf6b0a846688461a4e238c8f079a5
commit 9bff554c25acf6b0a846688461a4e238c8f079a5
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-05-06 11:21:13 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-05-13 00:53:44 +0000
amd64 MINIMAL config: remove sentence about acpi
(cherry picked from commit 3a8c69c1ff56b8f55a3ca87b1cb2513b5072a150)
---
sys/amd64/conf/MINIMAL | 2 --
1 file changed, 2 deletions(-)
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index a55a63d6b3ad..c851ab6c6d84 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -8,8 +8,6 @@
# Exceptions:
# o While UFS is buildable as a module, the current module lacks
# some features (ACL, GJOURNAL) that GENERIC includes.
-# o acpi as a module has been reported flakey and not well tested, so
-# is included in the kernel.
# o (non-loaded) random is included due to uncertainty...
# o Many networking things are included
#
From nobody Sat May 13 00:54:21 2023
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 4QJ6bK68xjz4Bg5s;
Sat, 13 May 2023 00:54:21 +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 4QJ6bK5lC5z3tZW;
Sat, 13 May 2023 00:54:21 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683939261;
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=aSHqYR69T52hkuFDJdndRxpjdTP6d4HhBXFNiQvgrPs=;
b=ajZ8AFI5WIds/hqoZUyu7zGE1IypqjFm0SqIXJwyGwcei7Zy6Hy3sRoPE5mqBVR8R2PkUo
eyYupJN05yli8tmYTMZ06/xM3Z5CsPdymp/CuqopaSqjtdm4zZaYpa+yftx6IgEAbKPyUc
8R3GjJ5q4Cuzzp9M9B4bn6DJri08lZo2x8VyyZolXiKojHFgn4CRUhYPE2BrHjQG3t/1nv
xix5MHWIn4WmydPL59v3In7k85Lp4uSPPKKqCoiWmAB6AZf2EqH/A4DkMkxqfRVPqklqD9
mzroYuvKBdCUil6/f1fzkUcMrHFaVOFa0W07TdoaUKI+YJjOfdyI7Vyzhh/I+Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683939261;
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=aSHqYR69T52hkuFDJdndRxpjdTP6d4HhBXFNiQvgrPs=;
b=ufNe4+0EMLuKZX3nS9WfbJlykDKb/nlOATxOXvcnIaqoxc5J1A9FUE6C5G+jCRKDgFp4Cz
C2X9SmZD1OmZUgy0eXe7/qBF9chQBed/zj8nykpFHgvZYGWzGXSbIp1ugbTiY9frav+t3f
sTBt+TeCzARCH3HFWFlCHVzg45M9yIzAcdUBiK1E+zPrUgcSY1kVUkOixgftFOFainB7Ru
bFI7p3gFC29dfLhimFbePCh6uBCylPx4vqhM3uoov4Bt/4MPsPMn2lIvYzrBqX/qIlcKOj
IY1pR2yiCk0Hp1PSSy8QH10qZFcU2zeNgIhm5bUICT4qYM5//tNQYjYlBOhFtQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683939261; a=rsa-sha256; cv=none;
b=tpRHaR6o7FY7DrtPgXpQI+dUf4hR0ESxjt5IEYZ96vf5d80hiIh0qESQ7D8rlDQ10Ghqde
w1NFkAD5yatnRI4H+m/4NPZjZNiomx6jle0d1Cq5vJzJtlGMFzCLUdJ46ZrzaqpFnv5hvz
67PlYUMXg6MYLFfPLMxNI96SrvbdLMKGxqV3HtPJtozhglikesV5p8KVhmru9tQFZQQUxD
4WKekxQ1JAKqOcltTzQwuragK4GLEfjYp9aNBLH03ST7qGsxjOCTQFOc9QQdIwKGz38NAN
FQpDsGXUvvILNY55lyR7uN5LYQqYji/bUJsSPyUlEcTN0B03IcvSB+m0AxnFuA==
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 4QJ6bK4lM4zx41;
Sat, 13 May 2023 00:54:21 +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 34D0sLmX067689;
Sat, 13 May 2023 00:54:21 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34D0sLD6067688;
Sat, 13 May 2023 00:54:21 GMT
(envelope-from git)
Date: Sat, 13 May 2023 00:54:21 GMT
Message-Id: <202305130054.34D0sLD6067688@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 32e3c90b242d - stable/13 - amd64: add MINIMALUP config
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: kib
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 32e3c90b242dc62097f0cb53ac3697ad1c7cadc5
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=32e3c90b242dc62097f0cb53ac3697ad1c7cadc5
commit 32e3c90b242dc62097f0cb53ac3697ad1c7cadc5
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-05-06 11:22:58 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-05-13 00:53:44 +0000
amd64: add MINIMALUP config
(cherry picked from commit 38843fe0f27cb93dc50a3b0d7ba9a958c0581de7)
---
sys/amd64/conf/MINIMALUP | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys/amd64/conf/MINIMALUP b/sys/amd64/conf/MINIMALUP
new file mode 100644
index 000000000000..0dbddbe5b341
--- /dev/null
+++ b/sys/amd64/conf/MINIMALUP
@@ -0,0 +1,4 @@
+include MINIMAL
+ident MINIMALUP
+nooptions SMP
+nooptions NUMA
From nobody Sat May 13 00:54:22 2023
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 4QJ6bM0vsBz4BgB1;
Sat, 13 May 2023 00:54:23 +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 4QJ6bL6bbYz3tlc;
Sat, 13 May 2023 00:54:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683939262;
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=uatODxQqaVeg3o0QCrKudtXu+AUobpK6Nd5RDUiI0qM=;
b=jnr6M0b3QlVS+odgskWrIO7TNA6Mn9Cc/gtnnAjwVWX7hPSPGwV7tw6UAVDjcUQ/sLeNye
4r5thdX0y83Kbi9xYlucIXEo3gAKLDy50ty5ikFgAc1CUy6r7cKpBSh8vpplsobqpIsIx3
Qfg2teKkLR5C2z2iARC1kCoDtQgH3QpWYdGbRvUj3Vs9YY1ekjRsAil9RXIyxG3T4g+9YW
ruo5aAnrMKuTfZAJ0Q2ZDVb9V0VFdPB6aGtg/jPEBOYZA7Z/Qu1sIHsx/uI4MGr5Q3xCyy
e+DTyUBAUJKEyNktP85Rsb6DW8FNg9KaxJrW4U7cESCP1SjW9MwLfMKu6g83Og==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683939262;
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=uatODxQqaVeg3o0QCrKudtXu+AUobpK6Nd5RDUiI0qM=;
b=Y530xnb9GwvAC7kTfga7q60Dx4V00xTbgMESgzV+ZBpMGnjqFoHMCvIVFkFSScnNKGxRtV
IuI+HQHRLXjJ2KrDCaEcV8vbQnX/+VfOeS+WESsOnlR5HkV4FQhk5zfOaCns/C5C2T99al
k6fMzbm+5AV5vwBxMIDZFy8vezeSPC5fUcRnHuuTXTQQ+NC6y7NWgTlHkMA8ub9SOxCyHq
APGS9j3m0rUHepzZhOxmm5dhfcv08Bm0z5Z7iNnmNbwZXjb+CfXkZo99UqqsVnFBmCQ70u
Xv47k4TJUpNVpe7jLURVMcP99ZsD+ojIsKwh3V91Ife8f1g08UnF/JfZUjtHNQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683939262; a=rsa-sha256; cv=none;
b=VnJZbpycZsC8eNnjQW+FM4xSiVeBjKd+tVNJWDN8B4NSjV3Acm2o+ihkLXqA7uUZ8inoMO
3OepK2biGtsKl6byEarJopWsj+ewVEmhphvASBTqJ9LEYDWW2YfHL7T2SjoWkurPjY/qR+
WVW/y/sy+QRS2ri1meLb+5Y7le4v9pbxjLhU03307Z/mXm6zH7AtB9HPzePbfanKU2YSdQ
b3T9uBR9+FBAOJ/3W/RCq2qvbIa3FXWQMm9QLtVaCUp7IQkXiRl07neCJBxFq6xAeM2UFq
uyzw3HaBLCjI9nAVlQUAr+rd2Op0/qN9dS2bd++YbixZklg7dI7EBEmZ3cfqEg==
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 4QJ6bL5fyGzx42;
Sat, 13 May 2023 00:54:22 +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 34D0sMft067715;
Sat, 13 May 2023 00:54:22 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34D0sMXH067714;
Sat, 13 May 2023 00:54:22 GMT
(envelope-from git)
Date: Sat, 13 May 2023 00:54:22 GMT
Message-Id: <202305130054.34D0sMXH067714@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: d99c8134bbcc - stable/13 - amd64 MINIMAL config: remove statements about UFS module
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: kib
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: d99c8134bbcc5c989e369dabe36eebe33b8e12bc
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=d99c8134bbcc5c989e369dabe36eebe33b8e12bc
commit d99c8134bbcc5c989e369dabe36eebe33b8e12bc
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-05-06 20:01:45 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-05-13 00:53:45 +0000
amd64 MINIMAL config: remove statements about UFS module
(cherry picked from commit bba6249ae9848b97d351ce04061c06d5e8ad8f9d)
---
sys/amd64/conf/MINIMAL | 2 --
1 file changed, 2 deletions(-)
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index c851ab6c6d84..64b8608594c6 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -6,8 +6,6 @@
# modules.
#
# Exceptions:
-# o While UFS is buildable as a module, the current module lacks
-# some features (ACL, GJOURNAL) that GENERIC includes.
# o (non-loaded) random is included due to uncertainty...
# o Many networking things are included
#
From nobody Sat May 13 00:54:23 2023
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 4QJ6bN0rfxz4Bg5w;
Sat, 13 May 2023 00:54:24 +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 4QJ6bN0Kmpz3v2P;
Sat, 13 May 2023 00:54:24 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683939264;
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=WbUEZ8gQCa4HqzCht/ajuYmVkSkr13XRWB15tElIJBc=;
b=gaOemEktOorU/LPDz4dQ+qJsEwfvA0TZqSO+nP3GWDMKPkJ3KvyvZZlJuYX5jOwysgztVm
gA1lIAUQK/9gHj0GQJvy4LzoWztZrD9BGRVv8VqSXuj3Da1VPt60f8gBUlAuWc0o9/2A1J
UYrwBukiWElutiRjGt3v6qAycnK3F3lp56IwcBcl6+GVkEMTQx1ymY8F+4/E9kfNpyyDQB
/wJf9XcIqMb1j7MP2OFcPqOPo5uQQAgcFZu4vukPkllBjN7XKCnMNTRvdJsvqHLgkD13/v
iFk34QcaLk6nw8tgbPkQOt19IXCsuv7v3lvs10bzjkWxb6GiQjgxtl0JaF4wrw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683939264;
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=WbUEZ8gQCa4HqzCht/ajuYmVkSkr13XRWB15tElIJBc=;
b=UvxohDMh8B9GkYvNZvMzBCnaRWu8dvkKDBrDH+oVO8z5oT64PVGOsiIzawjNZc6PruJh0V
IOar5r5KAWTu9EbzXP7jYuedEDIlFbyCKZEUocBvi83yQm8Cw/pWuxw3licNFHKqSDWRmR
qUZWjYvLXnBg07Pfb1kLTQH9fQsD9kwsNM1oe3YeLXAb6DuH1VZWubXeJsYIVksDP8NsXr
SEU9HnltmvHTG/yfECu6o5cFBdTA6bXxvevSlut1O/cFVpgPp5F42eImBSC+CnyNrlxFfF
9yysd+eHQysWtTXZwSLeagnOS9MxcXKOkaP/9jX9omA/LfcssaR2bvt1Mg+N5Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683939264; a=rsa-sha256; cv=none;
b=JU2FzlVRS555b3ZNWEos4WuL9M/jejtG2eSdg4FxcSymafoijEWkrhwg2+UTdAPQFdELtt
DLaVbiFpCUbd3Oo8yd9zUI37OSXr25pLRc5wMxqKJqAhEHuDeT9IAtmavPwlyXAifmCkIL
OS+nOMGVAd/H+t84fIG6HMBkQbPK1Gnk/dv6q7BZBJZ2ySuxcocRo+LpAt8iOLcJT6nu6C
mKnNFP7GvJQhniyTwvVCXdnUkr7/s4kDtX2UqXRyFSfjqhtsilE6qjNmE8hA7vh+csXQrJ
/q0LGYyFTBFJPkC9qtU6u2i/LdLuVg5YTDiWK8NZEhVOurxU08RwlT8emaejiQ==
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 4QJ6bM6YvBzwrC;
Sat, 13 May 2023 00:54:23 +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 34D0sNXG067734;
Sat, 13 May 2023 00:54:23 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34D0sNwr067733;
Sat, 13 May 2023 00:54:23 GMT
(envelope-from git)
Date: Sat, 13 May 2023 00:54:23 GMT
Message-Id: <202305130054.34D0sNwr067733@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 066d2b67be7f - stable/13 - amd64 MINIMAL: remove UFS from compiled-in list
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: kib
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 066d2b67be7f70498b8c30cd396fe5a6b3e7555b
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=066d2b67be7f70498b8c30cd396fe5a6b3e7555b
commit 066d2b67be7f70498b8c30cd396fe5a6b3e7555b
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-05-06 20:02:34 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-05-13 00:53:45 +0000
amd64 MINIMAL: remove UFS from compiled-in list
(cherry picked from commit 0c1c5e36ebbb7e30a5e57a044a20ea2c4f7cf793)
---
sys/amd64/conf/MINIMAL | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index 64b8608594c6..c00348e9ddc3 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -41,7 +41,6 @@ options INET # InterNETworking
options INET6 # IPv6 communications protocols
options TCP_OFFLOAD # TCP offload
options SCTP_SUPPORT # Allow kldload of SCTP
-options FFS # Berkeley Fast Filesystem
options SOFTUPDATES # Enable FFS soft updates support
options UFS_ACL # Support for access control lists
options UFS_DIRHASH # Improve performance on big directories
From nobody Sat May 13 00:54:24 2023
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 4QJ6bP1vwXz4Bg94;
Sat, 13 May 2023 00:54:25 +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 4QJ6bP1FWKz3v8b;
Sat, 13 May 2023 00:54:25 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683939265;
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=b5UpG6RUw/ATNdS97mixtDIxvaKhmRoKDt9cZ9IMfzE=;
b=VDjNq80VJTukhzPvfoJrTa+CURqC1Mgz6DBMCRc1PRyCfTWcvFnKJzJZci8joeiz6tKm66
lphdqyhHbWQ+XDrt6AvJ4BU/Q5hw1wGNCcNGekuY9ZBV3dSdXh75ehnwzQoHQTHueLleH3
JnRq2mOarYJDR+oULaIweYV3vZhJgvs0diSbEIGTBLFBSrnso6ElrIgX8u/Rn2zygSHvRP
jCNT0gW6lzAEgkYdNyPn9ShQTIFezHFmkUhicGvpePA3Jvkb5nnGeaXhOnngDw0ssVCx4s
OJ1YFT2DjE6BRI+lQgy4GjbpZ1TyqLAWSzMy+nvhBVq+uH6+5Rz19XJ8sMuDQg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683939265;
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=b5UpG6RUw/ATNdS97mixtDIxvaKhmRoKDt9cZ9IMfzE=;
b=KRKVzdg4zK5qoikx3duBHZTTIPd+G4W61F3OvfTQ2TQjCoSj6XkMPC782OA8TMRFMbzV65
YvRoM3j4uT8r0Koz4nGLjQrRvQ0gY3DzNJxUwozOly5OWdIfU8FwW3z0xcht8FV9DjA3Kj
qD4QgIqQ9tYdmgmrDqYtdgZcWtY1cmLfAcrLwyTduU4ltGnAsLNH5lEPviL1EN958+YzCV
zgF4WdeV3oTIoWiNjlvkej4EMI27ypKeNoSmEOXQqqZpPTfQANQD7+icQrLj/NyPs9lXqP
wKMDzwSQFEtKnIi3ejwMnwOGKbW3o6MRl+zYxFi1YVVfOBVcnbmbyoBe7xt3DQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683939265; a=rsa-sha256; cv=none;
b=MxIA9MUtg9vlGCh6qCQA3JBWSkzU72xaBkPw6kdpe6Y9SGPix755/z/wu1sUfU5NTuPaMk
q+1aTwrBxCYTU5YVI4KqGWS4IEI1pojZsoA2YaWKT0kKEGcX1yPOkpk1Sq6BYEQUxMyYZc
F3lTBjI5N1e8eDbVuOC/F1xAcODntFMyVHmIKNYliP2ZjAyg7Q8pyINEgCyhb02DLZUGQT
IUbZO2xa9Qbakkv1TPkrk6Bxv/3gKkuDtP9pUrWfUpnqViFIfZ1VIhxJDXWqxL5QWeyVts
LmsPCZUmxo90cIy54QYhB+40umkHn03UbjicjCS+RlT33ZDr7ach3IcBrCWvmw==
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 4QJ6bP0MD1zx43;
Sat, 13 May 2023 00:54:25 +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 34D0sOI3067753;
Sat, 13 May 2023 00:54:24 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34D0sOQL067752;
Sat, 13 May 2023 00:54:24 GMT
(envelope-from git)
Date: Sat, 13 May 2023 00:54:24 GMT
Message-Id: <202305130054.34D0sOQL067752@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: b1e09025dfdb - stable/13 - amd64 MINIMAL: SysV IPC syscalls are loadable
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: kib
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: b1e09025dfdb3795a6e2011c4a50b99dd61c2f2d
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=b1e09025dfdb3795a6e2011c4a50b99dd61c2f2d
commit b1e09025dfdb3795a6e2011c4a50b99dd61c2f2d
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-05-06 20:03:07 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-05-13 00:53:45 +0000
amd64 MINIMAL: SysV IPC syscalls are loadable
(cherry picked from commit bf864c3ed5830785cbc4dcc8b832c14fdc7110e4)
---
sys/amd64/conf/MINIMAL | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index c00348e9ddc3..eda191fb47be 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -59,9 +59,6 @@ options COMPAT_FREEBSD12 # Compatible with FreeBSD12
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options STACK # stack(9) support
-options SYSVSHM # SYSV-style shared memory
-options SYSVMSG # SYSV-style message queues
-options SYSVSEM # SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed.
options KBD_INSTALL_CDEV # install a CDEV entry in /dev