From patchwork Wed Jul 13 00:52:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gow X-Patchwork-Id: 12915850 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 9AAFCC43334 for ; Wed, 13 Jul 2022 00:52:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229993AbiGMAwa (ORCPT ); Tue, 12 Jul 2022 20:52:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229674AbiGMAwa (ORCPT ); Tue, 12 Jul 2022 20:52:30 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E45EBDBB9 for ; Tue, 12 Jul 2022 17:52:29 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-2dc7bdd666fso81716517b3.7 for ; Tue, 12 Jul 2022 17:52:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=IBBthWT9u4UyqwX/3AheGhzcyiFLeqqA+WnxRGpF0DM=; b=XtraHLVXVA8Q6rk2B0/mqyPO5tmI/GN09VHw9Jf2QsZFNymE9Gklp34Po5wmBkyH4o 5MN4giuBFiOSKIHN6ar6lcpcvtIx43YA93hNOq1NKSx61TIvEo5/8ydelhCplS1w7Mnj Nogt/4wrqMKnPx2HLqNg2zLTcFLKNOeLHnH0cCMOgOI9WIlPDnUmK5S61LpZ25I9aJl3 gbOTt6ItboRu00B3vjNg3Z77Q7YkCzyjb39RvdjVXZtK3tTx5kiu8trcCSlNBB9Ma5YD w16Me6jHQpRZ2/6V8FGtQdzIe0HE2b5IMGUECRDasyDV3WkqtxJWnFLtjbqL7KFdCcjl gGnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=IBBthWT9u4UyqwX/3AheGhzcyiFLeqqA+WnxRGpF0DM=; b=nBfxjfzGNYbLQ13jTFAOwPOfEmRVwhl2ws070acx1V7m6zmbiBEfy7cNCSokGtHeMZ Dpmchd5DAJZWSdDzYdsqdAVgrLn0s0s6NPmQRKJmvwcUXYKY7z5NoX800YUXLk3j7Dlm 3pqbWO3PqOM0djkiaGdAMnakPY1ioMTR3uuZo+0WFozq6pNGI9N4EyGQtU8Ym6i08oBn Yo0Y0g4e0cAOej/fudNWWJ7Des5EXruw18RLrs3mv42eECcSCtj/4sN21hpKZbuGoyGy 7MFTmuMChJC6uXd0GPsco2O73JPGyL81J5OYsnpw7/fHMjLjzBlh2WVhffjj4K+D6xuT VFbQ== X-Gm-Message-State: AJIora/9jx0jrnQE5QhmHaasICCzRtNH19YPrP8KIDny+Oa6VKbm5ynC VIHPCSlJL06XCmkVZsdVMbwAyeQ7/wClCQ== X-Google-Smtp-Source: AGRyM1tNeaI0uRA4XyHMmAsxk/ZwGTuVu3qI8Hv1n5Q0nkKc8YdOCBEsVUhM8hAZSzrZt0BG2Y3xc5OX9fvGhA== X-Received: from slicestar.c.googlers.com ([fda3:e722:ac3:cc00:4f:4b78:c0a8:20a1]) (user=davidgow job=sendgmr) by 2002:a25:cb0e:0:b0:66f:7b31:3563 with SMTP id b14-20020a25cb0e000000b0066f7b313563mr1141957ybg.85.1657673548486; Tue, 12 Jul 2022 17:52:28 -0700 (PDT) Date: Wed, 13 Jul 2022 08:52:20 +0800 Message-Id: <20220713005221.1926290-1-davidgow@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.37.0.144.g8ac04bfd2-goog Subject: [PATCH] module: kunit: Load .kunit_test_suites section when CONFIG_KUNIT=m From: David Gow To: Brendan Higgins , Shuah Khan , Daniel Latypov , Luis Chamberlain , Jeremy Kerr Cc: David Gow , linux-modules@vger.kernel.org, kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, Linux Kernel Mailing List Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org The new KUnit module handling has KUnit test suites listed in a .kunit_test_suites section of each module. This should be loaded when the module is, but at the moment this only happens if KUnit is built-in. Also load this when KUnit is enabled as a module: it'll not be usable unless KUnit is loaded, but such modules are likely to depend on KUnit anyway, so it's unlikely to ever be loaded needlessly. Fixes: 3d6e44623841 ("kunit: unify module and builtin suite definitions") Signed-off-by: David Gow Reviewed-by: Brendan Higgins Tested-by: Geert Uytterhoeven --- kernel/module/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/module/main.c b/kernel/module/main.c index 324a770f789c..222a0b7263b6 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2094,7 +2094,7 @@ static int find_module_sections(struct module *mod, struct load_info *info) sizeof(*mod->static_call_sites), &mod->num_static_call_sites); #endif -#ifdef CONFIG_KUNIT +#if IS_ENABLED(CONFIG_KUNIT) mod->kunit_suites = section_objs(info, ".kunit_test_suites", sizeof(*mod->kunit_suites), &mod->num_kunit_suites);