From patchwork Mon Dec 18 10:00:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10118675 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 3541A6019C for ; Mon, 18 Dec 2017 10:01:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21FF628DB1 for ; Mon, 18 Dec 2017 10:01:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 16BC728E35; Mon, 18 Dec 2017 10:01:24 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI 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 1004A28DB1 for ; Mon, 18 Dec 2017 10:01:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933407AbdLRKBV (ORCPT ); Mon, 18 Dec 2017 05:01:21 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:44455 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758260AbdLRKBS (ORCPT ); Mon, 18 Dec 2017 05:01:18 -0500 Received: by mail-wm0-f67.google.com with SMTP id t8so27968372wmc.3 for ; Mon, 18 Dec 2017 02:01:18 -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=P+A629uczMBDRbROdrM6MqYr9nyBieUI3jf+421np7E=; b=i/oPwsgd7HjnQcLSaYVuxRepMvXyQRL9/IO9k6CrasC+o4qmnH0sPftCEtLoBh/fW8 v0LZgZO/syC6KaULdsohFtV4zDCgRcVJ5copgY65X0jZmyY+QV/9xdqSU5FY6+0rZja/ cKzU4yYZb2WyJvyUavWkGDzMWFiZGYLdc0a4o= 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=P+A629uczMBDRbROdrM6MqYr9nyBieUI3jf+421np7E=; b=Niy0ISuv4r1kHws/K7Oj5JVT1nF8juaj35SW1FkhQIseLiVqAAoQC3lp0oIAdcZSEu PuViI+RZHzX7GP3N+XnEBWDjNqvdBYFAqr5Qm4M6vn4bjWHDrNrOfB22awa40fTYXl3O TS62b75+4EJbK5ZwzexrRsUB153wFlN9uOWd6gS1I1vOaeRTxXtj8RiYbcPrJE4+M/rI csIoC/uKQKnIF7ly7X+KQ8xYrOJEgid4dwUCAUvmVvx5nuRe/0OQPSd0cDKWMbjCtOMt KTCEk/VQcVJ+7nqTZVcv6cmLSQqMGw9Gks8jVpCstqz3m5BzNQ5HRObB3Lw/rNAFbdRp x7Og== X-Gm-Message-State: AKGB3mKZRFFhsHSvh1VUDgduTj3IhglPet+ArVbI1oisv6qGIJbz2XZf k6L8+cM+BO1AC/CiU7uVjEcCYw== X-Google-Smtp-Source: ACJfBosVpVd+3110tPrffk4qX3AvWJwNW/VO+VOucGUtyfHlSQjV/LdD96+dXyJWjYX7fyU/Xpg9pg== X-Received: by 10.80.195.12 with SMTP id a12mr29120426edb.142.1513591277315; Mon, 18 Dec 2017 02:01:17 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id h16sm10403130edj.34.2017.12.18.02.01.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Dec 2017 02:01:16 -0800 (PST) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: Marc Zyngier , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, Julien Thierry , Christoffer Dall , Catalin Marinas , stable@vger.kernel.org Subject: [PULL 1/5] arm64: kvm: Prevent restoring stale PMSCR_EL1 for vcpu Date: Mon, 18 Dec 2017 11:00:53 +0100 Message-Id: <20171218100057.7839-2-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171218100057.7839-1-christoffer.dall@linaro.org> References: <20171218100057.7839-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: Julien Thierry When VHE is not present, KVM needs to save and restores PMSCR_EL1 when possible. If SPE is used by the host, value of PMSCR_EL1 cannot be saved for the guest. If the host starts using SPE between two save+restore on the same vcpu, restore will write the value of PMSCR_EL1 read during the first save. Make sure __debug_save_spe_nvhe clears the value of the saved PMSCR_EL1 when the guest cannot use SPE. Signed-off-by: Julien Thierry Cc: Christoffer Dall Cc: Marc Zyngier Cc: Catalin Marinas Cc: Reviewed-by: Will Deacon Reviewed-by: Christoffer Dall Signed-off-by: Christoffer Dall --- arch/arm64/kvm/hyp/debug-sr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/kvm/hyp/debug-sr.c b/arch/arm64/kvm/hyp/debug-sr.c index 321c9c05dd9e..f4363d40e2cd 100644 --- a/arch/arm64/kvm/hyp/debug-sr.c +++ b/arch/arm64/kvm/hyp/debug-sr.c @@ -74,6 +74,9 @@ static void __hyp_text __debug_save_spe_nvhe(u64 *pmscr_el1) { u64 reg; + /* Clear pmscr in case of early return */ + *pmscr_el1 = 0; + /* SPE present on this CPU? */ if (!cpuid_feature_extract_unsigned_field(read_sysreg(id_aa64dfr0_el1), ID_AA64DFR0_PMSVER_SHIFT))