xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: "Roger Pau Monné" <roger.pau@citrix.com>
To: Roger Pau Monne <roger.pau@citrix.com>
Cc: xen-devel@lists.xenproject.org, Wei Liu <wei.liu2@citrix.com>,
	Jan Beulich <jbeulich@suse.com>,
	Andrew Cooper <andrew.cooper3@citrix.com>
Subject: Re: [Xen-devel] [PATCH] x86: fix alternative_callN
Date: Wed, 22 May 2019 17:43:54 +0100	[thread overview]
Message-ID: <20190522164354.dmyur2iu4g4w6ptm@Air-de-Roger> (raw)
Message-ID: <20190522164354.9HNqD4xZZhuUDoYmcPM38WEq44N2_K5ohmqsPqVMJog@z> (raw)
In-Reply-To: <20190522163810.32964-1-roger.pau@citrix.com>

Forget about this version, I've updated the subject and commit
message and forgot to re-generate the patch.

On Wed, May 22, 2019 at 05:38:10PM +0100, Roger Pau Monne wrote:
> alternative_callN using inline assemble to generate the alternative
> patch sites should be using the ALTERNATIVE C preprocessor macro
> rather than the ALTERNATIVE assembly macro, the more that using the
> assembly macro in an inline assembly instance causes the following
> error on llvm based toolchains:
> 
> <instantiation>:1:1: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <instantiation>:1:37: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
>                                     ^
> <instantiation>:1:60: error: invalid reassignment of non-absolute variable '.L0_diff'
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
>                                                            ^
> <inline asm>:1:2: note: while in macro instantiation
>         ALTERNATIVE "call *genapic+64(%rip)", "call .", X86_FEATURE_LM
>         ^
> <instantiation>:1:156: error: invalid symbol redefinition
>   ...- (.L0_orig_e - .L0_orig_s); mknops ((-(.L0_diff > 0)) * .L0_diff); .L0_orig_p:
>                                                                          ^
> <instantiation>:18:5: error: invalid symbol redefinition
>     .L0_repl_s1: call .; .L0_repl_e1:
>     ^
> <instantiation>:18:26: error: invalid symbol redefinition
>     .L0_repl_s1: call .; .L0_repl_e1:
>                          ^
> <instantiation>:1:1: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <instantiation>:1:37: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
>                                     ^
> <instantiation>:1:60: error: invalid reassignment of non-absolute variable '.L0_diff'
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
>                                                            ^
> <inline asm>:1:2: note: while in macro instantiation
>         ALTERNATIVE "call *genapic+64(%rip)", "call .", X86_FEATURE_LM
>         ^
> <instantiation>:1:156: error: invalid symbol redefinition
>   ...- (.L0_orig_e - .L0_orig_s); mknops ((-(.L0_diff > 0)) * .L0_diff); .L0_orig_p:
>                                                                          ^
> <instantiation>:18:5: error: invalid symbol redefinition
>     .L0_repl_s1: call .; .L0_repl_e1:
>     ^
> <instantiation>:18:26: error: invalid symbol redefinition
>     .L0_repl_s1: call .; .L0_repl_e1:
>                          ^
> <instantiation>:1:1: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <instantiation>:1:37: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
>                                     ^
> <instantiation>:1:60: error: invalid reassignment of non-absolute variable '.L0_diff'
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
>                                                            ^
> <inline asm>:1:2: note: while in macro instantiation
>         ALTERNATIVE "call *genapic+64(%rip)", "call .", X86_FEATURE_LM
>         ^
> <instantiation>:1:156: error: invalid symbol redefinition
>   ...- (.L0_orig_e - .L0_orig_s); mknops ((-(.L0_diff > 0)) * .L0_diff); .L0_orig_p:
>                                                                          ^
> <instantiation>:18:5: error: invalid symbol redefinition
>     .L0_repl_s1: call .; .L0_repl_e1:
>     ^
> <instantiation>:18:26: error: invalid symbol redefinition
>     .L0_repl_s1: call .; .L0_repl_e1:
>                          ^
> 
> Fixes: 67d01cdb5 ("x86: infrastructure to allow converting certain indirect calls to direct ones")
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> ---
> Cc: Jan Beulich <jbeulich@suse.com>
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
> ---
>  xen/include/asm-x86/alternative.h | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/xen/include/asm-x86/alternative.h b/xen/include/asm-x86/alternative.h
> index 63d0a450ba..92e3581bc2 100644
> --- a/xen/include/asm-x86/alternative.h
> +++ b/xen/include/asm-x86/alternative.h
> @@ -202,9 +202,8 @@ extern void alternative_branches(void);
>      rettype ret_;                                                  \
>      register unsigned long r10_ asm("r10");                        \
>      register unsigned long r11_ asm("r11");                        \
> -    asm volatile (__stringify(ALTERNATIVE "call *%c[addr](%%rip)", \
> -                                          "call .",                \
> -                                          X86_FEATURE_ALWAYS)      \
> +    asm volatile (ALTERNATIVE("call *%c[addr](%%rip)", "call .",   \
> +                              X86_FEATURE_ALWAYS)                  \
>                    : ALT_CALL ## n ## _OUT, "=a" (ret_),            \
>                      "=r" (r10_), "=r" (r11_) ASM_CALL_CONSTRAINT   \
>                    : [addr] "i" (&(func)), "g" (func)               \
> -- 
> 2.20.1 (Apple Git-117)
> 

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

  parent reply	other threads:[~2019-05-22 16:44 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-22 16:38 [PATCH] x86: fix alternative_callN Roger Pau Monne
2019-05-22 16:38 ` [Xen-devel] " Roger Pau Monne
2019-05-22 16:43 ` Roger Pau Monné [this message]
2019-05-22 16:43   ` Roger Pau Monné

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190522164354.dmyur2iu4g4w6ptm@Air-de-Roger \
    --to=roger.pau@citrix.com \
    --cc=andrew.cooper3@citrix.com \
    --cc=jbeulich@suse.com \
    --cc=wei.liu2@citrix.com \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).