From nobody Sun May 28 14:07:47 2023 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 4QTgTv580Hz4XRDq; Sun, 28 May 2023 14:07:47 +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 4QTgTv4jQ3z4FZj; Sun, 28 May 2023 14:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685282867; 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=brb/rlRz71KIHArnb7XOKhvV2sbH7xvbO3tUrTovd5A=; b=Q4N3heOHL/l16xYs1sIo4WlF+sGzHjMQh7hu9tnf9YD0hOSXqyafjHX7/2ymykV2Oz2KOn bGqpX0mcTsf8dI/xU+eEtaS7cKAZboHtJZatDYTkVQfLM9DXzryli/pHUubyr69f1CcbrL jfH/GuOmNnBXwFGWLmHciIBs4uCTRIGO8Caa3eNLaB2SMfIicQwV53W2bIKFIhOjIR334X ysqZOidhjOezWjb4R9toUd0Cdf/vx98NEczZSkItUfLxAEKw2FCNeRqu+rkY3IJRonOO0k IsWm8YZ0UjJ2WAa+vxcixohX8JNakNoLssM2USwXXlvRdN7iD+EOI3VTTRRD0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685282867; 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=brb/rlRz71KIHArnb7XOKhvV2sbH7xvbO3tUrTovd5A=; b=QNwbxY88Yi4dYpNhZs5mRVYz0Dz1Alp8srwKEPmPBG12FOZPqV7n8gk0YTRlltc1ghmlQV 7G0U4/IrsXVRkN7SwnBFj2bQp2SGcxGaw5s5xt5BLzvMtyHxjfiQHCwnO5eOnrqNSo8cck /BPdF/5spGXO0PnLhi97qP/OCJ1nncefmtdYBD3cijCTSpXSS5aqLY8dF041KBd2MjJtWA M4HV3NNALZeQjTaj6CHAHVVVEqjT4M6C5gxyC4uRbUZL+hD3PDFtukhc2VT7TnrpY1nQFf GSuaf/012xCAz7Etnmrb2k2PQJqRli7xmxXxbBR5x7zryUnWpOJUwmrsC7FU/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685282867; a=rsa-sha256; cv=none; b=dbczFpRpVnN7q89Rt6YysNMXnm36N3qBBd5UH3T+Bdxd8GFqzVYU0wfZsZX+vqYsmpwGCo DQ4e3XFjUylX3UMgBplqw4HqnXDM57uOIn6rM7IaPvb5hQ4KnnFyq4gUTI9o7nghwRWpxS aaWMImMEEBnMnCxHDgAFE1xyMz0gcJPc12rIq9wsHvh8nEyD9hY8O7WkPNBO0E3qzkn0hU SdjxU2rUjwRSPI5lBOM3M7qsEBCBbXQxp2+N9Vu2bHhlIRG0lK4shgOj8nDUo1+zhl5g1q BJ+3i3+NB/p6oXUbp+jhpwtsRXJIMzDuAZAPdgAf7w7fGlr1yDHFBFnsCHOVTw== 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 4QTgTv3lYCzXtW; Sun, 28 May 2023 14:07:47 +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 34SE7lLb067220; Sun, 28 May 2023 14:07:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34SE7lPa067219; Sun, 28 May 2023 14:07:47 GMT (envelope-from git) Date: Sun, 28 May 2023 14:07:47 GMT Message-Id: <202305281407.34SE7lPa067219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 185bd9fa3096 - main - linux(4): Simplify %r10 restoring on amd64 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 185bd9fa3096595350ebe7bcd7e0ddcf17773030 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=185bd9fa3096595350ebe7bcd7e0ddcf17773030 commit 185bd9fa3096595350ebe7bcd7e0ddcf17773030 Author: Dmitry Chagin AuthorDate: 2023-05-28 14:06:23 +0000 Commit: Dmitry Chagin CommitDate: 2023-05-28 14:06:23 +0000 linux(4): Simplify %r10 restoring on amd64 Restore %r10 at system call entry to avoid doing this multiply times. Differential Revision: https://reviews.freebsd.org/D40154 MFC after: 1 month --- sys/amd64/linux/linux_machdep.c | 6 ------ sys/amd64/linux/linux_sysvec.c | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index 6ac0ab0cd3d7..155ea918cd0a 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -350,12 +350,6 @@ linux_ptrace_getregs_machdep(struct thread *td, pid_t pid, linux_msg(td, "PT_LWPINFO failed with error %d", error); return (error); } - if ((lwpinfo.pl_flags & PL_FLAG_SCE) != 0) { - /* - * Undo the mangling done in exception.S:fast_syscall_common(). - */ - l_regset->r10 = l_regset->rcx; - } if ((lwpinfo.pl_flags & (PL_FLAG_SCE | PL_FLAG_SCX)) != 0) { /* * In Linux, the syscall number - passed to the syscall diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index 89d388dc6cf8..422cfbe7c5ba 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -167,6 +167,9 @@ linux_fetch_syscall_args(struct thread *td) else sa->callp = &p->p_sysent->sv_table[sa->code]; + /* Restore r10 earlier to avoid doing this multiply times. */ + frame->tf_r10 = frame->tf_rcx; + td->td_retval[0] = 0; return (0); } @@ -181,7 +184,6 @@ linux_set_syscall_retval(struct thread *td, int error) switch (error) { case 0: frame->tf_rax = td->td_retval[0]; - frame->tf_r10 = frame->tf_rcx; break; case ERESTART: @@ -192,7 +194,6 @@ linux_set_syscall_retval(struct thread *td, int error) * */ frame->tf_rip -= frame->tf_err; - frame->tf_r10 = frame->tf_rcx; break; case EJUSTRETURN: @@ -200,7 +201,6 @@ linux_set_syscall_retval(struct thread *td, int error) default: frame->tf_rax = bsd_to_linux_errno(error); - frame->tf_r10 = frame->tf_rcx; break; }