From nobody Wed May 17 11:31:16 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 4QLrXP09Zhz4B1rr; Wed, 17 May 2023 11:31:17 +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 4QLrXN6svjz4D20; Wed, 17 May 2023 11:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684323077; 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=oDt3ILKcvhFXtkmRCgk2Tg4lzU4JB/z7RP7jOVItZS0=; b=X9BR6SifkhaGGWQspwa/awIMC/RU2OlF56b7Fi0E+DYV9immtUrlKYJv9qIarWKywCaLx9 HbsWOL35hyPxhgJg0BlOeEnX+PX6jPuXuBnAZaBOtIeHGKGCasPA4i/AsmwselPjh01MsG bweU4nvJ8pDCJ2to4TGN1y73G5cIOZMRiXXPi5pXepBrftQj0GWy4V9a2/mH4/9V/f+AHU 5409T8nyG03dymscg7BF9Cr2DL5bQL/+BypGFEdXD/Bb0YCM1zGECahAKj7anpjIxlwyr/ q3eZ2xF+rYtBu65bMMSWboKKPJ+8qdVaKGibles1w5l4IgXEPjwbLo5vGi3wWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684323077; 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=oDt3ILKcvhFXtkmRCgk2Tg4lzU4JB/z7RP7jOVItZS0=; b=AN0i4x9aP0Y6hTEwfIWy8rDjLj1vIlfTzF8m0qL/xGskurPkRvuE3/w1dNTIkaqw1tol8z xhgGemFfQidcmMUyuVvDSib4boks2dBhjYfB+WLNBAcPJ871z+imvaeCt56qBLW6nyX1tH +tlm518olXrL9mYUusU3vENUutuq1zTLLrx4K30Qdts3zqttNsQZZJy2lAdAH4MOGdROHS oIrhW0PNJ7cGPc4fzbxjuaDrD415O4HsIhhWazqXpgM4At9v1fAMIdboIq9oCdKVoOvC1Q cUi+wHyCyOqLQ96qRvBrOL1mXBTQx9Iyshn6qhL0Zya4BoghiH7huc0otDfodg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684323077; a=rsa-sha256; cv=none; b=Vzg5xk5IFerDly0US1pZbzn18WwBFmzEAH7yonTgerhpiYiXoe6GnO8Z7Y2klmDCe/bIQ7 dYUIXN7Kx1bbcOPZ+zo961qC25QqNCtzyIHIdsztXcSU4NJyNYDlj4ytaT1193fN343pZM Ckz6TO2080G0vQY142mb5AH8UjzChDGT4xt6U+1vD29rpE9IS0BoL7YwXf0halsHSI+jmV GujNZalNbOvE3jWYZPmI9sQGCH7OKGp+6m/8McRbN2nAhXfUPJW6EZhw6kIJ3vb2QYakqg 59km+hffS/dCCw+hVWzoX4wdGRWS/hV0MkSe6n7tPp64yXrqoTNX9mKuCCVGDQ== 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 4QLrXN5zMlz11yV; Wed, 17 May 2023 11:31:16 +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 34HBVGsb000607; Wed, 17 May 2023 11:31:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34HBVG0s000606; Wed, 17 May 2023 11:31:16 GMT (envelope-from git) Date: Wed, 17 May 2023 11:31:16 GMT Message-Id: <202305171131.34HBVG0s000606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 37c1ef5ac0a2 - main - Move the arm64 sigcode to .rodata 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37c1ef5ac0a2867a59cfbdd73f1970389a7fc8e8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=37c1ef5ac0a2867a59cfbdd73f1970389a7fc8e8 commit 37c1ef5ac0a2867a59cfbdd73f1970389a7fc8e8 Author: Andrew Turner AuthorDate: 2023-05-17 11:00:12 +0000 Commit: Andrew Turner CommitDate: 2023-05-17 11:28:45 +0000 Move the arm64 sigcode to .rodata The kernel doesn't execute this code, it's only ever copied to userspace. Move it to .rodata as we don't need to modify it. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D39399 --- sys/arm64/arm64/locore.S | 8 +++++--- sys/arm64/arm64/sigtramp.S | 7 +++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index e17f897baeab..e26003b6c926 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -918,8 +918,10 @@ pagetable_end: el2_pagetable: .space PAGE_SIZE -.text -EENTRY(aarch32_sigcode) + .section .rodata, "a", %progbits + .globl aarch32_sigcode + .align 2 +aarch32_sigcode: .word 0xe1a0000d // mov r0, sp .word 0xe2800040 // add r0, r0, #SIGF_UC .word 0xe59f700c // ldr r7, [pc, #12] @@ -927,10 +929,10 @@ EENTRY(aarch32_sigcode) .word 0xe59f7008 // ldr r7, [pc, #8] .word 0xef000000 // swi #0 .word 0xeafffffa // b . - 16 -EEND(aarch32_sigcode) .word SYS_sigreturn .word SYS_exit .align 3 + .size aarch32_sigcode, . - aarch32_sigcode aarch32_esigcode: .data .global sz_aarch32_sigcode diff --git a/sys/arm64/arm64/sigtramp.S b/sys/arm64/arm64/sigtramp.S index a9ad10da766c..f1936e695f33 100644 --- a/sys/arm64/arm64/sigtramp.S +++ b/sys/arm64/arm64/sigtramp.S @@ -30,7 +30,10 @@ #include #include -ENTRY(sigcode) + .section .rodata, "a", %progbits + .globl sigcode + .align 2 +sigcode: blr x8 mov x0, sp add x0, x0, #SF_UC @@ -44,9 +47,9 @@ ENTRY(sigcode) svc 0 b 1b -END(sigcode) /* This may be copied to the stack, keep it 16-byte aligned */ .align 3 + .size sigcode, . - sigcode esigcode: .data