From nobody Sat Jan 21 02:29:59 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 4NzL1c5npgz2v1lx for ; Sat, 21 Jan 2023 02:30:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) (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 4NzL1c0BGrz4Hk4 for ; Sat, 21 Jan 2023 02:30:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b=wFQQzxe+; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2a00:1450:4864:20::630) smtp.mailfrom=wlosh@bsdimp.com; dmarc=none Received: by mail-ej1-x630.google.com with SMTP id mp20so18275786ejc.7 for ; Fri, 20 Jan 2023 18:30:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=OmLs98obyvjBaRnOQOURshGG8gyUsiRijuYqB6ZFVOY=; b=wFQQzxe+KpusEfzUGikfIkyeufnE4gYspXuTkXRwa7STrlMuXoJQ052vwH9HWw5Bq+ b/VFkbvkDLmqrfYUIdzPoegbvxGCl/yo6wb3yud1/OOkXGSL7PLPaMS4HbRknphNmd71 g7Qf/KKMZXA02YrYfIDPnraI58iCFEU6bkYIyCT266ZXg6dNFfLB2NMFLfE/MGPPH+e2 GPqNd/TcShhobKXL2Ph0eqLwGFyVZrEFIanoNWuEMjsLyu07dJAXXU3RM7B75b9vsNz+ A9psQTVo6n9ez+X0tjE4wnDFG69lParuk8ZyQqDicC3aHvkEN7zh5jIxP729vH5N1np3 WcEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OmLs98obyvjBaRnOQOURshGG8gyUsiRijuYqB6ZFVOY=; b=jO6nWhw5O2tN4DKITRvrCsgL4XRVZIOOeDf5gRQfLKm4D6GYO0Ub+6EDQCw9LX4aMm OWSJ3BljHi4RATAFvPaGJt66Q9l+ZhlHfUsbzvVDII6rwyaZS8BPCXmAGhz7IfancExm hWl4TZzfJMkHCN0ufDJPwMLQrZwdSniUJAR/ZNFH1oGrS9a6iMnQzqmbF2jXtTbTqGLM tkX81Zd+RpSqqEHeVnTa/sQtRAG1A48WIMKFI+nGWvux55W9jqfs/GxSLJzvhUw1cjo2 gXx3ube64Nf+EYJEC2u7/dgNyuLNaN3E8rQTjiOTGfTtaB46d9M0EGRyLBO0h3FPw0rt 8GLA== X-Gm-Message-State: AFqh2kozEtD+yHmJdt+JTu6M4kOkP4G8yTXwtYE/lVRH+29CaDSsMYbE Dzor9R3XycCZ66MY27bKY5PpZhE5T6lc9CkIE9QO3dVXNaS7V/HH X-Google-Smtp-Source: AMrXdXtgjrxf5AvRUvpK4CVhGObG3NMvYTDW4HRtxt9Ko1vUiG/KGinUJy4Gf0+DfaXtvWdnP7esgZRYtLErVvJZfPI= X-Received: by 2002:a17:906:d8b5:b0:7c0:f5e7:af76 with SMTP id qc21-20020a170906d8b500b007c0f5e7af76mr1710834ejb.432.1674268210695; Fri, 20 Jan 2023 18:30:10 -0800 (PST) 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 References: <202301210220.30L2KBQv006863@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Fri, 20 Jan 2023 19:29:59 -0700 Message-ID: Subject: Re: git: 34784d17eb2b - main - elf: Catch up with defining EF_ARM_EABI_VERSION in elf_common.h To: Jessica Clarke Cc: Warner Losh , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="000000000000f52e1905f2bcf1de" X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20210112.gappssmtp.com:s=20210112]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; R_SPF_NA(0.00)[no SPF record]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::630:from]; RCVD_TLS_LAST(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[bsdimp.com]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4NzL1c0BGrz4Hk4 X-Spamd-Bar: -- X-ThisMailContainsUnwantedMimeParts: N --000000000000f52e1905f2bcf1de Content-Type: text/plain; charset="UTF-8" On Fri, Jan 20, 2023 at 7:27 PM Warner Losh wrote: > > > On Fri, Jan 20, 2023 at 7:22 PM Jessica Clarke wrote: > >> On 21 Jan 2023, at 02:20, Warner Losh wrote: >> > >> > The branch main has been updated by imp: >> > >> > URL: >> https://cgit.FreeBSD.org/src/commit/?id=34784d17eb2bcdcfaee39f570bff613b4055912d >> > >> > commit 34784d17eb2bcdcfaee39f570bff613b4055912d >> > Author: Warner Losh >> > AuthorDate: 2023-01-21 02:15:52 +0000 >> > Commit: Warner Losh >> > CommitDate: 2023-01-21 02:18:15 +0000 >> > >> > elf: Catch up with defining EF_ARM_EABI_VERSION in elf_common.h >> > >> > FreeBSD defines EF_ARM_EABI_VERSION in a non-standard way (at least >> > differently than everybody else). We use this only in elf*machdep.c >> to >> > make sure the image is new enough. Switch to the more standard way of >> > defining this and adjust other constants to match. >> > >> > Fixes: c52c98e69a2e >> > Sponsored by: Netflix >> > --- >> > sys/arm/include/elf.h | 3 +-- >> > sys/arm64/arm64/elf32_machdep.c | 3 +-- >> > 2 files changed, 2 insertions(+), 4 deletions(-) >> > >> > diff --git a/sys/arm/include/elf.h b/sys/arm/include/elf.h >> > index 35d0fa55ca1a..2ea60e8f10ee 100644 >> > --- a/sys/arm/include/elf.h >> > +++ b/sys/arm/include/elf.h >> > @@ -74,9 +74,8 @@ __ElfType(Auxinfo); >> > #define ELF_TARG_VER 1 >> > >> > /* Defines specific for arm headers */ >> > -#define EF_ARM_EABI_VERSION(x) (((x) & EF_ARM_EABIMASK) >> 24) >> > #define EF_ARM_EABI_VERSION_UNKNOWN 0 >> >> Can also use EF_ARM_EABI_UNKNOWN in its place? >> > > I'm not sure I understand the question... In what's place? > Oh, I see... Yea... We can just delete EF_ARM_EABI_VERSION_UNKNOWN since it's unused. It was added for the OABI -> EABI transition... Warner > Warner > > >> Jess >> >> > -#define EF_ARM_EABI_FREEBSD_MIN 4 >> > +#define EF_ARM_EABI_FREEBSD_MIN EF_ARM_EABI_VER4 >> > >> > #define ET_DYN_LOAD_ADDR 0x01001000 >> > >> > diff --git a/sys/arm64/arm64/elf32_machdep.c >> b/sys/arm64/arm64/elf32_machdep.c >> > index f637c5a65c05..627973ecfd3d 100644 >> > --- a/sys/arm64/arm64/elf32_machdep.c >> > +++ b/sys/arm64/arm64/elf32_machdep.c >> > @@ -152,8 +152,7 @@ elf32_arm_abi_supported(struct image_params *imgp, >> int32_t *osrel __unused, >> > ID_AA64PFR0_EL0_64_32) >> > return (FALSE); >> > >> > -#define EF_ARM_EABI_VERSION(x) (((x) & EF_ARM_EABIMASK) >> 24) >> > -#define EF_ARM_EABI_FREEBSD_MIN 4 >> > +#define EF_ARM_EABI_FREEBSD_MIN EF_ARM_EABI_VER4 >> > hdr = (const Elf32_Ehdr *)imgp->image_header; >> > if (EF_ARM_EABI_VERSION(hdr->e_flags) < EF_ARM_EABI_FREEBSD_MIN) { >> > if (bootverbose) >> >> --000000000000f52e1905f2bcf1de Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Fri, Jan 20, 2023 at 7:27 PM Warne= r Losh <imp@bsdimp.com> wrote:<= br>


On Fri, Jan 20, 2023 at 7:22 PM Jessica Clarke <jrtc27@freebsd.org> wrote:
On = 21 Jan 2023, at 02:20, Warner Losh <imp@FreeBSD.org> wrote:
>
> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D34784d17eb2bcdcfaee39f570bff613b4055912d<= /a>
>
> commit 34784d17eb2bcdcfaee39f570bff613b4055912d
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2023-01-21 02:15:52 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2023-01-21 02:18:15 +0000
>
>=C2=A0 =C2=A0 elf: Catch up with defining EF_ARM_EABI_VERSION in elf_co= mmon.h
>
>=C2=A0 =C2=A0 FreeBSD defines EF_ARM_EABI_VERSION in a non-standard way= (at least
>=C2=A0 =C2=A0 differently than everybody else). We use this only in elf= *machdep.c to
>=C2=A0 =C2=A0 make sure the image is new enough. Switch to the more sta= ndard way of
>=C2=A0 =C2=A0 defining this and adjust other constants to match.
>
>=C2=A0 =C2=A0 Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 c52c98e69a2e
>=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Net= flix
> ---
> sys/arm/include/elf.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 3 +--<= br> > sys/arm64/arm64/elf32_machdep.c | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/sys/arm/include/elf.h b/sys/arm/include/elf.h
> index 35d0fa55ca1a..2ea60e8f10ee 100644
> --- a/sys/arm/include/elf.h
> +++ b/sys/arm/include/elf.h
> @@ -74,9 +74,8 @@ __ElfType(Auxinfo);
> #define=C2=A0 =C2=A0 =C2=A0 =C2=A0ELF_TARG_VER=C2=A0 =C2=A0 1
>
> /* Defines specific for arm headers */
> -#define=C2=A0 =C2=A0 =C2=A0 EF_ARM_EABI_VERSION(x) (((x) & EF_ARM= _EABIMASK) >> 24)
> #define=C2=A0 =C2=A0 =C2=A0 =C2=A0EF_ARM_EABI_VERSION_UNKNOWN 0

Can also use EF_ARM_EABI_UNKNOWN in its place?


Jess

> -#define=C2=A0 =C2=A0 =C2=A0 EF_ARM_EABI_FREEBSD_MIN 4
> +#define=C2=A0 =C2=A0 =C2=A0 EF_ARM_EABI_FREEBSD_MIN EF_ARM_EABI_VER4<= br> >
> #define=C2=A0 =C2=A0 =C2=A0 =C2=A0ET_DYN_LOAD_ADDR 0x01001000
>
> diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_m= achdep.c
> index f637c5a65c05..627973ecfd3d 100644
> --- a/sys/arm64/arm64/elf32_machdep.c
> +++ b/sys/arm64/arm64/elf32_machdep.c
> @@ -152,8 +152,7 @@ elf32_arm_abi_supported(struct image_params *imgp,= int32_t *osrel __unused,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ID_AA64PFR0_EL0_64_32)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return (FALSE);<= br> >
> -#define=C2=A0 =C2=A0 =C2=A0 EF_ARM_EABI_VERSION(x)=C2=A0 (((x) & = EF_ARM_EABIMASK) >> 24)
> -#define=C2=A0 =C2=A0 =C2=A0 EF_ARM_EABI_FREEBSD_MIN 4
> +#define=C2=A0 =C2=A0 =C2=A0 EF_ARM_EABI_FREEBSD_MIN EF_ARM_EABI_VER4<= br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0hdr =3D (const Elf32_Ehdr *)imgp->image_h= eader;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0if (EF_ARM_EABI_VERSION(hdr->e_flags) <= ; EF_ARM_EABI_FREEBSD_MIN) {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (bootverbose)=

--000000000000f52e1905f2bcf1de--