From nobody Wed May 28 12:02:44 2025 X-Original-To: dev-commits-src-main@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 4b6p6D6V45z5xQ3V; Wed, 28 May 2025 12:02:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6p6D5gZJz3b57; Wed, 28 May 2025 12:02:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748433764; 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=DQP0MdaqrbfHlPSEZkvppjQ/1tCbtOCR8H6NgDnSyWk=; b=kTfVoipfU/4kBV74wh0poo/XLcKL0IM9tGZTzhBLvmebMdod+CFjhdCP1kk6Qe0L7CahS6 kucLgs0JTkL5qMUKuzccBFZGfJlfWEnIbg8awG/IHXOxB/KOaON8yn3bEHDxpTPi9kU8r1 wiGeke+80f6vtp0mL2Ua+OR78TAKNkO9aFwxsT56sqlqOB6i7g/wzVrioGMt4nS8MudXyn TobaAXyJRfEn5tT1BiGvcYpaBRGAZLJwOWva6rzqjYbigV3CsSLgn0m9gEORtY6CKIiwY8 JGN06GJynlaqWxn54+3l4gtdGQtZAfRTXA7DnelunNKClwbWSKO2oSPJjUuItg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748433764; a=rsa-sha256; cv=none; b=sf+OsFHg3QacxP9i2buwUmQ1DfLZbhpov9Pn9KVQJFzf0UTC1+qI0uDdQApPX4lPAEhu9Q BDUKJ+e7Sd8MdlyJa5Ho0oMNweO9paHW/A7ab8heq8YxsfRxUwy5y+RgSTjflEkkTJ3P3v 3o4Gi5kcD8PpJ55QA3kRuGuirUBQliXEcBl4qwLLUUH1fqWOAC6r+vumqLrOGe1p7Zh4Mn ng4yBxBJ7V9drslC6+Mo42kqkfQUzOy8ysaXgzNUIEkXJ55h2YXX0+YeoMre2elQaWNw7K lNm1xy/tVE2Nk3S+P+aP6YVcNCiCfnt8I8+O3G+DkwHwyW1uF6k5SfYWQ4RohA== 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=1748433764; 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=DQP0MdaqrbfHlPSEZkvppjQ/1tCbtOCR8H6NgDnSyWk=; b=lp+5W6VLc+00+OpC2K2UuPGHv5viI5hd+h02KrVIq3EHZGzKDTrd5FCjm2/Dfat4/oUkKa KsrHToYAa8oGGwGjCz3YH6/8HZs4bWd5rB0fnK/e8Kje6reKY/zbJmGTfmtAfctnwFXNqU +2Z140RWANqckMPMd+O0/aH5dFLL6Z4D+vSGVBD1UGSGEfsqNfY5yO96ZvFMHXy6PoVvB+ UbWySa5Mip5ZdjSi6WOgpsHevPCxA9H4Ogx6ICPhh5rEamVZSHVopereLoZfRLKsEd4x8i +qYimDtm/McKsqEKwu0mg4NRyV3Im9flfpJ6NEY+5MOj92vMh6emMeL0nU/vag== 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 4b6p6D530Nzcyg; Wed, 28 May 2025 12:02:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54SC2iaE049191; Wed, 28 May 2025 12:02:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SC2i44049188; Wed, 28 May 2025 12:02:44 GMT (envelope-from git) Date: Wed, 28 May 2025 12:02:44 GMT Message-Id: <202505281202.54SC2i44049188@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 71186b6eaa07 - main - amd64: revert unintended changes in ia32_exception.S List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: 71186b6eaa070dda5229af374b584e5f65ce5fb3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=71186b6eaa070dda5229af374b584e5f65ce5fb3 commit 71186b6eaa070dda5229af374b584e5f65ce5fb3 Author: Konstantin Belousov AuthorDate: 2025-05-28 11:58:48 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-28 12:02:23 +0000 amd64: revert unintended changes in ia32_exception.S The result was the missed %r8 restore into the protected mode context, which is innocent. Fixes: ddab534cd6f6557740c24ff2019642880ad8bef6 Reported by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/amd64/ia32/ia32_exception.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/amd64/ia32/ia32_exception.S b/sys/amd64/ia32/ia32_exception.S index ef1a2c59a0af..42d0ff6c638b 100644 --- a/sys/amd64/ia32/ia32_exception.S +++ b/sys/amd64/ia32/ia32_exception.S @@ -54,10 +54,10 @@ int0x80_syscall_common: movq %rax,TF_RAX(%rsp) movq %rdx,TF_RDX(%rsp) movq %rcx,TF_RCX(%rsp) - movq %r15,TF_R15(%rsp) call handle_ibrs_entry sti movq %rsi,TF_RSI(%rsp) + movq %r8,TF_R8(%rsp) movq %r9,TF_R9(%rsp) movq %rbx,TF_RBX(%rsp) movq %rbp,TF_RBP(%rsp) @@ -66,6 +66,7 @@ int0x80_syscall_common: movq %r12,TF_R12(%rsp) movq %r13,TF_R13(%rsp) movq %r14,TF_R14(%rsp) + movq %r15,TF_R15(%rsp) movl $TF_HASSEGS,TF_FLAGS(%rsp) pushfq andq $~(PSL_D | PSL_AC),(%rsp)