From patchwork Fri Feb 2 11:31:09 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: 13542769 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 4886EC48291 for ; Fri, 2 Feb 2024 11:31:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C52586B0083; Fri, 2 Feb 2024 06:31:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BDADA6B0085; Fri, 2 Feb 2024 06:31:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A2DE06B0087; Fri, 2 Feb 2024 06:31:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 7E26E6B0083 for ; Fri, 2 Feb 2024 06:31:36 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4D92A1A0F91 for ; Fri, 2 Feb 2024 11:31:36 +0000 (UTC) X-FDA: 81746648592.13.989ED20 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) by imf30.hostedemail.com (Postfix) with ESMTP id 81CDF80009 for ; Fri, 2 Feb 2024 11:31:34 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=Gctvpzd2; spf=pass (imf30.hostedemail.com: domain of usama.anjum@collabora.com designates 46.235.227.194 as permitted sender) smtp.mailfrom=usama.anjum@collabora.com; dmarc=pass (policy=quarantine) header.from=collabora.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706873494; a=rsa-sha256; cv=none; b=PsayCFChrMByV9eoaZk7HnN4D5oaDh+LRmTKItEvRfplXWZTMxa0B1qg5eQ30sApbBGSxH gxLoeFKKy7LzHy2SPuk9eFCdaLvw3D2tgDc6Ki+SmsH5X7gNbVDV4e8viyulsD80Y7iOGV HLd5IALplTktOLP9/3kjtE3BHcVNlcU= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=Gctvpzd2; spf=pass (imf30.hostedemail.com: domain of usama.anjum@collabora.com designates 46.235.227.194 as permitted sender) smtp.mailfrom=usama.anjum@collabora.com; dmarc=pass (policy=quarantine) header.from=collabora.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706873494; 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:in-reply-to:references:references:dkim-signature; bh=FUJjFRsxZtoV0TJs1XWVM73qLuJ0XkK/GMGOZYBkEtc=; b=ZHbkMvC7VC/24KwX5DKM5dVYAPfNpGQ74WxqAHxxAYKjvBx9h8q5mnl3W68od9G/0kjvpM oZUewyNQimYNk4P4Q4eKWsiViwhgqgnhv0TjRTLHu3Xl7bX92WBEjthJYjUzuHqI4s6G33 e8sO1+isGMtw+AVgzIfCBla4u8bHCCs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1706873493; bh=svTlCA3lz9tOssty2sVCUQ4b7cMa6+0k/VLIT1J7+9U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gctvpzd28VBgke2Z+BXwCBrBQu1jQVsCaUleRlbQUwB7fiWabKc4N7PesugLWQUtI 1sq4+wP73NLDqs7qgWOjJl574RC2NLF3msWnLxVutqERk/OGVxInK8zIoyxNkLTdwD J5nstDTK2reP5hFbcQswwc8kV6J48STqelw5C8qKbMPDs/MHOFV+pQANANHRFx0cjS KsltlL/gJgemApo2KlWrmgBtNQ27M4sUjRaTEiCQLBDR0+EUTM5dnuqupm2SzyX9uD 20YBeMErqW/GW9fKnZ4eXWqE2IckqYxZk01TUfuqCPwGH+lxL495V9Lp3K6jq2E7Wl XpkZoyR0bEiSg== 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 CDA443782099; Fri, 2 Feb 2024 11:31:31 +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 02/12] selftests/mm: map_hugetlb: conform test to TAP format output Date: Fri, 2 Feb 2024 16:31:09 +0500 Message-ID: <20240202113119.2047740-3-usama.anjum@collabora.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240202113119.2047740-1-usama.anjum@collabora.com> References: <20240202113119.2047740-1-usama.anjum@collabora.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 81CDF80009 X-Stat-Signature: op5mgobuf1hr3nhd4ya5pt6z39onjp5u X-Rspam-User: X-HE-Tag: 1706873494-793458 X-HE-Meta: U2FsdGVkX19zXVYxf8TMK9BTSQ6+cYqQwCdNQqOKGhAZRFWSO7UHwIVKECSB/IYE57TZlgIPC/x7O/kgTSgQm6S6Zx8zZ970b6DE9+RqjmK4cpxYggc2SZ2vCANrKoenW1+vS09w7ub+BxT3Bvl9nZWp5rP2sh4sLRwysTJf2USHHHftAZCRuMGf7kaavxvf+UzhXHAi2uPbgax/tcBXNUsSrzlnRT51yeiItH2kDCiflSYJH+gqo7a+Lz9zTVp/EFXFU2XljthUcUDqp/D7yDLUixdWGuGOya4KY4vaCv2U4EKHPOYUM3G/JghMK96loZuN+qP+W5V6GgP1P7i0bLrCBJulZrF+bRqCwR2KcH9ofiGAgQt1XNBxgUdcdjO7cDaLBWAVrLptr8pnk0W6UpGN3sn38EysROiCXhXuoEUNRip/M757A4PXcL/frn7RNoHsaZoFMfegkLkNtR4LphZSnyduaWf90+UTKoxY0vpUpy+BjTV1aMmdElmlabDeSHWLHMvINvPDXAYvbabf/PHv+0XYRnmy5Ci5X7nRU5UXQMZt33NsahIctT4wIj53eIVPBespIiZh2Ox4MLLurSjgZf9vRCucCjVBJNwnRjreWkvquillq9PogcqbCHNjGFzWB769KUJkQN9mgYY9LPSAW298Z9lF3Nm0QHK+g6W4xHcc89QaYXLQlLPu2Lok3LwGxzYQpdRaAtqcf2gcjn5R+NhAJ3W4SIIMbz2R4PqAe49nPAULvmFz9zqbU+gdCpkWm0uMUlVsZ5TdYsvuW95PT9uYbxgln45wY7+dICOwyTIS/gwyHizR+ETp3BgZowjDfp+c/AXbm1X1fnnQ1iv1DQfYXPoFilTkbiFbEdkkGWRoQYTypNr5oOgxupWIkodNoZbYcrDnwlft+QeD4DOWf/05MEF11bMEnL/awJDcZA7Eva5vkdtT5rEsMRW4wXNDblBTOHgwiv5siul A1KhAd9B fx2liQmGDdWbT1uZVqIQ/gBjVd/npC5gmLg7yKwPqfAWsNsF1wKgRinCrqpNF9ohtzLQ1O2LSiuj3s5VDtb541KzVApqNcI1FG5nhObsZyMxnpKwXu/hPyroysNWP3zluDuuJmRhYDJ6WrABIcdfWUouynHDH22e41Q1pdeIPtlPc7RU6rHP/5jybdaZYxKQ7b96cir4OJSoSRZGgvmK/w6bk3zsaiwIU78bb6XIAmNNqFkyH8LbtM4EiCgFiSkBXJ8uaV1O1XrNVtx9UY+c5XTxsoVd+VaCXork1kAAsA6xYZo0= 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/map_hugetlb.c | 42 +++++++++++------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/tools/testing/selftests/mm/map_hugetlb.c b/tools/testing/selftests/mm/map_hugetlb.c index 86e8f2048a409..a1f005a90a4f0 100644 --- a/tools/testing/selftests/mm/map_hugetlb.c +++ b/tools/testing/selftests/mm/map_hugetlb.c @@ -16,6 +16,7 @@ #include #include #include "vm_util.h" +#include "../kselftest.h" #define LENGTH (256UL*1024*1024) #define PROTECTION (PROT_READ | PROT_WRITE) @@ -31,7 +32,7 @@ static void check_bytes(char *addr) { - printf("First hex is %x\n", *((unsigned int *)addr)); + ksft_print_msg("First hex is %x\n", *((unsigned int *)addr)); } static void write_bytes(char *addr, size_t length) @@ -42,23 +43,21 @@ static void write_bytes(char *addr, size_t length) *(addr + i) = (char)i; } -static int read_bytes(char *addr, size_t length) +static void read_bytes(char *addr, size_t length) { unsigned long i; check_bytes(addr); for (i = 0; i < length; i++) - if (*(addr + i) != (char)i) { - printf("Mismatch at %lu\n", i); - return 1; - } - return 0; + if (*(addr + i) != (char)i) + ksft_exit_fail_msg("Mismatch at %lu\n", i); + + ksft_test_result_pass("Read correct data\n"); } int main(int argc, char **argv) { void *addr; - int ret; size_t hugepage_size; size_t length = LENGTH; int flags = FLAGS; @@ -69,6 +68,9 @@ int main(int argc, char **argv) if (hugepage_size > length) length = hugepage_size; + ksft_print_header(); + ksft_set_plan(1); + if (argc > 1) length = atol(argv[1]) << 20; if (argc > 2) { @@ -78,27 +80,23 @@ int main(int argc, char **argv) } if (shift) - printf("%u kB hugepages\n", 1 << (shift - 10)); + ksft_print_msg("%u kB hugepages\n", 1 << (shift - 10)); else - printf("Default size hugepages\n"); - printf("Mapping %lu Mbytes\n", (unsigned long)length >> 20); + ksft_print_msg("Default size hugepages\n"); + ksft_print_msg("Mapping %lu Mbytes\n", (unsigned long)length >> 20); addr = mmap(ADDR, length, PROTECTION, flags, -1, 0); - if (addr == MAP_FAILED) { - perror("mmap"); - exit(1); - } + if (addr == MAP_FAILED) + ksft_exit_fail_msg("mmap: %s\n", strerror(errno)); - printf("Returned address is %p\n", addr); + ksft_print_msg("Returned address is %p\n", addr); check_bytes(addr); write_bytes(addr, length); - ret = read_bytes(addr, length); + read_bytes(addr, length); /* munmap() length of MAP_HUGETLB memory must be hugepage aligned */ - if (munmap(addr, length)) { - perror("munmap"); - exit(1); - } + if (munmap(addr, length)) + ksft_exit_fail_msg("munmap: %s\n", strerror(errno)); - return ret; + ksft_finished(); }