From nobody Tue Nov 03 09:02:07 2026 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 4jJjJ02mFkz6yPZD for ; Tue, 03 Nov 2026 09:02:08 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jJjHz5lCHz4KJY for ; Tue, 03 Nov 2026 09:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696527; 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=R0eL2xc6vdyMJVINrjhqcNTVmYeF4FJGprSUl/KZLiA=; b=x9sJ+1L2cBu1K2TEn0mFRoShaG0IovuKOlRwbH7LQKcnEQmOO+ap/fN5Ns6M11TQ3+YvmO u4K6sANBZyE+m94fk3oHbvYUaM9OE35zDtIA88gwcM2JdzqAPNOMVYrHJ09CZb2bgTdlmf j6skw2G5C8Gk3n/+mtnN3oz7xm4L30qlgSIJwSTvsjhEwMSidb6S8RMCOtNmy+uvrckD3F Q2iZiKvyG3o4aAhrMfK4lXvU92+/qgC0O8HPrSP/kTg1uT6bJAf2SPETA9iEbPXDip9rIy 8JUdG81d9T8b1EojiBEnIXPCSHguz1qimSUUF0sZL1tgNVr2B7bsvhfURTHQIQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793696527; b=ugMGYa1p4mqrlo9x7sdio/OA5LdV3XBKgm4mmvd4YDA7PSHrMgoRWNforRcdzqRqX+63qb JuhOGguDiAz00fOS6Uw/yF/6R8B00VCmJex+qA3HzpwmcYBh0kELQf1MvZe/VjtGjPPjNU ZX+sNUxKa0Ph9y8Lh34kNG8iMNtdzLe31yD4KehYACm4Qphp8TvmwreDo2trqJS/adhv6f GcoNnBNHSQoEl8TaRgYyNPE00wpCGeT5JhwxP1GnQJPyk2h+B0yFQxcts00LOl5s3iIM7y C7MDAh/QyyOd8Cs3DQ4ZmDZ+uqd/Z6hruhFXwUS6F1+WmH6V268fw9xm4NHseg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696527; 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=R0eL2xc6vdyMJVINrjhqcNTVmYeF4FJGprSUl/KZLiA=; b=GFAawvvlbpHlhLKUfFJg3GK9GjnvDnpzSYoBoNUGpAMl6lvp0HB0kwRtkBZAWud2X/dDvr 6N8ovUvJ/7J8Edhmyer3Gl58W3W6uFtbHYsWDXRrceW+/q88ZB+yZ4a9etxHlbAXtbkEiz M5dcE0n4tAtBIIeoIe7UDPd4Zl9zj53l3nXM2DzTdeVBkrZqo8lM0jNAewLd6YyPWVQ4G/ LlT0eqCAPK3yRLb4mdri9+CTjILF+OhyQ1bBMfp0T6r4KAElyS8kCC5tM8wZ8XT+2JGzRl ytXQ4FIadZXnMqfZauwcEc/j+J7Sobp8qlvDZgXu9TzI/gfizmLZKr/8KqSZBQ== 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 4jJjHz5PsXz1PWc for ; Tue, 03 Nov 2026 09:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 454ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 09:02:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6aa36e57d0b2 - stable/15 - amd64: do not pass SYSENTER frame to FRED fast syscall handler List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6aa36e57d0b26f6ccacd10c577c9bb5c3cf57c12 Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 09:02:07 +0000 Message-Id: <6ae9a30f.454ae.6c6758a4@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6aa36e57d0b26f6ccacd10c577c9bb5c3cf57c12 commit 6aa36e57d0b26f6ccacd10c577c9bb5c3cf57c12 Author: Konstantin Belousov AuthorDate: 2026-10-27 10:08:14 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-03 09:01:14 +0000 amd64: do not pass SYSENTER frame to FRED fast syscall handler (cherry picked from commit 8671e823b7678731cd1aaf8850ccde4a2c293527) --- sys/amd64/amd64/exception.S | 8 ++++---- sys/amd64/amd64/genassym.c | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index b596a0ff1b9d..e7f1c9ad5664 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -1650,10 +1650,10 @@ fred_events_handlers: movq %rsi,TF_RSI(%rsp) movl TF_FRED_EVINFO2(%rsp),%edi movl %edi,%eax - andl $TF_FRED_EVINFO2_TYPEMASK,%edi - cmpl $TF_FRED_EVINFO2_TYPE_SYSCALL,%edi - je user_fred_syscall - jmp user_fred_non_syscall + andl $TF_FRED_EVINFO2_SYSCALLMASK,%edi + cmpl $TF_FRED_EVINFO2_SYSCALLVAL,%edi + jne user_fred_non_syscall + jmp user_fred_syscall . = fred_events_handlers + 256 subq $TF_ERR,%rsp diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index 96663a9a2b55..affcf38576ac 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -188,9 +188,15 @@ ASSYM(TF_FRED_EVINFO2, offsetof(struct trapframe, tf_fred_evinfo2)); ASSYM(TF_FLAGS, offsetof(struct trapframe, tf_flags)); ASSYM(TF_SIZE, sizeof(struct trapframe)); ASSYM(TF_HASSEGS, TF_HASSEGS); +ASSYM(TF_FRED_EVINFO2_VECMASK, TF_FRED_EVINFO2_VECMASK); +ASSYM(TF_FRED_EVINFO2_VEC_SYSCALL, TF_FRED_EVINFO2_VEC_SYSCALL); +ASSYM(TF_FRED_EVINFO2_SYSCALLMASK, TF_FRED_EVINFO2_TYPEMASK | + TF_FRED_EVINFO2_VECMASK | TF_FRED_EVINFO2_LM); ASSYM(TF_FRED_EVINFO2_TYPE_EXC, TF_FRED_EVINFO2_TYPE_EXC); ASSYM(TF_FRED_EVINFO2_TYPE_SYSCALL, TF_FRED_EVINFO2_TYPE_SYSCALL); ASSYM(TF_FRED_EVINFO2_TYPEMASK, TF_FRED_EVINFO2_TYPEMASK); +ASSYM(TF_FRED_EVINFO2_SYSCALLVAL, TF_FRED_EVINFO2_TYPE_SYSCALL | + TF_FRED_EVINFO2_VEC_SYSCALL | TF_FRED_EVINFO2_LM); ASSYM(TF_FRED_EVINFO2_INSTLENMASK, TF_FRED_EVINFO2_INSTLENMASK); ASSYM(TF_FRED_EVINFO2_INSTLENSHIFT, TF_FRED_EVINFO2_INSTLENSHIFT);