Commit 57361114 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Catalin Marinas
Browse files

arm64/mm: Stop using ESR_ELx_FSC_TYPE during fault 



Fault status codes at page table level 0, 1, 2 and 3 for access, permission
and translation faults are architecturally organized in a way, that masking
out ESR_ELx_FSC_TYPE, fetches Level 0 status code for the respective fault.

Helpers like esr_fsc_is_[translation|permission|access_flag]_fault() mask
out ESR_ELx_FSC_TYPE before comparing against corresponding Level 0 status
code as the kernel does not yet care about the page table level, where in
the fault really occurred previously.

This scheme is starting to crumble after FEAT_LPA2 when level -1 got added.
Fault status code for translation fault at level -1 is 0x2B which does not
follow ESR_ELx_FSC_TYPE, requiring esr_fsc_is_translation_fault() changes.

This changes above helpers to compare against individual fault status code
values for each page table level and stop using ESR_ELx_FSC_TYPE, which is
losing its value as a common mask.

Cc: Will Deacon <will@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Reviewed-by: default avatarRyan Roberts <ryan.roberts@arm.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20240618034703.3622510-1-anshuman.khandual@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent cf63fe35

arch/arm64/include/asm/esr.h

+27 −6
Original line number Diff line number Diff line
@@ -121,6 +121,14 @@ 
#define ESR_ELx_FSC_SECC	(0x18)

#define ESR_ELx_FSC_SECC_TTW(n)	(0x1c + (n))



/* Status codes for individual page table levels */

#define ESR_ELx_FSC_ACCESS_L(n)	(ESR_ELx_FSC_ACCESS + n)

#define ESR_ELx_FSC_PERM_L(n)	(ESR_ELx_FSC_PERM + n)



#define ESR_ELx_FSC_FAULT_nL	(0x2C)

#define ESR_ELx_FSC_FAULT_L(n)	(((n) < 0 ? ESR_ELx_FSC_FAULT_nL : \

					    ESR_ELx_FSC_FAULT) + (n))



/* ISS field definitions for Data Aborts */

#define ESR_ELx_ISV_SHIFT	(24)

#define ESR_ELx_ISV		(UL(1) << ESR_ELx_ISV_SHIFT)
@@ -388,20 +396,33 @@ static inline bool esr_is_data_abort(unsigned long esr) 


static inline bool esr_fsc_is_translation_fault(unsigned long esr)

{

	/* Translation fault, level -1 */

	if ((esr & ESR_ELx_FSC) == 0b101011)

		return true;

	return (esr & ESR_ELx_FSC_TYPE) == ESR_ELx_FSC_FAULT;

	esr = esr & ESR_ELx_FSC;



	return (esr == ESR_ELx_FSC_FAULT_L(3)) ||

	       (esr == ESR_ELx_FSC_FAULT_L(2)) ||

	       (esr == ESR_ELx_FSC_FAULT_L(1)) ||

	       (esr == ESR_ELx_FSC_FAULT_L(0)) ||

	       (esr == ESR_ELx_FSC_FAULT_L(-1));

}



static inline bool esr_fsc_is_permission_fault(unsigned long esr)

{

	return (esr & ESR_ELx_FSC_TYPE) == ESR_ELx_FSC_PERM;

	esr = esr & ESR_ELx_FSC;



	return (esr == ESR_ELx_FSC_PERM_L(3)) ||

	       (esr == ESR_ELx_FSC_PERM_L(2)) ||

	       (esr == ESR_ELx_FSC_PERM_L(1)) ||

	       (esr == ESR_ELx_FSC_PERM_L(0));

}



static inline bool esr_fsc_is_access_flag_fault(unsigned long esr)

{

	return (esr & ESR_ELx_FSC_TYPE) == ESR_ELx_FSC_ACCESS;

	esr = esr & ESR_ELx_FSC;



	return (esr == ESR_ELx_FSC_ACCESS_L(3)) ||

	       (esr == ESR_ELx_FSC_ACCESS_L(2)) ||

	       (esr == ESR_ELx_FSC_ACCESS_L(1)) ||

	       (esr == ESR_ELx_FSC_ACCESS_L(0));

}



/* Indicate whether ESR.EC==0x1A is for an ERETAx instruction */