From: Jing Zhang <jingzhangos@google.com> To: KVM <kvm@vger.kernel.org>, KVMARM <kvmarm@lists.cs.columbia.edu>, LinuxMIPS <linux-mips@vger.kernel.org>, KVMPPC <kvm-ppc@vger.kernel.org>, LinuxS390 <linux-s390@vger.kernel.org>, Paolo Bonzini <pbonzini@redhat.com>, Fuad Tabba <tabba@google.com> Cc: Jing Zhang <jingzhangos@google.com> Subject: [PATCH 4/4] KVM: selftests: Update binary stats test for stats mode Date: Mon, 14 Jun 2021 02:53:51 +0000 [thread overview] Message-ID: <20210614025351.365284-5-jingzhangos@google.com> (raw) In-Reply-To: <20210614025351.365284-1-jingzhangos@google.com> Update binary stats selftest to support sanity test for stats read/write mode and offset. Signed-off-by: Jing Zhang <jingzhangos@google.com> --- tools/testing/selftests/kvm/kvm_binary_stats_test.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/kvm_binary_stats_test.c b/tools/testing/selftests/kvm/kvm_binary_stats_test.c index d85859a6815a..2a34b5e822e8 100644 --- a/tools/testing/selftests/kvm/kvm_binary_stats_test.c +++ b/tools/testing/selftests/kvm/kvm_binary_stats_test.c @@ -77,6 +77,8 @@ static void stats_test(int stats_fd) <= KVM_STATS_UNIT_MAX, "Unknown KVM stats unit"); TEST_ASSERT((pdesc->flags & KVM_STATS_BASE_MASK) <= KVM_STATS_BASE_MAX, "Unknown KVM stats base"); + TEST_ASSERT((pdesc->flags & KVM_STATS_MODE_MASK) + <= KVM_STATS_MODE_MAX, "Unknown KVM stats mode"); /* Check exponent for stats unit * Exponent for counter should be greater than or equal to 0 * Exponent for unit bytes should be greater than or equal to 0 @@ -106,11 +108,18 @@ static void stats_test(int stats_fd) } /* Check overlap */ TEST_ASSERT(header->data_offset >= header->desc_offset - || header->data_offset + size_data <= header->desc_offset, - "Data block is overlapped with Descriptor block"); + || header->data_offset + size_data <= header->desc_offset, + "Data block is overlapped with Descriptor block"); /* Check validity of all stats data size */ TEST_ASSERT(size_data >= header->count * sizeof(stats_data->value[0]), "Data size is not correct"); + /* Check stats offset */ + for (i = 0; i < header->count; ++i) { + pdesc = (void *)stats_desc + i * size_desc; + TEST_ASSERT(pdesc->offset < size_data, + "Invalid offset (%u) for stats: %s", + pdesc->offset, pdesc->name); + } /* Allocate memory for stats data */ stats_data = malloc(size_data); -- 2.32.0.272.g935e593368-goog
WARNING: multiple messages have this Message-ID (diff)
From: Jing Zhang <jingzhangos@google.com> To: KVM <kvm@vger.kernel.org>, KVMARM <kvmarm@lists.cs.columbia.edu>, LinuxMIPS <linux-mips@vger.kernel.org>, KVMPPC <kvm-ppc@vger.kernel.org>, LinuxS390 <linux-s390@vger.kernel.org>, Paolo Bonzini <pbonzini@redhat.com>, Fuad Tabba <tabba@google.com> Subject: [PATCH 4/4] KVM: selftests: Update binary stats test for stats mode Date: Mon, 14 Jun 2021 02:53:51 +0000 [thread overview] Message-ID: <20210614025351.365284-5-jingzhangos@google.com> (raw) In-Reply-To: <20210614025351.365284-1-jingzhangos@google.com> Update binary stats selftest to support sanity test for stats read/write mode and offset. Signed-off-by: Jing Zhang <jingzhangos@google.com> --- tools/testing/selftests/kvm/kvm_binary_stats_test.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/kvm_binary_stats_test.c b/tools/testing/selftests/kvm/kvm_binary_stats_test.c index d85859a6815a..2a34b5e822e8 100644 --- a/tools/testing/selftests/kvm/kvm_binary_stats_test.c +++ b/tools/testing/selftests/kvm/kvm_binary_stats_test.c @@ -77,6 +77,8 @@ static void stats_test(int stats_fd) <= KVM_STATS_UNIT_MAX, "Unknown KVM stats unit"); TEST_ASSERT((pdesc->flags & KVM_STATS_BASE_MASK) <= KVM_STATS_BASE_MAX, "Unknown KVM stats base"); + TEST_ASSERT((pdesc->flags & KVM_STATS_MODE_MASK) + <= KVM_STATS_MODE_MAX, "Unknown KVM stats mode"); /* Check exponent for stats unit * Exponent for counter should be greater than or equal to 0 * Exponent for unit bytes should be greater than or equal to 0 @@ -106,11 +108,18 @@ static void stats_test(int stats_fd) } /* Check overlap */ TEST_ASSERT(header->data_offset >= header->desc_offset - || header->data_offset + size_data <= header->desc_offset, - "Data block is overlapped with Descriptor block"); + || header->data_offset + size_data <= header->desc_offset, + "Data block is overlapped with Descriptor block"); /* Check validity of all stats data size */ TEST_ASSERT(size_data >= header->count * sizeof(stats_data->value[0]), "Data size is not correct"); + /* Check stats offset */ + for (i = 0; i < header->count; ++i) { + pdesc = (void *)stats_desc + i * size_desc; + TEST_ASSERT(pdesc->offset < size_data, + "Invalid offset (%u) for stats: %s", + pdesc->offset, pdesc->name); + } /* Allocate memory for stats data */ stats_data = malloc(size_data); -- 2.32.0.272.g935e593368-goog _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2021-06-14 2:54 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-14 2:53 [PATCH 0/4] Remove duplicated stats definitions for debugfs Jing Zhang 2021-06-14 2:53 ` Jing Zhang 2021-06-14 2:53 ` [PATCH 1/4] KVM: stats: Make sure no missing or mismatched binary stats definition Jing Zhang 2021-06-14 2:53 ` Jing Zhang 2021-06-14 2:53 ` Jing Zhang 2021-06-14 9:49 ` Fuad Tabba 2021-06-14 9:49 ` Fuad Tabba 2021-06-14 9:49 ` Fuad Tabba 2021-06-14 13:28 ` Jing Zhang 2021-06-14 13:28 ` Jing Zhang 2021-06-14 13:28 ` Jing Zhang 2021-06-16 12:55 ` kernel test robot 2021-06-16 12:55 ` kernel test robot 2021-06-16 12:55 ` kernel test robot 2021-06-16 12:55 ` kernel test robot 2021-06-14 2:53 ` [PATCH 2/4] KVM: stats: Use binary stats descriptors for debugfs interface Jing Zhang 2021-06-14 2:53 ` Jing Zhang 2021-06-14 2:53 ` Jing Zhang 2021-06-14 9:51 ` Paolo Bonzini 2021-06-14 9:51 ` Paolo Bonzini 2021-06-14 9:51 ` Paolo Bonzini 2021-06-14 13:36 ` Jing Zhang 2021-06-14 13:36 ` Jing Zhang 2021-06-14 13:36 ` Jing Zhang 2021-06-14 2:53 ` [PATCH 3/4] KVM: stats: Update documentation supporting stats mode and offset Jing Zhang 2021-06-14 2:53 ` Jing Zhang 2021-06-14 2:53 ` Jing Zhang [this message] 2021-06-14 2:53 ` [PATCH 4/4] KVM: selftests: Update binary stats test for stats mode Jing Zhang 2021-06-14 9:53 ` [PATCH 0/4] Remove duplicated stats definitions for debugfs Paolo Bonzini 2021-06-14 9:53 ` Paolo Bonzini 2021-06-14 9:53 ` Paolo Bonzini 2021-06-14 13:38 ` Jing Zhang 2021-06-14 13:38 ` Jing Zhang 2021-06-14 13:38 ` Jing Zhang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210614025351.365284-5-jingzhangos@google.com \ --to=jingzhangos@google.com \ --cc=kvm-ppc@vger.kernel.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-mips@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=pbonzini@redhat.com \ --cc=tabba@google.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.