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 DD472C8303C for ; Mon, 7 Jul 2025 15:26:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 64FBA6B03F9; Mon, 7 Jul 2025 11:26:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 626CB6B03FA; Mon, 7 Jul 2025 11:26:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 53CCE6B03FB; Mon, 7 Jul 2025 11:26:21 -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 41F736B03F9 for ; Mon, 7 Jul 2025 11:26:21 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id EDAB21D736A for ; Mon, 7 Jul 2025 15:26:20 +0000 (UTC) X-FDA: 83637844920.15.A01CC07 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf09.hostedemail.com (Postfix) with ESMTP id 1490E140015 for ; Mon, 7 Jul 2025 15:26:18 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=HLrwXdfw; spf=pass (imf09.hostedemail.com: domain of suresh.k.chandrappa@gmail.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=suresh.k.chandrappa@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751901979; 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=CK4wnJ8po7EknIU/yWoq/rDbHYqEFP2e834qGWhM8gPijsEMxY34auxt2wr2tcQBhUOV4K kDfNceKPueSVal2fTRYGmiDc9NQJHjewz8awBSMiuHZEbDxPsToShx5Rk+vhye4mUZytRv w8jUd29nFV0J1d8qrXikG/5Oz2tl/CA= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=HLrwXdfw; spf=pass (imf09.hostedemail.com: domain of suresh.k.chandrappa@gmail.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=suresh.k.chandrappa@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751901979; a=rsa-sha256; cv=none; b=YU9Q8UfARGqYdTWNhxUaBvTQ34F/Q6pkyVBlNaNsQtDxrWrwQu1F3gvuGLae/maPzkiwts 1rdjDkupxO1gG4aGv+8qfonwUPIfZNmqArWafNObyCjs2G28Cx++33e8hXImZkhI8O6qzx 8U39qJXjdvvMlrLEc5SxvAaDugREnUo= Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-234d3261631so25873885ad.1 for ; Mon, 07 Jul 2025 08:26:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751901978; x=1752506778; 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=HLrwXdfwby8svJuYkoj4NogMzYSkD2sLRjoK0fKuESTi8VDflyIiGlOLok0QNrcBVM bRPpuG29CdJw6/i0lL+Gb7Y4+QPCxU5f0+mnv8JqrxTTf1h3ULXDvajouguV8AjipcAb D1a5mGPdWaxDBREXIcRisBt0yNjncnxc1iefSjRbOlRjIa4gL4CqKK5do/oIaQTzZdRO xNWUc6pi29M9w+uRxNzdKQiBTO3+oSDdnd0nOOwg5VYpGZsHRUmNDpKhF2j+uuOjYz6s x8ePBFSq044TLyTQC8WuvasfVVzlefvD6aP6M+VIfL8eFB6S9j1QGrk90BnHB/petP+4 HUXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751901978; x=1752506778; 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=VlWBC5E8aWOKSOcyR1dayEyqZ910HmkFCyv+GEtaLlFu24GhfxqHUBYJupePHYl+Su mjE39uVxUkAcsEj53JaeX4lgpztaIFUQ8La1XSthhSJmGeMD57nQ31VXZKF7c8KrrsLJ KqIv5pFBI+buMmHGcNvbRO8jTWUw273Vwl6UAApu9rqDAyeG1e2D3cbRaui5fwx3lwv6 o1T5LN7aDByy8FPrZ1eTCC/LrInBYVGNUBerAEJXODUDmnHR/YAXn7Fv1osGd78L/4p7 C8PEzv20/sAGoQUeQq3qn3h+mNDsXccf9rlSHh6QR4aYOBE3MydWLFIti7ayjr+1EEn+ Is4A== X-Gm-Message-State: AOJu0YwJLlT0XGkrfrevqu16qvWbjwVDWfZz/eHQ7FPP1nI2Ub0pjXJf B0D+OfchS4sg+CGnIXs5cgix3fUHbbxeDGXd7cWH7c/JxZsxxAT8d7sH X-Gm-Gg: ASbGncsLT0uYbtjrV5n7BBxZgbuaCSWctRHRpWlpXWhrvXEY+ebVbIk0goo6GBnHa6m 0RatgkRoJB06pfzt1de/YUorNZ89hT/qUPj1s+qHPkn5J5zPQRg6Qn4VRt+EqrW7agkvab/z9wn eL5QnfGGKEw5n4rmetnE5VlS1LdDIoByyo47VDgoj2i0q034hNsL/5Ul5RFREkehnmxyT5vNtCn JoRCV9coZyFk22qftGxm96ACCrenn9n9i2sGWL8j++fM4iFMFVuDP95t1vZEuZvMnFkqBxWNUZS tk4UC4p6jxYTV/UoebOuqYhHhlPXetTxj+BcY0BV3roFF6orSAJ40yKhwUe9BUw= X-Google-Smtp-Source: AGHT+IGqWykd/w8bQ2ujww+9Z+3Ef0AnD/9nZSc3qwKua8/lEzUPtMn2BPqrtfdNhs0V2ycI7bUO5A== X-Received: by 2002:a17:903:1ae8:b0:23c:8f2d:5e23 with SMTP id d9443c01a7336-23c9100b4a3mr135778515ad.52.1751901977697; Mon, 07 Jul 2025 08:26:17 -0700 (PDT) Received: from skc-Dell-Pro-16-Plus-PB16250.. ([132.237.156.254]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23c84593e0asm87533495ad.193.2025.07.07.08.26.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jul 2025 08:26:17 -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: Mon, 7 Jul 2025 20:55:57 +0530 Message-ID: <20250707152557.49877-2-suresh.k.chandrappa@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250707152557.49877-1-suresh.k.chandrappa@gmail.com> References: <20250707152557.49877-1-suresh.k.chandrappa@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: apspmfubg9bww4io5xpjdjftbz9rq4pb X-Rspamd-Queue-Id: 1490E140015 X-Rspam-User: X-Rspamd-Server: rspam07 X-HE-Tag: 1751901978-681852 X-HE-Meta: U2FsdGVkX18R+H66/KcNS7Ir25TGpMJ5wogFOdBltORT/NFXiK4FyTklTE+xv0ib37VS1nLqv0JTd0DHKnB33zjT9qRCgXte15/wT5ug15zKIAvitN+axweNu1ByqFSkNTCtmCnYp6rXD6RO1/qZlKBvn1Oa9WSL7UbUWuQZW4uYijar6CmyQZB+rBH0q6Yw0CfW6Ejj5J9MTiT3ATRU4Ed5Z4ZUvfnOHWXWAhDGj7grpqBtbzsmfD2HVGARgVIZCO2gOEH9S+PJkrkzJFBO4l3CDZNcbDJTDnA9hg5n9evrbpP51xZUgPi1ge8zBorZSIuArIEuh1t/omY6UgxQCDq7z/uV+MBb+rBwh8npHCSAevyNifwxZV6FTU1Xexc2AUl80zK9cLcw4E6MKd2wUJk080QZ1sw8Oy2nzyHO7lWmAxRs7WptQTJyFyCKbbuafmw2w1PwXqSYrKggXOzXS/5wvkxY/sbqiqYnN/DVnR/ba+VZjgOfcDTnKbCWj66MGC0OFCoJ/o4JI745GfWLAyO9xsypmtN64K5zP5GNMyw7z3+rRQFdXXvBYxjZ/wz1cros34gErKAa+7EB21ddqwNfa+8uSlEl06dBI8jscgSLSDGSGxtOh9fEXwZca37VVgucNWSVQHimn30cXfmy10POjQA/Jsv9Ljme3aweQhSRHUfjQBHsPc3hi0upAVlWyrOOFmF7CBu2fGOHG8UWvSzZoP/vGi9gyIQnm1tQW0pxD4Uqi7AITgCjj+7Yy1ufJwdRdveiK1TqHLzfenFAji9v9QozUS4wjBDHWYgKatmvjChoaQlJ8WERf5aPpJjMnefhpmeq7TJdE+pLbs2Eu9o9IhHq1FQrJhm70JvOC7Ie5fJ01uOjft0Tim2RW3eRRO1Btnp857y8hHIzVo0SxgTcJ5B5/XcQoePMhZ0ka1cf8E+26SuBrbJzl8zKNJG6b20FH+QOteiH/DyV9IE 1hWIGe9E Q76B+fK4He2xA52paGGY85dr1MwiNl4Ev6fphpoY056QqGZGlQPS9VdRqJaDxJeh9J55L8SuVYoU1qAvRhIKKuz5QCz+wTEJFTIYgKiQUvrp7hvuz8uTUZcMkoy6FewlU8HXJ6S5XQO8oFDuk+CvwqIO7dZhWijj/okhIY4Hs3guDw/GRoTlTTD/lIivQkMuWUukMr8DQzouH5i9TFF8HG6Fb0YYlirSf/ysR3rBPTHz8A96HPoB7G7SD5UCQsJVmRVlANDaO0X2c/6EaAPYFws4i7AMsi2lkGqHE1BiC5ZYONJNDa3HuBEtz7nEiDmJjppPR7OtmdZ11MjIpMWjJ9ouev4iIfQBa315L9NdQmFPTFbRDX4IePyn820i2N90dMR62l5iWaY8uJqi8Q0zETjpyzQLks67+kwSa0yZ5TO7dYvDcQDAtT8Z/vIrSQbXB+9mbcRmHKkad92tYnYlViktU6UhR6aXtz13S 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