From: Sean Christopherson <seanjc@google.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Kan Liang <kan.liang@linux.intel.com>,
Dapeng Mi <dapeng1.mi@linux.intel.com>,
Jim Mattson <jmattson@google.com>,
Jinrong Liang <cloudliang@tencent.com>,
Aaron Lewis <aaronlewis@google.com>,
Like Xu <likexu@tencent.com>
Subject: [PATCH v10 23/29] KVM: selftests: Add helpers to read integer module params
Date: Tue, 9 Jan 2024 15:02:43 -0800 [thread overview]
Message-ID: <20240109230250.424295-24-seanjc@google.com> (raw)
In-Reply-To: <20240109230250.424295-1-seanjc@google.com>
Add helpers to read integer module params, which is painfully non-trivial
because the pain of dealing with strings in C is exacerbated by the kernel
inserting a newline.
Don't bother differentiating between int, uint, short, etc. They all fit
in an int, and KVM (thankfully) doesn't have any integer params larger
than an int.
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
.../selftests/kvm/include/kvm_util_base.h | 4 ++
tools/testing/selftests/kvm/lib/kvm_util.c | 62 +++++++++++++++++--
2 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h
index 9e5afc472c14..070f250036fc 100644
--- a/tools/testing/selftests/kvm/include/kvm_util_base.h
+++ b/tools/testing/selftests/kvm/include/kvm_util_base.h
@@ -259,6 +259,10 @@ bool get_kvm_param_bool(const char *param);
bool get_kvm_intel_param_bool(const char *param);
bool get_kvm_amd_param_bool(const char *param);
+int get_kvm_param_integer(const char *param);
+int get_kvm_intel_param_integer(const char *param);
+int get_kvm_amd_param_integer(const char *param);
+
unsigned int kvm_check_cap(long cap);
static inline bool kvm_has_cap(long cap)
diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index e066d584c656..9bafe44cb978 100644
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -51,13 +51,13 @@ int open_kvm_dev_path_or_exit(void)
return _open_kvm_dev_path_or_exit(O_RDONLY);
}
-static bool get_module_param_bool(const char *module_name, const char *param)
+static ssize_t get_module_param(const char *module_name, const char *param,
+ void *buffer, size_t buffer_size)
{
const int path_size = 128;
char path[path_size];
- char value;
- ssize_t r;
- int fd;
+ ssize_t bytes_read;
+ int fd, r;
r = snprintf(path, path_size, "/sys/module/%s/parameters/%s",
module_name, param);
@@ -66,11 +66,46 @@ static bool get_module_param_bool(const char *module_name, const char *param)
fd = open_path_or_exit(path, O_RDONLY);
- r = read(fd, &value, 1);
- TEST_ASSERT(r == 1, "read(%s) failed", path);
+ bytes_read = read(fd, buffer, buffer_size);
+ TEST_ASSERT(bytes_read > 0, "read(%s) returned %ld, wanted %ld bytes",
+ path, bytes_read, buffer_size);
r = close(fd);
TEST_ASSERT(!r, "close(%s) failed", path);
+ return bytes_read;
+}
+
+static int get_module_param_integer(const char *module_name, const char *param)
+{
+ /*
+ * 16 bytes to hold a 64-bit value (1 byte per char), 1 byte for the
+ * NUL char, and 1 byte because the kernel sucks and inserts a newline
+ * at the end.
+ */
+ char value[16 + 1 + 1];
+ ssize_t r;
+
+ memset(value, '\0', sizeof(value));
+
+ r = get_module_param(module_name, param, value, sizeof(value));
+ TEST_ASSERT(value[r - 1] == '\n',
+ "Expected trailing newline, got char '%c'", value[r - 1]);
+
+ /*
+ * Squash the newline, otherwise atoi_paranoid() will complain about
+ * trailing non-NUL characters in the string.
+ */
+ value[r - 1] = '\0';
+ return atoi_paranoid(value);
+}
+
+static bool get_module_param_bool(const char *module_name, const char *param)
+{
+ char value;
+ ssize_t r;
+
+ r = get_module_param(module_name, param, &value, sizeof(value));
+ TEST_ASSERT_EQ(r, 1);
if (value == 'Y')
return true;
@@ -95,6 +130,21 @@ bool get_kvm_amd_param_bool(const char *param)
return get_module_param_bool("kvm_amd", param);
}
+int get_kvm_param_integer(const char *param)
+{
+ return get_module_param_integer("kvm", param);
+}
+
+int get_kvm_intel_param_integer(const char *param)
+{
+ return get_module_param_integer("kvm_intel", param);
+}
+
+int get_kvm_amd_param_integer(const char *param)
+{
+ return get_module_param_integer("kvm_amd", param);
+}
+
/*
* Capability
*
--
2.43.0.472.g3155946c3a-goog
next prev parent reply other threads:[~2024-01-09 23:03 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-09 23:02 [PATCH v10 00/29] KVM: x86/pmu: selftests: Fixes and new tests Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 01/29] KVM: x86/pmu: Always treat Fixed counters as available when supported Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 02/29] KVM: x86/pmu: Allow programming events that match unsupported arch events Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 03/29] KVM: x86/pmu: Remove KVM's enumeration of Intel's architectural encodings Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 04/29] KVM: x86/pmu: Setup fixed counters' eventsel during PMU initialization Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 05/29] KVM: x86/pmu: Get eventsel for fixed counters from perf Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 06/29] KVM: x86/pmu: Don't ignore bits 31:30 for RDPMC index on AMD Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 07/29] KVM: x86/pmu: Prioritize VMX interception over #GP on RDPMC due to bad index Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 08/29] KVM: x86/pmu: Apply "fast" RDPMC only to Intel PMUs Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 09/29] KVM: x86/pmu: Disallow "fast" RDPMC for architectural " Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 10/29] KVM: x86/pmu: Treat "fixed" PMU type in RDPMC as index as a value, not flag Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 11/29] KVM: x86/pmu: Explicitly check for RDPMC of unsupported Intel PMC types Sean Christopherson
2024-01-12 3:50 ` Mi, Dapeng
2024-01-09 23:02 ` [PATCH v10 12/29] KVM: selftests: Add vcpu_set_cpuid_property() to set properties Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 13/29] KVM: selftests: Drop the "name" param from KVM_X86_PMU_FEATURE() Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 14/29] KVM: selftests: Extend {kvm,this}_pmu_has() to support fixed counters Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 15/29] KVM: selftests: Add pmu.h and lib/pmu.c for common PMU assets Sean Christopherson
2024-01-10 9:21 ` Andrew Jones
2024-01-10 13:58 ` Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 16/29] KVM: selftests: Test Intel PMU architectural events on gp counters Sean Christopherson
2024-01-12 9:14 ` Mi, Dapeng
2024-01-12 21:37 ` Sean Christopherson
2024-01-15 2:03 ` Mi, Dapeng
2024-01-30 23:27 ` Sean Christopherson
2024-01-31 2:11 ` Mi, Dapeng
2024-01-31 15:31 ` Sean Christopherson
2024-02-01 1:51 ` Mi, Dapeng
2024-01-09 23:02 ` [PATCH v10 17/29] KVM: selftests: Test Intel PMU architectural events on fixed counters Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 18/29] KVM: selftests: Test consistency of CPUID with num of gp counters Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 19/29] KVM: selftests: Test consistency of CPUID with num of fixed counters Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 20/29] KVM: selftests: Add functional test for Intel's fixed PMU counters Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 21/29] KVM: selftests: Expand PMU counters test to verify LLC events Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 22/29] KVM: selftests: Add a helper to query if the PMU module param is enabled Sean Christopherson
2024-01-09 23:02 ` Sean Christopherson [this message]
2024-01-09 23:02 ` [PATCH v10 24/29] KVM: selftests: Query module param to detect FEP in MSR filtering test Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 25/29] KVM: selftests: Move KVM_FEP macro into common library header Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 26/29] KVM: selftests: Test PMC virtualization with forced emulation Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 27/29] KVM: selftests: Add a forced emulation variation of KVM_ASM_SAFE() Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 28/29] KVM: selftests: Add helpers for safe and safe+forced RDMSR, RDPMC, and XGETBV Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 29/29] KVM: selftests: Extend PMU counters test to validate RDPMC after WRMSR Sean Christopherson
2024-01-12 9:17 ` [PATCH v10 00/29] KVM: x86/pmu: selftests: Fixes and new tests Mi, Dapeng
2024-01-31 0:59 ` Sean Christopherson
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=20240109230250.424295-24-seanjc@google.com \
--to=seanjc@google.com \
--cc=aaronlewis@google.com \
--cc=cloudliang@tencent.com \
--cc=dapeng1.mi@linux.intel.com \
--cc=jmattson@google.com \
--cc=kan.liang@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=likexu@tencent.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).