From patchwork Thu Aug 13 20:57:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uriel Guajardo X-Patchwork-Id: 11712977 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DBB9414E3 for ; Thu, 13 Aug 2020 20:57:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0BFD2078B for ; Thu, 13 Aug 2020 20:57:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LCKTmMxB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726522AbgHMU5e (ORCPT ); Thu, 13 Aug 2020 16:57:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726192AbgHMU5d (ORCPT ); Thu, 13 Aug 2020 16:57:33 -0400 Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 963C4C061757; Thu, 13 Aug 2020 13:57:33 -0700 (PDT) Received: by mail-io1-xd44.google.com with SMTP id u126so8671787iod.12; Thu, 13 Aug 2020 13:57:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jtseolvN6/zqJafrwR5VIYhs3afaZVZdwVkAVHy2pBs=; b=LCKTmMxBJmbGgDljt2Hm8ezcnEQBtvCF1dzDUEKqKYMMtV9bowlJ93fzTTYLQhDu8d FX2epQT5ZTQz/L74FakXaKZ79j1Sw2xXpreHa2pgxHJt/MH1j79IdfoacV53KRwC+E8J Qe4l129kiJHyCYrfYbjctDikfQ2U8mTEYctPZWOYJWTCnPGFoV9+EWt0eobnNCVRVVSm YypPt2tWNkFJdIF15wWrhWnH31F3faIO5wOTmmxJz1u/XPtkg/jFiRcY43T4VrCOgMbN xEYwC9Nrbb6F6nGf7WJGwXJwNSGfZOisUnCeHdr4dyvMzfDwGdPJcdp87NmbNLW9edex LQwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jtseolvN6/zqJafrwR5VIYhs3afaZVZdwVkAVHy2pBs=; b=kodQbd08xpklnPv4HbqtYUAeRVCM7n2bFlj7F7DfDQVuBRDONhiZs07x0xc74SHIfx zCTp9TJOUMZEdnbx0gbmZYQPYkt3W7AH6IpGrCPAp034aUsEnblM8y2csrBXDC/FYsmx fTgxK/AZeYCbxyVCzlgRUM93we4VAe9up0V940UXuIu5UKCUFLMrt7VJFy18f0BHA3HN 5UwzYBxP/Q0bc+HSjRlJl/jpyVC6VUDr22rPOjRScBePrrqk2CS+N9f8BTf5HsWM9sa5 7ASc3QaDxY3OSXU3cxDzEK9TD1dQIQUJbYMkA5KpgO2JpU5Cgjl5WlzlPNDmWb4Ecwdh dZKw== X-Gm-Message-State: AOAM530+paNtLgiDxi1XvGT3LAOEPiVFCWFJk0odrG4qVye7aUvi9ERo qL5I90tp/4sX0t7zVuF6Ve8= X-Google-Smtp-Source: ABdhPJzyw2jYcTYfxJ8VBN8TfWy68Up6wecEYDl2rrRr5Nw2UakFVSs3PQJtLEnH/03Kp6q1waw1YQ== X-Received: by 2002:a05:6638:305:: with SMTP id w5mr7267114jap.10.1597352252848; Thu, 13 Aug 2020 13:57:32 -0700 (PDT) Received: from urieldev.c.googlers.com.com (243.199.238.35.bc.googleusercontent.com. [35.238.199.243]) by smtp.gmail.com with ESMTPSA id s3sm3148603iol.49.2020.08.13.13.57.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2020 13:57:31 -0700 (PDT) From: Uriel Guajardo To: brendanhiggins@google.com Cc: urielguajardo@google.com, akpm@linux-foundation.org, keescook@chromium.org, rdunlap@infradead.org, herbert@gondor.apana.org.au, christian.brauner@ubuntu.com, peterz@infradead.org, ardb@kernel.og, arnd@arndb.de, julien.grall@arm.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, Uriel Guajardo Subject: [PATCH 1/2] kunit: support failure from dynamic analysis tools Date: Thu, 13 Aug 2020 20:57:21 +0000 Message-Id: <20200813205722.1384108-1-urielguajardojr@gmail.com> X-Mailer: git-send-email 2.28.0.220.ged08abb693-goog MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Adds an API to allow dynamic analysis tools to fail the currently running KUnit test case. - Always places the kunit test in the task_struct to allow other tools to access the currently running KUnit test. - Creates a new header file to avoid circular dependencies that could be created from the test.h file. Requires KASAN-KUnit integration patch to access the kunit test from task_struct: https://lore.kernel.org/linux-kselftest/20200606040349.246780-2-davidgow@google.com/ Signed-off-by: Uriel Guajardo --- include/kunit/test-bug.h | 24 ++++++++++++++++++++++++ include/kunit/test.h | 1 + lib/kunit/test.c | 10 ++++++---- 3 files changed, 31 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..283c19ec328f --- /dev/null +++ b/include/kunit/test-bug.h @@ -0,0 +1,24 @@ +/* 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 + +#if IS_ENABLED(CONFIG_KUNIT) + +extern void kunit_fail_current_test(void); + +#else + +static inline void kunit_fail_current_test(void) +{ +} + +#endif + +#endif /* _KUNIT_TEST_BUG_H */ diff --git a/include/kunit/test.h b/include/kunit/test.h index 3391f38389f8..81bf43a1abda 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff --git a/lib/kunit/test.c b/lib/kunit/test.c index dcc35fd30d95..d8189d827368 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -16,6 +16,12 @@ #include "string-stream.h" #include "try-catch-impl.h" +void kunit_fail_current_test(void) +{ + if (current->kunit_test) + kunit_set_failure(current->kunit_test); +} + static void kunit_print_tap_version(void) { static bool kunit_has_printed_tap_version; @@ -284,9 +290,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, @@ -602,9 +606,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 Aug 13 20:57:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uriel Guajardo X-Patchwork-Id: 11712979 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 17736739 for ; Thu, 13 Aug 2020 20:57:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EF8502078B for ; Thu, 13 Aug 2020 20:57:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FicCNtgk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726653AbgHMU5e (ORCPT ); Thu, 13 Aug 2020 16:57:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726499AbgHMU5e (ORCPT ); Thu, 13 Aug 2020 16:57:34 -0400 Received: from mail-io1-xd42.google.com (mail-io1-xd42.google.com [IPv6:2607:f8b0:4864:20::d42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E3C5C061383; Thu, 13 Aug 2020 13:57:34 -0700 (PDT) Received: by mail-io1-xd42.google.com with SMTP id b17so8745681ion.7; Thu, 13 Aug 2020 13:57:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z/ASPTS2Ee55jSURHALLk5ixEglfeB12zyqYUwDPixY=; b=FicCNtgk9br8P0aDJP+IkrIIj/ykK3OW4UarPWg55HNmL6X0l4yBUJeGk+5s3Acj5d /xRUYLZSs5YL86NqzVWmlKfhtw3TzJ5+236ebO+fozx06CDEO0MIV08O7RUizOHUazCY MbBKO0npIVzb3CQszRycq83Vv1N1vBIAE/Xm9xmqaWVkdRAbHVYnM+bxCLtB1wEZKkUz UlfzR/D1uzy58h7cSgxQmc+CcOpZSD+BbStz8gjuySxnvN3M6czi+8PCHq3k7LHLv4yM ShuPAOw2rot3GIGJMkIT2ucJQqBOcdAkznSiXbcen4JMbvL+nVL8dJdo380wjEJf+kFn 4NBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z/ASPTS2Ee55jSURHALLk5ixEglfeB12zyqYUwDPixY=; b=dWRcTY+rMXTvsM4JU+OAVPFdVQUwV9RqLDRib4+mYHf3Rj09iL0VO1GgK2U0XNgJsR vsvsxuVdhfQHP0S0djbypFdVa5fWB4/RRH2M6Ekw71n7nBZEQ6EVdHWTvG4bXcOzlPcD nGrJ/LeM2wU42qXa+Dp1frd1GGLFcrhJBUMxIaoU3zyQMCvPuU17E66E5e5WMRYUJawH T8bFUMcxuiw321dYPDaCbQ1arjjlKz046yfnRcgx8olMQUCHoqMhd/5fGbt58sYkH+sh oQbCUely01Pph+YsiDa/g0jSFGypr9TAPNsUCEHWOLBqZDw1+QcnC5v+ZAzJ0I1ovI52 D4/Q== X-Gm-Message-State: AOAM533Wr2M7LAGeVTzeUvkwVOJ87OlwaTA+QD/dLkuuKuLEPbOInoU+ 3EnKq8s+3ZQipuNUMZn8bHA= X-Google-Smtp-Source: ABdhPJwQTeRwrYnJMO8lXxIeQcSevKEfdwVrHpBE4+C5UU9Incq/oGqGH0rhsgSy0tEvO7Ia+E5FhQ== X-Received: by 2002:a02:8384:: with SMTP id z4mr7069563jag.121.1597352253446; Thu, 13 Aug 2020 13:57:33 -0700 (PDT) Received: from urieldev.c.googlers.com.com (243.199.238.35.bc.googleusercontent.com. [35.238.199.243]) by smtp.gmail.com with ESMTPSA id s3sm3148603iol.49.2020.08.13.13.57.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2020 13:57:33 -0700 (PDT) From: Uriel Guajardo To: brendanhiggins@google.com Cc: urielguajardo@google.com, akpm@linux-foundation.org, keescook@chromium.org, rdunlap@infradead.org, herbert@gondor.apana.org.au, christian.brauner@ubuntu.com, peterz@infradead.org, ardb@kernel.og, arnd@arndb.de, julien.grall@arm.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, Uriel Guajardo Subject: [PATCH 2/2] kunit: ubsan integration Date: Thu, 13 Aug 2020 20:57:22 +0000 Message-Id: <20200813205722.1384108-2-urielguajardojr@gmail.com> X-Mailer: git-send-email 2.28.0.220.ged08abb693-goog In-Reply-To: <20200813205722.1384108-1-urielguajardojr@gmail.com> References: <20200813205722.1384108-1-urielguajardojr@gmail.com> MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Integrates UBSAN into the KUnit testing framework. It fails KUnit tests whenever it reports undefined behavior. Signed-off-by: Uriel Guajardo --- lib/ubsan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/ubsan.c b/lib/ubsan.c index cb9af3f6b77e..1460e2c828c8 100644 --- a/lib/ubsan.c +++ b/lib/ubsan.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "ubsan.h" @@ -137,6 +138,7 @@ static void ubsan_prologue(struct source_location *loc, const char *reason) { current->in_ubsan++; + kunit_fail_current_test(); pr_err("========================================" "========================================\n"); pr_err("UBSAN: %s in %s:%d:%d\n", reason, loc->file_name,