From patchwork Tue Sep 15 03:58:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gow X-Patchwork-Id: 11775471 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 7B77E618 for ; Tue, 15 Sep 2020 03:59:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5CF89212CC for ; Tue, 15 Sep 2020 03:59:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="T7K2uPiW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726239AbgIOD7m (ORCPT ); Mon, 14 Sep 2020 23:59:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726106AbgIOD6l (ORCPT ); Mon, 14 Sep 2020 23:58:41 -0400 Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CCEFC061788 for ; Mon, 14 Sep 2020 20:58:40 -0700 (PDT) Received: by mail-qk1-x749.google.com with SMTP id 196so2018951qkn.6 for ; Mon, 14 Sep 2020 20:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=t2EDhHpbxYvpooWPkPafyfVXhtngpgFAoszDJvgbFKI=; b=T7K2uPiWj2/D4flL80U8mqzn5rMfoUQXEWNSI0T4NT3AQdaHDdR/iUmosD/SXF/gJM e4BooMeud5QB2lsoVPeWNYoqNsRwEMyFJZ1yPwbV0zxK3ay0wPpZ6J0yOta0Kx0DsnbH 6vdxIIBPzVA446vCS/6sICma3oY5h4jZzgEhEQu0OzwSDbDkFE67uGfIiIHeTYbDvCvj m0hyC0GaaJ9p1XIKFNjsAETvPYeYvl8dveZCfMKLyuL2Fh6kPz8G1H1j2oWCW/xOawcJ Sa4rMpmJFO2fRYQa7wAD8Dway/VsZrCfc3wkdEXc++ojnafFmUVmhCUPp7KfAOJQo9Kp BLcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=t2EDhHpbxYvpooWPkPafyfVXhtngpgFAoszDJvgbFKI=; b=VEa+CiJBgui6L461fFicIWabYrSdvRuntHpT+w6UETr5yKcM6y897rbIKy2wosmww1 znyYZyLW6aP1kWu6JPzPxsv9s8HrFHbl34OgnU5VVoUg+SWFMECXOSa4JcA0ylvSFL3i YNcb8xuaz2llC7DlyWF8x1ledlvM9OeybjfNKID9/HmAf406ghX3jZE+x/t7Gwac6Vmo 569/ZqVvQB/Udyi2wg6ng0KWizQCTF8hGtZC9FqG2fiJsEHtw2KcVdCvkIFgNmQ7ytqa 6MSX3pMZmDM6tN/oRnkLQGWwrlySy5xCb7ezWoCZ3sfAy+ifNjm0NX/oDZwNFclcigAP Ol1g== X-Gm-Message-State: AOAM533mrPgN8tSS6RUqO4NdIFEur5CDd3tU5QH+6GFnIu3g0Rskb3lF kCua9W9JGttXDtC46oi88FYm2vILR3L8VQ== X-Google-Smtp-Source: ABdhPJx4kZCH+lUX05DU7QtIqz06LxRL3r8CaW8jFmcjWdT3GD5SGcna4PTCsgScYU2C/3e9APTgIbwx1TvAww== X-Received: from spirogrip.svl.corp.google.com ([2620:15c:2cb:201:42a8:f0ff:fe4d:3548]) (user=davidgow job=sendgmr) by 2002:a05:6214:1712:: with SMTP id db18mr15740565qvb.4.1600142317345; Mon, 14 Sep 2020 20:58:37 -0700 (PDT) Date: Mon, 14 Sep 2020 20:58:23 -0700 Message-Id: <20200915035828.570483-1-davidgow@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog Subject: [PATCH v14 0/5] KASAN-KUnit Integration From: David Gow To: trishalfonso@google.com, brendanhiggins@google.com, aryabinin@virtuozzo.com, dvyukov@google.com, mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, andreyknvl@google.com, shuah@kernel.org, akpm@linux-foundation.org Cc: David Gow , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, linux-mm@kvack.org Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org This patchset contains everything needed to integrate KASAN and KUnit. KUnit will be able to: (1) Fail tests when an unexpected KASAN error occurs (2) Pass tests when an expected KASAN error occurs Convert KASAN tests to KUnit with the exception of copy_user_test because KUnit is unable to test those. Add documentation on how to run the KASAN tests with KUnit and what to expect when running these tests. The dependencies for this patchset are all present in 5.9-rc1+. Changes from v13: - Fix some compile warnings in test_kasan_module[9] Changes from v12: - Rebased on top of mainline (ab29a807) - Updated to match latest KUnit guidelines (no longer rename the test) - Fix some small issues with the documentation to match the correct test name and mention the module name. Changes from v11: - Rebased on top of latest -next (20200810) - Fixed a redundant memchr() call in kasan_memchr() - Added Andrey's "Tested-by" to everything. Changes from v10: - Fixed some whitespace issues in patch 2. - Split out the renaming of the KUnit test suite into a separate patch. Changes from v9: - Rebased on top of linux-next (20200731) + kselftest/kunit and [7] - Note that the kasan_rcu_uaf test has not been ported to KUnit, and remains in test_kasan_module. This is because: (a) KUnit's expect failure will not check if the RCU stacktraces show. (b) KUnit is unable to link the failure to the test, as it occurs in an RCU callback. Changes from v8: - Rebased on top of kselftest/kunit - (Which, with this patchset, should rebase cleanly on 5.8-rc7) - Renamed the KUnit test suite, config name to patch the proposed naming guidelines for KUnit tests[6] Changes from v7: - Rebased on top of kselftest/kunit - Rebased on top of v4 of the kunit resources API[1] - Rebased on top of v4 of the FORTIFY_SOURCE fix[2,3,4] - Updated the Kconfig entry to support KUNIT_ALL_TESTS Changes from v6: - Rebased on top of kselftest/kunit - Rebased on top of Daniel Axtens' fix for FORTIFY_SOURCE incompatibilites [2] - Removed a redundant report_enabled() check. - Fixed some places with out of date Kconfig names in the documentation. Changes from v5: - Split out the panic_on_warn changes to a separate patch. - Fix documentation to fewer to the new Kconfig names. - Fix some changes which were in the wrong patch. - Rebase on top of kselftest/kunit (currently identical to 5.7-rc1) Changes from v4: - KASAN no longer will panic on errors if both panic_on_warn and kasan_multishot are enabled. - As a result, the KASAN tests will no-longer disable panic_on_warn. - This also means panic_on_warn no-longer needs to be exported. - The use of temporary "kasan_data" variables has been cleaned up somewhat. - A potential refcount/resource leak should multiple KASAN errors appear during an assertion was fixed. - Some wording changes to the KASAN test Kconfig entries. Changes from v3: - KUNIT_SET_KASAN_DATA and KUNIT_DO_EXPECT_KASAN_FAIL have been combined and included in KUNIT_DO_EXPECT_KASAN_FAIL() instead. - Reordered logic in kasan_update_kunit_status() in report.c to be easier to read. - Added comment to not use the name "kasan_data" for any kunit tests outside of KUNIT_EXPECT_KASAN_FAIL(). Changes since v2: - Due to Alan's changes in [1], KUnit can be built as a module. - The name of the tests that could not be run with KUnit has been changed to be more generic: test_kasan_module. - Documentation on how to run the new KASAN tests and what to expect when running them has been added. - Some variables and functions are now static. - Now save/restore panic_on_warn in a similar way to kasan_multi_shot and renamed the init/exit functions to be more generic to accommodate. - Due to [4] in kasan_strings, kasan_memchr, and kasan_memcmp will fail if CONFIG_AMD_MEM_ENCRYPT is enabled so return early and print message explaining this circumstance. - Changed preprocessor checks to C checks where applicable. Changes since v1: - Make use of Alan Maguire's suggestion to use his patch that allows static resources for integration instead of adding a new attribute to the kunit struct - All KUNIT_EXPECT_KASAN_FAIL statements are local to each test - The definition of KUNIT_EXPECT_KASAN_FAIL is local to the test_kasan.c file since it seems this is the only place this will be used. - Integration relies on KUnit being builtin - copy_user_test has been separated into its own file since KUnit is unable to test these. This can be run as a module just as before, using CONFIG_TEST_KASAN_USER - The addition to the current task has been separated into its own patch as this is a significant enough change to be on its own. [1] https://lore.kernel.org/linux-kselftest/CAFd5g46Uu_5TG89uOm0Dj5CMq+11cwjBnsd-k_CVy6bQUeU4Jw@mail.gmail.com/T/#t [2] https://lore.kernel.org/linux-mm/20200424145521.8203-1-dja@axtens.net/ [3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=adb72ae1915db28f934e9e02c18bfcea2f3ed3b7 [4] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=47227d27e2fcb01a9e8f5958d8997cf47a820afc [5] https://bugzilla.kernel.org/show_bug.cgi?id=206337 [6] https://lore.kernel.org/linux-kselftest/20200620054944.167330-1-davidgow@google.com/ [7] https://lkml.org/lkml/2020/7/31/571 [8] https://lore.kernel.org/linux-kselftest/8d43e88e-1356-cd63-9152-209b81b16746@linuxfoundation.org/T/#u [9] https://www.spinics.net/lists/kernel/msg3660451.html David Gow (1): mm: kasan: Do not panic if both panic_on_warn and kasan_multishot set Patricia Alfonso (4): Add KUnit Struct to Current Task KUnit: KASAN Integration KASAN: Port KASAN Tests to KUnit KASAN: Testing Documentation Documentation/dev-tools/kasan.rst | 70 +++ include/kunit/test.h | 5 + include/linux/kasan.h | 6 + include/linux/sched.h | 4 + lib/Kconfig.kasan | 22 +- lib/Makefile | 4 +- lib/kunit/test.c | 13 +- lib/test_kasan.c | 728 ++++++++++++------------------ lib/test_kasan_module.c | 111 +++++ mm/kasan/report.c | 34 +- 10 files changed, 554 insertions(+), 443 deletions(-) create mode 100644 lib/test_kasan_module.c