Commit e2f73a18 authored Apr 16, 2018 by Ingo Molnar Committed by Arnaldo Carvalho de Melo Apr 17, 2018

tools/headers: Synchronize kernel ABI headers, v4.17-rc1



Sync the following tooling headers with the latest kernel version:

  tools/arch/arm/include/uapi/asm/kvm.h
    - New ABI: KVM_REG_ARM_*

  tools/arch/x86/include/asm/required-features.h
    - Removal of NEED_LA57 dependency

  tools/arch/x86/include/uapi/asm/kvm.h
    - New KVM ABI: KVM_SYNC_X86_*

  tools/include/uapi/asm-generic/mman-common.h
    - New ABI: MAP_FIXED_NOREPLACE flag

  tools/include/uapi/linux/bpf.h
    - New ABI: BPF_F_SEQ_NUMBER functions

  tools/include/uapi/linux/if_link.h
    - New ABI: IFLA tun and rmnet support

  tools/include/uapi/linux/kvm.h
    - New ABI: hyperv eventfd and CONN_ID_MASK support plus header cleanups

  tools/include/uapi/sound/asound.h
    - New ABI: SNDRV_PCM_FORMAT_FIRST PCM format specifier

  tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
    - The x86 system call table description changed due to the ptregs changes and the renames, in:

	d5a00528: syscalls/core, syscalls/x86: Rename struct pt_regs-based sys_*() to __x64_sys_*()
	5ac9efa3: syscalls/core, syscalls/x86: Clean up compat syscall stub naming convention
	ebeb8c82: syscalls/x86: Use 'struct pt_regs' based syscall calling for IA32_EMULATION and x32

Also fix the x86 syscall table warning:

  -Warning: Kernel ABI header at 'tools/arch/x86/entry/syscalls/syscall_64.tbl' differs from latest version at 'arch/x86/entry/syscalls/syscall_64.tbl'
  +Warning: Kernel ABI header at 'tools/perf/arch/x86/entry/syscalls/syscall_64.tbl' differs from latest version at 'arch/x86/entry/syscalls/syscall_64.tbl'

None of these changes impact existing tooling code, so we only have to copy the kernel version.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Brian Robbins <brianrob@microsoft.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: David Ahern <dsahern@gmail.com>
Cc: Dmitriy Vyukov <dvyukov@google.com> <dvyukov@google.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Kim Phillips <kim.phillips@arm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Li Zhijian <lizhijian@cn.fujitsu.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Martin Liška <mliska@suse.cz>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Matthias Kaehlcke <mka@chromium.org>
Cc: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Cc: Sandipan Das <sandipan@linux.vnet.ibm.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Takuya Yamamoto <tkydevel@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: William Cohen <wcohen@redhat.com>
Cc: Yonghong Song <yhs@fb.com>
Link: http://lkml.kernel.org/r/20180416064024.ofjtrz5yuu3ykhvl@gmail.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 5c8dad48

tools/arch/arm/include/uapi/asm/kvm.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -135,6 +135,15 @@ struct kvm_arch_memory_slot {
		#define KVM_REG_ARM_CRM_SHIFT 7
		#define KVM_REG_ARM_32_CRN_MASK 0x0000000000007800
		#define KVM_REG_ARM_32_CRN_SHIFT 11
		/*
		* For KVM currently all guest registers are nonsecure, but we reserve a bit
		* in the encoding to distinguish secure from nonsecure for AArch32 system
		* registers that are banked by security. This is 1 for the secure banked
		* register, and 0 for the nonsecure banked register or if the register is
		* not banked by security.
		*/
		#define KVM_REG_ARM_SECURE_MASK 0x0000000010000000
		#define KVM_REG_ARM_SECURE_SHIFT 28

		#define ARM_CP15_REG_SHIFT_MASK(x,n) \
		(((x) << KVM_REG_ARM_ ## n ## _SHIFT) & KVM_REG_ARM_ ## n ## _MASK)

tools/arch/x86/include/asm/required-features.h

+1 −7

Original line number	Diff line number	Diff line
		@@ -53,12 +53,6 @@
		# define NEED_MOVBE 0
		#endif

		#ifdef CONFIG_X86_5LEVEL
		# define NEED_LA57 (1<<(X86_FEATURE_LA57 & 31))
		#else
		# define NEED_LA57 0
		#endif

		#ifdef CONFIG_X86_64
		#ifdef CONFIG_PARAVIRT
		/* Paravirtualized systems may not have PSE or PGE available */
		@@ -104,7 +98,7 @@
		#define REQUIRED_MASK13 0
		#define REQUIRED_MASK14 0
		#define REQUIRED_MASK15 0
		#define REQUIRED_MASK16 (NEED_LA57)
		#define REQUIRED_MASK16 0
		#define REQUIRED_MASK17 0
		#define REQUIRED_MASK18 0
		#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 19)

tools/arch/x86/include/uapi/asm/kvm.h

+18 −1

Original line number	Diff line number	Diff line
		@@ -354,8 +354,25 @@ struct kvm_xcrs {
		__u64 padding[16];
		};

		/* definition of registers in kvm_run */
		#define KVM_SYNC_X86_REGS (1UL << 0)
		#define KVM_SYNC_X86_SREGS (1UL << 1)
		#define KVM_SYNC_X86_EVENTS (1UL << 2)

		#define KVM_SYNC_X86_VALID_FIELDS \
		(KVM_SYNC_X86_REGS\| \
		KVM_SYNC_X86_SREGS\| \
		KVM_SYNC_X86_EVENTS)

		/* kvm_sync_regs struct included by kvm_run struct */
		struct kvm_sync_regs {
		/* Members of this structure are potentially malicious.
		* Care must be taken by code reading, esp. interpreting,
		* data fields from them inside KVM to prevent TOCTOU and
		* double-fetch types of vulnerabilities.
		*/
		struct kvm_regs regs;
		struct kvm_sregs sregs;
		struct kvm_vcpu_events events;
		};

		#define KVM_X86_QUIRK_LINT0_REENABLED (1 << 0)

tools/include/uapi/asm-generic/mman-common.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,9 @@
		# define MAP_UNINITIALIZED 0x0 /* Don't support this flag */
		#endif

		/* 0x0100 - 0x80000 flags are defined in asm-generic/mman.h */
		#define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */

		/*
		* Flags for mlock
		*/

tools/include/uapi/linux/bpf.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -864,6 +864,7 @@ enum bpf_func_id {
		/* BPF_FUNC_skb_set_tunnel_key flags. */
		#define BPF_F_ZERO_CSUM_TX (1ULL << 1)
		#define BPF_F_DONT_FRAGMENT (1ULL << 2)
		#define BPF_F_SEQ_NUMBER (1ULL << 3)

		/* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and
		* BPF_FUNC_perf_event_read_value flags.