From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751693AbbHLTEa (ORCPT ); Wed, 12 Aug 2015 15:04:30 -0400 Received: from casper.infradead.org ([85.118.1.10]:52517 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826AbbHLTE2 (ORCPT ); Wed, 12 Aug 2015 15:04:28 -0400 Date: Wed, 12 Aug 2015 21:04:22 +0200 From: Peter Zijlstra To: Boris Ostrovsky Cc: "H. Peter Anvin" , Stephen Rothwell , Jeremy Fitzhardinge , Konrad Rzeszutek Wilk , Stefano Stabellini , Xen Devel , Thomas Gleixner , Ingo Molnar , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Lutomirski , David Vrabel Subject: Re: linux-next: manual merge of the xen-tip tree with the tip tree Message-ID: <20150812190422.GZ16853@twins.programming.kicks-ass.net> References: <20150812150954.36bc605c@canb.auug.org.au> <55CB49CA.8050305@oracle.com> <20150812172105.GW16853@twins.programming.kicks-ass.net> <20150812174625.GH18673@twins.programming.kicks-ass.net> <55CB8DAD.6090508@oracle.com> <20150812183614.GY16853@twins.programming.kicks-ass.net> <55CB9424.7030801@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <55CB9424.7030801@oracle.com> User-Agent: Mutt/1.5.21 (2012-12-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Aug 12, 2015 at 02:44:52PM -0400, Boris Ostrovsky wrote: > On 08/12/2015 02:36 PM, Peter Zijlstra wrote: > >On Wed, Aug 12, 2015 at 11:26:41AM -0700, H. Peter Anvin wrote: > >>One option might be to do the addition in assembly, i.e.: > >> > >>"i" (key), "i" (index) > >> > >>... and put the addition into the assembly source. > >Like so? Seems to build on gcc-4.6. > > Yes, this builds on 4.4.4. as well. Thanks, Ingo / Hpa, can you make the below patch appear in the right tip branch? --- Subject: jump_label, x86: Fix asm for older GCCs From: Peter Zijlstra Date: Wed Aug 12 20:58:48 CEST 2015 Boris reported that: gcc version 4.4.4 20100503 (Red Hat 4.4.4-2) fails to build. The problem appears that even though @key and @branch are compile time constants it doesn't see: &((char *)key)[branch] as an immediate. More recent GCCs don't appear to have this problem. In particular, Red Hat backported the asm goto feature into 4.4, 'normal' 4.4 compilers will not have this feature and thus not run into this asm. The solution is to supply both values to the asm as immediates and do the addition in asm. Suggested-by: "H. Peter Anvin" Reported-by: Boris Ostrovsky Tested-by: Boris Ostrovsky Signed-off-by: Peter Zijlstra (Intel) --- arch/x86/include/asm/jump_label.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/arch/x86/include/asm/jump_label.h +++ b/arch/x86/include/asm/jump_label.h @@ -22,9 +22,9 @@ static __always_inline bool arch_static_ ".byte " __stringify(STATIC_KEY_INIT_NOP) "\n\t" ".pushsection __jump_table, \"aw\" \n\t" _ASM_ALIGN "\n\t" - _ASM_PTR "1b, %l[l_yes], %c0 \n\t" + _ASM_PTR "1b, %l[l_yes], %c0 + %c1 \n\t" ".popsection \n\t" - : : "i" (&((char *)key)[branch]) : : l_yes); + : : "i" (key), "i" (branch) : : l_yes); return false; l_yes: @@ -38,9 +38,9 @@ static __always_inline bool arch_static_ "2:\n\t" ".pushsection __jump_table, \"aw\" \n\t" _ASM_ALIGN "\n\t" - _ASM_PTR "1b, %l[l_yes], %c0 \n\t" + _ASM_PTR "1b, %l[l_yes], %c0 + %c1 \n\t" ".popsection \n\t" - : : "i" (&((char *)key)[branch]) : : l_yes); + : : "i" (key), "i" (branch) : : l_yes); return false; l_yes: