From patchwork Mon Oct 17 11:52:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 13008715 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E9A86C433FE for ; Mon, 17 Oct 2022 12:06:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=pbGrQYRPAQcxWV0KPGjL25krGof7cwqMX0SsGF3fKeQ=; b=abIfBuk3GTeFH0 SfUY6d9mmjBqa1DQl+BWo/Wy8azyA+Lpr+X6zxQgCP+GwH8TynTVEGDchTs54v6mRJRAf4X9mWCXV ZY1vODdrWr3r9/HxDQhFjA7+az9mBYugyVpLkZ0/nkuR13IGv/3VveaWf5gebvOtOcjhpdfAngAEV IZ5FSWTkjotBT9wyzNpf8E33z80CcxVojX9gl8AJ/BYm00YKjQ7tCXujp4N6NOLnxcE7Juwp/UgW9 luAhB0ZX6mckiZc3yFh0BMcCHr1iTTwLOPU2jrEKbN27j8VKvFk5iRiv+ptjnBvwbnciOH0geFspp NHQDKUf0a1z/L3EjG+/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1okOrz-00BMk7-V0; Mon, 17 Oct 2022 12:05:25 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1okOgk-00BDVm-BV for linux-arm-kernel@lists.infradead.org; Mon, 17 Oct 2022 11:53:47 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D38F0B812A1; Mon, 17 Oct 2022 11:53:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F93FC433C1; Mon, 17 Oct 2022 11:53:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666007623; bh=TlmuoizYiy7ocLRUX9ITRdoDGCG+RyLE/kBvsyVSA4Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E/YX1u6Evb6DoaMiPuFbzBItnTR1d6+0VWVw7kjpQ3djj1CLRxeg+3t7HtnPnrBG7 iq49leJqB+ctfPDoqYlFnj6CoIa2wIUNvbOQLDc0us0mUouz7LcXMLGXSs3SINJ5Gz AnB2XJI1CHnSxSIF1gPu6YVBldxTNa3XFPygIe/SNFlQSPYGrXxWqTTkRp3tiJLg6n xTBK3CKp1h7tMBLlgm3FLCSv7Ajo/eqwzFGctpDIqbnLpNquB8T0yOoe6RxwfAPoCO 0rpuPVlY1ETIYSs73iqTNTDgpPfbnM5r2QZ4aicP1Frp7Z3CWtJDHwq1XKFGRsBN/H WPo1Ws9uz713A== From: Will Deacon To: kvmarm@lists.linux.dev Cc: Will Deacon , Sean Christopherson , Vincent Donnefort , Alexandru Elisei , Catalin Marinas , James Morse , Chao Peng , Quentin Perret , Suzuki K Poulose , Mark Rutland , Fuad Tabba , Oliver Upton , Marc Zyngier , kernel-team@android.com, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 23/25] KVM: arm64: Explicitly map 'kvm_vgic_global_state' at EL2 Date: Mon, 17 Oct 2022 12:52:07 +0100 Message-Id: <20221017115209.2099-24-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221017115209.2099-1-will@kernel.org> References: <20221017115209.2099-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221017_045346_602504_5FC9CF3A X-CRM114-Status: GOOD ( 13.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Quentin Perret The pkvm hypervisor at EL2 may need to read the 'kvm_vgic_global_state' variable from the host, for example when saving and restoring the state of the virtual GIC. Explicitly map 'kvm_vgic_global_state' in the stage-1 page-table of the pKVM hypervisor rather than relying on mapping all of the host '.rodata' section. Tested-by: Vincent Donnefort Signed-off-by: Quentin Perret Signed-off-by: Will Deacon --- arch/arm64/kvm/hyp/nvhe/setup.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/kvm/hyp/nvhe/setup.c b/arch/arm64/kvm/hyp/nvhe/setup.c index 0f69c1393416..5a371ab236db 100644 --- a/arch/arm64/kvm/hyp/nvhe/setup.c +++ b/arch/arm64/kvm/hyp/nvhe/setup.c @@ -161,6 +161,11 @@ static int recreate_hyp_mappings(phys_addr_t phys, unsigned long size, if (ret) return ret; + ret = pkvm_create_mappings(&kvm_vgic_global_state, + &kvm_vgic_global_state + 1, prot); + if (ret) + return ret; + return 0; }