From nobody Wed Jan 11 14:07:07 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 4NsTyQ0PP1z2p1Kq for ; Wed, 11 Jan 2023 14:07:10 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) (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 4NsTyP5g3Yz4BKG for ; Wed, 11 Jan 2023 14:07:09 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62d.google.com with SMTP id tz12so37084844ejc.9 for ; Wed, 11 Jan 2023 06:07:09 -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=3YPvi9XCIKquEusxgkbwhd6j/X6+QGiFYPDvdLH0Y9Y=; b=ufEZ9L6aowwUG5Yn/EeS/ApY0jNRgiZKy8ooqq+0tqpqV9RSxWA1gvwqp7BfxgB59J xx0APNOpldjZlah5P/esjkCGBpR5SPBDeoNBxZGz5IkwJ22ir6ZFRvk4fGFlt+0YKMm8 f28QHm5otlsmPYMPvUV4/v6RE+KfHY1TFaiIuLR7IOA9h9IBQI22Y0wAWQhBJ9BgoRlo +ZRlGfqpi72VjFAsO5ZxyqB2J5Vdzc+qrevgwbe2XsmjpoKDn2ZbMTE5zlQC+3Ue8gJu PV1WYRUdVlkJrxZ0WEZ//W0pPcNZCc6CS8wLS5gTKMnUhLhEccM0tUsmSyt9NLQZ2edy OJOg== 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=3YPvi9XCIKquEusxgkbwhd6j/X6+QGiFYPDvdLH0Y9Y=; b=jkCBkhDIdE7AokXr/o6z41xmOLMmT4JzsE3OGdqpbJ97bj6gzQ1L6VIFNcc7n0RHkw hQKkZki4m6lCfMO+6yWODknGPRXdo0Xtj48LQMG7zVsUZkvj2og3i9XH4lHa21rkBc4H JECXK9SbTY/RyxGtNtgdcEyRfKY4Sy2JE5RYo4skusHfSDSqFISjL3xUDarOxjNQdsye IEkAn5oFUpWiy9jO1cv/kjYAt+1hpvedAtACcSjJpxFVOtknsv4s4E+g2kk3wGj5Y74g GmUDYfUbyaM8wsKV9oIV9w171MW6uPmuTRrBva2wwzBY3GTCT8JhP9QX0NT50507KS0r Y7EQ== X-Gm-Message-State: AFqh2koiM3eYMbsEXIQ3Z7gLy/cqIjMG1l2aWlnxUOmd+xEx2JPtjUfd dtpG3GwbyMMEksPmeZvgOUIe6S9CvTffYuwXrG5E5Q== X-Google-Smtp-Source: AMrXdXs7gORBMtdC1PcXUC8QCUl78+zHSMLOUIAYow6fCBxT7yk3ogbSYB7Ck5dumKmBQ2z0/ynT0/AQdH8FfPT2Awg= X-Received: by 2002:a17:906:140e:b0:7c0:e0db:f136 with SMTP id p14-20020a170906140e00b007c0e0dbf136mr5721590ejc.333.1673446027524; Wed, 11 Jan 2023 06:07:07 -0800 (PST) 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 References: <202301042255.304MtY3G002415@gitrepo.freebsd.org> <20230105035046.A01DE62E@slippy.cwsent.com> <12b7ec5a-abf7-3b28-da80-ffedc1244c47@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Wed, 11 Jan 2023 07:07:07 -0700 Message-ID: Subject: Re: git: b069d3e01931 - main - rtld: Revert "When loading dso without PT_GNU_STACK phdr, only call" To: Konstantin Belousov Cc: Andrew Turner , John Baldwin , Jessica Clarke , Cy Schubert , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="00000000000005985205f1fd840b" X-Rspamd-Queue-Id: 4NsTyP5g3Yz4BKG X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --00000000000005985205f1fd840b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Jan 11, 2023 at 5:38 AM Konstantin Belousov wrote: > On Wed, Jan 11, 2023 at 12:05:55PM +0000, Andrew Turner wrote: > > > > > > > On 11 Jan 2023, at 11:09, Konstantin Belousov > 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 > 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=3Db069d3e0193121ff6de348f68c7ce93= e > > >>>>> 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 architectur= es > > >>>>> support executable stacks at an architectural level. > > >>>>> > > >>>>> This reverts commit 1290d38ac50b3afa7e5781d9d97346a1042c736c. > > >>>> > > >>>> I tried git log as follows in two independent repos, my "prod" rep= o > 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=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. > > Hm, it is remotes/github/master > And remotes: > github git@github.com:freebsd/freebsd-src.git > Yea, that's the old githib master branch for sure. We never used 'main' in the FreeBSD official git repo (the one from cgit, not the unofficial beta repo we had while still using svn). I don't have it in my pristine copy of the FreeBSD cgit repo. It is in an old github repo that I have though. There was a merge commit in the old repo as a bridge to the new repo, similar to what was done in CheriBSD. I've not checked to see what git blame tells me in my old merged repo since I've not updated it in quite a while. Warner --00000000000005985205f1fd840b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Jan 11, 2023 at 5:38 AM Konst= antin Belousov <kostikbel@gmail.c= om> wrote:
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=3Db069d3e0193121ff6de348f68c7c= e93e
> >>>>> e61e5e2f
> >>>>>
> >>>>> commit b069d3e0193121ff6de348f68c7ce93ee61e5e2f > >>>>> Author:=C2=A0 =C2=A0 =C2=A0John Baldwin <jhb@F= reeBSD.org>
> >>>>> AuthorDate: 2023-01-04 22:55:00 +0000
> >>>>> Commit:=C2=A0 =C2=A0 =C2=A0John Baldwin <jhb@F= reeBSD.org>
> >>>>> CommitDate: 2023-01-04 22:55:00 +0000
> >>>>>
> >>>>>=C2=A0 =C2=A0 rtld: Revert "When loading dso = without PT_GNU_STACK phdr, only call"
> >>>>>
> >>>>>=C2=A0 =C2=A0 After the removal of ia64 and sparc6= 4, all current architectures
> >>>>>=C2=A0 =C2=A0 support executable stacks at an arch= itectural level.
> >>>>>
> >>>>>=C2=A0 =C2=A0 This reverts commit 1290d38ac50b3afa= 7e5781d9d97346a1042c736c.
> >>>>
> >>>> I tried git log as follows in two independent repos, = my "prod" repo and the
> >>>> working repo I commit from:
> >>>>
> >>>> slippy$ git log 1290d38ac50b3afa7e5781d9d97346a1042c7= 36c
> >>>> fatal: bad object 1290d38ac50b3afa7e5781d9d97346a1042= c736c
> >>>> slippy$
> >>>>
> >>>> Could there be some corruption somewhere? Do other pe= ople have the same
> >>>> result as I do when they run git log against that has= h? Or are my repos
> >>>> corrupted?
> >>>>
> >>>> When I run git log and search for the string "Wh= en loading dso without
> >>>> PT_GNU_STACK phdr, only call", I find the follow= ing, suggesting that the
> >>>> svn2git process may have resulted in different hashes= in different repos
> >>>> used by=C2=A0 different people.
> >>>>
> >>>> commit cb38d4941c45e3c72c4b5b3fad87d297d950cf53
> >>>> Author:=C2=A0 =C2=A0 =C2=A0Konstantin Belousov <ki= b@FreeBSD.org>
> >>>> AuthorDate: Tue Jan 25 21:12:31 2011 +0000
> >>>> Commit:=C2=A0 =C2=A0 =C2=A0Konstantin Belousov <ki= b@FreeBSD.org>
> >>>> CommitDate: Tue Jan 25 21:12:31 2011 +0000
> >>>>
> >>>>=C2=A0 =C2=A0 When loading dso without PT_GNU_STACK ph= dr, only call
> >>>>=C2=A0 =C2=A0 __pthread_map_stacks_exec() on architect= ures that allow executable
> >>>>=C2=A0 =C2=A0 stacks.
> >>>>
> >>>>=C2=A0 =C2=A0 Reported and tested by: marcel (ia64) > >>>>
> >>>> Notes:
> >>>>=C2=A0 =C2=A0 svn path=3D/head/; revision=3D217851
> >>>>
> >>>> BTW, our GH read-only mirror has the same hash as abo= ve suggesting that
> >>>> jhb's repo may not be in sync with others with re= gard to svn2git generated
> >>>> commits?
> >>>>
> >>>> Or, does this point to a deeper problem with inconsis= tent 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 r= eason.=C2=A0 I might
> >> have done the blame in CheriBSD though which has a complicate= d 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 j= oin the old and
> >> new histories before merging the new hashes from that point f= orwards.
> >
> > I have pristine clone of the official FreeBSD src repo, which I u= sed when
> > did the review and look up the referenced commit.=C2=A0 It worked= for me.
> > I suspect/believe that the svn->git conversion also imported o= ld hashes.
>
> Which branches does "git branch -a --contains 1290d38ac50b3afa7e5= 781d9d97346a1042c736c=E2=80=9D list? For me I only see it on branches that = have been migrated from the old hashes.

Hm, it is remotes/github/master
And remotes:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 github=C2=A0 git@github.com:freebsd/freebsd-src= .git

Yea, that's the old githib mas= ter branch for sure. We never used 'main' in the FreeBSD official g= it repo (the one from cgit, not the unofficial beta repo we had while still= using svn). I don't have it in my pristine copy of the FreeBSD cgit re= po. It is in an old github repo that I have though. There was a merge commi= t in the old repo as a bridge to the new repo, similar to what was done in = CheriBSD. I've not checked to see what git blame tells me in my old mer= ged repo since I've not updated it in quite a while.

Warner
--00000000000005985205f1fd840b--