2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
|
|
* for more details.
|
|
|
|
*
|
|
|
|
* This file contains NUMA specific variables and functions which can
|
|
|
|
* be split away from DISCONTIGMEM and are used on NUMA machines with
|
|
|
|
* contiguous memory.
|
|
|
|
* 2002/08/07 Erich Focht <efocht@ess.nec.de>
|
|
|
|
* Populate cpu entries in sysfs for non-numa systems as well
|
|
|
|
* Intel Corporation - Ashok Raj
|
2006-02-27 11:37:45 +08:00
|
|
|
* 02/27/2006 Zhang, Yanmin
|
|
|
|
* Populate cpu cache entries in sysfs for cpu cache info
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/cpu.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/node.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/init.h>
|
2018-10-31 06:09:49 +08:00
|
|
|
#include <linux/memblock.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/nodemask.h>
|
2006-02-27 11:37:45 +08:00
|
|
|
#include <linux/notifier.h>
|
2011-08-01 06:33:21 +08:00
|
|
|
#include <linux/export.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm/mmzone.h>
|
|
|
|
#include <asm/numa.h>
|
|
|
|
#include <asm/cpu.h>
|
|
|
|
|
|
|
|
static struct ia64_cpu *sysfs_cpus;
|
|
|
|
|
2008-04-30 06:05:29 +08:00
|
|
|
void arch_fix_phys_package_id(int num, u32 slot)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
if (cpu_data(num)->socket_id == -1)
|
|
|
|
cpu_data(num)->socket_id = slot;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(arch_fix_phys_package_id);
|
|
|
|
|
2008-04-30 15:50:55 +08:00
|
|
|
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
int __ref arch_register_cpu(int num)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2005-04-01 11:51:10 +08:00
|
|
|
/*
|
2011-03-31 09:57:33 +08:00
|
|
|
* If CPEI can be re-targeted or if this is not
|
2006-12-07 09:14:10 +08:00
|
|
|
* CPEI target, then it is hotpluggable
|
2005-04-01 11:51:10 +08:00
|
|
|
*/
|
2006-12-07 09:14:10 +08:00
|
|
|
if (can_cpei_retarget() || !is_cpu_cpei_target(num))
|
|
|
|
sysfs_cpus[num].cpu.hotpluggable = 1;
|
2006-09-26 07:25:31 +08:00
|
|
|
map_cpu_to_node(num, node_cpuid[num].nid);
|
[PATCH] node hotplug: register cpu: remove node struct
With Goto-san's patch, we can add new pgdat/node at runtime. I'm now
considering node-hot-add with cpu + memory on ACPI.
I found acpi container, which describes node, could evaluate cpu before
memory. This means cpu-hot-add occurs before memory hot add.
In most part, cpu-hot-add doesn't depend on node hot add. But register_cpu(),
which creates symbolic link from node to cpu, requires that node should be
onlined before register_cpu(). When a node is onlined, its pgdat should be
there.
This patch-set holds off creating symbolic link from node to cpu
until node is onlined.
This removes node arguments from register_cpu().
Now, register_cpu() requires 'struct node' as its argument. But the array of
struct node is now unified in driver/base/node.c now (By Goto's node hotplug
patch). We can get struct node in generic way. So, this argument is not
necessary now.
This patch also guarantees add cpu under node only when node is onlined. It
is necessary for node-hot-add vs. cpu-hot-add patch following this.
Moreover, register_cpu calculates cpu->node_id by cpu_to_node() without regard
to its 'struct node *root' argument. This patch removes it.
Also modify callers of register_cpu()/unregister_cpu, whose args are changed
by register-cpu-remove-node-struct patch.
[Brice.Goglin@ens-lyon.org: fix it]
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-27 17:53:41 +08:00
|
|
|
return register_cpu(&sysfs_cpus[num].cpu, num);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2008-04-30 15:50:55 +08:00
|
|
|
EXPORT_SYMBOL(arch_register_cpu);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-12-08 22:43:46 +08:00
|
|
|
void __ref arch_unregister_cpu(int num)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-09-26 07:25:31 +08:00
|
|
|
unregister_cpu(&sysfs_cpus[num].cpu);
|
|
|
|
unmap_cpu_from_node(num, cpu_to_node(num));
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(arch_unregister_cpu);
|
2008-04-30 15:50:55 +08:00
|
|
|
#else
|
|
|
|
static int __init arch_register_cpu(int num)
|
|
|
|
{
|
|
|
|
return register_cpu(&sysfs_cpus[num].cpu, num);
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif /*CONFIG_HOTPLUG_CPU*/
|
|
|
|
|
|
|
|
|
|
|
|
static int __init topology_init(void)
|
|
|
|
{
|
|
|
|
int i, err = 0;
|
|
|
|
|
|
|
|
#ifdef CONFIG_NUMA
|
[PATCH] Export cpu topology in sysfs
The patch implements cpu topology exportation by sysfs.
Items (attributes) are similar to /proc/cpuinfo.
1) /sys/devices/system/cpu/cpuX/topology/physical_package_id:
represent the physical package id of cpu X;
2) /sys/devices/system/cpu/cpuX/topology/core_id:
represent the cpu core id to cpu X;
3) /sys/devices/system/cpu/cpuX/topology/thread_siblings:
represent the thread siblings to cpu X in the same core;
4) /sys/devices/system/cpu/cpuX/topology/core_siblings:
represent the thread siblings to cpu X in the same physical package;
To implement it in an architecture-neutral way, a new source file,
driver/base/topology.c, is to export the 5 attributes.
If one architecture wants to support this feature, it just needs to
implement 4 defines, typically in file include/asm-XXX/topology.h.
The 4 defines are:
#define topology_physical_package_id(cpu)
#define topology_core_id(cpu)
#define topology_thread_siblings(cpu)
#define topology_core_siblings(cpu)
The type of **_id is int.
The type of siblings is cpumask_t.
To be consistent on all architectures, the 4 attributes should have
deafult values if their values are unavailable. Below is the rule.
1) physical_package_id: If cpu has no physical package id, -1 is the
default value.
2) core_id: If cpu doesn't support multi-core, its core id is 0.
3) thread_siblings: Just include itself, if the cpu doesn't support
HT/multi-thread.
4) core_siblings: Just include itself, if the cpu doesn't support
multi-core and HT/Multi-thread.
So be careful when declaring the 4 defines in include/asm-XXX/topology.h.
If an attribute isn't defined on an architecture, it won't be exported.
Thank Nathan, Greg, Andi, Paul and Venki.
The patch provides defines for i386/x86_64/ia64.
Signed-off-by: Zhang, Yanmin <yanmin.zhang@intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-02-03 19:04:36 +08:00
|
|
|
/*
|
|
|
|
* MCD - Do we want to register all ONLINE nodes, or all POSSIBLE nodes?
|
|
|
|
*/
|
|
|
|
for_each_online_node(i) {
|
2006-06-27 17:53:38 +08:00
|
|
|
if ((err = register_one_node(i)))
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out;
|
[PATCH] Export cpu topology in sysfs
The patch implements cpu topology exportation by sysfs.
Items (attributes) are similar to /proc/cpuinfo.
1) /sys/devices/system/cpu/cpuX/topology/physical_package_id:
represent the physical package id of cpu X;
2) /sys/devices/system/cpu/cpuX/topology/core_id:
represent the cpu core id to cpu X;
3) /sys/devices/system/cpu/cpuX/topology/thread_siblings:
represent the thread siblings to cpu X in the same core;
4) /sys/devices/system/cpu/cpuX/topology/core_siblings:
represent the thread siblings to cpu X in the same physical package;
To implement it in an architecture-neutral way, a new source file,
driver/base/topology.c, is to export the 5 attributes.
If one architecture wants to support this feature, it just needs to
implement 4 defines, typically in file include/asm-XXX/topology.h.
The 4 defines are:
#define topology_physical_package_id(cpu)
#define topology_core_id(cpu)
#define topology_thread_siblings(cpu)
#define topology_core_siblings(cpu)
The type of **_id is int.
The type of siblings is cpumask_t.
To be consistent on all architectures, the 4 attributes should have
deafult values if their values are unavailable. Below is the rule.
1) physical_package_id: If cpu has no physical package id, -1 is the
default value.
2) core_id: If cpu doesn't support multi-core, its core id is 0.
3) thread_siblings: Just include itself, if the cpu doesn't support
HT/multi-thread.
4) core_siblings: Just include itself, if the cpu doesn't support
multi-core and HT/Multi-thread.
So be careful when declaring the 4 defines in include/asm-XXX/topology.h.
If an attribute isn't defined on an architecture, it won't be exported.
Thank Nathan, Greg, Andi, Paul and Venki.
The patch provides defines for i386/x86_64/ia64.
Signed-off-by: Zhang, Yanmin <yanmin.zhang@intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-02-03 19:04:36 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|
|
|
|
|
treewide: kzalloc() -> kcalloc()
The kzalloc() function has a 2-factor argument form, kcalloc(). This
patch replaces cases of:
kzalloc(a * b, gfp)
with:
kcalloc(a * b, gfp)
as well as handling cases of:
kzalloc(a * b * c, gfp)
with:
kzalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kzalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kzalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kzalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kzalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kzalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kzalloc
+ kcalloc
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kzalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kzalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kzalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kzalloc(sizeof(THING) * C2, ...)
|
kzalloc(sizeof(TYPE) * C2, ...)
|
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(C1 * C2, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * E2
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 05:03:40 +08:00
|
|
|
sysfs_cpus = kcalloc(NR_CPUS, sizeof(struct ia64_cpu), GFP_KERNEL);
|
2006-08-15 13:45:49 +08:00
|
|
|
if (!sysfs_cpus)
|
|
|
|
panic("kzalloc in topology_init failed - NR_CPUS too big?");
|
2005-04-17 06:20:36 +08:00
|
|
|
|
[PATCH] Export cpu topology in sysfs
The patch implements cpu topology exportation by sysfs.
Items (attributes) are similar to /proc/cpuinfo.
1) /sys/devices/system/cpu/cpuX/topology/physical_package_id:
represent the physical package id of cpu X;
2) /sys/devices/system/cpu/cpuX/topology/core_id:
represent the cpu core id to cpu X;
3) /sys/devices/system/cpu/cpuX/topology/thread_siblings:
represent the thread siblings to cpu X in the same core;
4) /sys/devices/system/cpu/cpuX/topology/core_siblings:
represent the thread siblings to cpu X in the same physical package;
To implement it in an architecture-neutral way, a new source file,
driver/base/topology.c, is to export the 5 attributes.
If one architecture wants to support this feature, it just needs to
implement 4 defines, typically in file include/asm-XXX/topology.h.
The 4 defines are:
#define topology_physical_package_id(cpu)
#define topology_core_id(cpu)
#define topology_thread_siblings(cpu)
#define topology_core_siblings(cpu)
The type of **_id is int.
The type of siblings is cpumask_t.
To be consistent on all architectures, the 4 attributes should have
deafult values if their values are unavailable. Below is the rule.
1) physical_package_id: If cpu has no physical package id, -1 is the
default value.
2) core_id: If cpu doesn't support multi-core, its core id is 0.
3) thread_siblings: Just include itself, if the cpu doesn't support
HT/multi-thread.
4) core_siblings: Just include itself, if the cpu doesn't support
multi-core and HT/Multi-thread.
So be careful when declaring the 4 defines in include/asm-XXX/topology.h.
If an attribute isn't defined on an architecture, it won't be exported.
Thank Nathan, Greg, Andi, Paul and Venki.
The patch provides defines for i386/x86_64/ia64.
Signed-off-by: Zhang, Yanmin <yanmin.zhang@intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-02-03 19:04:36 +08:00
|
|
|
for_each_present_cpu(i) {
|
2005-04-17 06:20:36 +08:00
|
|
|
if((err = arch_register_cpu(i)))
|
|
|
|
goto out;
|
[PATCH] Export cpu topology in sysfs
The patch implements cpu topology exportation by sysfs.
Items (attributes) are similar to /proc/cpuinfo.
1) /sys/devices/system/cpu/cpuX/topology/physical_package_id:
represent the physical package id of cpu X;
2) /sys/devices/system/cpu/cpuX/topology/core_id:
represent the cpu core id to cpu X;
3) /sys/devices/system/cpu/cpuX/topology/thread_siblings:
represent the thread siblings to cpu X in the same core;
4) /sys/devices/system/cpu/cpuX/topology/core_siblings:
represent the thread siblings to cpu X in the same physical package;
To implement it in an architecture-neutral way, a new source file,
driver/base/topology.c, is to export the 5 attributes.
If one architecture wants to support this feature, it just needs to
implement 4 defines, typically in file include/asm-XXX/topology.h.
The 4 defines are:
#define topology_physical_package_id(cpu)
#define topology_core_id(cpu)
#define topology_thread_siblings(cpu)
#define topology_core_siblings(cpu)
The type of **_id is int.
The type of siblings is cpumask_t.
To be consistent on all architectures, the 4 attributes should have
deafult values if their values are unavailable. Below is the rule.
1) physical_package_id: If cpu has no physical package id, -1 is the
default value.
2) core_id: If cpu doesn't support multi-core, its core id is 0.
3) thread_siblings: Just include itself, if the cpu doesn't support
HT/multi-thread.
4) core_siblings: Just include itself, if the cpu doesn't support
multi-core and HT/Multi-thread.
So be careful when declaring the 4 defines in include/asm-XXX/topology.h.
If an attribute isn't defined on an architecture, it won't be exported.
Thank Nathan, Greg, Andi, Paul and Venki.
The patch provides defines for i386/x86_64/ia64.
Signed-off-by: Zhang, Yanmin <yanmin.zhang@intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-02-03 19:04:36 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
[PATCH] Export cpu topology in sysfs
The patch implements cpu topology exportation by sysfs.
Items (attributes) are similar to /proc/cpuinfo.
1) /sys/devices/system/cpu/cpuX/topology/physical_package_id:
represent the physical package id of cpu X;
2) /sys/devices/system/cpu/cpuX/topology/core_id:
represent the cpu core id to cpu X;
3) /sys/devices/system/cpu/cpuX/topology/thread_siblings:
represent the thread siblings to cpu X in the same core;
4) /sys/devices/system/cpu/cpuX/topology/core_siblings:
represent the thread siblings to cpu X in the same physical package;
To implement it in an architecture-neutral way, a new source file,
driver/base/topology.c, is to export the 5 attributes.
If one architecture wants to support this feature, it just needs to
implement 4 defines, typically in file include/asm-XXX/topology.h.
The 4 defines are:
#define topology_physical_package_id(cpu)
#define topology_core_id(cpu)
#define topology_thread_siblings(cpu)
#define topology_core_siblings(cpu)
The type of **_id is int.
The type of siblings is cpumask_t.
To be consistent on all architectures, the 4 attributes should have
deafult values if their values are unavailable. Below is the rule.
1) physical_package_id: If cpu has no physical package id, -1 is the
default value.
2) core_id: If cpu doesn't support multi-core, its core id is 0.
3) thread_siblings: Just include itself, if the cpu doesn't support
HT/multi-thread.
4) core_siblings: Just include itself, if the cpu doesn't support
multi-core and HT/Multi-thread.
So be careful when declaring the 4 defines in include/asm-XXX/topology.h.
If an attribute isn't defined on an architecture, it won't be exported.
Thank Nathan, Greg, Andi, Paul and Venki.
The patch provides defines for i386/x86_64/ia64.
Signed-off-by: Zhang, Yanmin <yanmin.zhang@intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-02-03 19:04:36 +08:00
|
|
|
subsys_initcall(topology_init);
|
2006-02-27 11:37:45 +08:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Export cpu cache information through sysfs
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* A bunch of string array to get pretty printing
|
|
|
|
*/
|
|
|
|
static const char *cache_types[] = {
|
|
|
|
"", /* not used */
|
|
|
|
"Instruction",
|
|
|
|
"Data",
|
|
|
|
"Unified" /* unified */
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char *cache_mattrib[]={
|
|
|
|
"WriteThrough",
|
|
|
|
"WriteBack",
|
|
|
|
"", /* reserved */
|
|
|
|
"" /* reserved */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct cache_info {
|
|
|
|
pal_cache_config_info_t cci;
|
|
|
|
cpumask_t shared_cpu_map;
|
|
|
|
int level;
|
|
|
|
int type;
|
|
|
|
struct kobject kobj;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct cpu_cache_info {
|
|
|
|
struct cache_info *cache_leaves;
|
|
|
|
int num_cache_leaves;
|
|
|
|
struct kobject kobj;
|
|
|
|
};
|
|
|
|
|
2013-06-18 03:51:20 +08:00
|
|
|
static struct cpu_cache_info all_cpu_cache_info[NR_CPUS];
|
2006-02-27 11:37:45 +08:00
|
|
|
#define LEAF_KOBJECT_PTR(x,y) (&all_cpu_cache_info[x].cache_leaves[y])
|
|
|
|
|
|
|
|
#ifdef CONFIG_SMP
|
2013-06-18 03:51:20 +08:00
|
|
|
static void cache_shared_cpu_map_setup(unsigned int cpu,
|
2006-02-27 11:37:45 +08:00
|
|
|
struct cache_info * this_leaf)
|
|
|
|
{
|
|
|
|
pal_cache_shared_info_t csi;
|
|
|
|
int num_shared, i = 0;
|
|
|
|
unsigned int j;
|
|
|
|
|
|
|
|
if (cpu_data(cpu)->threads_per_core <= 1 &&
|
|
|
|
cpu_data(cpu)->cores_per_socket <= 1) {
|
2015-03-05 08:19:16 +08:00
|
|
|
cpumask_set_cpu(cpu, &this_leaf->shared_cpu_map);
|
2006-02-27 11:37:45 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ia64_pal_cache_shared_info(this_leaf->level,
|
|
|
|
this_leaf->type,
|
|
|
|
0,
|
|
|
|
&csi) != PAL_STATUS_SUCCESS)
|
|
|
|
return;
|
|
|
|
|
|
|
|
num_shared = (int) csi.num_shared;
|
|
|
|
do {
|
2006-06-25 20:46:43 +08:00
|
|
|
for_each_possible_cpu(j)
|
2006-02-27 11:37:45 +08:00
|
|
|
if (cpu_data(cpu)->socket_id == cpu_data(j)->socket_id
|
|
|
|
&& cpu_data(j)->core_id == csi.log1_cid
|
|
|
|
&& cpu_data(j)->thread_id == csi.log1_tid)
|
2015-03-05 08:19:16 +08:00
|
|
|
cpumask_set_cpu(j, &this_leaf->shared_cpu_map);
|
2006-02-27 11:37:45 +08:00
|
|
|
|
|
|
|
i++;
|
|
|
|
} while (i < num_shared &&
|
|
|
|
ia64_pal_cache_shared_info(this_leaf->level,
|
|
|
|
this_leaf->type,
|
|
|
|
i,
|
|
|
|
&csi) == PAL_STATUS_SUCCESS);
|
|
|
|
}
|
|
|
|
#else
|
2013-06-18 03:51:20 +08:00
|
|
|
static void cache_shared_cpu_map_setup(unsigned int cpu,
|
2006-02-27 11:37:45 +08:00
|
|
|
struct cache_info * this_leaf)
|
|
|
|
{
|
2015-03-05 08:19:16 +08:00
|
|
|
cpumask_set_cpu(cpu, &this_leaf->shared_cpu_map);
|
2006-02-27 11:37:45 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static ssize_t show_coherency_line_size(struct cache_info *this_leaf,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
return sprintf(buf, "%u\n", 1 << this_leaf->cci.pcci_line_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t show_ways_of_associativity(struct cache_info *this_leaf,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
return sprintf(buf, "%u\n", this_leaf->cci.pcci_assoc);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t show_attributes(struct cache_info *this_leaf, char *buf)
|
|
|
|
{
|
|
|
|
return sprintf(buf,
|
|
|
|
"%s\n",
|
|
|
|
cache_mattrib[this_leaf->cci.pcci_cache_attr]);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t show_size(struct cache_info *this_leaf, char *buf)
|
|
|
|
{
|
|
|
|
return sprintf(buf, "%uK\n", this_leaf->cci.pcci_cache_size / 1024);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t show_number_of_sets(struct cache_info *this_leaf, char *buf)
|
|
|
|
{
|
|
|
|
unsigned number_of_sets = this_leaf->cci.pcci_cache_size;
|
|
|
|
number_of_sets /= this_leaf->cci.pcci_assoc;
|
|
|
|
number_of_sets /= 1 << this_leaf->cci.pcci_line_size;
|
|
|
|
|
|
|
|
return sprintf(buf, "%u\n", number_of_sets);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t show_shared_cpu_map(struct cache_info *this_leaf, char *buf)
|
|
|
|
{
|
|
|
|
cpumask_t shared_cpu_map;
|
|
|
|
|
2012-03-29 05:42:46 +08:00
|
|
|
cpumask_and(&shared_cpu_map,
|
|
|
|
&this_leaf->shared_cpu_map, cpu_online_mask);
|
2015-02-14 06:37:14 +08:00
|
|
|
return scnprintf(buf, PAGE_SIZE, "%*pb\n",
|
|
|
|
cpumask_pr_args(&shared_cpu_map));
|
2006-02-27 11:37:45 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t show_type(struct cache_info *this_leaf, char *buf)
|
|
|
|
{
|
|
|
|
int type = this_leaf->type + this_leaf->cci.pcci_unified;
|
|
|
|
return sprintf(buf, "%s\n", cache_types[type]);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t show_level(struct cache_info *this_leaf, char *buf)
|
|
|
|
{
|
|
|
|
return sprintf(buf, "%u\n", this_leaf->level);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct cache_attr {
|
|
|
|
struct attribute attr;
|
|
|
|
ssize_t (*show)(struct cache_info *, char *);
|
|
|
|
ssize_t (*store)(struct cache_info *, const char *, size_t count);
|
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef define_one_ro
|
|
|
|
#undef define_one_ro
|
|
|
|
#endif
|
|
|
|
#define define_one_ro(_name) \
|
|
|
|
static struct cache_attr _name = \
|
|
|
|
__ATTR(_name, 0444, show_##_name, NULL)
|
|
|
|
|
|
|
|
define_one_ro(level);
|
|
|
|
define_one_ro(type);
|
|
|
|
define_one_ro(coherency_line_size);
|
|
|
|
define_one_ro(ways_of_associativity);
|
|
|
|
define_one_ro(size);
|
|
|
|
define_one_ro(number_of_sets);
|
|
|
|
define_one_ro(shared_cpu_map);
|
|
|
|
define_one_ro(attributes);
|
|
|
|
|
|
|
|
static struct attribute * cache_default_attrs[] = {
|
|
|
|
&type.attr,
|
|
|
|
&level.attr,
|
|
|
|
&coherency_line_size.attr,
|
|
|
|
&ways_of_associativity.attr,
|
|
|
|
&attributes.attr,
|
|
|
|
&size.attr,
|
|
|
|
&number_of_sets.attr,
|
|
|
|
&shared_cpu_map.attr,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
#define to_object(k) container_of(k, struct cache_info, kobj)
|
|
|
|
#define to_attr(a) container_of(a, struct cache_attr, attr)
|
|
|
|
|
2012-11-08 07:51:04 +08:00
|
|
|
static ssize_t ia64_cache_show(struct kobject * kobj, struct attribute * attr, char * buf)
|
2006-02-27 11:37:45 +08:00
|
|
|
{
|
|
|
|
struct cache_attr *fattr = to_attr(attr);
|
|
|
|
struct cache_info *this_leaf = to_object(kobj);
|
|
|
|
ssize_t ret;
|
|
|
|
|
|
|
|
ret = fattr->show ? fattr->show(this_leaf, buf) : 0;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-01-19 09:58:23 +08:00
|
|
|
static const struct sysfs_ops cache_sysfs_ops = {
|
2012-11-08 07:51:04 +08:00
|
|
|
.show = ia64_cache_show
|
2006-02-27 11:37:45 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct kobj_type cache_ktype = {
|
|
|
|
.sysfs_ops = &cache_sysfs_ops,
|
|
|
|
.default_attrs = cache_default_attrs,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct kobj_type cache_ktype_percpu_entry = {
|
|
|
|
.sysfs_ops = &cache_sysfs_ops,
|
|
|
|
};
|
|
|
|
|
2013-06-18 03:51:20 +08:00
|
|
|
static void cpu_cache_sysfs_exit(unsigned int cpu)
|
2006-02-27 11:37:45 +08:00
|
|
|
{
|
2006-04-21 01:11:09 +08:00
|
|
|
kfree(all_cpu_cache_info[cpu].cache_leaves);
|
|
|
|
all_cpu_cache_info[cpu].cache_leaves = NULL;
|
2006-02-27 11:37:45 +08:00
|
|
|
all_cpu_cache_info[cpu].num_cache_leaves = 0;
|
|
|
|
memset(&all_cpu_cache_info[cpu].kobj, 0, sizeof(struct kobject));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-06-18 03:51:20 +08:00
|
|
|
static int cpu_cache_sysfs_init(unsigned int cpu)
|
2006-02-27 11:37:45 +08:00
|
|
|
{
|
2009-05-23 04:49:49 +08:00
|
|
|
unsigned long i, levels, unique_caches;
|
2006-02-27 11:37:45 +08:00
|
|
|
pal_cache_config_info_t cci;
|
|
|
|
int j;
|
2009-05-23 04:49:49 +08:00
|
|
|
long status;
|
2006-02-27 11:37:45 +08:00
|
|
|
struct cache_info *this_cache;
|
|
|
|
int num_cache_leaves = 0;
|
|
|
|
|
|
|
|
if ((status = ia64_pal_cache_summary(&levels, &unique_caches)) != 0) {
|
|
|
|
printk(KERN_ERR "ia64_pal_cache_summary=%ld\n", status);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
treewide: kzalloc() -> kcalloc()
The kzalloc() function has a 2-factor argument form, kcalloc(). This
patch replaces cases of:
kzalloc(a * b, gfp)
with:
kcalloc(a * b, gfp)
as well as handling cases of:
kzalloc(a * b * c, gfp)
with:
kzalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kzalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kzalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kzalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kzalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kzalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kzalloc
+ kcalloc
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kzalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kzalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kzalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kzalloc(sizeof(THING) * C2, ...)
|
kzalloc(sizeof(TYPE) * C2, ...)
|
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(C1 * C2, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * E2
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 05:03:40 +08:00
|
|
|
this_cache=kcalloc(unique_caches, sizeof(struct cache_info),
|
|
|
|
GFP_KERNEL);
|
2006-02-27 11:37:45 +08:00
|
|
|
if (this_cache == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
for (i=0; i < levels; i++) {
|
|
|
|
for (j=2; j >0 ; j--) {
|
|
|
|
if ((status=ia64_pal_cache_config_info(i,j, &cci)) !=
|
|
|
|
PAL_STATUS_SUCCESS)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
this_cache[num_cache_leaves].cci = cci;
|
|
|
|
this_cache[num_cache_leaves].level = i + 1;
|
|
|
|
this_cache[num_cache_leaves].type = j;
|
|
|
|
|
|
|
|
cache_shared_cpu_map_setup(cpu,
|
|
|
|
&this_cache[num_cache_leaves]);
|
|
|
|
num_cache_leaves ++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
all_cpu_cache_info[cpu].cache_leaves = this_cache;
|
|
|
|
all_cpu_cache_info[cpu].num_cache_leaves = num_cache_leaves;
|
|
|
|
|
|
|
|
memset(&all_cpu_cache_info[cpu].kobj, 0, sizeof(struct kobject));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add cache interface for CPU device */
|
2016-11-04 01:33:53 +08:00
|
|
|
static int cache_add_dev(unsigned int cpu)
|
2006-02-27 11:37:45 +08:00
|
|
|
{
|
2016-11-04 01:33:53 +08:00
|
|
|
struct device *sys_dev = get_cpu_device(cpu);
|
2006-02-27 11:37:45 +08:00
|
|
|
unsigned long i, j;
|
|
|
|
struct cache_info *this_object;
|
|
|
|
int retval = 0;
|
|
|
|
|
|
|
|
if (all_cpu_cache_info[cpu].kobj.parent)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
retval = cpu_cache_sysfs_init(cpu);
|
|
|
|
if (unlikely(retval < 0))
|
|
|
|
return retval;
|
|
|
|
|
2007-12-18 03:54:39 +08:00
|
|
|
retval = kobject_init_and_add(&all_cpu_cache_info[cpu].kobj,
|
|
|
|
&cache_ktype_percpu_entry, &sys_dev->kobj,
|
|
|
|
"%s", "cache");
|
2009-08-12 05:52:11 +08:00
|
|
|
if (unlikely(retval < 0)) {
|
|
|
|
cpu_cache_sysfs_exit(cpu);
|
|
|
|
return retval;
|
|
|
|
}
|
2006-02-27 11:37:45 +08:00
|
|
|
|
|
|
|
for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) {
|
|
|
|
this_object = LEAF_KOBJECT_PTR(cpu,i);
|
2007-12-18 03:54:39 +08:00
|
|
|
retval = kobject_init_and_add(&(this_object->kobj),
|
|
|
|
&cache_ktype,
|
|
|
|
&all_cpu_cache_info[cpu].kobj,
|
|
|
|
"index%1lu", i);
|
2006-02-27 11:37:45 +08:00
|
|
|
if (unlikely(retval)) {
|
|
|
|
for (j = 0; j < i; j++) {
|
2007-12-21 00:13:05 +08:00
|
|
|
kobject_put(&(LEAF_KOBJECT_PTR(cpu,j)->kobj));
|
2006-02-27 11:37:45 +08:00
|
|
|
}
|
2007-12-21 00:13:05 +08:00
|
|
|
kobject_put(&all_cpu_cache_info[cpu].kobj);
|
2006-02-27 11:37:45 +08:00
|
|
|
cpu_cache_sysfs_exit(cpu);
|
2009-08-12 05:52:11 +08:00
|
|
|
return retval;
|
2006-02-27 11:37:45 +08:00
|
|
|
}
|
2007-12-18 03:54:39 +08:00
|
|
|
kobject_uevent(&(this_object->kobj), KOBJ_ADD);
|
2006-02-27 11:37:45 +08:00
|
|
|
}
|
2007-12-18 03:54:39 +08:00
|
|
|
kobject_uevent(&all_cpu_cache_info[cpu].kobj, KOBJ_ADD);
|
2006-02-27 11:37:45 +08:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Remove cache interface for CPU device */
|
2016-11-04 01:33:53 +08:00
|
|
|
static int cache_remove_dev(unsigned int cpu)
|
2006-02-27 11:37:45 +08:00
|
|
|
{
|
|
|
|
unsigned long i;
|
|
|
|
|
|
|
|
for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++)
|
2007-12-21 00:13:05 +08:00
|
|
|
kobject_put(&(LEAF_KOBJECT_PTR(cpu,i)->kobj));
|
2006-02-27 11:37:45 +08:00
|
|
|
|
|
|
|
if (all_cpu_cache_info[cpu].kobj.parent) {
|
2007-12-21 00:13:05 +08:00
|
|
|
kobject_put(&all_cpu_cache_info[cpu].kobj);
|
2006-02-27 11:37:45 +08:00
|
|
|
memset(&all_cpu_cache_info[cpu].kobj,
|
|
|
|
0,
|
|
|
|
sizeof(struct kobject));
|
|
|
|
}
|
|
|
|
|
|
|
|
cpu_cache_sysfs_exit(cpu);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-10-03 04:39:45 +08:00
|
|
|
static int __init cache_sysfs_init(void)
|
2006-02-27 11:37:45 +08:00
|
|
|
{
|
2016-11-04 01:33:53 +08:00
|
|
|
int ret;
|
2006-02-27 11:37:45 +08:00
|
|
|
|
2016-11-04 01:33:53 +08:00
|
|
|
ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "ia64/topology:online",
|
|
|
|
cache_add_dev, cache_remove_dev);
|
|
|
|
WARN_ON(ret < 0);
|
2006-02-27 11:37:45 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
device_initcall(cache_sysfs_init);
|