arm64: mm: Add is_el1_data_abort() helper

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>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20210603120239.169018-1-wangkefeng.wang@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 871c82a..5c855b2 100644 (file)
--- 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)