From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CA00C4706F for ; Mon, 1 Jan 2024 12:28:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B00E96B0271; Mon, 1 Jan 2024 07:28:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A61F16B0272; Mon, 1 Jan 2024 07:28:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9038C6B0273; Mon, 1 Jan 2024 07:28:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7B8E56B0271 for ; Mon, 1 Jan 2024 07:28:24 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 414A1C05EF for ; Mon, 1 Jan 2024 12:28:24 +0000 (UTC) X-FDA: 81630670128.25.AE69FB2 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) by imf15.hostedemail.com (Postfix) with ESMTP id 7C8F7A0013 for ; Mon, 1 Jan 2024 12:28:22 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=LbAOP40K; dmarc=pass (policy=quarantine) header.from=collabora.com; spf=pass (imf15.hostedemail.com: domain of usama.anjum@collabora.com designates 46.235.227.194 as permitted sender) smtp.mailfrom=usama.anjum@collabora.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704112102; a=rsa-sha256; cv=none; b=ZpQrxQGRol9ULLaMdWlCnXhfxKgo2sUWr6ScUbC72bKoP+lvlUHv55nQze2LivJ63RpjNv iD5JCBHS2OL/qpGGVs0tyDAvaMRHTDno3/RqIou1i3Iak4aYhlntEDINuNxL3vo2R2lkUF svkkhwuXbKo6BvMyV+LZW6XrQTpALyQ= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=LbAOP40K; dmarc=pass (policy=quarantine) header.from=collabora.com; spf=pass (imf15.hostedemail.com: domain of usama.anjum@collabora.com designates 46.235.227.194 as permitted sender) smtp.mailfrom=usama.anjum@collabora.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704112102; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=3viDfakoRh7+73iYHVtfGyt0U/x9y8XmOcQV3ojicAA=; b=QZi4uuYMBgahVWBujVMbUYe5S8N7WyGYQFE6Rpfo9wqobcMkllVpyM4bkfJ6L2r7F08i9t wrNtswdJqeT8DJe5evkTlSnVyfKrkw2YV1r4OcCuBxPCezsyeVDQU2xuXBu0L+/u9paJmf +T3UM2JzdMI+eI3RshEDogS+jN5c1rc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1704112100; bh=xm7n6hqVFtL1Me4dPsBfzKOCO6qpbR9c3yDpqbhJUvQ=; h=From:To:Cc:Subject:Date:From; b=LbAOP40KIWKYJRLjFziqkGOQtKijTCBwQ3amcroOFuxF1B3j0OIHe8u5Z6dH7rgkV 31oTuXJdPjbpbX4bd9CWZ5/PLOfIyd5fDj4Z6GFHElIgvdFXxOJHBPMhKPN7HilHb5 IfFkdfU0FXb1mqaDEVeboUy4iqubseDAooZBgp8MtYTvTSD3GGfYaVSsHoKBvcK60i pHr+CdoKjXiTtIz7wwBIXs6YPJZfL/yDTaz6MJ5LYUHOr5ku7gl+5BMao22ckVLP9D 8HunyrqP1yaV1OfWEQVd7Yl2HrItqR28DcRqDqg+wRFhGk3Bl7DmsEzViPYWio9Wpz 31KrGV2cbEnrQ== Received: from localhost.localdomain (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 0AE243780029; Mon, 1 Jan 2024 12:28:18 +0000 (UTC) From: Muhammad Usama Anjum To: Andrew Morton , Shuah Khan Cc: Muhammad Usama Anjum , kernel@collabora.com, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] selftests/mm: conform test to TAP format output Date: Mon, 1 Jan 2024 17:28:14 +0500 Message-ID: <20240101122815.1716498-1-usama.anjum@collabora.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 7C8F7A0013 X-Stat-Signature: sag184wcxy58akrcqiy4gwfgyr5691f6 X-HE-Tag: 1704112102-783883 X-HE-Meta: U2FsdGVkX1+wBl/AqV9TalOQymjYmP3KZFGlOCfsFth/lH8bApS3p6gvzTNLUUrd1C4l4OPJ/TxlzpGLOku+x45Mp19LaETZQ80xvlnxRnf+TCSnnZ4YXAXd/qgQ0tXWGVe48qy0d6IjyySHKFe1FK7ZHSxrEkcevfOz6ii9QMjGVUMpRfOeMrrRVaQCcqBoDgx6vkkiUYeHLusadGPWKrLWa+7h4en/P3Y4VIbmuX7dodN7WNVVQGcKs1sN7QY6g1mI4b2AuI2ixT3ZhKDT702JZBAIihs7XCJ/yDkuTI23dpSJhqzEop5V5YEUwretoZnrLX4XVF0PnN3piMxORl3ySF6H3hT6CpY1Sf+PYotoBOx+hh4eKHSkGSHFxg4jWxBJnDP5qPDu9dThBppyn1VCaau/mKMaAjDvfFYexMsmxqb/iz4siD14Zuq+Vq0FBCIKycn+sco8hJH3gy2JyqqIM8fICnpPUP/Bb+yCndGU8jUu4wRI6smVhGdKymuLJgJp8amhh/tndu/eoSx0y2g22fKpIMvQV+5UtCo/MzVZ+KpY2hxmv6wNnMoeL/4TMo+R5hingQzYcw2SeLZnRteN+g2Qi21dLo6855fhxLxRqkJtybjErl6kmExWkLfnHn7HDi0mNfoFnil7EfKpbPuhWwNgRqI/Umm0K4O8k8OPnpAEHZReBxpfBxYCStBeemLxuEXzKDXV4QSyvv0SpVLTqMEMzM6+Bl2yAbesRJ+Joc4wnIWyxMcj/cfkWV4FiOrUflq8WfYbNVXcwE8AA7ThyG+/2y0DGsRfuXuCPlB7iYWcwIduC4BTIfULTxc3BMyDnguMa7a+Fbc5AQjQ8yy7TJ3yNKBiPxa8z3kTPYs49PeUeH0ocHWzZJBLR25W0c9RQcWUClHpICMfnW232OUiCQEQe+NLTWDrqYoBZjr2j6VepUxC1AiqIfsv59kh710PekfXf4nsFYHLu3S W+N07Gp5 E5JrVhSN+VWI1rpGrLIHOe4rbmaFYNdIrXUqvHcXF+ultCu4t4gLOp5yzPU6SsvcHvXVMScHc5SvUHOCvuLaf7g9fROy1C3VO8fLmws27ih0sFMijwLCCB+GmKmKlxrtMsgFpKs/1CLC87ESMI20c9Jc3Jrf/PvtiDRVJPftvR893oXLkpIsRobnqRwt0FDIGYcQ4ssR1MTx+iyq6KFyZ4SGny0TCY+6PyLIYoBkbhdAKWZcxRnz965+snw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Conform the layout, informational and status messages to TAP. No functional change is intended other than the layout of output messages. Signed-off-by: Muhammad Usama Anjum --- tools/testing/selftests/mm/gup_test.c | 70 +++++++++++++++------------ 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/tools/testing/selftests/mm/gup_test.c b/tools/testing/selftests/mm/gup_test.c index ec2229136384..09efd1b3559e 100644 --- a/tools/testing/selftests/mm/gup_test.c +++ b/tools/testing/selftests/mm/gup_test.c @@ -50,39 +50,41 @@ static char *cmd_to_str(unsigned long cmd) void *gup_thread(void *data) { struct gup_test gup = *(struct gup_test *)data; - int i; + int i, status; /* Only report timing information on the *_BENCHMARK commands: */ if ((cmd == PIN_FAST_BENCHMARK) || (cmd == GUP_FAST_BENCHMARK) || (cmd == PIN_LONGTERM_BENCHMARK)) { for (i = 0; i < repeats; i++) { gup.size = size; - if (ioctl(gup_fd, cmd, &gup)) - perror("ioctl"), exit(1); + status = ioctl(gup_fd, cmd, &gup); + if (status) + break; pthread_mutex_lock(&print_mutex); - printf("%s: Time: get:%lld put:%lld us", - cmd_to_str(cmd), gup.get_delta_usec, - gup.put_delta_usec); + ksft_print_msg("%s: Time: get:%lld put:%lld us", + cmd_to_str(cmd), gup.get_delta_usec, + gup.put_delta_usec); if (gup.size != size) - printf(", truncated (size: %lld)", gup.size); - printf("\n"); + ksft_print_msg(", truncated (size: %lld)", gup.size); + ksft_print_msg("\n"); pthread_mutex_unlock(&print_mutex); } } else { gup.size = size; - if (ioctl(gup_fd, cmd, &gup)) { - perror("ioctl"); - exit(1); - } + status = ioctl(gup_fd, cmd, &gup); + if (status) + goto return_; pthread_mutex_lock(&print_mutex); - printf("%s: done\n", cmd_to_str(cmd)); + ksft_print_msg("%s: done\n", cmd_to_str(cmd)); if (gup.size != size) - printf("Truncated (size: %lld)\n", gup.size); + ksft_print_msg("Truncated (size: %lld)\n", gup.size); pthread_mutex_unlock(&print_mutex); } +return_: + ksft_test_result(!status, "ioctl status %d\n", status); return NULL; } @@ -170,7 +172,7 @@ int main(int argc, char **argv) touch = 1; break; default: - return -1; + ksft_exit_fail_msg("Wrong argument\n"); } } @@ -198,11 +200,12 @@ int main(int argc, char **argv) } } + ksft_print_header(); + ksft_set_plan(nthreads); + filed = open(file, O_RDWR|O_CREAT); - if (filed < 0) { - perror("open"); - exit(filed); - } + if (filed < 0) + ksft_exit_fail_msg("Unable to open %s: %s\n", file, strerror(errno)); gup.nr_pages_per_call = nr_pages; if (write) @@ -213,27 +216,29 @@ int main(int argc, char **argv) switch (errno) { case EACCES: if (getuid()) - printf("Please run this test as root\n"); + ksstatic unsigned long cmd = GUP_FAST_BENCHMARK; + static int gup_fd, repeats = 1; + static unsigned long size = 128 * MB; + /* Serialize prints */ + static pthread_mutex_t print_mutex = PTHREAD_MUTEX_INITIALIZER; +ft_print_msg("Please run this test as root\n"); break; case ENOENT: - if (opendir("/sys/kernel/debug") == NULL) { - printf("mount debugfs at /sys/kernel/debug\n"); - break; - } - printf("check if CONFIG_GUP_TEST is enabled in kernel config\n"); + if (opendir("/sys/kernel/debug") == NULL) + ksft_print_msg("mount debugfs at /sys/kernel/debug\n"); + ksft_print_msg("check if CONFIG_GUP_TEST is enabled in kernel config\n"); break; default: - perror("failed to open " GUP_TEST_FILE); + ksft_print_msg("failed to open %s: %s\n", GUP_TEST_FILE, strerror(errno)); break; } - exit(KSFT_SKIP); + ksft_test_result_skip("Please run this test as root\n"); + return ksft_exit_pass(); } p = mmap(NULL, size, PROT_READ | PROT_WRITE, flags, filed, 0); - if (p == MAP_FAILED) { - perror("mmap"); - exit(1); - } + if (p == MAP_FAILED) + ksft_exit_fail_msg("mmap: %s\n", strerror(errno)); gup.addr = (unsigned long)p; if (thp == 1) @@ -264,7 +269,8 @@ int main(int argc, char **argv) ret = pthread_join(tid[i], NULL); assert(ret == 0); } + free(tid); - return 0; + return ksft_exit_pass(); } -- 2.42.0