iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/uaccess: Switch __patch_instruction() to __put_user_asm_goto()

Browse Source 
__patch_instruction() is the only user of __put_user_asm() outside
of asm/uaccess.h

Switch to the new __put_user_asm_goto() to enable retirement of
__put_user_asm() in a later patch.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/b9745b122f4a9ae72cef445c61320022ab8b77b7.1599216721.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy 2020-09-04 11:01:31 +00:00 committed by Michael Ellerman
parent ee0a49a687
commit e64ac41ab0
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/powerpc/lib/code-patching.c
View File

@ -21,21 +21,18 @@
static int __patch_instruction(struct ppc_inst *exec_addr, struct ppc_inst instr, static int __patch_instruction(struct ppc_inst *exec_addr, struct ppc_inst instr,
struct ppc_inst *patch_addr) struct ppc_inst *patch_addr)
{ {
int err = 0; if (!ppc_inst_prefixed(instr))
__put_user_asm_goto(ppc_inst_val(instr), patch_addr, failed, "stw");
if (!ppc_inst_prefixed(instr)) { else
__put_user_asm(ppc_inst_val(instr), patch_addr, err, "stw"); __put_user_asm_goto(ppc_inst_as_u64(instr), patch_addr, failed, "std");
} else {
__put_user_asm(ppc_inst_as_u64(instr), patch_addr, err, "std");
}
if (err)
return err;
asm ("dcbst 0, %0; sync; icbi 0,%1; sync; isync" :: "r" (patch_addr), asm ("dcbst 0, %0; sync; icbi 0,%1; sync; isync" :: "r" (patch_addr),
"r" (exec_addr)); "r" (exec_addr));
return 0; return 0;
failed:
return -EFAULT;
} }
int raw_patch_instruction(struct ppc_inst *addr, struct ppc_inst instr) int raw_patch_instruction(struct ppc_inst *addr, struct ppc_inst instr)