Received: by 10.192.165.156 with SMTP id m28csp706963imm; Mon, 16 Apr 2018 07:28:29 -0700 (PDT) X-Google-Smtp-Source: AIpwx48PA2ewb2bNOq5gcb9h/2cVSYJaoQDgvoEXGz4hsr3FmVRo52vRh5r4p4MccnC/NP73FFdY X-Received: by 10.101.101.196 with SMTP id y4mr13125140pgv.129.1523888909229; Mon, 16 Apr 2018 07:28:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523888909; cv=none; d=google.com; s=arc-20160816; b=zFIXvj/54TfPcACZ902qtp019i74xv7Z7a/OyMopf2REH909Uu5GqEm/eD+dLOaZSr bZNnvGiYtxN/EZZpefbfyBfrHykCxrlYvm3NCOnnXsQomOV+UKFTkzZFNTz+anJedaIL fcxTMAC83mFtaExKJz+xnn4cVi5ZHA3HEXSjvHVGOZFeposyh222N1Ghv5UjeEwtBaoW jMdcDyXRQwCH3VfZb7S6AJQZ+9DEBExq7e8SMcva+wmXCmwPeULiBOCVncd0dGIq655G tYdoA+CGvrcW8HzRKagsh4MZdhUgv6aEVrOqxJ+zvukVwZQ05/u/yBOLB4GOk0r7lk0i puIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:arc-authentication-results; bh=rezrUdpUaqCJ3StnuxyNbQ3aamPTJFoK9dMuGLdFA2s=; b=ATi9PNlkzBYhkC0DbrmIsZevQkQgTg6foIYhd3M+Z0sqVgYy2k2ITMd2yiWr+VCLYP BOIHKdvpA/npLQsCe6dLejAky1wAU4WTzkvnteZoRMShaQBZGi78jKHnSyM4eNOtBVfO qBeximDgM1LImQkp7/NhCs2Euy4D9kf/Oeznt7ol7QRcRIbnSJFyYKv7SUhDIdBH7qXF S3eiCJgrPBo2J02Va5qPIqVVTVouxjkZNQZUjEjnTYd+Zp4o43lAAAiNsycpLiOlshNR 7DqLyNZCubA6n6G7g4o54qHXIYp82IG4kIgg0V/Yr3RAP7OhKpSuA3mg9omUgei9xDw2 wfdQ== 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 v201si4167824pgb.295.2018.04.16.07.28.14; Mon, 16 Apr 2018 07:28:29 -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 S1754420AbeDPKZz (ORCPT + 99 others); Mon, 16 Apr 2018 06:25:55 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:57758 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754304AbeDPKZx (ORCPT ); Mon, 16 Apr 2018 06:25:53 -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 E0A2215B2; Mon, 16 Apr 2018 03:25:52 -0700 (PDT) Received: from [10.1.206.73] (en101.cambridge.arm.com [10.1.206.73]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8F3013F25D; Mon, 16 Apr 2018 03:25:48 -0700 (PDT) Subject: Re: [PATCH v2 14/17] kvm: arm64: Switch to per VM IPA limit To: Punit Agrawal Cc: linux-arm-kernel@lists.infradead.org, ard.biesheuvel@linaro.org, kvm@vger.kernel.org, marc.zyngier@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, kristina.martsenko@arm.com, pbonzini@redhat.com, kvmarm@lists.cs.columbia.edu References: <1522156531-28348-1-git-send-email-suzuki.poulose@arm.com> <1522156531-28348-15-git-send-email-suzuki.poulose@arm.com> <87muy7vzoy.fsf@e105922-lin.cambridge.arm.com> From: Suzuki K Poulose Message-ID: <684e0890-6dde-58e3-7e9b-6839f6597c67@arm.com> Date: Mon, 16 Apr 2018 11:25:46 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <87muy7vzoy.fsf@e105922-lin.cambridge.arm.com> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 13/04/18 17:27, Punit Agrawal wrote: > Hi Suzuki, > > I haven't had a chance to look at the code but noticed one issue below. > > Suzuki K Poulose writes: > >> Now that we can manage the stage2 page table per VM, switch the >> configuration details to per VM instance. We keep track of the >> IPA bits, number of page table levels and the VTCR bits (which >> depends on the IPA and the number of levels). While at it, remove >> unused pgd_lock field from kvm_arch for arm64. >> >> Cc: Marc Zyngier >> Cc: Christoffer Dall >> Signed-off-by: Suzuki K Poulose >> --- >> arch/arm64/include/asm/kvm_host.h | 14 ++++++++++++-- >> arch/arm64/include/asm/kvm_mmu.h | 11 +++++++++-- >> arch/arm64/include/asm/stage2_pgtable.h | 1 - >> arch/arm64/kvm/hyp/switch.c | 3 +-- >> virt/kvm/arm/mmu.c | 4 ++++ >> 5 files changed, 26 insertions(+), 7 deletions(-) >> > > [...] > >> diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h >> index bb458bf..e86d7f4 100644 >> --- a/arch/arm64/include/asm/kvm_mmu.h >> +++ b/arch/arm64/include/asm/kvm_mmu.h >> @@ -136,9 +136,10 @@ static inline unsigned long __kern_hyp_va(unsigned long v) >> */ >> #define KVM_PHYS_SHIFT (40) >> >> -#define kvm_phys_shift(kvm) KVM_PHYS_SHIFT >> +#define kvm_phys_shift(kvm) (kvm->arch.phys_shift) >> #define kvm_phys_size(kvm) (_AC(1, ULL) << kvm_phys_shift(kvm)) >> #define kvm_phys_mask(kvm) (kvm_phys_size(kvm) - _AC(1, ULL)) >> +#define kvm_stage2_levels(kvm) (kvm->arch.s2_levels) >> >> static inline bool kvm_page_empty(void *ptr) >> { > > [...] > >> diff --git a/arch/arm64/include/asm/stage2_pgtable.h b/arch/arm64/include/asm/stage2_pgtable.h >> index 33e8ebb..9b75b83 100644 >> --- a/arch/arm64/include/asm/stage2_pgtable.h >> +++ b/arch/arm64/include/asm/stage2_pgtable.h >> @@ -44,7 +44,6 @@ >> */ >> #define __s2_pgd_ptrs(pa, lvls) (1 << ((pa) - pt_levels_pgdir_shift((lvls)))) >> >> -#define kvm_stage2_levels(kvm) stage2_pt_levels(kvm_phys_shift(kvm)) >> #define stage2_pgdir_shift(kvm) \ >> pt_levels_pgdir_shift(kvm_stage2_levels(kvm)) >> #define stage2_pgdir_size(kvm) (_AC(1, UL) << stage2_pgdir_shift((kvm))) > > [...] > >> diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c >> index 7a264c6..746f38e 100644 >> --- a/virt/kvm/arm/mmu.c >> +++ b/virt/kvm/arm/mmu.c >> @@ -753,6 +753,10 @@ int kvm_alloc_stage2_pgd(struct kvm *kvm) >> return -EINVAL; >> } >> >> + /* Make sure we have the stage2 configured for this VM */ >> + if (WARN_ON(!kvm_stage2_levels(kvm))) >> + return -EINVAL; >> + > > This hunk breaks the 32-bit build as kvm_stag2_levels() isn't defined on > arm. Thanks for spotting. I have fixed this locally in my next version to check for the kvm_phys_shift(), as I plan to delay the levels selection to the actual allocation of the table, giving us a fall back to increase the level if we are unable to allocate contiguous pages (e.g, 16 * 64K pages with say 46bit IPA). Cheers Suzuki