Commit 0c5f4162 authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

arm64: armv8_deprecated: move aarch32 helper earlier 



Subsequent patches will rework the logic in armv8_deprecated.c.

In preparation for subsequent changes, this patch moves some shared logic
earlier in the file. This will make subsequent diffs simpler and easier to
read.

At the same time, drop the `__kprobes` annotation from
aarch32_check_condition(), as this is only used for traps from compat
userspace, and has no risk of recursion within kprobes. As this is the
last kprobes annotation in armve8_deprecated.c, we no longer need to
include <asm/kprobes.h>.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Joey Gouly <joey.gouly@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20221019144123.612388-9-mark.rutland@arm.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 25eeac0c

arch/arm64/kernel/armv8_deprecated.c

+19 −20
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <asm/sysreg.h>

#include <asm/system_misc.h>

#include <asm/traps.h>

#include <asm/kprobes.h>



#define CREATE_TRACE_POINTS

#include "trace-events-emulation.h"
@@ -52,6 +51,25 @@ struct insn_emulation { 
	int max;

};



#define ARM_OPCODE_CONDTEST_FAIL   0

#define ARM_OPCODE_CONDTEST_PASS   1

#define ARM_OPCODE_CONDTEST_UNCOND 2



#define	ARM_OPCODE_CONDITION_UNCOND	0xf



static unsigned int aarch32_check_condition(u32 opcode, u32 psr)

{

	u32 cc_bits  = opcode >> 28;



	if (cc_bits != ARM_OPCODE_CONDITION_UNCOND) {

		if ((*aarch32_opcode_cond_checks[cc_bits])(psr))

			return ARM_OPCODE_CONDTEST_PASS;

		else

			return ARM_OPCODE_CONDTEST_FAIL;

	}

	return ARM_OPCODE_CONDTEST_UNCOND;

}



/*

 *  Implement emulation of the SWP/SWPB instructions using load-exclusive and

 *  store-exclusive.
@@ -132,25 +150,6 @@ static int emulate_swpX(unsigned int address, unsigned int *data, 
	return res;

}



#define ARM_OPCODE_CONDTEST_FAIL   0

#define ARM_OPCODE_CONDTEST_PASS   1

#define ARM_OPCODE_CONDTEST_UNCOND 2



#define	ARM_OPCODE_CONDITION_UNCOND	0xf



static unsigned int __kprobes aarch32_check_condition(u32 opcode, u32 psr)

{

	u32 cc_bits  = opcode >> 28;



	if (cc_bits != ARM_OPCODE_CONDITION_UNCOND) {

		if ((*aarch32_opcode_cond_checks[cc_bits])(psr))

			return ARM_OPCODE_CONDTEST_PASS;

		else

			return ARM_OPCODE_CONDTEST_FAIL;

	}

	return ARM_OPCODE_CONDTEST_UNCOND;

}



/*

 * swp_handler logs the id of calling process, dissects the instruction, sanity

 * checks the memory location, calls emulate_swpX for the actual operation and