Re: [Xen-devel] [PATCH 0.5/5] arm/alternatives: Drop the !HAS_ALTERNATIVE infrastructure

[Julien Grall <julien.grall@xxxxxxx>]

Hi Andrew,

Thank you for doing the clean-up.

On 30/01/18 11:16, Andrew Cooper wrote:
> ARM now unconditionally selects HAS_ALTERNATIVE, which has caused the
> !HAS_ALTERNATIVE code in include/asm-arm/alternative.h to bitrot to the point
> of failing to compile.
>
> Expand all the CONFIG_HAS_ALTERNATIVE references in ARM code.
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> ---
> CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
> CC: Julien Grall <julien.grall@xxxxxxx>
> CC: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
>
> N.B. Only compile tested
> ---
>   xen/arch/arm/xen.lds.S                    |  2 --
>   xen/include/asm-arm/alternative.h         | 15 ---------------
>   xen/test/livepatch/xen_hello_world_func.c |  2 +-
You forgot on in include/asm-arm/cpuerrata.h :).

>   3 files changed, 1 insertion(+), 18 deletions(-)
>
> diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S
> index c9b9546..b039018 100644
> --- a/xen/arch/arm/xen.lds.S
> +++ b/xen/arch/arm/xen.lds.S
> @@ -154,14 +154,12 @@ SECTIONS
>          *(.initcall1.init)
>          __initcall_end = .;
>   
> -#ifdef CONFIG_HAS_ALTERNATIVE
>          . = ALIGN(4);
>          __alt_instructions = .;
>          *(.altinstructions)
>          __alt_instructions_end = .;
>          . = ALIGN(4);
>          *(.altinstr_replacement)
> -#endif
>   
>          *(.init.data)
>          *(.init.data.rel)
> diff --git a/xen/include/asm-arm/alternative.h 
> b/xen/include/asm-arm/alternative.h
> index 6cc9d0d..4e33d1c 100644
> --- a/xen/include/asm-arm/alternative.h
> +++ b/xen/include/asm-arm/alternative.h
> @@ -3,8 +3,6 @@
>   
>   #include <asm/cpufeature.h>
>   
> -#ifdef CONFIG_HAS_ALTERNATIVE
> -
>   #ifndef __ASSEMBLY__
>   
>   #include <xen/init.h>
> @@ -152,17 +150,4 @@ int apply_alternatives(const struct alt_instr *start, 
> const struct alt_instr *en
>   #define ALTERNATIVE(oldinstr, newinstr, ...)   \
>         _ALTERNATIVE_CFG(oldinstr, newinstr, __VA_ARGS__, 1)
>   
> -#else /* !CONFIG_HAS_ALTERNATIVE */
> -
> -static inline void apply_alternatives_all(void)
> -{
> -}
> -
> -static inline int apply_alternatives(void *start, size_t length)
> -{
> -    return 0;
> -}
> -
> -#endif
> -
>   #endif /* __ASM_ALTERNATIVE_H */
> diff --git a/xen/test/livepatch/xen_hello_world_func.c 
> b/xen/test/livepatch/xen_hello_world_func.c
> index 1518f71..b358224 100644
> --- a/xen/test/livepatch/xen_hello_world_func.c
> +++ b/xen/test/livepatch/xen_hello_world_func.c
> @@ -29,7 +29,7 @@ const char *xen_hello_world(void)
>       rc = __get_user(tmp, non_canonical_addr);
>       BUG_ON(rc != -EFAULT);
>   #endif
> -#if defined(CONFIG_ARM) && defined(CONFIG_HAS_ALTERNATIVE)
> +#if defined(CONFIG_ARM)
>       asm(ALTERNATIVE("nop", "nop", LIVEPATCH_FEATURE));
>   #endif
>   
Cheers,

--
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel