From patchwork Tue Sep 27 18:05:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9352443 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0DE3D6077B for ; Tue, 27 Sep 2016 18:06:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 048EB29250 for ; Tue, 27 Sep 2016 18:06:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED5B22925B; Tue, 27 Sep 2016 18:06:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 527CE29272 for ; Tue, 27 Sep 2016 18:06:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756142AbcI0SGE (ORCPT ); Tue, 27 Sep 2016 14:06:04 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:38786 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756045AbcI0SF4 (ORCPT ); Tue, 27 Sep 2016 14:05:56 -0400 Received: by mail-wm0-f45.google.com with SMTP id l132so26933856wmf.1 for ; Tue, 27 Sep 2016 11:05:56 -0700 (PDT) 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=AS+V7G9sfqtbDCXH73AN/6+vLvWk8nc7YsvTFtRBh8U=; b=dlfTrMLuns8uTWBRXN6CeSeNGJD5tVXXuJA8qKAIDXHAHH1ANeXFXsdc+qWxqi/Lt4 t2HOEHHaWSKDckO+/aLtDQhEdKA/wnf3ZS3CyWdQTtnLVSrwGSMBlKglDP6e2Yc2eKOS Q9CX4scR8T+ZZZ7lNRIDu4K4kRISZp3jMHItA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AS+V7G9sfqtbDCXH73AN/6+vLvWk8nc7YsvTFtRBh8U=; b=HZdILfaA73OLgr4aYWqj3HS5wE+gaMmo1qQ4f++Mn1bWbJwM0VPRfWfYadYqEWmvbe SYHx1coBdsLl7kyNnuSeuER5y+JKZ2mHYfEmRrVXf4nc51TxIXmJDroxwkPGyYPuunzQ bYCx3nS9R2X0POEo7GjmEaUio6VfUVzNck7LsVvgSEB1/Ut891WxWHR2ZpeeLzjlcgrf E/XAubk7ERmcYGUTxGUXVxtsbexnBtGkWq71EVgOk1tiYvrG2fPHcvF7ADJghW9242NS babukAt0vrRci2zjkMBRenBSrFsxs8x2MkBk87MWmVdINfHcQD/QzaGirk0aRRY0t2oy BGtw== X-Gm-Message-State: AA6/9RnTfZpjd898HNXK18JY/GKm5UV/P3wX/dAn1Ittcy05z/1Fz4npY2MZXk1myjITIYHW X-Received: by 10.28.141.133 with SMTP id p127mr4308663wmd.119.1474999555031; Tue, 27 Sep 2016 11:05:55 -0700 (PDT) Received: from localhost.localdomain ([94.18.191.146]) by smtp.gmail.com with ESMTPSA id k2sm17932539wmg.23.2016.09.27.11.05.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Sep 2016 11:05:54 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Vladimir Murzin , "# v4 . 6+" , Christoffer Dall Subject: [PULL 09/50] arm64: KVM: VHE: reset PSTATE.PAN on entry to EL2 Date: Tue, 27 Sep 2016 20:05:17 +0200 Message-Id: <20160927180558.14699-10-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160927180558.14699-1-christoffer.dall@linaro.org> References: <20160927180558.14699-1-christoffer.dall@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Vladimir Murzin SCTLR_EL2.SPAN bit controls what happens with the PSTATE.PAN bit on an exception. However, this bit has no effect on the PSTATE.PAN when HCR_EL2.E2H or HCR_EL2.TGE is unset. Thus when VHE is used and exception taken from a guest PSTATE.PAN bit left unchanged and we continue with a value guest has set. To address that always reset PSTATE.PAN on entry from EL1. Fixes: 1f364c8c48a0 ("arm64: VHE: Add support for running Linux in EL2 mode") Signed-off-by: Vladimir Murzin Reviewed-by: James Morse Acked-by: Marc Zyngier Cc: # v4.6+ Signed-off-by: Christoffer Dall --- arch/arm64/kvm/hyp/entry.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S index 3967c231..b5926ee 100644 --- a/arch/arm64/kvm/hyp/entry.S +++ b/arch/arm64/kvm/hyp/entry.S @@ -96,6 +96,8 @@ ENTRY(__guest_exit) add x1, x1, #VCPU_CONTEXT + ALTERNATIVE(nop, SET_PSTATE_PAN(1), ARM64_HAS_PAN, CONFIG_ARM64_PAN) + // Store the guest regs x2 and x3 stp x2, x3, [x1, #CPU_XREG_OFFSET(2)]