Received: by 2002:a05:6512:2355:0:0:0:0 with SMTP id p21csp204244lfu; Wed, 30 Mar 2022 20:51:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxO86SiFY1Xossz0p1LunRAOWMUbONDPZ8JloqPt/IrhRvO28++AVZGlXC39D2JxCmza51D X-Received: by 2002:a17:902:e5c6:b0:155:ceb9:3710 with SMTP id u6-20020a170902e5c600b00155ceb93710mr33914535plf.59.1648698665787; Wed, 30 Mar 2022 20:51:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648698665; cv=none; d=google.com; s=arc-20160816; b=uvboSqO/axh1Ef58Y3Mq0NCYNPGzNFsvkkuXVdHILFHYPwVUwQASZYbYLl9hi/D5v4 s48h2I5mHBWPP05maYqi3dn3N4nfL/yuN1oVYNz9nMPuouO2x0r4xMtPRh7qdSgStb7N a8FrB0qxJwdIy/u3sUnIY/X6hZXU+j7Em3e0SCiRtnuAkhMEDIsdgDf369KOjLWrMBZH KXuihXt+R8WtYdzLK3AfHwpDY4c2ZSMdWR61ToL7XzFE26dL3Nw6eR5q6sdx2HrCGMmG WvHJtomm9DNAd7raVKHpzBGfkK3yBzRI9F/QLFpbUDl4vgMMoj5sTQ5vKdNOphj2I6ZT KI+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=xzO9cQFThrWl9C6pXMeFQf68aIxsF5msYllu20aIE98=; b=hS8BQAFUz9nllwp1iekYTeps8c9Zbuf2oQv5IC09c+cZydb683Fe4lNXcVJOjXjpZ6 OA9lC2JHTmYDy3p4heYROCeo+8yQpNx8CgButs1JM4ll4C4CpOOuUycnA0BWLvh1SwmO 2PmZud0O2tj7gHHeCpN8Nw4ZwfkYbSgr0hXjFvddKdGaHdEoo5bZbau8tS2doKXDJuj/ kHUMlSvNwmShI25ihvG34eupaLNDYLzyd77nd8H4rv02QCJ0rmlid+2uKhNTlh/ebsvU DKedLGzAG+qHGKIjdes8f6j5OtXNYLv7wucem+hE4GhakYyEdQr7btI31CaBpqmoJpwt IFHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=j8UY6vLA; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id w19-20020a63d753000000b003816043f02fsi22814720pgi.548.2022.03.30.20.51.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 20:51:05 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=j8UY6vLA; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9A0CA50E33; Wed, 30 Mar 2022 20:04:49 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349557AbiC3RtK (ORCPT + 99 others); Wed, 30 Mar 2022 13:49:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349581AbiC3RsS (ORCPT ); Wed, 30 Mar 2022 13:48:18 -0400 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1394BEA774 for ; Wed, 30 Mar 2022 10:46:31 -0700 (PDT) Received: by mail-pg1-x54a.google.com with SMTP id e12-20020a63544c000000b003985d5888a8so4889927pgm.15 for ; Wed, 30 Mar 2022 10:46:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=xzO9cQFThrWl9C6pXMeFQf68aIxsF5msYllu20aIE98=; b=j8UY6vLAgetGzYR7Xcw90unE7CpuF+C4hboX33h6Du9R57k/Ul278DXxDWBO8E/Uc+ mPVKSUKc7yEdGFMFdBkx/40loU9D6GS8MslHwI+eVBkPMqVfOPVKcwkJ8fIoVio4B24z 3IuY2IUSYntD3WYriRccTB+qmJ/Y7PtT0EaCZ2mub4N/GiZCcku3u0Mxtz57CgG6cGq2 qki10pMTDb3EMY5tvhM4PiLYBAXPtxAohMyshLA8DEAzwwoOndJaAmVqoSBTLd9uzGOa sdHBix2ewcx1OOPdx1ZTY0YQs0nsbIaICO91bWRAA02Ac5sPczgfmtSAc6XMAEHf+HjH QNaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=xzO9cQFThrWl9C6pXMeFQf68aIxsF5msYllu20aIE98=; b=GdZj0lnpON5tNWtfB7U3x8kU+SNeC/p/b2S5UIdPvN0SKOdPgEiNO4BVGD3Z6v7ZG1 iAQWl06+31++MkceY/6rerze9Ob7yoKF45eQ+ZG6tsahlb1ZUgkMt1xmEKDdu83W49rT IibPMf/gQd+ceLGmgOoc7e1ktMIBVXwpKYPOK3hNwuH0S86JDGlTVxMu4R6pO3oDjdcY 9YatehG+0zqnXdV7/vHYzKfmM5WSku5Uqzl5nZy5kXMlopuzVzBwqF7lZvee8L8uvpUg 3Zroi3x9JKXHlzHPVtkbGu2KEJZm8Xxx/qgc+B/JSQTik+rgJ8VDpVKnEbyjWtpyES4j acsQ== X-Gm-Message-State: AOAM530Xk2JiDUJOgGRqiDd2Lnd+QRKehxtnVwsj5MGzsoioq5uI8e0I 1y9Shoucugn3P8CmZPMhEM0wE8mjfIjLX+c90NE9dIii8Hkcu4K8nLGnvowNEnaB5IY1PbAGXYM vTrjF9BZ7PmhREh/a4B3ArP1EGK8AbzbZOVvsOvLEgHqRxJ4kJExtXTnuIKu6OEtGnWHuJYXF X-Received: from bgardon.sea.corp.google.com ([2620:15c:100:202:7c53:ec2f:bd26:b69c]) (user=bgardon job=sendgmr) by 2002:a17:90b:4b01:b0:1c7:8a37:bfd3 with SMTP id lx1-20020a17090b4b0100b001c78a37bfd3mr633793pjb.115.1648662390376; Wed, 30 Mar 2022 10:46:30 -0700 (PDT) Date: Wed, 30 Mar 2022 10:46:12 -0700 In-Reply-To: <20220330174621.1567317-1-bgardon@google.com> Message-Id: <20220330174621.1567317-3-bgardon@google.com> Mime-Version: 1.0 References: <20220330174621.1567317-1-bgardon@google.com> X-Mailer: git-send-email 2.35.1.1021.g381101b075-goog Subject: [PATCH v3 02/11] KVM: selftests: Dump VM stats in binary stats test From: Ben Gardon To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , Peter Xu , Sean Christopherson , David Matlack , Jim Mattson , David Dunn , Jing Zhang , Junaid Shahid , Ben Gardon Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add kvm_util library functions to read KVM stats through the binary stats interface and then dump them to stdout when running the binary stats test. Subsequent commits will extend the kvm_util code and use it to make assertions in a test for NX hugepages. 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 | 143 ++++++++++++++++++ 3 files changed, 147 insertions(+) diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index 976aaaba8769..4783fd1cd4cf 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -401,6 +401,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); 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 17f65d514915..afc4701ce8dd 100644 --- a/tools/testing/selftests/kvm/kvm_binary_stats_test.c +++ b/tools/testing/selftests/kvm/kvm_binary_stats_test.c @@ -174,6 +174,9 @@ static void vm_stats_test(struct kvm_vm *vm) stats_test(stats_fd); close(stats_fd); TEST_ASSERT(fcntl(stats_fd, F_GETFD) == -1, "Stats fd not freed"); + + /* Dump VM stats */ + dump_vm_stats(vm); } 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 11a692cf4570..f87df68b150d 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -2562,3 +2562,146 @@ int vcpu_get_stats_fd(struct kvm_vm *vm, uint32_t vcpuid) return ioctl(vcpu->fd, KVM_GET_STATS_FD, NULL); } + +/* Caller is responsible for freeing the returned kvm_stats_header. */ +static struct kvm_stats_header *read_vm_stats_header(int stats_fd) +{ + struct kvm_stats_header *header; + ssize_t ret; + + /* Read kvm stats header */ + header = malloc(sizeof(*header)); + TEST_ASSERT(header, "Allocate memory for stats header"); + + ret = read(stats_fd, header, sizeof(*header)); + TEST_ASSERT(ret == sizeof(*header), "Read stats header"); + + return header; +} + +static void dump_header(int stats_fd, struct kvm_stats_header *header) +{ + ssize_t ret; + char *id; + + printf("flags: %u\n", header->flags); + printf("name size: %u\n", header->name_size); + printf("num_desc: %u\n", header->num_desc); + printf("id_offset: %u\n", header->id_offset); + printf("desc_offset: %u\n", header->desc_offset); + printf("data_offset: %u\n", header->data_offset); + + /* Read kvm stats id string */ + id = malloc(header->name_size); + TEST_ASSERT(id, "Allocate memory for id string"); + ret = pread(stats_fd, id, header->name_size, header->id_offset); + TEST_ASSERT(ret == header->name_size, "Read id string"); + + printf("id: %s\n", id); + + free(id); +} + +static ssize_t stats_desc_size(struct kvm_stats_header *header) +{ + return sizeof(struct kvm_stats_desc) + header->name_size; +} + +/* Caller is responsible for freeing the returned kvm_stats_desc. */ +static struct kvm_stats_desc *read_vm_stats_desc(int stats_fd, + struct kvm_stats_header *header) +{ + struct kvm_stats_desc *stats_desc; + size_t size_desc; + ssize_t ret; + + size_desc = header->num_desc * stats_desc_size(header); + + /* Allocate memory for stats descriptors */ + stats_desc = malloc(size_desc); + TEST_ASSERT(stats_desc, "Allocate memory for stats descriptors"); + + /* Read kvm stats descriptors */ + ret = pread(stats_fd, stats_desc, size_desc, header->desc_offset); + TEST_ASSERT(ret == size_desc, "Read KVM stats descriptors"); + + return stats_desc; +} + +/* Caller is responsible for freeing the memory *data. */ +static int read_stat_data(int stats_fd, struct kvm_stats_header *header, + struct kvm_stats_desc *desc, uint64_t **data) +{ + u64 *stats_data; + ssize_t ret; + + stats_data = malloc(desc->size * sizeof(*stats_data)); + + ret = pread(stats_fd, stats_data, desc->size * sizeof(*stats_data), + header->data_offset + desc->offset); + + /* ret is in bytes. */ + ret = ret / sizeof(*stats_data); + + TEST_ASSERT(ret == desc->size, + "Read data of KVM stats: %s", desc->name); + + *data = stats_data; + + return ret; +} + +static void dump_stat(int stats_fd, struct kvm_stats_header *header, + struct kvm_stats_desc *desc) +{ + u64 *stats_data; + ssize_t ret; + int i; + + printf("\tflags: %u\n", desc->flags); + printf("\texponent: %u\n", desc->exponent); + printf("\tsize: %u\n", desc->size); + printf("\toffset: %u\n", desc->offset); + printf("\tbucket_size: %u\n", desc->bucket_size); + printf("\tname: %s\n", (char *)&desc->name); + + ret = read_stat_data(stats_fd, header, desc, &stats_data); + + printf("\tdata: %lu", *stats_data); + for (i = 1; i < ret; i++) + printf(", %lu", *(stats_data + i)); + printf("\n\n"); + + free(stats_data); +} + +void dump_vm_stats(struct kvm_vm *vm) +{ + struct kvm_stats_desc *stats_desc; + struct kvm_stats_header *header; + struct kvm_stats_desc *desc; + size_t size_desc; + int stats_fd; + int i; + + stats_fd = vm_get_stats_fd(vm); + + header = read_vm_stats_header(stats_fd); + dump_header(stats_fd, header); + + 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); + dump_stat(stats_fd, header, desc); + } + + free(stats_desc); + free(header); + + close(stats_fd); +} + -- 2.35.1.1021.g381101b075-goog