From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7844) id 0B8173857C71; Mon, 28 Aug 2023 20:02:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0B8173857C71 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1693252979; bh=W1jrOj+6KRTocaPh8oxPLhnFk5Pkx4yjmG8yvgNwqXI=; h=From:To:Subject:Date:From; b=RKv1g5qB8r0INejiIke9FWkJNQpgDKDr9oCw4Z5iWP6f/r2O0BjdP2GM9v4X/QJiw SYfLEiKRa9SJHRYOENI6txvS9EID6ppyDXZwyPBa/KooqKGjs2pH0C+bwculswSXDL rrg0FVu7uwaGErIYjJzR5UF8+R12RlxgOOodQw5w= 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.37/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.37/master X-Git-Oldrev: cc8243fb0b711ab05ac6dcf235f0555025921b5e X-Git-Newrev: f94ff95e936d41e28697bd4eac04954139b93558 Message-Id: <20230828200259.0B8173857C71@sourceware.org> Date: Mon, 28 Aug 2023 20:02:59 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f94ff95e936d41e28697bd4eac04954139b93558 commit f94ff95e936d41e28697bd4eac04954139b93558 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 d99c0b0e75..32b175eaf6 100644 --- a/sysdeps/x86/dl-cacheinfo.h +++ b/sysdeps/x86/dl-cacheinfo.h @@ -605,11 +605,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. */