From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751426AbdALLHK (ORCPT ); Thu, 12 Jan 2017 06:07:10 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:62941 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750860AbdALLHJ (ORCPT ); Thu, 12 Jan 2017 06:07:09 -0500 From: Arnd Bergmann To: Andrew Morton Cc: Arnd Bergmann , Kostenzer Felix , linux-kernel@vger.kernel.org Subject: [PATCH] lib: move sort self-test into a separate file Date: Thu, 12 Jan 2017 12:05:52 +0100 Message-Id: <20170112110657.3123790-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:jGZzQDylSTm+c7GFlyY6xdKQCyLTB4OPH/FiBNje6kOBMZn/NqN 4virvFT8H6phENSChKNLGYlDEwwZuPxgvGt0Zy/no1W+rZ7n/noqtqqVsrembR6oYMYD/oG KczhuYgAlNahdJz1Qstpe9M2eU46+G+r0NIkJghJdLfFPS3y9CQNglvcuWhpZaB2TVng9h4 YALLbCRMqpJS052h/Arsg== X-UI-Out-Filterresults: notjunk:1;V01:K0:PdR5XPhrcGs=:wmAvT7QFgEgRhR0VMEKi/T RZKmK97IyBOnihuadOZwBfWbjWmloJDEn2Ok+a8xD/xGpNsi+j/kCElSHUfP96GO6d2DkQSdP XeCdztgCQY2X2yeFMIXSyo7XMlgo11c2UhuidxY+guheI+WwWPkcOY0MwdA0vu8/DnCwiUwma Pk+WQvOkhH0R/Hao21PrKZ2YHolBmcfZugN6vlOBLo5s4cvGyhhefy0luZZIdZWWg6S97wGWE rhuL+sjsSDjLVjz5AzeOs3rVcrdzDETxg4lxHqjJcxaxuA09Yhzmpstnm+VrMXdZl1JIiRhmb xV5fXzDujb8W6RneUR1pHnFPBWFIxDtnVCQZu5MGO4z0yhJ2EHP7rR8xjnJRxcPEq2HzKpel/ TJST+dVvV7iaZSkaOSfCQ0m0T12yCf9hEfgrOYw1lxnjWBa5NfiLQXZLz7cOZhIHLRY5fBv3V Iu1knoWxZu+V5UGD4+oQTtLBFdtgR8rh0SXjSWd8P5+coqu/84IXTpeN7NUQy9h8SgaCcIN51 6zO8VT3PDisg9H5e+PZYeAwyCSQZ3dZNTu90hAakyQD9DP2cZTEo7Zo7zea3LrQZu+uBQaUz4 HIkgQcuUUUOtvIs0ErvQNHTmEBYMRxgICSIgFwLcQHu9I4uT7CqcrB2/iYwWH4fJarl7+vr7+ PRuIZPpiWLH3R2vbSeIiUSWHg6CJc3yD4wcBzRcMV5z6H8xWrQDYf9BO7CKn7O2ZGEGg= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The lib/sort.c file gets included in the EFI stub for use outside of the kernel address space, which now fails due to the addition of a module_init() function: 00000000 R_ARM_ABS32 test_sort_init drivers/firmware/efi/libstub/lib-sort.stub.o: absolute symbol references not allowed in the EFI stub drivers/firmware/efi/libstub/Makefile:69: recipe for target 'drivers/firmware/efi/libstub/lib-sort.stub.o' failed Other library tests live in a separate file, so doing the same here is an easy way to avoid the problem. Fixes: akpm-current ("lib: add CONFIG_TEST_SORT to enable self-test of sort()") Signed-off-by: Arnd Bergmann --- lib/Makefile | 1 + lib/sort.c | 44 -------------------------------------------- lib/test_sort.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 lib/test_sort.c diff --git a/lib/Makefile b/lib/Makefile index f5e72a728285..54d814a462da 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -50,6 +50,7 @@ obj-$(CONFIG_TEST_KASAN) += test_kasan.o obj-$(CONFIG_TEST_KSTRTOX) += test-kstrtox.o obj-$(CONFIG_TEST_LKM) += test_module.o obj-$(CONFIG_TEST_RHASHTABLE) += test_rhashtable.o +obj-$(CONFIG_TEST_SORT) += test_sort.o obj-$(CONFIG_TEST_USER_COPY) += test_user_copy.o obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_keys.o obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_key_base.o diff --git a/lib/sort.c b/lib/sort.c index a9b156e7471b..975c6ef6fec7 100644 --- a/lib/sort.c +++ b/lib/sort.c @@ -103,47 +103,3 @@ void sort(void *base, size_t num, size_t size, } EXPORT_SYMBOL(sort); - -#ifdef CONFIG_TEST_SORT -#include -#include -/* a simple boot-time regression test */ - -#define TEST_LEN 1000 - -static int __init cmpint(const void *a, const void *b) -{ - return *(int *)a - *(int *)b; -} - -static int __init test_sort_init(void) -{ - int *a, i, r = 1, err = -ENOMEM; - - a = kmalloc_array(TEST_LEN, sizeof(*a), GFP_KERNEL); - if (!a) - return err; - - for (i = 0; i < TEST_LEN; i++) { - r = (r * 725861) % 6599; - a[i] = r; - } - - sort(a, TEST_LEN, sizeof(*a), cmpint, NULL); - - err = -EINVAL; - for (i = 0; i < TEST_LEN-1; i++) - if (a[i] > a[i+1]) { - pr_err("test has failed\n"); - goto exit; - } - err = 0; - pr_info("test passed\n"); -exit: - kfree(a); - return err; -} - -module_init(test_sort_init); -MODULE_LICENSE("GPL"); -#endif diff --git a/lib/test_sort.c b/lib/test_sort.c new file mode 100644 index 000000000000..d389c1cc2f6c --- /dev/null +++ b/lib/test_sort.c @@ -0,0 +1,43 @@ +#include +#include +#include + +/* a simple boot-time regression test */ + +#define TEST_LEN 1000 + +static int __init cmpint(const void *a, const void *b) +{ + return *(int *)a - *(int *)b; +} + +static int __init test_sort_init(void) +{ + int *a, i, r = 1, err = -ENOMEM; + + a = kmalloc_array(TEST_LEN, sizeof(*a), GFP_KERNEL); + if (!a) + return err; + + for (i = 0; i < TEST_LEN; i++) { + r = (r * 725861) % 6599; + a[i] = r; + } + + sort(a, TEST_LEN, sizeof(*a), cmpint, NULL); + + err = -EINVAL; + for (i = 0; i < TEST_LEN-1; i++) + if (a[i] > a[i+1]) { + pr_err("test has failed\n"); + goto exit; + } + err = 0; + pr_info("test passed\n"); +exit: + kfree(a); + return err; +} + +module_init(test_sort_init); +MODULE_LICENSE("GPL"); -- 2.9.0