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 814D6C61D85 for ; Tue, 21 Nov 2023 23:28:44 +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:In-Reply-To:MIME-Version:References: 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=drecYHjdrvt/yKo8mnWUazu1XnT3bigdl53qQMkQRtQ=; b=OSNkwnOP/6NsPi oyMeHHWsFVBt99b53LFfJAsye4NfIuXg8iGyOq3Lvgrwqjf8bzOYSfDvbmdmSvLQiK3h2Hhe/4ozI BGVCojjrPYMqpFYaIikgNgfjx/0rm8ian0vIbn4epz4X9UyjUojSfXLgngBKbAritI+dWQ5NR6bxa 3Icvdz7uD3fFe7BnFUrNyFHIvRKNG95oO66t7b/gdnIoiKWVpwcZxJrtjXdS7Yvwj5Q2ejrPUqFI1 pC5fvSmBh35dW18hsVNtfE6tlp0ADFP/IOdR9Ki5B2qBdkH15xf16riL7ExZEkvQeo3ocOjrFYTX9 yP1styILVpek5a74T5lw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r5aA9-000G4K-0U; Tue, 21 Nov 2023 23:28:13 +0000 Received: from out-187.mta0.migadu.com ([91.218.175.187]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r5aA5-000G3d-0F for linux-arm-kernel@lists.infradead.org; Tue, 21 Nov 2023 23:28:11 +0000 Date: Tue, 21 Nov 2023 23:27:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1700609282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=2q8dv0rjx9h4tXKNgzb9NkEHz5STcz1Q2TUBr0ldfo4=; b=QNToNuD3IJTeznaC1U1UP7DbremOVuzOPkTGwIxq0AZdTlFw7LwG5SnJ0M5sR1RLjwMunW O9OBsByGxaevknXCrP+K9B699B12hJl02KZesXFexMMe+SaQkkN+M9MDwzCXPsi1rLakFG AYFMXf19GhkuwnqMLwaCzJJjGvD7zC0= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Oliver Upton To: Ryan Roberts Cc: Catalin Marinas , Will Deacon , Marc Zyngier , Suzuki K Poulose , James Morse , Zenghui Yu , Ard Biesheuvel , Anshuman Khandual , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev Subject: Re: [PATCH v5 11/12] KVM: selftests: arm64: Determine max ipa size per-page size Message-ID: References: <20231116142931.1675485-1-ryan.roberts@arm.com> <20231116142931.1675485-12-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20231116142931.1675485-12-ryan.roberts@arm.com> X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231121_152809_987998_2C467363 X-CRM114-Status: GOOD ( 20.84 ) 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 Thu, Nov 16, 2023 at 02:29:30PM +0000, Ryan Roberts wrote: > We are about to add 52 bit PA guest modes for 4K and 16K pages when the > system supports LPA2. In preparation beef up the logic that parses mmfr0 > to also tell us what the maximum supported PA size is for each page > size. Max PA size = 0 implies the page size is not supported at all. > > Signed-off-by: Ryan Roberts > --- > .../selftests/kvm/include/aarch64/processor.h | 4 +- > .../selftests/kvm/lib/aarch64/processor.c | 27 ++++++++++--- > tools/testing/selftests/kvm/lib/guest_modes.c | 40 ++++++++----------- > 3 files changed, 41 insertions(+), 30 deletions(-) > > diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h > index c42d683102c7..cf20e44e86f2 100644 > --- a/tools/testing/selftests/kvm/include/aarch64/processor.h > +++ b/tools/testing/selftests/kvm/include/aarch64/processor.h > @@ -119,8 +119,8 @@ enum { > /* Access flag update enable/disable */ > #define TCR_EL1_HA (1ULL << 39) > > -void aarch64_get_supported_page_sizes(uint32_t ipa, > - bool *ps4k, bool *ps16k, bool *ps64k); > +void aarch64_get_supported_page_sizes(uint32_t ipa, uint32_t *ipa4k, > + uint32_t *ipa16k, uint32_t *ipa64k); > > void vm_init_descriptor_tables(struct kvm_vm *vm); > void vcpu_init_descriptor_tables(struct kvm_vcpu *vcpu); > diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c > index 6fe12e985ba5..917cfeddb6b4 100644 > --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c > +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c > @@ -492,12 +492,24 @@ uint32_t guest_get_vcpuid(void) > return read_sysreg(tpidr_el1); > } > > -void aarch64_get_supported_page_sizes(uint32_t ipa, > - bool *ps4k, bool *ps16k, bool *ps64k) > +static uint32_t max_ipa_for_page_size(uint32_t vm_ipa, uint32_t gran, > + uint32_t not_sup_val, uint32_t ipa52_min_val) > +{ > + if (gran == not_sup_val) > + return 0; > + else if (gran >= ipa52_min_val && vm_ipa >= 52) > + return 52; > + else > + return min(vm_ipa, 48U); > +} > + > +void aarch64_get_supported_page_sizes(uint32_t ipa, uint32_t *ipa4k, > + uint32_t *ipa16k, uint32_t *ipa64k) > { > struct kvm_vcpu_init preferred_init; > int kvm_fd, vm_fd, vcpu_fd, err; > uint64_t val; > + uint32_t gran; > struct kvm_one_reg reg = { > .id = KVM_ARM64_SYS_REG(SYS_ID_AA64MMFR0_EL1), > .addr = (uint64_t)&val, > @@ -518,9 +530,14 @@ void aarch64_get_supported_page_sizes(uint32_t ipa, > err = ioctl(vcpu_fd, KVM_GET_ONE_REG, ®); > TEST_ASSERT(err == 0, KVM_IOCTL_ERROR(KVM_GET_ONE_REG, vcpu_fd)); > > - *ps4k = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_TGRAN4), val) != 0xf; > - *ps64k = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_TGRAN64), val) == 0; > - *ps16k = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_TGRAN16), val) != 0; > + gran = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_TGRAN4), val); > + *ipa4k = max_ipa_for_page_size(ipa, gran, 0xf, 1); > + > + gran = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_TGRAN64), val); > + *ipa64k = max_ipa_for_page_size(ipa, gran, 0xf, 0); > + > + gran = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_TGRAN16), val); > + *ipa16k = max_ipa_for_page_size(ipa, gran, 0, 2); > > close(vcpu_fd); > close(vm_fd); > diff --git a/tools/testing/selftests/kvm/lib/guest_modes.c b/tools/testing/selftests/kvm/lib/guest_modes.c > index 1df3ce4b16fd..c64c5cf49942 100644 > --- a/tools/testing/selftests/kvm/lib/guest_modes.c > +++ b/tools/testing/selftests/kvm/lib/guest_modes.c > @@ -18,33 +18,27 @@ void guest_modes_append_default(void) > #else > { > unsigned int limit = kvm_check_cap(KVM_CAP_ARM_VM_IPA_SIZE); > - bool ps4k, ps16k, ps64k; > + uint32_t ipa4k, ipa16k, ipa64k; > int i; > > - aarch64_get_supported_page_sizes(limit, &ps4k, &ps16k, &ps64k); > + aarch64_get_supported_page_sizes(limit, &ipa4k, &ipa16k, &ipa64k); > > - vm_mode_default = NUM_VM_MODES; > + guest_mode_append(VM_MODE_P52V48_64K, ipa64k >= 52, ipa64k >= 52); Can we just change guest_mode_append() to take a single bool argument and initialize both ::supported and ::enabled to its value? -- Thanks, Oliver _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel