From patchwork Thu Mar 11 15:23:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Latypov X-Patchwork-Id: 12131745 X-Patchwork-Delegate: shuah@kernel.org 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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham 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 CFCD8C433E0 for ; Thu, 11 Mar 2021 15:24:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8EA7C64FEC for ; Thu, 11 Mar 2021 15:24:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234101AbhCKPXq (ORCPT ); Thu, 11 Mar 2021 10:23:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234218AbhCKPXX (ORCPT ); Thu, 11 Mar 2021 10:23:23 -0500 Received: from mail-qv1-xf4a.google.com (mail-qv1-xf4a.google.com [IPv6:2607:f8b0:4864:20::f4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 763FBC061574 for ; Thu, 11 Mar 2021 07:23:23 -0800 (PST) Received: by mail-qv1-xf4a.google.com with SMTP id d15so15332042qvn.16 for ; Thu, 11 Mar 2021 07:23:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Uo+jdzDkstwte4rd5KP1ZCWjSQcfZaf7ZJhZWXy2RKs=; b=oU2FmmZy1hcNiNWsHS5LxlTOzAWKO8wzT9oIwklSSFU8vic4F9LLZemwiu5iaPJ7kb 0r5jphxrIlJMeTC9Q4pBCp0fvcx87DYKidbdpH/6FWR7AjA4wefUB7SG5d+iWlyj8KqP vxD2QcLXsAjKKQy7xzfraTFyWvRpk5FfsdJnWZEaXqATSC9zORoiaJM6aRlr4jUqFPng ziaGRRqHDdgUSCfoQVaL1guOfsuy0CpchIqafwrjcXghFqfTWMaOzLo0CXWAc6pIMLKo dtG9x5xh86R0tUGmwFhGedtf/RUzFWLAe3jXDiF/rMBAYgzKZJAdTNRPbfd8IeeLQRrT Jjyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Uo+jdzDkstwte4rd5KP1ZCWjSQcfZaf7ZJhZWXy2RKs=; b=pnm1mjwQsW2rt+mCbHXi/TSohjFwqeTo5SibHeMZ3UgCRjf0IRjgI85t4zHkL6lY/0 enYHk8X46K+0u8yd3/+2CIcfXVYOsg1ZG3f3ThsBy+myjI5nTwix3vp0rlZuQnhI1vs/ 5KXIvkybCibqy9Thu3nTHZlZEiFdbKlQpBgiMhz9y3QFL3d0BJBc8rIKKPzfJfr9I6ED 6oYiclLDItgXTv4HcqMAQDdILIgTATcmmcxHjJ8XEF7HEHuJHFBNTY3mWwelmsVrs14A Be97YxkrFOMyYZNhYYhozKF/suqin69F+3fQpcnLVFWTEdSWFQdTl0GpSseDKem3KhmW KLkQ== X-Gm-Message-State: AOAM533lZkHNG6Fl9m2jIIkWG7EQYp/mka3HPrs6k2Y59qjxPivkP+pd LTJI9WJqZTg8LJpUz+K9zV2tqSJpyyeKzA== X-Google-Smtp-Source: ABdhPJy1zi+D10F+EaOLwJkcGaJWbsWc2A4cgtaoxCxs+Xt42a/9UWmbeAIBXnObyqjj6bb+TiMDj9xPxP6ZNQ== X-Received: from dlatypov.svl.corp.google.com ([2620:15c:2cd:202:d84c:1a92:8f6c:2d41]) (user=dlatypov job=sendgmr) by 2002:a05:6214:242f:: with SMTP id gy15mr8169011qvb.17.1615476202686; Thu, 11 Mar 2021 07:23:22 -0800 (PST) Date: Thu, 11 Mar 2021 07:23:13 -0800 In-Reply-To: <20210311152314.3814916-1-dlatypov@google.com> Message-Id: <20210311152314.3814916-2-dlatypov@google.com> Mime-Version: 1.0 References: <20210311152314.3814916-1-dlatypov@google.com> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog Subject: [PATCH v4 1/2] kunit: support failure from dynamic analysis tools From: Daniel Latypov To: brendanhiggins@google.com Cc: davidgow@google.com, alan.maguire@oracle.com, linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, skhan@linuxfoundation.org, Uriel Guajardo , Daniel Latypov Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org From: Uriel Guajardo Add a kunit_fail_current_test() function to fail the currently running test, if any, with an error message. This is largely intended for dynamic analysis tools like UBSAN and for fakes. E.g. say I had a fake ops struct for testing and I wanted my `free` function to complain if it was called with an invalid argument, or caught a double-free. Most return void and have no normal means of signalling failure (e.g. super_operations, iommu_ops, etc.). Key points: * Always update current->kunit_test so anyone can use it. * commit 83c4e7a0363b ("KUnit: KASAN Integration") only updated it for CONFIG_KASAN=y * Create a new header so non-test code doesn't have to include all of (e.g. lib/ubsan.c) * Forward the file and line number to make it easier to track down failures * Declare the helper function for nice __printf() warnings about mismatched format strings even when KUnit is not enabled. Example output from kunit_fail_current_test("message"): [15:19:34] [FAILED] example_simple_test [15:19:34] # example_simple_test: initializing [15:19:34] # example_simple_test: lib/kunit/kunit-example-test.c:24: message [15:19:34] not ok 1 - example_simple_test Co-developed-by: Daniel Latypov Signed-off-by: Daniel Latypov Signed-off-by: Uriel Guajardo Reviewed-by: Alan Maguire Reviewed-by: Brendan Higgins --- include/kunit/test-bug.h | 30 ++++++++++++++++++++++++++++++ lib/kunit/test.c | 39 +++++++++++++++++++++++++++++++++++---- 2 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 include/kunit/test-bug.h diff --git a/include/kunit/test-bug.h b/include/kunit/test-bug.h new file mode 100644 index 000000000000..e88b74a4fd85 --- /dev/null +++ b/include/kunit/test-bug.h @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * KUnit API allowing dynamic analysis tools to interact with KUnit tests + * + * Copyright (C) 2020, Google LLC. + * Author: Uriel Guajardo + */ + +#ifndef _KUNIT_TEST_BUG_H +#define _KUNIT_TEST_BUG_H + +#define kunit_fail_current_test(fmt, ...) \ + __kunit_fail_current_test(__FILE__, __LINE__, fmt, ##__VA_ARGS__) + +#if IS_BUILTIN(CONFIG_KUNIT) + +extern __printf(3, 4) void __kunit_fail_current_test(const char *file, int line, + const char *fmt, ...); + +#else + +static __printf(3, 4) void __kunit_fail_current_test(const char *file, int line, + const char *fmt, ...) +{ +} + +#endif + + +#endif /* _KUNIT_TEST_BUG_H */ diff --git a/lib/kunit/test.c b/lib/kunit/test.c index ec9494e914ef..2f6cc0123232 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -16,6 +17,40 @@ #include "string-stream.h" #include "try-catch-impl.h" +#if IS_BUILTIN(CONFIG_KUNIT) +/* + * Fail the current test and print an error message to the log. + */ +void __kunit_fail_current_test(const char *file, int line, const char *fmt, ...) +{ + va_list args; + int len; + char *buffer; + + if (!current->kunit_test) + return; + + kunit_set_failure(current->kunit_test); + + /* kunit_err() only accepts literals, so evaluate the args first. */ + va_start(args, fmt); + len = vsnprintf(NULL, 0, fmt, args) + 1; + va_end(args); + + buffer = kunit_kmalloc(current->kunit_test, len, GFP_KERNEL); + if (!buffer) + return; + + va_start(args, fmt); + vsnprintf(buffer, len, fmt, args); + va_end(args); + + kunit_err(current->kunit_test, "%s:%d: %s", file, line, buffer); + kunit_kfree(current->kunit_test, buffer); +} +EXPORT_SYMBOL_GPL(__kunit_fail_current_test); +#endif + /* * Append formatted message to log, size of which is limited to * KUNIT_LOG_SIZE bytes (including null terminating byte). @@ -273,9 +308,7 @@ static void kunit_try_run_case(void *data) struct kunit_suite *suite = ctx->suite; struct kunit_case *test_case = ctx->test_case; -#if (IS_ENABLED(CONFIG_KASAN) && IS_ENABLED(CONFIG_KUNIT)) current->kunit_test = test; -#endif /* IS_ENABLED(CONFIG_KASAN) && IS_ENABLED(CONFIG_KUNIT) */ /* * kunit_run_case_internal may encounter a fatal error; if it does, @@ -624,9 +657,7 @@ void kunit_cleanup(struct kunit *test) spin_unlock(&test->lock); kunit_remove_resource(test, res); } -#if (IS_ENABLED(CONFIG_KASAN) && IS_ENABLED(CONFIG_KUNIT)) current->kunit_test = NULL; -#endif /* IS_ENABLED(CONFIG_KASAN) && IS_ENABLED(CONFIG_KUNIT)*/ } EXPORT_SYMBOL_GPL(kunit_cleanup); From patchwork Thu Mar 11 15:23:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Latypov X-Patchwork-Id: 12131743 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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham 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 ABBD2C433DB for ; Thu, 11 Mar 2021 15:24:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6BD5A64FE9 for ; Thu, 11 Mar 2021 15:24:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234114AbhCKPXr (ORCPT ); Thu, 11 Mar 2021 10:23:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234228AbhCKPXZ (ORCPT ); Thu, 11 Mar 2021 10:23:25 -0500 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 44B9FC061760 for ; Thu, 11 Mar 2021 07:23:25 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id d8so26052562ybs.11 for ; Thu, 11 Mar 2021 07:23:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=L8a6v/RpOX6g+ehik5lO30YcIfvFidygA9WSxm1D+Yc=; b=rjQJB/nSV8vMfPN6EV3mW4Sd9rlhVDO+UMZeva8LPjp1RkVyS87whQEEx1r8YgVldq iehwWrrsqtdbDWaXbi9V9ExkIdVvMthznM9+Ho5SMGoCQiMNoa1ZggUjX9t/Uccl6lgo GZ3xzy4SnQArHKwgwKQ4lAD9FV6QARIWq+6gLUkCZA9A74uR2BoMJ7PUcOy4C/A8eXRT OIBfOvRbQOGTXl0yUy56n+RxpPqvM9gmLcdEm+NcOBrcPGuFPsf71YUB/DqTJBk3BL0z XsblTltDpLQrJ6osoLa0hqc7G5zK+eFB5+LFyvwL9cdxTabJywM47Z1fsg5xvVU4FNl0 N9MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=L8a6v/RpOX6g+ehik5lO30YcIfvFidygA9WSxm1D+Yc=; b=O92KHB4uLyq35OjvfvBkdP/Lyo/hKPGOYT/z4stUyVv53cN84GdF96/srEKr2l6c9K k7OWyGT7b0XJ15sZaMDzk683eOphNfGAQziZpeCU98aZ4wMVM5gx/lXK+dLnGSDDjS1k CoPRRquDR12gfsYvndANryctImtcs2wSA7FssMDt8cyrKGuJ2KylwADVKgsV5GjRTZ4t 6Pt1cPrKNlVRdMcTVqAlURU3pEMKTdMRt7SuFzlJSMjYYSCDHXp2kyLZjCteR65HDWGL EH6QllxhgTGnucL7khSDBZbdR/QlO5oTUynR5Kf5CBD5C7/ND861ibtX3rR1p0VifpDV uJDw== X-Gm-Message-State: AOAM530RfdVgru6rU5rtJ6TqPY5ygzWRzAIUNBcIzfuXv0kMi9SQ2lBA /sn7cpQCq5uxUtkS5R52bZ/3u2PLBUWZCA== X-Google-Smtp-Source: ABdhPJz5XPbO6QvMxe+MoyS6OSsJiqu6t+BxS1+Z9XneXHEffoKuiHsRsCJ2UGA3OapzbfJ5IFewPVGOxa7U5g== X-Received: from dlatypov.svl.corp.google.com ([2620:15c:2cd:202:d84c:1a92:8f6c:2d41]) (user=dlatypov job=sendgmr) by 2002:a25:bfc1:: with SMTP id q1mr11335225ybm.89.1615476204498; Thu, 11 Mar 2021 07:23:24 -0800 (PST) Date: Thu, 11 Mar 2021 07:23:14 -0800 In-Reply-To: <20210311152314.3814916-1-dlatypov@google.com> Message-Id: <20210311152314.3814916-3-dlatypov@google.com> Mime-Version: 1.0 References: <20210311152314.3814916-1-dlatypov@google.com> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog Subject: [PATCH v4 2/2] kunit: ubsan integration From: Daniel Latypov To: brendanhiggins@google.com Cc: davidgow@google.com, alan.maguire@oracle.com, linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, skhan@linuxfoundation.org, Uriel Guajardo , Daniel Latypov Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org From: Uriel Guajardo Integrates UBSAN into the KUnit testing framework. It fails KUnit tests whenever it reports undefined behavior. When CONFIG_KUNIT=n, nothing is printed or even formatted, so this has no behavioral impact outside of tests. kunit_fail_current_test() effectively does a pr_err() as well, so there's some slight duplication, but it also ensures an error is recorded in the debugfs entry for the running KUnit test. Print a shorter version of the message to make it less spammy. Co-developed-by: Daniel Latypov Signed-off-by: Daniel Latypov Signed-off-by: Uriel Guajardo Reviewed-by: Alan Maguire --- lib/ubsan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/ubsan.c b/lib/ubsan.c index 26229973049d..bdc380ff5d5c 100644 --- a/lib/ubsan.c +++ b/lib/ubsan.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "ubsan.h" @@ -141,6 +142,8 @@ static void ubsan_prologue(struct source_location *loc, const char *reason) "========================================\n"); pr_err("UBSAN: %s in %s:%d:%d\n", reason, loc->file_name, loc->line & LINE_MASK, loc->column & COLUMN_MASK); + + kunit_fail_current_test("%s in %s", reason, loc->file_name); } static void ubsan_epilogue(void)