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 X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2F3BC38A2A for ; Thu, 7 May 2020 11:41:49 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B3EBB208E4 for ; Thu, 7 May 2020 11:41:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qGdS11zI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B3EBB208E4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=21pBnKILz5LVe2cKhiWsnyfxQ2UIdnZ+kQ8g4/uLTrY=; b=qGdS11zI055PYD DsDblwUQ9juZHkpNbIrBPsHMIpl8lw5/8e38ht5FWCX/76GdhUoFHn2DEsgus3ytczgcLWP4iDeGb ePTwR+9KIo/g4BMKmw90rBeaEFVRzwky65+wJpY3iORX37LTMxGsB3p/PUZYNxSFNNn6U+cnuMGmC vLt9B7UO9/L6DntSjnxX+ojzkPfwbGJA8GRw68n9eu/WV6QiEOFjwBWa//UxnOuBwgBcCMqDESCy5 tbJV+K6jRTXGklWeOKdqXJkJb6B0yjgKArmMO+fjmz8ivZefSxIDJsjRbevlV6WBiTbHmf+cTWDpb gMV8eyj3ZfGX/8AzllNg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWeuS-00083d-U1; Thu, 07 May 2020 11:41:48 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWeuO-0007wd-LH for linux-arm-kernel@lists.infradead.org; Thu, 07 May 2020 11:41:46 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 67A991FB; Thu, 7 May 2020 04:41:42 -0700 (PDT) Received: from [192.168.0.110] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6DA9D3F68F; Thu, 7 May 2020 04:41:40 -0700 (PDT) Subject: Re: [PATCH 01/26] KVM: arm64: Check advertised Stage-2 page size capability To: Marc Zyngier , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org References: <20200422120050.3693593-1-maz@kernel.org> <20200422120050.3693593-2-maz@kernel.org> From: Alexandru Elisei Message-ID: Date: Thu, 7 May 2020 12:42:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200422120050.3693593-2-maz@kernel.org> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200507_044144_788956_8E68455E X-CRM114-Status: GOOD ( 21.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Suzuki K Poulose , Andre Przywara , Christoffer Dall , Dave Martin , George Cherian , James Morse , "Zengtao \(B\)" , Catalin Marinas , Will Deacon , Jintack Lim , Julien Thierry Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, On 4/22/20 1:00 PM, Marc Zyngier wrote: > With ARMv8.5-GTG, the hardware (or more likely a hypervisor) can > advertise the supported Stage-2 page sizes. > > Let's check this at boot time. > > Signed-off-by: Marc Zyngier > --- > arch/arm64/include/asm/kvm_host.h | 2 +- > arch/arm64/include/asm/sysreg.h | 3 +++ > arch/arm64/kernel/cpufeature.c | 8 +++++++ > arch/arm64/kvm/reset.c | 40 ++++++++++++++++++++++++++++--- > virt/kvm/arm/arm.c | 4 +--- > 5 files changed, 50 insertions(+), 7 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 32c8a675e5a4a..7dd8fefa6aecd 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -670,7 +670,7 @@ static inline int kvm_arm_have_ssbd(void) > void kvm_vcpu_load_sysregs(struct kvm_vcpu *vcpu); > void kvm_vcpu_put_sysregs(struct kvm_vcpu *vcpu); > > -void kvm_set_ipa_limit(void); > +int kvm_set_ipa_limit(void); > > #define __KVM_HAVE_ARCH_VM_ALLOC > struct kvm *kvm_arch_alloc_vm(void); > diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h > index ebc6224328318..5d10c9148e844 100644 > --- a/arch/arm64/include/asm/sysreg.h > +++ b/arch/arm64/include/asm/sysreg.h > @@ -686,6 +686,9 @@ > #define ID_AA64ZFR0_SVEVER_SVE2 0x1 > > /* id_aa64mmfr0 */ > +#define ID_AA64MMFR0_TGRAN4_2_SHIFT 40 > +#define ID_AA64MMFR0_TGRAN64_2_SHIFT 36 > +#define ID_AA64MMFR0_TGRAN16_2_SHIFT 32 > #define ID_AA64MMFR0_TGRAN4_SHIFT 28 > #define ID_AA64MMFR0_TGRAN64_SHIFT 24 > #define ID_AA64MMFR0_TGRAN16_SHIFT 20 > diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c > index 9fac745aa7bb2..9892a845d06c9 100644 > --- a/arch/arm64/kernel/cpufeature.c > +++ b/arch/arm64/kernel/cpufeature.c > @@ -208,6 +208,14 @@ static const struct arm64_ftr_bits ftr_id_aa64zfr0[] = { > }; > > static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = { > + /* > + * Page size not being supported at Stage-2 are not fatal. You s/are not fatal/is not fatal > + * just give up KVM if PAGE_SIZE isn't supported there. Go fix > + * your favourite nesting hypervisor. > + */ > + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN4_2_SHIFT, 4, 1), > + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN64_2_SHIFT, 4, 1), > + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN16_2_SHIFT, 4, 1), > /* > * We already refuse to boot CPUs that don't support our configured > * page size, so we can only detect mismatches for a page size other > diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c > index 30b7ea680f66c..241db35a7ef4f 100644 > --- a/arch/arm64/kvm/reset.c > +++ b/arch/arm64/kvm/reset.c > @@ -9,6 +9,7 @@ > */ > > #include > +#include > #include > #include > #include > @@ -340,11 +341,42 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) > return ret; > } > > -void kvm_set_ipa_limit(void) > +int kvm_set_ipa_limit(void) > { > - unsigned int ipa_max, pa_max, va_max, parange; > + unsigned int ipa_max, pa_max, va_max, parange, tgran_2; > + u64 mmfr0 = read_sanitised_ftr_reg(SYS_ID_AA64MMFR0_EL1); > > - parange = read_sanitised_ftr_reg(SYS_ID_AA64MMFR0_EL1) & 0x7; > + /* > + * Check with ARMv8.5-GTG that our PAGE_SIZE is supported at > + * Stage-2. If not, things will stop very quickly. > + */ > + switch (PAGE_SIZE) { > + default: > + case SZ_4K: > + tgran_2 = ID_AA64MMFR0_TGRAN4_2_SHIFT; > + break; > + case SZ_16K: > + tgran_2 = ID_AA64MMFR0_TGRAN16_2_SHIFT; > + break; > + case SZ_64K: > + tgran_2 = ID_AA64MMFR0_TGRAN64_2_SHIFT; > + break; > + } > + > + switch (FIELD_GET(0xFUL << tgran_2, mmfr0)) { > + default: > + case 1: > + kvm_err("PAGE_SIZE not supported at Stage-2, giving up\n"); > + return -EINVAL; > + case 0: > + kvm_debug("PAGE_SIZE supported at Stage-2 (default)\n"); > + break; > + case 2: > + kvm_debug("PAGE_SIZE supported at Stage-2 (advertised)\n"); > + break; > + } > + > + parange = mmfr0 & 0x7; > pa_max = id_aa64mmfr0_parange_to_phys_shift(parange); > > /* Clamp the IPA limit to the PA size supported by the kernel */ > @@ -378,6 +410,8 @@ void kvm_set_ipa_limit(void) > "KVM IPA limit (%d bit) is smaller than default size\n", ipa_max); > kvm_ipa_limit = ipa_max; > kvm_info("IPA Size Limit: %dbits\n", kvm_ipa_limit); > + > + return 0; > } > > /* > diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c > index 48d0ec44ad77e..53b3ba9173ba7 100644 > --- a/virt/kvm/arm/arm.c > +++ b/virt/kvm/arm/arm.c > @@ -1387,9 +1387,7 @@ static inline void hyp_cpu_pm_exit(void) > > static int init_common_resources(void) > { > - kvm_set_ipa_limit(); > - > - return 0; > + return kvm_set_ipa_limit(); > } > > static int init_subsystems(void) For what is worth, I've taken a look at the ARMv8.5-GTG spec and your patch looks fine to me: Reviewed-by: Alexandru Elisei Thanks, Alex _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel