From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7844) id 1BCE13858D37; Sun, 13 Aug 2023 04:59:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1BCE13858D37 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1691902757; bh=aQJDbdm/1ck+n7S4mO1N/MCO8D39yeAIRgeZavfeUkE=; h=From:To:Subject:Date:From; b=OdeynW4CyE1XZ+Ux8YUDhHRwjOQEscSnCqcmkRVQNnAo6z/vZQS3eixTQIfaicGXu eaayNyJ8cwu+pP21EEzeyC45o9El0g/X/7hiX2tpwVQOFAOx97pFsFUib2Whm01gtH ZHPK10cbEH71i1bicxKmJm3wQS68WQby1iqiD5RQ= 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.38/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.38/master X-Git-Oldrev: 6b99458d197ab779ebb6ff632c168e2cbfa4f543 X-Git-Newrev: 5ea70cc02626d9b85f1570153873d8648a47bf95 Message-Id: <20230813045917.1BCE13858D37@sourceware.org> Date: Sun, 13 Aug 2023 04:59:17 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5ea70cc02626d9b85f1570153873d8648a47bf95 commit 5ea70cc02626d9b85f1570153873d8648a47bf95 Author: Noah Goldstein Date: Thu Aug 10 19:28:24 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/dl-cacheinfo.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h index 285773039f..5ddb35c9d9 100644 --- a/sysdeps/x86/dl-cacheinfo.h +++ b/sysdeps/x86/dl-cacheinfo.h @@ -770,11 +770,10 @@ get_common_cache_info (long int *shared_ptr, long int * shared_per_thread_ptr, u level. */ threads = ((cpu_features->features[CPUID_INDEX_1].cpuid.ebx >> 16) & 0xff); - - /* Get per-thread size of highest level cache. */ - if (shared_per_thread > 0 && threads > 0) - shared_per_thread /= threads; } + /* Get per-thread size of highest level cache. */ + if (shared_per_thread > 0 && threads > 0) + shared_per_thread /= threads; } /* Account for non-inclusive L2 and L3 caches. */