From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 85861158DC2 for ; Tue, 9 Apr 2024 23:47:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712706478; cv=none; b=SyoFmz/5BfxRDg9Q/PAZB3QnVEELmCwfmOZEQ/MLTEzdcb5UF3xBccXi+RrRLDW/SHrS5wZTvf2fj2yw0Uwc4oFrraRsyi2MUBKt8RvT4nH6Cw1d5SyXymCCByRYQaW31eJ63Ntb75gNQ9pk6iW4m2e3MvnXrv0DCpjkDCDuTuQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712706478; c=relaxed/simple; bh=fojvbkoQ1qnxHWDrD0djvFzPN586S6oM8s/o1Hodv8w=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=iuyeimXWzuDclKETdD2f1FsJG7pnP6ZUNhYEXhi0cOlpGRjVKuA/5RJyR0FaOh3ybumnx8AkjGL0OKfojABBgTmMTHsVBgwk/W9T937Qq6NWn3u06CVUPZaFcGzbTQSLoGSo1X+nL1Y/1JSMpveYPZP98n+IhQapK7JecsoMjec= 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=LQAQQlvU; arc=none smtp.client-ip=209.85.214.171 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 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="LQAQQlvU" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1e3e84a302eso23323095ad.0 for ; Tue, 09 Apr 2024 16:47:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1712706475; x=1713311275; darn=lists.linux.dev; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=RgrB4N7HIT6g2jHcT1375/VgKhsjQsjM2O3SRfcZbZc=; b=LQAQQlvU7ohu5+c2282A8A4YtJwSsE+mq1kujcU+l/VAWcPsbQhj+s/wuHhkie9zyn lD2Fvm73nFjOOLv0DoBGyoIsV64Iz5Pk09YnTC07PdH4PkRqX5pYU3rEYRijpAnmrc9H gamDRThG94AYsEUe+1bHlFjCQcyLAmqKCKygFwNFt67/3UwwUroXFtSCclXrw2CKC3mz TqbU1CSencAsqJtKY11J6rNixpmeAaZxgC9xn+M3oSwdLzf12szHctzMz48XQizPxff6 D56IgIXLEd/kuP06lWejb1U/IPj9tkxeVF0tVWQbVbBHVJ0Xf6gcpajHIfVWh2tLF+Z8 t6cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712706475; x=1713311275; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=RgrB4N7HIT6g2jHcT1375/VgKhsjQsjM2O3SRfcZbZc=; b=WP6ROT3K7UavCWosVkhjPAVeENYnN6KTV73TUBM/CP7KBWrILAHGIL1E/HzjknnwEV gkNRs0le/dkhTZhX+31VaWxsyYn4VS6ZJvCyXRP0PncRYBvd1g4hKYjOzmY85v9by3yL /31MT7enlAGcCrTdnsqCxDmrAsVYAqwHiJr+NMldTmduSia5Z9OPYr05TnfjOe1hTXBQ zZDcK03UcLEd24kGkm7eTtqQarWFZ3U4orQyt/N8lwyUbgI8uTko2lKQCrpqGJJ1umHC 3muzzEq4L/Po+11cpWo6JoUBXShd5F8nZ/r+NUGUHjfgTIKay+jvpiw0Ji4GWxArUgRX 2FDA== X-Forwarded-Encrypted: i=1; AJvYcCUo+if3YvA8q0rns46Ri+lD73u3gxe3g6/8+qGqmbw/H4Jr/I6hwCo4PuikF7hsr5Q4d/wGReQ571CnePFI3cN/6y/uE3I7ZDGBkcouAos= X-Gm-Message-State: AOJu0YyLATFaT5C1omdW25ql8FWKc2at+3cggdd2dRrbrctcVw5YFi0u EVnSpEwgcLwgFe61vLe3giRY8w8FuQ7FmRJzrbHeFm2vmK/CqwOasXDBhhsjDF0= X-Google-Smtp-Source: AGHT+IHk/q17IeOHQyGGUSgmO41DCPXIxbm368Sp4qp2GXcbAOCnlkTai/EEVXRYcJTcrtE51VHdfw== X-Received: by 2002:a17:902:f611:b0:1e2:a7bf:5172 with SMTP id n17-20020a170902f61100b001e2a7bf5172mr1613615plg.52.1712706474847; Tue, 09 Apr 2024 16:47:54 -0700 (PDT) Received: from [10.0.16.226] ([50.145.13.30]) by smtp.gmail.com with ESMTPSA id w19-20020a170902d11300b001e0501d3058sm9518174plw.63.2024.04.09.16.47.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 Apr 2024 16:47:54 -0700 (PDT) Message-ID: <4f3fa42e-eaf9-40bf-8906-6193ea21a575@rivosinc.com> Date: Tue, 9 Apr 2024 16:47:51 -0700 Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 22/22] KVM: riscv: selftests: Add a test for counter overflow Content-Language: en-US To: Andrew Jones Cc: linux-kernel@vger.kernel.org, Anup Patel , Ajay Kaher , Alexandre Ghiti , Alexey Makhalov , 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, VMware PV-Drivers Reviewers , Will Deacon , x86@kernel.org References: <20240403080452.1007601-1-atishp@rivosinc.com> <20240403080452.1007601-23-atishp@rivosinc.com> <20240405-3a20fe10d65368651c2d23fa@orel> From: Atish Patra In-Reply-To: <20240405-3a20fe10d65368651c2d23fa@orel> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 4/5/24 06:23, Andrew Jones wrote: > On Wed, Apr 03, 2024 at 01:04:51AM -0700, Atish Patra wrote: >> 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. > > Maybe we should give the user a command line option to disable this test > in case the platform they're testing doesn't support it but they want to > run the rest of the tests without getting a FAIL. > Sure. I will add that option. >> >> Reviewed-by: Anup Patel >> Signed-off-by: Atish Patra >> --- >> .../selftests/kvm/riscv/sbi_pmu_test.c | 114 ++++++++++++++++++ >> 1 file changed, 114 insertions(+) >> >> diff --git a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c >> index 7d195be5c3d9..451db956b885 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; >> >> @@ -117,6 +121,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) >> @@ -276,6 +305,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; >> @@ -366,6 +422,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; >> @@ -451,6 +535,33 @@ 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"); >> + >> + > > extra blank line here > Fixed. >> + 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) >> { >> pr_info("SBI PMU basic test : starting\n"); >> @@ -463,5 +574,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 >> > > Other than the command line option idea, > > Reviewed-by: Andrew Jones > > Thanks, > drew