diff mbox series

arm64: mm: Add is_el1_data_abort() helper

Message ID 20210603120239.169018-1-wangkefeng.wang@huawei.com (mailing list archive)
State New, archived
Headers show
Series arm64: mm: Add is_el1_data_abort() helper | expand

Commit Message

Kefeng Wang June 3, 2021, 12:02 p.m. UTC 
We alread have is_el1_instruction_abort(), add is_el1_data_abort()
helper and use it.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 arch/arm64/mm/fault.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Comments

Catalin Marinas June 3, 2021, 12:30 p.m. UTC | #1 
On Thu, Jun 03, 2021 at 08:02:39PM +0800, Kefeng Wang wrote:
> We alread have is_el1_instruction_abort(), add is_el1_data_abort()
> helper and use it.
> 
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>

It's better for consistency, so:

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Will Deacon June 3, 2021, 6:14 p.m. UTC | #2 
On Thu, 3 Jun 2021 20:02:39 +0800, Kefeng Wang wrote:
> We alread have is_el1_instruction_abort(), add is_el1_data_abort()
> helper and use it.

Applied to arm64 (for-next/mm), thanks!

[1/1] arm64: mm: Add is_el1_data_abort() helper
      https://git.kernel.org/arm64/c/fcf9dc02f839

Cheers,
diff mbox series

Patch

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 871c82ab0a30..5c855b2ab93b 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -232,13 +232,17 @@  static bool is_el1_instruction_abort(unsigned int esr)
 	return ESR_ELx_EC(esr) == ESR_ELx_EC_IABT_CUR;
 }
 
+static bool is_el1_data_abort(unsigned int esr)
+{
+	return ESR_ELx_EC(esr) == ESR_ELx_EC_DABT_CUR;
+}
+
 static inline bool is_el1_permission_fault(unsigned long addr, unsigned int esr,
 					   struct pt_regs *regs)
 {
-	unsigned int ec       = ESR_ELx_EC(esr);
 	unsigned int fsc_type = esr & ESR_ELx_FSC_TYPE;
 
-	if (ec != ESR_ELx_EC_DABT_CUR && ec != ESR_ELx_EC_IABT_CUR)
+	if (!is_el1_data_abort(esr) && !is_el1_instruction_abort(esr))
 		return false;
 
 	if (fsc_type == ESR_ELx_FSC_PERM)
@@ -258,7 +262,7 @@  static bool __kprobes is_spurious_el1_translation_fault(unsigned long addr,
 	unsigned long flags;
 	u64 par, dfsc;
 
-	if (ESR_ELx_EC(esr) != ESR_ELx_EC_DABT_CUR ||
+	if (!is_el1_data_abort(esr) ||
 	    (esr & ESR_ELx_FSC_TYPE) != ESR_ELx_FSC_FAULT)
 		return false;
 
@@ -346,10 +350,9 @@  static void do_tag_recovery(unsigned long addr, unsigned int esr,
 
 static bool is_el1_mte_sync_tag_check_fault(unsigned int esr)
 {
-	unsigned int ec = ESR_ELx_EC(esr);
 	unsigned int fsc = esr & ESR_ELx_FSC;
 
-	if (ec != ESR_ELx_EC_DABT_CUR)
+	if (!is_el1_data_abort(esr))
 		return false;
 
 	if (fsc == ESR_ELx_FSC_MTE)