From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FAB6C38145 for ; Tue, 6 Sep 2022 06:00:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 968D18024E; Tue, 6 Sep 2022 02:00:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8F1D980224; Tue, 6 Sep 2022 02:00:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 791738024E; Tue, 6 Sep 2022 02:00:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 6526880224 for ; Tue, 6 Sep 2022 02:00:53 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 33F76120F61 for ; Tue, 6 Sep 2022 06:00:53 +0000 (UTC) X-FDA: 79880611986.11.36D2E66 Received: from mail-yb1-f178.google.com (mail-yb1-f178.google.com [209.85.219.178]) by imf29.hostedemail.com (Postfix) with ESMTP id E08E71200A5 for ; Tue, 6 Sep 2022 06:00:52 +0000 (UTC) Received: by mail-yb1-f178.google.com with SMTP id 123so15338618ybv.7 for ; Mon, 05 Sep 2022 23:00:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=dVgxTZ8rakP42g8vhCO3njeR/uRGYZNUUx4gShIILwI=; b=d5kvgH2al2OzGC3Spb+XGYBBgJ8Mm3xF808v2cmMFnU1xLOoRQA1O8WMwDdihc92M5 pUEv0pk58+n2FJOnauWMMiUVOLfTQFcXt3C0p9xdRDWTV2oc7VmLJtkJP6ltuwHFAjWa k7Mce8yApzVuKrgcPGcGlJKVzv+L7kp83eUQzZV39wsCezAUJMlTUkLS/x5MCJlI0xfm KyMb3YRNyUpuo2gDRdUWW2bo3Op/mmCtFoHp/xWm6hu8ZtI9/eRx4ByXrC68Kqo2O0LI 7g5gOwSlPWos1y5l9tI4FKYGDrcjXP9vGElk7Sk5h7awDPHdIHLtRpqx32YcUapuOioQ gO6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=dVgxTZ8rakP42g8vhCO3njeR/uRGYZNUUx4gShIILwI=; b=22qZo1p8bQ4DNM9phL+h7asQyXN/W2oR9PMMi4tggNppg8ooDU/aBt8xfk8+fi97RA LxurjoKMIJ9RmqlRrfEaUe3blNLLHZD+UTUcUgxavB0L6/qj4EIuJ2OxWLcFyao/BED8 lePy7bhyRdedx1zeIrvf7eJj2kGF/XPlUqwsJOJEyBSxTY2QT6odJj12oc0SpdcpwO6L iQRkfQFoP9RigUIC2B6X8+JCkHeZMqZEHNNsDtRC28k/75lG/62mkgK7bYEb8NR3stF6 J6+ws3Knr51AFH8NSnCvQw6De+cjyjHcOiYgEg+SSUnKuArP+zZYkVI+nbDZnkKAD2KA C1Mg== X-Gm-Message-State: ACgBeo07MgbomRvJiq3+VhlAJSu35OHWxITTX+We+riwnXdQj0KVogQS AcVQjKMM79Aew9NlCsF35jNgxWLAtOxfb+B0v5ZocA== X-Google-Smtp-Source: AA6agR6H7ZaNY+warUhZhyAV9xv4cf03bKqoY92Ggt4rv/7N5rkwicu6vEp+repqTe/aMzeM+7QruB3NXr28ULn5MCY= X-Received: by 2002:a25:b983:0:b0:695:d8b4:a5a3 with SMTP id r3-20020a25b983000000b00695d8b4a5a3mr36413414ybg.553.1662444051930; Mon, 05 Sep 2022 23:00:51 -0700 (PDT) MIME-Version: 1.0 References: <676398f0aeecd47d2f8e3369ea0e95563f641a36.1662416260.git.andreyknvl@google.com> In-Reply-To: <676398f0aeecd47d2f8e3369ea0e95563f641a36.1662416260.git.andreyknvl@google.com> From: Marco Elver Date: Tue, 6 Sep 2022 08:00:00 +0200 Message-ID: Subject: Re: [PATCH] kasan: move tests to mm/kasan/ To: andrey.konovalov@linux.dev Cc: Alexander Potapenko , Andrew Morton , Andrey Konovalov , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=d5kvgH2a; spf=pass (imf29.hostedemail.com: domain of elver@google.com designates 209.85.219.178 as permitted sender) smtp.mailfrom=elver@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662444052; a=rsa-sha256; cv=none; b=yEbyRem1e3ZOH9mX8/2cH5y9Zl6AfNkgvPgqM06G6tZb9acSpQbPT4Aj3Y7583yd2oNmfW 50iTFZNyvciwkF4HLkWwkLT2aIS11XP4gQPpm08uH80D4t7WwzRYeYbE5TvZs2JglPyVkQ +4GFrmBKK2Wz4GmFpxfw/67ZzXspfBQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662444052; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=dVgxTZ8rakP42g8vhCO3njeR/uRGYZNUUx4gShIILwI=; b=GQ5OsWjx15x7K/9RJ0Jx4LfPu6HbsOEaaWTCQrg9jEev2Al855T8EXrAImTgCrlYG++T3A nPkoDvMSF9xrqh9sy7rKJ2EQ4mQ/YuTXrg+0EKpux9yAEDD4EndLLbOUYSvoZtd3xMExNU muuz9coPvuxcHv5wwTHSw01Uqag6z0s= Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=d5kvgH2a; spf=pass (imf29.hostedemail.com: domain of elver@google.com designates 209.85.219.178 as permitted sender) smtp.mailfrom=elver@google.com; dmarc=pass (policy=reject) header.from=google.com X-Stat-Signature: 8f4wh667w3x4y5s63gu574tohqexyc9e X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: E08E71200A5 X-HE-Tag: 1662444052-210824 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Tue, 6 Sept 2022 at 00:18, wrote: > > From: Andrey Konovalov > > Move KASAN tests to mm/kasan/ to keep the test code alongside the > implementation. > > Signed-off-by: Andrey Konovalov Reviewed-by: Marco Elver Thanks - this is overdue, and follows what newer KUnit tests do. > --- > MAINTAINERS | 1 - > lib/Makefile | 5 ----- > mm/kasan/Makefile | 8 ++++++++ > lib/test_kasan.c => mm/kasan/kasan_test.c | 2 +- > lib/test_kasan_module.c => mm/kasan/kasan_test_module.c | 2 +- > 5 files changed, 10 insertions(+), 8 deletions(-) > rename lib/test_kasan.c => mm/kasan/kasan_test.c (99%) > rename lib/test_kasan_module.c => mm/kasan/kasan_test_module.c (99%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 589517372408..31b3e4b11e01 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -10938,7 +10938,6 @@ F: arch/*/include/asm/*kasan.h > F: arch/*/mm/kasan_init* > F: include/linux/kasan*.h > F: lib/Kconfig.kasan > -F: lib/test_kasan*.c > F: mm/kasan/ > F: scripts/Makefile.kasan > > diff --git a/lib/Makefile b/lib/Makefile > index ffabc30a27d4..928d7605c35c 100644 > --- a/lib/Makefile > +++ b/lib/Makefile > @@ -65,11 +65,6 @@ obj-$(CONFIG_TEST_SYSCTL) += test_sysctl.o > obj-$(CONFIG_TEST_SIPHASH) += test_siphash.o > obj-$(CONFIG_HASH_KUNIT_TEST) += test_hash.o > 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_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) > UBSAN_SANITIZE_test_ubsan.o := y > diff --git a/mm/kasan/Makefile b/mm/kasan/Makefile > index 1f84df9c302e..d4837bff3b60 100644 > --- a/mm/kasan/Makefile > +++ b/mm/kasan/Makefile > @@ -35,7 +35,15 @@ CFLAGS_shadow.o := $(CC_FLAGS_KASAN_RUNTIME) > CFLAGS_hw_tags.o := $(CC_FLAGS_KASAN_RUNTIME) > CFLAGS_sw_tags.o := $(CC_FLAGS_KASAN_RUNTIME) > > +CFLAGS_KASAN_TEST := $(CFLAGS_KASAN) -fno-builtin $(call cc-disable-warning, vla) > + > +CFLAGS_kasan_test.o := $(CFLAGS_KASAN_TEST) > +CFLAGS_kasan_test_module.o := $(CFLAGS_KASAN_TEST) > + > obj-y := common.o report.o > obj-$(CONFIG_KASAN_GENERIC) += init.o generic.o report_generic.o shadow.o quarantine.o > obj-$(CONFIG_KASAN_HW_TAGS) += hw_tags.o report_hw_tags.o tags.o report_tags.o > obj-$(CONFIG_KASAN_SW_TAGS) += init.o report_sw_tags.o shadow.o sw_tags.o tags.o report_tags.o > + > +obj-$(CONFIG_KASAN_KUNIT_TEST) += kasan_test.o > +obj-$(CONFIG_KASAN_MODULE_TEST) += kasan_test_module.o > diff --git a/lib/test_kasan.c b/mm/kasan/kasan_test.c > similarity index 99% > rename from lib/test_kasan.c > rename to mm/kasan/kasan_test.c > index 505f77ffad27..f25692def781 100644 > --- a/lib/test_kasan.c > +++ b/mm/kasan/kasan_test.c > @@ -25,7 +25,7 @@ > > #include > > -#include "../mm/kasan/kasan.h" > +#include "kasan.h" > > #define OOB_TAG_OFF (IS_ENABLED(CONFIG_KASAN_GENERIC) ? 0 : KASAN_GRANULE_SIZE) > > diff --git a/lib/test_kasan_module.c b/mm/kasan/kasan_test_module.c > similarity index 99% > rename from lib/test_kasan_module.c > rename to mm/kasan/kasan_test_module.c > index b112cbc835e9..e4ca82dc2c16 100644 > --- a/lib/test_kasan_module.c > +++ b/mm/kasan/kasan_test_module.c > @@ -13,7 +13,7 @@ > #include > #include > > -#include "../mm/kasan/kasan.h" > +#include "kasan.h" > > static noinline void __init copy_user_test(void) > { > -- > 2.25.1 >