From nobody Wed Jan 11 12:05:55 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 4NsRGs2qCHz2rCYG for ; Wed, 11 Jan 2023 12:06:13 +0000 (UTC) (envelope-from bT.i10c2l5d30=rz0rnxeydaq6=fmhu11p9eg@em790814.fubar.geek.nz) Received: from e2i580.smtp2go.com (e2i580.smtp2go.com [103.2.142.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4NsRGr71BZz3tR5 for ; Wed, 11 Jan 2023 12:06:12 +0000 (UTC) (envelope-from bT.i10c2l5d30=rz0rnxeydaq6=fmhu11p9eg@em790814.fubar.geek.nz) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=mgy720.a1-4.dyn; x=1673439672; h=Feedback-ID: X-Smtpcorp-Track:To:Date:Subject:Message-Id:From:Reply-To:Sender: List-Unsubscribe; bh=qYRglWL+kr7VZ7mmltIRn1MTDwqfJNve36WJPDABciU=; b=Qh9gU9E1 aoSHfmmejbZj8IOcyA4RNM3WZ8Lk/2pdneO9xNHB6th/zEonBvBl5hvFbGr+93OZ29UNpBIEnS7iz vc6cnSYkmcFb+Vi1V/x7VxovYeeWWa4C3HnmirgncEYyvhiJGaP/e3sUKH8hQY4AS5C3PVNe505nE SZGlUG+zXvSbxBTQtATHrx7oL8SX/vf8Qy3MlbXggIIo6HoyJgs3sEDX6SJUoHQD6yl5vXx81Mfaa LFXF1YnZ+VeFD0OqG60uYuHOQn5SPySEGpM/1uf44ZUwS23iIjTeeQQWBchJqlL01BmPWZzQVArLr CsVL2q64oquCDsFjnFRwfuRULQ==; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fubar.geek.nz; i=@fubar.geek.nz; q=dns/txt; s=s790814; t=1673438772; h=from : subject : to : message-id : date; bh=qYRglWL+kr7VZ7mmltIRn1MTDwqfJNve36WJPDABciU=; b=mbmvOG/072NCNaeiQ9JrKHk18q1HATXas+GrA1vhPZM1t71qsOlb94fZQWH+JrYTwLMsi YENIdxwpW/BB12iMdeofOZ2DXH2tFcVIn83gKpXDimo1+82hiOqJp7m5mLQKjI40jzO5O6h mVSd0ktS0ONv4x7L/6pJjn/P9o3lDkn0yQjWcmMuPOUgyUu5ZxKJZ/RSF85DYNRiyvhRgPT wHvleMVTAReS0OTkgjegtHevNtcWss7D3lc2T7gESgK83oEOvpqAcDGOKCtEPLxbMCmwkpj XGwYRUNx5A19fR9kgY4tisIPNB/D0z5ODcEcrfuG23fRTtEzxJR646r72gOA== Received: from [10.139.162.187] (helo=SmtpCorp) by smtpcorp.com with esmtpsa (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2-S2G) (envelope-from ) id 1pFZrk-qt4CXK-U2; Wed, 11 Jan 2023 12:06:00 +0000 Received: from [10.162.55.164] (helo=morbo.fubar.geek.nz) by smtpcorp.com with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.96-S2G) (envelope-from ) id 1pFZrk-4XlhEL-2H; Wed, 11 Jan 2023 12:06:00 +0000 Received: from smtpclient.apple (cpc91214-cmbg18-2-0-cust234.5-4.cable.virginm.net [81.102.75.235]) by morbo.fubar.geek.nz (Postfix) with ESMTPSA id 773F92BE67; Wed, 11 Jan 2023 12:05:56 +0000 (UTC) From: Andrew Turner Message-Id: Content-Type: multipart/alternative; boundary="Apple-Mail=_40865D25-0184-41BF-BE9C-41DCED0B9267" 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 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: Re: git: b069d3e01931 - main - rtld: Revert "When loading dso without PT_GNU_STACK phdr, only call" Date: Wed, 11 Jan 2023 12:05:55 +0000 In-Reply-To: Cc: John Baldwin , Jessica Clarke , Cy Schubert , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" To: Konstantin Belousov References: <202301042255.304MtY3G002415@gitrepo.freebsd.org> <20230105035046.A01DE62E@slippy.cwsent.com> <12b7ec5a-abf7-3b28-da80-ffedc1244c47@FreeBSD.org> X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Smtpcorp-Track: 1pFZrk4b_hEL2H.vnYqsrc2UBNCR Feedback-ID: 790814m:790814amQcrys:790814sFQGhZUASJ X-Report-Abuse: Please forward a copy of this message, including all headers, to X-Rspamd-Queue-Id: 4NsRGr71BZz3tR5 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:23352, ipnet:103.2.140.0/22, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --Apple-Mail=_40865D25-0184-41BF-BE9C-41DCED0B9267 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 11 Jan 2023, at 11:09, Konstantin Belousov = wrote: >=20 > On Tue, Jan 10, 2023 at 08:21:20PM -0500, John Baldwin wrote: >> On 1/4/23 7:59 PM, Jessica Clarke wrote: >>> On 5 Jan 2023, at 03:50, Cy Schubert = wrote: >>>>=20 >>>> In message <202301042255.304MtY3G002415@gitrepo.freebsd.org>, John = Baldwin >>>> writ >>>> es: >>>>> The branch main has been updated by jhb: >>>>>=20 >>>>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Db069d3e0193121ff6de348f68c7ce93e= >>>>> e61e5e2f >>>>>=20 >>>>> commit b069d3e0193121ff6de348f68c7ce93ee61e5e2f >>>>> Author: John Baldwin >>>>> AuthorDate: 2023-01-04 22:55:00 +0000 >>>>> Commit: John Baldwin >>>>> CommitDate: 2023-01-04 22:55:00 +0000 >>>>>=20 >>>>> rtld: Revert "When loading dso without PT_GNU_STACK phdr, only = call" >>>>>=20 >>>>> After the removal of ia64 and sparc64, all current = architectures >>>>> support executable stacks at an architectural level. >>>>>=20 >>>>> This reverts commit 1290d38ac50b3afa7e5781d9d97346a1042c736c. >>>>=20 >>>> I tried git log as follows in two independent repos, my "prod" repo = and the >>>> working repo I commit from: >>>>=20 >>>> slippy$ git log 1290d38ac50b3afa7e5781d9d97346a1042c736c >>>> fatal: bad object 1290d38ac50b3afa7e5781d9d97346a1042c736c >>>> slippy$ >>>>=20 >>>> Could there be some corruption somewhere? Do other people have the = same >>>> result as I do when they run git log against that hash? Or are my = repos >>>> corrupted? >>>>=20 >>>> When I run git log and search for the string "When loading dso = without >>>> PT_GNU_STACK phdr, only call", I find the following, suggesting = that the >>>> svn2git process may have resulted in different hashes in different = repos >>>> used by different people. >>>>=20 >>>> commit cb38d4941c45e3c72c4b5b3fad87d297d950cf53 >>>> Author: Konstantin Belousov >>>> AuthorDate: Tue Jan 25 21:12:31 2011 +0000 >>>> Commit: Konstantin Belousov >>>> CommitDate: Tue Jan 25 21:12:31 2011 +0000 >>>>=20 >>>> When loading dso without PT_GNU_STACK phdr, only call >>>> __pthread_map_stacks_exec() on architectures that allow = executable >>>> stacks. >>>>=20 >>>> Reported and tested by: marcel (ia64) >>>>=20 >>>> Notes: >>>> svn path=3D/head/; revision=3D217851 >>>>=20 >>>> BTW, our GH read-only mirror has the same hash as above suggesting = that >>>> jhb's repo may not be in sync with others with regard to svn2git = generated >>>> commits? >>>>=20 >>>> Or, does this point to a deeper problem with inconsistent repos or = some >>>> other svn2git inconsistency somewhere? >>>=20 >>> It=E2=80=99s the hash from the old GitHub mirror that's now = freebsd/freebsd-legacy. >>=20 >> Interesting, that is the hash I got from git blame for some reason. = I might >> have done the blame in CheriBSD though which has a complicated = history where >> it merged commits from the old hashes up to a point when the new = hashes >> were published, then CheriBSD has a special merge commit to join the = old and >> new histories before merging the new hashes from that point forwards. >=20 > I have pristine clone of the official FreeBSD src repo, which I used = when > did the review and look up the referenced commit. It worked for me. > I suspect/believe that the svn->git conversion also imported old = hashes. Which branches does "git branch -a --contains = 1290d38ac50b3afa7e5781d9d97346a1042c736c=E2=80=9D list? For me I only = see it on branches that have been migrated from the old hashes. Andrew --Apple-Mail=_40865D25-0184-41BF-BE9C-41DCED0B9267 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8

On 11 Jan 2023, at 11:09, Konstantin Belousov <kostikbel@gmail.com>= wrote:

On Tue, Jan 10, 2023 at 08:21:20PM -0500, John Baldwin = wrote:
On = 1/4/23 7:59 PM, Jessica Clarke wrote:
On 5 Jan 2023, at 03:50, Cy Schubert <Cy.Schubert@cschubert.com> wrote:

In = message <202301042255.304MtY3G002415@gitrepo.freebsd.org>, John = Baldwin
writ
es:
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=3Db069d3e0193121ff6de34= 8f68c7ce93e
e61e5e2f

commit= b069d3e0193121ff6de348f68c7ce93ee61e5e2f
Author: =     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-01-04 22:55:00 +0000
Commit: =     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-01-04 22:55:00 +0000

   rtld: Revert "When loading dso without = PT_GNU_STACK phdr, only call"

   After the removal of ia64 and sparc64, all = current architectures
   support executable = stacks at an architectural level.

   This reverts commit = 1290d38ac50b3afa7e5781d9d97346a1042c736c.

I tried git log as follows in two independent repos, my = "prod" repo and the
working repo I commit from:

slippy$ git log = 1290d38ac50b3afa7e5781d9d97346a1042c736c
fatal: bad object = 1290d38ac50b3afa7e5781d9d97346a1042c736c
slippy$

Could there be some corruption somewhere? Do = other people have the same
result as I do when they run = git log against that hash? Or are my repos
corrupted?

When I run git log and search for the string = "When loading dso without
PT_GNU_STACK phdr, only call", I = find the following, suggesting that the
svn2git process = may have resulted in different hashes in different repos
used by  different people.

commit cb38d4941c45e3c72c4b5b3fad87d297d950cf53
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: Tue Jan 25 21:12:31 2011 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: Tue Jan 25 21:12:31 2011 +0000

   When loading dso without PT_GNU_STACK phdr, = only call
   __pthread_map_stacks_exec() on = architectures that allow executable
   stacks.

   Reported and tested by: marcel (ia64)

Notes:
   svn = path=3D/head/; revision=3D217851

BTW, our = GH read-only mirror has the same hash as above suggesting that
jhb's repo may not be in sync with others with regard to = svn2git generated
commits?

Or, = does this point to a deeper problem with inconsistent repos or some
other svn2git inconsistency somewhere?

It=E2=80=99s the hash from the = old GitHub mirror that's now freebsd/freebsd-legacy.

Interesting, that is the hash I = got from git blame for some reason.  I might
have = done the blame in CheriBSD though which has a complicated history = where
it merged commits from the old hashes up to a point = when the new hashes
were published, then CheriBSD has a = special merge commit to join the old and
new histories = before merging the new hashes from that point forwards.

I have pristine clone of the official FreeBSD src repo, which = I used when
did the = review and look up the referenced commit.  It worked for = me.
I = suspect/believe that the svn->git conversion also imported old = hashes.

Which = branches does "git branch -a --contains = 1290d38ac50b3afa7e5781d9d97346a1042c736c=E2=80=9D list? For me I only = see it on branches that have been migrated from the old = hashes.

Andrew

= --Apple-Mail=_40865D25-0184-41BF-BE9C-41DCED0B9267--