From nobody Mon Apr 03 22:03:15 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 4Pr4f10Mhfz43NYb for ; Mon, 3 Apr 2023 22:03:21 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pr4f00xnFz3Hvv for ; Mon, 3 Apr 2023 22:03:20 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com; dmarc=none Received: by mail-wr1-f42.google.com with SMTP id v1so30834821wrv.1 for ; Mon, 03 Apr 2023 15:03:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680559398; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=egc9k5r9QCb2Ukt7ELVcyxxPK26NU3PLhN9CoAYx6lM=; b=L51YlTU052igxrLk2PiPhctW0m6W5Fvl1GCTLKnLoqYGb6lNzKDEcZ70eChEUs8/NP XPgIISurxHtdzWZ6zQttYxvkUEQyhvV4YmFuOeT3f8Yu74dDXCVjxp9Tdlh6g1wDQ6xf lGGlK7HFfdH77dGRhCOfyEM073ITNvgLv6oL2HMZ1/HdD7m/5e48oV1omMf9UHZIWtf2 CxwZgTmAowWoDbN8PpTS5rmMo2rPoLuKdlZxKUjyFKuFqX891fLI4Y6sctnLl4S8TpBx APwZgQtKbDv8SaRoSs9NDaDEgfj67F0eDi6RxmFADpxerpChMhpIbamOonWB98wfUY8/ OdIA== X-Gm-Message-State: AAQBX9fR9ATAvn+EAJHzxmBkd03BZZq9WvibZVMKNKaxq1z7b2sWO8cK 3yr4yjb/LfCiTRx8S9TPMfaMN2+hoCdPuX8WgGFgtA== X-Google-Smtp-Source: AKy350a3b3OYDoKUA9l0Z+y3Tc7KqrNVIiX6oBVmEhY/5len1s6HejWl264DgMyAfuQzwZFcHK0slw== X-Received: by 2002:a5d:48c6:0:b0:2d8:81a9:4d75 with SMTP id p6-20020a5d48c6000000b002d881a94d75mr32929wrs.32.1680559398547; Mon, 03 Apr 2023 15:03:18 -0700 (PDT) Received: from smtpclient.apple (global-5-142.n-2.net.cam.ac.uk. [131.111.5.142]) by smtp.gmail.com with ESMTPSA id i17-20020a5d5591000000b002eaac3a9beesm950027wrv.8.2023.04.03.15.03.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Apr 2023 15:03:17 -0700 (PDT) Content-Type: text/plain; charset=utf-8 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 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: Re: git: 47ff149afaea - main - Move arm64 EENTRY uses before ENTRY From: Jessica Clarke In-Reply-To: <1D6F1E29-6EA8-4ABA-BA63-A9D91B1C8A0A@freebsd.org> Date: Mon, 3 Apr 2023 23:03:15 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202303311556.32VFuGQT080989@gitrepo.freebsd.org> <1D6F1E29-6EA8-4ABA-BA63-A9D91B1C8A0A@freebsd.org> To: Andrew Turner X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Spamd-Result: default: False [-2.49 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.992]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_THREE(0.00)[4]; FROM_HAS_DN(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_DN_EQ_ADDR_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.42:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FREEFALL_USER(0.00)[jrtc27]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_DKIM_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.42:from] X-Rspamd-Queue-Id: 4Pr4f00xnFz3Hvv X-Spamd-Bar: -- X-ThisMailContainsUnwantedMimeParts: N On 31 Mar 2023, at 17:00, Jessica Clarke wrote: > On 31 Mar 2023, at 16:56, Andrew Turner wrote: >>=20 >> The branch main has been updated by andrew: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D47ff149afaea6a403b8d044e26673bc3= cd605fe4 >>=20 >> commit 47ff149afaea6a403b8d044e26673bc3cd605fe4 >> Author: Andrew Turner >> AuthorDate: 2023-03-31 12:34:51 +0000 >> Commit: Andrew Turner >> CommitDate: 2023-03-31 15:45:31 +0000 >>=20 >> Move arm64 EENTRY uses before ENTRY >>=20 >> The ENTRY macro adds instructions to the start of a function but = not >> EENTRY. To use these instructions in both functions move the EENTRY >> use before the ENTRY use. >=20 > This doesn=E2=80=99t work. ENTRY is what has the .text and .align 2, = so this > could have the EENTRY symbols be unaligned or in the wrong section. In > this specific case it happens to work, but in general this is broken > and so your original problem needs fixing another way. Or I guess you > could make both ENTRY and EENTRY include the .text and .align 2 (but = on > other architectures with variable-length instructions, or even on = arm64 > were you to ever want to over-align functions, this would still be > insufficient). Ping. Jess >> Sponsored by: Arm Ltd >> --- >> sys/arm64/arm64/memcpy.S | 4 ++-- >> sys/arm64/arm64/support.S | 8 ++++---- >> 2 files changed, 6 insertions(+), 6 deletions(-) >>=20 >> diff --git a/sys/arm64/arm64/memcpy.S b/sys/arm64/arm64/memcpy.S >> index d5fbfa64e0fa..b394d6c1d30a 100644 >> --- a/sys/arm64/arm64/memcpy.S >> +++ b/sys/arm64/arm64/memcpy.S >> @@ -55,8 +55,8 @@ >> The loop tail is handled by always copying 64 bytes from the end. >> */ >>=20 >> -ENTRY(memcpy) >> EENTRY(memmove) >> +ENTRY(memcpy) >> add srcend, src, count >> add dstend, dstin, count >> cmp count, 128 >> @@ -237,6 +237,6 @@ L(copy64_from_start): >> stp B_l, B_h, [dstin, 16] >> stp C_l, C_h, [dstin] >> ret >> -EEND(memmove) >> END(memcpy) >> +EEND(memmove) >>=20 >> diff --git a/sys/arm64/arm64/support.S b/sys/arm64/arm64/support.S >> index 885af5676159..28ac1d553fbc 100644 >> --- a/sys/arm64/arm64/support.S >> +++ b/sys/arm64/arm64/support.S >> @@ -175,15 +175,15 @@ END(fueword32) >> * long fueword(volatile const void *, int64_t *) >> * int64_t fueword64(volatile const void *, int64_t *) >> */ >> -ENTRY(fueword) >> EENTRY(fueword64) >> +ENTRY(fueword) >> check_user_access 0, (VM_MAXUSER_ADDRESS-7), fsu_fault_nopcb >> fsudata ldtr, x0, 0 >> str x0, [x1] /* Save the data in kernel space = */ >> mov x0, #0 /* Success */ >> ret /* Return */ >> -EEND(fueword64) >> END(fueword) >> +EEND(fueword64) >>=20 >> /* >> * int subyte(volatile void *, int) >> @@ -218,14 +218,14 @@ END(suword32) >> /* >> * int suword(volatile void *, long) >> */ >> -ENTRY(suword) >> EENTRY(suword64) >> +ENTRY(suword) >> check_user_access 0, (VM_MAXUSER_ADDRESS-7), fsu_fault_nopcb >> fsudata sttr, x1, 0 >> mov x0, #0 /* Success */ >> ret /* Return */ >> -EEND(suword64) >> END(suword) >> +EEND(suword64) >>=20 >> ENTRY(setjmp) >> /* Store the stack pointer */