From: Kees Cook <keescook@chromium.org>
To: "Tobin C. Harding" <tobin@kernel.org>
Cc: Shuah Khan <shuah@kernel.org>, Jann Horn <jannh@google.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Randy Dunlap <rdunlap@infradead.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Andy Lutomirski <luto@amacapital.net>,
Daniel Micay <danielmicay@gmail.com>,
Arnd Bergmann <arnd@arndb.de>,
Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>,
"Gustavo A. R. Silva" <gustavo@embeddedor.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Kernel Hardening <kernel-hardening@lists.openwall.com>,
"open list:KERNEL SELFTEST FRAMEWORK"
<linux-kselftest@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3 5/7] lib: Use new kselftest header
Date: Tue, 2 Apr 2019 14:32:19 -0700 [thread overview]
Message-ID: <CAGXu5jLpC8tGNfa2N3H24eby6j=HMWZKgkQaM=3W8MznLQsAOw@mail.gmail.com> (raw)
In-Reply-To: <20190306214226.14598-6-tobin@kernel.org>
On Wed, Mar 6, 2019 at 1:43 PM Tobin C. Harding <tobin@kernel.org> wrote:
>
> We just added a new C header file for use with test modules that are
> intended to be run with kselftest. We can reduce code duplication by
> using this header.
>
> Use new kselftest header to reduce code duplication in test_printf and
> test_bitmap test modules.
>
> Signed-off-by: Tobin C. Harding <tobin@kernel.org>
Nice consolidation.
Acked-by: Kees Cook <keescook@chromium.org>
-Kees
> ---
> lib/test_bitmap.c | 20 ++++----------------
> lib/test_printf.c | 23 +++++------------------
> 2 files changed, 9 insertions(+), 34 deletions(-)
>
> diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c
> index 6cd7d0740005..792d90608052 100644
> --- a/lib/test_bitmap.c
> +++ b/lib/test_bitmap.c
> @@ -12,6 +12,8 @@
> #include <linux/slab.h>
> #include <linux/string.h>
>
> +#include "../tools/testing/selftests/kselftest_module.h"
> +
> static unsigned total_tests __initdata;
> static unsigned failed_tests __initdata;
>
> @@ -361,7 +363,7 @@ static void noinline __init test_mem_optimisations(void)
> }
> }
>
> -static int __init test_bitmap_init(void)
> +static void __init selftest(void)
> {
> test_zero_clear();
> test_fill_set();
> @@ -369,22 +371,8 @@ static int __init test_bitmap_init(void)
> test_bitmap_arr32();
> test_bitmap_parselist();
> test_mem_optimisations();
> -
> - if (failed_tests == 0)
> - pr_info("all %u tests passed\n", total_tests);
> - else
> - pr_warn("failed %u out of %u tests\n",
> - failed_tests, total_tests);
> -
> - return failed_tests ? -EINVAL : 0;
> }
>
> -static void __exit test_bitmap_cleanup(void)
> -{
> -}
> -
> -module_init(test_bitmap_init);
> -module_exit(test_bitmap_cleanup);
> -
> +KSTM_MODULE_LOADERS(test_bitmap);
> MODULE_AUTHOR("david decotigny <david.decotigny@googlers.com>");
> MODULE_LICENSE("GPL");
> diff --git a/lib/test_printf.c b/lib/test_printf.c
> index 601e8519319a..f4fcc1c43739 100644
> --- a/lib/test_printf.c
> +++ b/lib/test_printf.c
> @@ -21,6 +21,8 @@
> #include <linux/gfp.h>
> #include <linux/mm.h>
>
> +#include "../tools/testing/selftests/kselftest_module.h"
> +
> #define BUF_SIZE 256
> #define PAD_SIZE 16
> #define FILL_CHAR '$'
> @@ -590,12 +592,11 @@ test_pointer(void)
> flags();
> }
>
> -static int __init
> -test_printf_init(void)
> +static void __init selftest(void)
> {
> alloced_buffer = kmalloc(BUF_SIZE + 2*PAD_SIZE, GFP_KERNEL);
> if (!alloced_buffer)
> - return -ENOMEM;
> + return;
> test_buffer = alloced_buffer + PAD_SIZE;
>
> test_basic();
> @@ -604,22 +605,8 @@ test_printf_init(void)
> test_pointer();
>
> kfree(alloced_buffer);
> -
> - if (failed_tests == 0)
> - pr_info("all %u tests passed\n", total_tests);
> - else
> - pr_warn("failed %u out of %u tests\n", failed_tests, total_tests);
> -
> - return failed_tests ? -EINVAL : 0;
> }
>
> -module_init(test_printf_init);
> -
> -static void __exit test_printf_exit(void)
> -{
> -}
> -
> -module_exit(test_printf_exit);
> -
> +KSTM_MODULE_LOADERS(test_printf);
> MODULE_AUTHOR("Rasmus Villemoes <linux@rasmusvillemoes.dk>");
> MODULE_LICENSE("GPL");
> --
> 2.20.1
>
--
Kees Cook
next prev parent reply other threads:[~2019-04-02 21:32 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-06 21:42 [PATCH v3 0/7] lib/string: Add strscpy_pad() function Tobin C. Harding
2019-03-06 21:42 ` [PATCH v3 1/7] lib/test_printf: Add empty module_exit function Tobin C. Harding
2019-04-02 21:24 ` Kees Cook
2019-03-06 21:42 ` [PATCH v3 2/7] kselftest: Add test runner creation script Tobin C. Harding
2019-04-02 21:27 ` Kees Cook
2019-04-02 21:33 ` Randy Dunlap
2019-04-04 23:16 ` Tobin C. Harding
2019-03-06 21:42 ` [PATCH v3 3/7] kselftest/lib: Use new shell runner to define tests Tobin C. Harding
2019-04-02 21:29 ` Kees Cook
2019-04-02 21:45 ` Kees Cook
2019-04-02 21:51 ` Kees Cook
2019-03-06 21:42 ` [PATCH v3 4/7] kselftest: Add test module framework header Tobin C. Harding
2019-04-02 21:31 ` Kees Cook
2019-03-06 21:42 ` [PATCH v3 5/7] lib: Use new kselftest header Tobin C. Harding
2019-04-02 21:32 ` Kees Cook [this message]
2019-03-06 21:42 ` [PATCH v3 6/7] lib/string: Add strscpy_pad() function Tobin C. Harding
2019-04-02 21:35 ` Kees Cook
2019-03-06 21:42 ` [PATCH v3 7/7] lib: Add test module for strscpy_pad Tobin C. Harding
2019-04-02 21:36 ` Kees Cook
2019-03-06 21:49 ` [PATCH v3 0/7] lib/string: Add strscpy_pad() function Tobin C. Harding
2019-03-07 21:18 ` Tobin C. Harding
2019-03-07 22:43 ` Kees Cook
2019-03-08 5:23 ` Tobin C. Harding
2019-03-08 16:18 ` Kees Cook
2019-04-02 21:37 ` Kees Cook
2019-04-03 0:25 ` Tobin C. Harding
2019-04-03 0:29 ` shuah
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='CAGXu5jLpC8tGNfa2N3H24eby6j=HMWZKgkQaM=3W8MznLQsAOw@mail.gmail.com' \
--to=keescook@chromium.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=arnd@arndb.de \
--cc=danielmicay@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=gustavo@embeddedor.com \
--cc=jannh@google.com \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=luto@amacapital.net \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=rdunlap@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=shuah@kernel.org \
--cc=tobin@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).