From mboxrd@z Thu Jan 1 00:00:00 1970 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 B3EFCC83038 for ; Tue, 1 Jul 2025 18:49:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 20BA36B00B6; Tue, 1 Jul 2025 14:49:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1BC6D6B00B7; Tue, 1 Jul 2025 14:49:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0AB246B00B8; Tue, 1 Jul 2025 14:49:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id ED29E6B00B6 for ; Tue, 1 Jul 2025 14:49:23 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id B07F6140520 for ; Tue, 1 Jul 2025 18:49:23 +0000 (UTC) X-FDA: 83616583806.16.CEA9FEE Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) by imf03.hostedemail.com (Postfix) with ESMTP id 0539F20007 for ; Tue, 1 Jul 2025 18:49:21 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=l5LuHxZA; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf03.hostedemail.com: domain of suresh.k.chandrappa@gmail.com designates 209.85.210.54 as permitted sender) smtp.mailfrom=suresh.k.chandrappa@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751395762; 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=Dlocpt7CECBU87LrrF2s/X5hZPUr9DDE65AWKyn7Ey8=; b=7UfABpP31RB5CpTEAhQlDcva41zEeZF3J+q4NR/7LA9pkAkvaOGb+DlhkRZ4LlxX108Udk 7NP+acpUrLclmFz/lkGVeWEDp58DqnKrt0Jau5/sbw8ffloU6MwrdiJOkZUpmLbDE1ioYh 0fVNFVHCzC5UzP9a+++4VcACTGNeiGs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751395762; a=rsa-sha256; cv=none; b=jRR9iBc2MChp7eXr8SRVQZis5HtBExkbByOO04Svw6MZnQ4FyRZVZxP6mAunQu2JdK9zAy O2fHOR21sPd7b65LE3clDM7VhPs4fqll9er2QGAGRh2hyx3ktlo51eXblMG6en1Ez5Fkxo MnLAG4y5AdeFALuagdTw6wo7eJxC3b8= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=l5LuHxZA; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf03.hostedemail.com: domain of suresh.k.chandrappa@gmail.com designates 209.85.210.54 as permitted sender) smtp.mailfrom=suresh.k.chandrappa@gmail.com Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-72c47631b4cso2660406a34.1 for ; Tue, 01 Jul 2025 11:49:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751395761; x=1752000561; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Dlocpt7CECBU87LrrF2s/X5hZPUr9DDE65AWKyn7Ey8=; b=l5LuHxZApeVJyRDn+NuM0x5NFE5RxJ7mGHUZH9Mf5l3baC+5ZcW2P/UHFjwZQv5nBW McBgKlyly3OkuczEOI4RJtaf245+BYi1k/zh8MQj2Zn4PcKeKHAlJ6Z1yGUjx+j+SRkK 0DqhEekdsnmD7wwDCEMfIw28XGseXlKfw130Z+qpjPtLBMKnpJXkFRctElk1mCDI+lwT vOpouNepc6xWO4u3Bc5Pnb363CGRWR9DbDLPNwgqMKME/fpGxGJpqIf/u014xc/ku6Tl hdW+6Xert6ffrr8bccwXkQy8beE6+PEgq2SS7tBA4k+FM6U0ZIHDHcxSOvQYtnUmZPVt wj7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751395761; x=1752000561; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Dlocpt7CECBU87LrrF2s/X5hZPUr9DDE65AWKyn7Ey8=; b=dLV0lsmmZDZp/nrdTXN5rRDz3sX6TG9L4efkURS+M+hsIc8DIra5sOxeEm4D9MjKSK mswzo8jxoRT4nuH1Ew5x7IojYzTQDCmAuYGE16M0fUT9okwr7H9ypnQpT1U3NIS6aZFR iQtVC9MmG+IrvbiykR23n80DcXkvSe+CLs6SwI/KwFYY+qkReRh6uR+AuOm9nK6yhEhA 5JAHyoA33hTafd8rIzr4L+r0pOgZUeaN2SNuxq43hJs71DN8TnTu8ThTacWFWE2QoKTt 5e9rMwzVruT2m+s+GxKYOr0wyttiXtx9X8bTTS/ZBHwyFCBdF8JkCEqwBEjjMgDK9xqM bo9A== X-Gm-Message-State: AOJu0Yyzp2ycXkqhQwO+R79AUrPcUDbNPXnJb7SjTfrNZvN0sXg7cRSL +cUn/uLwSCDnDzK2KIw8pSAyxhLaHML8uk/NHwcGlLKhkWojctYoFuro X-Gm-Gg: ASbGncs/DBW07ettNXrCt2PX7i2GSpWnyNelC/knD5ACNZVD9GvDZ6su8w2q6H4DD3P lDL5ja+oTaUlTsjRZlCvT3bWUZMIPo4eOYESfsP6wzCs6brl6pMoxyJl7h3Y0q9yDdVa66Kfvlx 7mqzJnrGF4JyZMjH8A0w2NnCcUPZ0L103eOOWFykr+sdzULWCSlUxmapTwkpqai/NzJLzoqwXyU iOWkx643WIEVfSoieGM+Wk5vftUd1X0W/CvZuAhBOhZp7FT8y0UsbZgClxbcavE7BjiR6VrsJ7e A7fAv36lZRTlMw8lnGnW8a9riO4ZJ384VMb3hfDV8/yuiyisqPDMj6CMv2DkHAk= X-Google-Smtp-Source: AGHT+IGD6GYhV0TyC/EZGQWTN/JNDfKd7qgK/xYCQH+qgaNeT3VqCslC9FibejmA5HPhSxwD102TRw== X-Received: by 2002:a05:6830:91e:b0:72b:8fd3:e2dc with SMTP id 46e09a7af769-73b4cbe37a2mr82752a34.21.1751395760847; Tue, 01 Jul 2025 11:49:20 -0700 (PDT) Received: from skc-Dell-Pro-16-Plus-PB16250.. ([132.237.156.254]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-73afb0e3160sm2213242a34.44.2025.07.01.11.49.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jul 2025 11:49:20 -0700 (PDT) From: Suresh K C X-Google-Original-From: Suresh K C To: nphamcs@gmail.com, hannes@cmpxchg.org, joshua.hahnjy@gmail.com, shuah@kernel.org Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Suresh K C Subject: [PATCH v2 2/2] selftest: improve mmap test clarity Date: Wed, 2 Jul 2025 00:19:02 +0530 Message-ID: <20250701184902.8927-2-suresh.k.chandrappa@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250701184902.8927-1-suresh.k.chandrappa@gmail.com> References: <20250701184902.8927-1-suresh.k.chandrappa@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: zi6usryyucykzg7c48tkx117f3uwkbgm X-Rspamd-Queue-Id: 0539F20007 X-Rspam-User: X-Rspamd-Server: rspam07 X-HE-Tag: 1751395761-265955 X-HE-Meta: U2FsdGVkX19RVO8MO58BYx+goLhpa8qP6CJ+jFUX9ASKkL7deScJOh8jeNcatxzEP0xS3cqJoWRIxLZZtg5rmVM0rxfeSBVeolgOir8yAGGFEMDfKZnqlgUx6cMS4bq9dq14eLz8d1hmSrj7IiumeUIrONTV7K2naCCUUeWMNmQbPlc54YgD2vzx7UY/tG4uKutHeUZmlbwVH9p4mBfl2LiRWqUUpMFuq6AuoD7MMG1kyiyH4ZtqHBi8ZMtxaaY35dEMQO01bnyO94tQ+BCVNlInvCuFmXDoLJb88IxCXjOhC3bjlT+GFvl5XN0mMwBo5eFfMomSlPdsIDK7Sn7a4O/NtblkMMKCDi5wUKAIZZ4Og2LnS0yioePu/hpVRZLe2rOVqIAfHuOWOPWPL1SQW4XG5vvcTAfoMG7iJs9j7+zEqSvOcOVOiip91Zqy4sQufhnTJd8rHjFyP29JvfuSr/dL5PwXdoA1+r2tOflA508RHpJY4RmN9+mVRh32i4iCwgGAummxWEtv3Kl9LNMv1++tT80FSN/UHJU/9auh7/DbjdKCNOVxWHO9NU4048IruazPe1Di0zWqQp3cz6NBRrVdOFjCSf6v0YC8NUFzf2tv58snAYqbeaWq98qpOe8N4JxUIlvgvq38Z191IEFXyN95u0Xq6d0Su3ubLK2/99VFvCnyr1qSapgteHM1014WlHny+/iI6LBjt6A6bNEiWN9coO6l0Y0GVS8XuZtF9P/novvP9yNRzqn/QIkiSjOEZ5xVMxXlxY11I7/RyyWP0iU9aDIut5sKKAd9SJ15WmArdGCg7fAznAoZ3wzc6W2N2Pzvs5tdoxKucAodXsrYjLSSJ7P+9aC1xpPLEGckocqxDI61VPYqgEYZM1f4B+SbO1RihL970/uXNWWoAd4JrPMkCqEV4FE0/pkgbqHRAnQG45riN+Fva7qlTg4uHbLlrNwDhTHHgpp3TwtNTRp LI8LqRiT 0ArxYp9BGm3EdoPH/RcPWfeOc7Y5+DffgGnUHbn3GrVwH/JZzjnd1hYX94ZWbGcD1zRkdtNOQrFfAP73PLPZUVIi3GtdnoRuJXLhHhdYWan9UT1UeqlP1irwGnQ== 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: From: Suresh K C This patch refactors the mmap test logic to remove redundancy and improve error reporting. It also removes leftover test code that is no longer needed. Changes since v1: - Refactored mmap logic into a switch statement as suggested - Removed the last-character difference, which was only used for testing - Added clearer error messages to indicate whether shmem or mmap failed - Combined patches into a series for better context - Addressed feedback on patch origin and versioning Signed-off-by: Suresh K C --- .../selftests/cachestat/test_cachestat.c | 52 +++++++++++++------ 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/tools/testing/selftests/cachestat/test_cachestat.c b/tools/testing/selftests/cachestat/test_cachestat.c index b6452978dae0..0549b7224ba1 100644 --- a/tools/testing/selftests/cachestat/test_cachestat.c +++ b/tools/testing/selftests/cachestat/test_cachestat.c @@ -206,6 +206,17 @@ static int test_cachestat(const char *filename, bool write_random, bool create, out: return ret; } +const char* file_type_str(enum file_type type) { + switch (type) { + case FILE_SHMEM: + return "shmem"; + case FILE_MMAP: + return "mmap"; + default: + return "unknown"; + } +} + bool run_cachestat_test(enum file_type type) { @@ -225,34 +236,41 @@ bool run_cachestat_test(enum file_type type) fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, 0666); if (fd < 0) { - ksft_print_msg("Unable to create file.\n"); + ksft_print_msg("Unable to create %s file.\n",file_type_str(type)); ret = false; goto out; } if (ftruncate(fd, filesize)) { - ksft_print_msg("Unable to truncate file.\n"); - ret = false; - goto close_fd; - } - - if (!write_exactly(fd, filesize)) { - ksft_print_msg("Unable to write to file.\n"); + ksft_print_msg("Unable to truncate %s file.\n",file_type_str(type)); ret = false; goto close_fd; } - if (type == FILE_MMAP){ - char *map = mmap(NULL, filesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); - if (map == MAP_FAILED) { - ksft_print_msg("mmap failed.\n"); + switch (type){ + case FILE_SHMEM: + if (!write_exactly(fd, filesize)) { + ksft_print_msg("Unable to write to file.\n"); + ret = false; + goto close_fd; + } + break; + case FILE_MMAP: + char *map = mmap(NULL, filesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (map == MAP_FAILED) { + ksft_print_msg("mmap failed.\n"); + ret = false; + goto close_fd; + } + for (int i = 0; i < filesize; i++) { + map[i] = 'A'; + } + break; + default: + ksft_print_msg("Unsupported file type.\n"); ret = false; goto close_fd; - } - for (int i = 0; i < filesize; i++) { - map[i] = 'A'; - } - map[filesize - 1] = 'X'; + break; } syscall_ret = syscall(__NR_cachestat, fd, &cs_range, &cs, 0); -- 2.43.0