From nobody Wed Jan 11 11:09:06 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 4NsQ1D4hTlz2r4n3; Wed, 11 Jan 2023 11:09:20 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4NsQ1D090yz3kcx; Wed, 11 Jan 2023 11:09:19 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.16.1/8.16.1) with ESMTPS id 30BB97Gr073172 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 11 Jan 2023 13:09:10 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 30BB97Gr073172 Received: (from kostik@localhost) by tom.home (8.16.1/8.16.1/Submit) id 30BB96Wl073171; Wed, 11 Jan 2023 13:09:06 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 11 Jan 2023 13:09:06 +0200 From: Konstantin Belousov To: John Baldwin Cc: Jessica Clarke , Cy Schubert , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: b069d3e01931 - main - rtld: Revert "When loading dso without PT_GNU_STACK phdr, only call" Message-ID: References: <202301042255.304MtY3G002415@gitrepo.freebsd.org> <20230105035046.A01DE62E@slippy.cwsent.com> <12b7ec5a-abf7-3b28-da80-ffedc1244c47@FreeBSD.org> 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 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <12b7ec5a-abf7-3b28-da80-ffedc1244c47@FreeBSD.org> X-Rspamd-Queue-Id: 4NsQ1D090yz3kcx X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N 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: > > > > > > 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=b069d3e0193121ff6de348f68c7ce93e > > > > e61e5e2f > > > > > > > > commit b069d3e0193121ff6de348f68c7ce93ee61e5e2f > > > > Author: John Baldwin > > > > AuthorDate: 2023-01-04 22:55:00 +0000 > > > > Commit: John Baldwin > > > > 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 > > > AuthorDate: Tue Jan 25 21:12:31 2011 +0000 > > > Commit: Konstantin Belousov > > > 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=/head/; revision=217851 > > > > > > 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’s 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.