All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Bartosz Golaszewski <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:sched/core] Documentation: Update cputopology.txt
Date: Wed, 27 May 2015 07:21:52 -0700	[thread overview]
Message-ID: <tip-54a5369487fc0a9506bbf31ab2e00e5dc5d6d4cd@git.kernel.org> (raw)
In-Reply-To: <1432645896-12588-3-git-send-email-bgolaszewski@baylibre.com>

Commit-ID:  54a5369487fc0a9506bbf31ab2e00e5dc5d6d4cd
Gitweb:     http://git.kernel.org/tip/54a5369487fc0a9506bbf31ab2e00e5dc5d6d4cd
Author:     Bartosz Golaszewski <bgolaszewski@baylibre.com>
AuthorDate: Tue, 26 May 2015 15:11:29 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
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 <bgolaszewski@baylibre.com>
Cc: Benoit Cousson <bcousson@baylibre.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Jean Delvare <jdelvare@suse.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Link: http://lkml.kernel.org/r/1432645896-12588-3-git-send-email-bgolaszewski@baylibre.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 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().

  reply	other threads:[~2015-05-27 14:23 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-26 13:11 [RESEND][PATCH v2 0/9] x86: remove cpu_**_mask() functions Bartosz Golaszewski
2015-05-26 13:11 ` [RESEND][PATCH v2 1/9] topology: rename topology_thread_cpumask() Bartosz Golaszewski
2015-05-27 14:21   ` [tip:sched/core] sched/topology: Rename topology_thread_cpumask() to topology_sibling_cpumask() tip-bot for Bartosz Golaszewski
2015-05-26 13:11 ` [RESEND][PATCH v2 2/9] Documentation: update cputopology.txt Bartosz Golaszewski
2015-05-27 14:21   ` tip-bot for Bartosz Golaszewski [this message]
2015-05-26 13:11 ` [RESEND][PATCH v2 3/9] coretemp: replace cpu_sibling_mask() with topology_sibling_cpumask() Bartosz Golaszewski
2015-05-27 14:22   ` [tip:sched/core] coretemp: Replace " tip-bot for Bartosz Golaszewski
2015-05-26 13:11 ` [RESEND][PATCH v2 4/9] powernow-k8: replace cpu_core_mask() with topology_core_cpumask() Bartosz Golaszewski
2015-05-27 14:22   ` [tip:sched/core] powernow-k8: Replace " tip-bot for Bartosz Golaszewski
2015-05-26 13:11 ` [RESEND][PATCH v2 5/9] p4-clockmod: replace cpu_sibling_mask() with topology_sibling_cpumask() Bartosz Golaszewski
2015-05-27 14:22   ` [tip:sched/core] p4-clockmod: Replace " tip-bot for Bartosz Golaszewski
2015-05-26 13:11 ` [RESEND][PATCH v2 6/9] acpi-cpufreq: replace cpu_**_mask() with topology_**_cpumask() Bartosz Golaszewski
2015-05-27 14:23   ` [tip:sched/core] acpi-cpufreq: Replace " tip-bot for Bartosz Golaszewski
2015-05-26 13:11 ` [RESEND][PATCH v2 7/9] speedstep-ich: replace cpu_sibling_mask() with topology_sibling_cpumask() Bartosz Golaszewski
2015-05-27 14:23   ` [tip:sched/core] speedstep-ich: Replace " tip-bot for Bartosz Golaszewski
2015-05-26 13:11 ` [RESEND][PATCH v2 8/9] x86: replace cpu_**_mask() with topology_**_cpumask() Bartosz Golaszewski
2015-05-27 14:23   ` [tip:sched/core] x86: Replace " tip-bot for Bartosz Golaszewski
2015-05-26 13:11 ` [RESEND][PATCH v2 9/9] x86: remove cpu_sibling_mask() and cpu_core_mask() Bartosz Golaszewski
2015-05-27 14:24   ` [tip:sched/core] x86: Remove cpu_sibling_mask() and cpu_core_mask () tip-bot for Bartosz Golaszewski
2015-05-27 13:24 ` [RESEND][PATCH v2 0/9] x86: remove cpu_**_mask() functions Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-54a5369487fc0a9506bbf31ab2e00e5dc5d6d4cd@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=bcousson@baylibre.com \
    --cc=bgolaszewski@baylibre.com \
    --cc=catalin.marinas@arm.com \
    --cc=corbet@lwn.net \
    --cc=fenghua.yu@intel.com \
    --cc=hpa@zytor.com \
    --cc=jdelvare@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=linux@roeck-us.net \
    --cc=mingo@kernel.org \
    --cc=oleg.drokin@intel.com \
    --cc=peterz@infradead.org \
    --cc=rjw@rjwysocki.net \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    --cc=viresh.kumar@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.