From patchwork Thu Feb 29 06:56:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaoqin Huang X-Patchwork-Id: 208223 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp216643dyb; Wed, 28 Feb 2024 22:58:53 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVsam9Yso96GkL99PYq6CM7VJA8W4Qh1DFWz+5AdjMBuwNJWdDhSBiDgBsWFlKLkgycyPxHVY0/rgv+QVaqSCDzz78Ofg== X-Google-Smtp-Source: AGHT+IFQgXctCZzwcRB/pZxFvii011k/PGDFykpGgvlhZjacY7pKSYbywBPc5O9lWBGh3bRm+66W X-Received: by 2002:a05:6214:4a4b:b0:68f:5d44:b80 with SMTP id ph11-20020a0562144a4b00b0068f5d440b80mr1265201qvb.29.1709189933239; Wed, 28 Feb 2024 22:58:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709189933; cv=pass; d=google.com; s=arc-20160816; b=WNFw99GRillfQrR1AVTGY/fwvvFR5C4mhrhVgzPoKTkd38KPHuybn0SaniE95XiUly UD8+/gqOXFO4LXt+NhKYw/chgsrbuoCuiN0UnmO6fNNMMyF9FyoDkOg9qYbPn4hnZGf7 mRi6lVI8f8faU1pfmoJqo7iTnAQiDRR9qMZ/xdU1EGyO5t7aFi6LzYV2IYG+/x07qn+1 yeWDE/KQowCSRYjuFr4D9//YS8OlsqF5Q00yS+A1mjTKmgBAhtB931WgoUcgOcom3ruI 2jur4BCyT0kCPBE/zHg1+PgzONKfDUE4YEU5tA2kevM5hd0SMV6VraF+yVe6ShrvIDRk nkPg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=YFmwQWt00Kaj3Ot93eqM53gw7IrZWb5swPo/SmIieP0=; fh=5oSt14lwq4/RPFHd+JFpAcI7HGmicBIhmFBb0IsqPrA=; b=Tg8spNUWRLehOaSDqKBbApQCxxMwSSvV+7LKOxA/NXYd5gZAdmZJxtl8uJMS5dP/xE wmwpTAEzcpreEI9HgfcxHuhoKDknwLV7uEZmFzct2q8O6fizpIP2j32qHl+yCTlbwXzS bhugr+KCN4bdQ7WLmbZ6EyQhAQoRRK1BuCvXsvVKXFhQ/o7pzKEcmTGxHRhdix9Zrtdh ktpzYTjMbiMdMuQHO6z0eazD/lmNikrXYxXF4T5yfxhEm6JEUp1UZVhBpVdLwdAoQL3t V5DPkz+2HJxgrM+CgRmIkMiOXguV0xKCdWL8LMmfSOASmYeH1CDsdQoAlaIFLE2XiR2d LEvg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KU0Rzqq9; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-86201-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86201-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id c4-20020a056214224400b0068f99fe364dsi807989qvc.483.2024.02.28.22.58.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 22:58:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-86201-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KU0Rzqq9; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-86201-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86201-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id F36D71C2135B for ; Thu, 29 Feb 2024 06:58:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 495A547F7C; Thu, 29 Feb 2024 06:58:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KU0Rzqq9" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 674E33CF6E for ; Thu, 29 Feb 2024 06:58:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709189883; cv=none; b=K0BVYoH0oBk75ql9NNVi+QnPrDAeC/HJfX/cnGSmsweKkls+OK3jNt4JQjyoaTVRw13MhLOdcQhtFnvkflHWu8nvA76z9xVUTpUPlM33PRYhpwCg9aNfKehh9hegdl0r3geOjnrnoIGLMusefFVZaNaPPd9Awznvk5V+0QOruZo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709189883; c=relaxed/simple; bh=kSl3pHe/ihRWWBrf1Tezc0PNoeKDj3aNbp4aK+ZcfUs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GeAuXw9nqc0+BfHGLdy0S32q/ffPkXW3ekdArGuV/Rdtrwa0DQD2TAGc0alcOs53wEFMCOKboVQViRRYhZOHUBfFQlqaKQDTVqd8dJ3P465FGUciS8HKY2vpAApqPsVFXWiM/t/21KYx0goPMQOfi/7QsCWYrTMnh+weAiye4Ck= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=KU0Rzqq9; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709189879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YFmwQWt00Kaj3Ot93eqM53gw7IrZWb5swPo/SmIieP0=; b=KU0Rzqq9Th7y+JH2tQUObiwn4ZyMAcaxL0hZECiLoD2XdcWXED+EzNjsW16kGNSDU9SiF1 hih70MdboIbMXbw6A+Bdj4zrfaOZEjFNgkjG/hBm7psTMzcG1NamEsY4f0aRCP1rdRHqhU mkzgBdLYQ+6Dvu8L3odlulNhxqEUN5U= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-659-dGxUhgedMeCDdf-lt5JrlQ-1; Thu, 29 Feb 2024 01:57:55 -0500 X-MC-Unique: dGxUhgedMeCDdf-lt5JrlQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 55E9B185A784; Thu, 29 Feb 2024 06:57:55 +0000 (UTC) Received: from virt-mtcollins-01.lab.eng.rdu2.redhat.com (virt-mtcollins-01.lab.eng.rdu2.redhat.com [10.8.1.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45FF148B; Thu, 29 Feb 2024 06:57:55 +0000 (UTC) From: Shaoqin Huang To: Oliver Upton , Marc Zyngier , kvmarm@lists.linux.dev Cc: Eric Auger , Shaoqin Huang , James Morse , Suzuki K Poulose , Zenghui Yu , Paolo Bonzini , Shuah Khan , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v5 1/3] KVM: selftests: aarch64: Add helper function for the vpmu vcpu creation Date: Thu, 29 Feb 2024 01:56:19 -0500 Message-Id: <20240229065625.114207-2-shahuang@redhat.com> In-Reply-To: <20240229065625.114207-1-shahuang@redhat.com> References: <20240229065625.114207-1-shahuang@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792215543684813479 X-GMAIL-MSGID: 1792215543684813479 Create a vcpu with vpmu would be a common requirement for the vpmu test, so add the helper function for the vpmu vcpu creation. And use those helper function in the vpmu_counter_access.c test. Use this chance to delete the meaningless ASSERT about the pmuver, because KVM does not advertise an IMP_DEF PMU to guests. No functional changes intended. Signed-off-by: Shaoqin Huang --- .../kvm/aarch64/vpmu_counter_access.c | 33 ++++--------------- .../selftests/kvm/include/aarch64/vpmu.h | 29 ++++++++++++++++ 2 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 tools/testing/selftests/kvm/include/aarch64/vpmu.h diff --git a/tools/testing/selftests/kvm/aarch64/vpmu_counter_access.c b/tools/testing/selftests/kvm/aarch64/vpmu_counter_access.c index 5f9713364693..e068a0a7a43b 100644 --- a/tools/testing/selftests/kvm/aarch64/vpmu_counter_access.c +++ b/tools/testing/selftests/kvm/aarch64/vpmu_counter_access.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -426,18 +427,8 @@ static void guest_code(uint64_t expected_pmcr_n) /* 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, - }; + uint8_t ec; + uint64_t irq = 23; /* The test creates the vpmu_vm multiple times. Ensure a clean state */ memset(&vpmu_vm, 0, sizeof(vpmu_vm)); @@ -449,27 +440,17 @@ static void create_vpmu_vm(void *guest_code) 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); + vpmu_vm.vcpu = vm_vcpu_add_with_vpmu(vpmu_vm.vm, 0, 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); __TEST_REQUIRE(vpmu_vm.gic_fd >= 0, "Failed to create vgic-v3, skipping"); - /* 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_EL1_PMUVer), dfr0); - TEST_ASSERT(pmuver != ID_AA64DFR0_EL1_PMUVer_IMP_DEF && - pmuver >= ID_AA64DFR0_EL1_PMUVer_IMP, - "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); + vpmu_set_irq(vpmu_vm.vcpu, irq); + vpmu_init(vpmu_vm.vcpu); } static void destroy_vpmu_vm(void) diff --git a/tools/testing/selftests/kvm/include/aarch64/vpmu.h b/tools/testing/selftests/kvm/include/aarch64/vpmu.h new file mode 100644 index 000000000000..0dfcc7ab1c4d --- /dev/null +++ b/tools/testing/selftests/kvm/include/aarch64/vpmu.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include + +static inline struct kvm_vcpu *vm_vcpu_add_with_vpmu(struct kvm_vm *vm, + uint32_t vcpu_id, + void *guest_code) +{ + struct kvm_vcpu_init init; + + /* Create vCPU with PMUv3 */ + vm_ioctl(vm, KVM_ARM_PREFERRED_TARGET, &init); + init.features[0] |= (1 << KVM_ARM_VCPU_PMU_V3); + + return aarch64_vcpu_add(vm, 0, &init, guest_code); +} + +static void vpmu_set_irq(struct kvm_vcpu *vcpu, int irq) +{ + kvm_device_attr_set(vcpu->fd, KVM_ARM_VCPU_PMU_V3_CTRL, + KVM_ARM_VCPU_PMU_V3_IRQ, &irq); +} + +static void vpmu_init(struct kvm_vcpu *vcpu) +{ + kvm_device_attr_set(vcpu->fd, KVM_ARM_VCPU_PMU_V3_CTRL, + KVM_ARM_VCPU_PMU_V3_INIT, NULL); +} +