From patchwork Fri Jan 12 07:21:35 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: 187592 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp12848dyc; Thu, 11 Jan 2024 23:22:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IEJtWFMbjJ2SiBIOY7hhW7f6EmoxzigajsN9WYsULUGyKWgWW/OMu9oi5FYFIZfdefx04lM X-Received: by 2002:a17:906:380e:b0:a28:e7b8:c57e with SMTP id v14-20020a170906380e00b00a28e7b8c57emr357519ejc.130.1705044128952; Thu, 11 Jan 2024 23:22:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705044128; cv=none; d=google.com; s=arc-20160816; b=KXPl2Yo5A5nvNmLbM3nePXj3u1u3ehXD89Q//rZjtKTDX2Ej05LbNcwI9NRFf+NBV6 liKBGO2KEZVOp++GQCuRYEpF7A0W4LJWPRaytemtT8IbYvUgoViFN7YJEPG8/yjadpPT ryIXXTnj6OuIKFXyxj8Y0y18DgUMQQbZAMMYfRooSCY6MfdwvWGNEg9P7PLudyRwicaA rAx1KqDWBOQKeRndnGZfowBjO1xAFV7epPvTTJB8w8/1kNOXNY92mCRW8CGoXUlRLuT3 h3WPQ6eUyf7mATssNdPOJ2x7gkU6J4ngsy8jlsaK/4hElCtuWF5U5tsyNXe05SqCnR8t p6Tw== 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:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=s2SklXwDrfN2CthrOooNixZyo9tqgugJGAtaQibUEUA=; fh=mVBrUHkdhr4FdAuGFuDLONjpBFXQ76Q1/p1ghTG2QxI=; b=RdhzQzZhRquuz1X6vrT4WE4z7abRVPs4if/OAsetOepWWKB97qsTmQBSDFXUxQZU+K HmhOh8BhwH03Qn9ujmw/a5Zb8jCEiY5wFMEtqj/lXe5jfEHjVBqN8l/9gv33r4numMkX uE6F6+o+c244B8+okEbw6QUgIPf13cENlpjV3OqgdOPRdU9Qb8CAbcBATr7kcwHKgdco q8J674JqmZlDHqDVn4cevCFFD328y7vv2oG/KJ97FrZTkabdw03NwLoMwzbj7NACZzko m30tkPvuNbYgBY0uo3HJ1rWrwiCgi767s0/KpGiqUe4RPFm4Lo5m2rN7PQYKiH7WVSJS AYSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=FrHH7po2; spf=pass (google.com: domain of linux-kernel+bounces-24366-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-24366-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. [147.75.80.249]) by mx.google.com with ESMTPS id cw12-20020a170906c78c00b00a2ade023486si1178372ejb.124.2024.01.11.23.22.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jan 2024 23:22:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-24366-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=FrHH7po2; spf=pass (google.com: domain of linux-kernel+bounces-24366-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-24366-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 8FB191F2444F for ; Fri, 12 Jan 2024 07:22:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6054B5D746; Fri, 12 Jan 2024 07:21:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="FrHH7po2" 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 5A7A75C916; Fri, 12 Jan 2024 07:21:43 +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=1705044101; bh=o1IUw1D3iI8Y90Z4hsu7JwinzA97QoWLS2TEa1p944o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FrHH7po2p6f5bJlnjjARK+E5oPRZy5Mjhz3oMXw6a4KRpAireAwHVRMKyYKttNYQi RpUFQFefBsY+jE/5hw1Ps0LoPTWBUkgW9L+ig/KnkPuRQZMjYM15rUQoXZJBcfTdgi VwUYi3SkK90zBwqL2fpFPYAKbUKAXPCTQ+qsBESUZaaa//vhC7uhDq86ZNNngOZ1Nl dLxYceVowQeEdshFlKMb0jUiOANh0aBJ+ZDwc0Gr2zV/XkhrJYROP56QYlXwQd6i9t VOq0K+dn95R3MOABRQEjVLn1dYf361vSLVza18YnsflWC4PweFc4ee3jqYvYIK7WxC AADZGFRpj+Kxg== 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 06CC23782021; Fri, 12 Jan 2024 07:21:39 +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 2/7] selftests/mm: hugepage-vmemmap: conform test to TAP format output Date: Fri, 12 Jan 2024 12:21:35 +0500 Message-ID: <20240112072144.620098-2-usama.anjum@collabora.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240112072144.620098-1-usama.anjum@collabora.com> References: <20240112072144.620098-1-usama.anjum@collabora.com> 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: 1787868352435751907 X-GMAIL-MSGID: 1787868352435751907 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/hugepage-vmemmap.c | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/tools/testing/selftests/mm/hugepage-vmemmap.c b/tools/testing/selftests/mm/hugepage-vmemmap.c index 5b354c209e93..125b96a65286 100644 --- a/tools/testing/selftests/mm/hugepage-vmemmap.c +++ b/tools/testing/selftests/mm/hugepage-vmemmap.c @@ -10,6 +10,7 @@ #include #include #include +#include "../kselftest.h" #define MAP_LENGTH (2UL * 1024 * 1024) @@ -77,7 +78,7 @@ static int check_page_flags(unsigned long pfn) read(fd, &pageflags, sizeof(pageflags)); if ((pageflags & HEAD_PAGE_FLAGS) != HEAD_PAGE_FLAGS) { close(fd); - printf("Head page flags (%lx) is invalid\n", pageflags); + ksft_print_msg("Head page flags (%lx) is invalid\n", pageflags); return -1; } @@ -91,7 +92,7 @@ static int check_page_flags(unsigned long pfn) if ((pageflags & TAIL_PAGE_FLAGS) != TAIL_PAGE_FLAGS || (pageflags & HEAD_PAGE_FLAGS) == HEAD_PAGE_FLAGS) { close(fd); - printf("Tail page flags (%lx) is invalid\n", pageflags); + ksft_print_msg("Tail page flags (%lx) is invalid\n", pageflags); return -1; } } @@ -106,11 +107,12 @@ int main(int argc, char **argv) void *addr; unsigned long pfn; + ksft_print_header(); + ksft_set_plan(1); + addr = mmap(MAP_ADDR, MAP_LENGTH, PROT_READ | PROT_WRITE, MAP_FLAGS, -1, 0); - if (addr == MAP_FAILED) { - perror("mmap"); - exit(1); - } + if (addr == MAP_FAILED) + ksft_exit_fail_msg("mmap: %s\n", strerror(errno)); /* Trigger allocation of HugeTLB page. */ write_bytes(addr, MAP_LENGTH); @@ -118,23 +120,19 @@ int main(int argc, char **argv) pfn = virt_to_pfn(addr); if (pfn == -1UL) { munmap(addr, MAP_LENGTH); - perror("virt_to_pfn"); - exit(1); + ksft_exit_fail_msg("virt_to_pfn: %s\n", strerror(errno)); + } else if (!pfn && geteuid()) { + ksft_test_result_skip("Unable to read the pfn as non-root user\n"); + ksft_finished(); } - printf("Returned address is %p whose pfn is %lx\n", addr, pfn); + ksft_print_msg("Returned address is %p whose pfn is %lx\n", addr, pfn); - if (check_page_flags(pfn) < 0) { - munmap(addr, MAP_LENGTH); - perror("check_page_flags"); - exit(1); - } + ksft_test_result(!check_page_flags(pfn), "Check page flags\n"); /* munmap() length of MAP_HUGETLB memory must be hugepage aligned */ - if (munmap(addr, MAP_LENGTH)) { - perror("munmap"); - exit(1); - } + if (munmap(addr, MAP_LENGTH)) + ksft_exit_fail_msg("munmap: %s\n", strerror(errno)); - return 0; + ksft_finished(); }