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

Commit 08bcbfbf authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

ANDROID: GKI: arm64: fault: do_tlb_conf_fault_cb register fault callback 



Allow for vendor components or modules to override
"TLB conflict abort" handler,

Signed-off-by: default avatarMark Salyzyn <salyzyn@google.com>
Test: Verified with scripts/gki/device_snapshot
Test: No impact on /sys/ (except new module files) and /dev/
Test: All devices probed as before
Bug: 141888626
Change-Id: I7d0a4d7440412f2ffc611fe597d5d39d18a2a03a
(cherry picked from commit 75c07a4fbd301fbff1522e66996bad91617cd06f)
Bug: 149990629
parent 723feab6

arch/arm64/include/asm/traps.h

+8 −0
Original line number Diff line number Diff line
@@ -120,4 +120,12 @@ static inline u32 arm64_ras_serror_get_severity(u32 esr) 


bool arm64_is_fatal_ras_serror(struct pt_regs *regs, unsigned int esr);

void __noreturn arm64_serror_panic(struct pt_regs *regs, u32 esr);



extern int (*do_tlb_conf_fault_cb)(unsigned long addr,

				   unsigned int esr,

				   struct pt_regs *regs);

extern int do_tlb_conf_fault(unsigned long addr,

			     unsigned int esr,

			     struct pt_regs *regs);



#endif

arch/arm64/mm/fault.c

+21 −1
Original line number Diff line number Diff line
@@ -613,6 +613,26 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, 
	return 0;

}



int __weak do_tlb_conf_fault(unsigned long addr,

			     unsigned int esr,

			     struct pt_regs *regs)

{

	return 1; /* do_bad default */

}



int (*do_tlb_conf_fault_cb)(unsigned long addr,

			    unsigned int esr,

			    struct pt_regs *regs)

	= do_tlb_conf_fault; /* initialization saves us a branch */

EXPORT_SYMBOL_GPL(do_tlb_conf_fault_cb);



static int _do_tlb_conf_fault(unsigned long addr,

			      unsigned int esr,

			      struct pt_regs *regs)

{

	return (*do_tlb_conf_fault_cb)(addr, esr, regs);

}



static int __kprobes do_translation_fault(unsigned long addr,

					  unsigned int esr,

					  struct pt_regs *regs)
@@ -720,7 +740,7 @@ static const struct fault_info fault_info[] = { 
	{ do_bad,		SIGKILL, SI_KERNEL,	"unknown 45"			},

	{ do_bad,		SIGKILL, SI_KERNEL,	"unknown 46"			},

	{ do_bad,		SIGKILL, SI_KERNEL,	"unknown 47"			},

	{ do_bad,		SIGKILL, SI_KERNEL,	"TLB conflict abort"		},

	{ _do_tlb_conf_fault,	SIGKILL, SI_KERNEL,	"TLB conflict abort"		},

	{ do_bad,		SIGKILL, SI_KERNEL,	"Unsupported atomic hardware update fault"	},

	{ do_bad,		SIGKILL, SI_KERNEL,	"unknown 50"			},

	{ do_bad,		SIGKILL, SI_KERNEL,	"unknown 51"			},