From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6D21155389; Tue, 9 Jul 2024 11:13:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720523628; cv=none; b=hUOcWGf+8F4FU4I6i7Dom4FuZ1Ok8fcPww6/3FmOf6c4sfA4PSwLJVouBVGCJUd+OY+iIHM0VMlVkllMBmHVyDD2EuGiJz+d6tV2NcSpqNQWc86yGE3wg1/pc9hVpj/YM3AVe7yCqviIuBGnuR7ZLT7UEmeUb+/A00ZBUoSDJOA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720523628; c=relaxed/simple; bh=uturAAhQkaOg7Ft4g0wmQQ8NiudxeWmJ8zhpennOLnA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SnxZiWXPVkZIWsG57aBkuo/HQX74DtQ3XmJY01DH0XRl1hWIpU78hL7OdE26LeuhB7FVrYvRWy3iriWe43pWePOSGCGzL9CKVMG5MwI43GRcngymn2/4VHqNkrjEFNAovhzyC4DKajTVPfVOuNsJnSRrbWMmWnVpkYgxRb4ymtM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nnpIBWj7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="nnpIBWj7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 302ADC3277B; Tue, 9 Jul 2024 11:13:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1720523628; bh=uturAAhQkaOg7Ft4g0wmQQ8NiudxeWmJ8zhpennOLnA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nnpIBWj78tZGEaaoLgHfk2O3isDh3xvsyAwOQApJ6yrMcUquqhHSIVWC7XlB9iTSU afXHrt32LvIvkDE4bVpOwQY1oTCjyalF4auNGj3SVo6iyG3frgFPV/lJA0lgQMkHvG xXsOJL1SXCh5ZUumtljS0iRvtUunN1nlv9Lxif1Y= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Len Brown , Sasha Levin Subject: [PATCH 6.6 057/139] tools/power turbostat: Remember global max_die_id Date: Tue, 9 Jul 2024 13:09:17 +0200 Message-ID: <20240709110700.376211486@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240709110658.146853929@linuxfoundation.org> References: <20240709110658.146853929@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Len Brown [ Upstream commit cda203388687aa075db6f8996c3c4549fa518ea8 ] This is necessary to gracefully handle sparse die_id's. no functional change Signed-off-by: Len Brown Signed-off-by: Sasha Levin --- tools/power/x86/turbostat/turbostat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index ffa964ddbacef..6fad5fbfb0f96 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -566,6 +566,7 @@ struct topo_params { int num_cpus; int num_cores; int max_cpu_num; + int max_die_id; int max_node_num; int nodes_per_pkg; int cores_per_node; @@ -5871,7 +5872,6 @@ void topology_probe() int i; int max_core_id = 0; int max_package_id = 0; - int max_die_id = 0; int max_siblings = 0; /* Initialize num_cpus, max_cpu_num */ @@ -5940,8 +5940,8 @@ void topology_probe() /* get die information */ cpus[i].die_id = get_die_id(i); - if (cpus[i].die_id > max_die_id) - max_die_id = cpus[i].die_id; + if (cpus[i].die_id > topo.max_die_id) + topo.max_die_id = cpus[i].die_id; /* get numa node information */ cpus[i].physical_node_id = get_physical_node_id(&cpus[i]); @@ -5967,9 +5967,9 @@ void topology_probe() if (!summary_only && topo.cores_per_node > 1) BIC_PRESENT(BIC_Core); - topo.num_die = max_die_id + 1; + topo.num_die = topo.max_die_id + 1; if (debug > 1) - fprintf(outf, "max_die_id %d, sizing for %d die\n", max_die_id, topo.num_die); + fprintf(outf, "max_die_id %d, sizing for %d die\n", topo.max_die_id, topo.num_die); if (!summary_only && topo.num_die > 1) BIC_PRESENT(BIC_Die); -- 2.43.0