From nobody Tue Aug 1 20:04:16 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 4RFmKK44Wpz4pnjP; Tue, 1 Aug 2023 20:04:18 +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 4RFmKG0KjDz3GP2; Tue, 1 Aug 2023 20:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920258; 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=EOi7JfGdZlDKMYIuNuX8/yg7v3T/0DEGZhGVmK07t44=; b=udxAkq4ldQCh6We0f5xx9SMtOLnqUJF3/wJU2ovgffTIYubWFHGTec3gxVQqNCNjJ9udWP WPaTRV1W9iZz231PWkpUvjcQ1+Y96TdXydrWk3kGTXfZVZth1EDP3fWbiFlL6/WenXcYCJ cswy81cV4kBeaHVU8NQ6WVp7XDUTiISmEyGHJcJiruvyS7Ig67o3vzSHQypSYiicvVSERS DP7G5Vs4BgByCn4RudvndWfyolVjJvzP2/0MAFkCk7vNSplFt6x+slndY3DhAu/r7c0y8n VwMwpm+qWh2ygNvsVaA2png445XUOrhhYadtAVaKlbF8sELsEa1WHii7Gz9GeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920258; a=rsa-sha256; cv=none; b=qVGwrLJylZBtCHVEpG8ltKUfuTcG89tdUqLSFcIZ7AvzhuEjgW7XvP8Z+i1cqm+6i3QY5W m7N7TFEGMbQdSC9iLzKcfhVk6h0O2QFYyzjcEbD33QrfcDV5K7YbnmPF8W15wzwF5wxP4f N1lw8B4l6qf/ATj3MmqH4TFeCRj70E9SoU7q+Uvpo0rJVYR5Iq/qjrcI/zdCyHY3ApdSMv yVRmxvWgl6duyrD/an0/3lNWposv6+MVGUHwEXbsSGI7yGnDO+cFEV2vF4xzDYdL6sYXQo SZHKUm5j0AKs2Q1rpIcdk6wDFdk3v5BJDJtg+P2KFdT/FFKREseKfQLzgtKvLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920258; 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=EOi7JfGdZlDKMYIuNuX8/yg7v3T/0DEGZhGVmK07t44=; b=YbSAVToLuI/Tj2XF1dNZzFVZPxyT1znp/nT2FkI7xRvanlSA5MuV4UEwB9JQ+fPqcXGkYl pG1g3hkf+r36LrcHEyA58uzI0zL1TOEjyfKbnpgFjIkNsCANnWWOp+VidoBawBpIWf9iB+ 02i+G1UQqlSzSPRP9CXNeBtz3QPaBsSfNiEyD36OR6McjvHBQcbUowD/RiLZxkeQv2iWzK GwYn/XoksRG/0b9LXmCIBzAGHtabUOTh9n18fJQgbRFw177TmkPd2Pzxos4Ar6uuim8Khl A7snY7zNgeWmVQzONzheKTwocvjqynYUC1ob3W8zg2jTc5lhnklon68lE7GYpQ== 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 4RFmKF0jyNzrG3; Tue, 1 Aug 2023 20:04:17 +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 371K4G5t013020; Tue, 1 Aug 2023 20:04:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4Gge013019; Tue, 1 Aug 2023 20:04:16 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:16 GMT Message-Id: <202308012004.371K4Gge013019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e3e6fc371322 - releng/13.2 - Work around VNET and DPCPU related panics on aarch64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: e3e6fc3713229e5075473b9e0e9a66699e8a322b Auto-Submitted: auto-generated The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e3e6fc3713229e5075473b9e0e9a66699e8a322b commit e3e6fc3713229e5075473b9e0e9a66699e8a322b Author: Dimitry Andric AuthorDate: 2023-07-23 13:48:36 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:50:47 +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) (cherry picked from commit f1f27dfa4ad9da53fcdfc6aae644fab83bda4e76) Approved by: so Security: FreeBSD-EN-23:08.vnet --- sys/conf/kmod.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 2a2ab1d02277..b616be508ce4 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