From patchwork Fri Jan 15 17:52:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12023535 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 C1B61C433E0 for ; Fri, 15 Jan 2021 17:55:59 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7FB8922262 for ; Fri, 15 Jan 2021 17:55:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7FB8922262 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=aL5+Rg4ZR7CPBPPhpc4I3D8KFFDHKlclf7FNOMhRuu8=; b=1n6k6VI16p5Y8w2lp6P4NBDBM 2RdUL6ZAFAmGf/blBz+bwV0XSytp+n5fEw3I2rjDYnUE6fpKCstgc1kjR4NeZDXzc2je/kLHVU5O/ s+KokLHncTV5L3OmHNaUrfZA/FwLmTSiow3HzdL0qTXw/dc0XnfZUKYpIASiTnrpZwI8OFC+moLBY IdbM4W/BuR5s1j/7/rx26MhLKPMHq6Txp3LdLrTq8MDxycPEBMuzTyy9CJ3v3v2kUbv+v+SmfcQdI Vdeqqe9uxIAfSZen/SdTqmpYIgJx9Vw6GEPdfnLA6SUXnG9n8DpGhOEarG5Uzwx7zJDpxjvODNzhU PkgKZ6Rzw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0TIj-0003op-2u; Fri, 15 Jan 2021 17:54:21 +0000 Received: from mail-wm1-x349.google.com ([2a00:1450:4864:20::349]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0THk-0003Ta-2S for linux-arm-kernel@lists.infradead.org; Fri, 15 Jan 2021 17:53:24 +0000 Received: by mail-wm1-x349.google.com with SMTP id r1so3262296wmn.8 for ; Fri, 15 Jan 2021 09:53:17 -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=HQul2+mx68GlfTrevBbbyn+9Sc9/a5lDU2srZLIr3Ck=; b=rvX1/hyTPBtCswvlj/dnG/QZyZRiOpHNq8zgr6CimqrV0H8avfdz1Qy6Vrj7JuXv+D RAtbEW8x2gNHQC7BalE/okpelZb14euKVfienW74jKmUmHsotYiFTc7rpyziW/nc5as3 ugYxKzp0bdLLzd0P4aYJNiL1qmYLYrMmZIBxM0kdBgqdj41GptL9ruZzyH+0Q4UkXmYl AVzl0+GbVMFSAFKy09zCqH3UbANE+WZxQa7kW4UxxPSglAypQnBBwDXjSEe3guTtCQnX XbjXfP0fFXDrL0Oi6UcKI1695F0j75APleNL0nRi+qj2/KrbGn/ZvR7zgEoWaSg0YH/D LVMg== 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=HQul2+mx68GlfTrevBbbyn+9Sc9/a5lDU2srZLIr3Ck=; b=MVSABGiyWUKSZAcUdInlQSjn3ykzfNdIbMMeErc/fQgmGPl50sy6m1M5iAu68r62Uz yFCBl1HsoIoFON9pwkPYfAASuRSDPqpENT8f2fRlha4386oywcvJJai1N+kT/5etLSDL 9hQRPhemURQjJUR1X21m91sUcfwK8lN0WnBfwuoWgGmlYuC74lqYYohun1j5C7gXg4n1 FbnBdCqDbUTi3I5UsTCQnIIWCFqG0eFozTXZebPZTRZLVVNc5W/vwxEe6u1ZR8cdcIO+ jLVB7zN1ww8alviphrWW4UeZKCilJtJKkOibnr/6zoLqLPnw0l4bN70LtodgqZEUrOAc dgBw== X-Gm-Message-State: AOAM530yJGkgwnVtO0TicvH/WGv7dOrlF3QkPzKEX5CAicavH8YP2mog sfUIX8eFZh5Zkn3l52sA0vjCsmZjMW8woV/j X-Google-Smtp-Source: ABdhPJxomRrgEN3CNTsdSfel3qKrrLBG6NmZHav6A7NhHiQ3wikHilP82MgzokzEf9JlMrzvKGdBChth8jrss0us X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:2e88:: with SMTP id u130mr9830496wmu.83.1610733196486; Fri, 15 Jan 2021 09:53:16 -0800 (PST) Date: Fri, 15 Jan 2021 18:52:44 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog Subject: [PATCH v4 07/15] kasan: rename CONFIG_TEST_KASAN_MODULE From: Andrey Konovalov To: Andrew Morton , Catalin Marinas , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210115_125320_240169_E469EA34 X-CRM114-Status: GOOD ( 13.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Branislav Rankov , Andrey Konovalov , Kevin Brodsky , Will Deacon , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, Andrey Ryabinin , Peter Collingbourne , Evgenii Stepanov Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Rename CONFIG_TEST_KASAN_MODULE to CONFIG_KASAN_MODULE_TEST. This naming is more consistent with the existing CONFIG_KASAN_KUNIT_TEST. Link: https://linux-review.googlesource.com/id/Id347dfa5fe8788b7a1a189863e039f409da0ae5f Reviewed-by: Marco Elver Reviewed-by: Alexander Potapenko Signed-off-by: Andrey Konovalov --- Documentation/dev-tools/kasan.rst | 8 ++++---- lib/Kconfig.kasan | 2 +- lib/Makefile | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/dev-tools/kasan.rst b/Documentation/dev-tools/kasan.rst index 26c99852a852..b25ae43d683e 100644 --- a/Documentation/dev-tools/kasan.rst +++ b/Documentation/dev-tools/kasan.rst @@ -374,17 +374,17 @@ unmapped. This will require changes in arch-specific code. This allows ``VMAP_STACK`` support on x86, and can simplify support of architectures that do not have a fixed module region. -CONFIG_KASAN_KUNIT_TEST & CONFIG_TEST_KASAN_MODULE --------------------------------------------------- +CONFIG_KASAN_KUNIT_TEST and CONFIG_KASAN_MODULE_TEST +---------------------------------------------------- -KASAN tests consist on two parts: +KASAN tests consist of two parts: 1. Tests that are integrated with the KUnit Test Framework. Enabled with ``CONFIG_KASAN_KUNIT_TEST``. These tests can be run and partially verified automatically in a few different ways, see the instructions below. 2. Tests that are currently incompatible with KUnit. Enabled with -``CONFIG_TEST_KASAN_MODULE`` and can only be run as a module. These tests can +``CONFIG_KASAN_MODULE_TEST`` and can only be run as a module. These tests can only be verified manually, by loading the kernel module and inspecting the kernel log for KASAN reports. diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index 3091432acb0a..624ae1df7984 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -192,7 +192,7 @@ config KASAN_KUNIT_TEST For more information on KUnit and unit tests in general, please refer to the KUnit documentation in Documentation/dev-tools/kunit. -config TEST_KASAN_MODULE +config KASAN_MODULE_TEST tristate "KUnit-incompatible tests of KASAN bug detection capabilities" depends on m && KASAN && !KASAN_HW_TAGS help diff --git a/lib/Makefile b/lib/Makefile index afeff05fa8c5..122f25d6407e 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -68,7 +68,7 @@ obj-$(CONFIG_TEST_IDA) += test_ida.o obj-$(CONFIG_KASAN_KUNIT_TEST) += test_kasan.o CFLAGS_test_kasan.o += -fno-builtin CFLAGS_test_kasan.o += $(call cc-disable-warning, vla) -obj-$(CONFIG_TEST_KASAN_MODULE) += test_kasan_module.o +obj-$(CONFIG_KASAN_MODULE_TEST) += test_kasan_module.o CFLAGS_test_kasan_module.o += -fno-builtin obj-$(CONFIG_TEST_UBSAN) += test_ubsan.o CFLAGS_test_ubsan.o += $(call cc-disable-warning, vla)