Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b94b87f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.106 into android-4.9 



Changes in 4.9.106
	objtool: Improve detection of BUG() and other dead ends
	objtool: Move checking code to check.c
	tools lib: Add for_each_clear_bit macro
	tools: add more bitmap functions
	tools: enable endian checks for all sparse builds
	tools include: Introduce linux/compiler-gcc.h
	radix tree test suite: Remove types.h
	tools include: Adopt __compiletime_error
	tools include: Introduce atomic_cmpxchg_{relaxed,release}()
	tools include: Add UINT_MAX def to kernel.h
	tools include: Adopt kernel's refcount.h
	perf tools: Force fixdep compilation at the start of the build
	perf tools: Move headers check into bash script
	tools include uapi: Grab copies of stat.h and fcntl.h
	tools include: Introduce linux/bug.h, from the kernel sources
	tools include: Adopt __same_type() and __must_be_array() from the kernel
	tools include: Move ARRAY_SIZE() to linux/kernel.h
	tools include: Drop ARRAY_SIZE() definition from linux/hashtable.h
	tools include: Include missing headers for fls() and types in linux/log2.h
	objtool: sync up with the 4.14.47 version of objtool
	objtool: Support GCC 8's cold subfunctions
	objtool: Support GCC 8 switch tables
	objtool: Detect RIP-relative switch table references
	objtool: Detect RIP-relative switch table references, part 2
	objtool: Fix "noreturn" detection for recursive sibling calls
	objtool, x86: Add several functions and files to the objtool whitelist
	perf/tools: header file sync up
	objtool: header file sync-up
	x86/xen: Add unwind hint annotations to xen_setup_gdt
	objtool: Enclose contents of unreachable() macro in a block
	Linux 4.9.106

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents dbe0f612 2460c23c

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 105

SUBLEVEL = 106

EXTRAVERSION =

NAME = Roaring Lionus

arch/x86/crypto/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
# Arch-specific CryptoAPI modules.

#



OBJECT_FILES_NON_STANDARD := y



avx_supported := $(call as-instr,vpxor %xmm0$(comma)%xmm0$(comma)%xmm0,yes,no)

avx2_supported := $(call as-instr,vpgatherdd %ymm0$(comma)(%eax$(comma)%ymm1\

				$(comma)4)$(comma)%ymm2,yes,no)

arch/x86/crypto/sha1-mb/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
# Arch-specific CryptoAPI modules.

#



OBJECT_FILES_NON_STANDARD := y



avx2_supported := $(call as-instr,vpgatherdd %ymm0$(comma)(%eax$(comma)%ymm1\

                                $(comma)4)$(comma)%ymm2,yes,no)

ifeq ($(avx2_supported),yes)

arch/x86/crypto/sha256-mb/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
# Arch-specific CryptoAPI modules.

#



OBJECT_FILES_NON_STANDARD := y



avx2_supported := $(call as-instr,vpgatherdd %ymm0$(comma)(%eax$(comma)%ymm1\

                                $(comma)4)$(comma)%ymm2,yes,no)

ifeq ($(avx2_supported),yes)

arch/x86/include/asm/orc_types.h

0 → 100644
+107 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 Josh Poimboeuf <jpoimboe@redhat.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version 2

 * of the License, or (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#ifndef _ORC_TYPES_H

#define _ORC_TYPES_H



#include <linux/types.h>

#include <linux/compiler.h>



/*

 * The ORC_REG_* registers are base registers which are used to find other

 * registers on the stack.

 *

 * ORC_REG_PREV_SP, also known as DWARF Call Frame Address (CFA), is the

 * address of the previous frame: the caller's SP before it called the current

 * function.

 *

 * ORC_REG_UNDEFINED means the corresponding register's value didn't change in

 * the current frame.

 *

 * The most commonly used base registers are SP and BP -- which the previous SP

 * is usually based on -- and PREV_SP and UNDEFINED -- which the previous BP is

 * usually based on.

 *

 * The rest of the base registers are needed for special cases like entry code

 * and GCC realigned stacks.

 */

#define ORC_REG_UNDEFINED		0

#define ORC_REG_PREV_SP			1

#define ORC_REG_DX			2

#define ORC_REG_DI			3

#define ORC_REG_BP			4

#define ORC_REG_SP			5

#define ORC_REG_R10			6

#define ORC_REG_R13			7

#define ORC_REG_BP_INDIRECT		8

#define ORC_REG_SP_INDIRECT		9

#define ORC_REG_MAX			15



/*

 * ORC_TYPE_CALL: Indicates that sp_reg+sp_offset resolves to PREV_SP (the

 * caller's SP right before it made the call).  Used for all callable

 * functions, i.e. all C code and all callable asm functions.

 *

 * ORC_TYPE_REGS: Used in entry code to indicate that sp_reg+sp_offset points

 * to a fully populated pt_regs from a syscall, interrupt, or exception.

 *

 * ORC_TYPE_REGS_IRET: Used in entry code to indicate that sp_reg+sp_offset

 * points to the iret return frame.

 *

 * The UNWIND_HINT macros are used only for the unwind_hint struct.  They

 * aren't used in struct orc_entry due to size and complexity constraints.

 * Objtool converts them to real types when it converts the hints to orc

 * entries.

 */

#define ORC_TYPE_CALL			0

#define ORC_TYPE_REGS			1

#define ORC_TYPE_REGS_IRET		2

#define UNWIND_HINT_TYPE_SAVE		3

#define UNWIND_HINT_TYPE_RESTORE	4



#ifndef __ASSEMBLY__

/*

 * This struct is more or less a vastly simplified version of the DWARF Call

 * Frame Information standard.  It contains only the necessary parts of DWARF

 * CFI, simplified for ease of access by the in-kernel unwinder.  It tells the

 * unwinder how to find the previous SP and BP (and sometimes entry regs) on

 * the stack for a given code address.  Each instance of the struct corresponds

 * to one or more code locations.

 */

struct orc_entry {

	s16		sp_offset;

	s16		bp_offset;

	unsigned	sp_reg:4;

	unsigned	bp_reg:4;

	unsigned	type:2;

};



/*

 * This struct is used by asm and inline asm code to manually annotate the

 * location of registers on the stack for the ORC unwinder.

 *

 * Type can be either ORC_TYPE_* or UNWIND_HINT_TYPE_*.

 */

struct unwind_hint {

	u32		ip;

	s16		sp_offset;

	u8		sp_reg;

	u8		type;

};

#endif /* __ASSEMBLY__ */



#endif /* _ORC_TYPES_H */