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, 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 11066C433EF for ; Thu, 23 Sep 2021 17:39:34 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 920376121F for ; Thu, 23 Sep 2021 17:39:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 920376121F Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 11895900002; Thu, 23 Sep 2021 13:39:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C8A66B0071; Thu, 23 Sep 2021 13:39:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EF9EB900002; Thu, 23 Sep 2021 13:39:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0125.hostedemail.com [216.40.44.125]) by kanga.kvack.org (Postfix) with ESMTP id E15D46B006C for ; Thu, 23 Sep 2021 13:39:32 -0400 (EDT) Received: from smtpin35.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id A382F3014E for ; Thu, 23 Sep 2021 17:39:32 +0000 (UTC) X-FDA: 78619550184.35.FB56E0F Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by imf16.hostedemail.com (Postfix) with ESMTP id 56496F000095 for ; Thu, 23 Sep 2021 17:39:32 +0000 (UTC) Received: by mail-qk1-f178.google.com with SMTP id t4so24564112qkb.9 for ; Thu, 23 Sep 2021 10:39:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=8tzYzW9ssEz6BTq7KxGd6zNB6scfISySpG7l9Pl80cU=; b=H75LXkHaUwwAm4BSpDy5AnWV+XSOZDev7FrpykS/giXYt858AYzZMFCD3sSFA3XTgW IoLkAdCptqfhxxVmm307Jxfj+YONQVCV+SOmKeBbR3iazzdB24BHc+osZoc9XDQ4RDeo mylQXDgC/2mJ87MbzTLjI7+q/0K5PYy3/ZDV1QKj8XXv348jKubbFl747ZT7fBY9TiRV SL4OHhMJMuNNSxmUqv793WSjNyf52APfmx6XEc4KaLP8ebD08k+kn1EUy4Q3GphQL2AA E4dyYL7+zcabtSFOErnxOrGsLuxAtEN5FZHjIEChPTuLB9yG7/oYm0nmQmBvzQ19lBu6 1ZfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=8tzYzW9ssEz6BTq7KxGd6zNB6scfISySpG7l9Pl80cU=; b=YPL1gIiFB5uIArwlrc7IpfL/7Px2XSIJ+CCHGGMOrsvl+Nr7kvTCGv4K3oVIfmYUgz pU37yHcVkYJHxdw969d51FBHnY/wKVC6Q1i4eVWmL2I5mm2aSQ2hFpdAUIkBjfilH4fL xNAQBes2cAO/HBVZayu7aBfq/K0LClMb3NrlKdWxgCseThXLITuRNNw/Mz6FzELUTSUe bcgMtbCkGSK2HJr5r3Yli7xBBN4GOUYu/NMLxI9MtwOkWy6UT+01Rwx6B5eChdHn+wi6 vFkz3BXr8EJ/srl2l+WWABT7naCkFXhi48qgkg0rEPtq1dHo5lokuPUZRhZR0N0SmMYP PHNg== X-Gm-Message-State: AOAM530m1bRA7SU5d6LCB1zuYvBU6AT2Li5EH29btMuo7/tAonhBD0nT +Xx37TrOqNmKeKgr0eTw/SdEWen5P5RoirOKBXLwyQ== X-Google-Smtp-Source: ABdhPJxMiGRNL56xDmo++U1oL8Ec3RGjkClfKTvyu24aijyR99utYnUTBPMTCoyY+GtGCMls81F+wxB5dZSTid4QofI= X-Received: by 2002:a37:a90d:: with SMTP id s13mr6209571qke.115.1632418771499; Thu, 23 Sep 2021 10:39:31 -0700 (PDT) MIME-Version: 1.0 References: <20210922182541.1372400-1-elver@google.com> In-Reply-To: <20210922182541.1372400-1-elver@google.com> From: David Gow Date: Fri, 24 Sep 2021 01:39:19 +0800 Message-ID: Subject: Re: [PATCH] kfence: test: use kunit_skip() to skip tests To: Marco Elver Cc: Andrew Morton , Alexander Potapenko , Dmitry Vyukov , Aleksandr Nogikh , Taras Madan , Linux Kernel Mailing List , Linux Memory Management List , kasan-dev Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 56496F000095 X-Stat-Signature: h8b13ti9y3idm363nhffak6gci7c8bof Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=H75LXkHa; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf16.hostedemail.com: domain of davidgow@google.com designates 209.85.222.178 as permitted sender) smtp.mailfrom=davidgow@google.com X-HE-Tag: 1632418772-42041 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 Thu, Sep 23, 2021 at 2:26 AM Marco Elver wrote: > > Use the new kunit_skip() to skip tests if requirements were not met. It > makes it easier to see in KUnit's summary if there were skipped tests. > > Signed-off-by: Marco Elver > --- Thanks: I'm glad these features are proving useful. I've tested these under qemu, and it works pretty well. Certainly from the KUnit point of view, this is: Reviewed-by: David Gow (A couple of unrelated complaints about the kfence tests are that TRACEPOINTS isn't selected by default, and that the manual registering/unregistering of the tracepoints does break some of the kunit tooling when several tests are built-in. That's something that exists independently of this patch, though, and possibly requires some KUnit changes to be fixed cleanly (kfence isn't the only thing to do this). So not something to hold up this patch.) Cheers, -- David > mm/kfence/kfence_test.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/mm/kfence/kfence_test.c b/mm/kfence/kfence_test.c > index f1690cf54199..695030c1fff8 100644 > --- a/mm/kfence/kfence_test.c > +++ b/mm/kfence/kfence_test.c > @@ -32,6 +32,11 @@ > #define arch_kfence_test_address(addr) (addr) > #endif > > +#define KFENCE_TEST_REQUIRES(test, cond) do { \ > + if (!(cond)) \ > + kunit_skip((test), "Test requires: " #cond); \ > +} while (0) > + > /* Report as observed from console. */ > static struct { > spinlock_t lock; > @@ -555,8 +560,7 @@ static void test_init_on_free(struct kunit *test) > }; > int i; > > - if (!IS_ENABLED(CONFIG_INIT_ON_FREE_DEFAULT_ON)) > - return; > + KFENCE_TEST_REQUIRES(test, IS_ENABLED(CONFIG_INIT_ON_FREE_DEFAULT_ON)); > /* Assume it hasn't been disabled on command line. */ > > setup_test_cache(test, size, 0, NULL); > @@ -603,10 +607,8 @@ static void test_gfpzero(struct kunit *test) > char *buf1, *buf2; > int i; > > - if (CONFIG_KFENCE_SAMPLE_INTERVAL > 100) { > - kunit_warn(test, "skipping ... would take too long\n"); > - return; > - } > + /* Skip if we think it'd take too long. */ > + KFENCE_TEST_REQUIRES(test, CONFIG_KFENCE_SAMPLE_INTERVAL <= 100); > > setup_test_cache(test, size, 0, NULL); > buf1 = test_alloc(test, size, GFP_KERNEL, ALLOCATE_ANY); > -- > 2.33.0.464.g1972c5931b-goog >