From patchwork Fri Feb 2 11:31:19 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: 13542779 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 A14A3C47DB3 for ; Fri, 2 Feb 2024 11:32:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8AA666B009F; Fri, 2 Feb 2024 06:31:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 831CA6B00A0; Fri, 2 Feb 2024 06:31:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65E736B00A1; Fri, 2 Feb 2024 06:31:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 428506B009F for ; Fri, 2 Feb 2024 06:31:57 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 18BA3C0EAB for ; Fri, 2 Feb 2024 11:31:57 +0000 (UTC) X-FDA: 81746649474.30.C3F38DE Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) by imf04.hostedemail.com (Postfix) with ESMTP id 4D5584000C for ; Fri, 2 Feb 2024 11:31:55 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=5jrbRNKk; dmarc=pass (policy=quarantine) header.from=collabora.com; spf=pass (imf04.hostedemail.com: domain of usama.anjum@collabora.com designates 46.235.227.194 as permitted sender) smtp.mailfrom=usama.anjum@collabora.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706873515; 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=asUANzFqAgLjH6ZwJV82sNijZ4nVe9PH98JXMjUtul4=; b=NyFWnxZa2iyY5zGdtaBTuulGETlEf19MXQ/4NAO+tme4Dhi+FdlQk67R24wslDHTz5krEh XC46E5ZIKBp1RYVg/OVqaUJcQJAgNI7mfQzP9+JeEXO0vJn1pX84UcW9mbrDFXKu7eT1CY B7YFZwcLDEtqR7LgdfNLV/+4/cUWeZQ= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=5jrbRNKk; dmarc=pass (policy=quarantine) header.from=collabora.com; spf=pass (imf04.hostedemail.com: domain of usama.anjum@collabora.com designates 46.235.227.194 as permitted sender) smtp.mailfrom=usama.anjum@collabora.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706873515; a=rsa-sha256; cv=none; b=jUKb+zF4RR8YfNCAkjzgLbJLna/spGDxLobPqFBaXKFlB3TzE1lfwv9dnnl07l2fh5xqWy v5+Rvg0CorEo2rV7pNxkajcvQK6cDzpG67uHRdVPjnd1ennTOKyzP7KLAlm6HeRur7nmQa EsAyo1rObpabKiWmBaKCSM4Kp41HA9I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1706873514; bh=2kIkJOhTpv8Q3QiyGfqRKh0McTWdwjht00wQfRsByJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=5jrbRNKk2culQ7Kp1jvUG6aqXkgZGNOc8qXtU/77rVinmrrbF6j5UzkcypE4v7SzV 1sO8jFCGmlohyfABEMbYhlNulnL3KlfpqyHBfy8y1i/Zysv5SY2cws+zuUO7/7EH5n b2y3r6zBw0bwETOeTG23b0P5VWzHBbFVkVGy9K+INzWMymN+6GtiTyy02TbgBLQeSP uleeXDj31LR55nOzdR8Mn620o4NbUmjDKcMDn+Y4a9dbP5SDECDwTpSO8SYRdlJoPm eS/hqInMh9SclMZCxfJsspNL0xSJctOq5MgTF/S9RMtyVOTL8wSS2vZpuLE/04MbBD Q5sERtgWJq9Pw== 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 A3C913782099; Fri, 2 Feb 2024 11:31:52 +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 12/12] selftests/mm: virtual_address_range: conform to TAP format output Date: Fri, 2 Feb 2024 16:31:19 +0500 Message-ID: <20240202113119.2047740-13-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-Queue-Id: 4D5584000C X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: mxswqsf8b9ororef65uegj6sgudjzixd X-HE-Tag: 1706873515-12123 X-HE-Meta: U2FsdGVkX1/9rmEMbnAJ7xi2J/c4cEwH26LNiSP2PFW63KxBq2m3iktH0To8O/MdJVNFDbHHrgF1WaEobvjACi6Yoy0bJp85HHY1g0jwfiXdFqfT8qgkAxWweUq8tuHAv5eoAKvmTt6UwMQCDv3GGkXy+gzddAta+MlKhWtMm/H1uFphsApWd9+JqR1TmlFcJLz/flT9O1EA2hAFOoLHV2bfLWLFMps8lTLCFejyaKDgaT1pKRn7UoudNitTztjAV5j7HyXbxLVamRev/pXu6RVcbSJ8JfZGJmKtCQ2QZAj3BigcKxQsKU+TuODrqttPr410ez7dq+9zv13P2V5FxVRuasiMCCb6RWarU509D+jVkOeb56RAYXM/9l+0ZzIolnA5bSPDwVllXbntgrg3iL2xD0D7fXMUkbp9cI+1gQgOGr7jUGf2lN1IW13THCpWqTsZwonfOX6YTjXKt8LugZk74lC70jf+ARY3o91SLpPChEK0oUe7E8lu3LOdUbHAQiqYT6t8LS2Q65cmRXU4UQ6gBSPuoPNM9nFO0ozAciG+WWXK2tgtRfkYoj8G4wwrttbYA5BF+n4Ot9x1pWvI51KeTrwPcSVN3FOMV+8XKVvYXvPPalDuSHwuAJwxQ3JWgUbvBq23JBN9qxFFnivafizmCvtyFB/aGZZHvb4T9ciuPpf23Ym5mukDhQXOIMk61YR4T5UpcKUUT8pomszt/OIpNi1Vh28wj5Yx3cLkV5cz9Rziq5Wj6+rPNp32lKTgG3mKkbJPmHwQGddyyUgd0J2trPClk0Tbp2kxItAsYVNWn2PkMtXeJVbJZVxEdA99kr3nq+mW87niVeJUeDeRzTBbkKA3/WYrmESB/wRrIjUy8mQ7Uo07kJ4MFmr7N8GwQkMIzyAzWWbcj7N2riKbOEPpkF0YUZkXdT4/P+ShvpB3+tR93SKZ2ILDx9+T+Yk80h5YRGYyZLEoNbVvJMs MdnujepL GdRYFZycZw1JMdIZ0Y9T4FE1jBEzQEOLgJdARkE0wmxCFgE6bfs9WApaE1WBg1s6Ij8XZymgzjyTIX8Nv35HOr/Wa/GyJxXrehnr071U16ErUCv/xmIsmuxDJ3vrrV+uArIXoX+aAfacdCSjJngJUoukoAqJYROYiIHhpl0btsWJ5KGqcjGFiww6tcdYkIejsglGLTqcry2SCAz6aZOUrUe7ZtXONlTP/vIzW8Lcd+kwl6JO5huFnYOUyKiFjhQgRQ8lIdpb8ybCGipbUVbUoVIdSGW2YOb/vBRID1bLNdagZGAI= 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 --- .../selftests/mm/virtual_address_range.c | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/tools/testing/selftests/mm/virtual_address_range.c b/tools/testing/selftests/mm/virtual_address_range.c index bae0ceaf95b13..7bcf8d48256a6 100644 --- a/tools/testing/selftests/mm/virtual_address_range.c +++ b/tools/testing/selftests/mm/virtual_address_range.c @@ -12,6 +12,7 @@ #include #include #include +#include "../kselftest.h" /* * Maximum address range mapped with a single mmap() @@ -68,23 +69,15 @@ static char *hind_addr(void) return (char *) (1UL << bits); } -static int validate_addr(char *ptr, int high_addr) +static void validate_addr(char *ptr, int high_addr) { unsigned long addr = (unsigned long) ptr; - if (high_addr) { - if (addr < HIGH_ADDR_MARK) { - printf("Bad address %lx\n", addr); - return 1; - } - return 0; - } + if (high_addr && addr < HIGH_ADDR_MARK) + ksft_exit_fail_msg("Bad address %lx\n", addr); - if (addr > HIGH_ADDR_MARK) { - printf("Bad address %lx\n", addr); - return 1; - } - return 0; + if (addr > HIGH_ADDR_MARK) + ksft_exit_fail_msg("Bad address %lx\n", addr); } static int validate_lower_address_hint(void) @@ -107,23 +100,29 @@ int main(int argc, char *argv[]) char *hint; unsigned long i, lchunks, hchunks; + ksft_print_header(); + ksft_set_plan(1); + for (i = 0; i < NR_CHUNKS_LOW; i++) { ptr[i] = mmap(NULL, MAP_CHUNK_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); if (ptr[i] == MAP_FAILED) { - if (validate_lower_address_hint()) - return 1; + if (validate_lower_address_hint()) { + ksft_test_result_skip("Memory constraint not fulfilled\n"); + ksft_finished(); + } break; } - if (validate_addr(ptr[i], 0)) - return 1; + validate_addr(ptr[i], 0); } lchunks = i; hptr = (char **) calloc(NR_CHUNKS_HIGH, sizeof(char *)); - if (hptr == NULL) - return 1; + if (hptr == NULL) { + ksft_test_result_skip("Memory constraint not fulfilled\n"); + ksft_finished(); + } for (i = 0; i < NR_CHUNKS_HIGH; i++) { hint = hind_addr(); @@ -133,8 +132,7 @@ int main(int argc, char *argv[]) if (hptr[i] == MAP_FAILED) break; - if (validate_addr(hptr[i], 1)) - return 1; + validate_addr(hptr[i], 1); } hchunks = i; @@ -145,5 +143,7 @@ int main(int argc, char *argv[]) munmap(hptr[i], MAP_CHUNK_SIZE); free(hptr); - return 0; + + ksft_test_result_pass("Test\n"); + ksft_finished(); }