Received: by 2002:a05:6500:1b45:b0:1f5:f2ab:c469 with SMTP id cz5csp168362lqb; Tue, 16 Apr 2024 11:53:07 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWtCoJ9rS7PRYuEa9+21VcyXaOLUpRcLbs1BZm1rhHXis9f0TqkZasqrdf6bbO+1aSJZAvnP/hoLjARgXrrc36LHkU+CUjWCumA8O2IpQ== X-Google-Smtp-Source: AGHT+IHjMyaTG9SAsrVeSEIqZTrJbR6h0J4da7T0eTCiN5pq+ujic4ysfSUX2L/sZ+xK3TpngAIs X-Received: by 2002:a17:90b:1b46:b0:2a2:4040:f57b with SMTP id nv6-20020a17090b1b4600b002a24040f57bmr12432769pjb.36.1713293586713; Tue, 16 Apr 2024 11:53:06 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713293586; cv=pass; d=google.com; s=arc-20160816; b=Y18u+YzBiHOgtCS3ktYrORPcD4qSZKDnMQ1bXwJfkdS6YPj5K3HzNnx8JunwsvUmPK 07ReQTcQ6fcCiZkzfK0t+FYqWdoyGnA6gYgJWZrE2PvF5223QLuU27KhNECcg7Xu0cnJ Li/izwr8OxB/4H+gQ7QNVq6tmLh0L+MHTZ6ej+p6VwgflXxYT/7EfHZQiezH1vjZmTa8 SMuv3+MzaNOZPSJZ9cgpoECDFUc/LkGoCYKlAXRiPg+RQ5uksm5/xXq1CJKE+ipgD75i dlJuRKQR6AOj80VXXpAv/5/A4kJ7NdXvpFJHXhopMEoMPuinlg1U3J0dCee3G+2dC6pO u9wg== 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=pdAbjdLX31vZDITT2BD/zRGEaHkPavc56BKt6Swumik=; fh=7SJ88jyRfCa/QyubzHJGr8k28EF3cKZ+/egkoD91Ols=; b=bgbsKnf18aNQKQON4SqGa7LdaDRK0hexmm6mWom6psuD2jxdW4kJdmgLof7XS5ZfWT CfqyisNdDSldu9geXonQY7aBEn+VUjRYCuXRGngg8aMcOJK1wpogCEhEAI5gp/ETG70C VXUD+mC+Z8MCvsrE+jXUtpkXfPa8STKW6Cl6+prPY4tmKTakxEVZAkzmFy9KTiJ/g+8X LkBPhsmV6SwzUMsNwyB2q75tmpqqh/rkD00tOV1nV0PFsBQumO8Wd4efZl/GiZLLF4XN SLd3OPbBS/8auFruUfrFN7DKGxlsKsPmqS/3+h4AJ6GeNVCt1mI8YMjke6Wctsn5U915 oUSg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=0Fvf6jyb; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-147422-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-147422-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id x14-20020a17090aca0e00b002aae699c352si736775pjt.54.2024.04.16.11.53.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 11:53:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-147422-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=0Fvf6jyb; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-147422-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-147422-linux.lists.archive=gmail.com@vger.kernel.org" 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 4EAB92834E7 for ; Tue, 16 Apr 2024 18:52:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 599DA146D41; Tue, 16 Apr 2024 18:45:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="0Fvf6jyb" Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3B36145B31 for ; Tue, 16 Apr 2024 18:45:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713293117; cv=none; b=SLlsMnPHmJVxm6sEkAL/fMuEAUxSpGgFqJpy49OYitSFoQxFdnPeLpqoAG/Y3fHBP9aF85PICpJYiuW4rzlCDJNcR7yjnbQ0b9zByv1CfI7sNBUjFMh7XJY5EHV8uFA/T+QkiMF7w/Y+HnEqonMSIhSMfmsSLIKAMESeh8B1ZFM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713293117; c=relaxed/simple; bh=65rhAcwCILUb42nVmZohYDmQAcxJzl/q2lZjypsWOFU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=re+IP+yONkzYXGdS0hS02GWxIfHsFUcHD+AARU7RlAynMb1vIHMkN7Wj6TKUOcsI5k+TM1Ypu+fHvLyxqtBTxACWinGtb5HMTtRw2ifCoqthcs8QmqonddXOZwm0/LKmX21cSTnSYtaFQGk3M2xa5nSFvMYt9nDmOIYRUmu2Res= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=0Fvf6jyb; arc=none smtp.client-ip=209.85.215.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-5cfd95130c6so3197283a12.1 for ; Tue, 16 Apr 2024 11:45:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1713293114; x=1713897914; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pdAbjdLX31vZDITT2BD/zRGEaHkPavc56BKt6Swumik=; b=0Fvf6jybHulkA2RFmSVgXVL/PDwl2IqvmNo38PCu4/WOBZRcB1HGyYdcfTEJ6cUkY9 XT6kZYl0FGY+j+5aZ5zwXHwlrTtX2H1FI1Ka7yH9oUouoB7hN5uwNi/QoKdRPEmX2hLT wEeSDGF6mbsUvqYQTd++xvTIc9DYFbBIwaENzyMHCYCnqn2A5t3lmjX+qtorWPFbbCZ/ +ISPcYqM6PxuVdkYRjeEhMBbepAA3xj9nqBM3xjwkOrFhGjFyZqGymhiY8Zef+eiX5zv Cv9v7PvzLmRMIjXC/S/u8biF72ympsEEp3AnhcY19KUaU9aW0tH3LFFY/9M2/vxB/u37 em5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713293114; x=1713897914; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pdAbjdLX31vZDITT2BD/zRGEaHkPavc56BKt6Swumik=; b=Esh+8FaxYUt2jLToXFdYvH3nzFCYC9+t9b78kkXdCORHPYqRjgAnnjq+BzYsKL0kdt DVpZiz/eADEwKKgr9juv31bhZqgBGQJZb/M2Ote9eqTx+LIsdB0K6JIXKwG5cHBHf9o6 GZtM5JdUcMmnL8TSy7cZAPH6mfqyqGn3f/Q2VRBA0o2EU+yj+d+01AFufiqYj/laCQMT yOtuGfHfZN1ZwP/OZ6kYOImZfGHQdFF9y7TT+6BCiudaEfQIwNxIqelDCxwp/mNodpLE TVcLWO2rLxEyY+XxQGM8EhLPXsING0ci1Cqm6HuGNqeVxiy0xbIS5LDfXz+wkj9dnrVw h44g== X-Gm-Message-State: AOJu0Yzn61yRyrjXbYCsterjdStqghzRyfz27DGVz/K44d2yXMHbpCXy E4oWK8V77OGCKFOGz0ISmkgv38OLHxobEit0cy6VvjG59I3MI3riwlrM0UFqsIA/vut0IRZVUI2 T X-Received: by 2002:a17:90a:db97:b0:2a5:fb3a:32e8 with SMTP id h23-20020a17090adb9700b002a5fb3a32e8mr11035882pjv.38.1713293114015; Tue, 16 Apr 2024 11:45:14 -0700 (PDT) Received: from atishp.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id o19-20020a17090aac1300b002a269828bb8sm8883645pjq.40.2024.04.16.11.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 11:45:13 -0700 (PDT) From: Atish Patra To: linux-kernel@vger.kernel.org Cc: Atish Patra , Anup Patel , Andrew Jones , Ajay Kaher , Albert Ou , Alexandre Ghiti , Conor Dooley , Juergen Gross , kvm-riscv@lists.infradead.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-riscv@lists.infradead.org, Mark Rutland , Palmer Dabbelt , Paolo Bonzini , Paul Walmsley , Shuah Khan , virtualization@lists.linux.dev, Will Deacon , x86@kernel.org Subject: [PATCH v7 23/24] KVM: riscv: selftests: Add a test for counter overflow Date: Tue, 16 Apr 2024 11:44:20 -0700 Message-Id: <20240416184421.3693802-24-atishp@rivosinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240416184421.3693802-1-atishp@rivosinc.com> References: <20240416184421.3693802-1-atishp@rivosinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add a test for verifying overflow interrupt. Currently, it relies on overflow support on cycle/instret events. This test works for cycle/ instret events which support sampling via hpmcounters on the platform. There are no ISA extensions to detect if a platform supports that. Thus, this test will fail on platform with virtualization but doesn't support overflow on these two events. Reviewed-by: Anup Patel Reviewed-by: Andrew Jones Signed-off-by: Atish Patra --- .../selftests/kvm/riscv/sbi_pmu_test.c | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c index 9002ff451abf..0fd9b76ae838 100644 --- a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c +++ b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c @@ -14,6 +14,7 @@ #include "test_util.h" #include "processor.h" #include "sbi.h" +#include "arch_timer.h" /* Maximum counters(firmware + hardware) */ #define RISCV_MAX_PMU_COUNTERS 64 @@ -24,6 +25,9 @@ union sbi_pmu_ctr_info ctrinfo_arr[RISCV_MAX_PMU_COUNTERS]; static void *snapshot_gva; static vm_paddr_t snapshot_gpa; +static int vcpu_shared_irq_count; +static int counter_in_use; + /* Cache the available counters in a bitmask */ static unsigned long counter_mask_available; @@ -120,6 +124,31 @@ static void guest_illegal_exception_handler(struct ex_regs *regs) regs->epc += 4; } +static void guest_irq_handler(struct ex_regs *regs) +{ + unsigned int irq_num = regs->cause & ~CAUSE_IRQ_FLAG; + struct riscv_pmu_snapshot_data *snapshot_data = snapshot_gva; + unsigned long overflown_mask; + unsigned long counter_val = 0; + + /* Validate that we are in the correct irq handler */ + GUEST_ASSERT_EQ(irq_num, IRQ_PMU_OVF); + + /* Stop all counters first to avoid further interrupts */ + stop_counter(counter_in_use, SBI_PMU_STOP_FLAG_TAKE_SNAPSHOT); + + csr_clear(CSR_SIP, BIT(IRQ_PMU_OVF)); + + overflown_mask = READ_ONCE(snapshot_data->ctr_overflow_mask); + GUEST_ASSERT(overflown_mask & 0x01); + + WRITE_ONCE(vcpu_shared_irq_count, vcpu_shared_irq_count+1); + + counter_val = READ_ONCE(snapshot_data->ctr_values[0]); + /* Now start the counter to mimick the real driver behavior */ + start_counter(counter_in_use, SBI_PMU_START_FLAG_SET_INIT_VALUE, counter_val); +} + static unsigned long get_counter_index(unsigned long cbase, unsigned long cmask, unsigned long cflags, unsigned long event) @@ -318,6 +347,33 @@ static void test_pmu_event_snapshot(unsigned long event) stop_reset_counter(counter, 0); } +static void test_pmu_event_overflow(unsigned long event) +{ + unsigned long counter; + unsigned long counter_value_post; + unsigned long counter_init_value = ULONG_MAX - 10000; + struct riscv_pmu_snapshot_data *snapshot_data = snapshot_gva; + + counter = get_counter_index(0, counter_mask_available, 0, event); + counter_in_use = counter; + + /* The counter value is updated w.r.t relative index of cbase passed to start/stop */ + WRITE_ONCE(snapshot_data->ctr_values[0], counter_init_value); + start_counter(counter, SBI_PMU_START_FLAG_INIT_SNAPSHOT, 0); + dummy_func_loop(10000); + udelay(msecs_to_usecs(2000)); + /* irq handler should have stopped the counter */ + stop_counter(counter, SBI_PMU_STOP_FLAG_TAKE_SNAPSHOT); + + counter_value_post = READ_ONCE(snapshot_data->ctr_values[0]); + /* The counter value after stopping should be less the init value due to overflow */ + __GUEST_ASSERT(counter_value_post < counter_init_value, + "counter_value_post %lx counter_init_value %lx for counter\n", + counter_value_post, counter_init_value); + + stop_reset_counter(counter, 0); +} + static void test_invalid_event(void) { struct sbiret ret; @@ -413,6 +469,34 @@ static void test_pmu_events_snaphost(void) GUEST_DONE(); } +static void test_pmu_events_overflow(void) +{ + int num_counters = 0; + + /* Verify presence of SBI PMU and minimum requrired SBI version */ + verify_sbi_requirement_assert(); + + snapshot_set_shmem(snapshot_gpa, 0); + csr_set(CSR_IE, BIT(IRQ_PMU_OVF)); + local_irq_enable(); + + /* Get the counter details */ + num_counters = get_num_counters(); + update_counter_info(num_counters); + + /* + * Qemu supports overflow for cycle/instruction. + * This test may fail on any platform that do not support overflow for these two events. + */ + test_pmu_event_overflow(SBI_PMU_HW_CPU_CYCLES); + GUEST_ASSERT_EQ(vcpu_shared_irq_count, 1); + + test_pmu_event_overflow(SBI_PMU_HW_INSTRUCTIONS); + GUEST_ASSERT_EQ(vcpu_shared_irq_count, 2); + + GUEST_DONE(); +} + static void run_vcpu(struct kvm_vcpu *vcpu) { struct ucall uc; @@ -498,6 +582,32 @@ static void test_vm_events_snapshot_test(void *guest_code) test_vm_destroy(vm); } +static void test_vm_events_overflow(void *guest_code) +{ + struct kvm_vm *vm = NULL; + struct kvm_vcpu *vcpu; + + vm = vm_create_with_one_vcpu(&vcpu, guest_code); + __TEST_REQUIRE(__vcpu_has_sbi_ext(vcpu, KVM_RISCV_SBI_EXT_PMU), + "SBI PMU not available, skipping test"); + + __TEST_REQUIRE(__vcpu_has_isa_ext(vcpu, KVM_RISCV_ISA_EXT_SSCOFPMF), + "Sscofpmf is not available, skipping overflow test"); + + test_vm_setup_snapshot_mem(vm, vcpu); + vm_init_vector_tables(vm); + vm_install_interrupt_handler(vm, guest_irq_handler); + + vcpu_init_vector_tables(vcpu); + /* Initialize guest timer frequency. */ + vcpu_get_reg(vcpu, RISCV_TIMER_REG(frequency), &timer_freq); + sync_global_to_guest(vm, timer_freq); + + run_vcpu(vcpu); + + test_vm_destroy(vm); +} + int main(void) { test_vm_basic_test(test_pmu_basic_sanity); @@ -509,5 +619,8 @@ int main(void) test_vm_events_snapshot_test(test_pmu_events_snaphost); pr_info("SBI PMU event verification with snapshot test : PASS\n"); + test_vm_events_overflow(test_pmu_events_overflow); + pr_info("SBI PMU event verification with overflow test : PASS\n"); + return 0; } -- 2.34.1