Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp900327imm; Fri, 29 Jun 2018 08:09:34 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfmNnVWDufxoxX8GLm8hKjR/xT851G1qkmnh6S7TGzOlLAK6C1wP9mBlL+2+3QAgHRKZPAe X-Received: by 2002:a62:2605:: with SMTP id m5-v6mr14947246pfm.223.1530284974855; Fri, 29 Jun 2018 08:09:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530284974; cv=none; d=google.com; s=arc-20160816; b=Rxh6N7GEoBKJ33ACL+lw1XpwKCbyC8KNXoc2ys7FfUNPcVEaK4N125/m0Rmla77U5m HcLyWG2fFZ2m0FXEd3H0CdLqA3ZMInekg+pjh/kdH3r9CC92pTBJo6BoIoouglh41VLB Z44wFbJw9J9alrWv/O8gr7NKL25Ry9WyCsiYqEog3+chByVQabMP+RfDh+bZyMPznL4e sMPT2vBQzW/fOAh6o3AE7NB8FugLiNl5G/x57fte8Zer5rbbNOjBxu9hEVnvxdah0khn Z3XhI7eZOP7ibMk1tnHU5AkJZnaX2vPabMK6wqQo3PtR/zCRpk8/iW80DxuCADszcWMr S+QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=ut8vwlmH5CaSZ7pTKmC+YLplkIWKnfqccB7F9a+i9ic=; b=pHpbpyqJrKNWeH5xCWt6OxhxIUPWQybQYbXgdErB3gRfBn/HEmhqkr5FCxUPyTfWQ3 3aaM6ybYUWOFTJg9TxJtowo0nQ4ZmXtTVoBMfo66Hut1VvTE3GauGzPmNDnm/Ofj9Ry8 y2IA2I4MtmdIz5GC1YphhsLV3JdTnSA728t3D6z5NaUsR/8C/EUcZjamsyfgkgyE7vEO JKOdL2/qh5EGR8FdzFm3P6Rd3ChVRRM+2RWo88llS03dCa/NNuVKLB7Yr1GVhhXsuxeW a2I1vbdE4zxkGh0d+NgxqfdK05V4xfoTMImJV9eYFCWM13Pg6m8d33cX/Swn5QkKpaJS ndWg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v14-v6si8911269pfe.149.2018.06.29.08.09.19; Fri, 29 Jun 2018 08:09:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754911AbeF2LUz (ORCPT + 99 others); Fri, 29 Jun 2018 07:20:55 -0400 Received: from foss.arm.com ([217.140.101.70]:60184 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965094AbeF2LQn (ORCPT ); Fri, 29 Jun 2018 07:16:43 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0EC2918A; Fri, 29 Jun 2018 04:16:43 -0700 (PDT) Received: from en101.cambridge.arm.com (en101.cambridge.arm.com [10.1.206.73]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 889DF3F266; Fri, 29 Jun 2018 04:16:40 -0700 (PDT) From: Suzuki K Poulose To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, james.morse@arm.com, marc.zyngier@arm.com, cdall@kernel.org, eric.auger@redhat.com, julien.grall@arm.com, will.deacon@arm.com, catalin.marinas@arm.com, punit.agrawal@arm.com, qemu-devel@nongnu.org, Suzuki K Poulose , Christoffer Dall Subject: [PATCH v3 11/20] kvm: arm64: Helper for computing VTCR_EL2.SL0 Date: Fri, 29 Jun 2018 12:15:31 +0100 Message-Id: <1530270944-11351-12-git-send-email-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530270944-11351-1-git-send-email-suzuki.poulose@arm.com> References: <1530270944-11351-1-git-send-email-suzuki.poulose@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org VTCR_EL2 holds the following key stage2 translation table parameters: SL0 - Entry level in the page table lookup. T0SZ - Denotes the size of the memory addressed by the table. We have been using fixed values for the SL0 depending on the page size as we have a fixed IPA size. But since we are about to make it dynamic, we need to calculate the SL0 at runtime per VM. This patch adds a helper to comput the value of SL0 for a given IPA. Cc: Marc Zyngier Cc: Christoffer Dall Signed-off-by: Suzuki K Poulose --- Changes since v2: - Part 2 of split from VTCR & VTTBR dynamic configuration --- arch/arm64/include/asm/kvm_arm.h | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index c557f45..11a7db0 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -153,7 +153,8 @@ * 2 level page tables (SL = 1) */ #define VTCR_EL2_TGRAN_FLAGS (VTCR_EL2_TG0_64K | VTCR_EL2_SL0_LVL1) -#define VTTBR_X_TGRAN_MAGIC 38 +#define VTCR_EL2_TGRAN_SL0_BASE 3UL + #elif defined(CONFIG_ARM64_16K_PAGES) /* * Stage2 translation configuration: @@ -161,7 +162,7 @@ * 2 level page tables (SL = 1) */ #define VTCR_EL2_TGRAN_FLAGS (VTCR_EL2_TG0_16K | VTCR_EL2_SL0_LVL1) -#define VTTBR_X_TGRAN_MAGIC 42 +#define VTCR_EL2_TGRAN_SL0_BASE 3UL #else /* 4K */ /* * Stage2 translation configuration: @@ -169,11 +170,39 @@ * 3 level page tables (SL = 1) */ #define VTCR_EL2_TGRAN_FLAGS (VTCR_EL2_TG0_4K | VTCR_EL2_SL0_LVL1) -#define VTTBR_X_TGRAN_MAGIC 37 +#define VTCR_EL2_TGRAN_SL0_BASE 2UL #endif #define VTCR_EL2_FLAGS (VTCR_EL2_COMMON_BITS | VTCR_EL2_TGRAN_FLAGS) /* + * VTCR_EL2:SL0 indicates the entry level for Stage2 translation. + * Interestingly, it depends on the page size. + * See D.10.2.110, VTCR_EL2, in ARM DDI 0487B.b + * + * ----------------------------------------- + * | Entry level | 4K | 16K/64K | + * ------------------------------------------ + * | Level: 0 | 2 | - | + * ------------------------------------------ + * | Level: 1 | 1 | 2 | + * ------------------------------------------ + * | Level: 2 | 0 | 1 | + * ------------------------------------------ + * | Level: 3 | - | 0 | + * ------------------------------------------ + * + * That table roughly translates to : + * + * SL0(PAGE_SIZE, Entry_level) = SL0_BASE(PAGE_SIZE) - Entry_Level + * + * Where SL0_BASE(4K) = 2 and SL0_BASE(16K) = 3, SL0_BASE(64K) = 3, provided + * we take care of ruling out the unsupported cases and + * Entry_Level = 4 - Number_of_levels. + * + */ +#define VTCR_EL2_SL0(levels) \ + ((VTCR_EL2_TGRAN_SL0_BASE - (4 - (levels))) << VTCR_EL2_SL0_SHIFT) +/* * ARM VMSAv8-64 defines an algorithm for finding the translation table * descriptors in section D4.2.8 in ARM DDI 0487B.b. * -- 2.7.4