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 X-Spam-Level: X-Spam-Status: No, score=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=ham 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 E6327C433DB for ; Wed, 13 Jan 2021 16:25:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 62B2F2339D for ; Wed, 13 Jan 2021 16:25:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 62B2F2339D Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A2C736B015C; Wed, 13 Jan 2021 11:25:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B44D6B015E; Wed, 13 Jan 2021 11:25:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 87C4F6B015F; Wed, 13 Jan 2021 11:25:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0250.hostedemail.com [216.40.44.250]) by kanga.kvack.org (Postfix) with ESMTP id 6E5DD6B015C for ; Wed, 13 Jan 2021 11:25:44 -0500 (EST) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 24AF11EE6 for ; Wed, 13 Jan 2021 16:25:44 +0000 (UTC) X-FDA: 77701277808.10.noise33_3d02fe42751f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin10.hostedemail.com (Postfix) with ESMTP id EF8E216A4BC for ; Wed, 13 Jan 2021 16:25:43 +0000 (UTC) X-HE-Tag: noise33_3d02fe42751f X-Filterd-Recvd-Size: 12948 Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) by imf16.hostedemail.com (Postfix) with ESMTP for ; Wed, 13 Jan 2021 16:25:43 +0000 (UTC) Received: by mail-oi1-f171.google.com with SMTP id q205so2650986oig.13 for ; Wed, 13 Jan 2021 08:25:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Rj6WRYh2NAKrrsW/5ki70/RayzjiACCNyfDalLAwfF0=; b=jSgTpyYiVJNvKujRLGFHHELEmVz4JaV4upEv4FrohplG4JzMFV2LBIWHmUvTqhpUez 8WhDODyf3jNJ5VECgMdRmCtxLaFe12S2tcRAbwSi1uZSq+pXvrcExhVkO5DrPu5GiDdx gQSBle4eN1Joaf53lFbpxNGky8YVAoRsOCvr2ricmh0lHb6BqsD/CUolq7af1qTUSPZD kG11xlEloWLUF6690HyCiS0NvfrHxKGMip8LHYyNcxuCBNyhvC1fmbD14pQO/trvmyOK W3JQ1SU+3Nd0pTyJaHKpqXYDfSP8hUwigwsli8PqsUDn7J8QHj/dDHmHwiuS0PlRt1FU 2qKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Rj6WRYh2NAKrrsW/5ki70/RayzjiACCNyfDalLAwfF0=; b=n2RbgLbSHIcppEULbBoZa9Et6N8FK86gMqePOKWsV7+KX8/YsCBtLxKUWk44A+V+JD uWrjAD/InM7VeMWukqbLnXiL/7fYN81BFQjSWRJiQKdG/4whvwT6UmnQbrEMLvZ1XHnQ LYit3/F/4ywAEbP26ZZliRt6SQPGveYoWbFpmX5qnPOoiNeNQswTXhIzgehdrYuV1R+r y5ewWzMPDeaAi+AuNdNl+BOhO+Uv4APg1Ioj0TnvEH07YFH1+Vu9ZqwLWWGpd+IR4bGr mRVzmRO5yR7/Ok8TnT0ee4z42Bu/2Id+RhCTGfSlJkjXjy6H3IaCayrwNPKWHsJzpwi0 5Rgw== X-Gm-Message-State: AOAM533LfhrnP9hQxrfgObDXAzNzE/Lh47CHxQBzW3dGdYcz+VCwcwo6 QorZFcgLkRdePsNJBHdUgCL3ULF+HVyCCOvCMZbHAw== X-Google-Smtp-Source: ABdhPJywPKjJzUSFfYCgX2MFHcUXeN6dr16UwQ1EagdVwLG9fJmHZSDX5Gftx2s3q5t7XWKipNBvsCRCzXZ1EiumsIU= X-Received: by 2002:aca:58d6:: with SMTP id m205mr17059oib.121.1610555142511; Wed, 13 Jan 2021 08:25:42 -0800 (PST) MIME-Version: 1.0 References: <0afed913e43017575794de0777b15ef6b2bdd486.1610554432.git.andreyknvl@google.com> In-Reply-To: <0afed913e43017575794de0777b15ef6b2bdd486.1610554432.git.andreyknvl@google.com> From: Marco Elver Date: Wed, 13 Jan 2021 17:25:30 +0100 Message-ID: Subject: Re: [PATCH v2 04/14] kasan: add macros to simplify checking test constraints To: Andrey Konovalov Cc: Catalin Marinas , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Andrew Morton , Will Deacon , Andrey Ryabinin , Peter Collingbourne , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev , Linux ARM , Linux Memory Management List , LKML Content-Type: text/plain; charset="UTF-8" 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 Wed, 13 Jan 2021 at 17:21, Andrey Konovalov wrote: > > Some KASAN tests require specific kernel configs to be enabled. > Instead of copy-pasting the checks for these configs add a few helper > macros and use them. > > Link: https://linux-review.googlesource.com/id/I237484a7fddfedf4a4aae9cc61ecbcdbe85a0a63 > Suggested-by: Alexander Potapenko > Signed-off-by: Andrey Konovalov Nice! Reviewed-by: Marco Elver > --- > lib/test_kasan.c | 101 +++++++++++++++-------------------------------- > 1 file changed, 31 insertions(+), 70 deletions(-) > > diff --git a/lib/test_kasan.c b/lib/test_kasan.c > index 6f46e27c2af7..714ea27fcc3e 100644 > --- a/lib/test_kasan.c > +++ b/lib/test_kasan.c > @@ -73,6 +73,20 @@ static void kasan_test_exit(struct kunit *test) > fail_data.report_found); \ > } while (0) > > +#define KASAN_TEST_NEEDS_CONFIG_ON(test, config) do { \ > + if (!IS_ENABLED(config)) { \ > + kunit_info((test), "skipping, " #config " required"); \ > + return; \ > + } \ > +} while (0) > + > +#define KASAN_TEST_NEEDS_CONFIG_OFF(test, config) do { \ > + if (IS_ENABLED(config)) { \ > + kunit_info((test), "skipping, " #config " enabled"); \ > + return; \ > + } \ > +} while (0) > + > static void kmalloc_oob_right(struct kunit *test) > { > char *ptr; > @@ -114,10 +128,7 @@ static void kmalloc_pagealloc_oob_right(struct kunit *test) > char *ptr; > size_t size = KMALLOC_MAX_CACHE_SIZE + 10; > > - if (!IS_ENABLED(CONFIG_SLUB)) { > - kunit_info(test, "CONFIG_SLUB is not enabled."); > - return; > - } > + KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_SLUB); > > /* > * Allocate a chunk that does not fit into a SLUB cache to trigger > @@ -135,10 +146,7 @@ static void kmalloc_pagealloc_uaf(struct kunit *test) > char *ptr; > size_t size = KMALLOC_MAX_CACHE_SIZE + 10; > > - if (!IS_ENABLED(CONFIG_SLUB)) { > - kunit_info(test, "CONFIG_SLUB is not enabled."); > - return; > - } > + KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_SLUB); > > ptr = kmalloc(size, GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); > @@ -152,10 +160,7 @@ static void kmalloc_pagealloc_invalid_free(struct kunit *test) > char *ptr; > size_t size = KMALLOC_MAX_CACHE_SIZE + 10; > > - if (!IS_ENABLED(CONFIG_SLUB)) { > - kunit_info(test, "CONFIG_SLUB is not enabled."); > - return; > - } > + KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_SLUB); > > ptr = kmalloc(size, GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); > @@ -218,10 +223,7 @@ static void kmalloc_oob_16(struct kunit *test) > } *ptr1, *ptr2; > > /* This test is specifically crafted for the generic mode. */ > - if (!IS_ENABLED(CONFIG_KASAN_GENERIC)) { > - kunit_info(test, "CONFIG_KASAN_GENERIC required\n"); > - return; > - } > + KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_KASAN_GENERIC); > > ptr1 = kmalloc(sizeof(*ptr1) - 3, GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr1); > @@ -454,10 +456,7 @@ static void kasan_global_oob(struct kunit *test) > char *p = &global_array[ARRAY_SIZE(global_array) + i]; > > /* Only generic mode instruments globals. */ > - if (!IS_ENABLED(CONFIG_KASAN_GENERIC)) { > - kunit_info(test, "CONFIG_KASAN_GENERIC required"); > - return; > - } > + KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_KASAN_GENERIC); > > KUNIT_EXPECT_KASAN_FAIL(test, *(volatile char *)p); > } > @@ -486,10 +485,7 @@ static void kasan_stack_oob(struct kunit *test) > volatile int i = OOB_TAG_OFF; > char *p = &stack_array[ARRAY_SIZE(stack_array) + i]; > > - if (!IS_ENABLED(CONFIG_KASAN_STACK)) { > - kunit_info(test, "CONFIG_KASAN_STACK is not enabled"); > - return; > - } > + KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_KASAN_STACK); > > KUNIT_EXPECT_KASAN_FAIL(test, *(volatile char *)p); > } > @@ -501,15 +497,8 @@ static void kasan_alloca_oob_left(struct kunit *test) > char *p = alloca_array - 1; > > /* Only generic mode instruments dynamic allocas. */ > - if (!IS_ENABLED(CONFIG_KASAN_GENERIC)) { > - kunit_info(test, "CONFIG_KASAN_GENERIC required"); > - return; > - } > - > - if (!IS_ENABLED(CONFIG_KASAN_STACK)) { > - kunit_info(test, "CONFIG_KASAN_STACK is not enabled"); > - return; > - } > + KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_KASAN_GENERIC); > + KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_KASAN_STACK); > > KUNIT_EXPECT_KASAN_FAIL(test, *(volatile char *)p); > } > @@ -521,15 +510,8 @@ static void kasan_alloca_oob_right(struct kunit *test) > char *p = alloca_array + i; > > /* Only generic mode instruments dynamic allocas. */ > - if (!IS_ENABLED(CONFIG_KASAN_GENERIC)) { > - kunit_info(test, "CONFIG_KASAN_GENERIC required"); > - return; > - } > - > - if (!IS_ENABLED(CONFIG_KASAN_STACK)) { > - kunit_info(test, "CONFIG_KASAN_STACK is not enabled"); > - return; > - } > + KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_KASAN_GENERIC); > + KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_KASAN_STACK); > > KUNIT_EXPECT_KASAN_FAIL(test, *(volatile char *)p); > } > @@ -593,11 +575,7 @@ static void kasan_memchr(struct kunit *test) > * str* functions are not instrumented with CONFIG_AMD_MEM_ENCRYPT. > * See https://bugzilla.kernel.org/show_bug.cgi?id=206337 for details. > */ > - if (IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT)) { > - kunit_info(test, > - "str* functions are not instrumented with CONFIG_AMD_MEM_ENCRYPT"); > - return; > - } > + KASAN_TEST_NEEDS_CONFIG_OFF(test, CONFIG_AMD_MEM_ENCRYPT); > > if (OOB_TAG_OFF) > size = round_up(size, OOB_TAG_OFF); > @@ -621,11 +599,7 @@ static void kasan_memcmp(struct kunit *test) > * str* functions are not instrumented with CONFIG_AMD_MEM_ENCRYPT. > * See https://bugzilla.kernel.org/show_bug.cgi?id=206337 for details. > */ > - if (IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT)) { > - kunit_info(test, > - "str* functions are not instrumented with CONFIG_AMD_MEM_ENCRYPT"); > - return; > - } > + KASAN_TEST_NEEDS_CONFIG_OFF(test, CONFIG_AMD_MEM_ENCRYPT); > > if (OOB_TAG_OFF) > size = round_up(size, OOB_TAG_OFF); > @@ -648,11 +622,7 @@ static void kasan_strings(struct kunit *test) > * str* functions are not instrumented with CONFIG_AMD_MEM_ENCRYPT. > * See https://bugzilla.kernel.org/show_bug.cgi?id=206337 for details. > */ > - if (IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT)) { > - kunit_info(test, > - "str* functions are not instrumented with CONFIG_AMD_MEM_ENCRYPT"); > - return; > - } > + KASAN_TEST_NEEDS_CONFIG_OFF(test, CONFIG_AMD_MEM_ENCRYPT); > > ptr = kmalloc(size, GFP_KERNEL | __GFP_ZERO); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); > @@ -713,10 +683,7 @@ static void kasan_bitops_generic(struct kunit *test) > long *bits; > > /* This test is specifically crafted for the generic mode. */ > - if (!IS_ENABLED(CONFIG_KASAN_GENERIC)) { > - kunit_info(test, "CONFIG_KASAN_GENERIC required\n"); > - return; > - } > + KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_KASAN_GENERIC); > > /* > * Allocate 1 more byte, which causes kzalloc to round up to 16 bytes; > @@ -744,11 +711,8 @@ static void kasan_bitops_tags(struct kunit *test) > { > long *bits; > > - /* This test is specifically crafted for the tag-based mode. */ > - if (IS_ENABLED(CONFIG_KASAN_GENERIC)) { > - kunit_info(test, "CONFIG_KASAN_SW_TAGS required\n"); > - return; > - } > + /* This test is specifically crafted for tag-based modes. */ > + KASAN_TEST_NEEDS_CONFIG_OFF(test, CONFIG_KASAN_GENERIC); > > /* Allocation size will be rounded to up granule size, which is 16. */ > bits = kzalloc(sizeof(*bits), GFP_KERNEL); > @@ -777,10 +741,7 @@ static void vmalloc_oob(struct kunit *test) > { > void *area; > > - if (!IS_ENABLED(CONFIG_KASAN_VMALLOC)) { > - kunit_info(test, "CONFIG_KASAN_VMALLOC is not enabled."); > - return; > - } > + KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_KASAN_VMALLOC); > > /* > * We have to be careful not to hit the guard page. > -- > 2.30.0.284.gd98b1dd5eaa7-goog >