Skip to content

Commit b4d6bb3

Browse files
rmurphy-armctmarinas
authored andcommitted
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: Robin Murphy <robin.murphy@arm.com> Reviewed-by: Tong Tiangen <tongtiangen@huawei.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Link: https://lore.kernel.org/r/20220420030418.3189040-6-tongtiangen@huawei.com Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent fb396bb commit b4d6bb3

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/arm64/lib/mte.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ SYM_FUNC_START(mte_copy_tags_from_user)
9393
mov x3, x1
9494
cbz x2, 2f
9595
1:
96-
user_ldst 2f, ldtrb, w4, x1, 0
96+
USER(2f, ldtrb w4, [x1])
9797
lsl x4, x4, #MTE_TAG_SHIFT
9898
stg x4, [x0], #MTE_GRANULE_SIZE
9999
add x1, x1, #1
@@ -120,7 +120,7 @@ SYM_FUNC_START(mte_copy_tags_to_user)
120120
1:
121121
ldg x4, [x1]
122122
ubfx x4, x4, #MTE_TAG_SHIFT, #MTE_TAG_SIZE
123-
user_ldst 2f, sttrb, w4, x0, 0
123+
USER(2f, sttrb w4, [x0])
124124
add x0, x0, #1
125125
add x1, x1, #MTE_GRANULE_SIZE
126126
subs x2, x2, #1

0 commit comments

Comments
 (0)