On Thu, Oct 12, 2023 at 8:02 AM Sebastian Ott <sebott@xxxxxxxxxx> wrote:
>
> On Thu, 12 Oct 2023, Sebastian Ott wrote:
> > On Mon, 9 Oct 2023, Raghavendra Rao Ananta wrote:
> >> +/* Create a VM that has one vCPU with PMUv3 configured. */
> >> +static void create_vpmu_vm(void *guest_code)
> >> +{
> >> + struct kvm_vcpu_init init;
> >> + uint8_t pmuver, ec;
> >> + uint64_t dfr0, irq = 23;
> >> + struct kvm_device_attr irq_attr = {
> >> + .group = KVM_ARM_VCPU_PMU_V3_CTRL,
> >> + .attr = KVM_ARM_VCPU_PMU_V3_IRQ,
> >> + .addr = (uint64_t)&irq,
> >> + };
> >> + struct kvm_device_attr init_attr = {
> >> + .group = KVM_ARM_VCPU_PMU_V3_CTRL,
> >> + .attr = KVM_ARM_VCPU_PMU_V3_INIT,
> >> + };
> >> +
> >> + /* The test creates the vpmu_vm multiple times. Ensure a clean state
> >> */
> >> + memset(&vpmu_vm, 0, sizeof(vpmu_vm));
> >> +
> >> + vpmu_vm.vm = vm_create(1);
> >> + vm_init_descriptor_tables(vpmu_vm.vm);
> >> + for (ec = 0; ec < ESR_EC_NUM; ec++) {
> >> + vm_install_sync_handler(vpmu_vm.vm, VECTOR_SYNC_CURRENT, ec,
> >> + guest_sync_handler);
> >> + }
> >> +
> >> + /* Create vCPU with PMUv3 */
> >> + vm_ioctl(vpmu_vm.vm, KVM_ARM_PREFERRED_TARGET, &init);
> >> + init.features[0] |= (1 << KVM_ARM_VCPU_PMU_V3);
> >> + vpmu_vm.vcpu = aarch64_vcpu_add(vpmu_vm.vm, 0, &init, guest_code);
> >> + vcpu_init_descriptor_tables(vpmu_vm.vcpu);
> >> + vpmu_vm.gic_fd = vgic_v3_setup(vpmu_vm.vm, 1, 64,
> >> + GICD_BASE_GPA, GICR_BASE_GPA);
> >> +
> >> + /* Make sure that PMUv3 support is indicated in the ID register */
> >> + vcpu_get_reg(vpmu_vm.vcpu,
> >> + KVM_ARM64_SYS_REG(SYS_ID_AA64DFR0_EL1), &dfr0);
> >> + pmuver = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_PMUVER), dfr0);
> >> + TEST_ASSERT(pmuver != ID_AA64DFR0_PMUVER_IMP_DEF &&
> >> + pmuver >= ID_AA64DFR0_PMUVER_8_0,
> >> + "Unexpected PMUVER (0x%x) on the vCPU with PMUv3",
> >> pmuver);
> >> +
> >> + /* Initialize vPMU */
> >> + vcpu_ioctl(vpmu_vm.vcpu, KVM_SET_DEVICE_ATTR, &irq_attr);
> >> + vcpu_ioctl(vpmu_vm.vcpu, KVM_SET_DEVICE_ATTR, &init_attr);
> >> +}
> >
> > This one fails to build for me:
> > aarch64/vpmu_counter_access.c: In function ‘create_vpmu_vm’:
> > aarch64/vpmu_counter_access.c:456:47: error: ‘ID_AA64DFR0_PMUVER_MASK’
> > undeclared (first use in this function); did you mean
> > ‘ID_AA64DFR0_EL1_PMUVer_MASK’?
> > 456 | pmuver = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_PMUVER),
> > dfr0);
>
> Looks like there's a clash with
> "KVM: arm64: selftests: Import automatic generation of sysreg defs"
> from:
> https://lore.kernel.org/r/20231003230408.3405722-12-oliver.upton@xxxxxxxxx
Thanks for the pointer, Sebastian! Surprisingly, I don't see the patch
when I sync to kvmarm/next.
Oliver,
Aren't the selftest patches from the 'Enable writable ID regs' series
[1] merged into kvmarm/next? Looking at the log, I couldn't find them
and the last patch that went from the series was [2]. Am I missing
something?
Thank you.
Raghavendra
[1]: https://lore.kernel.org/all/169644154288.3677537.15121340860793882283.b4-ty@xxxxxxxxx/
[2]: https://lore.kernel.org/all/20231003230408.3405722-11-oliver.upton@xxxxxxxxx/
