From patchwork Thu Jan 14 19:36:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12020729 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 41F8DC433E0 for ; Thu, 14 Jan 2021 19:40:13 +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 9D49B2343B for ; Thu, 14 Jan 2021 19:40:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9D49B2343B 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=T0MGX5vxucCVLlAtW+7jHGjLO fjjB99R7FHLDXCp+pG3z7dQ1qIo8NDPc4e1RsA/+w0CyPjjS79qYHzWoW+bK1h2gdcnXDmKAJCOmI xRMDEZmSgEd1lT678/c0wVZbWFuc5lgjZG2GJcaj7YLKCSl+QaHLhThkSwk9D8KR3MxeR6MPhu4fx xt4pagWAvstvKu42eplX/T1NiLmcBC5Elyq6vqA/bYdHvkkaTvnMj2PsJOVxu6UPnjhVuLV+yqE+t GdJyCVevR1S9iY7YarOtaft4f7HuK/co19QwhJvsxMPeo/KctghuLy86Gre9jn+kGeOuLX42zg1n9 Q4Twx98xA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l08Rk-0004l1-Ro; Thu, 14 Jan 2021 19:38:16 +0000 Received: from mail-qk1-x749.google.com ([2607:f8b0:4864:20::749]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l08QR-0004Dj-2j for linux-arm-kernel@lists.infradead.org; Thu, 14 Jan 2021 19:37:04 +0000 Received: by mail-qk1-x749.google.com with SMTP id y187so5646375qke.20 for ; Thu, 14 Jan 2021 11:36:52 -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=cC2ei3K/burC1V05bUH8G+fNOAFdZpwW4EQHaWQNgyIryXqoQVAEiwhLB2hM5t0hrB wFOTSCFsvTNMW6Jzoi7mtUmkL4lxWpJo3h/lpxXHKJswMG87IEOdTfC6x28lxfk2Nmt+ pgLCAHklanBSMEDPf9ggTkMvk4t9LGh27ssNuFuR8NH5x3/px63sAhUNBCu5hLRmUEz+ 1J8OGY7E0ikCdfegMeZ3Lywoa7ZEwQaJeEwoviq72KzOqYyU59tQADbAlprL8ePIsh5C Wi9SChydLn5dwimYNREKVlpcEABVAiqRXU32+yYXZRWavoGV5bpkCG3HS0iOlpnIYxdM 4pBQ== 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=iGjBqMeR+q5Naxcqhe/TUhKYnaTBQqDXpMzf8mtjpob5og/wAsJbHuQR25CRc4yKfD H+vWQC+xV3TeICyZbThUTwaULg8242cR73SLQLVnQBnv84NCU00rMMdRRNhouFx1mGy2 4xvDUVPi09bMNppxozTit22T55GCffoi9xNyVfYJu8n7km27LpmpW9IrS4tc+QoE4kaH bcnkCHtlDrf2ZffXAR7xYwTVidFYOxFcVX37jS/246zpQePyQyQ6YPqi5ZNhJRpVm6uX oiFipTkK8JoVf1qF8Ja6vQR3ez5pRZivJ0imw1DekkXTE+6CkK15NPyLOjuqBRfHT/hp NOug== X-Gm-Message-State: AOAM532yB0LTdOL8j7kqiDqCvuBMnJsWLbdivGjrMFPCDtLxd2ypFTXJ E6c8YfKL6zbO87xWPhb9kyNXQKo7Dcz96joy X-Google-Smtp-Source: ABdhPJwVmuGAJCSzCsJ61Hsuv/BlmJ8U6GDde/ydmAvT3bcP69fYCJLcO7gZkutQ5AILyl0UzzxpeXpOSBeIpTdr X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6214:14ee:: with SMTP id k14mr8494029qvw.36.1610653010781; Thu, 14 Jan 2021 11:36:50 -0800 (PST) Date: Thu, 14 Jan 2021 20:36:23 +0100 In-Reply-To: Message-Id: <008f7320e7155cead8bbae07a92ea0140fb4fc7c.1610652890.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog Subject: [PATCH v3 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-20210114_143655_263341_FB37717C X-CRM114-Status: GOOD ( 13.30 ) 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)