From patchwork Fri Jul 31 04:42:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gow X-Patchwork-Id: 11694069 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 D9888913 for ; Fri, 31 Jul 2020 04:43:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B242421744 for ; Fri, 31 Jul 2020 04:43:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="SfL5KD6k" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726643AbgGaEnC (ORCPT ); Fri, 31 Jul 2020 00:43:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725800AbgGaEnA (ORCPT ); Fri, 31 Jul 2020 00:43:00 -0400 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 5F85DC061574 for ; Thu, 30 Jul 2020 21:43:00 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id a5so20189091ybh.3 for ; Thu, 30 Jul 2020 21:43:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=K3PusR14df0uIi/zL2N7bolWKbqSLb4cLy+G3Ea6VDU=; b=SfL5KD6k5TtpyPZjZ9qVEhCHWxFu80bqvhOYMY+WJw+I3XJKW1sSXierTta6GNURuI aIrF8UB9yAQX5GpWcYrs41zc6IfZy/LIrz3bp95B9CAXjPxdwVdESusrmv+vy+g3s/a8 njYm7Z0OHWkBpH4indkiKqN+9pc/CX5AXoDzkDSkW+tZLgDn4MTB3+N1Vms32kOJZjjV PU/nuxRUfAl4LdYr5JP2lUP+ovAjC3wRX+FkHQ2R7FNthdru427jBmbybZqjpmmmWxod upPUyWAQIzZ64eyNrqcOEGVL74/xbrPd2ooou+3uep8k8wDDVsnIecPGyDSOQlPVYM9b cahA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=K3PusR14df0uIi/zL2N7bolWKbqSLb4cLy+G3Ea6VDU=; b=GUj8gucq5ixqyUKE9zAD31s2dbEH3wDJuNw7jHh2LStmjjZwvLXb6k6rGxikFRcpxQ 3WIv/4VGCti+8VGgwOwvoa3nTxuXjr8R2p+t7zsIJVvhSqkAbMq1XHtbcxYoJ1CTYy5L Uzj2jAcE9nPBMIp7C8l7d+ByjqmEGVKP7s88wYT/d8RJ6Pce2/PM0jrERU+tJlZZJVm3 FzlDq+0lCh0HmoLy4wZXnoVdJQ/kXyS5CVUx8/G85kqRk6SURrmEIhJHJBqEC7vR7kmN 5im89Az8Iw8/tcFgqKkScpvSQJtB8d699i+PbkVLHI65L94w/T2rfDuJI5+g9NavRDmr DA0A== X-Gm-Message-State: AOAM532Jf2TPCyy7dxwkJvLVTYpAGnSoqxdCtq1dW68a9BmnOI3mA9Ac X0quBaIZ6IiIqBzgSZ+yEHhp/nsc8/3GPA== X-Google-Smtp-Source: ABdhPJxjq4cLH1f2wXrcHrWR8dDMLZAJ5LwGt3ZWOjjT2Ngynt7sVf01TuvMKCIqJ2gD+Iw9jhLrap9b2jrTwA== X-Received: by 2002:a5b:d12:: with SMTP id y18mr3333265ybp.400.1596170579443; Thu, 30 Jul 2020 21:42:59 -0700 (PDT) Date: Thu, 30 Jul 2020 21:42:37 -0700 Message-Id: <20200731044242.1323143-1-davidgow@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.28.0.163.g6104cc2f0b6-goog Subject: [PATCH v9 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 Cc: David Gow , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.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. This patchset depends on: - "kunit: extend kunit resources API" [1] - This is already present in the kselftest/kunit branch I'd _really_ like to get this into 5.9 if possible: we also have some other changes which depend on some things here. 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/ 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 | 7 +- lib/kunit/test.c | 13 +- lib/test_kasan.c | 858 ------------------------------ mm/kasan/report.c | 34 +- 9 files changed, 147 insertions(+), 872 deletions(-) delete mode 100644 lib/test_kasan.c