From patchwork Tue Feb 11 17:48:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 11376125 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AC7B21395 for ; Tue, 11 Feb 2020 17:50:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 869E0206D7 for ; Tue, 11 Feb 2020 17:50:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581443406; bh=2lzshsjfN/k3DkUr97SZX8z9y6OmheIcQ6EfHGz4VSU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tUNdb9UUqfcpwovj38BhpekxabX3rzbMzt6JAj0WK8i1WGyFKpFBhOVieZ5DTggVl amB9/AIRgWYfkgY4lSY5PnLBO5s0dbiY6Ek2NnHqdsYivYk5EHSrKC2k6OxcbY/8nq XJ/t0urro0QTdt7YGRS5ELZzfadcw3b/v1nlDTuM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730061AbgBKRt7 (ORCPT ); Tue, 11 Feb 2020 12:49:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:52364 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730022AbgBKRt7 (ORCPT ); Tue, 11 Feb 2020 12:49:59 -0500 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6136A214DB; Tue, 11 Feb 2020 17:49:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581443398; bh=2lzshsjfN/k3DkUr97SZX8z9y6OmheIcQ6EfHGz4VSU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nxvylJ7UNsw1LZMzsJYRpYMI9SCwuz9BYiZYNOCOBQX0owbANZNnxbhTGkmrF65Ay /cbxDgif49u3ppBaqxxpzIsCC/3fupO9J8W6nqVhCRiab/rsr+ST9cXh/03AUZK73c uLBqVKjt5r/jo+5yyjmX4Vgoifb6qUi6FnOxigKQ= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1j1ZfY-004O7k-NW; Tue, 11 Feb 2020 17:49:56 +0000 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: Andre Przywara , Christoffer Dall , Dave Martin , Jintack Lim , Alexandru Elisei , James Morse , Julien Thierry , Suzuki K Poulose Subject: [PATCH v2 05/94] KVM: arm64: nv: Allow userspace to set PSR_MODE_EL2x Date: Tue, 11 Feb 2020 17:48:09 +0000 Message-Id: <20200211174938.27809-6-maz@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211174938.27809-1-maz@kernel.org> References: <20200211174938.27809-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, andre.przywara@arm.com, christoffer.dall@arm.com, Dave.Martin@arm.com, jintack@cs.columbia.edu, alexandru.elisei@arm.com, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Christoffer Dall We were not allowing userspace to set a more privileged mode for the VCPU than EL1, but we should allow this when nested virtualization is enabled for the VCPU. Signed-off-by: Christoffer Dall Signed-off-by: Marc Zyngier --- arch/arm64/kvm/guest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index 2bd92301d32f..c75b5498c048 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include "trace.h" @@ -194,6 +195,11 @@ static int set_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) if (vcpu_el1_is_32bit(vcpu)) return -EINVAL; break; + case PSR_MODE_EL2h: + case PSR_MODE_EL2t: + if (vcpu_el1_is_32bit(vcpu) || !nested_virt_in_use(vcpu)) + return -EINVAL; + break; default: err = -EINVAL; goto out;