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 0F7A3C433F5 for ; Wed, 20 Apr 2022 17:35:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1381161AbiDTRiP (ORCPT ); Wed, 20 Apr 2022 13:38:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1381136AbiDTRiH (ORCPT ); Wed, 20 Apr 2022 13:38:07 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 185F714006 for ; Wed, 20 Apr 2022 10:35:21 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id pb1-20020a17090b3c0100b001d2b09b6185so1245688pjb.2 for ; Wed, 20 Apr 2022 10:35:21 -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=3hrVtKxiHbpz+NEaukEgKfo35soXVBenGEmfstwEEVg=; b=c92/D0tTK6mgxclzC4mkN1Z+Dd4UUec5FITmwETokYfH34YQTRAExgqJy+oRv9Pb4b 8Ldc2CH8j9nSF0gp0ESyVcrLTmHaTW5PjLbVcz/oN7BPsys5tV812WIkE/UNWy1hPE7Y bsi/C7MuVkLPq36Qqrna2QjXXnw2Ry/n9IwElWKuH1NElZ8V/l/4shEQPx8KHe4TxVdK ACmcYmLYeulOT57i0J0MnYLGkb9MCL7JjziqLaroH00w4dud63DQ48ZIaksYK1dmFrD1 m4Pm3IOVa7QG3GBhXfgAhCLvUQMMACNLzeJjuHqu6H32A7dOZd2L8dXcaJBsxLw7W+jw h46g== 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=3hrVtKxiHbpz+NEaukEgKfo35soXVBenGEmfstwEEVg=; b=AZ7d1yPVWA9/1gbOKIcfVKl7Dw0th7byPXcbEwCuU0lF2coeAE4Jd8aQDs7HoJVAdK 0kVkHswbHFguXETq6LRNEdwxhtC3+xlqnXCHpvmpob5dQYZYxdzo/6snt8rJwazmETWZ lKCqgIBB4Z5N0LHIB5/pzKXh4yPDOILGqcP+U/8QUEBXeEvcrKMppRHQvxFQ1++JOTdy OOpqbLVMmbJc2B3xibf7KjV3eGJz0OlvtiPSHKYNDBTgtMcGtE7k5nYakYSrOjVGbA+X C6kwUtxG+SQUEhBxmsxDzpuLA1ilRUVQuJo5+7RfQ4KnZSCOgpOTRq5Up8Eb5WBbwjPi SQpg== X-Gm-Message-State: AOAM531gVb7dTCed/F6VHtSSHvkOGrogirzG8HbTCKMrV8a6ArFhNOxn 1HU9+P+SX68wnzlMs2giRvkw6j6W3Q8vr2OXmhBePSQR/MZqSvFf8KEgt76+tjbut8h7aulcz5h xWwqJ6mDVIaUp+qzV1K+YV8fX4Fu2GDI9333rWkLfVg0gg8UBau8u7Ps2Ki3nZJkLYiWXF+P6 X-Google-Smtp-Source: ABdhPJw7eHr1qhn7c2BfQ+hyrDFgTWTh4w8N0NJRzArOEZocpnHXiaEqecWXU2fQT+mTQNFgzLoKZno2S7x4 X-Received: from bgardon.sea.corp.google.com ([2620:15c:100:202:6ea6:489a:aad6:761c]) (user=bgardon job=sendgmr) by 2002:a05:6a00:884:b0:4fe:134d:81cc with SMTP id q4-20020a056a00088400b004fe134d81ccmr24602772pfj.57.1650476120419; Wed, 20 Apr 2022 10:35:20 -0700 (PDT) Date: Wed, 20 Apr 2022 10:35:05 -0700 In-Reply-To: <20220420173513.1217360-1-bgardon@google.com> Message-Id: <20220420173513.1217360-3-bgardon@google.com> Mime-Version: 1.0 References: <20220420173513.1217360-1-bgardon@google.com> X-Mailer: git-send-email 2.36.0.rc0.470.gd361397f0d-goog Subject: [PATCH v6 02/10] KVM: selftests: Read binary stats header in lib 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" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move the code to read the binary stats header to the KVM selftests library. It will be re-used by other tests to check KVM behavior. No functional change intended. Reviewed-by: David Matlack Signed-off-by: Ben Gardon --- .../selftests/kvm/include/kvm_util_base.h | 1 + .../selftests/kvm/kvm_binary_stats_test.c | 4 ++-- tools/testing/selftests/kvm/lib/kvm_util.c | 21 +++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index 92cef0ffb19e..749cded9b157 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -400,6 +400,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 read_stats_header(int stats_fd, struct kvm_stats_header *header); 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 dad34d8a41fe..fb511b42a03e 100644 --- a/tools/testing/selftests/kvm/kvm_binary_stats_test.c +++ b/tools/testing/selftests/kvm/kvm_binary_stats_test.c @@ -33,8 +33,8 @@ static void stats_test(int stats_fd) struct kvm_stats_desc *pdesc; /* Read kvm stats header */ - ret = read(stats_fd, &header, sizeof(header)); - TEST_ASSERT(ret == sizeof(header), "Read stats header"); + read_stats_header(stats_fd, &header); + size_desc = sizeof(*stats_desc) + header.name_size; /* Read kvm stats id string */ diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 1665a220abcb..1d75d41f92dc 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -2556,3 +2556,24 @@ int vcpu_get_stats_fd(struct kvm_vm *vm, uint32_t vcpuid) return ioctl(vcpu->fd, KVM_GET_STATS_FD, NULL); } + +/* + * Read binary stats header + * + * Input Args: + * stats_fd - the file descriptor for the binary stats file from which to read + * + * Output Args: + * header - a binary stats metadata header to be filled with data + * + * Return: void + * + * Read a header for the binary stats interface. + */ +void read_stats_header(int stats_fd, struct kvm_stats_header *header) +{ + ssize_t ret; + + ret = read(stats_fd, header, sizeof(*header)); + TEST_ASSERT(ret == sizeof(*header), "Read stats header"); +} -- 2.36.0.rc0.470.gd361397f0d-goog