From nobody Thu Jun 29 08:20:45 2023 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 4QsBGk0XlWz4knf2; Thu, 29 Jun 2023 08:20:46 +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 4QsBGj6vDFz3wJk; Thu, 29 Jun 2023 08:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026846; 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=0Yx/hVHcc/HDaZe0CcUc3dEWtJjwwNJq2MwSzqGMH5E=; b=YlYvJgXxvzOzNtpMLN+XXgpFsSzep+BtL6aF427l3w58YmLEaogG2zf8Bk6VvRCydIPoyZ uBXOOG1QFqRIilsz79uC0JTfa1D9kq4if1H8sKveRQkO567rjjQ/3D54pcBC8EBOie+U1F k8IvP7Dwkch4VCRYa0U4c1+vP9ehf32veZIpa+W5yV75HrRHaknt39U5vT1UX9G0/4P6FI X/gv/wgG5l3sV4lQuVl25ZiSjkkUBFVjoR2Ibr8yxFE3PZVn4ANvSDmL5+oxHFwgORJV/i jqD/svwo0/wRCTjdHyjXFiNWg6gGp0yLa7NGT1N0cbK9utHxBW1bM7q4FUNDeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026846; 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=0Yx/hVHcc/HDaZe0CcUc3dEWtJjwwNJq2MwSzqGMH5E=; b=HNQhcsJDxZMwEjsPs4bCXgEpf+kh6Pb0IPqVbaSAWwffefB1nytRw0cyQoml+T4UXi2zZc nVWPGX4EihpKet8bWFYl0E/F+sYFxdmYh934Xnn/Rll8AsI28+xDB9wAu0DTJXLksAc08V fNu1av7ZxCKhHGcyHY4tm3hlJFRjqEQRuPV9pSiyZbioR9uSWBOuKfUuLZoz4JWEwHyh+E Z6s5dmyYTlrV+Nk1Ktsm18e/j4IxtWn8zFTxuHLX7+3yJ1fo70oU8CUg/5s+qIM4G8vrkV F/YSXfl3UPv4X5WObW8iqnYieUBsTh9y1xxHMvkTqbeh5tkI3NIUjvVOkxbObg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688026846; a=rsa-sha256; cv=none; b=JxwvQnoSS8A3F2Uc4wECbdmA1PFd3NSGk+335ZUpfscLEaAMFjAecXVOAFlftg53biIAaw lHIruQn33FmAFyWrL1Fo42JUKYB9CgEsupgKPjgB5kBcAlRZq4Q7104DjNLNyIYfzra9th 5rjO2fUz5R7QhneI8R5fHzaNSgs3AGDltke59hQCEE2/T+JJiMeY9LU88lf9T+5kG0zP9w PDqqt6FPq5ZkKuOwzEhKqaVkUwJ0i7pDWP/R+oeSwAKzhNn51qJZNu7E+ACfXhg+MlDH/w VAkrP4cbOgvRZieQd+wsHO40EHNQ2lw3s3Q8Xqgclmx/CAhmYFY24Fb9pAdO+A== 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 4QsBGj5pCTz17q9; Thu, 29 Jun 2023 08:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35T8KjQi085284; Thu, 29 Jun 2023 08:20:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T8KjCs085269; Thu, 29 Jun 2023 08:20:45 GMT (envelope-from git) Date: Thu, 29 Jun 2023 08:20:45 GMT Message-Id: <202306290820.35T8KjCs085269@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 053cbecd29f8 - stable/13 - linux(4): Simplify %r10 restoring on amd64 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 053cbecd29f8f167628f5316d064557323af6ee8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=053cbecd29f8f167628f5316d064557323af6ee8 commit 053cbecd29f8f167628f5316d064557323af6ee8 Author: Dmitry Chagin AuthorDate: 2023-05-28 14:06:23 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-29 08:16:01 +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 (cherry picked from commit 185bd9fa3096595350ebe7bcd7e0ddcf17773030) --- 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 3681dc881485..fea1e274ac95 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -166,6 +166,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); } @@ -180,7 +183,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: @@ -191,7 +193,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: @@ -199,7 +200,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; }