From patchwork Mon Nov 6 17:23:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 162092 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2810647vqu; Mon, 6 Nov 2023 09:23:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IGQdw/oQcLIlgcWaPLIodP3YQeuSif5rsXSM0O/FfgPN+UIJ0j9taMWVydpim4W/vDEU04x X-Received: by 2002:a05:6a21:18a:b0:181:74fe:ba83 with SMTP id le10-20020a056a21018a00b0018174feba83mr14435288pzb.40.1699291424652; Mon, 06 Nov 2023 09:23:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699291424; cv=none; d=google.com; s=arc-20160816; b=qJRY4jOtAdALM8jUwpUPNCWTIjoa7m2zneym7ZkhqcesDauu+e/A12ChXzI5zzLmyu 1JLPtvXz/Z4m9xX58n86tOvzfTwwPOLSMvBPoHALseXmQcz77BFHXzXhzLgdViUZmZKG nmpV1NtuwwLNHG9ssO/ogmmS2IiofWT4Op2z1zDK1SH8u3VZ5NDyV0tnMPf0Pxre5BoA fvgtS5z8UqnJwTC5IfnhyZhynfH3UwHE+E6Qs6eIP8CMBkedB6QtqHetiD2+WFY+jscM YWaxwHaitVh3RVlsiKYblLbHXgkIaI3NtVIxpkbvjhTjyXsIi0FGyMBufDNKOclcB4Fw Y9+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=WcST5ABue6IsnqHZV3oTaKyNlMPnd8YrlPpC3JsEA1s=; fh=E36W0jRcn4Xv/TvoRfuyZ2higkySCLB3RjP8MwuYhCQ=; b=KuyWaj0FA5vRfYgIzXIXiN6hVqIDowmoBvqfOfRExab9ITZsMQkkCA/6aqEnU7ap3Y Z6cpRq0v+XmBHRv1bpaMnS3Au3g2uQNOtwI4jwhVmH2915A0cxFElulMZh4TxMVESDPr ibbpLGGcd6dObktxwY8WqaTtk/FNJ2SbTeYKa+TA0aFSsdph3RedsH2QMOpPK0g+W66b TQW2BpgywWZfmqxDeF01X1dLL+d05wdAHQSItV7xJDIhjlNcHNSoo0UaaMGBr71dGX7f 89McjLNDJkYtXlm9sgHtCNSrKULsjl03M0yV1yZAaCg7o9cq2nnAm90V3QwnQPcHvEdq Modg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=KEWXL5rB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id x64-20020a638643000000b0059f0cebd04csi89802pgd.722.2023.11.06.09.23.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 09:23:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=KEWXL5rB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id CEE0880A97EA; Mon, 6 Nov 2023 09:23:41 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231755AbjKFRX2 (ORCPT + 34 others); Mon, 6 Nov 2023 12:23:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231792AbjKFRX0 (ORCPT ); Mon, 6 Nov 2023 12:23:26 -0500 Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4499B1BC; Mon, 6 Nov 2023 09:23:24 -0800 (PST) Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 3A66MObl024065; Mon, 6 Nov 2023 11:23:11 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=PODMain02222019; bh=W cST5ABue6IsnqHZV3oTaKyNlMPnd8YrlPpC3JsEA1s=; b=KEWXL5rB8paIdH0ZS DZ5Lyzib0CYWXRoPpmNZNLb4QDnFAxWnuazPLAJj3s0KTPmpPn+w+nos/ZistGok MsukjY4AY3Ro/DbilqhHKFaFXgMwWv/P0Y48tuVWMTNKRfYOjapfgcjSQ+N+y4xP Y0kf2se5hnDKqaCQYHAM+WN2wcAiKlYMoNcweDZ4wft9ggQ6DNxfmw/YJWpHbYWc jalI46zt0YrZhFsPylyEA+bJdkjglZ/kqWdvTHPhBL4W9IHDnrzDJDYoPnwgMnvV V+WEPAtu4a9bm4OxnpRE2+R+K/d+yqhr1HhduOv2RMAMGNVms6uP5KW5rQ1WHM6E ODvxw== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3u5kbwt5mx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 06 Nov 2023 11:23:10 -0600 (CST) Received: from ediex01.ad.cirrus.com (198.61.84.80) by ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Mon, 6 Nov 2023 17:23:08 +0000 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.2.1118.39 via Frontend Transport; Mon, 6 Nov 2023 17:23:08 +0000 Received: from EDIN4L06LR3.ad.cirrus.com (EDIN4L06LR3.ad.cirrus.com [198.61.64.48]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 3687AB38; Mon, 6 Nov 2023 17:23:08 +0000 (UTC) From: Richard Fitzgerald To: , , CC: , , , , "Richard Fitzgerald" , kernel test robot Subject: [PATCH] kunit: test: Avoid cast warning in when adding kfree() as an action Date: Mon, 6 Nov 2023 17:23:05 +0000 Message-ID: <20231106172305.2857-1-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Proofpoint-GUID: yvGy7mG34ISBVZzVv2LSMVLJ5iUL6rb6 X-Proofpoint-ORIG-GUID: yvGy7mG34ISBVZzVv2LSMVLJ5iUL6rb6 X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 06 Nov 2023 09:23:41 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781836204845253488 X-GMAIL-MSGID: 1781836204845253488 In kunit_log_test() pass the kfree_wrapper() function to kunit_add_action() instead of directly passing kfree(). This prevents a cast warning: lib/kunit/kunit-test.c:565:25: warning: cast from 'void (*)(const void *)' to 'kunit_action_t *' (aka 'void (*)(void *)') converts to incompatible function type [-Wcast-function-type-strict] 564 full_log = string_stream_get_string(test->log); > 565 kunit_add_action(test, (kunit_action_t *)kfree, full_log); Signed-off-by: Richard Fitzgerald Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202311070041.kWVYx7YP-lkp@intel.com/ Fixes: 05e2006ce493 ("kunit: Use string_stream for test log") --- lib/kunit/kunit-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/kunit/kunit-test.c b/lib/kunit/kunit-test.c index 99d2a3a528e1..de2113a58fa0 100644 --- a/lib/kunit/kunit-test.c +++ b/lib/kunit/kunit-test.c @@ -562,7 +562,7 @@ static void kunit_log_test(struct kunit *test) KUNIT_EXPECT_TRUE(test, test->log->append_newlines); full_log = string_stream_get_string(test->log); - kunit_add_action(test, (kunit_action_t *)kfree, full_log); + kunit_add_action(test, kfree_wrapper, full_log); KUNIT_EXPECT_NOT_ERR_OR_NULL(test, strstr(full_log, "put this in log.")); KUNIT_EXPECT_NOT_ERR_OR_NULL(test,