From patchwork Tue Jan 5 18:27:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12000075 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, 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 87ABAC433DB for ; Tue, 5 Jan 2021 18:31:20 +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 ECFEB22D58 for ; Tue, 5 Jan 2021 18:31:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ECFEB22D58 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=cyqiYFXhotL1fwXpZQiPlsrVjFp8CSGQIydSoRg4Wto=; b=IYeqS3Z0bjSsi0d9Wkmrkzc2c FwvICG5dmmnO98tNGX0z9QZlbrNSS05nIeQcet3yKLTbg/jHjvQW1MddM9oVOkbs+WJO0kH9c4PgK BiqPWkU4CY9wp83uHaU2lfNJyvNHHn3J53EgXmZBKsiBB6QNl2HovtlfxRZ6upTHoq6V9SQjPPMaj tAKc94um9K191q0eVajpCHlmenSvl9VQ91+PysdzHsST5/dEGHd6FXbjU3i4jm1BzDYoGX/WmvVBY 7X0Gev+torGcP0qSfuzXmMD/92SJqogZaZKeLBjzQ9ca0evnnQKFmfLM4OkI0U6ojNjBo15Zllqk3 wrIINjlxQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwr4d-0007Dc-6E; Tue, 05 Jan 2021 18:28:51 +0000 Received: from mail-qt1-x849.google.com ([2607:f8b0:4864:20::849]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwr49-00072G-LP for linux-arm-kernel@lists.infradead.org; Tue, 05 Jan 2021 18:28:26 +0000 Received: by mail-qt1-x849.google.com with SMTP id f33so436390qtb.1 for ; Tue, 05 Jan 2021 10:28:19 -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=iDwaT/3sgxFRaKMDSbTZTruUt2fPWaZ2OF7Juvdk9+4=; b=f1nlOcJ45SiSeQbbtxVAu7J2DYKI2ZwAe8b91X2yoiIjBsOXDJnvD/sBnzp3lX2frS 0mZbrQdEhMiexqhNXrPWvU9GMhevNlJ2Phy5cNKzK1jUbSyqFk9433mc7RwKvXMJx0kC XmpFmbY3VKZ/3TmJE6DBk9XqTz+7ZyISJIfwnQoBbB67K7gGozJa8V3WaAyYxfH0Qhhs VBFUdbzI2TUoF2wMAp221x2+7GmCUjPYl5u2uvdlEveg0CHngQRYat7HQ8KO1sk3orXZ S3fbR+nGM5WsInj1VhqYjVsJNiLx67WpSw22Vlt3N7JaCUhLlnacvfiW+AMJAMT5GhHE bUlg== 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=iDwaT/3sgxFRaKMDSbTZTruUt2fPWaZ2OF7Juvdk9+4=; b=Gv30cy73p2M6tdV+ggjIl26d1PamzL5iR+WtswLSQ5CvniizNBUpY5T4aqkR2AQuDX egEGrK+4Ye8yDfwvMF4f1EL3ErnCMnsUASak6vwmARA+Cw2eWyYA0dD7WZN2UPXpPDgL x3McaW9izvABTkfBVR+C902T/eefwYrlEcQoxv94ute8thNWpP+2roc5EtNpH5zEVnDp Jzgr54SeTikF4dI8cbG9VOiKvxlQ8u2mFvMbm4NOHQ2n+uIgC16P+cm0M0vaPJk9ckXx iqAFjRZ78nYh63PFAHEIxp1su1sbcWLIKpXdo/ya2/CBnhJ6kbhr7MolYZmOgF3p1xY7 oT5Q== X-Gm-Message-State: AOAM530HB1oYgNjnELEZfXV/ZGTpuVP097KmijuxtpokTTwWTLDpvKse 36cZRAs2AMd/lYHB7pOEO9WfxLiPLWvkKRqF X-Google-Smtp-Source: ABdhPJymIJigzVTAxKHFYX8GJcQw7CeKutLWk6jrbS4xQfYUuzfaOM9YhI/tZ9A1wpNabOEH+OhLop6BRA4Y6A2V X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6214:13e2:: with SMTP id ch2mr693457qvb.57.1609871298143; Tue, 05 Jan 2021 10:28:18 -0800 (PST) Date: Tue, 5 Jan 2021 19:27:50 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.729.g45daf8777d-goog Subject: [PATCH 06/11] kasan: rename CONFIG_TEST_KASAN_MODULE From: Andrey Konovalov To: 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-20210105_132821_828158_AEAAF1C0 X-CRM114-Status: GOOD ( 13.11 ) 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 , Andrew Morton , 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. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Id347dfa5fe8788b7a1a189863e039f409da0ae5f Reviewed-by: Alexander Potapenko Reviewed-by: Marco Elver --- Documentation/dev-tools/kasan.rst | 6 +++--- lib/Kconfig.kasan | 2 +- lib/Makefile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/dev-tools/kasan.rst b/Documentation/dev-tools/kasan.rst index 26c99852a852..72535816145d 100644 --- a/Documentation/dev-tools/kasan.rst +++ b/Documentation/dev-tools/kasan.rst @@ -374,8 +374,8 @@ 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: @@ -384,7 +384,7 @@ KASAN tests consist on two parts: 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)