From patchwork Fri Aug 25 06:38:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avinesh Kumar X-Patchwork-Id: 1825805 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=blXkjt8L; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=DD5FXNra; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=patchwork.ozlabs.org) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RX9L46bnZz1yZs for ; Fri, 25 Aug 2023 16:39:56 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 9DFD63CC3A8 for ; Fri, 25 Aug 2023 08:39:54 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [IPv6:2001:4b78:1:20::6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id BB6273CC3EE for ; Fri, 25 Aug 2023 08:39:39 +0200 (CEST) Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id A60111400990 for ; Fri, 25 Aug 2023 08:39:38 +0200 (CEST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id AC3A3224A8 for ; Fri, 25 Aug 2023 06:39:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1692945577; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZypuDsbwz1kqVifiJXLyms8nCCERyyHvdbK3u2Jv/8Q=; b=blXkjt8LCIYJnsS0NZvGc+Sc35PTSFR/8pYh5Byru5v2BZ2Lr10nyhZzxkrdEmcUu+uZO0 2b6zk8KlimmdiOTSWQ8ZYJB9BdM6X9zRoBhssWvnMgZc6qqdOt44vDCYr6Y2qarMP2iQZI CGasnYZmHafDJJSAwfe/eELhJx+BEPg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1692945577; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZypuDsbwz1kqVifiJXLyms8nCCERyyHvdbK3u2Jv/8Q=; b=DD5FXNraTx8BkvNuOuCtxWyKw5tJFlIEGHVjMit7WjuPMyE4Oa+E9PLxJQVy4XQA9d3nX1 MGidUiRRZ/cNwxAA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 484D2138F9 for ; Fri, 25 Aug 2023 06:39:37 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id lrmLBqlM6GR7LwAAMHmgww (envelope-from ) for ; Fri, 25 Aug 2023 06:39:37 +0000 From: Avinesh Kumar To: ltp@lists.linux.it Date: Fri, 25 Aug 2023 12:08:39 +0530 Message-ID: <20230825063932.30875-2-akumar@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230825063932.30875-1-akumar@suse.de> References: <20230825063932.30875-1-akumar@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 1.0.1 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on in-6.smtp.seeweb.it Subject: [LTP] [PATCH 2/5] syscalls/mmap09: Rewrite the test using new LTP API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Avinesh Kumar --- testcases/kernel/syscalls/mmap/mmap09.c | 134 ++++++++---------------- 1 file changed, 45 insertions(+), 89 deletions(-) diff --git a/testcases/kernel/syscalls/mmap/mmap09.c b/testcases/kernel/syscalls/mmap/mmap09.c index 4ab0da470..6f59baf4a 100644 --- a/testcases/kernel/syscalls/mmap/mmap09.c +++ b/testcases/kernel/syscalls/mmap/mmap09.c @@ -1,119 +1,75 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (c) International Business Machines Corp., 2003 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See - * the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Copyright (c) International Business Machines Corp., 2001 + * 04/2003 Written by Paul Larson + * Copyright (c) 2023 SUSE LLC Avinesh Kumar */ -/* - * Test Description: - * Verify that truncating a mmaped file works correctly. - * - * Expected Result: - * ftruncate should be allowed to increase, decrease, or zero the - * size of a file that has been mmaped +/*\ + * [Description] * - * Test: - * Use ftruncate to shrink the file while it is mapped - * Use ftruncate to grow the file while it is mapped - * Use ftruncate to zero the size of the file while it is mapped - * - * HISTORY - * 04/2003 Written by Paul Larson + * Verify that, once we have a file mapping created using mmap(), we can + * successfully shrink, grow or zero the size of the mapped file using + * ftruncate. */ -#include -#include -#include -#include -#include -#include -#include "test.h" -#define mapsize (1 << 14) -char *TCID = "mmap09"; -int TST_TOTAL = 3; +#include +#include "tst_test.h" +#define mapsize (1 << 14) +#define TEMPFILE "mmapfile" static int fd; -static char *maddr; +static char *addr; -static struct test_case_t { +static struct tcase { off_t newsize; char *desc; -} TC[] = { - {mapsize - 8192, "ftruncate mmaped file to a smaller size"}, - {mapsize + 1024, "ftruncate mmaped file to a larger size"}, - {0, "ftruncate mmaped file to 0 size"}, +} tcases[] = { + {mapsize - 8192, "ftruncate mapped file to a smaller size"}, + {mapsize + 1024, "ftruncate mapped file to a bigger size"}, + {0, "ftruncate mapped file to zero size"} }; -static void setup(void); -static void cleanup(void); - -int main(int argc, char **argv) +static void setup(void) { - int lc; - int i; - - tst_parse_opts(argc, argv, NULL, NULL); - - setup(); + fd = SAFE_OPEN(TEMPFILE, O_RDWR | O_CREAT, 0666); - for (lc = 0; TEST_LOOPING(lc); lc++) { - tst_count = 0; - for (i = 0; i < TST_TOTAL; i++) { - TEST(ftruncate(fd, TC[i].newsize)); + SAFE_FTRUNCATE(fd, mapsize); - if (TEST_RETURN == -1) { - tst_resm(TFAIL | TTERRNO, "%s", TC[i].desc); - } else { - tst_resm(TPASS, "%s", TC[i].desc); - } - } + addr = mmap(0, mapsize, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, fd, 0); + if (addr == MAP_FAILED) + tst_brk(TFAIL | TERRNO, "mmap() failed"); - } + memset(addr, 'A', mapsize); - cleanup(); - tst_exit(); } -static void setup(void) +static void run(unsigned int i) { - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; + struct stat stat_buf; + struct tcase *tc = &tcases[i]; - tst_tmpdir(); + TST_EXP_PASS(ftruncate(fd, tc->newsize), "%s", tc->desc); - if ((fd = open("mmaptest", O_RDWR | O_CREAT, 0666)) < 0) - tst_brkm(TFAIL | TERRNO, cleanup, "opening mmaptest failed"); + SAFE_FSTAT(fd, &stat_buf); + TST_EXP_EQ_LI(stat_buf.st_size, tc->newsize); - /* ftruncate the file to 16k */ - if (ftruncate(fd, mapsize) < 0) - tst_brkm(TFAIL | TERRNO, cleanup, "ftruncate file failed"); - - maddr = mmap(0, mapsize, PROT_READ | PROT_WRITE, - MAP_FILE | MAP_SHARED, fd, 0); - if (maddr == MAP_FAILED) - tst_brkm(TFAIL | TERRNO, cleanup, "mmapping mmaptest failed"); - - /* fill up the file with A's */ - memset(maddr, 'A', mapsize); + SAFE_FTRUNCATE(fd, mapsize); } static void cleanup(void) { - munmap(maddr, mapsize); - close(fd); - tst_rmdir(); + if (fd > 0) + SAFE_CLOSE(fd); + if (addr) + SAFE_MUNMAP(addr, mapsize); } + +static struct tst_test test = { + .setup = setup, + .cleanup = cleanup, + .test = run, + .tcnt = ARRAY_SIZE(tcases), + .needs_tmpdir = 1 +};