UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Robin Murphy 2022-04-20 03:04:16 +00:00 committed by Catalin Marinas
parent fb396bb459
commit b4d6bb38f9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/lib/mte.S
View File

@ -93,7 +93,7 @@ SYM_FUNC_START(mte_copy_tags_from_user)
mov x3, x1 mov x3, x1
cbz x2, 2f cbz x2, 2f
1: 1:
user_ldst 2f, ldtrb, w4, x1, 0 USER(2f, ldtrb w4, [x1])
lsl x4, x4, #MTE_TAG_SHIFT lsl x4, x4, #MTE_TAG_SHIFT
stg x4, [x0], #MTE_GRANULE_SIZE stg x4, [x0], #MTE_GRANULE_SIZE
add x1, x1, #1 add x1, x1, #1
@ -120,7 +120,7 @@ SYM_FUNC_START(mte_copy_tags_to_user)
1: 1:
ldg x4, [x1] ldg x4, [x1]
ubfx x4, x4, #MTE_TAG_SHIFT, #MTE_TAG_SIZE 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 x0, x0, #1
add x1, x1, #MTE_GRANULE_SIZE add x1, x1, #MTE_GRANULE_SIZE
subs x2, x2, #1 subs x2, x2, #1