Commit b4d6bb38 authored by Robin Murphy's avatar Robin Murphy Committed by Catalin Marinas
Browse files

arm64: mte: Clean up user tag accessors 



Invoking user_ldst to explicitly add a post-increment of 0 is silly.
Just use a normal USER() annotation and save the redundant instruction.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarTong Tiangen <tongtiangen@huawei.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20220420030418.3189040-6-tongtiangen@huawei.com


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

arch/arm64/lib/mte.S

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ SYM_FUNC_START(mte_copy_tags_from_user) 
	mov	x3, x1

	cbz	x2, 2f

1:

	user_ldst 2f, ldtrb, w4, x1, 0

USER(2f, ldtrb	w4, [x1])

	lsl	x4, x4, #MTE_TAG_SHIFT

	stg	x4, [x0], #MTE_GRANULE_SIZE

	add	x1, x1, #1
@@ -120,7 +120,7 @@ SYM_FUNC_START(mte_copy_tags_to_user) 
1:

	ldg	x4, [x1]

	ubfx	x4, x4, #MTE_TAG_SHIFT, #MTE_TAG_SIZE

	user_ldst 2f, sttrb, w4, x0, 0

USER(2f, sttrb	w4, [x0])

	add	x0, x0, #1

	add	x1, x1, #MTE_GRANULE_SIZE

	subs	x2, x2, #1