From patchwork Fri Feb 23 18:00:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 129477 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp926638edc; Fri, 23 Feb 2018 10:00:39 -0800 (PST) X-Google-Smtp-Source: AH8x224uGFYT77CLBbBhUBtZosbsPGGe9hIslzEKQZt5s2AJ3KGqWr/M+uw/uaKxG+mnapKa9+zC X-Received: by 2002:a17:902:8d81:: with SMTP id v1-v6mr2441091plo.430.1519408839336; Fri, 23 Feb 2018 10:00:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519408839; cv=none; d=google.com; s=arc-20160816; b=WR50AaqHEcXw4nDtLCZ4Y24A4NL9btkoP9lc7tHV1HwuvWBm+OhLSG9cYwLqT/1MZM tS9xQozWGbDypO+w7IAcVsibq2pzCL6uMM6/iBl/1WS2juHw+AkNY/FaZtzcxgyq8Qg3 K2s7dZdjbT8N/fOji5j6QEXlBdmAVMBpdPmtJAZRdgMJC/pW+pGv+k/cX0v0IXvG0wJT nGNSci1pUBQMlX5FvXWQ9Jq9NolyqSwbDmwoj/idus61FFqSr8l+VprTTVg799regyM3 rkNt2aUZrH9gEqr7IVHcy6zZPuHmiDVXHcJjb1y9+dTyitBrNaMiQQgBVrN7qO9SJGrF h+2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=Kfkw9ZD5tds9lSp3Uv/bmpxaRTm1nJeVdaEjobuazYU=; b=nVBOiMu+r77x6iHXcr/U21yPqLWmZDw9AM+56eeVZgOqWPRzR+X+iAichYIHjKdg0R tO8Sd0PJ/RCxyykL5QLC5X78RD0trWI65j+8Vwnal+ig3XGvEVsIly3DMxiHR2DHxvqJ ce2KBp3nJec2ErznfsNqevgMpUDnhivEDsvpnFwAbea+4x8ECJBSGS1JopQEv6VDa4Cy VSPAFdeuIqoMq5Hs55qxJg//8ydfA+V19avFvH3bGPcD9L714MLav7VjReZjSIzPMxMe AOYSsqJA1fWoS7ScoykbL8qsHLiiBlqqPiEWfrk6BY+e8Dogo8PtczPzCqAet1rQ2Umy B7cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q/Trp0qM; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g7si2143729pfc.393.2018.02.23.10.00.39; Fri, 23 Feb 2018 10:00:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q/Trp0qM; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751540AbeBWSAi (ORCPT + 10 others); Fri, 23 Feb 2018 13:00:38 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:54010 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751952AbeBWSAe (ORCPT ); Fri, 23 Feb 2018 13:00:34 -0500 Received: by mail-wm0-f65.google.com with SMTP id t74so6228026wme.3 for ; Fri, 23 Feb 2018 10:00:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Kfkw9ZD5tds9lSp3Uv/bmpxaRTm1nJeVdaEjobuazYU=; b=Q/Trp0qMmJm2+BCII2Ka6t+7ioQUy/7UWSto6RH1bE9iY3hcvS8zru3Yy71kMNfvU8 qwbbAkoXtrHy/AbzMESPYPXnawCP0Sgy3FzIF6NUZ/wG7o+mkgoQGFBZMd+nrR4jdzCC gGb2P0T5qZRyPTf00sEgJO3g6wginllOt3RVQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Kfkw9ZD5tds9lSp3Uv/bmpxaRTm1nJeVdaEjobuazYU=; b=r533ZI3XTP2dIWTrjZxUIKOQujj93lAtXSzuwg4AhAKjnwRfxI+fHVO93SZOgxX07T i0hQp2l6hxUG76N3tn1Uk/nwuhotnERlJbD4tMTqG2nssaB/5cVPrykvd/S3SYfEW9lW sBhzXFz40QQy4BrnyZNGBkynnYRTaCrPLRfhYSgs3VGp/+PrYOA6VLbkIIY8VV0NzIjI koJnH4Yh3l2vJqabYE55wq664ncE/Y4Wo47jRHEFsmAfeudpoz0ajDiiP09aW8TWmDsm aVU0iYIz/WAnqs0VcgWaeRYKmOQyByIT6CjX+gBycZ58SymIvl0YAgJX7xA6RWz/caJu 7VGg== X-Gm-Message-State: APf1xPAidlRXcArUjT+ePHC+Ia+yzLhqtBUzeSaDh+uetaOIHrk9slQf P00ZbbH+fVMOHbDhfa7AxLT6wQ== X-Received: by 10.80.169.230 with SMTP id n93mr3837968edc.202.1519408833068; Fri, 23 Feb 2018 10:00:33 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id 6sm2198349edl.87.2018.02.23.10.00.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Feb 2018 10:00:32 -0800 (PST) From: Christoffer Dall To: Paolo Bonzini , =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, Marc Zyngier , Arnd Bergmann , stable@vger.kernel.org, Christoffer Dall Subject: [PULL 2/2] ARM: kvm: fix building with gcc-8 Date: Fri, 23 Feb 2018 19:00:24 +0100 Message-Id: <20180223180024.8846-3-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180223180024.8846-1-christoffer.dall@linaro.org> References: <20180223180024.8846-1-christoffer.dall@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann In banked-sr.c, we use a top-level '__asm__(".arch_extension virt")' statement to allow compilation of a multi-CPU kernel for ARMv6 and older ARMv7-A that don't normally support access to the banked registers. This is considered to be a programming error by the gcc developers and will no longer work in gcc-8, where we now get a build error: /tmp/cc4Qy7GR.s:34: Error: Banked registers are not available with this architecture. -- `mrs r3,SP_usr' /tmp/cc4Qy7GR.s:41: Error: Banked registers are not available with this architecture. -- `mrs r3,ELR_hyp' /tmp/cc4Qy7GR.s:55: Error: Banked registers are not available with this architecture. -- `mrs r3,SP_svc' /tmp/cc4Qy7GR.s:62: Error: Banked registers are not available with this architecture. -- `mrs r3,LR_svc' /tmp/cc4Qy7GR.s:69: Error: Banked registers are not available with this architecture. -- `mrs r3,SPSR_svc' /tmp/cc4Qy7GR.s:76: Error: Banked registers are not available with this architecture. -- `mrs r3,SP_abt' Passign the '-march-armv7ve' flag to gcc works, and is ok here, because we know the functions won't ever be called on pre-ARMv7VE machines. Unfortunately, older compiler versions (4.8 and earlier) do not understand that flag, so we still need to keep the asm around. Backporting to stable kernels (4.6+) is needed to allow those to be built with future compilers as well. Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84129 Fixes: 33280b4cd1dc ("ARM: KVM: Add banked registers save/restore") Cc: stable@vger.kernel.org Signed-off-by: Arnd Bergmann Signed-off-by: Christoffer Dall --- arch/arm/kvm/hyp/Makefile | 5 +++++ arch/arm/kvm/hyp/banked-sr.c | 4 ++++ 2 files changed, 9 insertions(+) -- 2.14.2 diff --git a/arch/arm/kvm/hyp/Makefile b/arch/arm/kvm/hyp/Makefile index 5638ce0c9524..63d6b404d88e 100644 --- a/arch/arm/kvm/hyp/Makefile +++ b/arch/arm/kvm/hyp/Makefile @@ -7,6 +7,8 @@ ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING KVM=../../../../virt/kvm +CFLAGS_ARMV7VE :=$(call cc-option, -march=armv7ve) + obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v2-sr.o obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o @@ -15,7 +17,10 @@ obj-$(CONFIG_KVM_ARM_HOST) += tlb.o obj-$(CONFIG_KVM_ARM_HOST) += cp15-sr.o obj-$(CONFIG_KVM_ARM_HOST) += vfp.o obj-$(CONFIG_KVM_ARM_HOST) += banked-sr.o +CFLAGS_banked-sr.o += $(CFLAGS_ARMV7VE) + obj-$(CONFIG_KVM_ARM_HOST) += entry.o obj-$(CONFIG_KVM_ARM_HOST) += hyp-entry.o obj-$(CONFIG_KVM_ARM_HOST) += switch.o +CFLAGS_switch.o += $(CFLAGS_ARMV7VE) obj-$(CONFIG_KVM_ARM_HOST) += s2-setup.o diff --git a/arch/arm/kvm/hyp/banked-sr.c b/arch/arm/kvm/hyp/banked-sr.c index 111bda8cdebd..be4b8b0a40ad 100644 --- a/arch/arm/kvm/hyp/banked-sr.c +++ b/arch/arm/kvm/hyp/banked-sr.c @@ -20,6 +20,10 @@ #include +/* + * gcc before 4.9 doesn't understand -march=armv7ve, so we have to + * trick the assembler. + */ __asm__(".arch_extension virt"); void __hyp_text __banked_save_state(struct kvm_cpu_context *ctxt)