From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 817098F5F; Mon, 13 Feb 2023 15:48:57 +0000 (UTC) Received: by mail-il1-f175.google.com with SMTP id n2so5336327ili.11; Mon, 13 Feb 2023 07:48:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676303336; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=Waw3704gOD/az5PcxO/EsghNrg3YZs8kXzHhQwOTEJs=; b=L5JDfZTnchppM3i6PqdvZLVMUS05vfV6UthgxdbPQcP2L3fl48I39lLW0iJEfZkUwu Yhd91zOLTLdUPCObSKvyqf5a2esNEHrrVH5jUviY7UGp55DzP3Vx7wko/pfxNuYcL3JF sF8+crevet79/M2ZQwBGnzvAFtVje9FYHqRMM+xHXqQvuEu98OE2ZO4xhiKk+MmrRCD4 eVEJzyuV41/UWwvhPLRxYNpdL4NzIj6Gj7Dz9nd1v930bHIHEIklMpwWCYVp/uDEvLdG +wlnMESx22SdV5y5lTx5s1QP1SP9eErTeKre0IHAFHoD5KHfSJPrpPMQupn3q3xCuQ/g 2ixQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676303336; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Waw3704gOD/az5PcxO/EsghNrg3YZs8kXzHhQwOTEJs=; b=3yvRebKEkX+Odb18Mz3U/fOEF+mUr3TtITmObwY4bwppUrwSu22koPSIaxmW3PPM4w nVik2C3YUle0Fg0uyQOcbAusSdrAoXJkn/GE8HC1A8RrAfUUQ1ZzxgLRv1qg5AFCUJwy Jp721ljGDpdUXiC4mCO5sTO9KYuzwFOxOrXdL64WsSgg/PIlGmA+GSoxqAeAmgkuTL5Q 7DqbOlxYRCVjZ8aIN8kMls129/1t/o7wiJ/VyKuWFOlGb/pMFW883GEAVCNKg/F0CW7d 9nG6F+VDW4wtltiHGGe4zgOagjSZ2bjh1q156ekiguCEquWrJuCMW/W55OSHsxsHLABx Vg/Q== X-Gm-Message-State: AO0yUKUzSEE9ROO86pXuXvWA4VAgR2pfhjaF2ppQ8BDQuBzjCBqVLLMf VSP9h7oThmgNd5pJDAzbJks= X-Google-Smtp-Source: AK7set+FwZ+W7PnwPjiG2Mo2t7jCLHwiWgiv5IrmVFUv0YbtS1W/pjLs5Z/wAor1s/0TtYblSNqN9g== X-Received: by 2002:a05:6e02:ee3:b0:315:363e:b140 with SMTP id j3-20020a056e020ee300b00315363eb140mr4769616ilk.1.1676303336441; Mon, 13 Feb 2023 07:48:56 -0800 (PST) Received: from localhost (88-115-161-74.elisa-laajakaista.fi. [88.115.161.74]) by smtp.gmail.com with ESMTPSA id h26-20020a02c73a000000b00389d02a032dsm4041122jao.172.2023.02.13.07.48.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 07:48:56 -0800 (PST) Date: Mon, 13 Feb 2023 17:48:46 +0200 From: Zhi Wang To: Steven Price Cc: kvm@vger.kernel.org, kvmarm@lists.linux.dev, Catalin Marinas , Marc Zyngier , Will Deacon , James Morse , Oliver Upton , Suzuki K Poulose , Zenghui Yu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Joey Gouly , Alexandru Elisei , Christoffer Dall , Fuad Tabba , linux-coco@lists.linux.dev Subject: Re: [RFC PATCH 04/28] arm64: RME: Check for RME support at KVM init Message-ID: <20230213174846.00003fad@gmail.com> In-Reply-To: <20230127112932.38045-5-steven.price@arm.com> References: <20230127112248.136810-1-suzuki.poulose@arm.com> <20230127112932.38045-1-steven.price@arm.com> <20230127112932.38045-5-steven.price@arm.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Fri, 27 Jan 2023 11:29:08 +0000 Steven Price wrote: > Query the RMI version number and check if it is a compatible version. A > static key is also provided to signal that a supported RMM is available. > > Functions are provided to query if a VM or VCPU is a realm (or rec) > which currently will always return false. > > Signed-off-by: Steven Price > --- > arch/arm64/include/asm/kvm_emulate.h | 17 ++++++++++ > arch/arm64/include/asm/kvm_host.h | 4 +++ > arch/arm64/include/asm/kvm_rme.h | 22 +++++++++++++ > arch/arm64/include/asm/virt.h | 1 + > arch/arm64/kvm/Makefile | 3 +- > arch/arm64/kvm/arm.c | 8 +++++ > arch/arm64/kvm/rme.c | 49 ++++++++++++++++++++++++++++ > 7 files changed, 103 insertions(+), 1 deletion(-) > create mode 100644 arch/arm64/include/asm/kvm_rme.h > create mode 100644 arch/arm64/kvm/rme.c > > diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h > index 9bdba47f7e14..5a2b7229e83f 100644 > --- a/arch/arm64/include/asm/kvm_emulate.h > +++ b/arch/arm64/include/asm/kvm_emulate.h > @@ -490,4 +490,21 @@ static inline bool vcpu_has_feature(struct kvm_vcpu *vcpu, int feature) > return test_bit(feature, vcpu->arch.features); > } > > +static inline bool kvm_is_realm(struct kvm *kvm) > +{ > + if (static_branch_unlikely(&kvm_rme_is_available)) > + return kvm->arch.is_realm; > + return false; > +} > + > +static inline enum realm_state kvm_realm_state(struct kvm *kvm) > +{ > + return READ_ONCE(kvm->arch.realm.state); > +} > + > +static inline bool vcpu_is_rec(struct kvm_vcpu *vcpu) > +{ > + return false; > +} > + > #endif /* __ARM64_KVM_EMULATE_H__ */ > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 35a159d131b5..04347c3a8c6b 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -26,6 +26,7 @@ > #include > #include > #include > +#include > > #define __KVM_HAVE_ARCH_INTC_INITIALIZED > > @@ -240,6 +241,9 @@ struct kvm_arch { > * the associated pKVM instance in the hypervisor. > */ > struct kvm_protected_vm pkvm; > + > + bool is_realm; ^ It would be better to put more comments which really helps on the review. I was looking for the user of this memeber to see when it is set. It seems it is not in this patch. It would have been nice to have a quick answer from the comments. > + struct realm realm; > }; > > struct kvm_vcpu_fault_info { > diff --git a/arch/arm64/include/asm/kvm_rme.h b/arch/arm64/include/asm/kvm_rme.h > new file mode 100644 > index 000000000000..c26bc2c6770d > --- /dev/null > +++ b/arch/arm64/include/asm/kvm_rme.h > @@ -0,0 +1,22 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Copyright (C) 2023 ARM Ltd. > + */ > + > +#ifndef __ASM_KVM_RME_H > +#define __ASM_KVM_RME_H > + > +enum realm_state { > + REALM_STATE_NONE, > + REALM_STATE_NEW, > + REALM_STATE_ACTIVE, > + REALM_STATE_DYING > +}; > + > +struct realm { > + enum realm_state state; > +}; > + > +int kvm_init_rme(void); > + > +#endif > diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h > index 4eb601e7de50..be1383e26626 100644 > --- a/arch/arm64/include/asm/virt.h > +++ b/arch/arm64/include/asm/virt.h > @@ -80,6 +80,7 @@ void __hyp_set_vectors(phys_addr_t phys_vector_base); > void __hyp_reset_vectors(void); > > DECLARE_STATIC_KEY_FALSE(kvm_protected_mode_initialized); > +DECLARE_STATIC_KEY_FALSE(kvm_rme_is_available); > > /* Reports the availability of HYP mode */ > static inline bool is_hyp_mode_available(void) > diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile > index 5e33c2d4645a..d2f0400c50da 100644 > --- a/arch/arm64/kvm/Makefile > +++ b/arch/arm64/kvm/Makefile > @@ -20,7 +20,8 @@ kvm-y += arm.o mmu.o mmio.o psci.o hypercalls.o pvtime.o \ > vgic/vgic-v3.o vgic/vgic-v4.o \ > vgic/vgic-mmio.o vgic/vgic-mmio-v2.o \ > vgic/vgic-mmio-v3.o vgic/vgic-kvm-device.o \ > - vgic/vgic-its.o vgic/vgic-debug.o > + vgic/vgic-its.o vgic/vgic-debug.o \ > + rme.o > > kvm-$(CONFIG_HW_PERF_EVENTS) += pmu-emul.o pmu.o > > diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c > index 9c5573bc4614..d97b39d042ab 100644 > --- a/arch/arm64/kvm/arm.c > +++ b/arch/arm64/kvm/arm.c > @@ -38,6 +38,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -47,6 +48,7 @@ > > static enum kvm_mode kvm_mode = KVM_MODE_DEFAULT; > DEFINE_STATIC_KEY_FALSE(kvm_protected_mode_initialized); > +DEFINE_STATIC_KEY_FALSE(kvm_rme_is_available); > > DECLARE_KVM_HYP_PER_CPU(unsigned long, kvm_hyp_vector); > > @@ -2213,6 +2215,12 @@ int kvm_arch_init(void *opaque) > > in_hyp_mode = is_kernel_in_hyp_mode(); > > + if (in_hyp_mode) { > + err = kvm_init_rme(); > + if (err) > + return err; > + } > + > if (cpus_have_final_cap(ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) || > cpus_have_final_cap(ARM64_WORKAROUND_1508412)) > kvm_info("Guests without required CPU erratum workarounds can deadlock system!\n" \ > diff --git a/arch/arm64/kvm/rme.c b/arch/arm64/kvm/rme.c > new file mode 100644 > index 000000000000..f6b587bc116e > --- /dev/null > +++ b/arch/arm64/kvm/rme.c > @@ -0,0 +1,49 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2023 ARM Ltd. > + */ > + > +#include > + > +#include > +#include > + > +static int rmi_check_version(void) > +{ > + struct arm_smccc_res res; > + int version_major, version_minor; > + > + arm_smccc_1_1_invoke(SMC_RMI_VERSION, &res); > + > + if (res.a0 == SMCCC_RET_NOT_SUPPORTED) > + return -ENXIO; > + > + version_major = RMI_ABI_VERSION_GET_MAJOR(res.a0); > + version_minor = RMI_ABI_VERSION_GET_MINOR(res.a0); > + > + if (version_major != RMI_ABI_MAJOR_VERSION) { > + kvm_err("Unsupported RMI ABI (version %d.%d) we support %d\n", > + version_major, version_minor, > + RMI_ABI_MAJOR_VERSION); > + return -ENXIO; > + } > + > + kvm_info("RMI ABI version %d.%d\n", version_major, version_minor); > + > + return 0; > +} > + > +int kvm_init_rme(void) > +{ > + if (PAGE_SIZE != SZ_4K) > + /* Only 4k page size on the host is supported */ > + return 0; > + > + if (rmi_check_version()) > + /* Continue without realm support */ > + return 0; > + > + /* Future patch will enable static branch kvm_rme_is_available */ > + > + return 0; > +} 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 0A214C64EC7 for ; Mon, 13 Feb 2023 15:50:13 +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:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WuRheUu0dSFIx4lDeX+GZbXWuDQzEWfbU3iOwP05siU=; b=WEjZ1b6nQhFzkR 24Xw+BxhNgsW0NPfUXm4emY+fx7qL1ZmcMar4CQDr88gU7T+avF1+szjJKpJCaKkVxhtJPsLx6a4S EJ1cqALyMYWWZaDa4YNVz6YPS+Pm5jlwHuSlA86lO/hi27ECMSowcoXWPZanVEQrUiewAbBtx5wqt C/FiDm+ndv4xQNOflieO6knNffjDZpq4hHmVLw3QQTYBjgFEkwrw/dzZ0oRltiCbXAL9+4pro67bC YHzq5kTvQoF99DJs43N3DWD5POeX0xIiOvugWvzV0ZnZT/c1NJwuCFjLrsTsg93L+AyknyfA/bzZO 3uVWCCRHa1yrxe97PA4Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pRb4l-00FJ4s-Is; Mon, 13 Feb 2023 15:49:08 +0000 Received: from mail-il1-x136.google.com ([2607:f8b0:4864:20::136]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pRb4e-00FJ1G-J0 for linux-arm-kernel@lists.infradead.org; Mon, 13 Feb 2023 15:49:02 +0000 Received: by mail-il1-x136.google.com with SMTP id h29so3530526ila.8 for ; Mon, 13 Feb 2023 07:48:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676303336; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=Waw3704gOD/az5PcxO/EsghNrg3YZs8kXzHhQwOTEJs=; b=L5JDfZTnchppM3i6PqdvZLVMUS05vfV6UthgxdbPQcP2L3fl48I39lLW0iJEfZkUwu Yhd91zOLTLdUPCObSKvyqf5a2esNEHrrVH5jUviY7UGp55DzP3Vx7wko/pfxNuYcL3JF sF8+crevet79/M2ZQwBGnzvAFtVje9FYHqRMM+xHXqQvuEu98OE2ZO4xhiKk+MmrRCD4 eVEJzyuV41/UWwvhPLRxYNpdL4NzIj6Gj7Dz9nd1v930bHIHEIklMpwWCYVp/uDEvLdG +wlnMESx22SdV5y5lTx5s1QP1SP9eErTeKre0IHAFHoD5KHfSJPrpPMQupn3q3xCuQ/g 2ixQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676303336; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Waw3704gOD/az5PcxO/EsghNrg3YZs8kXzHhQwOTEJs=; b=EZgYZ9gGcyRiDiLX+1XaOMEjr8FvX1LCiwYhK/fJYTuPq+OIRfAb1KKwpyeaAYMEy5 uuuvFSiUDRJmehdwtJLFp2FnOpHRWykDDnyAQeJSMAehMHxlzDHVGy5x82obbdLyDs0Q CsrOjMj5RZO2Nu7OZFhI4/w2fIKzTRvQgLr5xmJAJmBLVo/HKlk++n/gSnNzhugeTZpB zr6LaMi1laPUf0GuBi+kfYsGBPiA5VQ5hBdcOBrbcp15BnXjOZ0FJVvq7RoqbmNtQl4P kvYFUiDVOHKryIFsnqDiXfUmZ3rPVbMfu8xNBarmpcEyF0I+tbppo93cdvPu7RTmqVre 3I/w== X-Gm-Message-State: AO0yUKV6yfam/myHtikD5htvQFUX2ovnpMM2KV4jYrcc2YEkEXfDKaU8 7jPudFulQeLU1UM5Wo+fi8Wl2arhKZaWLA== X-Google-Smtp-Source: AK7set+FwZ+W7PnwPjiG2Mo2t7jCLHwiWgiv5IrmVFUv0YbtS1W/pjLs5Z/wAor1s/0TtYblSNqN9g== X-Received: by 2002:a05:6e02:ee3:b0:315:363e:b140 with SMTP id j3-20020a056e020ee300b00315363eb140mr4769616ilk.1.1676303336441; Mon, 13 Feb 2023 07:48:56 -0800 (PST) Received: from localhost (88-115-161-74.elisa-laajakaista.fi. [88.115.161.74]) by smtp.gmail.com with ESMTPSA id h26-20020a02c73a000000b00389d02a032dsm4041122jao.172.2023.02.13.07.48.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 07:48:56 -0800 (PST) Date: Mon, 13 Feb 2023 17:48:46 +0200 From: Zhi Wang To: Steven Price Cc: kvm@vger.kernel.org, kvmarm@lists.linux.dev, Catalin Marinas , Marc Zyngier , Will Deacon , James Morse , Oliver Upton , Suzuki K Poulose , Zenghui Yu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Joey Gouly , Alexandru Elisei , Christoffer Dall , Fuad Tabba , linux-coco@lists.linux.dev Subject: Re: [RFC PATCH 04/28] arm64: RME: Check for RME support at KVM init Message-ID: <20230213174846.00003fad@gmail.com> In-Reply-To: <20230127112932.38045-5-steven.price@arm.com> References: <20230127112248.136810-1-suzuki.poulose@arm.com> <20230127112932.38045-1-steven.price@arm.com> <20230127112932.38045-5-steven.price@arm.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230213_074900_687696_2F88D270 X-CRM114-Status: GOOD ( 32.18 ) 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="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, 27 Jan 2023 11:29:08 +0000 Steven Price wrote: > Query the RMI version number and check if it is a compatible version. A > static key is also provided to signal that a supported RMM is available. > > Functions are provided to query if a VM or VCPU is a realm (or rec) > which currently will always return false. > > Signed-off-by: Steven Price > --- > arch/arm64/include/asm/kvm_emulate.h | 17 ++++++++++ > arch/arm64/include/asm/kvm_host.h | 4 +++ > arch/arm64/include/asm/kvm_rme.h | 22 +++++++++++++ > arch/arm64/include/asm/virt.h | 1 + > arch/arm64/kvm/Makefile | 3 +- > arch/arm64/kvm/arm.c | 8 +++++ > arch/arm64/kvm/rme.c | 49 ++++++++++++++++++++++++++++ > 7 files changed, 103 insertions(+), 1 deletion(-) > create mode 100644 arch/arm64/include/asm/kvm_rme.h > create mode 100644 arch/arm64/kvm/rme.c > > diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h > index 9bdba47f7e14..5a2b7229e83f 100644 > --- a/arch/arm64/include/asm/kvm_emulate.h > +++ b/arch/arm64/include/asm/kvm_emulate.h > @@ -490,4 +490,21 @@ static inline bool vcpu_has_feature(struct kvm_vcpu *vcpu, int feature) > return test_bit(feature, vcpu->arch.features); > } > > +static inline bool kvm_is_realm(struct kvm *kvm) > +{ > + if (static_branch_unlikely(&kvm_rme_is_available)) > + return kvm->arch.is_realm; > + return false; > +} > + > +static inline enum realm_state kvm_realm_state(struct kvm *kvm) > +{ > + return READ_ONCE(kvm->arch.realm.state); > +} > + > +static inline bool vcpu_is_rec(struct kvm_vcpu *vcpu) > +{ > + return false; > +} > + > #endif /* __ARM64_KVM_EMULATE_H__ */ > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 35a159d131b5..04347c3a8c6b 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -26,6 +26,7 @@ > #include > #include > #include > +#include > > #define __KVM_HAVE_ARCH_INTC_INITIALIZED > > @@ -240,6 +241,9 @@ struct kvm_arch { > * the associated pKVM instance in the hypervisor. > */ > struct kvm_protected_vm pkvm; > + > + bool is_realm; ^ It would be better to put more comments which really helps on the review. I was looking for the user of this memeber to see when it is set. It seems it is not in this patch. It would have been nice to have a quick answer from the comments. > + struct realm realm; > }; > > struct kvm_vcpu_fault_info { > diff --git a/arch/arm64/include/asm/kvm_rme.h b/arch/arm64/include/asm/kvm_rme.h > new file mode 100644 > index 000000000000..c26bc2c6770d > --- /dev/null > +++ b/arch/arm64/include/asm/kvm_rme.h > @@ -0,0 +1,22 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Copyright (C) 2023 ARM Ltd. > + */ > + > +#ifndef __ASM_KVM_RME_H > +#define __ASM_KVM_RME_H > + > +enum realm_state { > + REALM_STATE_NONE, > + REALM_STATE_NEW, > + REALM_STATE_ACTIVE, > + REALM_STATE_DYING > +}; > + > +struct realm { > + enum realm_state state; > +}; > + > +int kvm_init_rme(void); > + > +#endif > diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h > index 4eb601e7de50..be1383e26626 100644 > --- a/arch/arm64/include/asm/virt.h > +++ b/arch/arm64/include/asm/virt.h > @@ -80,6 +80,7 @@ void __hyp_set_vectors(phys_addr_t phys_vector_base); > void __hyp_reset_vectors(void); > > DECLARE_STATIC_KEY_FALSE(kvm_protected_mode_initialized); > +DECLARE_STATIC_KEY_FALSE(kvm_rme_is_available); > > /* Reports the availability of HYP mode */ > static inline bool is_hyp_mode_available(void) > diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile > index 5e33c2d4645a..d2f0400c50da 100644 > --- a/arch/arm64/kvm/Makefile > +++ b/arch/arm64/kvm/Makefile > @@ -20,7 +20,8 @@ kvm-y += arm.o mmu.o mmio.o psci.o hypercalls.o pvtime.o \ > vgic/vgic-v3.o vgic/vgic-v4.o \ > vgic/vgic-mmio.o vgic/vgic-mmio-v2.o \ > vgic/vgic-mmio-v3.o vgic/vgic-kvm-device.o \ > - vgic/vgic-its.o vgic/vgic-debug.o > + vgic/vgic-its.o vgic/vgic-debug.o \ > + rme.o > > kvm-$(CONFIG_HW_PERF_EVENTS) += pmu-emul.o pmu.o > > diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c > index 9c5573bc4614..d97b39d042ab 100644 > --- a/arch/arm64/kvm/arm.c > +++ b/arch/arm64/kvm/arm.c > @@ -38,6 +38,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -47,6 +48,7 @@ > > static enum kvm_mode kvm_mode = KVM_MODE_DEFAULT; > DEFINE_STATIC_KEY_FALSE(kvm_protected_mode_initialized); > +DEFINE_STATIC_KEY_FALSE(kvm_rme_is_available); > > DECLARE_KVM_HYP_PER_CPU(unsigned long, kvm_hyp_vector); > > @@ -2213,6 +2215,12 @@ int kvm_arch_init(void *opaque) > > in_hyp_mode = is_kernel_in_hyp_mode(); > > + if (in_hyp_mode) { > + err = kvm_init_rme(); > + if (err) > + return err; > + } > + > if (cpus_have_final_cap(ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) || > cpus_have_final_cap(ARM64_WORKAROUND_1508412)) > kvm_info("Guests without required CPU erratum workarounds can deadlock system!\n" \ > diff --git a/arch/arm64/kvm/rme.c b/arch/arm64/kvm/rme.c > new file mode 100644 > index 000000000000..f6b587bc116e > --- /dev/null > +++ b/arch/arm64/kvm/rme.c > @@ -0,0 +1,49 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2023 ARM Ltd. > + */ > + > +#include > + > +#include > +#include > + > +static int rmi_check_version(void) > +{ > + struct arm_smccc_res res; > + int version_major, version_minor; > + > + arm_smccc_1_1_invoke(SMC_RMI_VERSION, &res); > + > + if (res.a0 == SMCCC_RET_NOT_SUPPORTED) > + return -ENXIO; > + > + version_major = RMI_ABI_VERSION_GET_MAJOR(res.a0); > + version_minor = RMI_ABI_VERSION_GET_MINOR(res.a0); > + > + if (version_major != RMI_ABI_MAJOR_VERSION) { > + kvm_err("Unsupported RMI ABI (version %d.%d) we support %d\n", > + version_major, version_minor, > + RMI_ABI_MAJOR_VERSION); > + return -ENXIO; > + } > + > + kvm_info("RMI ABI version %d.%d\n", version_major, version_minor); > + > + return 0; > +} > + > +int kvm_init_rme(void) > +{ > + if (PAGE_SIZE != SZ_4K) > + /* Only 4k page size on the host is supported */ > + return 0; > + > + if (rmi_check_version()) > + /* Continue without realm support */ > + return 0; > + > + /* Future patch will enable static branch kvm_rme_is_available */ > + > + return 0; > +} _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel