From patchwork Fri Oct 21 07:28:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gow X-Patchwork-Id: 6545 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp546502wrr; Fri, 21 Oct 2022 00:40:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6ubVmkIHRIgPjGz53/f4JnBU1A8ArHYd7AwocM1ZHg2qVt3DKCQvMCfKEcA2VsZ08N9opp X-Received: by 2002:a17:902:c405:b0:181:83e4:490e with SMTP id k5-20020a170902c40500b0018183e4490emr17650556plk.4.1666338005189; Fri, 21 Oct 2022 00:40:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666338005; cv=none; d=google.com; s=arc-20160816; b=AUBBm8vNFHPXIDWO/TiVH5XA/sRJJJyCdfSy+h8eRCxv9MgmBEnGTAXNfL2vDxs/rc Zx8Ahi4VycAcYJ9EilN6paB15XitDyZSo9ksS99a9Ri1OCyO7KL4PkYvi1sgVvefymHD cdWFxqtoFiGLK0Q3+LBDhoVR551Hunc9BlppPJFJLfdXxcA4eWCcBNYTDTbza6o38QMn YsQ5O1+Yg3haJalAlCcgL4L7QWHTGyX95eSaNqXe4WX15eVqUC5QyXLibc4azCnYX7e7 oFZ3LqxRRJxFnH6F91J+Ch3TLzETpaZ0gh9WSO9GQ2jzBPA2me4iY0Wxc8Boor15h61d Pv7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=4Ukwd+W4yUObSSiJHNA3xBbGR2xkY62jRsxgv2DCjeM=; b=cb8H3xzJHu/CZ4pv6LuNqCCQh/ARhfNdD9OZ51xqzMzxgbNPyODOgYkKOv1Np7df84 N80fgV8+0MlkKH/jJe9hjp+l9vIkAoeuUSH0F5Lm5ny3WzxHvBT/rtIP8W+SDJEhmrwh t4T6auWpJyJujvEBuEgceMJUhhi3MuhYO2n25m7vGkMyM1Bvippr6h+/CZhys5d6nOkI cKdLoiZvs5vUi1sgQOJO8hnVuX/ST3rMlSSwuJpy4W1FL0rbhxWfASmvvGTa9EcFVyDc xljkXOHW41Yx0WPard7PHQAsg2ENefq1MPzeMfiT+YF8PHga7kYiJTnkQoLiBi+HcfuQ yqUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=DDR1FZmX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f20-20020a056a0022d400b0052f60f7e0bcsi27105980pfj.346.2022.10.21.00.39.52; Fri, 21 Oct 2022 00:40:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=DDR1FZmX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229864AbiJUHbd (ORCPT + 99 others); Fri, 21 Oct 2022 03:31:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230152AbiJUHbW (ORCPT ); Fri, 21 Oct 2022 03:31:22 -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 4C91D2475FD for ; Fri, 21 Oct 2022 00:31:15 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id m66-20020a257145000000b006c23949ec98so2375309ybc.4 for ; Fri, 21 Oct 2022 00:31:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=4Ukwd+W4yUObSSiJHNA3xBbGR2xkY62jRsxgv2DCjeM=; b=DDR1FZmXOPfNnIahF64Yl1WnL3w1ledFOway/UOkPmf59UO0S5M9JKyLb7LqsKBBpd SwCMN0yvBUeC/7w6TJ/3PGjpiP95babhe9PQdsYTzelfzTyOU7DqeUaiETnnKY4BmoOL w1/dLB+J3w06ZKSH6j+WQOc0tqOZVs/2oOSujKZManwU/mRZV7yVmh25nMuPRpQaajRx BjhLvJcwjN0tpVo/o6/yVDkW8ra/Bh1EoJPZsLTgtXWbUVLc4RD+8HlEe4wkDhP05eST 71o0FtYoGrDlSlJYzSlgdegNH1hj2tS69LxMbieFLlSq+l2LMQe9IPxh2VkXIIxTrwv7 KrUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=4Ukwd+W4yUObSSiJHNA3xBbGR2xkY62jRsxgv2DCjeM=; b=N1ELjc8vSZNEEm7MtdbJz7dhvMFl0/UCQTdaPeHVm0DybBc9CwRamomB295JGPoX/X AOYUkAQILI11cDQrcDCjuvG2MAYmSlYvMzIlm3bIecrxvDTxj3TEwIcdwHcqg4SIA0eL pFwPnlwpCNkADXhaGRVH4f/QhceDanVCftqC3nBKTW6zDkLpRFNuahHrXVEEE687Zw5M AAXRfy7vxo0l6Kv7t+YWYzGtVgI2tygnysn7PJY3bZKTOERro3tq0Kbc6DhsSWjnB/TX LaUXMtHvnvRjK/nwbcZcxnhLgssAWTK8pqW31totPpFGqtFPk2dI9N9GRSVoKseOUz36 yu5g== X-Gm-Message-State: ACrzQf3xgybxNnISf/sV5GR4Sixdj3gpqiIQmJeR5jN0S+LHtK+ahcfQ 4slrU4FuyzBuSj1wbZ6iENGXHtzhNKrHQw== X-Received: from slicestar.c.googlers.com ([fda3:e722:ac3:cc00:4f:4b78:c0a8:20a1]) (user=davidgow job=sendgmr) by 2002:a05:6902:1003:b0:6bf:3ae4:7d31 with SMTP id w3-20020a056902100300b006bf3ae47d31mr15179638ybt.48.1666337474473; Fri, 21 Oct 2022 00:31:14 -0700 (PDT) Date: Fri, 21 Oct 2022 15:28:55 +0800 In-Reply-To: <20221021072854.333010-1-davidgow@google.com> Mime-Version: 1.0 References: <20221021072854.333010-1-davidgow@google.com> X-Mailer: git-send-email 2.38.0.135.g90850a2211-goog Message-ID: <20221021072854.333010-2-davidgow@google.com> Subject: [PATCH 2/2] kunit: Use the static key in kunit_fail_current_test() From: David Gow To: Brendan Higgins , Daniel Latypov , Shuah Khan Cc: David Gow , kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Kees Cook X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747282039968871217?= X-GMAIL-MSGID: =?utf-8?q?1747282039968871217?= Speed up the case where kunit_fail_current_test() is called when no test is running. This should make it convenient for code to call this unconditionally in some error paths, without fear of causing a performance problem. If CONFIG_KUNIT=n, this compiles away to nothing. If CONFIG_KUNIT=y, it will compile down to a NOP (on most architectures) if no KUnit test is currently running. kunit_fail_current_test() does not work if KUnit itself is built as a module, though this is a pre-existing limitation. Note that the definition of kunit_fail_current_test() still wraps an empty, inline function if KUnit is not built-in. This is to ensure that the printf format string __attribute__ will still work. Signed-off-by: David Gow --- include/kunit/test-bug.h | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/include/kunit/test-bug.h b/include/kunit/test-bug.h index 5fc58081d511..ba9558a9f9c0 100644 --- a/include/kunit/test-bug.h +++ b/include/kunit/test-bug.h @@ -9,16 +9,29 @@ #ifndef _KUNIT_TEST_BUG_H #define _KUNIT_TEST_BUG_H -#define kunit_fail_current_test(fmt, ...) \ - __kunit_fail_current_test(__FILE__, __LINE__, fmt, ##__VA_ARGS__) - #if IS_BUILTIN(CONFIG_KUNIT) +#include /* For static branch */ + +/* Static key if KUnit is running any tests. */ +extern struct static_key_false kunit_running; + +#define kunit_fail_current_test(fmt, ...) do { \ + if (static_branch_unlikely(&kunit_running)) { \ + __kunit_fail_current_test(__FILE__, __LINE__, \ + fmt, ##__VA_ARGS__); \ + } while (0) + + extern __printf(3, 4) void __kunit_fail_current_test(const char *file, int line, const char *fmt, ...); #else +/* We define this with an empty helper function so format string warnings work */ +#define kunit_fail_current_test(fmt, ...) \ + __kunit_fail_current_test(__FILE__, __LINE__, fmt, ##__VA_ARGS__) + static inline __printf(3, 4) void __kunit_fail_current_test(const char *file, int line, const char *fmt, ...) {