From patchwork Tue Jan 2 05:32:22 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: 184243 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4280754dyb; Mon, 1 Jan 2024 21:33:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IEnGkkfXb6aNhkGRM+jh+mifzFZ6Iniao1W5PnK4U4I6pGztJaeuDm+O/GpbRepRJnYoOUe X-Received: by 2002:a05:620a:2237:b0:781:5d3b:869d with SMTP id n23-20020a05620a223700b007815d3b869dmr6873730qkh.112.1704173581262; Mon, 01 Jan 2024 21:33:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704173581; cv=none; d=google.com; s=arc-20160816; b=ipdPe8PA3o4z10D6mAhpVYbCOwsPiO1WxmKpSJWoNtUipBB90481bcC/kpmdTBUnU9 ft7iOKrNl8pu40MyT8cSUFwXqqrYcjGQcV/5Fpp2+rTzZSOtRDMlxLV2bmWwvl0bDjcK v9iLWJj+6Ahjt7f2N4ZdwFNRUWo0y9dlI5clvwpmue5i7e0ookI1rIrenCDXB/krMBjk GQCpw5kMR7Fen4w9h2+sf/X3F29ZrRZgPwRc18dmJLAajQQo9PdJSv3462p2RnSm7IZ9 dYS998y8iPiqkOxV0vlzYJNqPNtZdvAqYXfOocMb8hkSOl9ddbTBR8VZfu5R1WyM2I7w 87zg== 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=Nhb4I078jQXNS6IcTiCHKfr0oXD7OWZL7aLePC4KFhc=; fh=mVBrUHkdhr4FdAuGFuDLONjpBFXQ76Q1/p1ghTG2QxI=; b=jkqyxwdE7eU6VUom6URpuEb9fbmdctN3d8bcWNAW2DWyZMlOVaIaWBmxPSIx/80oC0 muu/0twPGWGn1Vu4rufUlJDDFwxEYG3Q8ytQsDQFmOnjizHBHe6Cp5xe9rBJgMI/LIFs RD79KKX8IOXm4GDrr/EOb6p6wIJg30SfwUQQYSvWm6wrR3rgW2r+s80wtABSAajF3rde qrWWclO21lxb1/YDMRfE7V2N7Brwr50D4njd2YURQoK+7xBAPxFkjUS3d7A6QDNOWGwh PsrtYwaQkpYaB9sWnbh1qzXEmE3X6EeF9LEFaWjSCPNLBd/sunB3QkRXRHoie211iIQb MEoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="Y/L8t0BE"; spf=pass (google.com: domain of linux-kernel+bounces-14051-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14051-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id vv7-20020a05620a562700b0077d8f0bfe49si25342085qkn.732.2024.01.01.21.33.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 21:33:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-14051-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="Y/L8t0BE"; spf=pass (google.com: domain of linux-kernel+bounces-14051-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14051-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 130F21C211FC for ; Tue, 2 Jan 2024 05:33:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B01F31C29; Tue, 2 Jan 2024 05:32:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="Y/L8t0BE" 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 8C20423C3; Tue, 2 Jan 2024 05:32:44 +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=1704173561; bh=2juRjiTk2yf2Invlzo8FhJ7DM0AxRqUdtU6w5CejRpQ=; h=From:To:Cc:Subject:Date:From; b=Y/L8t0BEZ/W9E4wQ8+eUXmBSexrMU4m1q++W2phLH2hRmo0DZWlI5Qf+7t8C4VQs/ cB46jRgqbHaxXyB6cD0szhIWV7M+ejNMHkwCCNSl8OCgCQhkWKUl5sCA+IqkTPLs20 9aYiyjR+vnsRaltJjDlq8uk7D3ySnNntMcEitiyU7G6sMqCae4dv+206znDCkVMiSL Qq6F5nvCdwkQx8OiF3Y613+xjK/ZZy8P9KC4QIM9lvBN1OhmDYZ75JNV1KqdFHPSyt 8wudk/47hy0pnVxwB4idNKG1Pd+m18ESUUrB9h5KebqNXAv+vQwdAeJ8XWaSEuoa7Y 8vzyTpyx6fafg== 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 9A3C83780C21; Tue, 2 Jan 2024 05:32: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] selftests: mm: hugepage-mmap: conform to TAP format output Date: Tue, 2 Jan 2024 10:32:22 +0500 Message-ID: <20240102053223.2099572-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: 1786955516798382230 X-GMAIL-MSGID: 1786955516798382230 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-mmap.c | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/mm/hugepage-mmap.c b/tools/testing/selftests/mm/hugepage-mmap.c index 955ef87f382c..267eea2e0e0b 100644 --- a/tools/testing/selftests/mm/hugepage-mmap.c +++ b/tools/testing/selftests/mm/hugepage-mmap.c @@ -22,6 +22,7 @@ #include #include #include +#include "../kselftest.h" #define LENGTH (256UL*1024*1024) #define PROTECTION (PROT_READ | PROT_WRITE) @@ -37,7 +38,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) @@ -55,7 +56,7 @@ static int read_bytes(char *addr) check_bytes(addr); for (i = 0; i < LENGTH; i++) if (*(addr + i) != (char)i) { - printf("Mismatch at %lu\n", i); + ksft_print_msg("Error: Mismatch at %lu\n", i); return 1; } return 0; @@ -66,20 +67,20 @@ int main(void) void *addr; int fd, ret; + ksft_print_header(); + ksft_set_plan(1); + fd = memfd_create("hugepage-mmap", MFD_HUGETLB); - if (fd < 0) { - perror("memfd_create() failed"); - exit(1); - } + if (fd < 0) + ksft_exit_fail_msg("memfd_create() failed: %s\n", strerror(errno)); addr = mmap(ADDR, LENGTH, PROTECTION, FLAGS, fd, 0); if (addr == MAP_FAILED) { - perror("mmap"); close(fd); - exit(1); + 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); ret = read_bytes(addr); @@ -87,5 +88,7 @@ int main(void) munmap(addr, LENGTH); close(fd); - return ret; + ksft_test_result(!ret, "Read same data\n"); + + ksft_exit(!ret); }