From patchwork Fri Feb 5 23:53:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Latypov X-Patchwork-Id: 377821 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 48D06C433E6 for ; Sat, 6 Feb 2021 03:17:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1C4AD64FA8 for ; Sat, 6 Feb 2021 03:17:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229813AbhBFDP3 (ORCPT ); Fri, 5 Feb 2021 22:15:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231186AbhBFCpN (ORCPT ); Fri, 5 Feb 2021 21:45:13 -0500 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A651C08ED9B for ; Fri, 5 Feb 2021 15:53:11 -0800 (PST) Received: by mail-pl1-x649.google.com with SMTP id e12so5263232plh.2 for ; Fri, 05 Feb 2021 15:53:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=Z0L4KRAp/unRkOGmt9I23plvEx27DzuKEm7py6O/w2c=; b=Q/ylOrtnRFmhjo9UCHitPuV4px2gXSP3MyCkyK+8+ls84iMRRS8OSAZT7cH2+oiC85 hK620e8iS574lWbuv5JxnZ7APAJf4nZAIWEd43/p/6pAsI/fo1+SAr+zUO2u0laRWBYx y2c09NYhhLhhAUKC5VGZI8rQ36+17Mnd62CbFTQ5/8u2Nh47Y9pw49hdyWrKmhfeSWw5 MbTQc1z+guqOHAqgsPk5cC5eSMkaN/+FhOkN/Cjbnv4tNCqtAeNF1Xe7P00pWgCkToVQ zz1WuEZcm1oz39irvTQl2BBHGYwaYsv/lVQnwBKhRBMOEH14m8b9lM/DHYrm2mQ7Jjh/ 3cLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Z0L4KRAp/unRkOGmt9I23plvEx27DzuKEm7py6O/w2c=; b=PtNx0t6nrHXH/TFTlcClypghaKliPqG5SqwprTzOrbOoZun8EOeS8NsoTTYw/HKO8C hxqE80Pzwqiynccfoh9cojasn54lRm6NTx7KrWelXH/4AnGTXV0n5cnYcdyxabOzXG0/ ccay3/1ACqUW0mlsOMqKWB2erpAnVS9RYBPCmMLIKEhBXkGYZcKLBKFsxUkmZuFSCCZJ 1mxV0enHl9sOrHLeopg479nNhYe9NGoG/36fqd0zixWL6Lh4/b3BB0fTMD+Fb1iJb0aJ puGRBqS1R6qd/+0Ll8U2xdJ9V12YIgd8L1iUL9rOMjZ4BrKeecvVZd/cOIyuMwgyYErh 9cjw== X-Gm-Message-State: AOAM531w9d1Qi18IkGql8lRXE1L1SuThEoACFkba3DRAVuh6+iF324OW 9PsnUAQv5NrrN/PtD+EloTO04Hc5MQ3JiQ== X-Google-Smtp-Source: ABdhPJxBzkKo3NS6X7dAHuQXnMT2IDWsDkdxHihebGkVGPdwlTmzXlj0sYtK7nI74cpy2BCyLE0UvHjzAmgA5w== Sender: "dlatypov via sendgmr" X-Received: from dlatypov.svl.corp.google.com ([2620:15c:2cd:202:a8b1:128a:69fa:86fb]) (user=dlatypov job=sendgmr) by 2002:a17:902:ab83:b029:e1:6021:dd19 with SMTP id f3-20020a170902ab83b02900e16021dd19mr6174824plr.40.1612569190908; Fri, 05 Feb 2021 15:53:10 -0800 (PST) Date: Fri, 5 Feb 2021 15:53:01 -0800 In-Reply-To: <20210205235302.2022784-1-dlatypov@google.com> Message-Id: <20210205235302.2022784-2-dlatypov@google.com> Mime-Version: 1.0 References: <20210205235302.2022784-1-dlatypov@google.com> X-Mailer: git-send-email 2.30.0.478.g8a0d178c01-goog Subject: [PATCH v2 1/2] kunit: support failure from dynamic analysis tools From: Daniel Latypov To: brendanhiggins@google.com, davidgow@google.com Cc: 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 it as a 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: Uriel Guajardo Signed-off-by: Daniel Latypov Reviewed-by: Alan Maguire --- include/kunit/test-bug.h | 30 ++++++++++++++++++++++++++++++ lib/kunit/test.c | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 62 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..4963ed52c2df --- /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_ENABLED(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..7b16aae0ccae 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -16,6 +17,37 @@ #include "string-stream.h" #include "try-catch-impl.h" +/* + * 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); +} + /* * Append formatted message to log, size of which is limited to * KUNIT_LOG_SIZE bytes (including null terminating byte). @@ -273,9 +305,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 +654,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 Fri Feb 5 23:53:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Latypov X-Patchwork-Id: 377824 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 4A315C43331 for ; Sat, 6 Feb 2021 02:50:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 30A7264FE4 for ; Sat, 6 Feb 2021 02:50:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231978AbhBFCtf (ORCPT ); Fri, 5 Feb 2021 21:49:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231596AbhBFCnX (ORCPT ); Fri, 5 Feb 2021 21:43:23 -0500 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BDC9C08EDA0 for ; Fri, 5 Feb 2021 15:53:13 -0800 (PST) Received: by mail-pl1-x649.google.com with SMTP id u14so5261782plf.4 for ; Fri, 05 Feb 2021 15:53:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=t77+PuCigeZOcF53sLtwu0Du9UKFrCGhrRKsmy3L6C4=; b=oiw8Q6GYyKteToglNy7gdpC0BukBR+3yrtUTagUwTRT+aluXP2YhlzxIytogmMfWMz pzArK1ylL5HXFjdTLFlotXqZY3ynows31B902aEnpyEPk+H08PGdPDxET+4iFl+lt0/s TswcIShTwC3LkJzv1KNMd2STFuQp4+YYC0KoI9L6zuSbPypmTs6v1JzKbPPvkGWgm2J9 rS8fVrV4dFfiEXSN0d3Hr7JafjATZru6O+grs5EgBOALzgNj6xF/Qh71AsH+bDSjgIUy WVm4fNEMn5LLeEEXwRU7lFKAIT9l0DY7LDVGP3DdhhUoIEpP4Xn8Cke/s+2x4kStFA/s LvCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=t77+PuCigeZOcF53sLtwu0Du9UKFrCGhrRKsmy3L6C4=; b=PnA/w9QGy85dBNI0fcYl40VAc7wDj6lqma/3+8JRILZ58ddV0FFGMrsuReaQFd9Pya uCL/f6qS0Zuf8pRP/PYUXAD7PGwSM52sgPv2ufnFtr99prZ3BcQdaDmOYeJfbUreGY06 98Z4AuJNNlfy1oASoTer1OCd9ksKYI3O9viSeiYkm6cbolOnJGoeGU8xDWOnRXhiPQcY ttDkqAdtmeudtGPMINxOrhMBon//LLxZ+PVYzb3hfPwTsu1SUhVg/FbtV+kEX3W/lJMI mA3pel+5YYOt2lTN+22tJ95W5htZhNb7mH96L/GtRzC560q4ZghHAL1b4r8q5HwGiipZ Dj+Q== X-Gm-Message-State: AOAM530R5JhEh9RQII3G5bvve3CyQVuK8BRmt44nOiFCbuX6Z2JYPYGx HLB7AQleHC0ixN5onYeohphsxyvTMeqQ5w== X-Google-Smtp-Source: ABdhPJwUXTrySp7ZE4Eqsd+iiglqdwGlkHvNviLq7t8BzZfzBm3E2RtqKaaxIevIdIwPBBzGPCL9xi3H7rs3+g== Sender: "dlatypov via sendgmr" X-Received: from dlatypov.svl.corp.google.com ([2620:15c:2cd:202:a8b1:128a:69fa:86fb]) (user=dlatypov job=sendgmr) by 2002:a17:902:52a:b029:da:989f:6c01 with SMTP id 39-20020a170902052ab02900da989f6c01mr5920868plf.45.1612569192975; Fri, 05 Feb 2021 15:53:12 -0800 (PST) Date: Fri, 5 Feb 2021 15:53:02 -0800 In-Reply-To: <20210205235302.2022784-1-dlatypov@google.com> Message-Id: <20210205235302.2022784-3-dlatypov@google.com> Mime-Version: 1.0 References: <20210205235302.2022784-1-dlatypov@google.com> X-Mailer: git-send-email 2.30.0.478.g8a0d178c01-goog Subject: [PATCH v2 2/2] kunit: ubsan integration From: Daniel Latypov To: brendanhiggins@google.com, davidgow@google.com Cc: 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: Uriel Guajardo Signed-off-by: Daniel Latypov --- lib/ubsan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/ubsan.c b/lib/ubsan.c index bec38c64d6a6..1ec7d6f1fe63 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)