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 */
|
2008-07-18 12:55:51 +08:00
|
|
|
#ifndef __ASM_SPARC64_ELF_H
|
|
|
|
|
#define __ASM_SPARC64_ELF_H
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* ELF register definitions..
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <asm/ptrace.h>
|
|
|
|
|
#include <asm/processor.h>
|
2016-09-05 23:42:55 +08:00
|
|
|
#include <asm/extable_64.h>
|
2008-07-18 12:55:51 +08:00
|
|
|
#include <asm/spitfire.h>
|
2018-02-22 01:15:48 +08:00
|
|
|
#include <asm/adi.h>
|
2008-07-18 12:55:51 +08:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Sparc section types
|
|
|
|
|
*/
|
|
|
|
|
#define STT_REGISTER 13
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Sparc ELF relocation types
|
|
|
|
|
*/
|
|
|
|
|
#define R_SPARC_NONE 0
|
|
|
|
|
#define R_SPARC_8 1
|
|
|
|
|
#define R_SPARC_16 2
|
|
|
|
|
#define R_SPARC_32 3
|
|
|
|
|
#define R_SPARC_DISP8 4
|
|
|
|
|
#define R_SPARC_DISP16 5
|
|
|
|
|
#define R_SPARC_DISP32 6
|
|
|
|
|
#define R_SPARC_WDISP30 7
|
|
|
|
|
#define R_SPARC_WDISP22 8
|
|
|
|
|
#define R_SPARC_HI22 9
|
|
|
|
|
#define R_SPARC_22 10
|
|
|
|
|
#define R_SPARC_13 11
|
|
|
|
|
#define R_SPARC_LO10 12
|
|
|
|
|
#define R_SPARC_GOT10 13
|
|
|
|
|
#define R_SPARC_GOT13 14
|
|
|
|
|
#define R_SPARC_GOT22 15
|
|
|
|
|
#define R_SPARC_PC10 16
|
|
|
|
|
#define R_SPARC_PC22 17
|
|
|
|
|
#define R_SPARC_WPLT30 18
|
|
|
|
|
#define R_SPARC_COPY 19
|
|
|
|
|
#define R_SPARC_GLOB_DAT 20
|
|
|
|
|
#define R_SPARC_JMP_SLOT 21
|
|
|
|
|
#define R_SPARC_RELATIVE 22
|
|
|
|
|
#define R_SPARC_UA32 23
|
|
|
|
|
#define R_SPARC_PLT32 24
|
|
|
|
|
#define R_SPARC_HIPLT22 25
|
|
|
|
|
#define R_SPARC_LOPLT10 26
|
|
|
|
|
#define R_SPARC_PCPLT32 27
|
|
|
|
|
#define R_SPARC_PCPLT22 28
|
|
|
|
|
#define R_SPARC_PCPLT10 29
|
|
|
|
|
#define R_SPARC_10 30
|
|
|
|
|
#define R_SPARC_11 31
|
|
|
|
|
#define R_SPARC_64 32
|
|
|
|
|
#define R_SPARC_OLO10 33
|
|
|
|
|
#define R_SPARC_WDISP16 40
|
|
|
|
|
#define R_SPARC_WDISP19 41
|
|
|
|
|
#define R_SPARC_7 43
|
|
|
|
|
#define R_SPARC_5 44
|
|
|
|
|
#define R_SPARC_6 45
|
|
|
|
|
|
|
|
|
|
/* Bits present in AT_HWCAP, primarily for Sparc32. */
|
2011-07-29 14:31:26 +08:00
|
|
|
#define HWCAP_SPARC_FLUSH 0x00000001
|
|
|
|
|
#define HWCAP_SPARC_STBAR 0x00000002
|
|
|
|
|
#define HWCAP_SPARC_SWAP 0x00000004
|
|
|
|
|
#define HWCAP_SPARC_MULDIV 0x00000008
|
|
|
|
|
#define HWCAP_SPARC_V9 0x00000010
|
|
|
|
|
#define HWCAP_SPARC_ULTRA3 0x00000020
|
|
|
|
|
#define HWCAP_SPARC_BLKINIT 0x00000040
|
|
|
|
|
#define HWCAP_SPARC_N2 0x00000080
|
|
|
|
|
|
|
|
|
|
/* Solaris compatible AT_HWCAP bits. */
|
|
|
|
|
#define AV_SPARC_MUL32 0x00000100 /* 32x32 multiply is efficient */
|
|
|
|
|
#define AV_SPARC_DIV32 0x00000200 /* 32x32 divide is efficient */
|
|
|
|
|
#define AV_SPARC_FSMULD 0x00000400 /* 'fsmuld' is efficient */
|
|
|
|
|
#define AV_SPARC_V8PLUS 0x00000800 /* v9 insn available to 32bit */
|
|
|
|
|
#define AV_SPARC_POPC 0x00001000 /* 'popc' is efficient */
|
|
|
|
|
#define AV_SPARC_VIS 0x00002000 /* VIS insns available */
|
|
|
|
|
#define AV_SPARC_VIS2 0x00004000 /* VIS2 insns available */
|
|
|
|
|
#define AV_SPARC_ASI_BLK_INIT 0x00008000 /* block init ASIs available */
|
|
|
|
|
#define AV_SPARC_FMAF 0x00010000 /* fused multiply-add */
|
|
|
|
|
#define AV_SPARC_VIS3 0x00020000 /* VIS3 insns available */
|
|
|
|
|
#define AV_SPARC_HPC 0x00040000 /* HPC insns available */
|
|
|
|
|
#define AV_SPARC_RANDOM 0x00080000 /* 'random' insn available */
|
|
|
|
|
#define AV_SPARC_TRANS 0x00100000 /* transaction insns available */
|
|
|
|
|
#define AV_SPARC_FJFMAU 0x00200000 /* unfused multiply-add */
|
|
|
|
|
#define AV_SPARC_IMA 0x00400000 /* integer multiply-add */
|
|
|
|
|
#define AV_SPARC_ASI_CACHE_SPARING \
|
|
|
|
|
0x00800000 /* cache sparing ASIs available */
|
2012-08-17 07:41:04 +08:00
|
|
|
#define AV_SPARC_PAUSE 0x01000000 /* PAUSE available */
|
|
|
|
|
#define AV_SPARC_CBCOND 0x02000000 /* CBCOND insns available */
|
|
|
|
|
|
|
|
|
|
/* Solaris decided to enumerate every single crypto instruction type
|
|
|
|
|
* in the AT_HWCAP bits. This is wasteful, since if crypto is present,
|
|
|
|
|
* you still need to look in the CFR register to see if the opcode is
|
|
|
|
|
* really available. So we simply advertise only "crypto" support.
|
|
|
|
|
*/
|
|
|
|
|
#define HWCAP_SPARC_CRYPTO 0x04000000 /* CRYPTO insns available */
|
2015-12-18 01:33:50 +08:00
|
|
|
#define HWCAP_SPARC_ADI 0x08000000 /* ADI available */
|
2008-07-18 12:55:51 +08:00
|
|
|
|
|
|
|
|
#define CORE_DUMP_USE_REGSET
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* These are used to set parameters in the core dumps.
|
|
|
|
|
*/
|
|
|
|
|
#define ELF_ARCH EM_SPARCV9
|
|
|
|
|
#define ELF_CLASS ELFCLASS64
|
|
|
|
|
#define ELF_DATA ELFDATA2MSB
|
|
|
|
|
|
|
|
|
|
/* Format of 64-bit elf_gregset_t is:
|
|
|
|
|
* G0 --> G7
|
|
|
|
|
* O0 --> O7
|
|
|
|
|
* L0 --> L7
|
|
|
|
|
* I0 --> I7
|
|
|
|
|
* TSTATE
|
|
|
|
|
* TPC
|
|
|
|
|
* TNPC
|
|
|
|
|
* Y
|
|
|
|
|
*/
|
|
|
|
|
typedef unsigned long elf_greg_t;
|
|
|
|
|
#define ELF_NGREG 36
|
|
|
|
|
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
unsigned long pr_regs[32];
|
|
|
|
|
unsigned long pr_fsr;
|
|
|
|
|
unsigned long pr_gsr;
|
|
|
|
|
unsigned long pr_fprs;
|
|
|
|
|
} elf_fpregset_t;
|
|
|
|
|
|
|
|
|
|
/* Format of 32-bit elf_gregset_t is:
|
|
|
|
|
* G0 --> G7
|
|
|
|
|
* O0 --> O7
|
|
|
|
|
* L0 --> L7
|
|
|
|
|
* I0 --> I7
|
|
|
|
|
* PSR, PC, nPC, Y, WIM, TBR
|
|
|
|
|
*/
|
|
|
|
|
typedef unsigned int compat_elf_greg_t;
|
|
|
|
|
#define COMPAT_ELF_NGREG 38
|
|
|
|
|
typedef compat_elf_greg_t compat_elf_gregset_t[COMPAT_ELF_NGREG];
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
union {
|
|
|
|
|
unsigned int pr_regs[32];
|
|
|
|
|
unsigned long pr_dregs[16];
|
|
|
|
|
} pr_fr;
|
|
|
|
|
unsigned int __unused;
|
|
|
|
|
unsigned int pr_fsr;
|
|
|
|
|
unsigned char pr_qcnt;
|
|
|
|
|
unsigned char pr_q_entrysize;
|
|
|
|
|
unsigned char pr_en;
|
|
|
|
|
unsigned int pr_q[64];
|
|
|
|
|
} compat_elf_fpregset_t;
|
|
|
|
|
|
|
|
|
|
/* UltraSparc extensions. Still unused, but will be eventually. */
|
|
|
|
|
typedef struct {
|
|
|
|
|
unsigned int pr_type;
|
|
|
|
|
unsigned int pr_align;
|
|
|
|
|
union {
|
|
|
|
|
struct {
|
|
|
|
|
union {
|
|
|
|
|
unsigned int pr_regs[32];
|
|
|
|
|
unsigned long pr_dregs[16];
|
|
|
|
|
long double pr_qregs[8];
|
|
|
|
|
} pr_xfr;
|
|
|
|
|
} pr_v8p;
|
|
|
|
|
unsigned int pr_xfsr;
|
|
|
|
|
unsigned int pr_fprs;
|
|
|
|
|
unsigned int pr_xg[8];
|
|
|
|
|
unsigned int pr_xo[8];
|
|
|
|
|
unsigned long pr_tstate;
|
|
|
|
|
unsigned int pr_filler[8];
|
|
|
|
|
} pr_un;
|
|
|
|
|
} elf_xregset_t;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This is used to ensure we don't load something for the wrong architecture.
|
|
|
|
|
*/
|
|
|
|
|
#define elf_check_arch(x) ((x)->e_machine == ELF_ARCH)
|
|
|
|
|
#define compat_elf_check_arch(x) ((x)->e_machine == EM_SPARC || \
|
|
|
|
|
(x)->e_machine == EM_SPARC32PLUS)
|
|
|
|
|
#define compat_start_thread start_thread32
|
|
|
|
|
|
|
|
|
|
#define ELF_EXEC_PAGESIZE PAGE_SIZE
|
|
|
|
|
|
|
|
|
|
/* This is the location that an ET_DYN program is loaded if exec'ed. Typical
|
|
|
|
|
use of this is to invoke "./ld.so someprog" to test out a new version of
|
|
|
|
|
the loader. We need to make sure that it is out of the way of the program
|
|
|
|
|
that it will "exec", and that there is sufficient room for the brk. */
|
|
|
|
|
|
|
|
|
|
#define ELF_ET_DYN_BASE 0x0000010000000000UL
|
|
|
|
|
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
|
|
|
|
|
|
2011-07-29 14:31:26 +08:00
|
|
|
extern unsigned long sparc64_elf_hwcap;
|
|
|
|
|
#define ELF_HWCAP sparc64_elf_hwcap
|
2008-07-18 12:55:51 +08:00
|
|
|
|
|
|
|
|
/* This yields a string that ld.so will use to load implementation
|
|
|
|
|
specific libraries for optimization. This is more specific in
|
|
|
|
|
intent than poking at uname or /proc/cpuinfo. */
|
|
|
|
|
|
|
|
|
|
#define ELF_PLATFORM (NULL)
|
|
|
|
|
|
2008-10-16 21:39:57 +08:00
|
|
|
#define SET_PERSONALITY(ex) \
|
2010-01-29 13:42:02 +08:00
|
|
|
do { if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \
|
|
|
|
|
set_thread_flag(TIF_32BIT); \
|
2008-07-18 12:55:51 +08:00
|
|
|
else \
|
2010-01-29 13:42:02 +08:00
|
|
|
clear_thread_flag(TIF_32BIT); \
|
2008-07-18 12:55:51 +08:00
|
|
|
/* flush_thread will update pgd cache */ \
|
2009-05-08 06:36:13 +08:00
|
|
|
if (personality(current->personality) != PER_LINUX32) \
|
|
|
|
|
set_personality(PER_LINUX | \
|
|
|
|
|
(current->personality & (~PER_MASK))); \
|
2008-07-18 12:55:51 +08:00
|
|
|
} while (0)
|
|
|
|
|
|
vDSO for sparc
Following patch is based on work done by Nick Alcock on 64-bit vDSO for sparc
in Oracle linux. I have extended it to include support for 32-bit vDSO for sparc
on 64-bit kernel.
vDSO for sparc is based on the X86 implementation. This patch
provides vDSO support for both 64-bit and 32-bit programs on 64-bit kernel.
vDSO will be disabled on 32-bit linux kernel on sparc.
*) vclock_gettime.c contains all the vdso functions. Since data page is mapped
before the vdso code page, the pointer to data page is got by subracting offset
from an address in the vdso code page. The return address stored in
%i7 is used for this purpose.
*) During compilation, both 32-bit and 64-bit vdso images are compiled and are
converted into raw bytes by vdso2c program to be ready for mapping into the
process. 32-bit images are compiled only if CONFIG_COMPAT is enabled. vdso2c
generates two files vdso-image-64.c and vdso-image-32.c which contains the
respective vDSO image in C structure.
*) During vdso initialization, required number of vdso pages are allocated and
raw bytes are copied into the pages.
*) During every exec, these pages are mapped into the process through
arch_setup_additional_pages and the location of mapping is passed on to the
process through aux vector AT_SYSINFO_EHDR which is used by glibc.
*) A new update_vsyscall routine for sparc is added to keep the data page in
vdso updated.
*) As vDSO cannot contain dynamically relocatable references, a new version of
cpu_relax is added for the use of vDSO.
This change also requires a putback to glibc to use vDSO. For testing,
programs planning to try vDSO can be compiled against the generated
vdso(64/32).so in the source.
Testing:
========
[root@localhost ~]# cat vdso_test.c
int main() {
struct timespec tv_start, tv_end;
struct timeval tv_tmp;
int i;
int count = 1 * 1000 * 10000;
long long diff;
clock_gettime(0, &tv_start);
for (i = 0; i < count; i++)
gettimeofday(&tv_tmp, NULL);
clock_gettime(0, &tv_end);
diff = (long long)(tv_end.tv_sec -
tv_start.tv_sec)*(1*1000*1000*1000);
diff += (tv_end.tv_nsec - tv_start.tv_nsec);
printf("Start sec: %d\n", tv_start.tv_sec);
printf("End sec : %d\n", tv_end.tv_sec);
printf("%d cycles in %lld ns = %f ns/cycle\n", count, diff,
(double)diff / (double)count);
return 0;
}
[root@localhost ~]# cc vdso_test.c -o t32_without_fix -m32 -lrt
[root@localhost ~]# ./t32_without_fix
Start sec: 1502396130
End sec : 1502396140
10000000 cycles in 9565148528 ns = 956.514853 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t32_with_fix -m32 ./vdso32.so.dbg
[root@localhost ~]# ./t32_with_fix
Start sec: 1502396168
End sec : 1502396169
10000000 cycles in 798141262 ns = 79.814126 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_without_fix -m64 -lrt
[root@localhost ~]# ./t64_without_fix
Start sec: 1502396208
End sec : 1502396218
10000000 cycles in 9846091800 ns = 984.609180 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_with_fix -m64 ./vdso64.so.dbg
[root@localhost ~]# ./t64_with_fix
Start sec: 1502396257
End sec : 1502396257
10000000 cycles in 380984048 ns = 38.098405 ns/cycle
V1 to V2 Changes:
=================
Added hot patching code to switch the read stick instruction to read
tick instruction based on the hardware.
V2 to V3 Changes:
=================
Merged latest changes from sparc-next and moved the initialization
of clocksource_tick.archdata.vclock_mode to time_init_early. Disabled
queued spinlock and rwlock configuration when simulating 32-bit config
to compile 32-bit VDSO.
V3 to V4 Changes:
=================
Hardcoded the page size as 8192 in linker script for both 64-bit and
32-bit binaries. Removed unused variables in vdso2c.h. Added -mv8plus flag to
Makefile to prevent the generation of relocation entries for __lshrdi3 in 32-bit
vdso binary.
Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Signed-off-by: Nagarathnam Muthusamy <nagarathnam.muthusamy@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-09-21 23:05:31 +08:00
|
|
|
extern unsigned int vdso_enabled;
|
|
|
|
|
|
|
|
|
|
#define ARCH_DLINFO \
|
|
|
|
|
do { \
|
2018-02-22 01:15:48 +08:00
|
|
|
extern struct adi_config adi_state; \
|
vDSO for sparc
Following patch is based on work done by Nick Alcock on 64-bit vDSO for sparc
in Oracle linux. I have extended it to include support for 32-bit vDSO for sparc
on 64-bit kernel.
vDSO for sparc is based on the X86 implementation. This patch
provides vDSO support for both 64-bit and 32-bit programs on 64-bit kernel.
vDSO will be disabled on 32-bit linux kernel on sparc.
*) vclock_gettime.c contains all the vdso functions. Since data page is mapped
before the vdso code page, the pointer to data page is got by subracting offset
from an address in the vdso code page. The return address stored in
%i7 is used for this purpose.
*) During compilation, both 32-bit and 64-bit vdso images are compiled and are
converted into raw bytes by vdso2c program to be ready for mapping into the
process. 32-bit images are compiled only if CONFIG_COMPAT is enabled. vdso2c
generates two files vdso-image-64.c and vdso-image-32.c which contains the
respective vDSO image in C structure.
*) During vdso initialization, required number of vdso pages are allocated and
raw bytes are copied into the pages.
*) During every exec, these pages are mapped into the process through
arch_setup_additional_pages and the location of mapping is passed on to the
process through aux vector AT_SYSINFO_EHDR which is used by glibc.
*) A new update_vsyscall routine for sparc is added to keep the data page in
vdso updated.
*) As vDSO cannot contain dynamically relocatable references, a new version of
cpu_relax is added for the use of vDSO.
This change also requires a putback to glibc to use vDSO. For testing,
programs planning to try vDSO can be compiled against the generated
vdso(64/32).so in the source.
Testing:
========
[root@localhost ~]# cat vdso_test.c
int main() {
struct timespec tv_start, tv_end;
struct timeval tv_tmp;
int i;
int count = 1 * 1000 * 10000;
long long diff;
clock_gettime(0, &tv_start);
for (i = 0; i < count; i++)
gettimeofday(&tv_tmp, NULL);
clock_gettime(0, &tv_end);
diff = (long long)(tv_end.tv_sec -
tv_start.tv_sec)*(1*1000*1000*1000);
diff += (tv_end.tv_nsec - tv_start.tv_nsec);
printf("Start sec: %d\n", tv_start.tv_sec);
printf("End sec : %d\n", tv_end.tv_sec);
printf("%d cycles in %lld ns = %f ns/cycle\n", count, diff,
(double)diff / (double)count);
return 0;
}
[root@localhost ~]# cc vdso_test.c -o t32_without_fix -m32 -lrt
[root@localhost ~]# ./t32_without_fix
Start sec: 1502396130
End sec : 1502396140
10000000 cycles in 9565148528 ns = 956.514853 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t32_with_fix -m32 ./vdso32.so.dbg
[root@localhost ~]# ./t32_with_fix
Start sec: 1502396168
End sec : 1502396169
10000000 cycles in 798141262 ns = 79.814126 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_without_fix -m64 -lrt
[root@localhost ~]# ./t64_without_fix
Start sec: 1502396208
End sec : 1502396218
10000000 cycles in 9846091800 ns = 984.609180 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_with_fix -m64 ./vdso64.so.dbg
[root@localhost ~]# ./t64_with_fix
Start sec: 1502396257
End sec : 1502396257
10000000 cycles in 380984048 ns = 38.098405 ns/cycle
V1 to V2 Changes:
=================
Added hot patching code to switch the read stick instruction to read
tick instruction based on the hardware.
V2 to V3 Changes:
=================
Merged latest changes from sparc-next and moved the initialization
of clocksource_tick.archdata.vclock_mode to time_init_early. Disabled
queued spinlock and rwlock configuration when simulating 32-bit config
to compile 32-bit VDSO.
V3 to V4 Changes:
=================
Hardcoded the page size as 8192 in linker script for both 64-bit and
32-bit binaries. Removed unused variables in vdso2c.h. Added -mv8plus flag to
Makefile to prevent the generation of relocation entries for __lshrdi3 in 32-bit
vdso binary.
Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Signed-off-by: Nagarathnam Muthusamy <nagarathnam.muthusamy@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-09-21 23:05:31 +08:00
|
|
|
if (vdso_enabled) \
|
|
|
|
|
NEW_AUX_ENT(AT_SYSINFO_EHDR, \
|
|
|
|
|
(unsigned long)current->mm->context.vdso); \
|
2018-02-22 01:15:48 +08:00
|
|
|
NEW_AUX_ENT(AT_ADI_BLKSZ, adi_state.caps.blksz); \
|
|
|
|
|
NEW_AUX_ENT(AT_ADI_NBITS, adi_state.caps.nbits); \
|
|
|
|
|
NEW_AUX_ENT(AT_ADI_UEONADI, adi_state.caps.ue_on_adi); \
|
vDSO for sparc
Following patch is based on work done by Nick Alcock on 64-bit vDSO for sparc
in Oracle linux. I have extended it to include support for 32-bit vDSO for sparc
on 64-bit kernel.
vDSO for sparc is based on the X86 implementation. This patch
provides vDSO support for both 64-bit and 32-bit programs on 64-bit kernel.
vDSO will be disabled on 32-bit linux kernel on sparc.
*) vclock_gettime.c contains all the vdso functions. Since data page is mapped
before the vdso code page, the pointer to data page is got by subracting offset
from an address in the vdso code page. The return address stored in
%i7 is used for this purpose.
*) During compilation, both 32-bit and 64-bit vdso images are compiled and are
converted into raw bytes by vdso2c program to be ready for mapping into the
process. 32-bit images are compiled only if CONFIG_COMPAT is enabled. vdso2c
generates two files vdso-image-64.c and vdso-image-32.c which contains the
respective vDSO image in C structure.
*) During vdso initialization, required number of vdso pages are allocated and
raw bytes are copied into the pages.
*) During every exec, these pages are mapped into the process through
arch_setup_additional_pages and the location of mapping is passed on to the
process through aux vector AT_SYSINFO_EHDR which is used by glibc.
*) A new update_vsyscall routine for sparc is added to keep the data page in
vdso updated.
*) As vDSO cannot contain dynamically relocatable references, a new version of
cpu_relax is added for the use of vDSO.
This change also requires a putback to glibc to use vDSO. For testing,
programs planning to try vDSO can be compiled against the generated
vdso(64/32).so in the source.
Testing:
========
[root@localhost ~]# cat vdso_test.c
int main() {
struct timespec tv_start, tv_end;
struct timeval tv_tmp;
int i;
int count = 1 * 1000 * 10000;
long long diff;
clock_gettime(0, &tv_start);
for (i = 0; i < count; i++)
gettimeofday(&tv_tmp, NULL);
clock_gettime(0, &tv_end);
diff = (long long)(tv_end.tv_sec -
tv_start.tv_sec)*(1*1000*1000*1000);
diff += (tv_end.tv_nsec - tv_start.tv_nsec);
printf("Start sec: %d\n", tv_start.tv_sec);
printf("End sec : %d\n", tv_end.tv_sec);
printf("%d cycles in %lld ns = %f ns/cycle\n", count, diff,
(double)diff / (double)count);
return 0;
}
[root@localhost ~]# cc vdso_test.c -o t32_without_fix -m32 -lrt
[root@localhost ~]# ./t32_without_fix
Start sec: 1502396130
End sec : 1502396140
10000000 cycles in 9565148528 ns = 956.514853 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t32_with_fix -m32 ./vdso32.so.dbg
[root@localhost ~]# ./t32_with_fix
Start sec: 1502396168
End sec : 1502396169
10000000 cycles in 798141262 ns = 79.814126 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_without_fix -m64 -lrt
[root@localhost ~]# ./t64_without_fix
Start sec: 1502396208
End sec : 1502396218
10000000 cycles in 9846091800 ns = 984.609180 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_with_fix -m64 ./vdso64.so.dbg
[root@localhost ~]# ./t64_with_fix
Start sec: 1502396257
End sec : 1502396257
10000000 cycles in 380984048 ns = 38.098405 ns/cycle
V1 to V2 Changes:
=================
Added hot patching code to switch the read stick instruction to read
tick instruction based on the hardware.
V2 to V3 Changes:
=================
Merged latest changes from sparc-next and moved the initialization
of clocksource_tick.archdata.vclock_mode to time_init_early. Disabled
queued spinlock and rwlock configuration when simulating 32-bit config
to compile 32-bit VDSO.
V3 to V4 Changes:
=================
Hardcoded the page size as 8192 in linker script for both 64-bit and
32-bit binaries. Removed unused variables in vdso2c.h. Added -mv8plus flag to
Makefile to prevent the generation of relocation entries for __lshrdi3 in 32-bit
vdso binary.
Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Signed-off-by: Nagarathnam Muthusamy <nagarathnam.muthusamy@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-09-21 23:05:31 +08:00
|
|
|
} while (0)
|
|
|
|
|
|
|
|
|
|
struct linux_binprm;
|
|
|
|
|
|
|
|
|
|
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
|
|
|
|
|
extern int arch_setup_additional_pages(struct linux_binprm *bprm,
|
|
|
|
|
int uses_interp);
|
2008-07-18 12:55:51 +08:00
|
|
|
#endif /* !(__ASM_SPARC64_ELF_H) */
|