public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Noah Goldstein <nwg@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/release/2.31/master] x86: Fix incorrect scope of setting `shared_per_thread` [BZ# 30745] Date: Tue, 12 Sep 2023 03:48:21 +0000 (GMT) [thread overview] Message-ID: <20230912034821.220703858296@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9f27ef8090f26110be9de3514c7ca82c6f270265 commit 9f27ef8090f26110be9de3514c7ca82c6f270265 Author: Noah Goldstein <goldstein.w.n@gmail.com> Date: Fri Aug 11 18:48:01 2023 -0500 x86: Fix incorrect scope of setting `shared_per_thread` [BZ# 30745] The: ``` if (shared_per_thread > 0 && threads > 0) shared_per_thread /= threads; ``` Code was accidentally moved to inside the else scope. This doesn't match how it was previously (before af992e7abd). This patch fixes that by putting the division after the `else` block. (cherry picked from commit 084fb31bc2c5f95ae0b9e6df4d3cf0ff43471ede) Diff: --- sysdeps/x86/cacheinfo.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sysdeps/x86/cacheinfo.c b/sysdeps/x86/cacheinfo.c index 951c1603d6..17db517830 100644 --- a/sysdeps/x86/cacheinfo.c +++ b/sysdeps/x86/cacheinfo.c @@ -679,18 +679,19 @@ init_cacheinfo (void) } else { - intel_bug_no_cache_info: +intel_bug_no_cache_info: /* Assume that all logical threads share the highest cache level. */ - threads = ((cpu_features->cpuid[COMMON_CPUID_INDEX_1].ebx >> 16) - & 0xff); - - /* Cap usage of highest cache level to the number of supported - threads. */ - if (shared_per_thread > 0 && threads > 0) - shared_per_thread /= threads; + threads + = ((cpu_features->cpuid[COMMON_CPUID_INDEX_1].ebx + >> 16) & 0xff); } + + /* Cap usage of highest cache level to the number of supported + threads. */ + if (shared_per_thread > 0 && threads > 0) + shared_per_thread /= threads; } /* Account for non-inclusive L2 and L3 caches. */
reply other threads:[~2023-09-12 3:48 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230912034821.220703858296@sourceware.org \ --to=nwg@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).