From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 588B3368263 for ; Tue, 2 Jun 2026 17:41:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780422118; cv=none; b=kmHT2QWeAk5VzLIeeEvhKxmmh0KF3+XvjvA6i7oIJBDIPZbOHgg+D0yanlvs0q32I9fKDZAQRTSOSKbEtI9uiZ6QOOMZPEL6zvGbKJD+qy84dXitM5aKPgqQq1ztNN60nOHbileEbCnBjqHCV+/mdeKLgAv6ssKuKE3u1YAP3RI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780422118; c=relaxed/simple; bh=yOIBlf72jA48mjf589w2ZAWU7HHMLckXT75Zq2uwsSE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qThZOzKZhJ+xC+dMmBLkKT+zi/FJ70qP1WGhr1iqCxYHWu2SuHxy0RHT5Mf1vdyV+HvZoMx2VyY/AWCLqqvmUMhAIJWYjdGUnzxbDal/k2Tmw0LWLU9dpnkLDEyEwCk1ln/WfYrOwG32a5X3q/KAQHBftJDGWHai4b7mqXMdZbg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=VMndEAWO; arc=none smtp.client-ip=74.125.82.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="VMndEAWO" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-304ed777a96so2620389eec.1 for ; Tue, 02 Jun 2026 10:41:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780422115; x=1781026915; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ZPCq8R2iFDOBkRBVDOMhdJ7tVwFyybPPEZNvzTbgMro=; b=VMndEAWO4h96sUe8qDeDSGV+9wgVmD9SER46HIQIxETLoUJpUKKtfvqAfBS2yZC+1P YtkubPzISxgCt5KFMuNU6lVR5OIqdOkipAFeWn4ZkGZ39sILKxhwelLitIAwGAZ1DjAo kOwZFDFg3jcHXStagjEGd/t6inOr/8V19ITBAQ1EV5jw8y2IduVOvA3dHL0GkGhK+Jo8 1+cFKzawBU7pZUnTmwx7d9Rqh6e1DT6QcG4A+Blm3YLFCLmboh7Tts+kQocNleYnquFl 0xi6zbDTCW5wkCiutQG4EM9YR3xty2hM5b8TEYAOt26ZImKvuZsB6A+MpHGgM6XaDThK jTjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780422115; x=1781026915; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZPCq8R2iFDOBkRBVDOMhdJ7tVwFyybPPEZNvzTbgMro=; b=MIrYw0rFbqRsNawSZOTY7g8NM6FhC6NfZS1t39xlDDCnS8lFXwVqIqesnITqfwCZAk jrDx1DLJz/09v31dmESKbwkfnlMTBZ1MtPiPuA1HMXnnedm76tBy4I9CMA7joqn5W+AB PuX2wGcfUHUPUblQX2lP4Qn1JSmDkFP3LpTsub2g0WvgANmoWlZwDwlnycw3uTyQVEb3 shZSxDEgFP1vEiBBLO/pQB7T1Hxz7zTmA6IwSkBBe5VNdIGyWPh2Q9I0gvFUWhMk0xPM S45MuAJF+pwAR6qGpLvVfNPsbTyXKTBPDgkEv8NQ1qmQOZA9EoRfwr+AbGck96Yv1UnI NAGA== X-Forwarded-Encrypted: i=1; AFNElJ8aHp2dAXluQFx+WeJjukys9mb3DPDOYuGsbkqWsB5kwF97jjjlmXIUCG38avUeOorOhpQqkwemUTqU/FY=@vger.kernel.org X-Gm-Message-State: AOJu0YxcMGmL8ePYBKgIpW1OPgbRJO0sHzk3AXROl8klQhCa/3CRN8Ob K+UNAz0J/epGQqPyPzKnEuZWGYLKn6X7K9t/AZc5cNAvnZcwAHV5iTWLwM8hBf6jmYs2Cw7OEqi HbGJc+q9whQ== X-Received: from dycok16.prod.google.com ([2002:a05:7301:db10:b0:2d7:dc51:72ad]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:2313:b0:2c9:ee15:a0ee with SMTP id 5a478bee46e88-3074d5322b0mr122281eec.12.1780422115207; Tue, 02 Jun 2026 10:41:55 -0700 (PDT) Date: Tue, 2 Jun 2026 10:41:16 -0700 In-Reply-To: <20260602174129.3192312-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260602073132.2653307-1-irogers@google.com> <20260602174129.3192312-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602174129.3192312-6-irogers@google.com> Subject: [PATCH v8 05/18] perf test: Support dynamic test suites with setup callback and private data From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alexander.shishkin@linux.intel.com, james.clark@linaro.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org Content-Type: text/plain; charset="UTF-8" Add void *priv to struct test_case to allow passing per-test context. Add int (*setup)(struct test_suite *) to struct test_suite to allow dynamic generation of test cases. Update build_suites() to invoke the setup callback for each suite if present, ensuring dynamic cases are available before listing or running. Assisted-by: Gemini-CLI:Google Gemini 3 Signed-off-by: Ian Rogers --- tools/perf/tests/builtin-test.c | 17 ++++++++++++++++- tools/perf/tests/tests.h | 2 ++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index 7946878195b7..485ff75ab880 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -765,10 +765,21 @@ static struct test_suite **build_suites(void) for (size_t i = 0, j = 0; i < ARRAY_SIZE(suites); i++, j = 0) \ while ((suite = suites[i][j++]) != NULL) - for_each_suite(t) + for_each_suite(t) { + if (t->setup) { + int ret = t->setup(t); + + if (ret < 0) { + errno = -ret; + return NULL; + } + } num_suites++; + } result = calloc(num_suites + 1, sizeof(struct test_suite *)); + if (!result) + return NULL; for (int pass = 1; pass <= 2; pass++) { for_each_suite(t) { @@ -831,6 +842,8 @@ int cmd_test(int argc, const char **argv) argc = parse_options_subcommand(argc, argv, test_options, test_subcommands, test_usage, 0); if (argc >= 1 && !strcmp(argv[0], "list")) { suites = build_suites(); + if (!suites) + return errno ? -errno : -ENOMEM; ret = perf_test__list(stdout, suites, argc - 1, argv + 1); free(suites); return ret; @@ -863,6 +876,8 @@ int cmd_test(int argc, const char **argv) rlimit__bump_memlock(); suites = build_suites(); + if (!suites) + return errno ? -errno : -ENOMEM; ret = __cmd_test(suites, argc, argv, skiplist); free(suites); return ret; diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index ee00518bf36f..9bcf1dbb0663 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -38,12 +38,14 @@ struct test_case { const char *skip_reason; test_fnptr run_case; bool exclusive; + void *priv; }; struct test_suite { const char *desc; struct test_case *test_cases; void *priv; + int (*setup)(struct test_suite *suite); }; #define DECLARE_SUITE(name) \ -- 2.54.0.1013.g208068f2d8-goog