From: Andrew Cooper Date: Fri, 8 Sep 2017 16:05:33 +0000 (+0300) Subject: x86/shadow: Use ERR_PTR infrastructure for sh_emulate_map_dest() X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1456 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=19cee44abfdf162a25d86f999d9a50bcfdf468bc;p=xen.git x86/shadow: Use ERR_PTR infrastructure for sh_emulate_map_dest() sh_emulate_map_dest() predates the introduction of the generic ERR_PTR() infrastructure, but take the opportunity to avoid opencoding it. The chosen error constants require need to be negative to work with IS_ERR(), but no other changes. Signed-off-by: Andrew Cooper Acked-by: Tim Deegan Reviewed-by: Wei Liu --- diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index f7efe66e80..8d4f2442b8 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4754,8 +4754,8 @@ sh_x86_emulate_write(struct vcpu *v, unsigned long vaddr, void *src, return X86EMUL_UNHANDLEABLE; addr = sh_emulate_map_dest(v, vaddr, bytes, sh_ctxt); - if ( sh_emulate_map_dest_failed(addr) ) - return (long)addr; + if ( IS_ERR(addr) ) + return ~PTR_ERR(addr); paging_lock(v->domain); memcpy(addr, src, bytes); @@ -4796,8 +4796,8 @@ sh_x86_emulate_cmpxchg(struct vcpu *v, unsigned long vaddr, return X86EMUL_UNHANDLEABLE; addr = sh_emulate_map_dest(v, vaddr, bytes, sh_ctxt); - if ( sh_emulate_map_dest_failed(addr) ) - return (long)addr; + if ( IS_ERR(addr) ) + return ~PTR_ERR(addr); paging_lock(v->domain); switch ( bytes ) diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 46d9bab7fa..6a03370402 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -395,10 +395,9 @@ void shadow_unhook_mappings(struct domain *d, mfn_t smfn, int user_only); /* Returns a mapped pointer to write to, or one of the following error * indicators. */ -#define MAPPING_UNHANDLEABLE ((void *)(unsigned long)X86EMUL_UNHANDLEABLE) -#define MAPPING_EXCEPTION ((void *)(unsigned long)X86EMUL_EXCEPTION) -#define MAPPING_SILENT_FAIL ((void *)(unsigned long)X86EMUL_OKAY) -#define sh_emulate_map_dest_failed(rc) ((unsigned long)(rc) <= 3) +#define MAPPING_UNHANDLEABLE ERR_PTR(~(long)X86EMUL_UNHANDLEABLE) +#define MAPPING_EXCEPTION ERR_PTR(~(long)X86EMUL_EXCEPTION) +#define MAPPING_SILENT_FAIL ERR_PTR(~(long)X86EMUL_OKAY) void *sh_emulate_map_dest(struct vcpu *v, unsigned long vaddr, unsigned int bytes, struct sh_emulate_ctxt *sh_ctxt); void sh_emulate_unmap_dest(struct vcpu *v, void *addr, unsigned int bytes,