From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 9F59D38555AB; Fri, 12 May 2023 15:13:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9F59D38555AB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683904427; bh=ZjylJx0Mvhszi95wKPspf+/E84cQAjyQ5Cts1OKgzjA=; h=From:To:Subject:Date:From; b=H0aFL45SfF0W9EsI4xnascPR6wtGUrTPa3TljGhB4UMIMfy3NpMm9RmJHX1xlt3I+ STTy2KuAEW8MlNU468BALhMtBOqgi3JBXUsRYVahEK/EsDo/XaMhdL/Jx69YPrIzbQ tEweYa+M/2/6xsqIc2zWIxW4oPM12lzIJRblwgjM= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Jon Turney To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] fhandler/proc.cc(format_proc_cpuinfo): Add Linux 6.3 cpuinfo X-Act-Checkin: newlib-cygwin X-Git-Author: Brian Inglis X-Git-Refname: refs/heads/master X-Git-Oldrev: 8144619bad0c25b1a27edbd0085664ac338822af X-Git-Newrev: 41fdb869f9984ca2f8600aaa980b4ed2eae2e980 Message-Id: <20230512151347.9F59D38555AB@sourceware.org> Date: Fri, 12 May 2023 15:13:47 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D41fdb869f99= 84ca2f8600aaa980b4ed2eae2e980 commit 41fdb869f9984ca2f8600aaa980b4ed2eae2e980 Author: Brian Inglis Date: Sun May 7 21:12:10 2023 -0600 fhandler/proc.cc(format_proc_cpuinfo): Add Linux 6.3 cpuinfo =20 cpuid 0x00000007:0 ecx:7 shstk Shadow Stack support & Windows [20]20= H1/[20]2004+ =3D> user_shstk User mode program Shadow Stack supp= ort AMD SVM 0x8000000a:0 edx:25 vnmi virtual Non-Maskable Interrrupts Sync AMD 0x80000008:0 ebx flags across two output locations Diff: --- winsup/cygwin/fhandler/proc.cc | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/winsup/cygwin/fhandler/proc.cc b/winsup/cygwin/fhandler/proc.cc index 0e60c519e..3c79762e0 100644 --- a/winsup/cygwin/fhandler/proc.cc +++ b/winsup/cygwin/fhandler/proc.cc @@ -1384,8 +1384,8 @@ format_proc_cpuinfo (void *, char *&destbuf) =20 ftcprint (features2, 0, "perfmon_v2"); /* Performance Monitoring Versi= on 2 */ } - /* cpuid 0x80000008 ebx */ - if (maxe >=3D 0x80000008) + /* AMD cpuid 0x80000008 ebx */ + if (is_amd && maxe >=3D 0x80000008) { /* cpuid (&unused, &features1, &unused, &unused, 0x80000008, 0); */ /* from above ^ */ @@ -1395,16 +1395,19 @@ format_proc_cpuinfo (void *, char *&destbuf) /* ftcprint (features1, 4, "rdpru"); *//* user level rd proc reg */ /* ftcprint (features1, 6, "mba"); *//* memory BW alloc */ /* ftcprint (features1, 9, "wbnoinvd"); *//* wbnoinvd instruction */ - ftcprint (features1, 14, "ibrs"); /* ind br restricted spec */ ftcprint (features1, 12, "ibpb"); /* ind br pred barrier */ + ftcprint (features1, 14, "ibrs"); /* ind br restricted spec */ ftcprint (features1, 15, "stibp"); /* 1 thread ind br pred */ - ftcprint (features1, 16, "ibrs_enhanced"); /* IBRS_ALL enhanced IBRS al= ways on */ + ftcprint (features1, 16, "ibrs_enhanced"); /* ibrs_enhanced IBRS always= on */ /* ftcprint (features1, 17, "stibp_always_on"); */ /* stibp always on */ -/* ftcprint (features1, 18, "ibrs_pref");*//* IBRS_PREF IBRS preferred */ +/* ftcprint (features1, 18, "ibrs_pref");*//* ibrs_pref IBRS preferred */ /* ftcprint (features1, 23, "amd_ppin"); *//* protected proc id no */ /* ftcprint (features1, 24, "ssbd"); *//* spec store byp dis */ /* ftcprint (features1, 25, "virt_ssbd");*//* vir spec store byp dis */ /* ftcprint (features1, 26, "ssb_no"); *//* ssb fixed in hardware */ +/* ftcprint (features1, 27, "cppc"); *//* collab proc perf ctl */ +/* ftcprint (features1, 28, "amd_psfd"); *//* predictive store fwd dis */ +/* ftcprint (features1, 31, "brs"); *//* branch sampling */ } =20 /* cpuid 0x00000021 ebx|edx|ecx =3D=3D "IntelTDX " */ @@ -1483,6 +1486,14 @@ format_proc_cpuinfo (void *, char *&destbuf) =20 /* ftcprint (features1, 6, "split_lock_detect");*//* MSR_TEST_CTRL spli= t lock */ =20 + /* cpuid 0x00000007 ecx & Windows [20]20H1/[20]2004+ */ + if (maxf >=3D 0x00000007 && wincap.osname () >=3D "10.0" + && wincap.build_number () >=3D 19041) + { + cpuid (&unused, &unused, &features1, &unused, 0x00000007, 0); + ftcprint (features1, 7, "user_shstk"); /* "user shadow stack" */ + } + /* cpuid 0x00000007:1 eax */ if (maxf >=3D 0x00000007) { @@ -1491,6 +1502,7 @@ format_proc_cpuinfo (void *, char *&destbuf) ftcprint (features1, 4, "avx_vnni"); /* vex enc NN vec */ ftcprint (features1, 5, "avx512_bf16"); /* vec bfloat16 short */ /* ftcprint (features1, 7, "cmpccxadd"); */ /* CMPccXADD instructions */ +/* ftcprint (features1, 18, "lkgs"); */ /* load kernel (userspace) GS */ /* ftcprint (features1, 21, "amx_fp16"); */ /* AMX fp16 Support */ /* ftcprint (features1, 23, "avx_ifma"); */ /* Support for VPMADD52[H,L= ]UQ */ ftcprint (features1, 26, "lam"); /* Linear Address Masking */ @@ -1510,14 +1522,15 @@ format_proc_cpuinfo (void *, char *&destbuf) /* ftcprint (features1, 12, "ibpb" ); */ /* ind br pred barrier */ /* ftcprint (features1, 14, "ibrs" ); */ /* ind br restricted spec */ /* ftcprint (features1, 15, "stibp"); */ /* 1 thread ind br pred */ -/* ftcprint (features1, 16, "ibrs_enhanced");*//* IBRS_ALL enhanced IBRS= always on */ +/* ftcprint (features1, 16, "ibrs_enhanced"); */ /* ibrs_enhanced IBRS = always on */ /* ftcprint (features1, 17, "stibp_always_on"); */ /* stibp always on */ -/* ftcprint (features1, 18, "ibrs_pref");*//* IBRS_PREF IBRS preferred */ +/* ftcprint (features1, 18, "ibrs_pref"); */ /* ibrs_pref IBRS preferred= */ ftcprint (features1, 23, "amd_ppin"); /* protected proc id no */ /* ftcprint (features1, 24, "ssbd"); */ /* spec store byp dis */ ftcprint (features1, 25, "virt_ssbd"); /* vir spec store byp dis */ /* ftcprint (features1, 26, "ssb_no"); */ /* ssb fixed in hardware */ ftcprint (features1, 27, "cppc"); /* collab proc perf ctl */ +/* ftcprint (features1, 28, "amd_psfd"); */ /* predictive store fwd dis= */ ftcprint (features1, 31, "brs"); /* branch sampling */ } =20 @@ -1558,6 +1571,7 @@ format_proc_cpuinfo (void *, char *&destbuf) ftcprint (features1, 15, "v_vmsave_vmload"); /* virt vmsave vmload */ ftcprint (features1, 16, "vgif"); /* virt glb int flag */ ftcprint (features1, 20, "v_spec_ctrl"); /* virt spec ctrl support */ + ftcprint (features1, 25, "vnmi"); /* virt NMI */ /* ftcprint (features1, 28, "svme_addr_chk"); *//* secure vmexit addr c= heck */ } =20 @@ -1572,6 +1586,7 @@ format_proc_cpuinfo (void *, char *&destbuf) ftcprint (features1, 4, "ospke"); /* OS prot keys en */ ftcprint (features1, 5, "waitpkg"); /* umon/umwait/tpause */ ftcprint (features1, 6, "avx512_vbmi2"); /* vec bit manip 2 */ +/* ftcprint (features1, 7, "shstk"); */ /* Shadow stack */ ftcprint (features1, 8, "gfni"); /* Galois field instr */ ftcprint (features1, 9, "vaes"); /* vector AES */ ftcprint (features1, 10, "vpclmulqdq"); /* nc mul dbl quad */