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

Commit 5d500544 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.173 into android11-5.4-lts 



Changes in 5.4.173
	kbuild: Add $(KBUILD_HOSTLDFLAGS) to 'has_libelf' test
	devtmpfs regression fix: reconfigure on each mount
	orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()
	vfs: fs_context: fix up param length parsing in legacy_parse_param
	perf: Protect perf_guest_cbs with RCU
	KVM: s390: Clarify SIGP orders versus STOP/RESTART
	media: uvcvideo: fix division by zero at stream start
	rtlwifi: rtl8192cu: Fix WARNING when calling local_irq_restore() with interrupts enabled
	firmware: qemu_fw_cfg: fix sysfs information leak
	firmware: qemu_fw_cfg: fix NULL-pointer deref on duplicate entries
	firmware: qemu_fw_cfg: fix kobject leak in probe error path
	KVM: x86: remove PMU FIXED_CTR3 from msrs_to_save_all
	ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Master after reboot from Windows
	mtd: fixup CFI on ixp4xx
	ARM: 9025/1: Kconfig: CPU_BIG_ENDIAN depends on !LD_IS_LLD
	Linux 5.4.173

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I1127aba3d2970fc47a45fa127abed48255bd53b7
parents ed177b55 4aa2e739

Makefile

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 172

SUBLEVEL = 173

EXTRAVERSION =

NAME = Kleptomaniac Octopus
@@ -1095,7 +1095,7 @@ HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf) 


ifdef CONFIG_STACK_VALIDATION

  has_libelf := $(call try-run,\

		echo "int main() {}" | $(HOSTCC) -xc -o /dev/null $(HOST_LIBELF_LIBS) -,1,0)

		echo "int main() {}" | $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -xc -o /dev/null $(HOST_LIBELF_LIBS) -,1,0)

  ifeq ($(has_libelf),1)

    objtool_target := tools/objtool FORCE

  else

arch/arm/kernel/perf_callchain.c

+11 −6
Original line number Diff line number Diff line
@@ -62,9 +62,10 @@ user_backtrace(struct frame_tail __user *tail, 
void

perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)

{

	struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();

	struct frame_tail __user *tail;



	if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {

	if (guest_cbs && guest_cbs->is_in_guest()) {

		/* We don't support guest os callchain now */

		return;

	}
@@ -98,9 +99,10 @@ callchain_trace(struct stackframe *fr, 
void

perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)

{

	struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();

	struct stackframe fr;



	if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {

	if (guest_cbs && guest_cbs->is_in_guest()) {

		/* We don't support guest os callchain now */

		return;

	}
@@ -111,18 +113,21 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re 


unsigned long perf_instruction_pointer(struct pt_regs *regs)

{

	if (perf_guest_cbs && perf_guest_cbs->is_in_guest())

		return perf_guest_cbs->get_guest_ip();

	struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();



	if (guest_cbs && guest_cbs->is_in_guest())

		return guest_cbs->get_guest_ip();



	return instruction_pointer(regs);

}



unsigned long perf_misc_flags(struct pt_regs *regs)

{

	struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();

	int misc = 0;



	if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {

		if (perf_guest_cbs->is_user_mode())

	if (guest_cbs && guest_cbs->is_in_guest()) {

		if (guest_cbs->is_user_mode())

			misc |= PERF_RECORD_MISC_GUEST_USER;

		else

			misc |= PERF_RECORD_MISC_GUEST_KERNEL;

arch/arm/mm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -743,6 +743,7 @@ config SWP_EMULATE 
config CPU_BIG_ENDIAN

	bool "Build big-endian kernel"

	depends on ARCH_SUPPORTS_BIG_ENDIAN

	depends on !LD_IS_LLD

	help

	  Say Y if you plan on running a kernel in big-endian mode.

	  Note that your board must be properly built and your board

arch/arm64/kernel/perf_callchain.c

+12 −6
Original line number Diff line number Diff line
@@ -102,7 +102,9 @@ compat_user_backtrace(struct compat_frame_tail __user *tail, 
void perf_callchain_user(struct perf_callchain_entry_ctx *entry,

			 struct pt_regs *regs)

{

	if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {

	struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();



	if (guest_cbs && guest_cbs->is_in_guest()) {

		/* We don't support guest os callchain now */

		return;

	}
@@ -147,9 +149,10 @@ static int callchain_trace(struct stackframe *frame, void *data) 
void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,

			   struct pt_regs *regs)

{

	struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();

	struct stackframe frame;



	if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {

	if (guest_cbs && guest_cbs->is_in_guest()) {

		/* We don't support guest os callchain now */

		return;

	}
@@ -160,18 +163,21 @@ void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, 


unsigned long perf_instruction_pointer(struct pt_regs *regs)

{

	if (perf_guest_cbs && perf_guest_cbs->is_in_guest())

		return perf_guest_cbs->get_guest_ip();

	struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();



	if (guest_cbs && guest_cbs->is_in_guest())

		return guest_cbs->get_guest_ip();



	return instruction_pointer(regs);

}



unsigned long perf_misc_flags(struct pt_regs *regs)

{

	struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();

	int misc = 0;



	if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {

		if (perf_guest_cbs->is_user_mode())

	if (guest_cbs && guest_cbs->is_in_guest()) {

		if (guest_cbs->is_user_mode())

			misc |= PERF_RECORD_MISC_GUEST_USER;

		else

			misc |= PERF_RECORD_MISC_GUEST_KERNEL;

arch/csky/kernel/perf_callchain.c

+4 −2
Original line number Diff line number Diff line
@@ -86,10 +86,11 @@ static unsigned long user_backtrace(struct perf_callchain_entry_ctx *entry, 
void perf_callchain_user(struct perf_callchain_entry_ctx *entry,

			 struct pt_regs *regs)

{

	struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();

	unsigned long fp = 0;



	/* C-SKY does not support virtualization. */

	if (perf_guest_cbs && perf_guest_cbs->is_in_guest())

	if (guest_cbs && guest_cbs->is_in_guest())

		return;



	fp = regs->regs[4];
@@ -110,10 +111,11 @@ void perf_callchain_user(struct perf_callchain_entry_ctx *entry, 
void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,

			   struct pt_regs *regs)

{

	struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();

	struct stackframe fr;



	/* C-SKY does not support virtualization. */

	if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {

	if (guest_cbs && guest_cbs->is_in_guest()) {

		pr_warn("C-SKY does not support perf in guest mode!");

		return;

	}