From nobody Sun May 14 21:31:08 2023 X-Original-To: dev-commits-src-all@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 4QKFzw688tz49B3Y; Sun, 14 May 2023 21:31:08 +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 4QKFzw5SZtz3wmj; Sun, 14 May 2023 21:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684099868; 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=E9w41P9XoYp7UwYSWxpNfA+aXkidfJW5hg8n7LVGtSM=; b=VFNoGLhI52nqW1Kefoa6CDTwQd6nofWl3hPmjBTutE+VIqnWgo0/xc7Q5rBft9zt+KIikl A51LqFDWmpHSgtK1ggrdoBXAwWKnFOdd1+lECWsn/3haiXCG7DmN5kuhS++36vf/Z07O/h 5JaEQZrKsDHH8Qyb/erVmiDexxZMxsXlMwbk84LFMsWupgv9GvY023cpMmryzB4h/ab/2a a/yxPA99Rt3dDoyPUJm2tiENYJunQXbuRTeA0s8pEReGwwzNLu51E6WAZy+YUC0cAl4ab5 JgQYz/tKdd5wwYdxRdahtUKR2haXcNw95xCr9HRgQnHSQoAF9AqUr4KO2cZIJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684099868; 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=E9w41P9XoYp7UwYSWxpNfA+aXkidfJW5hg8n7LVGtSM=; b=fcFsOBFYmoeLiOiD7kL0GPyZG65zQChd054H2TBsRvLXEZMMJCSyMMZlpuKJoXywkbkySM z2jX2Eptvv5RPT9E+/8FHB4cmiGRpVTFDwBtzrrwzc+LDbyBGCnAK2HeFmquuUM8J4XFrZ DIXo19SyRbzPnb4R4VKq5oEsXs15qNmdDsZc/5DxRcSN6qOkcICF6bwtQ0oCegBDKmddkI Kis4Xganf5kSOWOLtzHTUmuC6glg280SfGmODl2pyU2fOHLSZh+/m4ThdXjcJ0U4pc1br4 UuWs2N3ae9nHbwDFUScRqjKmdS1k7Jr8Dh5zslBKFNbT1BKGKC11a/WN66N9iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684099868; a=rsa-sha256; cv=none; b=P2KIsSho4uZ2VNjEGf4AXm1GookyeJ/q4iyYHZMwXyk2t60xJwmeTvlYtLgv0hmlTJ6aTM fQZn54fiz/NDyc9Av9MSUoWS/xo7FLQdJAWhCWkYcXw/sq9bcQ8t4LppxRnbkWNy65cExj rQRWp6H7QmATYBo0Gb7XAE+fg7xLs9uYthRSZYokVrw5ubEP9f1mkzdr658SA1xaYkF0G9 A5aLlHcX77JG25MIDiRCuWx4UL3kZghkMfMxTLXsgjnQ4Ex/sk93ulrcCv346Twr8X0WJT t0+u50aT5Suq91Xo1ihP4d2UUQ878uSX+Imj00VCFqsOjAnO3Y0hYE94JezA5A== 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 4QKFzw4M2rzF7y; Sun, 14 May 2023 21:31:08 +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 34ELV8xQ074080; Sun, 14 May 2023 21:31:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34ELV8bV074079; Sun, 14 May 2023 21:31:08 GMT (envelope-from git) Date: Sun, 14 May 2023 21:31:08 GMT Message-Id: <202305142131.34ELV8bV074079@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: 5f19e18b641a - main - linux(4): Get rid of linux_vdso_sigcode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 5f19e18b641add5632e1bf19cce27b5d46e1e55a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=5f19e18b641add5632e1bf19cce27b5d46e1e55a commit 5f19e18b641add5632e1bf19cce27b5d46e1e55a Author: Dmitry Chagin AuthorDate: 2023-05-14 21:26:24 +0000 Commit: Dmitry Chagin CommitDate: 2023-05-14 21:26:24 +0000 linux(4): Get rid of linux_vdso_sigcode MFC after: 1 week --- sys/arm64/linux/linux_locore.asm | 7 +------ sys/arm64/linux/linux_sysvec.c | 4 ++-- sys/arm64/linux/linux_vdso.lds.s | 1 - 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sys/arm64/linux/linux_locore.asm b/sys/arm64/linux/linux_locore.asm index 417cc7bd5fc4..6ebecef51b39 100644 --- a/sys/arm64/linux/linux_locore.asm +++ b/sys/arm64/linux/linux_locore.asm @@ -47,13 +47,8 @@ linux_platform: nop /* This is what Linux calls a "Mysterious NOP". */ EENTRY(__kernel_rt_sigreturn) - mov x8, #LINUX_SYS_linux_rt_sigreturn - svc #0 -EEND(__kernel_rt_sigreturn) - -EENTRY(linux_vdso_sigcode) blr x8 mov x8, #LINUX_SYS_linux_rt_sigreturn svc #0 -EEND(linux_vdso_sigcode) +EEND(__kernel_rt_sigreturn) diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index 8337bdfe0eb2..299586e1c7b6 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -118,7 +118,7 @@ LIN_SDT_PROBE_DEFINE0(sysvec, linux_exec_setregs, todo); LINUX_VDSO_SYM_CHAR(linux_platform); LINUX_VDSO_SYM_INTPTR(kern_timekeep_base); -LINUX_VDSO_SYM_INTPTR(linux_vdso_sigcode); +LINUX_VDSO_SYM_INTPTR(__kernel_rt_sigreturn); static int linux_fetch_syscall_args(struct thread *td) @@ -355,7 +355,7 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) tf->tf_x[29] = (register_t)&fp->fp; tf->tf_x[8] = (register_t)catcher; tf->tf_sp = (register_t)fp; - tf->tf_elr = (register_t)linux_vdso_sigcode; + tf->tf_elr = (register_t)__kernel_rt_sigreturn; CTR3(KTR_SIG, "sendsig: return td=%p pc=%#x sp=%#x", td, tf->tf_elr, tf->tf_sp); diff --git a/sys/arm64/linux/linux_vdso.lds.s b/sys/arm64/linux/linux_vdso.lds.s index 8790e14bbb80..652b99545069 100644 --- a/sys/arm64/linux/linux_vdso.lds.s +++ b/sys/arm64/linux/linux_vdso.lds.s @@ -70,7 +70,6 @@ VERSION global: linux_platform; kern_timekeep_base; - linux_vdso_sigcode; local: *; }; }