From patchwork Mon Jan 1 12:28:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Usama Anjum X-Patchwork-Id: 184159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp3939637dyb; Mon, 1 Jan 2024 04:28:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IGhy08jC3mi2SmEopFxFbdfSKGxDGZtZNyfcleH/iOm0tl0BSXiM4+1tOVyARDJMumMs44q X-Received: by 2002:a17:906:34d9:b0:a28:c46:2740 with SMTP id h25-20020a17090634d900b00a280c462740mr533911ejb.70.1704112119748; Mon, 01 Jan 2024 04:28:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704112119; cv=none; d=google.com; s=arc-20160816; b=I/UqVUoFbTPRFJqRVXHyQNdQWyLZ/L0GQGNVPLgt/nLQLLTYx7/m7My05OuWqtfjKI V4GAuIyq4SvoDjHGKTwp27a2Hn9Y8lRB80/WYdjPtvmnOhpFrFj8AQ/MfztpoK6en1T2 Bg3VNh7R8/awh/Ky6OrcCl/oEagIIeUZGRqqrBltXIPWx5frkCGajy4hsygcy8zQ+KWJ 7dy4BTol0ODpA8MoqO/NIi52xPaAIyX8xL3a5cUjjcvrvS1vNNPd7Cs52unbq89NciyV V+Is5mC5msI8Tv1gOpCrb/oVjiicBdgyrlfYrePVkk5AbSokl4GNnAMkOZZi1nJjw8Hu Ee6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=3viDfakoRh7+73iYHVtfGyt0U/x9y8XmOcQV3ojicAA=; fh=mVBrUHkdhr4FdAuGFuDLONjpBFXQ76Q1/p1ghTG2QxI=; b=s3+rN2otA3amYIct+9orNfM+rzk5KXOXqepEDZfAkOMQ/fIYyktM9JVS1duwkyOb3P K5yl4VI6efEd9AYyqW3gFXh0gkkiYIJAxmm1qY10FtyYPHjqcg0/rAhl4A+dZ7590cbf k9G5iZtw2CXcZFdgt+xeQngfBcDxrvRdeoEPIDrRNGnBUd3JBgPDmVBRMGYXua8SDQKK XZ4vySpeJtx2ikRhSUyrFCaNqChPQrGhU9Sb0FuLxYaIt+gYIwm45+xj4bTbjLXZY2sh fgwqOmBrKaZA1uh7VqnBHL+prpYFFUQtiVMACaBSYWuGxKyTqzOaVJYIRzaD0YUqNB0q g3wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=LbAOP40K; spf=pass (google.com: domain of linux-kernel+bounces-13861-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13861-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id gi31-20020a1709070c9f00b00a234b6bc08csi9418745ejc.262.2024.01.01.04.28.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 04:28:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-13861-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=LbAOP40K; spf=pass (google.com: domain of linux-kernel+bounces-13861-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13861-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 5C8881F21660 for ; Mon, 1 Jan 2024 12:28:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0D5434689; Mon, 1 Jan 2024 12:28:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="LbAOP40K" X-Original-To: linux-kernel@vger.kernel.org Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9FF862595; Mon, 1 Jan 2024 12:28:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786876478531513274 X-GMAIL-MSGID: 1786891069734861548 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(); }