2016-12-06 21:18:51 +08:00
|
|
|
#!/bin/sh
|
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
|
2016-12-06 21:18:51 +08:00
|
|
|
|
2019-08-30 06:41:21 +08:00
|
|
|
FILES='
|
2019-08-19 22:00:54 +08:00
|
|
|
include/uapi/linux/const.h
|
2017-08-01 03:45:32 +08:00
|
|
|
include/uapi/drm/drm.h
|
|
|
|
|
include/uapi/drm/i915_drm.h
|
2018-12-19 03:15:53 +08:00
|
|
|
include/uapi/linux/fadvise.h
|
2017-03-30 22:16:59 +08:00
|
|
|
include/uapi/linux/fcntl.h
|
2018-10-25 01:31:12 +08:00
|
|
|
include/uapi/linux/fs.h
|
2019-09-27 23:01:26 +08:00
|
|
|
include/uapi/linux/fscrypt.h
|
2017-10-31 21:04:11 +08:00
|
|
|
include/uapi/linux/kcmp.h
|
2017-08-01 03:45:32 +08:00
|
|
|
include/uapi/linux/kvm.h
|
2018-07-26 20:26:13 +08:00
|
|
|
include/uapi/linux/in.h
|
2019-01-09 00:42:37 +08:00
|
|
|
include/uapi/linux/mount.h
|
tools include UAPI: Sync x86's syscalls_64.tbl, generic unistd.h and fcntl.h to pick up openat2 and pidfd_getfd
fddb5d430ad9 ("open: introduce openat2(2) syscall")
9a2cef09c801 ("arch: wire up pidfd_getfd syscall")
We also need to grab a copy of uapi/linux/openat2.h since it is now
needed by fcntl.h, add it to tools/perf/check_headers.h.
$ diff -u tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/x86/entry/syscalls/syscall_64.tbl
--- tools/perf/arch/x86/entry/syscalls/syscall_64.tbl 2019-12-20 16:43:57.662429958 -0300
+++ arch/x86/entry/syscalls/syscall_64.tbl 2020-02-10 16:36:22.070012468 -0300
@@ -357,6 +357,8 @@
433 common fspick __x64_sys_fspick
434 common pidfd_open __x64_sys_pidfd_open
435 common clone3 __x64_sys_clone3/ptregs
+437 common openat2 __x64_sys_openat2
+438 common pidfd_getfd __x64_sys_pidfd_getfd
#
# x32-specific system call numbers start at 512 to avoid cache impact
$
Update tools/'s copy of that file:
$ cp arch/x86/entry/syscalls/syscall_64.tbl tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
See the result:
$ diff -u /tmp/build/perf/arch/x86/include/generated/asm/syscalls_64.c.before /tmp/build/perf/arch/x86/include/generated/asm/syscalls_64.c
--- /tmp/build/perf/arch/x86/include/generated/asm/syscalls_64.c.before 2020-02-10 16:42:59.010636041 -0300
+++ /tmp/build/perf/arch/x86/include/generated/asm/syscalls_64.c 2020-02-10 16:43:24.149958337 -0300
@@ -346,5 +346,7 @@
[433] = "fspick",
[434] = "pidfd_open",
[435] = "clone3",
+ [437] = "openat2",
+ [438] = "pidfd_getfd",
};
-#define SYSCALLTBL_x86_64_MAX_ID 435
+#define SYSCALLTBL_x86_64_MAX_ID 438
$
Now one can use:
perf trace -e openat2,pidfd_getfd
To get just those syscalls or use in things like:
perf trace -e open*
To get all the open variant (open, openat, openat2, etc) or:
perf trace pidfd*
To get the pidfd syscalls.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Aleksa Sarai <cyphar@cyphar.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Sargun Dhillon <sargun@sargun.me>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2020-02-11 22:58:56 +08:00
|
|
|
include/uapi/linux/openat2.h
|
2016-12-06 21:18:51 +08:00
|
|
|
include/uapi/linux/perf_event.h
|
2017-10-27 01:41:01 +08:00
|
|
|
include/uapi/linux/prctl.h
|
2017-07-20 21:46:34 +08:00
|
|
|
include/uapi/linux/sched.h
|
2017-03-30 22:16:59 +08:00
|
|
|
include/uapi/linux/stat.h
|
2018-12-28 01:18:13 +08:00
|
|
|
include/uapi/linux/usbdevice_fs.h
|
2017-08-01 03:45:32 +08:00
|
|
|
include/uapi/linux/vhost.h
|
2017-08-01 03:45:32 +08:00
|
|
|
include/uapi/sound/asound.h
|
2018-09-25 21:55:59 +08:00
|
|
|
include/linux/bits.h
|
2020-04-14 21:27:39 +08:00
|
|
|
include/vdso/bits.h
|
2019-08-19 22:00:54 +08:00
|
|
|
include/linux/const.h
|
2020-04-14 19:52:23 +08:00
|
|
|
include/vdso/const.h
|
2016-12-06 21:18:51 +08:00
|
|
|
include/linux/hash.h
|
|
|
|
|
include/uapi/linux/hw_breakpoint.h
|
|
|
|
|
arch/x86/include/asm/disabled-features.h
|
|
|
|
|
arch/x86/include/asm/required-features.h
|
|
|
|
|
arch/x86/include/asm/cpufeatures.h
|
2019-08-30 06:41:21 +08:00
|
|
|
arch/x86/include/asm/inat_types.h
|
2019-09-06 21:14:10 +08:00
|
|
|
arch/x86/include/asm/emulate_prefix.h
|
2019-10-16 02:40:23 +08:00
|
|
|
arch/x86/include/asm/irq_vectors.h
|
2019-09-27 02:26:39 +08:00
|
|
|
arch/x86/include/asm/msr-index.h
|
2018-12-18 03:15:27 +08:00
|
|
|
arch/x86/include/uapi/asm/prctl.h
|
2019-08-30 06:41:21 +08:00
|
|
|
arch/x86/lib/x86-opcode-map.txt
|
|
|
|
|
arch/x86/tools/gen-insn-attr-x86.awk
|
2016-12-06 21:18:51 +08:00
|
|
|
arch/arm/include/uapi/asm/perf_regs.h
|
|
|
|
|
arch/arm64/include/uapi/asm/perf_regs.h
|
|
|
|
|
arch/powerpc/include/uapi/asm/perf_regs.h
|
2017-11-28 22:08:41 +08:00
|
|
|
arch/s390/include/uapi/asm/perf_regs.h
|
2016-12-06 21:18:51 +08:00
|
|
|
arch/x86/include/uapi/asm/perf_regs.h
|
|
|
|
|
arch/x86/include/uapi/asm/kvm.h
|
|
|
|
|
arch/x86/include/uapi/asm/kvm_perf.h
|
|
|
|
|
arch/x86/include/uapi/asm/svm.h
|
2017-07-19 04:09:21 +08:00
|
|
|
arch/x86/include/uapi/asm/unistd.h
|
2016-12-06 21:18:51 +08:00
|
|
|
arch/x86/include/uapi/asm/vmx.h
|
|
|
|
|
arch/powerpc/include/uapi/asm/kvm.h
|
|
|
|
|
arch/s390/include/uapi/asm/kvm.h
|
|
|
|
|
arch/s390/include/uapi/asm/kvm_perf.h
|
2017-12-04 17:56:49 +08:00
|
|
|
arch/s390/include/uapi/asm/ptrace.h
|
2016-12-06 21:18:51 +08:00
|
|
|
arch/s390/include/uapi/asm/sie.h
|
|
|
|
|
arch/arm/include/uapi/asm/kvm.h
|
|
|
|
|
arch/arm64/include/uapi/asm/kvm.h
|
2018-07-07 05:34:34 +08:00
|
|
|
arch/arm64/include/uapi/asm/unistd.h
|
2018-01-19 16:56:13 +08:00
|
|
|
arch/alpha/include/uapi/asm/errno.h
|
|
|
|
|
arch/mips/include/asm/errno.h
|
|
|
|
|
arch/mips/include/uapi/asm/errno.h
|
|
|
|
|
arch/parisc/include/uapi/asm/errno.h
|
|
|
|
|
arch/powerpc/include/uapi/asm/errno.h
|
|
|
|
|
arch/sparc/include/uapi/asm/errno.h
|
|
|
|
|
arch/x86/include/uapi/asm/errno.h
|
2016-12-06 21:18:51 +08:00
|
|
|
include/asm-generic/bitops/arch_hweight.h
|
|
|
|
|
include/asm-generic/bitops/const_hweight.h
|
|
|
|
|
include/asm-generic/bitops/__fls.h
|
|
|
|
|
include/asm-generic/bitops/fls.h
|
|
|
|
|
include/asm-generic/bitops/fls64.h
|
|
|
|
|
include/linux/coresight-pmu.h
|
2018-01-19 16:56:14 +08:00
|
|
|
include/uapi/asm-generic/errno.h
|
|
|
|
|
include/uapi/asm-generic/errno-base.h
|
2017-08-01 09:52:28 +08:00
|
|
|
include/uapi/asm-generic/ioctls.h
|
2016-12-06 21:18:51 +08:00
|
|
|
include/uapi/asm-generic/mman-common.h
|
2018-07-07 05:34:34 +08:00
|
|
|
include/uapi/asm-generic/unistd.h
|
2016-12-06 21:18:51 +08:00
|
|
|
'
|
|
|
|
|
|
2018-04-23 17:08:16 +08:00
|
|
|
check_2 () {
|
|
|
|
|
file1=$1
|
|
|
|
|
file2=$2
|
2016-12-06 21:18:51 +08:00
|
|
|
|
2018-04-23 17:08:16 +08:00
|
|
|
shift
|
2016-12-06 21:18:51 +08:00
|
|
|
shift
|
|
|
|
|
|
2018-04-23 17:08:16 +08:00
|
|
|
cmd="diff $* $file1 $file2 > /dev/null"
|
2016-12-06 21:18:51 +08:00
|
|
|
|
2018-08-11 16:39:15 +08:00
|
|
|
test -f $file2 && {
|
|
|
|
|
eval $cmd || {
|
2018-08-13 19:15:03 +08:00
|
|
|
echo "Warning: Kernel ABI header at '$file1' differs from latest version at '$file2'" >&2
|
|
|
|
|
echo diff -u $file1 $file2
|
2018-08-11 16:39:15 +08:00
|
|
|
}
|
|
|
|
|
}
|
2016-12-06 21:18:51 +08:00
|
|
|
}
|
|
|
|
|
|
2018-04-23 17:08:16 +08:00
|
|
|
check () {
|
|
|
|
|
file=$1
|
|
|
|
|
|
|
|
|
|
shift
|
|
|
|
|
|
2018-08-13 19:15:03 +08:00
|
|
|
check_2 tools/$file $file $*
|
2018-04-23 17:08:16 +08:00
|
|
|
}
|
2016-12-06 21:18:51 +08:00
|
|
|
|
2017-10-17 02:53:08 +08:00
|
|
|
# Check if we have the kernel headers (tools/perf/../../include), else
|
|
|
|
|
# we're probably on a detached tarball, so no point in trying to check
|
|
|
|
|
# differences.
|
|
|
|
|
test -d ../../include || exit 0
|
|
|
|
|
|
2018-08-13 19:15:03 +08:00
|
|
|
cd ../..
|
|
|
|
|
|
2016-12-06 21:18:51 +08:00
|
|
|
# simple diff check
|
2019-08-30 06:41:21 +08:00
|
|
|
for i in $FILES; do
|
2016-12-06 21:18:51 +08:00
|
|
|
check $i -B
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# diff with extra ignore lines
|
2019-12-02 22:40:57 +08:00
|
|
|
check arch/x86/lib/memcpy_64.S '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memcpy_\(erms\|orig\))"'
|
|
|
|
|
check arch/x86/lib/memset_64.S '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memset_\(erms\|orig\))"'
|
tools headers uapi: Sync asm-generic/mman-common.h and linux/mman.h
To deal with the move of some defines from asm-generic/mmap-common.h to
linux/mman.h done in:
746c9398f5ac ("arch: move common mmap flags to linux/mman.h")
The generated mmap_flags array stays the same:
$ tools/perf/trace/beauty/mmap_flags.sh
static const char *mmap_flags[] = {
[ilog2(0x40) + 1] = "32BIT",
[ilog2(0x01) + 1] = "SHARED",
[ilog2(0x02) + 1] = "PRIVATE",
[ilog2(0x10) + 1] = "FIXED",
[ilog2(0x20) + 1] = "ANONYMOUS",
[ilog2(0x100000) + 1] = "FIXED_NOREPLACE",
[ilog2(0x0100) + 1] = "GROWSDOWN",
[ilog2(0x0800) + 1] = "DENYWRITE",
[ilog2(0x1000) + 1] = "EXECUTABLE",
[ilog2(0x2000) + 1] = "LOCKED",
[ilog2(0x4000) + 1] = "NORESERVE",
[ilog2(0x8000) + 1] = "POPULATE",
[ilog2(0x10000) + 1] = "NONBLOCK",
[ilog2(0x20000) + 1] = "STACK",
[ilog2(0x40000) + 1] = "HUGETLB",
[ilog2(0x80000) + 1] = "SYNC",
};
$
And to have the system's sys/mman.h find the definition of MAP_SHARED
and MAP_PRIVATE, make sure they are defined in the tools/ mman-common.h
in a way that keeps it the same as the kernel's, need for keeping the
Android's NDK cross build working.
This silences these perf build warnings:
Warning: Kernel ABI header at 'tools/include/uapi/asm-generic/mman-common.h' differs from latest version at 'include/uapi/asm-generic/mman-common.h'
diff -u tools/include/uapi/asm-generic/mman-common.h include/uapi/asm-generic/mman-common.h
Warning: Kernel ABI header at 'tools/include/uapi/linux/mman.h' differs from latest version at 'include/uapi/linux/mman.h'
diff -u tools/include/uapi/linux/mman.h include/uapi/linux/mman.h
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-h80ycpc6pedg9s5z2rwpy6ws@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2019-03-26 01:06:07 +08:00
|
|
|
check include/uapi/asm-generic/mman.h '-I "^#include <\(uapi/\)*asm-generic/mman-common\(-tools\)*.h>"'
|
2018-04-23 17:08:15 +08:00
|
|
|
check include/uapi/linux/mman.h '-I "^#include <\(uapi/\)*asm/mman.h>"'
|
2020-04-14 21:27:39 +08:00
|
|
|
check include/linux/build_bug.h '-I "^#\(ifndef\|endif\)\( \/\/\)* static_assert$"'
|
tools perf: Move from sane_ctype.h obtained from git to the Linux's original
We got the sane_ctype.h headers from git and kept using it so far, but
since that code originally came from the kernel sources to the git
sources, perhaps its better to just use the one in the kernel, so that
we can leverage tools/perf/check_headers.sh to be notified when our copy
gets out of sync, i.e. when fixes or goodies are added to the code we've
copied.
This will help with things like tools/lib/string.c where we want to have
more things in common with the kernel, such as strim(), skip_spaces(),
etc so as to go on removing the things that we have in tools/perf/util/
and instead using the code in the kernel, indirectly and removing things
like EXPORT_SYMBOL(), etc, getting notified when fixes and improvements
are made to the original code.
Hopefully this also should help with reducing the difference of code
hosted in tools/ to the one in the kernel proper.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-7k9868l713wqtgo01xxygn12@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2019-06-26 04:27:31 +08:00
|
|
|
check include/linux/ctype.h '-I "isdigit("'
|
|
|
|
|
check lib/ctype.c '-I "^EXPORT_SYMBOL" -I "^#include <linux/export.h>" -B'
|
2019-09-01 04:14:19 +08:00
|
|
|
check arch/x86/include/asm/inat.h '-I "^#include [\"<]\(asm/\)*inat_types.h[\">]"'
|
|
|
|
|
check arch/x86/include/asm/insn.h '-I "^#include [\"<]\(asm/\)*inat.h[\">]"'
|
|
|
|
|
check arch/x86/lib/inat.c '-I "^#include [\"<]\(../include/\)*asm/insn.h[\">]"'
|
2019-09-06 21:14:10 +08:00
|
|
|
check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]" -I "^#include [\"<]\(../include/\)*asm/emulate_prefix.h[\">]"'
|
2018-08-13 19:15:03 +08:00
|
|
|
|
2018-08-13 19:15:04 +08:00
|
|
|
# diff non-symmetric files
|
|
|
|
|
check_2 tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/x86/entry/syscalls/syscall_64.tbl
|
|
|
|
|
|
2020-05-16 06:17:29 +08:00
|
|
|
# check duplicated library files
|
|
|
|
|
check_2 tools/perf/util/hashmap.h tools/lib/bpf/hashmap.h
|
|
|
|
|
check_2 tools/perf/util/hashmap.c tools/lib/bpf/hashmap.c
|
|
|
|
|
|
2018-08-13 19:15:03 +08:00
|
|
|
cd tools/perf
|