Date: Wed, 11 Jan 2023 12:05:55 +0000 From: Andrew Turner <andrew@fubar.geek.nz> To: Konstantin Belousov <kostikbel@gmail.com> Cc: John Baldwin <jhb@freebsd.org>, Jessica Clarke <jrtc27@freebsd.org>, Cy Schubert <Cy.Schubert@cschubert.com>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>, "dev-commits-src-main@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: <F3B87C81-7A97-4BA4-8ADA-A75E53B14092@fubar.geek.nz> In-Reply-To: <Y76Y0oUSqRj0sUD8@kib.kiev.ua> References: <202301042255.304MtY3G002415@gitrepo.freebsd.org> <20230105035046.A01DE62E@slippy.cwsent.com> <C41C83D5-9123-48C1-A3A2-7694556C8CE8@freebsd.org> <12b7ec5a-abf7-3b28-da80-ffedc1244c47@FreeBSD.org> <Y76Y0oUSqRj0sUD8@kib.kiev.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <kostikbel@gmail.com> = 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 <Cy.Schubert@cschubert.com> = 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 <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 >>>>>=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 <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 >>>>=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 <html><head><meta http-equiv=3D"Content-Type" content=3D"text/html; = charset=3Dutf-8"></head><body style=3D"word-wrap: break-word; = -webkit-nbsp-mode: space; line-break: after-white-space;" class=3D""><br = class=3D""><div><br class=3D""><blockquote type=3D"cite" class=3D""><div = class=3D"">On 11 Jan 2023, at 11:09, Konstantin Belousov <<a = href=3D"mailto:kostikbel@gmail.com" class=3D"">kostikbel@gmail.com</a>>= wrote:</div><br class=3D"Apple-interchange-newline"><div class=3D""><meta= charset=3D"UTF-8" class=3D""><span style=3D"caret-color: rgb(0, 0, 0); = font-family: Helvetica; font-size: 12px; font-style: normal; = font-variant-caps: normal; font-weight: 400; letter-spacing: normal; = text-align: start; text-indent: 0px; text-transform: none; white-space: = normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; = text-decoration: none; float: none; display: inline !important;" = class=3D"">On Tue, Jan 10, 2023 at 08:21:20PM -0500, John Baldwin = wrote:</span><br style=3D"caret-color: rgb(0, 0, 0); font-family: = Helvetica; font-size: 12px; font-style: normal; font-variant-caps: = normal; font-weight: 400; letter-spacing: normal; text-align: start; = text-indent: 0px; text-transform: none; white-space: normal; = word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: = none;" class=3D""><blockquote type=3D"cite" style=3D"font-family: = Helvetica; font-size: 12px; font-style: normal; font-variant-caps: = normal; font-weight: 400; letter-spacing: normal; orphans: auto; = text-align: start; text-indent: 0px; text-transform: none; white-space: = normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; = -webkit-text-stroke-width: 0px; text-decoration: none;" class=3D"">On = 1/4/23 7:59 PM, Jessica Clarke wrote:<br class=3D""><blockquote = type=3D"cite" class=3D"">On 5 Jan 2023, at 03:50, Cy Schubert <<a = href=3D"mailto:Cy.Schubert@cschubert.com" = class=3D"">Cy.Schubert@cschubert.com</a>> wrote:<br = class=3D""><blockquote type=3D"cite" class=3D""><br class=3D"">In = message <<a = href=3D"mailto:202301042255.304MtY3G002415@gitrepo.freebsd.org" = class=3D"">202301042255.304MtY3G002415@gitrepo.freebsd.org</a>>, John = Baldwin<br class=3D"">writ<br class=3D"">es:<br class=3D""><blockquote = type=3D"cite" class=3D"">The branch main has been updated by jhb:<br = class=3D""><br class=3D"">URL: <a = href=3D"https://cgit.FreeBSD.org/src/commit/?id=3Db069d3e0193121ff6de348f6= 8c7ce93e" = class=3D"">https://cgit.FreeBSD.org/src/commit/?id=3Db069d3e0193121ff6de34= 8f68c7ce93e</a><br class=3D"">e61e5e2f<br class=3D""><br class=3D"">commit= b069d3e0193121ff6de348f68c7ce93ee61e5e2f<br class=3D"">Author: = John Baldwin <<a = href=3D"mailto:jhb@FreeBSD.org" class=3D"">jhb@FreeBSD.org</a>><br = class=3D"">AuthorDate: 2023-01-04 22:55:00 +0000<br class=3D"">Commit: = John Baldwin <<a = href=3D"mailto:jhb@FreeBSD.org" class=3D"">jhb@FreeBSD.org</a>><br = class=3D"">CommitDate: 2023-01-04 22:55:00 +0000<br class=3D""><br = class=3D""> rtld: Revert "When loading dso without = PT_GNU_STACK phdr, only call"<br class=3D""><br = class=3D""> After the removal of ia64 and sparc64, all = current architectures<br class=3D""> support executable = stacks at an architectural level.<br class=3D""><br = class=3D""> This reverts commit = 1290d38ac50b3afa7e5781d9d97346a1042c736c.<br class=3D""></blockquote><br = class=3D"">I tried git log as follows in two independent repos, my = "prod" repo and the<br class=3D"">working repo I commit from:<br = class=3D""><br class=3D"">slippy$ git log = 1290d38ac50b3afa7e5781d9d97346a1042c736c<br class=3D"">fatal: bad object = 1290d38ac50b3afa7e5781d9d97346a1042c736c<br class=3D"">slippy$<br = class=3D""><br class=3D"">Could there be some corruption somewhere? Do = other people have the same<br class=3D"">result as I do when they run = git log against that hash? Or are my repos<br class=3D"">corrupted?<br = class=3D""><br class=3D"">When I run git log and search for the string = "When loading dso without<br class=3D"">PT_GNU_STACK phdr, only call", I = find the following, suggesting that the<br class=3D"">svn2git process = may have resulted in different hashes in different repos<br = class=3D"">used by different people.<br class=3D""><br = class=3D"">commit cb38d4941c45e3c72c4b5b3fad87d297d950cf53<br = class=3D"">Author: Konstantin Belousov <<a = href=3D"mailto:kib@FreeBSD.org" class=3D"">kib@FreeBSD.org</a>><br = class=3D"">AuthorDate: Tue Jan 25 21:12:31 2011 +0000<br = class=3D"">Commit: Konstantin Belousov <<a = href=3D"mailto:kib@FreeBSD.org" class=3D"">kib@FreeBSD.org</a>><br = class=3D"">CommitDate: Tue Jan 25 21:12:31 2011 +0000<br class=3D""><br = class=3D""> When loading dso without PT_GNU_STACK phdr, = only call<br class=3D""> __pthread_map_stacks_exec() on = architectures that allow executable<br = class=3D""> stacks.<br class=3D""><br = class=3D""> Reported and tested by: marcel (ia64)<br = class=3D""><br class=3D"">Notes:<br class=3D""> svn = path=3D/head/; revision=3D217851<br class=3D""><br class=3D"">BTW, our = GH read-only mirror has the same hash as above suggesting that<br = class=3D"">jhb's repo may not be in sync with others with regard to = svn2git generated<br class=3D"">commits?<br class=3D""><br class=3D"">Or, = does this point to a deeper problem with inconsistent repos or some<br = class=3D"">other svn2git inconsistency somewhere?<br = class=3D""></blockquote><br class=3D"">It=E2=80=99s the hash from the = old GitHub mirror that's now freebsd/freebsd-legacy.<br = class=3D""></blockquote><br class=3D"">Interesting, that is the hash I = got from git blame for some reason. I might<br class=3D"">have = done the blame in CheriBSD though which has a complicated history = where<br class=3D"">it merged commits from the old hashes up to a point = when the new hashes<br class=3D"">were published, then CheriBSD has a = special merge commit to join the old and<br class=3D"">new histories = before merging the new hashes from that point forwards.<br = class=3D""></blockquote><br style=3D"caret-color: rgb(0, 0, 0); = font-family: Helvetica; font-size: 12px; font-style: normal; = font-variant-caps: normal; font-weight: 400; letter-spacing: normal; = text-align: start; text-indent: 0px; text-transform: none; white-space: = normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; = text-decoration: none;" class=3D""><span style=3D"caret-color: rgb(0, 0, = 0); font-family: Helvetica; font-size: 12px; font-style: normal; = font-variant-caps: normal; font-weight: 400; letter-spacing: normal; = text-align: start; text-indent: 0px; text-transform: none; white-space: = normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; = text-decoration: none; float: none; display: inline !important;" = class=3D"">I have pristine clone of the official FreeBSD src repo, which = I used when</span><br style=3D"caret-color: rgb(0, 0, 0); font-family: = Helvetica; font-size: 12px; font-style: normal; font-variant-caps: = normal; font-weight: 400; letter-spacing: normal; text-align: start; = text-indent: 0px; text-transform: none; white-space: normal; = word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: = none;" class=3D""><span style=3D"caret-color: rgb(0, 0, 0); font-family: = Helvetica; font-size: 12px; font-style: normal; font-variant-caps: = normal; font-weight: 400; letter-spacing: normal; text-align: start; = text-indent: 0px; text-transform: none; white-space: normal; = word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: = none; float: none; display: inline !important;" class=3D"">did the = review and look up the referenced commit. It worked for = me.</span><br style=3D"caret-color: rgb(0, 0, 0); font-family: = Helvetica; font-size: 12px; font-style: normal; font-variant-caps: = normal; font-weight: 400; letter-spacing: normal; text-align: start; = text-indent: 0px; text-transform: none; white-space: normal; = word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: = none;" class=3D""><span style=3D"caret-color: rgb(0, 0, 0); font-family: = Helvetica; font-size: 12px; font-style: normal; font-variant-caps: = normal; font-weight: 400; letter-spacing: normal; text-align: start; = text-indent: 0px; text-transform: none; white-space: normal; = word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: = none; float: none; display: inline !important;" class=3D"">I = suspect/believe that the svn->git conversion also imported old = hashes.</span></div></blockquote><br class=3D""></div><div>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.</div><div><br class=3D""></div><div>Andrew</div><br = class=3D""></body></html>= --Apple-Mail=_40865D25-0184-41BF-BE9C-41DCED0B9267--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?F3B87C81-7A97-4BA4-8ADA-A75E53B14092>