diff options
| author | Noah Goldstein <goldstein.w.n@gmail.com> | 2023-08-11 18:48:01 -0500 |
|---|---|---|
| committer | Noah Goldstein <goldstein.w.n@gmail.com> | 2023-09-11 22:48:44 -0500 |
| commit | 29f401e05d85919a5328567733867d9447d7d706 (patch) | |
| tree | 0253691cf60a6c4181100e002cd5e3d3faab6741 | |
| parent | 68a2030415c9c6211d7fea1f48f4922dab132335 (diff) | |
| download | glibc-29f401e05d85919a5328567733867d9447d7d706.tar.gz glibc-29f401e05d85919a5328567733867d9447d7d706.tar.xz glibc-29f401e05d85919a5328567733867d9447d7d706.zip | |
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)
| -rw-r--r-- | sysdeps/x86/cacheinfo.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sysdeps/x86/cacheinfo.c b/sysdeps/x86/cacheinfo.c index f5d36573b3..5df807d5b6 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. */ |