From patchwork Thu Nov 23 10:45:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 168860 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp353668vqx; Thu, 23 Nov 2023 02:46:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IGolCDWxKs79+bky7w/HnJoPj0tDxMg89BlOQKRnvBP0b1tAxIbcR0BawNQdfecSZygrn3h X-Received: by 2002:a05:6a00:2450:b0:6be:1f19:e604 with SMTP id d16-20020a056a00245000b006be1f19e604mr6415179pfj.21.1700736385432; Thu, 23 Nov 2023 02:46:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700736385; cv=none; d=google.com; s=arc-20160816; b=Lz7lRpFZsSO5hEcXPHGjUUyt3ejlzMj97wnAfHWvM1r4XNvjkuNVzE8bYRGTA6r0p5 fL5k3OHjQf7O8brUWLjWZjalPkzVwUgtTjIsR7uW7wGOCQD/xzfCXGsGSnAAqTMCNwqi my1l39oQST8EHsOm//iZDRRNhELc5D7HJmeDqEhcWCJi+kbYDRFO9nyTaM3xhzMvp1se BLLek5okrWE7EAGAQrXfljo9jmh4xUj5lB/TCJDGUeHkIiH42WD/Jr0n62Qs1CAYpjgU EGCpKFgoRbgmkQy7AtYEW1kCJILoFolgm1UqAVd/rl39xoboS7psDz6u9I1SnPnn4vLw IYeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=EEOEwqzPMFgLH8090jvwTkFiMXDZbP/t7cilio45EME=; fh=xTLXRGx4c4TfWcKwHqVnB5TIoYG9Q9s1pGUshP+bk2Q=; b=MQU4f1LRCfb5KUjlAPLc1Jbdt1K5sJD28L0BbcrzAu5+NMcc/Y6x/cFH55KFz0NFzr vmTqjnQRm85Dpyuunk7xaNlQUsb9wUCbf0tD7IWbbt/8ow4xoHRKrhBifMdXiu6YYsfm uikG+vg41YTSICbh/CWe4fQCDPz6RQT85ywwYvEMEVAOfFJ9NrBdewgFAwxQv8ZnOKLl 6ZgbRUR2N2e/e91bKkbvkE4b8BEtFIIWUhbauqMk3BCs0/JDZM/fpbRLDOoyXvhRjR9f Iy2lnYvRQfjW/n3bAjtnpbWdS+Fu+onhBDB0nxEf71eRrWe7iZW0uo4m9YFUYDjMPrJw nMfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="eI/Xmvpd"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id g14-20020a63200e000000b005b92d41764dsi1065643pgg.794.2023.11.23.02.46.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 02:46:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="eI/Xmvpd"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id B764D8075DF3; Thu, 23 Nov 2023 02:46:16 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344782AbjKWKp7 (ORCPT + 99 others); Thu, 23 Nov 2023 05:45:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235173AbjKWKpz (ORCPT ); Thu, 23 Nov 2023 05:45:55 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 046C091 for ; Thu, 23 Nov 2023 02:46:02 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84F69C433CA; Thu, 23 Nov 2023 10:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700736361; bh=f9ztNUYk0shaQOX+D23ktWQugMWIRfK4+eA+oTSsXGU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eI/XmvpdUGIKVIljR1uNg7lSHWoUbl5bJR0mHGl4rwF1AP5ZXT1IiNHUrQ5IW3QQO JD0JkR5AwR+gsIoZqo58gzLzD82MCFCTGu9XAUYK6iEnW0QgMeiDc7YmcyTCkeWzE+ XsB8VL3APR8qtSykPR6QKQnGlbNzxnZYwYi97YnwFAgX80ujQYQXGMu3CvhmeiBAqC hlaNy295jJuYyaBKT96rRPtr74mpum6kebrElNJ9Qn0BKLLfyOUwLwnEgO3U0xaGo2 F6D9VUOnsiwh8gv0L1GH+PJa4dQvwsBLDrdarg7Q9KI4uecJS8vj6sOCPC4R26YnCI 8303Qcnf5UGGg== From: Mark Brown Date: Thu, 23 Nov 2023 10:45:47 +0000 Subject: [PATCH 1/3] kselftest/vDSO: Make test name reporting for vdso_abi_test tooling friendly MIME-Version: 1.0 Message-Id: <20231123-kselftest-vdso-test-name-v1-1-1b30441c422b@kernel.org> References: <20231123-kselftest-vdso-test-name-v1-0-1b30441c422b@kernel.org> In-Reply-To: <20231123-kselftest-vdso-test-name-v1-0-1b30441c422b@kernel.org> To: Shuah Khan Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-0438c X-Developer-Signature: v=1; a=openpgp-sha256; l=6296; i=broonie@kernel.org; h=from:subject:message-id; bh=f9ztNUYk0shaQOX+D23ktWQugMWIRfK4+eA+oTSsXGU=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBlXy1kG3DQ6TV+c1qw4FsNHIPg58Uw/Cx4iRvul tx/bsQhG5OJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZV8tZAAKCRAk1otyXVSH 0At/B/42TjILXbyY8E1rRvJ5D96OjQqagGrgBmJA7LhtJ3SEGmEyR7QdmSyMubkCEqOHisghGmX CPfEkzAyjE78nHVa94OpZ5x6MVgqQGorCGqvQOoGV8mms+Pat/7Kig44EVGQCv23M/ONtqba9ev sPA4OJkABYAtMHx0KuDgWPdAeUV6vWBYKbFF5Tn6lCvYAA4chN68yvqORYawLDfNk3q8AcIrbv/ a8P+2R9Ed4H6NzSnbumrHLA5UfRipRnF+gCz6LWWnHr7NUlSmVvmLlO+Q2+mnZXR0RGy4oyLfae apnrTghMtWRaNQlqGMEN47nAdAjf1OnlBnT6qCMUJCOCo1V+ X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-1.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 morse.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 (morse.vger.email [0.0.0.0]); Thu, 23 Nov 2023 02:46:16 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783351356013824326 X-GMAIL-MSGID: 1783351356013824326 The test results from vdso_abi_test are all formatted using a series of macros: #define VDSO_TEST_PASS_MSG() "\n%s(): PASS\n", __func__ #define VDSO_TEST_FAIL_MSG(x) "\n%s(): %s FAIL\n", __func__, x #define VDSO_TEST_SKIP_MSG(x) "\n%s(): SKIP: Could not find %s\n", __func__, x which don't play nicely with automated KTAP parsers since the actual KTAP lines are in the form ok 1 with no test name and we get an additional log line such as vdso_test_gettimeofday(): PASS with no preceeding # as KTAP requires. The lack of a test name means that many automation systems will have a hard time distinguishing between the different tests or correlating results between runs, the lack of # is less severe but could potentially cause confusion. Fix these issues by rewriting all the result reporting to include both the vDSO function name being tested and (where there is one) the name of the clock being tested in the main KTAP line. Since we have tests both with and without a specific clock we abandon the helper macros and just put the format strings used directly in the ksft_ API calls. When we fail to look up the relevant vDSO symbol we add a separate print statement explaining why the skip is being done. This gives output such as: ok 1 __vdso_gettimeofday # clock_id: CLOCK_REALTIME # The time is 1700673118.58091596 ok 2 __vdso_clock_gettime CLOCK_REALTIME which is much easier for test automation to work with. Signed-off-by: Mark Brown --- tools/testing/selftests/vDSO/vdso_test_abi.c | 66 +++++++++++++++------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/tools/testing/selftests/vDSO/vdso_test_abi.c b/tools/testing/selftests/vDSO/vdso_test_abi.c index 883ca85424bc..b304abae6e8f 100644 --- a/tools/testing/selftests/vDSO/vdso_test_abi.c +++ b/tools/testing/selftests/vDSO/vdso_test_abi.c @@ -33,9 +33,20 @@ typedef long (*vdso_clock_gettime_t)(clockid_t clk_id, struct timespec *ts); typedef long (*vdso_clock_getres_t)(clockid_t clk_id, struct timespec *ts); typedef time_t (*vdso_time_t)(time_t *t); -#define VDSO_TEST_PASS_MSG() "\n%s(): PASS\n", __func__ -#define VDSO_TEST_FAIL_MSG(x) "\n%s(): %s FAIL\n", __func__, x -#define VDSO_TEST_SKIP_MSG(x) "\n%s(): SKIP: Could not find %s\n", __func__, x +const char *vdso_clock_name[12] = { + "CLOCK_REALTIME", + "CLOCK_MONOTONIC", + "CLOCK_PROCESS_CPUTIME_ID", + "CLOCK_THREAD_CPUTIME_ID", + "CLOCK_MONOTONIC_RAW", + "CLOCK_REALTIME_COARSE", + "CLOCK_MONOTONIC_COARSE", + "CLOCK_BOOTTIME", + "CLOCK_REALTIME_ALARM", + "CLOCK_BOOTTIME_ALARM", + "CLOCK_SGI_CYCLE", + "CLOCK_TAI", +}; static void vdso_test_gettimeofday(void) { @@ -44,7 +55,8 @@ static void vdso_test_gettimeofday(void) (vdso_gettimeofday_t)vdso_sym(version, name[0]); if (!vdso_gettimeofday) { - ksft_test_result_skip(VDSO_TEST_SKIP_MSG(name[0])); + ksft_print_msg("Couldn't find %s\n", name[0]); + ksft_test_result_skip("%s\n", name[0]); return; } @@ -54,9 +66,9 @@ static void vdso_test_gettimeofday(void) if (ret == 0) { ksft_print_msg("The time is %lld.%06lld\n", (long long)tv.tv_sec, (long long)tv.tv_usec); - ksft_test_result_pass(VDSO_TEST_PASS_MSG()); + ksft_test_result_pass("%s\n", name[0]); } else { - ksft_test_result_fail(VDSO_TEST_FAIL_MSG(name[0])); + ksft_test_result_fail("%s\n", name[0]); } } @@ -67,7 +79,9 @@ static void vdso_test_clock_gettime(clockid_t clk_id) (vdso_clock_gettime_t)vdso_sym(version, name[1]); if (!vdso_clock_gettime) { - ksft_test_result_skip(VDSO_TEST_SKIP_MSG(name[1])); + ksft_print_msg("Couldn't find %s\n", name[1]); + ksft_test_result_skip("%s %s\n", name[1], + vdso_clock_name[clk_id]); return; } @@ -77,9 +91,11 @@ static void vdso_test_clock_gettime(clockid_t clk_id) if (ret == 0) { ksft_print_msg("The time is %lld.%06lld\n", (long long)ts.tv_sec, (long long)ts.tv_nsec); - ksft_test_result_pass(VDSO_TEST_PASS_MSG()); + ksft_test_result_pass("%s %s\n", name[1], + vdso_clock_name[clk_id]); } else { - ksft_test_result_fail(VDSO_TEST_FAIL_MSG(name[1])); + ksft_test_result_fail("%s %s\n", name[1], + vdso_clock_name[clk_id]); } } @@ -90,7 +106,8 @@ static void vdso_test_time(void) (vdso_time_t)vdso_sym(version, name[2]); if (!vdso_time) { - ksft_test_result_skip(VDSO_TEST_SKIP_MSG(name[2])); + ksft_print_msg("Couldn't find %s\n", name[2]); + ksft_test_result_skip("%s\n", name[2]); return; } @@ -99,9 +116,9 @@ static void vdso_test_time(void) if (ret > 0) { ksft_print_msg("The time in hours since January 1, 1970 is %lld\n", (long long)(ret / 3600)); - ksft_test_result_pass(VDSO_TEST_PASS_MSG()); + ksft_test_result_pass("%s\n", name[2]); } else { - ksft_test_result_fail(VDSO_TEST_FAIL_MSG(name[2])); + ksft_test_result_fail("%s\n", name[2]); } } @@ -114,7 +131,9 @@ static void vdso_test_clock_getres(clockid_t clk_id) (vdso_clock_getres_t)vdso_sym(version, name[3]); if (!vdso_clock_getres) { - ksft_test_result_skip(VDSO_TEST_SKIP_MSG(name[3])); + ksft_print_msg("Couldn't find %s\n", name[3]); + ksft_test_result_skip("%s %s\n", name[3], + vdso_clock_name[clk_id]); return; } @@ -137,27 +156,14 @@ static void vdso_test_clock_getres(clockid_t clk_id) clock_getres_fail++; if (clock_getres_fail > 0) { - ksft_test_result_fail(VDSO_TEST_FAIL_MSG(name[3])); + ksft_test_result_fail("%s %s\n", name[3], + vdso_clock_name[clk_id]); } else { - ksft_test_result_pass(VDSO_TEST_PASS_MSG()); + ksft_test_result_pass("%s %s\n", name[3], + vdso_clock_name[clk_id]); } } -const char *vdso_clock_name[12] = { - "CLOCK_REALTIME", - "CLOCK_MONOTONIC", - "CLOCK_PROCESS_CPUTIME_ID", - "CLOCK_THREAD_CPUTIME_ID", - "CLOCK_MONOTONIC_RAW", - "CLOCK_REALTIME_COARSE", - "CLOCK_MONOTONIC_COARSE", - "CLOCK_BOOTTIME", - "CLOCK_REALTIME_ALARM", - "CLOCK_BOOTTIME_ALARM", - "CLOCK_SGI_CYCLE", - "CLOCK_TAI", -}; - /* * This function calls vdso_test_clock_gettime and vdso_test_clock_getres * with different values for clock_id. From patchwork Thu Nov 23 10:45:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 168861 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp353669vqx; Thu, 23 Nov 2023 02:46:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IFIVJVBVpa+9go4EZtl+pXwwlaxXd8WbZRDb2iUW3fs+s5eadeaAzYQQrnN0/sjobPDr/Wb X-Received: by 2002:a17:90b:4a4a:b0:283:2873:88ad with SMTP id lb10-20020a17090b4a4a00b00283287388admr3075003pjb.10.1700736385687; Thu, 23 Nov 2023 02:46:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700736385; cv=none; d=google.com; s=arc-20160816; b=qdX4Gcccm3Y9oksWkbZGYrhWFOv14ER3RCXAig7K7cY53akvFElXtIc0CuLOsW/E8/ q49lbqgdkYrRC15FxG15EEP4Oc/vMuIQhm1qtM6qxfTbwKCurxGwz3xaJLAFFvu67Y/B mAvBx/D+ET43Jou2vSOFMV9O5hWaehwAeXkH8fLCKOZygITJmmsLUUxPH+1TyPe5X3tm cmUdLdrbNf2Uguo/+RzFdJvoR0xU7TrYoR5wJj+rjwq1HzvE3uY9lVtCNe83guxkI/cZ fwUi4FB6xhTPS/HXaB1i58kWhA5pv8DUHEbrgy/MDWSel1MpJXr82Q+wsb3bLlMpIePw gqkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=uSZY/haUUdeELA/J7RqroQCTBgguiE7pO/oMnSPdbNA=; fh=xTLXRGx4c4TfWcKwHqVnB5TIoYG9Q9s1pGUshP+bk2Q=; b=bD1LB/ut6EQd2U3KAvSiV2JCfcYATraogutYOt9ip8Uu8WW0gvdbLjW8mIrT4FPyj0 iTprIAK3DPq2HoJr3BMRxGW7cKkMMEmPi3X+VY07J5y9HIyuLl+PgI/w+I7l80Ey0vi/ MWJ4VLj47U9mAuWqVTQD1r9hGkjjwbBbxa0ke47fryWGj7CT1mezhLhSa0lAbOWZyS1N 7dQnJ3ZtOjpT5YuNLsZPOiDMpXTrzil9j6jOh+a924PCerlJbzLmY5RlLuIrIw/A4DA9 jrWp3QVADsUF/jK3yP12hAAGKEMF2GiY3vwUR/M+pnLrhsJrN4EZ035zFIM1awMumaJu YB0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="ajdIZ+/e"; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id l1-20020a170903244100b001b9c3498526si904957pls.433.2023.11.23.02.46.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 02:46:25 -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=@kernel.org header.s=k20201202 header.b="ajdIZ+/e"; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 12B938088A61; Thu, 23 Nov 2023 02:46:23 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344820AbjKWKqE (ORCPT + 99 others); Thu, 23 Nov 2023 05:46:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230150AbjKWKp4 (ORCPT ); Thu, 23 Nov 2023 05:45:56 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D2B21BD for ; Thu, 23 Nov 2023 02:46:03 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2CAC7C433C7; Thu, 23 Nov 2023 10:46:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700736363; bh=kb3AIT5xG1kFCiQ1Vz+UvRYW0kxBneNP3MyKZ8I3yMw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ajdIZ+/e6/N4hUqFRjdNpAhx8Ye4yk+RAxJEwyynxyAOoXTxab//qTui6Vvq/uLiY uHpxjyuH81bRUlgtyjXwhNoIybaLNtYSTGoYjgFzuHX+5wvfR4Orua9Oe/AuMrSV7C 5LFOuRGV46yoMjL54cmdPzMacP2qw47l6rN9AybNku1l265sEhcBYP+xWt8GK74JpP khidagGHu+FBOGTC8DTXmlDASF6n+0GzOVf6yfl37qbkW/gAPj/eH0p1OP5UiXViGl 21DSJhZm1gNZZy0Qx5eh+ynz8Spe3gu4hrJUYAJP208viZpCI++MlhCE6VLe1ELxbr BNGqHTUYao3Lw== From: Mark Brown Date: Thu, 23 Nov 2023 10:45:48 +0000 Subject: [PATCH 2/3] kselftest/vDSO: Fix message formatting for clock_id logging MIME-Version: 1.0 Message-Id: <20231123-kselftest-vdso-test-name-v1-2-1b30441c422b@kernel.org> References: <20231123-kselftest-vdso-test-name-v1-0-1b30441c422b@kernel.org> In-Reply-To: <20231123-kselftest-vdso-test-name-v1-0-1b30441c422b@kernel.org> To: Shuah Khan Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-0438c X-Developer-Signature: v=1; a=openpgp-sha256; l=1123; i=broonie@kernel.org; h=from:subject:message-id; bh=kb3AIT5xG1kFCiQ1Vz+UvRYW0kxBneNP3MyKZ8I3yMw=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBlXy1kdvjeWC86olt31l1UALcmPYTkSVpBieK6Q AQu19N/ubqJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZV8tZAAKCRAk1otyXVSH 0O9BB/4mWSoAfdRNgPQ8rNiUEhipeTPetXaKsihnKxpsSxSwaR1M2CX0hyEnzzU7yIBXvEsp7nj OZ+A+/ALdtzdpXHes2R2/gnRJ9y+ck0SCa80S45QAC6w89R/W09Vq3jZWz33U7SGVH4yBuxol65 Q3WyjU5Q6mj3GR7BIFFC6reEhfGtvgJsOUpcXcMyvRJF6lxR9iZ9dSi3Cq3ZMl/1TwvHx8ITUw0 8K8AsnQTlAX1by2G5XKUgPxuV0RWwA7nTkke2Q3yzLb0YnB3GZtpY8zX90X5pvSfUgWfS5aOt1u M9edALMMYGp5YvmwUlU5OCeccmQwxWZpVODQ3nAUVkSIh0gK X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-1.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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]); Thu, 23 Nov 2023 02:46:23 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783351356230835812 X-GMAIL-MSGID: 1783351356230835812 When logging the ID of the currently tested clock vdso_test_clock() puts a spurious newline at the start of the format string resulting in output such as # clock_id: CLOCK_BOOTTIME which is a valid but empty KTAP informational message followed by a non conferment output line. Remove the initial newline to create a more KTAP friendly # clock_id: CLOCK_BOOTTIME Signed-off-by: Mark Brown --- tools/testing/selftests/vDSO/vdso_test_abi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/vDSO/vdso_test_abi.c b/tools/testing/selftests/vDSO/vdso_test_abi.c index b304abae6e8f..d0e247cca58a 100644 --- a/tools/testing/selftests/vDSO/vdso_test_abi.c +++ b/tools/testing/selftests/vDSO/vdso_test_abi.c @@ -170,7 +170,7 @@ static void vdso_test_clock_getres(clockid_t clk_id) */ static inline void vdso_test_clock(clockid_t clock_id) { - ksft_print_msg("\nclock_id: %s\n", vdso_clock_name[clock_id]); + ksft_print_msg("clock_id: %s\n", vdso_clock_name[clock_id]); vdso_test_clock_gettime(clock_id); From patchwork Thu Nov 23 10:45:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 168862 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp353767vqx; Thu, 23 Nov 2023 02:46:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IGjR9pRNfEplgV16AgkeMikAlzYFSAkG5G0FViDl2Di05I/AkrdfLIwm0Vcj5z96f1LxbHO X-Received: by 2002:aa7:9311:0:b0:6cb:7025:9930 with SMTP id cz17-20020aa79311000000b006cb70259930mr5112537pfb.8.1700736399571; Thu, 23 Nov 2023 02:46:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700736399; cv=none; d=google.com; s=arc-20160816; b=sLe6Q6NpPDcGccs3yX0viufGUmAxIS9Gw4k71Bkw3Bog+HHwHoVK3+L0NwX6t8ajia zrAOAsKh7+yeK9nMFTcKhQ/ytmSN3fBcBl5bJivkSs6xv9OIn6tv6Tj1rSNAfTlzg2VZ /8RRsiHoMO8ybDnpBZZbtsk6f8jFV4V4PKtxTOCFrgjnEQzHF63jj0ZIZnR13jNyMAVy 83CcPTIlJ+CWmCHjuldaa59PZTUN4DOc2X5kXnX4g/CDjZW8psHSE1+SwM0AzgnN+/Mq LquFj2tLq13DXzoxz671o0Q81mQX8XpuJHdyIbSTvzN9+j9zDp9Fkddj7DGrsJOLmMoX wgjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=NtI50uoCDiHMqx4Rjlld52n2DZQx1Uhvw1oK4L9B3YA=; fh=xTLXRGx4c4TfWcKwHqVnB5TIoYG9Q9s1pGUshP+bk2Q=; b=ke4XI8EjS4g34l8g6F6nk7yqGUGqoJe/H5zZ9lmZ/+Gd2kFyGLzyUgJMyNMjeKNxKW hHs76EegCBv/cIbV45jNrkwXracWMgqimRRbn7UKznpx7Qb5Vdj3d4lXOa0XfUTrxQNb cKmXwZGVekwWSD0tZQiv5A7MHLHl7yU2x1jdEdISVztxbM+MwKGFE1UJ/P0P+2lzmXRp C2bcHAc49a/dvie+SG8DXHpzM3RorVx58Aap2jC2G9Wpm0ODC5+tXgr7hzMc2QZEVVby SwEofFzsbqleEfO3n8CoNbUf2VDz9PQctIlOENJL1xAe76oGvUKShsXfDA+JrDg8kQIu /Ryg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rTcTIJoo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id 10-20020a63144a000000b00584b6af3b9fsi1053080pgu.524.2023.11.23.02.46.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 02:46:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rTcTIJoo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 2E311808726A; Thu, 23 Nov 2023 02:46:37 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344854AbjKWKqI (ORCPT + 99 others); Thu, 23 Nov 2023 05:46:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344779AbjKWKp7 (ORCPT ); Thu, 23 Nov 2023 05:45:59 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6265CD4A for ; Thu, 23 Nov 2023 02:46:05 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E59BEC433C9; Thu, 23 Nov 2023 10:46:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700736365; bh=a/0xnzSEqDgdkmB+Ou/rO19RkkJCDKLmNeBwmcdoHhE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=rTcTIJooVID1Ib9olpdj+20mPww9uC5zCmFqFdKXWqeKxQuvxgx6dKoAgRe3lHfCR 7dC92JTY4NK32pEqTbrOELXoFoj+zS3Z7bVUStw8som5F5AcstvYDPkk+4uoa2DIY1 fbCWe+UuWopz6Vys3o0xAVK/Dz32QA5x+8CQrLVVklKhPU5/MEjZFOkHyoOXjkQuOn wkW3i4YGsdCyB9f63Vk6W9InIBl+jr/n4xf6n9FrOXnef2RvZlL5npifrN7fNRv1LP P1GdAqJ6L9tVUuYL7yBV97rA78QP8rosb3cU/nU/QSOhV8iJyFHKSVlrnmMV3/98EH 9v912jBT6pICA== From: Mark Brown Date: Thu, 23 Nov 2023 10:45:49 +0000 Subject: [PATCH 3/3] kselftest/vDSO: Use ksft_print_msg() rather than printf in vdso_test_abi MIME-Version: 1.0 Message-Id: <20231123-kselftest-vdso-test-name-v1-3-1b30441c422b@kernel.org> References: <20231123-kselftest-vdso-test-name-v1-0-1b30441c422b@kernel.org> In-Reply-To: <20231123-kselftest-vdso-test-name-v1-0-1b30441c422b@kernel.org> To: Shuah Khan Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-0438c X-Developer-Signature: v=1; a=openpgp-sha256; l=1205; i=broonie@kernel.org; h=from:subject:message-id; bh=a/0xnzSEqDgdkmB+Ou/rO19RkkJCDKLmNeBwmcdoHhE=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBlXy1lMTced+NcgUkIpAhxxJ8e7HZk4MO0yZjrl pFql9Ib0p+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZV8tZQAKCRAk1otyXVSH 0M9NB/sGRJU2UFvPA5r3mlI2dzt36kaovzgfbklY1UeNZUS1bz59nT74Klk6v1p5k8ywH5yK9k4 7eKdQ2qtaN+jq3CrJRNjLGRB1qnyjsHJ41AW4NiVBKon9a+SO4Qwzoq5RysgwB4daRolPJm7hhy i4MLgKHoZTecqDfl9LFQiAjJcwqGJOCvsF/SztCgQtqZ9hsQpnzl1QFNrYr5PG2gPiespvk+zoW KZzovK79wUE1VKgxXcSXpCklw4gkRAma7HMu9PUCed05bx8/g/+9So8LqZRrXLh0ikZl0H7JJGR I7llYuwE/vRrsTWXTl4wk0i1TCk0M+WzB8zk9usW2N38PPuc X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-1.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 howler.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 (howler.vger.email [0.0.0.0]); Thu, 23 Nov 2023 02:46:37 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783351370803453187 X-GMAIL-MSGID: 1783351370803453187 There are a couple of raw printf() calls in vdso_test_abi which result in non KTAP conforment output such as [vDSO kselftest] VDSO_VERSION: LINUX_2.6 Convert them to use ksft_print_msg() so that they don't cause confusion for parsers. Signed-off-by: Mark Brown --- tools/testing/selftests/vDSO/vdso_test_abi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/vDSO/vdso_test_abi.c b/tools/testing/selftests/vDSO/vdso_test_abi.c index d0e247cca58a..96d32fd65b42 100644 --- a/tools/testing/selftests/vDSO/vdso_test_abi.c +++ b/tools/testing/selftests/vDSO/vdso_test_abi.c @@ -187,14 +187,14 @@ int main(int argc, char **argv) ksft_set_plan(VDSO_TEST_PLAN); if (!sysinfo_ehdr) { - printf("AT_SYSINFO_EHDR is not present!\n"); + ksft_print_msg("AT_SYSINFO_EHDR is not present!\n"); return KSFT_SKIP; } version = versions[VDSO_VERSION]; name = (const char **)&names[VDSO_NAMES]; - printf("[vDSO kselftest] VDSO_VERSION: %s\n", version); + ksft_print_msg("[vDSO kselftest] VDSO_VERSION: %s\n", version); vdso_init_from_sysinfo_ehdr(getauxval(AT_SYSINFO_EHDR));