License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 22:07:57 +08:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0 */
|
2005-09-08 04:59:48 +08:00
|
|
|
#ifndef _ASM_POWERPC_TOPOLOGY_H
|
|
|
|
|
#define _ASM_POWERPC_TOPOLOGY_H
|
2005-12-17 05:43:46 +08:00
|
|
|
#ifdef __KERNEL__
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
|
2011-12-22 06:29:42 +08:00
|
|
|
struct device;
|
2006-05-02 03:16:12 +08:00
|
|
|
struct device_node;
|
2020-11-06 06:30:40 +08:00
|
|
|
struct drmem_lmb;
|
2006-05-02 03:16:12 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifdef CONFIG_NUMA
|
|
|
|
|
|
2010-05-17 04:19:56 +08:00
|
|
|
/*
|
2014-06-05 07:07:14 +08:00
|
|
|
* If zone_reclaim_mode is enabled, a RECLAIM_DISTANCE of 10 will mean that
|
|
|
|
|
* all zones on all nodes will be eligible for zone_reclaim().
|
2010-05-17 04:19:56 +08:00
|
|
|
*/
|
|
|
|
|
#define RECLAIM_DISTANCE 10
|
|
|
|
|
|
2005-09-08 04:59:48 +08:00
|
|
|
#include <asm/mmzone.h>
|
|
|
|
|
|
2010-01-06 02:55:10 +08:00
|
|
|
#define cpumask_of_node(node) ((node) == -1 ? \
|
|
|
|
|
cpu_all_mask : \
|
2010-04-26 23:32:43 +08:00
|
|
|
node_to_cpumask_map[node])
|
2008-12-26 19:53:39 +08:00
|
|
|
|
2006-06-10 18:53:06 +08:00
|
|
|
struct pci_bus;
|
2006-11-28 02:19:00 +08:00
|
|
|
#ifdef CONFIG_PCI
|
2006-06-10 18:53:06 +08:00
|
|
|
extern int pcibus_to_node(struct pci_bus *bus);
|
2006-11-28 02:19:00 +08:00
|
|
|
#else
|
|
|
|
|
static inline int pcibus_to_node(struct pci_bus *bus)
|
|
|
|
|
{
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2006-06-10 18:53:06 +08:00
|
|
|
|
2008-12-26 19:53:39 +08:00
|
|
|
#define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \
|
|
|
|
|
cpu_all_mask : \
|
|
|
|
|
cpumask_of_node(pcibus_to_node(bus)))
|
|
|
|
|
|
2021-08-12 21:22:22 +08:00
|
|
|
int cpu_relative_distance(__be32 *cpu1_assoc, __be32 *cpu2_assoc);
|
2010-05-17 04:22:31 +08:00
|
|
|
extern int __node_distance(int, int);
|
|
|
|
|
#define node_distance(a, b) __node_distance(a, b)
|
|
|
|
|
|
2005-12-13 03:56:47 +08:00
|
|
|
extern void __init dump_numa_cpu_topology(void);
|
|
|
|
|
|
2011-12-22 06:29:42 +08:00
|
|
|
extern int sysfs_add_device_to_node(struct device *dev, int nid);
|
|
|
|
|
extern void sysfs_remove_device_from_node(struct device *dev, int nid);
|
2006-05-02 03:16:12 +08:00
|
|
|
|
2018-01-27 03:41:59 +08:00
|
|
|
static inline void update_numa_cpu_lookup_table(unsigned int cpu, int node)
|
|
|
|
|
{
|
|
|
|
|
numa_cpu_lookup_table[cpu] = node;
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-06 18:23:57 +08:00
|
|
|
static inline int early_cpu_to_node(int cpu)
|
|
|
|
|
{
|
|
|
|
|
int nid;
|
|
|
|
|
|
|
|
|
|
nid = numa_cpu_lookup_table[cpu];
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Fall back to node 0 if nid is unset (it should be, except bugs).
|
|
|
|
|
* This allows callers to safely do NODE_DATA(early_cpu_to_node(cpu)).
|
|
|
|
|
*/
|
|
|
|
|
return (nid < 0) ? 0 : nid;
|
|
|
|
|
}
|
2020-11-06 06:30:40 +08:00
|
|
|
|
|
|
|
|
int of_drconf_to_nid_single(struct drmem_lmb *lmb);
|
2021-08-12 21:22:21 +08:00
|
|
|
void update_numa_distance(struct device_node *node);
|
2020-11-06 06:30:40 +08:00
|
|
|
|
2021-08-26 18:05:20 +08:00
|
|
|
extern void map_cpu_to_node(int cpu, int node);
|
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
|
extern void unmap_cpu_from_node(unsigned long cpu);
|
|
|
|
|
#endif /* CONFIG_HOTPLUG_CPU */
|
|
|
|
|
|
2010-12-18 06:07:47 +08:00
|
|
|
#else
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2017-06-06 18:23:57 +08:00
|
|
|
static inline int early_cpu_to_node(int cpu) { return 0; }
|
|
|
|
|
|
2005-12-13 03:56:47 +08:00
|
|
|
static inline void dump_numa_cpu_topology(void) {}
|
|
|
|
|
|
2011-12-22 06:29:42 +08:00
|
|
|
static inline int sysfs_add_device_to_node(struct device *dev, int nid)
|
2006-05-02 03:16:12 +08:00
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-22 06:29:42 +08:00
|
|
|
static inline void sysfs_remove_device_from_node(struct device *dev,
|
2006-05-02 03:16:12 +08:00
|
|
|
int nid)
|
|
|
|
|
{
|
|
|
|
|
}
|
2017-06-21 06:08:30 +08:00
|
|
|
|
2018-02-14 20:17:47 +08:00
|
|
|
static inline void update_numa_cpu_lookup_table(unsigned int cpu, int node) {}
|
|
|
|
|
|
2021-08-12 21:22:22 +08:00
|
|
|
static inline int cpu_relative_distance(__be32 *cpu1_assoc, __be32 *cpu2_assoc)
|
2019-07-04 01:04:00 +08:00
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2020-11-06 06:30:40 +08:00
|
|
|
static inline int of_drconf_to_nid_single(struct drmem_lmb *lmb)
|
|
|
|
|
{
|
|
|
|
|
return first_online_node;
|
|
|
|
|
}
|
2006-05-02 03:16:12 +08:00
|
|
|
|
2021-08-12 21:22:21 +08:00
|
|
|
static inline void update_numa_distance(struct device_node *node) {}
|
2021-08-26 18:05:20 +08:00
|
|
|
|
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
|
static inline void map_cpu_to_node(int cpu, int node) {}
|
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
|
static inline void unmap_cpu_from_node(unsigned long cpu) {}
|
|
|
|
|
#endif /* CONFIG_HOTPLUG_CPU */
|
|
|
|
|
#endif /* CONFIG_SMP */
|
|
|
|
|
|
2020-11-06 06:30:40 +08:00
|
|
|
#endif /* CONFIG_NUMA */
|
pseries/hotplug-memory: hot-add: skip redundant LMB lookup
During memory hot-add, dlpar_add_lmb() calls memory_add_physaddr_to_nid()
to determine which node id (nid) to use when later calling __add_memory().
This is wasteful. On pseries, memory_add_physaddr_to_nid() finds an
appropriate nid for a given address by looking up the LMB containing the
address and then passing that LMB to of_drconf_to_nid_single() to get the
nid. In dlpar_add_lmb() we get this address from the LMB itself.
In short, we have a pointer to an LMB and then we are searching for
that LMB *again* in order to find its nid.
If we call of_drconf_to_nid_single() directly from dlpar_add_lmb() we
can skip the redundant lookup. The only error handling we need to
duplicate from memory_add_physaddr_to_nid() is the fallback to the
default nid when drconf_to_nid_single() returns -1 (NUMA_NO_NODE) or
an invalid nid.
Skipping the extra lookup makes hot-add operations faster, especially
on machines with many LMBs.
Consider an LPAR with 126976 LMBs. In one test, hot-adding 126000
LMBs on an upatched kernel took ~3.5 hours while a patched kernel
completed the same operation in ~2 hours:
Unpatched (12450 seconds):
Sep 9 04:06:31 ltc-brazos1 drmgr[810169]: drmgr: -c mem -a -q 126000
Sep 9 04:06:31 ltc-brazos1 kernel: pseries-hotplug-mem: Attempting to hot-add 126000 LMB(s)
[...]
Sep 9 07:34:01 ltc-brazos1 kernel: pseries-hotplug-mem: Memory at 20000000 (drc index 80000002) was hot-added
Patched (7065 seconds):
Sep 8 21:49:57 ltc-brazos1 drmgr[877703]: drmgr: -c mem -a -q 126000
Sep 8 21:49:57 ltc-brazos1 kernel: pseries-hotplug-mem: Attempting to hot-add 126000 LMB(s)
[...]
Sep 8 23:27:42 ltc-brazos1 kernel: pseries-hotplug-mem: Memory at 20000000 (drc index 80000002) was hot-added
It should be noted that the speedup grows more substantial when
hot-adding LMBs at the end of the drconf range. This is because we
are skipping a linear LMB search.
To see the distinction, consider smaller hot-add test on the same
LPAR. A perf-stat run with 10 iterations showed that hot-adding 4096
LMBs completed less than 1 second faster on a patched kernel:
Unpatched:
Performance counter stats for 'drmgr -c mem -a -q 4096' (10 runs):
104,753.42 msec task-clock # 0.992 CPUs utilized ( +- 0.55% )
4,708 context-switches # 0.045 K/sec ( +- 0.69% )
2,444 cpu-migrations # 0.023 K/sec ( +- 1.25% )
394 page-faults # 0.004 K/sec ( +- 0.22% )
445,902,503,057 cycles # 4.257 GHz ( +- 0.55% ) (66.67%)
8,558,376,740 stalled-cycles-frontend # 1.92% frontend cycles idle ( +- 0.88% ) (49.99%)
300,346,181,651 stalled-cycles-backend # 67.36% backend cycles idle ( +- 0.76% ) (50.01%)
258,091,488,691 instructions # 0.58 insn per cycle
# 1.16 stalled cycles per insn ( +- 0.22% ) (66.67%)
70,568,169,256 branches # 673.660 M/sec ( +- 0.17% ) (50.01%)
3,100,725,426 branch-misses # 4.39% of all branches ( +- 0.20% ) (49.99%)
105.583 +- 0.589 seconds time elapsed ( +- 0.56% )
Patched:
Performance counter stats for 'drmgr -c mem -a -q 4096' (10 runs):
104,055.69 msec task-clock # 0.993 CPUs utilized ( +- 0.32% )
4,606 context-switches # 0.044 K/sec ( +- 0.20% )
2,463 cpu-migrations # 0.024 K/sec ( +- 0.93% )
394 page-faults # 0.004 K/sec ( +- 0.25% )
442,951,129,921 cycles # 4.257 GHz ( +- 0.32% ) (66.66%)
8,710,413,329 stalled-cycles-frontend # 1.97% frontend cycles idle ( +- 0.47% ) (50.06%)
299,656,905,836 stalled-cycles-backend # 67.65% backend cycles idle ( +- 0.39% ) (50.02%)
252,731,168,193 instructions # 0.57 insn per cycle
# 1.19 stalled cycles per insn ( +- 0.20% ) (66.66%)
68,902,851,121 branches # 662.173 M/sec ( +- 0.13% ) (49.94%)
3,100,242,882 branch-misses # 4.50% of all branches ( +- 0.15% ) (49.98%)
104.829 +- 0.325 seconds time elapsed ( +- 0.31% )
This is consistent. An add-by-count hot-add operation adds LMBs
greedily, so LMBs near the start of the drconf range are considered
first. On an otherwise idle LPAR with so many LMBs we would expect to
find the LMBs we need near the start of the drconf range, hence the
smaller speedup.
Signed-off-by: Scott Cheloha <cheloha@linux.ibm.com>
Reviewed-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200916145122.3408129-1-cheloha@linux.ibm.com
2020-09-16 22:51:22 +08:00
|
|
|
|
2011-01-12 07:56:29 +08:00
|
|
|
#if defined(CONFIG_NUMA) && defined(CONFIG_PPC_SPLPAR)
|
2022-04-11 15:49:34 +08:00
|
|
|
void find_and_update_cpu_nid(int cpu);
|
2020-08-10 15:18:33 +08:00
|
|
|
extern int cpu_to_coregroup_id(int cpu);
|
2011-01-12 07:56:29 +08:00
|
|
|
#else
|
2022-04-11 15:49:34 +08:00
|
|
|
static inline void find_and_update_cpu_nid(int cpu) {}
|
2020-08-10 15:18:33 +08:00
|
|
|
static inline int cpu_to_coregroup_id(int cpu)
|
|
|
|
|
{
|
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
|
return cpu_to_core_id(cpu);
|
|
|
|
|
#else
|
|
|
|
|
return 0;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 07:56:29 +08:00
|
|
|
#endif /* CONFIG_NUMA && CONFIG_PPC_SPLPAR */
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm-generic/topology.h>
|
|
|
|
|
|
2006-06-27 17:54:42 +08:00
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
|
#include <asm/cputable.h>
|
2006-11-13 11:51:46 +08:00
|
|
|
|
|
|
|
|
#ifdef CONFIG_PPC64
|
|
|
|
|
#include <asm/smp.h>
|
|
|
|
|
|
2013-08-12 20:05:57 +08:00
|
|
|
#define topology_physical_package_id(cpu) (cpu_to_chip_id(cpu))
|
2020-01-29 21:51:21 +08:00
|
|
|
|
2015-05-26 21:11:28 +08:00
|
|
|
#define topology_sibling_cpumask(cpu) (per_cpu(cpu_sibling_map, cpu))
|
2021-04-15 20:09:33 +08:00
|
|
|
#define topology_core_cpumask(cpu) (per_cpu(cpu_core_map, cpu))
|
2008-07-27 13:24:54 +08:00
|
|
|
#define topology_core_id(cpu) (cpu_to_core_id(cpu))
|
2018-10-30 02:43:36 +08:00
|
|
|
|
2006-11-13 11:51:46 +08:00
|
|
|
#endif
|
2006-06-27 17:54:42 +08:00
|
|
|
#endif
|
|
|
|
|
|
2005-12-17 05:43:46 +08:00
|
|
|
#endif /* __KERNEL__ */
|
2005-09-08 04:59:48 +08:00
|
|
|
#endif /* _ASM_POWERPC_TOPOLOGY_H */
|