From nobody Wed Jul 26 18:05: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 4RB1zT4TKpz4pg4n;
Wed, 26 Jul 2023 18:05: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 4RB1zT3p0lz3rhK;
Wed, 26 Jul 2023 18:05:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1690394757;
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=6O25C646pQXU9S4QKQJXnT3KDQD+yKirfdLWYwlgMkQ=;
b=KCL55MiwQQ39+2oI9/2puj/fSljJ/GDCz0F42krDfIcS3/Ft+aVSZov5M9ehLmm8h5n863
qr1bmCVZ85Y/W7PNVy6xkaxAyR5NIhtfgLNC3+5pbVd/7R+LKsh7gT0I0a+8bKrv3c95q3
TZYSFboIQeG4e476/vBdoKQh+Ttib2yIgX0uXDz13BH5bQWaA1m4ErvKnXTYKmQSuT3J/B
0hNWrTx+HpeyMo4dEnAjAFSXDRI2gbOkXSNeNt7hWmcoAoQbyqs9T2k69H6vqaq637f/In
MVOxI1vbeIcBZLJaNMSDroBx4XuQASxt7I18zmNKdPV+W8NlpyX2He9ylYmesQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1690394757;
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=6O25C646pQXU9S4QKQJXnT3KDQD+yKirfdLWYwlgMkQ=;
b=wVEf/fliiEj6dLdmwZFvf/SpTbRJoztg0mxM/T5IuipmI0yNigpZNKmq18TdoYbK5hbxfH
4nCaU8z9TQRol6+0O2IhkeAmtbV8+bpJnIW1xiTlpXP14e0nNyfHfK28O4q8Kw28+QnTJ2
EZBGSQ2BOyeoNs8yV2O9GZRqX3cCe0W4XVUh26yHuTx3IVSSL3iFF7x4CseY9KinQAgyO6
ggs8gOJv9LIvDJxpVCFqiyZHgzlV0owt7HgJzOhv0V/J7ezvdA0BkTOa1sqd67LtnLH32w
eToDtvrRrqUUfADAAQLNjVANGeHDEjYQTbxst23Fhtq9oNrnm9xNp2APqBUCBA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690394757; a=rsa-sha256; cv=none;
b=l9A5tH2vki+z8rRT/aQZN1gnHacVeDYnssHOIoAAi0rnRbapj1hK4hjC4bK5uMZgh48pAZ
pQ/2rSnAINB4FmUALT4NeAumhqNP9krrkE5ATFm1X0sjSrg63Lzrg8t+F4obg8ZavWP3OX
XaT5Lv2IbXrEqEvYO+5Sq1t4Qr899PS/CYvH0gGfrsgoOw58ZWt7yyQVoWfsbUWt4rvZM9
meVhoKL6U1l7T4qv/ZmwQT5t+cF0a6gPPUA5teGV5eBaJg/9Nnt7KLMJrw+2KehwULpMyo
96hvlXbvoU4j4y8qgkJ9z1j8PX1LFKRXwpo5NGTmxUiLDj8O8BgfmK6x8i/nww==
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 4RB1zT2mX5zs8X;
Wed, 26 Jul 2023 18:05:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36QI5v09087443;
Wed, 26 Jul 2023 18:05:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36QI5vjF087442;
Wed, 26 Jul 2023 18:05:57 GMT
(envelope-from git)
Date: Wed, 26 Jul 2023 18:05:57 GMT
Message-Id: <202307261805.36QI5vjF087442@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: f1f27dfa4ad9 - stable/13 - Work around VNET and DPCPU related panics on aarch64
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: f1f27dfa4ad9da53fcdfc6aae644fab83bda4e76
Auto-Submitted: auto-generated
The branch stable/13 has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=f1f27dfa4ad9da53fcdfc6aae644fab83bda4e76
commit f1f27dfa4ad9da53fcdfc6aae644fab83bda4e76
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2023-07-23 13:48:36 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2023-07-26 18:02:37 +0000
Work around VNET and DPCPU related panics on aarch64
lld >= 14 and recent GNU ld can relax adrp+add and adrp+ldr
instructions, which breaks VNET and DPCPU when used in modules.
Until VNET and DPCPU can be fixed to deal with these relaxed
instructions, disable linker relaxation for now.
PR: 264094
Reviewed by: markj
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D41156
(cherry picked from commit 80e4ac2964a11edef456a15b77e43aadeaf273a2)
---
sys/conf/kmod.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index a06f6a2555d9..4a0d828f0159 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -168,6 +168,13 @@ CFLAGS+= -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
CFLAGS+= -fPIC
.endif
+.if ${MACHINE_CPUARCH} == "aarch64"
+# https://bugs.freebsd.org/264094
+# lld >= 14 and recent GNU ld can relax adrp+add and adrp+ldr instructions,
+# which breaks VNET.
+LDFLAGS+= --no-relax
+.endif
+
# Temporary workaround for PR 196407, which contains the fascinating details.
# Don't allow clang to use fpu instructions or registers in kernel modules.
.if ${MACHINE_CPUARCH} == arm