From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46853C433E0 for ; Fri, 26 Jun 2020 21:29:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 14D3D20B1F for ; Fri, 26 Jun 2020 21:29:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ZHuV3n4N" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726146AbgFZV30 (ORCPT ); Fri, 26 Jun 2020 17:29:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726022AbgFZV3Z (ORCPT ); Fri, 26 Jun 2020 17:29:25 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 157C7C03E97B for ; Fri, 26 Jun 2020 14:29:25 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id b7so4792304pju.0 for ; Fri, 26 Jun 2020 14:29:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=/Ga8k3mofod9gwPX4Z/kRgYwjmzbSSQT5mPWQ+iRr00=; b=ZHuV3n4N2UyL/uEYmg3j+3S3u+0QqpFCQhDYVKkZw9LuOjYP1YSNslr8dnNrsBn9Dh We7UamS+FEowQ2lOAMqm20z8L9ypztLNs429NEWOoxO6J0/qlK/WaTSFp6sTA+5zXJXt QK39ZARTjmUwV0eEr/JQyzmixIHGUEqhvzyh0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=/Ga8k3mofod9gwPX4Z/kRgYwjmzbSSQT5mPWQ+iRr00=; b=j5qwgFpbDA4md4hNRsY3GTdQLpjPhNQNDcVq2Gcb86M0JANWwTUg5X5Ak3rpI5xDwj uTgDdljJP2a9H0MvH6fZXFF4goy15VInEQU7I94O/8nYGv6XUCTQhlcn2h26A8YJCyGn a5/w6sFxCH2XiNhK9suDIEwwO6NDTzhS8GnwDe9wo0mWqp9Qw0qYYu2NYwHdav972U1o r4IUdgmr1cjDZvJ2ho4oBH3jeK5hNo5kPNzUCM3tCI0Hsmb+vgfY6j7d4bMbbSp+9liU rI5gdSY6drSfFXYrWA0tnyaYgj5v87S1oPDm4w8YY+iTRHXAHp1Ipjlzpm9c61hJaE91 UcpA== X-Gm-Message-State: AOAM530uO+2Le1Z6GbfPDCjFgCd9EOMuXHnfzOTjMH3ItY7FSfinL2Cx vkMDWjTr2LpPxGr6FV1O0Eji4A== X-Google-Smtp-Source: ABdhPJwxwunBg3ErYOqng8+maceCSdLikNLQ8Egfp/C6bLTULFH4Wp7/OynACw0oVHkVmKrSUGo10g== X-Received: by 2002:a17:90a:4a6:: with SMTP id g35mr5538400pjg.155.1593206964538; Fri, 26 Jun 2020 14:29:24 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id j19sm5623223pjy.40.2020.06.26.14.29.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 14:29:23 -0700 (PDT) Date: Fri, 26 Jun 2020 14:29:22 -0700 From: Kees Cook To: Brendan Higgins Cc: jdike@addtoit.com, richard@nod.at, anton.ivanov@cambridgegreys.com, arnd@arndb.de, skhan@linuxfoundation.org, alan.maguire@oracle.com, yzaikin@google.com, davidgow@google.com, akpm@linux-foundation.org, rppt@linux.ibm.com, frowand.list@gmail.com, catalin.marinas@arm.com, will@kernel.org, monstr@monstr.eu, mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org, chris@zankel.net, jcmvbkbc@gmail.com, gregkh@linuxfoundation.org, sboyd@kernel.org, logang@deltatee.com, mcgrof@kernel.org, linux-um@lists.infradead.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-xtensa@linux-xtensa.org Subject: Re: [PATCH v5 07/12] kunit: test: create a single centralized executor for all tests Message-ID: <202006261423.0BC9D830@keescook> References: <20200626210917.358969-1-brendanhiggins@google.com> <20200626210917.358969-8-brendanhiggins@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200626210917.358969-8-brendanhiggins@google.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 26, 2020 at 02:09:12PM -0700, Brendan Higgins wrote: > From: Alan Maguire > > Add a centralized executor to dispatch tests rather than relying on > late_initcall to schedule each test suite separately. Centralized > execution is for built-in tests only; modules will execute tests when > loaded. > > Signed-off-by: Alan Maguire > Co-developed-by: Iurii Zaikin > Signed-off-by: Iurii Zaikin > Co-developed-by: Brendan Higgins > Signed-off-by: Brendan Higgins > Reviewed-by: Stephen Boyd > --- > include/kunit/test.h | 67 +++++++++++++++++++++++++++++--------------- > lib/kunit/Makefile | 3 +- > lib/kunit/executor.c | 28 ++++++++++++++++++ > lib/kunit/test.c | 2 +- > 4 files changed, 76 insertions(+), 24 deletions(-) > create mode 100644 lib/kunit/executor.c > > diff --git a/include/kunit/test.h b/include/kunit/test.h > index 47e61e1d53370..f3e86c3953a2b 100644 > --- a/include/kunit/test.h > +++ b/include/kunit/test.h > @@ -224,7 +224,7 @@ size_t kunit_suite_num_test_cases(struct kunit_suite *suite); > unsigned int kunit_test_case_num(struct kunit_suite *suite, > struct kunit_case *test_case); > > -int __kunit_test_suites_init(struct kunit_suite **suites); > +int __kunit_test_suites_init(struct kunit_suite * const * const suites); > > void __kunit_test_suites_exit(struct kunit_suite **suites); > > @@ -237,34 +237,57 @@ void __kunit_test_suites_exit(struct kunit_suite **suites); > * Registers @suites_list with the test framework. See &struct kunit_suite for > * more information. > * > - * When builtin, KUnit tests are all run as late_initcalls; this means > - * that they cannot test anything where tests must run at a different init > - * phase. One significant restriction resulting from this is that KUnit > - * cannot reliably test anything that is initialize in the late_init phase; > - * another is that KUnit is useless to test things that need to be run in > - * an earlier init phase. > - * > - * An alternative is to build the tests as a module. Because modules > - * do not support multiple late_initcall()s, we need to initialize an > - * array of suites for a module. > - * > - * TODO(brendanhiggins@google.com): Don't run all KUnit tests as > - * late_initcalls. I have some future work planned to dispatch all KUnit > - * tests from the same place, and at the very least to do so after > - * everything else is definitely initialized. > + * If a test suite is built-in, module_init() gets translated into > + * an initcall which we don't want as the idea is that for builtins > + * the executor will manage execution. So ensure we do not define > + * module_{init|exit} functions for the builtin case when registering > + * suites via kunit_test_suites() below. > */ > -#define kunit_test_suites(suites_list...) \ > - static struct kunit_suite *suites[] = {suites_list, NULL}; \ > - static int kunit_test_suites_init(void) \ > +#ifdef MODULE > +#define kunit_test_suites_for_module(__suites) \ > + static int __init kunit_test_suites_init(void) \ > { \ > - return __kunit_test_suites_init(suites); \ > + return __kunit_test_suites_init(__suites); \ > } \ > - late_initcall(kunit_test_suites_init); \ > + module_init(kunit_test_suites_init); \ > + \ > static void __exit kunit_test_suites_exit(void) \ > { \ > - return __kunit_test_suites_exit(suites); \ > + return __kunit_test_suites_exit(__suites); \ > } \ > module_exit(kunit_test_suites_exit) > +#else > +#define kunit_test_suites_for_module(__suites) > +#endif /* MODULE */ > + > +#define __kunit_test_suites(unique_array, unique_suites, ...) \ > + static struct kunit_suite *unique_array[] = { __VA_ARGS__, NULL }; \ > + kunit_test_suites_for_module(unique_array); \ > + static struct kunit_suite **unique_suites \ > + __used __section(.kunit_test_suites) = unique_array > + > +/** > + * kunit_test_suites() - used to register one or more &struct kunit_suite > + * with KUnit. > + * > + * @suites: a statically allocated list of &struct kunit_suite. > + * > + * Registers @suites with the test framework. See &struct kunit_suite for > + * more information. > + * > + * When builtin, KUnit tests are all run via executor; this is done > + * by placing the array of struct kunit_suite * in the .kunit_test_suites > + * ELF section. > + * > + * An alternative is to build the tests as a module. Because modules do not > + * support multiple initcall()s, we need to initialize an array of suites for a > + * module. > + * > + */ > +#define kunit_test_suites(...) \ > + __kunit_test_suites(__UNIQUE_ID(array), \ > + __UNIQUE_ID(suites), \ > + __VA_ARGS__) > > #define kunit_test_suite(suite) kunit_test_suites(&suite) > > diff --git a/lib/kunit/Makefile b/lib/kunit/Makefile > index 724b94311ca36..c49f4ffb6273a 100644 > --- a/lib/kunit/Makefile > +++ b/lib/kunit/Makefile > @@ -3,7 +3,8 @@ obj-$(CONFIG_KUNIT) += kunit.o > kunit-objs += test.o \ > string-stream.o \ > assert.o \ > - try-catch.o > + try-catch.o \ > + executor.o > > ifeq ($(CONFIG_KUNIT_DEBUGFS),y) > kunit-objs += debugfs.o > diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c > new file mode 100644 > index 0000000000000..7015e7328dce7 > --- /dev/null > +++ b/lib/kunit/executor.c > @@ -0,0 +1,28 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +#include > + > +/* > + * These symbols point to the .kunit_test_suites section and are defined in > + * include/asm-generic/vmlinux.lds.h, and consequently must be extern. > + */ > +extern struct kunit_suite * const * const __kunit_suites_start[]; > +extern struct kunit_suite * const * const __kunit_suites_end[]; I would expect these to be in include/asm-generic/sections.h but I guess it's not required. Reviewed-by: Kees Cook -- Kees Cook From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 102DEC433E0 for ; Fri, 26 Jun 2020 21:47:38 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B0FFD2088E for ; Fri, 26 Jun 2020 21:47:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ZHuV3n4N" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B0FFD2088E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49tr8Q58H2zDqJC for ; Sat, 27 Jun 2020 07:47:34 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=chromium.org (client-ip=2607:f8b0:4864:20::641; helo=mail-pl1-x641.google.com; envelope-from=keescook@chromium.org; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ZHuV3n4N; dkim-atps=neutral Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49tqlX1btCzDqsZ for ; Sat, 27 Jun 2020 07:29:28 +1000 (AEST) Received: by mail-pl1-x641.google.com with SMTP id 35so4735166ple.0 for ; Fri, 26 Jun 2020 14:29:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=/Ga8k3mofod9gwPX4Z/kRgYwjmzbSSQT5mPWQ+iRr00=; b=ZHuV3n4N2UyL/uEYmg3j+3S3u+0QqpFCQhDYVKkZw9LuOjYP1YSNslr8dnNrsBn9Dh We7UamS+FEowQ2lOAMqm20z8L9ypztLNs429NEWOoxO6J0/qlK/WaTSFp6sTA+5zXJXt QK39ZARTjmUwV0eEr/JQyzmixIHGUEqhvzyh0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=/Ga8k3mofod9gwPX4Z/kRgYwjmzbSSQT5mPWQ+iRr00=; b=JntASyhqp8Ha8RceEY+SkN5XnCfePZvoBTo/E4TJ26f8PRrsllycVjGplhkfssZ/Nq bC9xz7Nc6UVdyyPqOlFzk+cc04AN/u5pwrUafbCs8UsH3RIQ0ouEfTctK0ui6HPzh7rb PES8AUHQ4fw+/M+Kd1HO8xqqhTo6v3vUdMDYhZVfzRmrqHPHyF4vEU4IC2aCqmsOxazL VY5CGi+bYlvuDXUQBWLh7NkfAzO21PboeR9aFZnsW/Ds3a6o4OsEfyadZEo3upB1QjUa beVgf/Q8vqCG1QER/SVHn2UjwbKW3OvHCPrVfbjUjS+7htcxkBV5h+P7daKAuC3reaTS N+6g== X-Gm-Message-State: AOAM530ivevCqHZB4BrS/ju6OmBEVbhhUFYK0wfHWDYxC5G2GS6I6mW3 Ds0BD1ArvlcvxRi0fI8E+eHHXg== X-Google-Smtp-Source: ABdhPJwxwunBg3ErYOqng8+maceCSdLikNLQ8Egfp/C6bLTULFH4Wp7/OynACw0oVHkVmKrSUGo10g== X-Received: by 2002:a17:90a:4a6:: with SMTP id g35mr5538400pjg.155.1593206964538; Fri, 26 Jun 2020 14:29:24 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id j19sm5623223pjy.40.2020.06.26.14.29.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 14:29:23 -0700 (PDT) Date: Fri, 26 Jun 2020 14:29:22 -0700 From: Kees Cook To: Brendan Higgins Subject: Re: [PATCH v5 07/12] kunit: test: create a single centralized executor for all tests Message-ID: <202006261423.0BC9D830@keescook> References: <20200626210917.358969-1-brendanhiggins@google.com> <20200626210917.358969-8-brendanhiggins@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200626210917.358969-8-brendanhiggins@google.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-doc@vger.kernel.org, catalin.marinas@arm.com, jcmvbkbc@gmail.com, will@kernel.org, paulus@samba.org, linux-kselftest@vger.kernel.org, frowand.list@gmail.com, anton.ivanov@cambridgegreys.com, linux-arch@vger.kernel.org, richard@nod.at, rppt@linux.ibm.com, yzaikin@google.com, linux-xtensa@linux-xtensa.org, arnd@arndb.de, jdike@addtoit.com, linux-um@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, davidgow@google.com, skhan@linuxfoundation.org, linux-arm-kernel@lists.infradead.org, kunit-dev@googlegroups.com, chris@zankel.net, monstr@monstr.eu, sboyd@kernel.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, mcgrof@kernel.org, alan.maguire@oracle.com, akpm@linux-foundation.org, logang@deltatee.com Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Fri, Jun 26, 2020 at 02:09:12PM -0700, Brendan Higgins wrote: > From: Alan Maguire > > Add a centralized executor to dispatch tests rather than relying on > late_initcall to schedule each test suite separately. Centralized > execution is for built-in tests only; modules will execute tests when > loaded. > > Signed-off-by: Alan Maguire > Co-developed-by: Iurii Zaikin > Signed-off-by: Iurii Zaikin > Co-developed-by: Brendan Higgins > Signed-off-by: Brendan Higgins > Reviewed-by: Stephen Boyd > --- > include/kunit/test.h | 67 +++++++++++++++++++++++++++++--------------- > lib/kunit/Makefile | 3 +- > lib/kunit/executor.c | 28 ++++++++++++++++++ > lib/kunit/test.c | 2 +- > 4 files changed, 76 insertions(+), 24 deletions(-) > create mode 100644 lib/kunit/executor.c > > diff --git a/include/kunit/test.h b/include/kunit/test.h > index 47e61e1d53370..f3e86c3953a2b 100644 > --- a/include/kunit/test.h > +++ b/include/kunit/test.h > @@ -224,7 +224,7 @@ size_t kunit_suite_num_test_cases(struct kunit_suite *suite); > unsigned int kunit_test_case_num(struct kunit_suite *suite, > struct kunit_case *test_case); > > -int __kunit_test_suites_init(struct kunit_suite **suites); > +int __kunit_test_suites_init(struct kunit_suite * const * const suites); > > void __kunit_test_suites_exit(struct kunit_suite **suites); > > @@ -237,34 +237,57 @@ void __kunit_test_suites_exit(struct kunit_suite **suites); > * Registers @suites_list with the test framework. See &struct kunit_suite for > * more information. > * > - * When builtin, KUnit tests are all run as late_initcalls; this means > - * that they cannot test anything where tests must run at a different init > - * phase. One significant restriction resulting from this is that KUnit > - * cannot reliably test anything that is initialize in the late_init phase; > - * another is that KUnit is useless to test things that need to be run in > - * an earlier init phase. > - * > - * An alternative is to build the tests as a module. Because modules > - * do not support multiple late_initcall()s, we need to initialize an > - * array of suites for a module. > - * > - * TODO(brendanhiggins@google.com): Don't run all KUnit tests as > - * late_initcalls. I have some future work planned to dispatch all KUnit > - * tests from the same place, and at the very least to do so after > - * everything else is definitely initialized. > + * If a test suite is built-in, module_init() gets translated into > + * an initcall which we don't want as the idea is that for builtins > + * the executor will manage execution. So ensure we do not define > + * module_{init|exit} functions for the builtin case when registering > + * suites via kunit_test_suites() below. > */ > -#define kunit_test_suites(suites_list...) \ > - static struct kunit_suite *suites[] = {suites_list, NULL}; \ > - static int kunit_test_suites_init(void) \ > +#ifdef MODULE > +#define kunit_test_suites_for_module(__suites) \ > + static int __init kunit_test_suites_init(void) \ > { \ > - return __kunit_test_suites_init(suites); \ > + return __kunit_test_suites_init(__suites); \ > } \ > - late_initcall(kunit_test_suites_init); \ > + module_init(kunit_test_suites_init); \ > + \ > static void __exit kunit_test_suites_exit(void) \ > { \ > - return __kunit_test_suites_exit(suites); \ > + return __kunit_test_suites_exit(__suites); \ > } \ > module_exit(kunit_test_suites_exit) > +#else > +#define kunit_test_suites_for_module(__suites) > +#endif /* MODULE */ > + > +#define __kunit_test_suites(unique_array, unique_suites, ...) \ > + static struct kunit_suite *unique_array[] = { __VA_ARGS__, NULL }; \ > + kunit_test_suites_for_module(unique_array); \ > + static struct kunit_suite **unique_suites \ > + __used __section(.kunit_test_suites) = unique_array > + > +/** > + * kunit_test_suites() - used to register one or more &struct kunit_suite > + * with KUnit. > + * > + * @suites: a statically allocated list of &struct kunit_suite. > + * > + * Registers @suites with the test framework. See &struct kunit_suite for > + * more information. > + * > + * When builtin, KUnit tests are all run via executor; this is done > + * by placing the array of struct kunit_suite * in the .kunit_test_suites > + * ELF section. > + * > + * An alternative is to build the tests as a module. Because modules do not > + * support multiple initcall()s, we need to initialize an array of suites for a > + * module. > + * > + */ > +#define kunit_test_suites(...) \ > + __kunit_test_suites(__UNIQUE_ID(array), \ > + __UNIQUE_ID(suites), \ > + __VA_ARGS__) > > #define kunit_test_suite(suite) kunit_test_suites(&suite) > > diff --git a/lib/kunit/Makefile b/lib/kunit/Makefile > index 724b94311ca36..c49f4ffb6273a 100644 > --- a/lib/kunit/Makefile > +++ b/lib/kunit/Makefile > @@ -3,7 +3,8 @@ obj-$(CONFIG_KUNIT) += kunit.o > kunit-objs += test.o \ > string-stream.o \ > assert.o \ > - try-catch.o > + try-catch.o \ > + executor.o > > ifeq ($(CONFIG_KUNIT_DEBUGFS),y) > kunit-objs += debugfs.o > diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c > new file mode 100644 > index 0000000000000..7015e7328dce7 > --- /dev/null > +++ b/lib/kunit/executor.c > @@ -0,0 +1,28 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +#include > + > +/* > + * These symbols point to the .kunit_test_suites section and are defined in > + * include/asm-generic/vmlinux.lds.h, and consequently must be extern. > + */ > +extern struct kunit_suite * const * const __kunit_suites_start[]; > +extern struct kunit_suite * const * const __kunit_suites_end[]; I would expect these to be in include/asm-generic/sections.h but I guess it's not required. Reviewed-by: Kees Cook -- Kees Cook From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C029C433DF for ; Fri, 26 Jun 2020 21:30:58 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EC72920B1F for ; Fri, 26 Jun 2020 21:30:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="OSkOz/Nl"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ZHuV3n4N" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC72920B1F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pmRAY0J/1rwbyF1rFHSlf6xszfVH00pUKf0aF/iZHXA=; b=OSkOz/NlMaYQmIMy/XZDWduh0 Ia+lkJnG/uKTNmtJSTIXnVJPx6UHY6uEyZ9iQwRrjELU4kTNJ/lTlOy87UnYPMLf6CXaSnYBhAMnM WKCRbW3udebm/OXdkAERUi1ev6/pFIYCD/AI2xt+rTO4Iw8nTJVIkrhC4duMz1aiKimQCju9i1PqG ewCLoPwHznAWWUlbdUrhYe8NG8JYboXKXaD+YXwc1PNCb6FypLVA2dFQJcHh3dEMIMk40VnkZtVmj bYWjHyAOOLjJdAN9kZSDhPxulGa3nD+BwBqYHJ4iRbXwN7Mto2FQVLEVOPsiUyU8Ujm+fWCBZPyx4 FGFb7ARuQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jovub-0003Q1-Bo; Fri, 26 Jun 2020 21:29:29 +0000 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jovuY-0003Ov-Md for linux-arm-kernel@lists.infradead.org; Fri, 26 Jun 2020 21:29:27 +0000 Received: by mail-pj1-x1041.google.com with SMTP id b92so5450511pjc.4 for ; Fri, 26 Jun 2020 14:29:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=/Ga8k3mofod9gwPX4Z/kRgYwjmzbSSQT5mPWQ+iRr00=; b=ZHuV3n4N2UyL/uEYmg3j+3S3u+0QqpFCQhDYVKkZw9LuOjYP1YSNslr8dnNrsBn9Dh We7UamS+FEowQ2lOAMqm20z8L9ypztLNs429NEWOoxO6J0/qlK/WaTSFp6sTA+5zXJXt QK39ZARTjmUwV0eEr/JQyzmixIHGUEqhvzyh0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=/Ga8k3mofod9gwPX4Z/kRgYwjmzbSSQT5mPWQ+iRr00=; b=PcTrE8zsZK3r11JNqU9ipc8Z2jf1j0iG5/tb+O9yF1tj2jHlHT6+Z6/k7xZIw1Txjy r4eS4S0TRFa+h7B7wojWb5jPgWTQTpWmvWQw98//paq2efZdLXsh08hlilrt6Z31svno x82rJ6GjWm0MXXwAyzMU1mI5DdMaLoWaZ6r/7RKlnVFJW2CwB0orguDS/N6o0/bksDQn aOV2euUv1SDXEGnket15pMhBgIXdVEGuYUqMEl8IzpqhoQQjnp+VQfdcXJHH63JkvaW1 bf1NutUEmiF+iA9zMzlm86uInClqWGuHuUlLmiHf7lDOJY2mzXv5Pt7vH6EdEMaIpYur I+aw== X-Gm-Message-State: AOAM531g3TFm0UUhXMMF16xuXkb804o+8jJBe1MukRnDe0Wr/d2Wql4q gQBZeAIYAszpPe+rexRY8IFfeA== X-Google-Smtp-Source: ABdhPJwxwunBg3ErYOqng8+maceCSdLikNLQ8Egfp/C6bLTULFH4Wp7/OynACw0oVHkVmKrSUGo10g== X-Received: by 2002:a17:90a:4a6:: with SMTP id g35mr5538400pjg.155.1593206964538; Fri, 26 Jun 2020 14:29:24 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id j19sm5623223pjy.40.2020.06.26.14.29.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 14:29:23 -0700 (PDT) Date: Fri, 26 Jun 2020 14:29:22 -0700 From: Kees Cook To: Brendan Higgins Subject: Re: [PATCH v5 07/12] kunit: test: create a single centralized executor for all tests Message-ID: <202006261423.0BC9D830@keescook> References: <20200626210917.358969-1-brendanhiggins@google.com> <20200626210917.358969-8-brendanhiggins@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200626210917.358969-8-brendanhiggins@google.com> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-doc@vger.kernel.org, catalin.marinas@arm.com, jcmvbkbc@gmail.com, will@kernel.org, paulus@samba.org, linux-kselftest@vger.kernel.org, frowand.list@gmail.com, anton.ivanov@cambridgegreys.com, linux-arch@vger.kernel.org, richard@nod.at, rppt@linux.ibm.com, benh@kernel.crashing.org, yzaikin@google.com, linux-xtensa@linux-xtensa.org, arnd@arndb.de, jdike@addtoit.com, linux-um@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, davidgow@google.com, skhan@linuxfoundation.org, linux-arm-kernel@lists.infradead.org, kunit-dev@googlegroups.com, chris@zankel.net, monstr@monstr.eu, sboyd@kernel.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, mcgrof@kernel.org, alan.maguire@oracle.com, mpe@ellerman.id.au, akpm@linux-foundation.org, logang@deltatee.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Jun 26, 2020 at 02:09:12PM -0700, Brendan Higgins wrote: > From: Alan Maguire > > Add a centralized executor to dispatch tests rather than relying on > late_initcall to schedule each test suite separately. Centralized > execution is for built-in tests only; modules will execute tests when > loaded. > > Signed-off-by: Alan Maguire > Co-developed-by: Iurii Zaikin > Signed-off-by: Iurii Zaikin > Co-developed-by: Brendan Higgins > Signed-off-by: Brendan Higgins > Reviewed-by: Stephen Boyd > --- > include/kunit/test.h | 67 +++++++++++++++++++++++++++++--------------- > lib/kunit/Makefile | 3 +- > lib/kunit/executor.c | 28 ++++++++++++++++++ > lib/kunit/test.c | 2 +- > 4 files changed, 76 insertions(+), 24 deletions(-) > create mode 100644 lib/kunit/executor.c > > diff --git a/include/kunit/test.h b/include/kunit/test.h > index 47e61e1d53370..f3e86c3953a2b 100644 > --- a/include/kunit/test.h > +++ b/include/kunit/test.h > @@ -224,7 +224,7 @@ size_t kunit_suite_num_test_cases(struct kunit_suite *suite); > unsigned int kunit_test_case_num(struct kunit_suite *suite, > struct kunit_case *test_case); > > -int __kunit_test_suites_init(struct kunit_suite **suites); > +int __kunit_test_suites_init(struct kunit_suite * const * const suites); > > void __kunit_test_suites_exit(struct kunit_suite **suites); > > @@ -237,34 +237,57 @@ void __kunit_test_suites_exit(struct kunit_suite **suites); > * Registers @suites_list with the test framework. See &struct kunit_suite for > * more information. > * > - * When builtin, KUnit tests are all run as late_initcalls; this means > - * that they cannot test anything where tests must run at a different init > - * phase. One significant restriction resulting from this is that KUnit > - * cannot reliably test anything that is initialize in the late_init phase; > - * another is that KUnit is useless to test things that need to be run in > - * an earlier init phase. > - * > - * An alternative is to build the tests as a module. Because modules > - * do not support multiple late_initcall()s, we need to initialize an > - * array of suites for a module. > - * > - * TODO(brendanhiggins@google.com): Don't run all KUnit tests as > - * late_initcalls. I have some future work planned to dispatch all KUnit > - * tests from the same place, and at the very least to do so after > - * everything else is definitely initialized. > + * If a test suite is built-in, module_init() gets translated into > + * an initcall which we don't want as the idea is that for builtins > + * the executor will manage execution. So ensure we do not define > + * module_{init|exit} functions for the builtin case when registering > + * suites via kunit_test_suites() below. > */ > -#define kunit_test_suites(suites_list...) \ > - static struct kunit_suite *suites[] = {suites_list, NULL}; \ > - static int kunit_test_suites_init(void) \ > +#ifdef MODULE > +#define kunit_test_suites_for_module(__suites) \ > + static int __init kunit_test_suites_init(void) \ > { \ > - return __kunit_test_suites_init(suites); \ > + return __kunit_test_suites_init(__suites); \ > } \ > - late_initcall(kunit_test_suites_init); \ > + module_init(kunit_test_suites_init); \ > + \ > static void __exit kunit_test_suites_exit(void) \ > { \ > - return __kunit_test_suites_exit(suites); \ > + return __kunit_test_suites_exit(__suites); \ > } \ > module_exit(kunit_test_suites_exit) > +#else > +#define kunit_test_suites_for_module(__suites) > +#endif /* MODULE */ > + > +#define __kunit_test_suites(unique_array, unique_suites, ...) \ > + static struct kunit_suite *unique_array[] = { __VA_ARGS__, NULL }; \ > + kunit_test_suites_for_module(unique_array); \ > + static struct kunit_suite **unique_suites \ > + __used __section(.kunit_test_suites) = unique_array > + > +/** > + * kunit_test_suites() - used to register one or more &struct kunit_suite > + * with KUnit. > + * > + * @suites: a statically allocated list of &struct kunit_suite. > + * > + * Registers @suites with the test framework. See &struct kunit_suite for > + * more information. > + * > + * When builtin, KUnit tests are all run via executor; this is done > + * by placing the array of struct kunit_suite * in the .kunit_test_suites > + * ELF section. > + * > + * An alternative is to build the tests as a module. Because modules do not > + * support multiple initcall()s, we need to initialize an array of suites for a > + * module. > + * > + */ > +#define kunit_test_suites(...) \ > + __kunit_test_suites(__UNIQUE_ID(array), \ > + __UNIQUE_ID(suites), \ > + __VA_ARGS__) > > #define kunit_test_suite(suite) kunit_test_suites(&suite) > > diff --git a/lib/kunit/Makefile b/lib/kunit/Makefile > index 724b94311ca36..c49f4ffb6273a 100644 > --- a/lib/kunit/Makefile > +++ b/lib/kunit/Makefile > @@ -3,7 +3,8 @@ obj-$(CONFIG_KUNIT) += kunit.o > kunit-objs += test.o \ > string-stream.o \ > assert.o \ > - try-catch.o > + try-catch.o \ > + executor.o > > ifeq ($(CONFIG_KUNIT_DEBUGFS),y) > kunit-objs += debugfs.o > diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c > new file mode 100644 > index 0000000000000..7015e7328dce7 > --- /dev/null > +++ b/lib/kunit/executor.c > @@ -0,0 +1,28 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +#include > + > +/* > + * These symbols point to the .kunit_test_suites section and are defined in > + * include/asm-generic/vmlinux.lds.h, and consequently must be extern. > + */ > +extern struct kunit_suite * const * const __kunit_suites_start[]; > +extern struct kunit_suite * const * const __kunit_suites_end[]; I would expect these to be in include/asm-generic/sections.h but I guess it's not required. Reviewed-by: Kees Cook -- Kees Cook _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel