From patchwork Fri Jan 12 07:21:34 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: 187591 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp12775dyc; Thu, 11 Jan 2024 23:21:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IGeEKpMVx9EHeM8el4oeM0ufPx2cE+3P/4yrltY7BQEYNpABi6OyfVksc2dUZbKKLQj43HH X-Received: by 2002:a2e:b794:0:b0:2cc:eeea:9e81 with SMTP id n20-20020a2eb794000000b002cceeea9e81mr480359ljo.100.1705044118320; Thu, 11 Jan 2024 23:21:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705044118; cv=none; d=google.com; s=arc-20160816; b=gjgezxZEgVa2r6cAlHpwnX8PurXDrOmtHbjGNKvHLratmJrSMty2i/IpQFkuadh9NE oEiN92a34l30e50Ob7eg0X6LJGM6CgJGeFaxv34pKcpNlOVQPZZMfIGPfbqLzjrb3R/E EMEgksqw97s+IPlDBCImGwEjOUl1zsz5QGWPdisBgjT/H3RWnojuOoTCnXMgILLJjf7d goHiVDipOAUcZBWGNB68D7E60bz7orsE0DXjed8GVI5K55UFi0Qj5I0rHduR+WXF9Pzx QOviSg9Zj2vbBhkmWIkviHQyLtaGf1XRbuppftMowjXqAZvRAGREflh98USRfvWMa4+d qV0Q== 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=KEdkNivyIg3PurhJ3VjHntzXTr+Tal6Xval7en+bt2s=; fh=mVBrUHkdhr4FdAuGFuDLONjpBFXQ76Q1/p1ghTG2QxI=; b=YyFvVPQBwKapRGWgXAyPVmtYNjMMow6yEFdmXEfiZok55yTwgSHe9ElubSb/jMZoF/ aIz3nHK9p2Ux5aDh8ynp4xPsw1RcFELzM4g/dFm156bWoHdFJXDwU/+2S/BTq/6413y4 O82wP6wvqjpZVF5QMoAJOz7IkbR3Q7ABf+6PbjH3xH9dvvFu2JHOgQ0ogHvA/0tUD5Or BM8qdvnpp1tqVjdqOWAyYtdGHvryURRayLfiftiO0lQpTnVVJp1MSSeeTa6s8bXTJVoU MMXmQCSnQQuZoliwfWxwaeVR5d732Ak8kEJrNZqGLL/6k4kY1ygloRKHVQF5CK4lcPPA vrfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=F+XHcFcW; spf=pass (google.com: domain of linux-kernel+bounces-24365-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-24365-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 v6-20020a056402174600b00558dcec9d98si26058edx.514.2024.01.11.23.21.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jan 2024 23:21:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-24365-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=F+XHcFcW; spf=pass (google.com: domain of linux-kernel+bounces-24365-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-24365-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 B359F1F22992 for ; Fri, 12 Jan 2024 07:21:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 13CE65D72D; Fri, 12 Jan 2024 07:21:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="F+XHcFcW" 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 0FDE35C8FF; Fri, 12 Jan 2024 07:21:40 +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=1705044099; bh=rRQZLwAtR4o/VCOAcxTzVSxdZ70bLgI9faWJJSJCsAc=; h=From:To:Cc:Subject:Date:From; b=F+XHcFcWnw2ojCsRoBMmjj+t+/NROO0ERHC+NcXTC1y95tjpFGNQU9p+yDqGag/5c Sja7dnvAsNlzLkXnNtZ3CbGpZnInpGXWKBWs+VIO0QL887i5YfauEdXtQW6p2NFRwq Wd0ZEJmxdHeGgbXpmzLCAgctyEjN5rg1lek5IMCtX3q/3Vg/NG9K5nSRpVzRjULXMb akMZWrWUkeNfSIfxFRj/vyeljJ3YB024sgNgqiCBAhxIzZWgxDIdWjHmRDJEKVDUPB 4o8d/C6KimRHHjhxRqWvg0vUQOZu1HhrMrAof2aos5eNOIBqE+EsHDjsaG0i9o5tYW C8JpWe7vqaB1A== 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 A39453780894; Fri, 12 Jan 2024 07:21:37 +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 1/7] selftests/mm: hugepage-shm: conform test to TAP format output Date: Fri, 12 Jan 2024 12:21:34 +0500 Message-ID: <20240112072144.620098-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: 1787868341619316220 X-GMAIL-MSGID: 1787868341619316220 Conform the layout, informational and status messages to TAP. No functional change is intended other than the layout of output messages. The "." was being printed inside for loop to indicate the writes progress. This was extraneous and hence removed in the patch. Signed-off-by: Muhammad Usama Anjum --- tools/testing/selftests/mm/hugepage-shm.c | 47 +++++++++++------------ 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/tools/testing/selftests/mm/hugepage-shm.c b/tools/testing/selftests/mm/hugepage-shm.c index 478bb1e989e9..f949dbbc3454 100644 --- a/tools/testing/selftests/mm/hugepage-shm.c +++ b/tools/testing/selftests/mm/hugepage-shm.c @@ -34,11 +34,10 @@ #include #include #include +#include "../kselftest.h" #define LENGTH (256UL*1024*1024) -#define dprintf(x) printf(x) - /* Only ia64 requires this */ #ifdef __ia64__ #define ADDR (void *)(0x8000000000000000UL) @@ -54,44 +53,42 @@ int main(void) unsigned long i; char *shmaddr; + ksft_print_header(); + ksft_set_plan(1); + shmid = shmget(2, LENGTH, SHM_HUGETLB | IPC_CREAT | SHM_R | SHM_W); - if (shmid < 0) { - perror("shmget"); - exit(1); - } - printf("shmid: 0x%x\n", shmid); + if (shmid < 0) + ksft_exit_fail_msg("shmget: %s\n", strerror(errno)); + + ksft_print_msg("shmid: 0x%x\n", shmid); shmaddr = shmat(shmid, ADDR, SHMAT_FLAGS); if (shmaddr == (char *)-1) { - perror("Shared memory attach failure"); shmctl(shmid, IPC_RMID, NULL); - exit(2); + ksft_exit_fail_msg("Shared memory attach failure: %s\n", strerror(errno)); } - printf("shmaddr: %p\n", shmaddr); - dprintf("Starting the writes:\n"); - for (i = 0; i < LENGTH; i++) { + ksft_print_msg("shmaddr: %p\n", shmaddr); + + ksft_print_msg("Starting the writes:"); + for (i = 0; i < LENGTH; i++) shmaddr[i] = (char)(i); - if (!(i % (1024 * 1024))) - dprintf("."); - } - dprintf("\n"); + ksft_print_msg("Done.\n"); - dprintf("Starting the Check..."); + ksft_print_msg("Starting the Check..."); for (i = 0; i < LENGTH; i++) - if (shmaddr[i] != (char)i) { - printf("\nIndex %lu mismatched\n", i); - exit(3); - } - dprintf("Done.\n"); + if (shmaddr[i] != (char)i) + ksft_exit_fail_msg("\nIndex %lu mismatched\n", i); + ksft_print_msg("Done.\n"); if (shmdt((const void *)shmaddr) != 0) { - perror("Detach failure"); shmctl(shmid, IPC_RMID, NULL); - exit(4); + ksft_exit_fail_msg("Detach failure: %s\n", strerror(errno)); } shmctl(shmid, IPC_RMID, NULL); - return 0; + ksft_test_result_pass("Completed test\n"); + + ksft_finished(); }