From nobody Wed Aug 31 01:32:14 2022 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 4MHRVk5NYtz4bq8s; Wed, 31 Aug 2022 01:32:14 +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 4MHRVk3tMJz3CXx; Wed, 31 Aug 2022 01:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661909534; 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=FtyVUGr+9FlzIgVQtwihnASX7CWgIR2OrITmL9BhprQ=; b=AAbRaBQQy7iNCiBaZUsg2NsYz4G/U2vJUH1F53Zw+7Oe9XYFfGEUsFcnFW4aXw9KCfO4Ap kI/F+P4XdTpNzEE/IUthoqjOcK6ax9yTzstzowzixlCw2qQxqQl3XR8PwWFdQkwxm8LoUe nnqA5iwPuDma43yaFFipt6h6EqX8jGXb0H6ABcUmByhYXc4xt6sOvB0TXb3OiNKJJ1fCeu 2aRHbhCKkw3s3hrLJozOzk8Rx+hjnoacLqKQKXfUk7UnL9CRMkQw1dyMLyGZl2BdWWf26I 4zMlLL/xzxuFHNWMrCGD79GPOpe5Zk38yc4IQyyu0gI0Y788BtQ46BmiPqBSlQ== 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 4MHRVk30H9zxxy; Wed, 31 Aug 2022 01:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27V1WEeD033183; Wed, 31 Aug 2022 01:32:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27V1WEoj033182; Wed, 31 Aug 2022 01:32:14 GMT (envelope-from git) Date: Wed, 31 Aug 2022 01:32:14 GMT Message-Id: <202208310132.27V1WEoj033182@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 79ceb5107b3b - stable/13 - i386 doreti: stop saving/restoring %ecx around calls into C 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 79ceb5107b3ba5d917d529221f00b6087b6dc64d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661909534; 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=FtyVUGr+9FlzIgVQtwihnASX7CWgIR2OrITmL9BhprQ=; b=qZetdfZZmq2jewgZESui8MqETHh2ufRwxsVQkcLJM7nBh+9yCBHW8tCU5eAgMHzgRUPjmF aK9A7lw1zxqHIyEYzmSQxp4hBT8zb9iQIhhnmWgXEtTofe24YnC35jwlwwjfJjuFFSSflt zdwwIRVYvo0VJ2Ii55QoD0Z0b0IIh2PaZxRHr5VlGupDu6zf3/h4FmPCjkyqQ6RrjIOHXA GQp5gO66Qyu7tEFLAfJcrw1uZH/qLM5I5UYOHorcK4TH7eRpPUOFZpr68QvMJ8pdBlxx7J /gxdc0chZJ2l/6hEh+uDQb0tPdUj4gWcccKHYH1UKThMHrrVHeq3NhdGQ97c/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661909534; a=rsa-sha256; cv=none; b=jWHATBQiXtdokLzxrcEiDXFgExdRxePxAzMfbP6MJsqn/jfISZ+veIIftA/Y6dvX/OYI0t TGtMD2upiRBx7fxZhAlW3JkhrWid1qHx8swpEuS4gPBDDFQFlSVJ6VpvNYbsv1CzTanlrC BadkkmqyUPgtGJAH8GVLdn/sNE8BxaONc4VyJlSQNsJOpIxWa0BdnBVTQi4rWE4Fs91eAv EMKtyP5/6M1LlWkKyspK5ZKDaF9Eksx3wYh2AUYHuV8a7ZtVphWL/kIDZVF2ttGaHRm1zp WhWKiK3UeqkdIccvoNBTYUBV2DblHo57ZCT3MlQnqYz5I7jUtUqLRSb0athVUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=79ceb5107b3ba5d917d529221f00b6087b6dc64d commit 79ceb5107b3ba5d917d529221f00b6087b6dc64d Author: Konstantin Belousov AuthorDate: 2022-08-18 04:07:29 +0000 Commit: Konstantin Belousov CommitDate: 2022-08-31 01:20:27 +0000 i386 doreti: stop saving/restoring %ecx around calls into C (cherry picked from commit e8b2980e4a126407e15d33ee8d987385c8321261) --- sys/i386/i386/exception.s | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s index 7dad1cc5978b..90c3182f9b13 100644 --- a/sys/i386/i386/exception.s +++ b/sys/i386/i386/exception.s @@ -546,22 +546,21 @@ doreti_exit: je doreti_iret_nmi cmpl $T_TRCTRAP, TF_TRAPNO(%esp) je doreti_iret_nmi - movl $TF_SZ, %ecx testl $PSL_VM,TF_EFLAGS(%esp) - jz 1f /* PCB_VM86CALL is not set */ - addl $VM86_STACK_SPACE, %ecx - jmp 2f -1: testl $SEL_RPL_MASK, TF_CS(%esp) + jnz 1f /* PCB_VM86CALL is not set */ + testl $SEL_RPL_MASK, TF_CS(%esp) jz doreti_popl_fs -2: movl $handle_ibrs_exit,%eax - pushl %ecx /* preserve enough call-used regs */ +1: movl $handle_ibrs_exit,%eax call *%eax movl mds_handler,%eax call *%eax - popl %ecx movl %esp, %esi movl PCPU(TRAMPSTK), %edx - subl %ecx, %edx + movl $TF_SZ, %ecx + testl $PSL_VM,TF_EFLAGS(%esp) + jz 2f /* PCB_VM86CALL is not set */ + addl $VM86_STACK_SPACE, %ecx +2: subl $TF_SZ, %edx movl %edx, %edi rep; movsb movl %edx, %esp