63985c5f10
Current usertools/cpu_layout.py is broken to handle multithreads of count more than 2 as in IBM powerpc P8 servers. Below patch addressed this issue. Also, added minor exception catch on failing to open unavailable sys file in case of multithread=off configuration in server. Patch has been verified not to break existing topology configurations and also not changing anything in current output. Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> Reviewed-by: Andriy Berestovskyy <andriy.berestovskyy@caviumnetworks.com>
100 lines
3.6 KiB
Python
Executable File
100 lines
3.6 KiB
Python
Executable File
#!/usr/bin/env python
|
|
|
|
#
|
|
# BSD LICENSE
|
|
#
|
|
# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
|
|
# Copyright(c) 2017 Cavium Networks Ltd. All rights reserved.
|
|
# All rights reserved.
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions
|
|
# are met:
|
|
#
|
|
# * Redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer.
|
|
# * Redistributions in binary form must reproduce the above copyright
|
|
# notice, this list of conditions and the following disclaimer in
|
|
# the documentation and/or other materials provided with the
|
|
# distribution.
|
|
# * Neither the name of Intel Corporation nor the names of its
|
|
# contributors may be used to endorse or promote products derived
|
|
# from this software without specific prior written permission.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
#
|
|
from __future__ import print_function
|
|
import sys
|
|
|
|
sockets = []
|
|
cores = []
|
|
core_map = {}
|
|
base_path = "/sys/devices/system/cpu"
|
|
fd = open("{}/kernel_max".format(base_path))
|
|
max_cpus = int(fd.read())
|
|
fd.close()
|
|
for cpu in xrange(max_cpus + 1):
|
|
try:
|
|
fd = open("{}/cpu{}/topology/core_id".format(base_path, cpu))
|
|
except IOError:
|
|
continue
|
|
except:
|
|
break
|
|
core = int(fd.read())
|
|
fd.close()
|
|
fd = open("{}/cpu{}/topology/physical_package_id".format(base_path, cpu))
|
|
socket = int(fd.read())
|
|
fd.close()
|
|
if core not in cores:
|
|
cores.append(core)
|
|
if socket not in sockets:
|
|
sockets.append(socket)
|
|
key = (socket, core)
|
|
if key not in core_map:
|
|
core_map[key] = []
|
|
core_map[key].append(cpu)
|
|
|
|
print(format("=" * (47 + len(base_path))))
|
|
print("Core and Socket Information (as reported by '{}')".format(base_path))
|
|
print("{}\n".format("=" * (47 + len(base_path))))
|
|
print("cores = ", cores)
|
|
print("sockets = ", sockets)
|
|
print("")
|
|
|
|
max_processor_len = len(str(len(cores) * len(sockets) * 2 - 1))
|
|
max_thread_count = len(core_map.values()[0])
|
|
max_core_map_len = (max_processor_len * max_thread_count) \
|
|
+ len(", ") * (max_thread_count - 1) \
|
|
+ len('[]') + len('Socket ')
|
|
max_core_id_len = len(str(max(cores)))
|
|
|
|
output = " ".ljust(max_core_id_len + len('Core '))
|
|
for s in sockets:
|
|
output += " Socket %s" % str(s).ljust(max_core_map_len - len('Socket '))
|
|
print(output)
|
|
|
|
output = " ".ljust(max_core_id_len + len('Core '))
|
|
for s in sockets:
|
|
output += " --------".ljust(max_core_map_len)
|
|
output += " "
|
|
print(output)
|
|
|
|
for c in cores:
|
|
output = "Core %s" % str(c).ljust(max_core_id_len)
|
|
for s in sockets:
|
|
if core_map.has_key((s,c)):
|
|
output += " " + str(core_map[(s, c)]).ljust(max_core_map_len)
|
|
else:
|
|
output += " " * (max_core_map_len + 1)
|
|
print(output)
|