From patchwork Tue Jan 2 05:38:06 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: 184244 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4282465dyb; Mon, 1 Jan 2024 21:40:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IEO4oGPJ0Xc7O+JnmR+sKA3u8JE8OjMCNRF0mNzkUm78XtKwy1jvgczIHpGcg2LXtxeePym X-Received: by 2002:a17:903:1245:b0:1d4:ab3c:355e with SMTP id u5-20020a170903124500b001d4ab3c355emr4383720plh.25.1704174027201; Mon, 01 Jan 2024 21:40:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704174027; cv=none; d=google.com; s=arc-20160816; b=ySPR1dwsXX4XqJb1BNyrQ+e6ScZwUcGQMdpBi2x/iOFPh20M1NdYiQx7c1pSkbxnWR PsVYtJ7TDISm6xQPqnJyRbjlrWjYHFBLAoYEtPOdh+JMgXp215SV2X4IqFRAgXPfuMZP egrcI3BCo3Wcbq+kRHNsbtgDls8LnekTEPaBZBCtBvljCmfylQl3CR3SFmgZxlSlOMnS MlpCAHVLWVItkIN/OebNCqx5gwRABcg0zjtrXN3nzc3dB+740KMi7aTCbFyjWLH1ByDd S4O2gHgobKoBtvw/zpcKqWvBvrZ8HL1aOuqmTlLQ4MlkPLo7qz03teyPYF9zAn32Vnoz UVDg== 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=zgS0nhsyEozsVkfWhz0/qWUEiUkHq06d1FqI4K3Ua5c=; fh=mVBrUHkdhr4FdAuGFuDLONjpBFXQ76Q1/p1ghTG2QxI=; b=ezvgfes2MNGGLjdItJfuO260jUvo55I5E9R2YwNwlm85pti/GS1XUH1IcqnFzPz6rc EQDEnqy+inn7FXT7YoxN9Ev4YcPY9nJDUv9GROqLo1FYZvqeRuHwep3GJfwmFWwxMDlD 7oCsNzqMwl/e2YFyqmM1YAJUbM8YNyUpddmK5Dxm5Bmky5TwY+kAXSUyHaCURqrVM9jC lAMJo7qZyE1M6DNNha0UoE2X+EP16dN1q6Eu/qzyxljf80DFQQawQD2JJYzUC6g7s9ep h1//k78H7rXZXRUwv3U/uW1EglbIq0Xxdnj/nbuNj9avtJZ10e6TCedLUOElQ0oc/0zI MieA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=whSikbQ4; spf=pass (google.com: domain of linux-kernel+bounces-14057-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14057-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id e4-20020a17090301c400b001d4891f73f0si8893994plh.549.2024.01.01.21.40.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 21:40:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-14057-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=whSikbQ4; spf=pass (google.com: domain of linux-kernel+bounces-14057-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14057-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id AC24AB21484 for ; Tue, 2 Jan 2024 05:40:25 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 96F6820F9; Tue, 2 Jan 2024 05:40:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="whSikbQ4" 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 4EC46257C; Tue, 2 Jan 2024 05:40:10 +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=1704174008; bh=z6qn03b6LeS1LR8vScT4yPeTy8AttWujLJP3TbJX0Vw=; h=From:To:Cc:Subject:Date:From; b=whSikbQ41Fkmk4oTuvRCSAHHiZgyXRal1tLdj4xqOMH2SvWKPFQuxBSnI+uK4u8fS sOC1yGTVaDpdMee+w00DPVirYc8EzYNrShQ6Mu8EbxZPKlJBcJZ9AH7EvhjGm6s4Ox v9A/gJGT2v5dkXNxGAps9I1dpKJFHl0f6tRYTDzJCO9dBBd9EHVsv+VYoavGRqYWHf 3TAioQSAxXhTxF2twGpgxmqDzYP9LHjtC/UoVQk+hiigpnpLDNsKIYG0caIQxaILsK 6WZPXDJHLTVs7y1wICaZLsrMv18WBtTMk/BlnLyiVO2dr/FnZ9Jipm1qf0yqtPy1+h RAsZZoYMidT6g== 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 A5C0A3780FC7; Tue, 2 Jan 2024 05:40:06 +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 v2] selftests/mm: gup_test: conform test to TAP format output Date: Tue, 2 Jan 2024 10:38:06 +0500 Message-ID: <20240102053807.2114200-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: 1786955984423434569 X-GMAIL-MSGID: 1786955984423434569 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 --- Changes since v1: - Fix typo - Update subject --- tools/testing/selftests/mm/gup_test.c | 65 ++++++++++++++------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/tools/testing/selftests/mm/gup_test.c b/tools/testing/selftests/mm/gup_test.c index ec2229136384..cbe99594d319 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,24 @@ int main(int argc, char **argv) switch (errno) { case EACCES: if (getuid()) - printf("Please run this test as root\n"); + ksft_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 +264,8 @@ int main(int argc, char **argv) ret = pthread_join(tid[i], NULL); assert(ret == 0); } + free(tid); - return 0; + return ksft_exit_pass(); }