From: Aaron Lewis <aaronlewis@google.com>
To: kvm@vger.kernel.org
Cc: alex@shazbot.org, dmatlack@google.com, jgg@nvidia.com,
Aaron Lewis <aaronlewis@google.com>
Subject: [PATCH 3/4] vfio: selftests: Allow a size for vfio_dma_mapping_perf_test
Date: Wed, 1 Jul 2026 20:33:10 +0000 [thread overview]
Message-ID: <20260701203311.326798-4-aaronlewis@google.com> (raw)
In-Reply-To: <20260701203311.326798-1-aaronlewis@google.com>
Allow the user to specify a DMA region size via the command line for
vfio_dma_mapping_perf_test.
Because the selftest harness also parses command-line parameters, sharing
them directly is problematic. Adding options directly to the test could
create conflicts with harness-defined options. Even without conflicts, the
harness would need to be updated to recognize test-specific options to avoid
failing on unknown parameters.
Resolve this by isolating the two sets of parameters. The standard command-line
options are consumed by the test itself. To pass options through to the test
harness, introduce a new '-a' option.
For example, both the test size and the test harness options can be set
like this:
./vfio_dma_mapping_perf_test -b 16G -a "-v vfio_type1_iommu_memfd_hugetlb_1gb"
This invocation configures a 16G DMA region and restricts execution to the
specified test variant, which is useful when debugging DMA mapping latency
issues for a specific IOMMU type.
Signed-off-by: Aaron Lewis <aaronlewis@google.com>
---
.../vfio/vfio_dma_mapping_perf_test.c | 132 +++++++++++++++++-
1 file changed, 129 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/vfio/vfio_dma_mapping_perf_test.c b/tools/testing/selftests/vfio/vfio_dma_mapping_perf_test.c
index 4639bda7ebaa..6c025e9c4420 100644
--- a/tools/testing/selftests/vfio/vfio_dma_mapping_perf_test.c
+++ b/tools/testing/selftests/vfio/vfio_dma_mapping_perf_test.c
@@ -4,6 +4,7 @@
#include <sys/mman.h>
#include <time.h>
#include <unistd.h>
+#include <wordexp.h>
#include <linux/iommufd.h>
#include <linux/limits.h>
@@ -19,6 +20,12 @@
static const char *device_bdf;
+struct test_params {
+ u64 size;
+};
+
+struct test_params test_params;
+
struct iommu_mapping {
u64 pgd;
u64 p4d;
@@ -80,7 +87,7 @@ FIXTURE_TEARDOWN(vfio_dma_mapping_perf_test)
TEST_F(vfio_dma_mapping_perf_test, dma_map_unmap)
{
- const u64 size = SZ_1G;
+ const u64 size = test_params.size;
const int flags = variant->mmap_flags;
struct dma_region region;
struct timespec start;
@@ -204,7 +211,7 @@ static void teardown_memfd(int fd, u64 size, void *vaddr)
TEST_F(vfio_dma_mapping_perf_memfd_test, dma_map_unmap_from_file)
{
- const u64 size = SZ_1G;
+ const u64 size = test_params.size;
struct dma_region region;
struct timespec start;
u64 unmapped;
@@ -235,8 +242,127 @@ TEST_F(vfio_dma_mapping_perf_memfd_test, dma_map_unmap_from_file)
teardown_memfd(fd, size, region.vaddr);
}
+/*
+ * Parses "[0-9]+[kmgt]?".
+ */
+size_t parse_size(const char *size)
+{
+ size_t base;
+ char *scale;
+ int shift = 0;
+
+ VFIO_ASSERT_TRUE(size && isdigit(size[0]),
+ "Need at least one digit in '%s'.", size);
+
+ base = strtoull(size, &scale, 0);
+
+ VFIO_ASSERT_TRUE(base != ULLONG_MAX, "Overflow parsing size!");
+
+ switch (tolower(*scale)) {
+ case 't':
+ shift = 40;
+ break;
+ case 'g':
+ shift = 30;
+ break;
+ case 'm':
+ shift = 20;
+ break;
+ case 'k':
+ shift = 10;
+ break;
+ case 'b':
+ case '\0':
+ shift = 0;
+ break;
+ default:
+ VFIO_FAIL("Unknown size letter '%c'.", *scale);
+ }
+
+ VFIO_ASSERT_TRUE((base << shift) >> shift == base,
+ "Overflow scaling size!");
+
+ return base << shift;
+}
+
+static void help(char *name)
+{
+ puts("");
+ printf("usage: %s [-h] [-b bytes] [-a \"test harness args\"]\n", name);
+ puts("");
+ printf(" -h: Display this help message.\n"
+ " -b: Specify the size of the DMA region to be mapped\n"
+ " and unmapped. e.g. 16M or 8G, (default: 1G)\n"
+ " -a: Args that are forwarded to the test harness,\n"
+ " e.g. -a \"-t dma_map_unmap_from_file\"\n");
+}
+
+struct harness_args
+{
+ int argc;
+ char **argv;
+ wordexp_t exp;
+};
+
+static void populate_harness_args(struct harness_args *args, const char *argv_0,
+ const char *cmdlne)
+{
+ if (wordexp(argv_0, &args->exp, WRDE_NOCMD) == 0 &&
+ wordexp(cmdlne, &args->exp, WRDE_APPEND | WRDE_NOCMD) == 0) {
+ args->argc = args->exp.we_wordc;
+ args->argv = args->exp.we_wordv;
+ }
+}
+
+static void setup_test(struct harness_args *args, int argc, char *argv[])
+{
+ int opt;
+
+ test_params = (struct test_params) {
+ .size = SZ_1G,
+ };
+
+ while ((opt = getopt(argc, argv, "a:b:h")) != -1) {
+ switch (opt) {
+ case 'a':
+ populate_harness_args(args, argv[0], optarg);
+ break;
+ case 'b':
+ test_params.size = parse_size(optarg);
+ break;
+ case 'h':
+ default:
+ help(argv[0]);
+ goto out;
+ }
+ }
+
+out:
+ // Reset getopt() state to allow the test harness to use it.
+ optind = 1;
+}
+
+static void teardown_test(struct harness_args *args)
+{
+ if (args->argv) {
+ args->argc = 0;
+ args->argv = NULL;
+ wordfree(&args->exp);
+ }
+}
+
int main(int argc, char *argv[])
{
+ struct harness_args args = (struct harness_args) {
+ .argc = 0,
+ .argv = NULL,
+ };
+ int r;
+
+ setup_test(&args, argc, argv);
device_bdf = vfio_selftests_get_bdf(&argc, argv);
- return test_harness_run(argc, argv);
+ r = test_harness_run(args.argc, args.argv);
+ teardown_test(&args);
+
+ return r;
}
--
2.55.0.rc0.799.gd6f94ed593-goog
next prev parent reply other threads:[~2026-07-01 20:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-01 20:33 [PATCH 0/4] Introduce vfio_dma_mapping_perf_test Aaron Lewis
2026-07-01 20:33 ` [PATCH 1/4] vfio: selftests: " Aaron Lewis
2026-07-01 20:44 ` sashiko-bot
2026-07-01 20:33 ` [PATCH 2/4] vfio: selftests: Add memfd test to vfio_dma_mapping_perf_test Aaron Lewis
2026-07-01 20:43 ` sashiko-bot
2026-07-01 20:33 ` Aaron Lewis [this message]
2026-07-01 20:44 ` [PATCH 3/4] vfio: selftests: Allow a size for vfio_dma_mapping_perf_test sashiko-bot
2026-07-01 20:33 ` [PATCH 4/4] vfio: selftests: Allow the flag MAP_POPULATE to be set on the cmdline Aaron Lewis
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=20260701203311.326798-4-aaronlewis@google.com \
--to=aaronlewis@google.com \
--cc=alex@shazbot.org \
--cc=dmatlack@google.com \
--cc=jgg@nvidia.com \
--cc=kvm@vger.kernel.org \
/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 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.