From patchwork Tue Jan 2 08:19:18 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: 13508893 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 1C0EAC46CD2 for ; Tue, 2 Jan 2024 08:42:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6E7718D0003; Tue, 2 Jan 2024 03:42:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 697538D0002; Tue, 2 Jan 2024 03:42:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5856D8D0003; Tue, 2 Jan 2024 03:42:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 496DB8D0002 for ; Tue, 2 Jan 2024 03:42:45 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 149C48053B for ; Tue, 2 Jan 2024 08:42:45 +0000 (UTC) X-FDA: 81633730290.16.1779128 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) by imf11.hostedemail.com (Postfix) with ESMTP id 4A72E40025 for ; Tue, 2 Jan 2024 08:42:43 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=bEq7Iz0D; spf=pass (imf11.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=1704184963; 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:references:dkim-signature; bh=iDgtWXO2SUfSmObj7QYyY43wIicoWRzKZhO3Si+J1X4=; b=bQwP7pUeFvNbMJ4geDa9FA2HfZF9IZBgHClZ93h4zHlWlOCYTKxEsnAahZ0WiFPnQ5qfZW zUydaRzCFr1ZM2ZbHp5KhLMX8Tuq9IbhppbfkIEshok1FEn0o+avovuKLFgtr7lpNgtR+P ZMmccmZEt6178Rfh++OBCr3iNaEX1HE= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=bEq7Iz0D; spf=pass (imf11.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=1704184963; a=rsa-sha256; cv=none; b=6XOF4IzPnzABrBVECpcc8Z8uOFXOl3kvOAfWLEW9uP8aNpMxF9MnISD5QawpmVDXjo7e7Y PDSV8D9PcAYKMJQ7bLCN0Oe3AFBAQVomsRhLBvJtuzsDPDn8XTlwzRvygqd+K442mrsoNj CSntIdH3tCIADCWQkdHMzxBTJ+/jerM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1704184961; bh=spflRRYbVyJI+GGk2sTIi1F+XFwMR1bA9QOFqaNLvnI=; h=From:To:Cc:Subject:Date:From; b=bEq7Iz0D56xaFA4xRPKaUIKofXDRD9rmgTlSkaYBaCPO6vLHZxyOV/FZI5V5TUGC1 W5c/iSO1ZL+6ihdoA1eiFBHABzyVVtcwme79aUBopxjNwFDyKVr2Oz0PVDEifNsTLM tjhR9BsNHIyv+9yQTL1D1DtjIHaLyF5XrxYbgV1J3Lj4alhVh0YjdqP0TadeB0sMBt v+Y+/7QU6Wrw1CUWDEWFlcT6KCY8YYiZ3RHgzXIbHcUuCIa4duV+amHSLDX3DV6M9p XAI1TC+0rpBFfoihFhIGNSAuro2HetPS5Br9aWe0wQz5UK/sj12o+iZ/imUJPdpTKP 5qZDwuCWaTArw== 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 C054237804B2; Tue, 2 Jan 2024 08:42: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] mm/selftests: hugepage-mremap: conform test to TAP format output Date: Tue, 2 Jan 2024 13:19:18 +0500 Message-ID: <20240102081919.2325570-1-usama.anjum@collabora.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: 4A72E40025 X-Rspam-User: X-Stat-Signature: qor7htmco9iiyqh7oakm5w3xxmb8id7b X-Rspamd-Server: rspam01 X-HE-Tag: 1704184963-2352 X-HE-Meta: U2FsdGVkX191yqF0ylNEiIX2wn2tl8Ztn8zrD9flhjT+tjhOtM7X3lIvwc3oXrPz4Pk5Zu9pk9r5jvRJlATpJsviudV2hoL/8k9vNA4/TssL3/75OqefhS1ZYo9f/K/jQtH3oCvWxr5BA1VWGj1OFMy0wGUlCev/KzmmderwwB4ZHsXvUN8h5IlyduVWPdmIJpfHDntqVB4itiJKST+TqNECcQk3VnWUO5r7rDvp9odcKczTsLA4b+YfiRnrHhK9Wcpu5GGJdzKC7/XjD+nsYjOjZqqivBtBOSjbWOTgpPH9MLICxGXpivud76k6m3gRb9GBtVySPZq/aCWf1xu4VB+S2HXinDLt0KOlxTChI1rmevZODtcmMLvUnmIWBnMqK0k8QVpu8bXQbh3gM7NseQFMF26/H8ZbesycPflXoPh365NEFqKV7j7OjhMhU1QWrOY+DDV0qPc7hjlKAVJWHzXxm3DPgHHR4MMUrIILwxu6GvuglQTpkd7CYV1dZsdc3GtEZ/mzHoB6TyA+PvW3kIrnQ4gJ5pYnnKTObaSjiyW8A+9vC8+I2uK/Sg3JDSllwJf8eCqBx49EOEz28DJYVD7dBglF25IH59nButgRS1RdO8iDuUJ+XhlZEvXJFUawuRLeZ/iI32ZmXZWyoBmFt0xFANDSyt76C0oE02jBxg6h506Ace0dEwWPP6g0sDSfmnhvkVlhdK7cERmpPljmGkACBu69DEFkcm0QwW3jtrXCYZVAaBc5FyDmKZd5RxHPiwwLEjkl0LxLz3KFLDjFZT8wuua0DXFmPqNFJS2BEX09bwU6hJrNKyQfYJFFiz6109lmTP4c4dwrKeY5/plEYYKDGDhpHGenAxSqpE7Ma6/VeMTODmefAANpOQObRaIvDNlee3U/cs+QORiYEC3VKMDMUfmF7j+VYzsAhcV+jmtdrA2NQNIAMcKvNwJ0Ygk/wVa/cXOgjtExpP2IqUx 6YXJ445w fgOMmb9k0UJdjVYLfpx5KUBsBJdoBbNOcTgXXYWV9ytSU4Rk9tSNkvZydzdK2GSO1BoXYz6zUizB8UfegysDtTBT6vhDopQKivBgsHvDVSf7Qvdenm+H3SupLCeoY2Qgy+xqlj43mB6g1RcKRH+vqtVNmvL8r7f5vCANn0G8JUHfs/u3PU1tn6gJhTYJQqi8l0W9wBWg7n8yXRncnmSO3pCAhfMrX4ZVpC56BhO5tQAASeye7S2HQQpUHgg== 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/hugepage-mremap.c | 87 ++++++++------------ 1 file changed, 35 insertions(+), 52 deletions(-) diff --git a/tools/testing/selftests/mm/hugepage-mremap.c b/tools/testing/selftests/mm/hugepage-mremap.c index cabd0084f57b..c463d1c09c9b 100644 --- a/tools/testing/selftests/mm/hugepage-mremap.c +++ b/tools/testing/selftests/mm/hugepage-mremap.c @@ -24,6 +24,7 @@ #include #include #include +#include "../kselftest.h" #include "vm_util.h" #define DEFAULT_LENGTH_MB 10UL @@ -34,7 +35,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 len) @@ -52,7 +53,7 @@ static int read_bytes(char *addr, size_t len) check_bytes(addr); for (i = 0; i < len; i++) if (*(addr + i) != (char)i) { - printf("Mismatch at %lu\n", i); + ksft_print_msg("Mismatch at %lu\n", i); return 1; } return 0; @@ -66,17 +67,13 @@ static void register_region_with_uffd(char *addr, size_t len) /* Create and enable userfaultfd object. */ uffd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK); - if (uffd == -1) { - perror("userfaultfd"); - exit(1); - } + if (uffd == -1) + ksft_exit_fail_msg("userfaultfd: %s\n", strerror(errno)); uffdio_api.api = UFFD_API; uffdio_api.features = 0; - if (ioctl(uffd, UFFDIO_API, &uffdio_api) == -1) { - perror("ioctl-UFFDIO_API"); - exit(1); - } + if (ioctl(uffd, UFFDIO_API, &uffdio_api) == -1) + ksft_exit_fail_msg("ioctl-UFFDIO_API: %s\n", strerror(errno)); /* Create a private anonymous mapping. The memory will be * demand-zero paged--that is, not yet allocated. When we @@ -86,21 +83,17 @@ static void register_region_with_uffd(char *addr, size_t len) addr = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - if (addr == MAP_FAILED) { - perror("mmap"); - exit(1); - } + if (addr == MAP_FAILED) + ksft_exit_fail_msg("mmap: %s\n", strerror(errno)); - printf("Address returned by mmap() = %p\n", addr); + ksft_print_msg("Address returned by mmap() = %p\n", addr); /* Register the memory range of the mapping we just created for * handling by the userfaultfd object. In mode, we request to track * missing pages (i.e., pages that have not yet been faulted in). */ - if (uffd_register(uffd, addr, len, true, false, false)) { - perror("ioctl-UFFDIO_REGISTER"); - exit(1); - } + if (uffd_register(uffd, addr, len, true, false, false)) + ksft_exit_fail_msg("ioctl-UFFDIO_REGISTER: %s\n", strerror(errno)); } int main(int argc, char *argv[]) @@ -108,10 +101,11 @@ int main(int argc, char *argv[]) size_t length = 0; int ret = 0, fd; - if (argc >= 2 && !strcmp(argv[1], "-h")) { - printf("Usage: %s [length_in_MB]\n", argv[0]); - exit(1); - } + ksft_print_header(); + ksft_set_plan(1); + + if (argc >= 2 && !strcmp(argv[1], "-h")) + ksft_exit_fail_msg("Usage: %s [length_in_MB]\n", argv[0]); /* Read memory length as the first arg if valid, otherwise fallback to * the default length. @@ -123,50 +117,40 @@ int main(int argc, char *argv[]) length = MB_TO_BYTES(length); fd = memfd_create(argv[0], MFD_HUGETLB); - if (fd < 0) { - perror("Open failed"); - exit(1); - } + if (fd < 0) + ksft_exit_fail_msg("Open failed: %s\n", strerror(errno)); /* mmap to a PUD aligned address to hopefully trigger pmd sharing. */ unsigned long suggested_addr = 0x7eaa40000000; void *haddr = mmap((void *)suggested_addr, length, PROTECTION, MAP_HUGETLB | MAP_SHARED | MAP_POPULATE, fd, 0); - printf("Map haddr: Returned address is %p\n", haddr); - if (haddr == MAP_FAILED) { - perror("mmap1"); - exit(1); - } + ksft_print_msg("Map haddr: Returned address is %p\n", haddr); + if (haddr == MAP_FAILED) + ksft_exit_fail_msg("mmap1: %s\n", strerror(errno)); /* mmap again to a dummy address to hopefully trigger pmd sharing. */ suggested_addr = 0x7daa40000000; void *daddr = mmap((void *)suggested_addr, length, PROTECTION, MAP_HUGETLB | MAP_SHARED | MAP_POPULATE, fd, 0); - printf("Map daddr: Returned address is %p\n", daddr); - if (daddr == MAP_FAILED) { - perror("mmap3"); - exit(1); - } + ksft_print_msg("Map daddr: Returned address is %p\n", daddr); + if (daddr == MAP_FAILED) + ksft_exit_fail_msg("mmap3: %s\n", strerror(errno)); suggested_addr = 0x7faa40000000; void *vaddr = mmap((void *)suggested_addr, length, PROTECTION, FLAGS, -1, 0); - printf("Map vaddr: Returned address is %p\n", vaddr); - if (vaddr == MAP_FAILED) { - perror("mmap2"); - exit(1); - } + ksft_print_msg("Map vaddr: Returned address is %p\n", vaddr); + if (vaddr == MAP_FAILED) + ksft_exit_fail_msg("mmap2: %s\n", strerror(errno)); register_region_with_uffd(haddr, length); void *addr = mremap(haddr, length, length, MREMAP_MAYMOVE | MREMAP_FIXED, vaddr); - if (addr == MAP_FAILED) { - perror("mremap"); - exit(1); - } + if (addr == MAP_FAILED) + ksft_exit_fail_msg("mremap: %s\n", strerror(errno)); - printf("Mremap: Returned address is %p\n", addr); + ksft_print_msg("Mremap: Returned address is %p\n", addr); check_bytes(addr); write_bytes(addr, length); ret = read_bytes(addr, length); @@ -174,12 +158,11 @@ int main(int argc, char *argv[]) munmap(addr, length); addr = mremap(addr, length, length, 0); - if (addr != MAP_FAILED) { - printf("mremap: Expected failure, but call succeeded\n"); - exit(1); - } + if (addr != MAP_FAILED) + ksft_exit_fail_msg("mremap: Expected failure, but call succeeded\n"); close(fd); - return ret; + ksft_test_result(!ret, "Read same data\n"); + ksft_exit(!ret); }