Xen project Mailing List

Re: [Xen-devel] [PATCH] x86: fix alternative_callN

To: Roger Pau Monne <roger.pau@xxxxxxxxxx>

From: Roger Pau Monné <roger.pau@xxxxxxxxxx>

Date: Wed, 22 May 2019 17:43:54 +0100

Authentication-results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=roger.pau@xxxxxxxxxx; spf=Pass smtp.mailfrom=roger.pau@xxxxxxxxxx; spf=None smtp.helo=postmaster@xxxxxxxxxxxxxxxxxxxxxxxxxx

Cc: xen-devel@xxxxxxxxxxxxxxxxxxxx, Wei Liu <wei.liu2@xxxxxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>

Delivery-date: Wed, 22 May 2019 16:44:11 +0000

Ironport-sdr: WPFuABeF1NBvnmrsxXNG9VXn0LZoSJF3sEWP2iL9KkZoTaxdmTlsoCEh0w28X2sHbUKRkMyt2S TvfOAcWGBb2R5kB9D7zaDt1756ONNilqyG3/B+pT7aPC7wjqxK5PBoL5M+oCs5l49GdxK7Lui1 RVeDo1BShHb7WVbc/0q3J68tLkIdB619xBvJPxVGugNAB0uQnjPBImaML0QdkWCV1XDMAgZrtb aWEf9HQ/WfiERIVL8qV0Dmqz4aOtxCdcSYiKOLOsBsFZ3VfdxFflZw74ViXtEknv088YE1YG2z lBg=

List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

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@xxxxxxxxxx> > --- > Cc: Jan Beulich <jbeulich@xxxxxxxx> > Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> > Cc: Wei Liu <wei.liu2@xxxxxxxxxx> > --- > 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@xxxxxxxxxxxxxxxxxxxx https://lists.xenproject.org/mailman/listinfo/xen-devel

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.