From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFAF21A629 for ; Thu, 10 Nov 2022 19:03:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 964BAC433B5; Thu, 10 Nov 2022 19:03:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668107006; bh=jpgN/o7gJjsbua2rrgBmvkSKGFw4SbtSbfKaxMoXCwA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RrYvl8WqAFP7yk2IQrZvw2uDMMUA1NjRZDHLVT/Oi9WzfmZW+rAI9z5ccmK0IKL6B d377D6FTxGMnDakKIyO4DSXq/bG1crBV8QCeWMaPO634ARzbFqzAURPq0r7PIiBamB +l25Yb/TEmtRPqi75KdI7eNuaPlUM56C1eS5LIVbZV8HcBKJV2uEA19cq6Po+wf3d1 /YhPn4z/3StZQS6c1f33LbZYQ19EAVRwKjCdEGCHoArGQo0ujHvOhRgE6HltdgX3Xp B4kJ9fhMkpW/P1ziEqoWIkxGXEkEjqlPDdBsLJbJSSWpOS3mGWg/msD16koqXVCbBb vuSkc7/Pzg7rQ== From: Will Deacon To: kvmarm@lists.linux.dev Cc: Will Deacon , Sean Christopherson , Vincent Donnefort , Alexandru Elisei , Catalin Marinas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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 v6 05/26] KVM: arm64: Unify identifiers used to distinguish host and hypervisor Date: Thu, 10 Nov 2022 19:02:38 +0000 Message-Id: <20221110190259.26861-6-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221110190259.26861-1-will@kernel.org> References: <20221110190259.26861-1-will@kernel.org> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 'pkvm_component_id' enum type provides constants to refer to the host and the hypervisor, yet this information is duplicated by the 'pkvm_hyp_id' constant. Remove the definition of 'pkvm_hyp_id' and move the 'pkvm_component_id' type definition to 'mem_protect.h' so that it can be used outside of the memory protection code, for example when initialising the owner for hypervisor-owned pages. Reviewed-by: Oliver Upton Reviewed-by: Philippe Mathieu-Daudé Tested-by: Vincent Donnefort Signed-off-by: Will Deacon --- arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 6 +++++- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 8 -------- arch/arm64/kvm/hyp/nvhe/setup.c | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h index 80e99836eac7..f5705a1e972f 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -51,7 +51,11 @@ struct host_kvm { }; extern struct host_kvm host_kvm; -extern const u8 pkvm_hyp_id; +/* This corresponds to page-table locking order */ +enum pkvm_component_id { + PKVM_ID_HOST, + PKVM_ID_HYP, +}; int __pkvm_prot_finalize(void); int __pkvm_host_share_hyp(u64 pfn); diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index 1e78acf9662e..ff86f5bd230f 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -26,8 +26,6 @@ struct host_kvm host_kvm; static struct hyp_pool host_s2_pool; -const u8 pkvm_hyp_id = 1; - static void host_lock_component(void) { hyp_spin_lock(&host_kvm.lock); @@ -380,12 +378,6 @@ void handle_host_mem_abort(struct kvm_cpu_context *host_ctxt) BUG_ON(ret && ret != -EAGAIN); } -/* This corresponds to locking order */ -enum pkvm_component_id { - PKVM_ID_HOST, - PKVM_ID_HYP, -}; - struct pkvm_mem_transition { u64 nr_pages; diff --git a/arch/arm64/kvm/hyp/nvhe/setup.c b/arch/arm64/kvm/hyp/nvhe/setup.c index 8f2726d7e201..0312c9c74a5a 100644 --- a/arch/arm64/kvm/hyp/nvhe/setup.c +++ b/arch/arm64/kvm/hyp/nvhe/setup.c @@ -212,7 +212,7 @@ static int fix_host_ownership_walker(u64 addr, u64 end, u32 level, state = pkvm_getstate(kvm_pgtable_hyp_pte_prot(pte)); switch (state) { case PKVM_PAGE_OWNED: - return host_stage2_set_owner_locked(phys, PAGE_SIZE, pkvm_hyp_id); + return host_stage2_set_owner_locked(phys, PAGE_SIZE, PKVM_ID_HYP); case PKVM_PAGE_SHARED_OWNED: prot = pkvm_mkstate(PKVM_HOST_MEM_PROT, PKVM_PAGE_SHARED_BORROWED); break; -- 2.38.1.431.g37b22c650d-goog From mboxrd@z Thu Jan 1 00:00:00 1970 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 5ACD2C433FE for ; Thu, 10 Nov 2022 19:06:12 +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=dMmr89hUd2r+MOJq1iCxCtBdiOMJXdAaFH6VvdPlMIo=; b=eb17FTJxUtyAIr uNxh05tOJqJezHlu7ID1XtRROLKVoNHH690CNkq3g1oWCjVzpq8dwYUuBodannCBaRRk2ePIsAdwD 3tpPc6NJZkOtwNj1qrtATR6f/01IwuQ9a4IizItpGYQCzG7XZMnm4F2Px2YJwhU81e/eRRTzunpUz QIakC3q1sg7cN4jFM5TYUw89dWb3770wBDXppGhJjIxNcb7sRCUEN1iAt39t2Pu1SedTYbTLqX/1a aSgt3Iv865QZMdyOTdotV0q/Pge1cPQKWuCUmPyOAqVIX7/Uf7iMxDonLg1qcZ3T0+CfwTIZBSrS9 47sStj/8JtfUYYApYK8g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1otCrL-008TCD-Jw; Thu, 10 Nov 2022 19:05:07 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1otCpl-008S5t-LX for linux-arm-kernel@lists.infradead.org; Thu, 10 Nov 2022 19:03:31 +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 20DA3B822E0; Thu, 10 Nov 2022 19:03:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 964BAC433B5; Thu, 10 Nov 2022 19:03:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668107006; bh=jpgN/o7gJjsbua2rrgBmvkSKGFw4SbtSbfKaxMoXCwA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RrYvl8WqAFP7yk2IQrZvw2uDMMUA1NjRZDHLVT/Oi9WzfmZW+rAI9z5ccmK0IKL6B d377D6FTxGMnDakKIyO4DSXq/bG1crBV8QCeWMaPO634ARzbFqzAURPq0r7PIiBamB +l25Yb/TEmtRPqi75KdI7eNuaPlUM56C1eS5LIVbZV8HcBKJV2uEA19cq6Po+wf3d1 /YhPn4z/3StZQS6c1f33LbZYQ19EAVRwKjCdEGCHoArGQo0ujHvOhRgE6HltdgX3Xp B4kJ9fhMkpW/P1ziEqoWIkxGXEkEjqlPDdBsLJbJSSWpOS3mGWg/msD16koqXVCbBb vuSkc7/Pzg7rQ== From: Will Deacon To: kvmarm@lists.linux.dev Cc: Will Deacon , Sean Christopherson , Vincent Donnefort , Alexandru Elisei , Catalin Marinas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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 v6 05/26] KVM: arm64: Unify identifiers used to distinguish host and hypervisor Date: Thu, 10 Nov 2022 19:02:38 +0000 Message-Id: <20221110190259.26861-6-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221110190259.26861-1-will@kernel.org> References: <20221110190259.26861-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221110_110330_019408_F97819CE X-CRM114-Status: GOOD ( 16.41 ) 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org VGhlICdwa3ZtX2NvbXBvbmVudF9pZCcgZW51bSB0eXBlIHByb3ZpZGVzIGNvbnN0YW50cyB0byBy ZWZlciB0byB0aGUKaG9zdCBhbmQgdGhlIGh5cGVydmlzb3IsIHlldCB0aGlzIGluZm9ybWF0aW9u IGlzIGR1cGxpY2F0ZWQgYnkgdGhlCidwa3ZtX2h5cF9pZCcgY29uc3RhbnQuCgpSZW1vdmUgdGhl IGRlZmluaXRpb24gb2YgJ3Brdm1faHlwX2lkJyBhbmQgbW92ZSB0aGUgJ3Brdm1fY29tcG9uZW50 X2lkJwp0eXBlIGRlZmluaXRpb24gdG8gJ21lbV9wcm90ZWN0LmgnIHNvIHRoYXQgaXQgY2FuIGJl IHVzZWQgb3V0c2lkZSBvZgp0aGUgbWVtb3J5IHByb3RlY3Rpb24gY29kZSwgZm9yIGV4YW1wbGUg d2hlbiBpbml0aWFsaXNpbmcgdGhlIG93bmVyIGZvcgpoeXBlcnZpc29yLW93bmVkIHBhZ2VzLgoK UmV2aWV3ZWQtYnk6IE9saXZlciBVcHRvbiA8b2xpdmVyLnVwdG9uQGxpbnV4LmRldj4KUmV2aWV3 ZWQtYnk6IFBoaWxpcHBlIE1hdGhpZXUtRGF1ZMOpIDxwaGlsbWRAbGluYXJvLm9yZz4KVGVzdGVk LWJ5OiBWaW5jZW50IERvbm5lZm9ydCA8dmRvbm5lZm9ydEBnb29nbGUuY29tPgpTaWduZWQtb2Zm LWJ5OiBXaWxsIERlYWNvbiA8d2lsbEBrZXJuZWwub3JnPgotLS0KIGFyY2gvYXJtNjQva3ZtL2h5 cC9pbmNsdWRlL252aGUvbWVtX3Byb3RlY3QuaCB8IDYgKysrKystCiBhcmNoL2FybTY0L2t2bS9o eXAvbnZoZS9tZW1fcHJvdGVjdC5jICAgICAgICAgfCA4IC0tLS0tLS0tCiBhcmNoL2FybTY0L2t2 bS9oeXAvbnZoZS9zZXR1cC5jICAgICAgICAgICAgICAgfCAyICstCiAzIGZpbGVzIGNoYW5nZWQs IDYgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC9hcm02 NC9rdm0vaHlwL2luY2x1ZGUvbnZoZS9tZW1fcHJvdGVjdC5oIGIvYXJjaC9hcm02NC9rdm0vaHlw L2luY2x1ZGUvbnZoZS9tZW1fcHJvdGVjdC5oCmluZGV4IDgwZTk5ODM2ZWFjNy4uZjU3MDVhMWU5 NzJmIDEwMDY0NAotLS0gYS9hcmNoL2FybTY0L2t2bS9oeXAvaW5jbHVkZS9udmhlL21lbV9wcm90 ZWN0LmgKKysrIGIvYXJjaC9hcm02NC9rdm0vaHlwL2luY2x1ZGUvbnZoZS9tZW1fcHJvdGVjdC5o CkBAIC01MSw3ICs1MSwxMSBAQCBzdHJ1Y3QgaG9zdF9rdm0gewogfTsKIGV4dGVybiBzdHJ1Y3Qg aG9zdF9rdm0gaG9zdF9rdm07CiAKLWV4dGVybiBjb25zdCB1OCBwa3ZtX2h5cF9pZDsKKy8qIFRo aXMgY29ycmVzcG9uZHMgdG8gcGFnZS10YWJsZSBsb2NraW5nIG9yZGVyICovCitlbnVtIHBrdm1f Y29tcG9uZW50X2lkIHsKKwlQS1ZNX0lEX0hPU1QsCisJUEtWTV9JRF9IWVAsCit9OwogCiBpbnQg X19wa3ZtX3Byb3RfZmluYWxpemUodm9pZCk7CiBpbnQgX19wa3ZtX2hvc3Rfc2hhcmVfaHlwKHU2 NCBwZm4pOwpkaWZmIC0tZ2l0IGEvYXJjaC9hcm02NC9rdm0vaHlwL252aGUvbWVtX3Byb3RlY3Qu YyBiL2FyY2gvYXJtNjQva3ZtL2h5cC9udmhlL21lbV9wcm90ZWN0LmMKaW5kZXggMWU3OGFjZjk2 NjJlLi5mZjg2ZjViZDIzMGYgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtNjQva3ZtL2h5cC9udmhlL21l bV9wcm90ZWN0LmMKKysrIGIvYXJjaC9hcm02NC9rdm0vaHlwL252aGUvbWVtX3Byb3RlY3QuYwpA QCAtMjYsOCArMjYsNiBAQCBzdHJ1Y3QgaG9zdF9rdm0gaG9zdF9rdm07CiAKIHN0YXRpYyBzdHJ1 Y3QgaHlwX3Bvb2wgaG9zdF9zMl9wb29sOwogCi1jb25zdCB1OCBwa3ZtX2h5cF9pZCA9IDE7Ci0K IHN0YXRpYyB2b2lkIGhvc3RfbG9ja19jb21wb25lbnQodm9pZCkKIHsKIAloeXBfc3Bpbl9sb2Nr KCZob3N0X2t2bS5sb2NrKTsKQEAgLTM4MCwxMiArMzc4LDYgQEAgdm9pZCBoYW5kbGVfaG9zdF9t ZW1fYWJvcnQoc3RydWN0IGt2bV9jcHVfY29udGV4dCAqaG9zdF9jdHh0KQogCUJVR19PTihyZXQg JiYgcmV0ICE9IC1FQUdBSU4pOwogfQogCi0vKiBUaGlzIGNvcnJlc3BvbmRzIHRvIGxvY2tpbmcg b3JkZXIgKi8KLWVudW0gcGt2bV9jb21wb25lbnRfaWQgewotCVBLVk1fSURfSE9TVCwKLQlQS1ZN X0lEX0hZUCwKLX07Ci0KIHN0cnVjdCBwa3ZtX21lbV90cmFuc2l0aW9uIHsKIAl1NjQJCQkJbnJf cGFnZXM7CiAKZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQva3ZtL2h5cC9udmhlL3NldHVwLmMgYi9h cmNoL2FybTY0L2t2bS9oeXAvbnZoZS9zZXR1cC5jCmluZGV4IDhmMjcyNmQ3ZTIwMS4uMDMxMmM5 Yzc0YTVhIDEwMDY0NAotLS0gYS9hcmNoL2FybTY0L2t2bS9oeXAvbnZoZS9zZXR1cC5jCisrKyBi L2FyY2gvYXJtNjQva3ZtL2h5cC9udmhlL3NldHVwLmMKQEAgLTIxMiw3ICsyMTIsNyBAQCBzdGF0 aWMgaW50IGZpeF9ob3N0X293bmVyc2hpcF93YWxrZXIodTY0IGFkZHIsIHU2NCBlbmQsIHUzMiBs ZXZlbCwKIAlzdGF0ZSA9IHBrdm1fZ2V0c3RhdGUoa3ZtX3BndGFibGVfaHlwX3B0ZV9wcm90KHB0 ZSkpOwogCXN3aXRjaCAoc3RhdGUpIHsKIAljYXNlIFBLVk1fUEFHRV9PV05FRDoKLQkJcmV0dXJu IGhvc3Rfc3RhZ2UyX3NldF9vd25lcl9sb2NrZWQocGh5cywgUEFHRV9TSVpFLCBwa3ZtX2h5cF9p ZCk7CisJCXJldHVybiBob3N0X3N0YWdlMl9zZXRfb3duZXJfbG9ja2VkKHBoeXMsIFBBR0VfU0la RSwgUEtWTV9JRF9IWVApOwogCWNhc2UgUEtWTV9QQUdFX1NIQVJFRF9PV05FRDoKIAkJcHJvdCA9 IHBrdm1fbWtzdGF0ZShQS1ZNX0hPU1RfTUVNX1BST1QsIFBLVk1fUEFHRV9TSEFSRURfQk9SUk9X RUQpOwogCQlicmVhazsKLS0gCjIuMzguMS40MzEuZzM3YjIyYzY1MGQtZ29vZwoKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwg bWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8v bGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK