Received: by 2002:a05:7412:6592:b0:d7:7d3a:4fe2 with SMTP id m18csp1392931rdg; Fri, 11 Aug 2023 22:38:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFlZ1A3KhhH0PRPngky6udoi8H9Tc+JvzV4InUzCPHrpnGIrK3WbdBVoZOrQe3AZvZ+oNq5 X-Received: by 2002:a05:6830:160f:b0:6bc:f854:4850 with SMTP id g15-20020a056830160f00b006bcf8544850mr4669013otr.4.1691818679821; Fri, 11 Aug 2023 22:37:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691818679; cv=none; d=google.com; s=arc-20160816; b=cVn/zRGpGbnurnr+ivV7cPqROzHkqIXPCMOZUID06/YADQgohXT60N993ePPf9T/Il u1C7jsQ9mJsDQO9uztocXYbM8iwhFEF2DFC8EeOHOsiyUgkIwfonuOKkDsGazfoXXxF3 U2QvH1EFK9/MDeWnSp+beZgF0n8/EPYEFYeQnWm06TZGMe7bq4Kw+48LwiQsUTOMHbxU tgU6Ct7siyz1Dik/uMw7Ez1QJcUc8tegX6VAk2K7GYbjzvYws/dBmf01qd6YYfZw8eVE ORKueyuerM/ubjZyxN1aF69IuPepP2QwnR7LjGOyD6uUx2EUNNZGD6EzsZkQH6cQKgz8 JUJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :mime-version:user-agent:date:message-id:from:references:to:subject; bh=+zhdzX0jlr0IXiIOfOzFLxtSPZFTXIeqUtOnbEriQo4=; fh=GbgBGZXCG/nGvg8WyX/H7J2VVIX6PJT5qT5wAuY5rG0=; b=h1IGv1dEqt8iocEL9HSPkdK5nQ6JQtSq/OoYSAxP4QygyZdB7m91j3W3oTJTS4ogK1 GW6nN4LU/J2ocgvumW6OIThdvpNy0EOpyzVdGZVwTa4rbLKP1e2T6rJGlbf4GdOSbrCO 49jVGDtI1SN3OXylgFvE8AYRuLmzwF7KrdfdjiiaVlbtlVXs5MS6/fosQdegza9NZvQ2 xh+GtbTwZtXcGQq48m/grSbQOKKzDonmEZdSTvFoW2+JsWZ/Rt/lIGPF6Rgt5k3qErSr wj+NDejrluCJSrgC0akJ9D9q81qZ8FL0ojVdDFk568ZjYiY+RNZlTOJgNRbKTli9ySVk nILg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f6-20020a056a001ac600b006870878c6dbsi4371959pfv.191.2023.08.11.22.37.48; Fri, 11 Aug 2023 22:37:59 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234007AbjHLDzJ (ORCPT + 99 others); Fri, 11 Aug 2023 23:55:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229475AbjHLDzI (ORCPT ); Fri, 11 Aug 2023 23:55:08 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAAEF30D2; Fri, 11 Aug 2023 20:55:06 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RN6Hm6gm1z4f3m6S; Sat, 12 Aug 2023 11:55:00 +0800 (CST) Received: from [10.174.178.129] (unknown [10.174.178.129]) by APP1 (Coremail) with SMTP id cCh0CgAHNTGUAtdkCZvtAQ--.44296S2; Sat, 12 Aug 2023 11:55:02 +0800 (CST) Subject: Re: [PATCH] kunit: replace KUNIT_TRIGGER_STATIC_STUB maro with KUNIT_STATIC_STUB_REDIRECT To: brendan.higgins@linux.dev, davidgow@google.com, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org References: <20230725172051.2142641-1-shikemeng@huaweicloud.com> From: Kemeng Shi Message-ID: Date: Sat, 12 Aug 2023 11:55:00 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.0 MIME-Version: 1.0 In-Reply-To: <20230725172051.2142641-1-shikemeng@huaweicloud.com> Content-Type: text/plain; charset=gbk Content-Transfer-Encoding: 7bit X-CM-TRANSID: cCh0CgAHNTGUAtdkCZvtAQ--.44296S2 X-Coremail-Antispam: 1UD129KBjvJXoW7Kr45AF4rJrWxGryUGr45ZFb_yoW8Zw13pa 93CFykZr1UJFs2kFyxZFWvqr4akw4xJrWjkr43Ww4fZFW8Xrs7Ga1DKw4rKw4UG3ykXa98 Z3sIyFy5Ka1DArJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyEb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4 vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7Cj xVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x 0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG 6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFV Cjc4AY6r1j6r4UM4x0Y48IcVAKI48JMxk0xIA0c2IEe2xFo4CEbIxvr21l42xK82IYc2Ij 64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x 8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE 2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42 xK8VAvwI8IcIk0rVWrZr1j6s0DMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIE c7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU1CPfJUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,KHOP_HELO_FCRDNS, MAY_BE_FORGED,NICE_REPLY_A,SPF_HELO_NONE,SPF_NONE autolearn=ham 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 Friendly ping... on 7/26/2023 1:20 AM, Kemeng Shi wrote: > We mix up KUNIT_TRIGGER_STATIC_STUB and KUNIT_STATIC_STUB_REDIRECT in > static_stub header. Just correct KUNIT_TRIGGER_STATIC_STUB to > KUNIT_STATIC_STUB_REDIRECT which is documented. > > Signed-off-by: Kemeng Shi > --- > include/kunit/static_stub.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/kunit/static_stub.h b/include/kunit/static_stub.h > index 9b80150a5d62..85315c80b303 100644 > --- a/include/kunit/static_stub.h > +++ b/include/kunit/static_stub.h > @@ -11,7 +11,7 @@ > #if !IS_ENABLED(CONFIG_KUNIT) > > /* If CONFIG_KUNIT is not enabled, these stubs quietly disappear. */ > -#define KUNIT_TRIGGER_STATIC_STUB(real_fn_name, args...) do {} while (0) > +#define KUNIT_STATIC_STUB_REDIRECT(real_fn_name, args...) do {} while (0) > > #else > > @@ -30,7 +30,7 @@ > * This is a function prologue which is used to allow calls to the current > * function to be redirected by a KUnit test. KUnit tests can call > * kunit_activate_static_stub() to pass a replacement function in. The > - * replacement function will be called by KUNIT_TRIGGER_STATIC_STUB(), which > + * replacement function will be called by KUNIT_STATIC_STUB_REDIRECT(), which > * will then return from the function. If the caller is not in a KUnit context, > * the function will continue execution as normal. > * > @@ -87,7 +87,7 @@ void __kunit_activate_static_stub(struct kunit *test, > * When activated, calls to real_fn_addr from within this test (even if called > * indirectly) will instead call replacement_addr. The function pointed to by > * real_fn_addr must begin with the static stub prologue in > - * KUNIT_TRIGGER_STATIC_STUB() for this to work. real_fn_addr and > + * KUNIT_STATIC_STUB_REDIRECT() for this to work. real_fn_addr and > * replacement_addr must have the same type. > * > * The redirection can be disabled again with kunit_deactivate_static_stub(). >