From nobody Fri Oct 09 14:50:51 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 4j1VD13zL7z6vb41 for ; Fri, 09 Oct 2026 14:50: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j1VD11yVpz4Q8K for ; Fri, 09 Oct 2026 14:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791557457; 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=5dG3Yf4X5ZEam/qVSnps6L6brqODHGMUIlIc4jB0t0g=; b=vnMS9J2FC7brN7pv1hvFr44qS2jT+zvsnH4Ni1nk5KkMvyd2RrTOiw0BGXynt7x5kmU74+ EBP5o4dPntWsEvt93iW+gTD5aUyH0V6bm9cIe6S2MrOFsNXKaCFjMFf2ocCcAMm3HCyqqj Md+M6b2D2rN5xtCPFV82mpUoJty6xK8tGRUJj9X9+nPUZoY3T+g8yJB4pUkCXbP8kn+dzU JIZKsMjyGa2ejm0eftgCvPL5YBjhhOi870VmxXHRpRQODoCFcdNVMv1w9EjL7VXdImuIWk Q4Ou2FocjVd8rhHtoNaI0gMDRZCZ4Ht85YbERB1Jt01/SIPgmj0PC8mu6OQolg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791557457; b=sOM+JEsZgx6u4nD4nF4UqehBNfmRU8jl/hshr8tkAbPfvm6HHoccz6uQDV1mOCJ+M0A4Fc lrOp2oEGf1wDOnG1lAR+mMkEsaKHzJYBZ/0ZdixJp2sOENrEZlv458chuC8Leb04sCcpDW QHJWDfZ/jvKFZolDhcJU8yJDU1SjkugCbC5NiwI89UcnxLtb1CQKL5YkDsC6MYFZrmKfE/ uv0ymSvnqiD9Hy1ubEkpl5M9Qtz5JbA+r88M8KKE2y1CDxMLUCORraHP1IZ6u+Zm0IEBNL RPQwwNlNhrqihR7MgA/MWlvVfSFpdSYUxYInrwgz5JasfYti/BEAI1wYrBpsNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791557457; 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=5dG3Yf4X5ZEam/qVSnps6L6brqODHGMUIlIc4jB0t0g=; b=McnRdo0z0B5cLSgsGjpg/wjgU0mp+g29UND2Uf3cMfENa4GnlVkfSdKcpTS2YrsxSeNysx rIXNkGB1JpdVYPoY1BiSCqJKWFm2wbvvryp9b6f2TjffKUfsORwhaofT6R0eYDivXDXbox fM5sDhy+0PUi5NnDWC1uWemiBPeZUEd9yL6NktbEtgKWomJg236/QaHOCSqkjqAzJF0d2i izCpglLkYJtkgjyA+iiRzvqgCbrKwfTUtjBLYNQvPKuotH/367+XEQvhTRmChuHHiF8Srx QEWj9kPeE+hr5NHMWVMYhoZOel1se5rrwUXYlZIqAUPPvs90KabSSS1cA6fn/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j1VD112FXzFL2 for ; Fri, 09 Oct 2026 14:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a0da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Oct 2026 14:50:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 74d971fe1561 - main - x86: Add external retpoline thunk List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74d971fe156113cc63add2e6701e369c93c4f52b Auto-Submitted: auto-generated Date: Fri, 09 Oct 2026 14:50:51 +0000 Message-Id: <6ac8ff4b.3a0da.3a63d1a2@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=74d971fe156113cc63add2e6701e369c93c4f52b commit 74d971fe156113cc63add2e6701e369c93c4f52b Author: Ed Maste AuthorDate: 2018-03-14 14:53:34 +0000 Commit: Ed Maste CommitDate: 2026-10-09 14:50:40 +0000 x86: Add external retpoline thunk This allows use of -mindirect-branch=thunk-extern, and is only a few bytes of dead code if not used. Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D60524 --- sys/amd64/amd64/support.S | 10 ++++++++++ sys/i386/i386/support.S | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S index 1d7d05843ba8..b037e03f87f2 100644 --- a/sys/amd64/amd64/support.S +++ b/sys/amd64/amd64/support.S @@ -1996,4 +1996,14 @@ ENTRY(cpu_sync_core) iretq END(cpu_sync_core) +/* External Retpoline thunk */ +ENTRY(__x86_indirect_thunk_r11) + callq 2f +1: pause + lfence + jmp 1b +2: movq %r11, (%rsp) + retq +END(__x86_indirect_thunk_r11) + .section .note.GNU-stack,"",%progbits diff --git a/sys/i386/i386/support.S b/sys/i386/i386/support.S index e5e39c9ec5d4..cb6420750f77 100644 --- a/sys/i386/i386/support.S +++ b/sys/i386/i386/support.S @@ -587,4 +587,14 @@ ENTRY(cpu_sync_core) iretl END(cpu_sync_core) +/* External retpoline thunk */ +ENTRY(__x86_indirect_thunk_eax) + calll 2f +1: pause + lfence + jmp 1b +2: movl %eax, (%esp) + retl +END(__x86_indirect_thunk_eax) + .section .note.GNU-stack,"",%progbits