From nobody Sun Feb 8 10:34:14 2026 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 47908C00528 for ; Tue, 25 Jul 2023 21:25:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229850AbjGYVZv (ORCPT ); Tue, 25 Jul 2023 17:25:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230441AbjGYVZh (ORCPT ); Tue, 25 Jul 2023 17:25:37 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7EBE41FF5 for ; Tue, 25 Jul 2023 14:25:34 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-cfc77042aeaso6428379276.0 for ; Tue, 25 Jul 2023 14:25:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690320333; x=1690925133; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=cQABQp9/fgq5do2PMDLxADuXEdETdAo+fTGFrKhT3xM=; b=jflwaAyedN/44AlTS/1LBQZ2iOctYb54voSmLUC7KqyJwqTDzemtXJi2RUu0W8uF0B Zn+c1hipTe94C17FmEdWXbpbkMZ0V1gPdMeobJE/K55o8vVB7nvNd/nsXkEBknQUwuRo NjP/M1egHlpX69ETuSa/AYPlS18wxOxne37oLti2YRj1roxxT8YsJQC57oCJ1hb5rBPG nGsMO3FE26jfPLXiCtnb4LCz2vWcYgkUysEGZNtRn1uQiGIacB4U1akaMInllMJeoCNA fl3uBVC4v/xCr6Myn3tv5jLaCk9sN5VJumemnf9MXeofRTPYb5ylW7USeqPG0jc9OC5e PeSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690320333; x=1690925133; 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=cQABQp9/fgq5do2PMDLxADuXEdETdAo+fTGFrKhT3xM=; b=k1OYgvS3T0QvUVl1SNZJnDK8VFBGX3gvvQhX6s9C9vi3F16xE8PJETYrXbvZqDEHvn LJtt3LYA2n8KgWZMymEXYvjv0dVSwC1OSm3S5q+ipnBmOlU4rVEKPB7VxRw+NMgIR3d4 9V4CCo/V5BjBauELfn2T7Y6qcVmYaPaCTn33P8X/w3Af+zCg7E2AIZFChMb9P7EdXZEK o9UFBnzwfLFCcsjj84Lsp1MXmWhseZtn91dy5qlaYYPkfoRuEiYDcf9W84eQ1JjvvlDt yyHKN2Le2LZ8jek6kngxJGrlljl5YGjIhmeclgHkHgNpm1IyDMXfLd4tF6OXtRZ1X797 qpzA== X-Gm-Message-State: ABy/qLYxcVA6iDVdoCqh65mPDN5BL/9+Z70ztawGAPtoMjfPSaA9g0di 6DUNGirTQzJtLMCsGnCQB63Xghfw3w== X-Google-Smtp-Source: APBJJlHlirou98NBt4AkCpdrgz6nHsMm8KPUoNreSfSI1YkyEZ/9+IhgTHHhe1LAkpBK0VKXMvnLxQR1JA== X-Received: from rmoar-specialist.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:45d3]) (user=rmoar job=sendgmr) by 2002:a25:db84:0:b0:d0a:86fc:536c with SMTP id g126-20020a25db84000000b00d0a86fc536cmr1183ybf.2.1690320333783; Tue, 25 Jul 2023 14:25:33 -0700 (PDT) Date: Tue, 25 Jul 2023 21:25:14 +0000 In-Reply-To: <20230725212522.1622716-1-rmoar@google.com> Mime-Version: 1.0 References: <20230725212522.1622716-1-rmoar@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230725212522.1622716-4-rmoar@google.com> Subject: [PATCH v3 3/9] kunit: Add module attribute From: Rae Moar To: shuah@kernel.org, davidgow@google.com, dlatypov@google.com, brendan.higgins@linux.dev Cc: linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, keescook@chromium.org, linux-hardening@vger.kernel.org, jstultz@google.com, tglx@linutronix.de, sboyd@kernel.org, Rae Moar Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add module attribute to the test attribute API. This attribute stores the module name associated with the test using KBUILD_MODNAME. The name of a test suite and the module name often do not match. A reference to the module name associated with the suite could be extremely helpful in running tests as modules without needing to check the codebase. This attribute will be printed for each suite. Reviewed-by: David Gow Signed-off-by: Rae Moar --- Changes since v2: - No changes. Changes since v1: - Change kunit_attr_list definition to fix compile error Changes since RFC v2: - No changes. Changes: since RFC v1: - This is a new patch. include/kunit/test.h | 13 ++++++++----- lib/kunit/attributes.c | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/include/kunit/test.h b/include/kunit/test.h index ed5f5000a095..011e0d6bb506 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -131,6 +131,7 @@ struct kunit_case { =20 /* private: internal use only. */ enum kunit_status status; + char *module_name; char *log; }; =20 @@ -155,7 +156,9 @@ static inline char *kunit_status_to_ok_not_ok(enum kuni= t_status status) * &struct kunit_case object from it. See the documentation for * &struct kunit_case for an example on how to use it. */ -#define KUNIT_CASE(test_name) { .run_case =3D test_name, .name =3D #test_n= ame } +#define KUNIT_CASE(test_name) \ + { .run_case =3D test_name, .name =3D #test_name, \ + .module_name =3D KBUILD_MODNAME} =20 /** * KUNIT_CASE_ATTR - A helper for creating a &struct kunit_case @@ -167,7 +170,7 @@ static inline char *kunit_status_to_ok_not_ok(enum kuni= t_status status) */ #define KUNIT_CASE_ATTR(test_name, attributes) \ { .run_case =3D test_name, .name =3D #test_name, \ - .attr =3D attributes } + .attr =3D attributes, .module_name =3D KBUILD_MODNAME} =20 /** * KUNIT_CASE_SLOW - A helper for creating a &struct kunit_case @@ -178,7 +181,7 @@ static inline char *kunit_status_to_ok_not_ok(enum kuni= t_status status) =20 #define KUNIT_CASE_SLOW(test_name) \ { .run_case =3D test_name, .name =3D #test_name, \ - .attr.speed =3D KUNIT_SPEED_SLOW } + .attr.speed =3D KUNIT_SPEED_SLOW, .module_name =3D KBUILD_MODNAME} =20 /** * KUNIT_CASE_PARAM - A helper for creation a parameterized &struct kunit_= case @@ -199,7 +202,7 @@ static inline char *kunit_status_to_ok_not_ok(enum kuni= t_status status) */ #define KUNIT_CASE_PARAM(test_name, gen_params) \ { .run_case =3D test_name, .name =3D #test_name, \ - .generate_params =3D gen_params } + .generate_params =3D gen_params, .module_name =3D KBUILD_MODNAME} =20 /** * KUNIT_CASE_PARAM_ATTR - A helper for creating a parameterized &struct @@ -213,7 +216,7 @@ static inline char *kunit_status_to_ok_not_ok(enum kuni= t_status status) #define KUNIT_CASE_PARAM_ATTR(test_name, gen_params, attributes) \ { .run_case =3D test_name, .name =3D #test_name, \ .generate_params =3D gen_params, \ - .attr =3D attributes } + .attr =3D attributes, .module_name =3D KBUILD_MODNAME} =20 /** * struct kunit_suite - describes a related collection of &struct kunit_ca= se diff --git a/lib/kunit/attributes.c b/lib/kunit/attributes.c index ffd0d692b334..9dce4f4d726c 100644 --- a/lib/kunit/attributes.c +++ b/lib/kunit/attributes.c @@ -61,6 +61,12 @@ static const char *attr_speed_to_string(void *attr, bool= *to_free) return attr_enum_to_string(attr, speed_str_list, to_free); } =20 +static const char *attr_string_to_string(void *attr, bool *to_free) +{ + *to_free =3D false; + return (char *) attr; +} + /* Get Attribute Methods */ =20 static void *attr_speed_get(void *test_or_suite, bool is_test) @@ -74,6 +80,18 @@ static void *attr_speed_get(void *test_or_suite, bool is= _test) return ((void *) suite->attr.speed); } =20 +static void *attr_module_get(void *test_or_suite, bool is_test) +{ + struct kunit_suite *suite =3D is_test ? NULL : test_or_suite; + struct kunit_case *test =3D is_test ? test_or_suite : NULL; + + // Suites get their module attribute from their first test_case + if (test) + return ((void *) test->module_name); + else + return ((void *) suite->test_cases[0].module_name); +} + /* List of all Test Attributes */ =20 static struct kunit_attr kunit_attr_list[] =3D { @@ -84,6 +102,13 @@ static struct kunit_attr kunit_attr_list[] =3D { .attr_default =3D (void *)KUNIT_SPEED_NORMAL, .print =3D PRINT_ALWAYS, }, + { + .name =3D "module", + .get_attr =3D attr_module_get, + .to_string =3D attr_string_to_string, + .attr_default =3D (void *)"", + .print =3D PRINT_SUITE, + } }; =20 /* Helper Functions to Access Attributes */ --=20 2.41.0.487.g6d72f3e995-goog