From nobody Thu Jun 12 19:22:52 2025 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 4bJC9Y1PZWz5yHj8 for ; Thu, 12 Jun 2025 19:23:13 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic308-55.consmr.mail.gq1.yahoo.com (sonic308-55.consmr.mail.gq1.yahoo.com [98.137.68.31]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4bJC9W5zFlz3DX0 for ; Thu, 12 Jun 2025 19:23:11 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=gOeaKXg0; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.68.31 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1749756185; bh=2mk3nTNJUiLPB2opSTlIOOEn/GLa6PayeUvFCrPtdeI=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=gOeaKXg0aUwNTd/2njjiGQxO9afWQcHhDnUvLYtLV0SqeCKRt/dwAxmsuCyck51Hr63pWlDsZuIsV5/5KWwfHQCZNQCTIkikQJPLzdyJzUKhJe28LPCYfl/UnuvFb2JQu3fErzEHyUnS4wookY8vQoRUJWanFmA5xmqpayTDfpSRh4JTiGfTKuTKHuCztxxV2sxdmySVCxN4WMikOPEQkQgA11wPSRphstw994AmpzNdT8ipNVU+kxfdg1seeyhvoxf90XthmdNOR0vT/DLz8VhtP06pfc8PBIX800kpAqmyuTyM7XhOzZG/zvbiMLV1TET/R+nD0FBOEyoiE9YqOA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1749756185; bh=7WmObBsSe2j3fFxBklIPYun/JujToXQJ0YjB6EEMY6X=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=uByFtXx155cJm7o93o69TPgobILI5iPM4KHf3q3oubBRafX9ppmFlzPT9Wo635LMJUQz+V3FFljwYz128k7QjUAz8oK2s4CYDUQEvfdQw+NwArTWh3yvr3xW5oS95h9FSgqygW92dsU3sPMHdZ5r4ZRhZJll9onhJtmdDnS61tWX8weX+9KvJDWrAiOFl4IgtR4Dj7PCaP3U0sR9oRPD8UPlTDQ8jMgM2GW5TAbXmGZFMQcLr7Ch7EgrWLQ+zKu6f2n9ue0kSPT51hjqwo7S4w18MqRP4IlZNcObMpqjvSgPGk/9KDTiWgkModolN0RVSgxIRfXPd+1Kqj3d0CSAjQ== X-YMail-OSG: 5eDoj8gVM1n1At329cw4AjqZkLkcXnrGWYdaPImG0JxTDyQk26rKC6d5fAs_oYT C7qi0cAn.7jOu8caGHWbzBfTYNU5gTLkQWMU_4q7SocQHqfkSVbzPHPFKiFucnq0F2A7_FmBFdIW 0DPFp6O4x0Gh3H6ySPaP7_N5q5bnpwP7vILVEB2IRoQzgu8EDDW7L9vlOJcaRUZQhZjpE3sSdpaY qTAnQvdvscE7ehP3vELlz6OL5is.hL_nJgt4Dajedm2tXgg0bYRR_4rP19s_XAFeYlKpJkOCQQEQ .ahUAe3rbny1wqzaoOMjOeghwSxRK1GSkS7n32sOiEjw_XdM.q72wJFO_6INH2XR_hit042lgWUo WNDqdBt3ZQ3y8GY6xaNHoNRfCdpPVDJMfaVsbVyU0616YcXoJzasw9p_bPXuikfGJIdCOrcz3jHt NXbqz.tUQV0yLRjT1oXq48_v46VOsPxJ14Dd5rbtFjxb_yochTdrXnhuhLbnWZwNXVl9CR1DxN5J KuYVpLvDWTbxjxgqCoYxdZ6nTMT9Es685xDHy9Fs3Kx15IGLphCb8RjCb09opEFBi3e0Rx7ppUKe A.lCafdP_TuZaosjfT5wCJXLlLgIS6UBRn9ESEaMRpregxLhwn2N9tYyD37DEGs4Ss.7gZdEXxcS 2KyNjRtmsMpiLKQ9MU52p839RY_m26LHA9elgfJMxD8Sx_ON_ijNyrYYc1v._BtAO4zxYFFU3hBo YC92zAslkWrxdSbCFB5TYWj9kTN41nZxnPGwDAgHiorIlPSFro4eNWbV4BVn9YBBZR1P3wSBMj8w ICmSEgmdp59XOymxUyh_d3z7cHkH0RTveVO74L9Y6nPcVQjvpOMNM6qfGRp2CCx8c9zvi2GmyNn1 BG0Qopp93wO2p.C1yBkrXcq2Lh3Vj8ARA1tZERx5loIGSuc0GIJKIVIQFvDV6kckJbBZR5x_ZnqZ .6Vh3llgJhJEyVQIi_hbwtn.SJyfPCccLFpSUWDUkXSP815x2TxliDlG4MVYWHLRpH6KHyGOVTvP 6wf.1RfBOrsrRr95m8KHMDYltzLTpO5KnyIMQIHwOOmPHBAEW8cB0DhQrWL8SHh6ujEck5WnufOf LMyDJtOEFgjOw338Aaf740fwS_c_.tnHG8Ne27gNk1_hlky15kmtFDLDPolgKwoX3az3QT8M.xzH elg6QY.qA3svQWIovy_E4GG_bzGfnOTRz5ONy8FesRmX7Uaxcv5183GrJlfWvb96m1r_PA0Y3pfM rZc3xb1GI9JCljCBlthIAMEq5WydIYhT9nZXulM0XzIc4_xiW0zt_oZb.NKz1THVHrdoqUqhGEqg PXwMSqoBbaee6cOqHHO3lY6OFJig9nFDGpsaSWl._2VTB5D6MQKgY7dm0zZq6EMov4uTdRPp528s bPbAloDfOl4LxfNyVa9Fl_wPjoOi4ZqZ.kCayUcLRpCM1g01a2a6NQM73fHdLUCWqD3HgE1zxauV EnggUU3QHF4V0NEQ2INe5wL18HXtDVD4kuh9CVCZS4fnGdmXhZUEeK9qqQqqq7IBLOnDOVxBKs76 590JsP_TL.ULyQqU.MXjc2JI56TUEkFFLrEVFZhrC.MAfF8HYTCabYh2JA02hFXuN2TIVMBcHj68 baepKa.T0sH1ym3GqgnKlIN.ghQhxMZnN0x.CfHb2AdIDp.pn5bSm2veygma4GIuP8Eq.H80hIdm AvRzxAw5.6yy0Onstm4UCC__MgdjTrrDqo5D3ho5U0WNyfuTDkHZikVxeue5vsO3FT7njTS6vM_L Z5gv0RxqnVTHTpw_Dp.YCOBr9krrnd6vSZTmE4UuKF3CQsbbvRPClnMxaCaP9lt2iCaadNeYuACz XrpUqJEHqBs8MgYtD6XUMNmrXVHbb5_E6NKi_z_XfN4O6ak3bsmgtNBYmwdIC7Eg2oiNpSaJLiMr iQx3TjLJvExLzlX96F.CX8ckkE6Kg_cSpG2DEMJG2Vuf7_SMEQuPyOI25uExVMg3jVVvItG5qchi _ls9EW2enV7IJfNDS23OMOZjSMRKtyocnbtAQUow2YoTb5M2qqY0hKyHTSbHtPDEmIU089Nbx2Y8 T1Zw3FPwm8a1EkuI7ytF30ti46SKLFeVx3dotP5vuH.Hloxj_Xxinmyb_PTJrREpoMBpmypGBKOz CAIXKvB3cp.R8qHR14Nxx0CfnGgzccHJX5Q5oi.5PZWuMMtfn0d_ikZeMe3FRtpZIJsB8PreyTwj Kg1S2WhS5MGj06Qd2IzDxmi4izi6gyWoS2ozMDyhW8y6ZSwYSRkd9k3NLTY0fkBf4oOjfFEjXksp iAvgwIDpuKoKlYdoE9aI30A-- X-Sonic-MF: X-Sonic-ID: c0c03b1f-c9a1-4ee3-a9db-1adafc887a5a Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.gq1.yahoo.com with HTTP; Thu, 12 Jun 2025 19:23:05 +0000 Received: by hermes--production-gq1-74d64bb7d7-r5xbr (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 9d86ec8d8975c47f8b50c161281792d9; Thu, 12 Jun 2025 19:23:03 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.600.51.1.1\)) Subject: RE: git: 883596411327 - stable/14 - amd64: switch to amd64_set_tlsbase to set tls base [|| (. . . && osrel >= 1403502) test too?] Message-Id: <4C483AC0-4082-4EBB-AAC2-01610E0482B3@yahoo.com> Date: Thu, 12 Jun 2025 12:22:52 -0700 To: Konstantin Belousov , dev-commits-src-main@freebsd.org X-Mailer: Apple Mail (2.3826.600.51.1.1) References: <4C483AC0-4082-4EBB-AAC2-01610E0482B3.ref@yahoo.com> X-Spamd-Result: default: False [-1.65 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-0.79)[-0.789]; NEURAL_SPAM_SHORT(0.64)[0.637]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_FROM(0.00)[yahoo.com]; TO_DN_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.31:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.31:from]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; SUBJECT_HAS_QUESTION(0.00)[] X-Rspamd-Queue-Id: 4bJC9W5zFlz3DX0 X-Spamd-Bar: - Konstantin Belousov wrote on Date: Thu, 12 Jun 2025 18:03:03 UTC : > The branch stable/14 has been updated by kib: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D88359641132766cc0a8eed283a7a7045= 95c7c119 >=20 > commit 88359641132766cc0a8eed283a7a704595c7c119 > Author: Konstantin Belousov > AuthorDate: 2025-05-22 04:32:25 +0000 > Commit: Konstantin Belousov > CommitDate: 2025-06-12 18:02:50 +0000 >=20 > amd64: switch to amd64_set_tlsbase to set tls base > =20 > (cherry picked from commit = aef025fc9b6c8b06677086a93c866ee09622f6fa) > --- > libexec/rtld-elf/amd64/reloc.c | 6 ++++-- > sys/x86/include/tls.h | 2 +- > 2 files changed, 5 insertions(+), 3 deletions(-) >=20 > diff --git a/libexec/rtld-elf/amd64/reloc.c = b/libexec/rtld-elf/amd64/reloc.c > index 7e7f01a5d186..74693d35ba1d 100644 > --- a/libexec/rtld-elf/amd64/reloc.c > +++ b/libexec/rtld-elf/amd64/reloc.c > @@ -530,10 +530,12 @@ allocate_initial_tls(Obj_Entry *objs) > addr =3D allocate_tls(objs, 0, TLS_TCB_SIZE, TLS_TCB_ALIGN); > =20 > /* > - * This does not use _tcb_set() as it calls amd64_set_fsbase() > + * This does not use _tcb_set() as it calls amd64_set_tlsbase() > * which is an ifunc and rtld must not use ifuncs. > */ > - if (__getosreldate() >=3D P_OSREL_WRFSBASE && > + if (__getosreldate() >=3D P_OSREL_TLSBASE) lib/libc/amd64/sys/amd64_set_tlsbase.c has more in its test, "|| (P_OSREL_MAJOR(osrel) =3D=3D 14 && osrel >=3D 1403502)" : +DEFINE_UIFUNC(, int, amd64_set_tlsbase, (void *)) +{ + int osrel; + + osrel =3D __getosreldate(); + if (osrel >=3D P_OSREL_TLSBASE || + (P_OSREL_MAJOR(osrel) =3D=3D 14 && osrel >=3D 1403502)) + return (amd64_set_tlsbase_syscall); + return (amd64_set_fsbase); +} Is the difference in libexec/rtld-elf/amd64/reloc.c related to P_OSREL_TLSBASE like testing deliberate? > + sysarch(AMD64_SET_TLSBASE, &addr); > + else if (__getosreldate() >=3D P_OSREL_WRFSBASE && > (cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) !=3D 0) > wrfsbase((uintptr_t)addr); > else > diff --git a/sys/x86/include/tls.h b/sys/x86/include/tls.h > index 4b6b58b4a5e3..b431c336122c 100644 > --- a/sys/x86/include/tls.h > +++ b/sys/x86/include/tls.h > @@ -59,7 +59,7 @@ static __inline void > _tcb_set(struct tcb *tcb) > { > #ifdef __amd64__ > - amd64_set_fsbase(tcb); > + amd64_set_tlsbase(tcb); > #else > i386_set_gsbase(tcb); > #endif =20 =3D=3D=3D Mark Millard marklmi at yahoo.com