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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ECB81C433FE for ; Mon, 21 Mar 2022 00:27:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343928AbiCUA2V (ORCPT ); Sun, 20 Mar 2022 20:28:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343899AbiCUA2I (ORCPT ); Sun, 20 Mar 2022 20:28:08 -0400 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBA47DE910 for ; Sun, 20 Mar 2022 17:26:43 -0700 (PDT) Received: by mail-pf1-x449.google.com with SMTP id c6-20020a621c06000000b004fa7307e2e0so4369871pfc.6 for ; Sun, 20 Mar 2022 17:26:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=ONXdbAN8amlEB9qh6OgAKGOjSA/PDIQV8SIv35wcs8A=; b=M+NOaEnG6mj6JNTytwlFELsq2MhitrDFldJcZeXo09FgI1nAz5E+TAv3aUmQVZQZnj 3D1EbJ8yTnWcGrQnNk0NpqHgtPgIRkexkaos7Ic84kCeANiIoaiXaoVRmcNzC0r01STI BF33pX+0Uem/BI64+Tdln+4OqbAIgUNOoObYnK6wb6vPI/gWddA0PjEFLdkCMTcKfZdH M9ks8wNMR5HVMB/4es2FMurFj6AoIzhWTewYuQGw+DTIdzN/JK5ySU7ayXmkpgJYvXDv fq80XL3SnVLntF8x1coPEThYe+KNcfUz4NTk0WUSoiRjTJ0BCUV77/4evNYpEq0HIBK3 GN2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=ONXdbAN8amlEB9qh6OgAKGOjSA/PDIQV8SIv35wcs8A=; b=aZSIS62IHWX4jyShwPG5IJRs9QcIHu6vFIFvBxRjCozOxCYI+NOi2DDDEXdxYmGaRx 6WzT34zmWlM2B3MvCy0tnaKQuzDCPAbu3Ttozwtq17HHdzIf87v3LV9quqzjAw5oRdNL +uEGLs7Oi3O3iGYHBTdMcIS4YPs4GO1wLLbJRnM5wlT1bnnKaS+YApob0oIl+omT7tVP 2GY9PI71cgbxzL96N8Bb72wz81MVmfnjK/1mT5MpWgK4XlfvhhhrFiSz9RYSgVW1n/js /KTRXoMFoizm4zI23um5jGmxlsp7xKMm7Zgip+e6E52CBTv4246kNisSqheuizTrJlue v5Gw== X-Gm-Message-State: AOAM53391ADlJh5k8TVKJZWuCleQkxGZ+I/gfgSo+F+U/RL6hCS1BINC iIO/OljxevGJz6CrZkMNFhRd/D7liDRj X-Google-Smtp-Source: ABdhPJyQh0cpfhcq39A4la7k4keyo7dVFdF0fGkivbfV/iyl7s5g/kW3RQ8CmP/A+Tpauwan61zOFPISJtTf X-Received: from mizhang-super.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1071]) (user=mizhang job=sendgmr) by 2002:a17:902:b097:b0:154:2bda:bd38 with SMTP id p23-20020a170902b09700b001542bdabd38mr9344521plr.155.1647822403459; Sun, 20 Mar 2022 17:26:43 -0700 (PDT) Reply-To: Mingwei Zhang Date: Mon, 21 Mar 2022 00:26:36 +0000 In-Reply-To: <20220321002638.379672-1-mizhang@google.com> Message-Id: <20220321002638.379672-3-mizhang@google.com> Mime-Version: 1.0 References: <20220321002638.379672-1-mizhang@google.com> X-Mailer: git-send-email 2.35.1.894.gb6a874cedc-goog Subject: [PATCH 2/4] selftests: KVM: Test reading a single stat From: Mingwei Zhang To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Gardon , Mingwei Zhang , David Matlack , Jing Zhang , Peter Xu , Ben Gardon Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ben Gardon Retrieve the value of a single stat by name in the binary stats test to ensure the kvm_util library functions work. CC: Jing Zhang Signed-off-by: Ben Gardon --- .../selftests/kvm/include/kvm_util_base.h | 1 + .../selftests/kvm/kvm_binary_stats_test.c | 3 ++ tools/testing/selftests/kvm/lib/kvm_util.c | 53 +++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index 160b9ad8474a..a07964c95941 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -393,6 +393,7 @@ void assert_on_unhandled_exception(struct kvm_vm *vm, uint32_t vcpuid); int vm_get_stats_fd(struct kvm_vm *vm); int vcpu_get_stats_fd(struct kvm_vm *vm, uint32_t vcpuid); void dump_vm_stats(struct kvm_vm *vm); +uint64_t vm_get_single_stat(struct kvm_vm *vm, const char *stat_name); uint32_t guest_get_vcpuid(void); diff --git a/tools/testing/selftests/kvm/kvm_binary_stats_test.c b/tools/testing/selftests/kvm/kvm_binary_stats_test.c index afc4701ce8dd..97bde355f105 100644 --- a/tools/testing/selftests/kvm/kvm_binary_stats_test.c +++ b/tools/testing/selftests/kvm/kvm_binary_stats_test.c @@ -177,6 +177,9 @@ static void vm_stats_test(struct kvm_vm *vm) /* Dump VM stats */ dump_vm_stats(vm); + + /* Read a single stat. */ + printf("remote_tlb_flush: %lu\n", vm_get_single_stat(vm, "remote_tlb_flush")); } static void vcpu_stats_test(struct kvm_vm *vm, int vcpu_id) diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index d9c660913403..dad54f5d57e7 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -2660,3 +2660,56 @@ void dump_vm_stats(struct kvm_vm *vm) close(stats_fd); } +static int vm_get_stat_data(struct kvm_vm *vm, const char *stat_name, + uint64_t **data) +{ + struct kvm_stats_desc *stats_desc; + struct kvm_stats_header *header; + struct kvm_stats_desc *desc; + size_t size_desc; + int stats_fd; + int ret = -EINVAL; + int i; + + *data = NULL; + + stats_fd = vm_get_stats_fd(vm); + + header = read_vm_stats_header(stats_fd); + + stats_desc = read_vm_stats_desc(stats_fd, header); + + size_desc = stats_desc_size(header); + + /* Read kvm stats data one by one */ + for (i = 0; i < header->num_desc; ++i) { + desc = (void *)stats_desc + (i * size_desc); + + if (strcmp(desc->name, stat_name)) + continue; + + ret = read_stat_data(stats_fd, header, desc, data); + } + + free(stats_desc); + free(header); + + close(stats_fd); + + return ret; +} + +uint64_t vm_get_single_stat(struct kvm_vm *vm, const char *stat_name) +{ + uint64_t *data; + uint64_t value; + int ret; + + ret = vm_get_stat_data(vm, stat_name, &data); + TEST_ASSERT(ret == 1, "Stat %s expected to have 1 element, but has %d", + stat_name, ret); + value = *data; + free(data); + return value; +} + -- 2.35.1.894.gb6a874cedc-goog