From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932092AbbE0OXQ (ORCPT ); Wed, 27 May 2015 10:23:16 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36335 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752436AbbE0OXO (ORCPT ); Wed, 27 May 2015 10:23:14 -0400 Date: Wed, 27 May 2015 07:21:52 -0700 From: tip-bot for Bartosz Golaszewski Message-ID: Cc: linux-kernel@vger.kernel.org, linux@arm.linux.org.uk, jdelvare@suse.de, fenghua.yu@intel.com, oleg.drokin@intel.com, rjw@rjwysocki.net, torvalds@linux-foundation.org, tglx@linutronix.de, mingo@kernel.org, catalin.marinas@arm.com, hpa@zytor.com, bgolaszewski@baylibre.com, viresh.kumar@linaro.org, bcousson@baylibre.com, linux@roeck-us.net, corbet@lwn.net, peterz@infradead.org Reply-To: linux@arm.linux.org.uk, jdelvare@suse.de, linux-kernel@vger.kernel.org, fenghua.yu@intel.com, oleg.drokin@intel.com, tglx@linutronix.de, catalin.marinas@arm.com, mingo@kernel.org, rjw@rjwysocki.net, torvalds@linux-foundation.org, bgolaszewski@baylibre.com, hpa@zytor.com, viresh.kumar@linaro.org, bcousson@baylibre.com, linux@roeck-us.net, corbet@lwn.net, peterz@infradead.org In-Reply-To: <1432645896-12588-3-git-send-email-bgolaszewski@baylibre.com> References: <1432645896-12588-3-git-send-email-bgolaszewski@baylibre.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] Documentation: Update cputopology.txt Git-Commit-ID: 54a5369487fc0a9506bbf31ab2e00e5dc5d6d4cd X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 54a5369487fc0a9506bbf31ab2e00e5dc5d6d4cd Gitweb: http://git.kernel.org/tip/54a5369487fc0a9506bbf31ab2e00e5dc5d6d4cd Author: Bartosz Golaszewski AuthorDate: Tue, 26 May 2015 15:11:29 +0200 Committer: Ingo Molnar CommitDate: Wed, 27 May 2015 15:22:15 +0200 Documentation: Update cputopology.txt The documentation on cpu topology seems to be a bit out-of-date. It doesn't mention the **_siblings_list attributes and uses old names for topology_**_cpumask() macros. Add information on missing attributes plus some additional clarifications. Signed-off-by: Bartosz Golaszewski Cc: Benoit Cousson Cc: Catalin Marinas Cc: Fenghua Yu Cc: Guenter Roeck Cc: Jean Delvare Cc: Jonathan Corbet Cc: Linus Torvalds Cc: Oleg Drokin Cc: Peter Zijlstra Cc: Rafael J. Wysocki Cc: Russell King Cc: Thomas Gleixner Cc: Viresh Kumar Link: http://lkml.kernel.org/r/1432645896-12588-3-git-send-email-bgolaszewski@baylibre.com Signed-off-by: Ingo Molnar --- Documentation/cputopology.txt | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/Documentation/cputopology.txt b/Documentation/cputopology.txt index 428a961..12b1b25 100644 --- a/Documentation/cputopology.txt +++ b/Documentation/cputopology.txt @@ -1,6 +1,6 @@ Export CPU topology info via sysfs. Items (attributes) are similar -to /proc/cpuinfo. +to /proc/cpuinfo output of some architectures: 1) /sys/devices/system/cpu/cpuX/topology/physical_package_id: @@ -23,20 +23,35 @@ to /proc/cpuinfo. 4) /sys/devices/system/cpu/cpuX/topology/thread_siblings: internal kernel map of cpuX's hardware threads within the same - core as cpuX + core as cpuX. -5) /sys/devices/system/cpu/cpuX/topology/core_siblings: +5) /sys/devices/system/cpu/cpuX/topology/thread_siblings_list: + + human-readable list of cpuX's hardware threads within the same + core as cpuX. + +6) /sys/devices/system/cpu/cpuX/topology/core_siblings: internal kernel map of cpuX's hardware threads within the same physical_package_id. -6) /sys/devices/system/cpu/cpuX/topology/book_siblings: +7) /sys/devices/system/cpu/cpuX/topology/core_siblings_list: + + human-readable list of cpuX's hardware threads within the same + physical_package_id. + +8) /sys/devices/system/cpu/cpuX/topology/book_siblings: internal kernel map of cpuX's hardware threads within the same book_id. +9) /sys/devices/system/cpu/cpuX/topology/book_siblings_list: + + human-readable list of cpuX's hardware threads within the same + book_id. + To implement it in an architecture-neutral way, a new source file, -drivers/base/topology.c, is to export the 4 or 6 attributes. The two book +drivers/base/topology.c, is to export the 6 or 9 attributes. The three book related sysfs files will only be created if CONFIG_SCHED_BOOK is selected. For an architecture to support this feature, it must define some of @@ -48,16 +63,18 @@ these macros in include/asm-XXX/topology.h: #define topology_core_cpumask(cpu) #define topology_book_cpumask(cpu) -The type of **_id is int. -The type of siblings is (const) struct cpumask *. +The type of **_id macros is int. +The type of **_cpumask macros is (const) struct cpumask *. The latter +correspond with appropriate **_siblings sysfs attributes (except for +topology_sibling_cpumask() which corresponds with thread_siblings). To be consistent on all architectures, include/linux/topology.h provides default definitions for any of the above macros that are not defined by include/asm-XXX/topology.h: 1) physical_package_id: -1 2) core_id: 0 -3) thread_siblings: just the given CPU -4) core_siblings: just the given CPU +3) sibling_cpumask: just the given CPU +4) core_cpumask: just the given CPU For architectures that don't support books (CONFIG_SCHED_BOOK) there are no default definitions for topology_book_id() and topology_book_cpumask().