From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7844) id DD1513858C2A; Tue, 12 Sep 2023 03:48:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DD1513858C2A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1694490538; bh=3KX0WQkOTr0CFqKef+LBY5yNE6C5ZjScK+P7I6q+b/I=; h=From:To:Subject:Date:From; b=cb5Zi3ri3W4DTu+bRomGsd1kqQMGpdLaBOaF0s4F+VOaTqjmOxIr/RiPbYuQz/2pz EQR7rx2AZ5mxBSAesAV1nEqX5GwVZ0LoAvE3YluGEMXZCfOzzlJRqWq3PA818dy0Kr i6a9fh8P+20WGs88nPZIFXOt6xqr/78nbxHZ2kKI= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Noah Goldstein To: glibc-cvs@sourceware.org Subject: [glibc/release/2.29/master] x86: Fix incorrect scope of setting `shared_per_thread` [BZ# 30745] X-Act-Checkin: glibc X-Git-Author: Noah Goldstein X-Git-Refname: refs/heads/release/2.29/master X-Git-Oldrev: 83ce856e77fc50e213195a3f59aefb1e7dde6d71 X-Git-Newrev: bb7c57219d18f345acac3587c2b14ed3b9c1e261 Message-Id: <20230912034858.DD1513858C2A@sourceware.org> Date: Tue, 12 Sep 2023 03:48:58 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=bb7c57219d18f345acac3587c2b14ed3b9c1e261 commit bb7c57219d18f345acac3587c2b14ed3b9c1e261 Author: Noah Goldstein 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 0080e8dad5..3a3e1115fa 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. */