From nobody Mon Jan 31 11:32:47 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 59461198294A; Mon, 31 Jan 2022 11:32:48 +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 4JnQsX1hjmz3Lrj; Mon, 31 Jan 2022 11:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643628768; 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=MoGct/IoXg65uOPPLmf0Rf0Qw6SvUYLANRFvttZwdyM=; b=Hy7b07HPWc+HA/fEshJ5VhkNaaoPvyl4FEW4YnKRhFQ4LDlwn9HkWQcNynrDVtO6Ni3+jy V0hj9Je6nYgiLAUG92TUmXTuToqJRJvqfxcJWwFZ1HXM4bqZXnVKvJOsQwGadHZUbnXE+X JkblDgke/WU7BMIojwxustdrazp1+GX0SftEbihQ0JwGTk1hc2FyJKYX6BpCb8HYpJwVU1 isnwBAUiR2SW31L+aQMTuzj7OYrKS97dUZ60FTqhudDdursPrcowxZWT6YV00MvQnsHNwL 5QoTAqkt5F84fjSGcepg2mjDoUq1v67djgSi/jg7dXaOLMXJxX8E3Qib8OAr2Q== 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 17CDE1BA90; Mon, 31 Jan 2022 11:32:48 +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 20VBWmH3015048; Mon, 31 Jan 2022 11:32:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20VBWlwu015047; Mon, 31 Jan 2022 11:32:47 GMT (envelope-from git) Date: Mon, 31 Jan 2022 11:32:47 GMT Message-Id: <202201311132.20VBWlwu015047@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 70f901bc94ef - stable/13 - Remove the sigcode base check on arm64 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 70f901bc94efa18f716ed28b924c5210b1e62375 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643628768; 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=MoGct/IoXg65uOPPLmf0Rf0Qw6SvUYLANRFvttZwdyM=; b=Dgje2a3xPqv9Krra2LjxQGqcJVDzKXMYXrU9dqdNNfdxw2lAsUu8LqwUpA4TRfFTDPSDf1 RWPoAunwJSgx31RUwefs7LBYam7h/6O91FQXhNHg7bupA6tQvVeJ2+pKqeP/vQ0iOW5F6t tFtPHD13PpqSLndl743T6BiEP0utoeH5aaG6Da7vUGRcZ8te9gd0lYmjGCX86CXWV1M7ZD SjDt2VpDo9F0d37jyHeiKFeudcxXINdH/jU/oy7AS3drAZMaUDGbZij/JHpSH5nS8oMu6K dS3+v3FFSR2PJGqh6Uf7sD/o7MV6ZTe5rK4R279xd3G+ppV7G993yelTT6FWyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643628768; a=rsa-sha256; cv=none; b=eUo7cHXvDoeTbYiFefxlJKoIhpye5hox49HPmMLN+7//+vqsNXve5e1F446BG0Ob4tQ4LL 6cnvJgi9+3zwjJrG57EO7MMDyIrETDI5FgkMgbyIM1SF5YdW+CwMZcfC+Gki73yR8N4WFK vWEu4bhLT+TsSmeo1OgtwBS70qpG5A47SRygfjq0fYUW7rZ/XX3qoEtAMVSuFal7JLtCzW DUfzi7hQiPD0xs07i2VvKqiJIqJgYgDtlr9bd5reZqJ4sR5J2dDroHgN+R8BzpJH9Vamu1 vOtDg95m0wqMaLIWqIFI/wvqx/cegBB0vqLeuP+/ruIbEua5dl21K/kbY+vs/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=70f901bc94efa18f716ed28b924c5210b1e62375 commit 70f901bc94efa18f716ed28b924c5210b1e62375 Author: Andrew Turner AuthorDate: 2022-01-05 11:01:31 +0000 Commit: Andrew Turner CommitDate: 2022-01-31 10:05:47 +0000 Remove the sigcode base check on arm64 This was added with the shared page support. It is unused as we always enable the shared page on FreeBSD executables on arm64. (cherry picked from commit fbdca14953785b6309b2754a90a85180fadc2a9d) --- sys/arm64/arm64/exec_machdep.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/arm64/arm64/exec_machdep.c b/sys/arm64/arm64/exec_machdep.c index cfc288e2b5aa..0766be0b6a1b 100644 --- a/sys/arm64/arm64/exec_machdep.c +++ b/sys/arm64/arm64/exec_machdep.c @@ -544,7 +544,6 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) struct trapframe *tf; struct sigframe *fp, frame; struct sigacts *psp; - struct sysentvec *sysent; int onstack, sig; td = curthread; @@ -602,12 +601,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) tf->tf_elr = (register_t)catcher; tf->tf_sp = (register_t)fp; - sysent = p->p_sysent; - if (sysent->sv_sigcode_base != 0) - tf->tf_lr = (register_t)sysent->sv_sigcode_base; - else - tf->tf_lr = (register_t)(sysent->sv_psstrings - - *(sysent->sv_szsigcode)); + tf->tf_lr = (register_t)p->p_sysent->sv_sigcode_base; CTR3(KTR_SIG, "sendsig: return td=%p pc=%#x sp=%#x", td, tf->tf_elr, tf->tf_sp);