From patchwork Mon Jul 24 16:28:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rae Moar X-Patchwork-Id: 13324985 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D00C9C0015E for ; Mon, 24 Jul 2023 16:31:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230352AbjGXQb0 (ORCPT ); Mon, 24 Jul 2023 12:31:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231428AbjGXQbG (ORCPT ); Mon, 24 Jul 2023 12:31:06 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B395F173B for ; Mon, 24 Jul 2023 09:30:52 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d064a458dd5so2177658276.1 for ; Mon, 24 Jul 2023 09:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690216252; x=1690821052; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=7sBUbFGOfkdg+y86JLV+b2jt4Ke/rKZsCCFE+qCNm2k=; b=6xd1vmR/+70epw4GOXC0q2IJen2E23Pe/K33kkUZ4Kgcdmx7E8BxZ2rJWPZjuh5R1s 1hAMMQ0ON/dM2E5QfRfwRJJhl4W3iwbcmFpn9AJtppBM6z9bmD1RA9kNEmxTQMeqvZ83 Ya+nCxljoREyNnvYskPglAvaqCtmEj+aK2EFEq10jIc+LJznANpmYg+Zg+VN+3wSTt8Q 4faK8G71HAHQ48TkmbpTwoeqaUtZouBWcredbS87BpeTVJYzBAR+MJQqHGaQXXCQGsAU lFzu8TkL+/2yZo9OWZBlHlKEYiJzVayajsbnqT55leYZIKDGgzwxIale37TKHRUDTNkY KnUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690216252; x=1690821052; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7sBUbFGOfkdg+y86JLV+b2jt4Ke/rKZsCCFE+qCNm2k=; b=D4TMV7Dg+GaFMPo8ljaiPIAX+khbMrkLSZ/d/1+MlyQjS/6SkLM6MuGuhgTs7ywCqS rBzXToGLr6qkFssT+qFDrxqSsjWcffX85IdCUFUPjtLFr4iB50zdgDlhMrfm+gWg83VP UM20xtrpQ3Be6NAUULtzz63zop0K11tXzdr7SJfRJ7b932jXXbI5b4byHZybPEfc9x6X TGHXMInoTY1mo+4/wTHbj+oDInovTV7EDqZEZ8fWuXIWcxMLOk2rQHTx3GpdA9/MC/T5 A/lr/01nW/ad0qrn67hV2mdgynpnl8jntJuSuApSgODrmjk5jD1tmSnJ3tgrYzre0+lv fFEw== X-Gm-Message-State: ABy/qLYgH4Y51e2gmGt4hY8A0SbOAmAX1hg0bFlnR4zAojWkiJtDjwNA S3G9r/ZxYb/yNjd9hj/tHBzrTfUbpA== X-Google-Smtp-Source: APBJJlFM3YGjVPZ0AjGp/9h8RQw0ogZlMbM6uvGlB6myyeAR/Nw9B3nJEiGptn+vPN4e9vjsWNJnRHlSHg== X-Received: from rmoar-specialist.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:45d3]) (user=rmoar job=sendgmr) by 2002:a25:6990:0:b0:d0b:5e2e:8d02 with SMTP id e138-20020a256990000000b00d0b5e2e8d02mr32398ybc.1.1690216251907; Mon, 24 Jul 2023 09:30:51 -0700 (PDT) Date: Mon, 24 Jul 2023 16:28:26 +0000 In-Reply-To: <20230724162834.1354164-1-rmoar@google.com> Mime-Version: 1.0 References: <20230724162834.1354164-1-rmoar@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230724162834.1354164-7-rmoar@google.com> Subject: [PATCH v2 6/9] kunit: memcpy: Mark tests as slow using test attributes From: Rae Moar To: shuah@kernel.org, davidgow@google.com, dlatypov@google.com, brendan.higgins@linux.dev Cc: linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, keescook@chromium.org, linux-hardening@vger.kernel.org, jstultz@google.com, tglx@linutronix.de, sboyd@kernel.org, Rae Moar Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org Mark slow memcpy KUnit tests using test attributes. Tests marked as slow are as follows: memcpy_large_test, memmove_test, memmove_large_test, and memmove_overlap_test. These tests were the slowest of the memcpy tests and relatively slower to most other KUnit tests. Most of these tests are already skipped when CONFIG_MEMCPY_SLOW_KUNIT_TEST is not enabled. These tests can now be filtered using the KUnit test attribute filtering feature. Example: --filter "speed>slow". This will run only the tests that have speeds faster than slow. The slow attribute will also be outputted in KTAP. Note: This patch is intended to replace the use of CONFIG_MEMCPY_SLOW_KUNIT_TEST and to potentially deprecate this feature. This patch does not remove the config option but does add a note to the config definition commenting on this future shift. Acked-by: Kees Cook Signed-off-by: Rae Moar Reviewed-by: David Gow --- Changes since v1: - No changes. Changes since RFC v2: - No changes. Changes since RFC v1: - Added note under CONFIG_MEMCPY_SLOW_KUNIT_TEST. lib/Kconfig.debug | 3 +++ lib/memcpy_kunit.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 550cb967b668..1b3894e861f2 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -2701,6 +2701,9 @@ config MEMCPY_SLOW_KUNIT_TEST and bit ranges. These can be very slow, so they are split out as a separate config, in case they need to be disabled. + Note this config option will be replaced by the use of KUnit test + attributes. + config IS_SIGNED_TYPE_KUNIT_TEST tristate "Test is_signed_type() macro" if !KUNIT_ALL_TESTS depends on KUNIT diff --git a/lib/memcpy_kunit.c b/lib/memcpy_kunit.c index 887926f04731..440aee705ccc 100644 --- a/lib/memcpy_kunit.c +++ b/lib/memcpy_kunit.c @@ -551,10 +551,10 @@ static void strtomem_test(struct kunit *test) static struct kunit_case memcpy_test_cases[] = { KUNIT_CASE(memset_test), KUNIT_CASE(memcpy_test), - KUNIT_CASE(memcpy_large_test), - KUNIT_CASE(memmove_test), - KUNIT_CASE(memmove_large_test), - KUNIT_CASE(memmove_overlap_test), + KUNIT_CASE_SLOW(memcpy_large_test), + KUNIT_CASE_SLOW(memmove_test), + KUNIT_CASE_SLOW(memmove_large_test), + KUNIT_CASE_SLOW(memmove_overlap_test), KUNIT_CASE(strtomem_test), {} };