From nobody Fri May 22 16:18:23 2026 X-Original-To: dev-commits-src-all@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 4gMVnd23qWz6f6vN for ; Fri, 22 May 2026 16:18: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gMVnc6Vnbz3n5k for ; Fri, 22 May 2026 16:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779466708; 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=R4QOzFOzqvBGeiGDKZ3x2H9OiZufT4h7mqG06xDUG/U=; b=M86515xh5BAbYx16w6hVdKHcFf/GdsDztlHXeaEJRyqCnm9UpF42uhKUEc3v0i12Jzn4jn /VMvY/corfzC6ohF8V+bFdYHzKjb8C9wuz1XXU7lJkOCxTurTN5+xLsbZAJ6FXBPot27qx N/sL0TrCJn9r4nP34sam4IgkGC5r1qke6zD3HHSU1LD6C9B9ycl4oHnssiRGVslbc13vI9 XUY4p3MjCsEIH9nSRZgl5DD5FIqfgVEYdxqmcH0ZG0l9ghqPiT6j8IHehLh8flcu6VpwWR job2Y0Egbnn6mL+pV0E0j/tKM5pLIJusv3X9NJhM+BMIfsJup8Mn+9aCPkUdmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779466708; a=rsa-sha256; cv=none; b=GJbwUN6VjDl7LyX/5PKdk2PRSBviNyHE5nFw5qPKMEAVsy9qoW0NA+xf90R9Qktkw0NYzC jOgjWTykJZKybiEuJm5D7Gckh0PcAjlxMGswZSd3+JED0zIzybe5UymwnQS+OpYm3yNgkm u4bHfVwFXPfXK8B4vxOuKXVqBbM1dc5SDaR97ryJFLukF0ia66AHq6AWM5s5zDsajbN0W+ fz+s+qUhv3Twwd2YYdekmaXv0aPc+tSuif8EeDX2N3GTmE7OrR2kMBw4qHYDJ9dFqQ7ziM BZXBwfzEYpEMmUCy7iZP6v+iHvwMBk+W1oFU2l+ltYJWgI0r8tLu+ApmqFbH8w== 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=1779466708; 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=R4QOzFOzqvBGeiGDKZ3x2H9OiZufT4h7mqG06xDUG/U=; b=bczUZfk3aKiNtu+XYST5TfKgVgAiaeeEX6swDpFDb+unty0rp5ZreJPFuX949bT2MCfaop eJlBvlFDNp0L0LJJhyU/mctTRJN/dPfvg5HzGr6T327rtdaVmoxfe4Q9Hvsva8aVbeZXO0 dtxW4DkBKmffFj1cBPPuxIGjeiFwTW34luwsynTjJGHoJCagZarMv79Hwc9W/VWhOMLb9R 3rQzgIcwMN1FnJguRUxHna1kcLgcOa4Ij9qC85bst01RgIGPE6ySy5jzu+sDrmC86HQh7b Fwt2fqZ61D59/x3WPhheQlhVIz7Fv8pDlW2qv5PMDwf2dWy9ZrL/UuDseOcnZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gMVnc5VSZzBfP for ; Fri, 22 May 2026 16:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2592a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 22 May 2026 16:18:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: bed77cf7c213 - main - vmm/arm64: Compile vmm_nvhe.c without SSP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: bed77cf7c213c3f93a0dc099e4b46c078495a328 Auto-Submitted: auto-generated Date: Fri, 22 May 2026 16:18:23 +0000 Message-Id: <6a1081cf.2592a.122bd13a@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bed77cf7c213c3f93a0dc099e4b46c078495a328 commit bed77cf7c213c3f93a0dc099e4b46c078495a328 Author: Mark Johnston AuthorDate: 2026-05-22 16:10:04 +0000 Commit: Mark Johnston CommitDate: 2026-05-22 16:10:04 +0000 vmm/arm64: Compile vmm_nvhe.c without SSP This file implements a set of EL2 hypercall handlers and is used to switch between guests and the host kernel when VHE is not in use. There is no SSP runtime available there. Reported by: Jenkins Fixes: 8deebce931fa ("kernel: Enable -fstack-protector-strong by default") --- sys/conf/files.arm64 | 2 +- sys/modules/vmm/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index faecea51d5c1..172f79cc5773 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -141,7 +141,7 @@ arm64/vmm/vmm_nvhe_exception.S optional vmm \ no-obj arm64/vmm/vmm_nvhe.c optional vmm \ dependency "$S/arm64/vmm/vmm_hyp.c" \ - compile-with "${NOSAN_C} -fpie" \ + compile-with "${NOSAN_C:N-fstack-protector*} -fpie" \ no-obj vmm_hyp_blob.elf.full optional vmm \ dependency "vmm_nvhe.o vmm_nvhe_exception.o" \ diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index dcb401d2026d..4084822c4f43 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -52,7 +52,7 @@ vmm_nvhe_exception.o: vmm_nvhe_exception.S vmm_hyp_exception.S ${NOSAN_CFLAGS:N-mbranch-protection*} ${.IMPSRC} -o ${.TARGET} -fpie vmm_nvhe.o: vmm_nvhe.c vmm_hyp.c - ${CC} -c ${NOSAN_CFLAGS:N-mbranch-protection*} ${.IMPSRC} \ + ${CC} -c ${NOSAN_CFLAGS:N-mbranch-protection*:N-fstack-protector*} ${.IMPSRC} \ -o ${.TARGET} -fpie vmm_hyp_blob.elf.full: vmm_nvhe_exception.o vmm_nvhe.o