From patchwork Mon Apr 24 18:46:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1773037 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=K/Bc9nw2; dkim=fail reason="signature verification failed" header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=i+22/RLL; dkim-atps=neutral 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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q4vHj0PGgz23hs for ; Tue, 25 Apr 2023 04:46:56 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 37EC53CE571 for ; Mon, 24 Apr 2023 20:46:54 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-3.smtp.seeweb.it (in-3.smtp.seeweb.it [217.194.8.3]) (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 B7B5F3CBC8E for ; Mon, 24 Apr 2023 20:46:52 +0200 (CEST) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) (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-3.smtp.seeweb.it (Postfix) with ESMTPS id DF4A01A006FD for ; Mon, 24 Apr 2023 20:46:51 +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-out2.suse.de (Postfix) with ESMTPS id 152AE1F74D; Mon, 24 Apr 2023 18:46:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1682362011; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=w8z7RjC7lJsaqlTKb1TuRM0+LdyCJGlGA3M5Udfodzc=; b=K/Bc9nw2x+VCwl/pHwZfL6qTO+1jllReKNNOIyHEUkyRW6zHUOoJoE9V5vhdIwyB/zMt0P fTn9ke8sWZ86Z8sjmeSQiFt366kFqQW8tpxrnhwgKAEu3N3UCfPCiQ1YPdEhfDOR5qVzfp 9+VRRhkZW6HlU8T+b9ypCXzkcK7Mmtg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1682362011; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=w8z7RjC7lJsaqlTKb1TuRM0+LdyCJGlGA3M5Udfodzc=; b=i+22/RLLficIVDP/XXzTH9vXypQKgKwBXqNpFbVh215O51LJWaYYU89heCqYEzoF2mx8xU N7a8zgC11H06CkDQ== 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 A2A6A1390E; Mon, 24 Apr 2023 18:46:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Ab0oIJrORmSKVwAAMHmgww (envelope-from ); Mon, 24 Apr 2023 18:46:50 +0000 From: Petr Vorel To: ltp@lists.linux.it Date: Mon, 24 Apr 2023 20:46:57 +0200 Message-Id: <20230424184658.2858634-1-pvorel@suse.cz> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-3.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, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-3.smtp.seeweb.it Subject: [LTP] [PATCH v2 1/2] nfslock01: Add GPL-2.0-or-later license, copyright 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" C sources and headers in nfslock01 directory don't have a license. Add GPL 2+. Signed-off-by: Petr Vorel --- testcases/network/nfs/nfslock01/nfs_flock.c | 3 +++ testcases/network/nfs/nfslock01/nfs_flock.h | 5 +++++ testcases/network/nfs/nfslock01/nfs_flock_dgen.c | 3 +++ testcases/network/nfs/nfslock01/nfs_flock_func.c | 5 +++++ 4 files changed, 16 insertions(+) diff --git a/testcases/network/nfs/nfslock01/nfs_flock.c b/testcases/network/nfs/nfslock01/nfs_flock.c index 92acceee9..fe345780e 100644 --- a/testcases/network/nfs/nfslock01/nfs_flock.c +++ b/testcases/network/nfs/nfslock01/nfs_flock.c @@ -1,4 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* + * Copyright (c) Linux Test Project, 2001-2023 + * * Program for testing file locking. The original data file consists of * characters from 'A' to 'Z'. The data file after running this program * would consist of lines with 1's in even lines and 0's in odd lines. diff --git a/testcases/network/nfs/nfslock01/nfs_flock.h b/testcases/network/nfs/nfslock01/nfs_flock.h index 09e3845f4..6ed9eb689 100644 --- a/testcases/network/nfs/nfslock01/nfs_flock.h +++ b/testcases/network/nfs/nfslock01/nfs_flock.h @@ -1,3 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) Linux Test Project, 2001-2009 + */ + #include #include #include diff --git a/testcases/network/nfs/nfslock01/nfs_flock_dgen.c b/testcases/network/nfs/nfslock01/nfs_flock_dgen.c index 39abc549f..129121d9e 100644 --- a/testcases/network/nfs/nfslock01/nfs_flock_dgen.c +++ b/testcases/network/nfs/nfslock01/nfs_flock_dgen.c @@ -1,4 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* + * Copyright (c) Linux Test Project, 2001-2023 + * * This program generates data for testing file locking */ diff --git a/testcases/network/nfs/nfslock01/nfs_flock_func.c b/testcases/network/nfs/nfslock01/nfs_flock_func.c index 811136188..0896e9ae6 100644 --- a/testcases/network/nfs/nfslock01/nfs_flock_func.c +++ b/testcases/network/nfs/nfslock01/nfs_flock_func.c @@ -1,3 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) Linux Test Project, 2001-2012 + */ + #include #include From patchwork Mon Apr 24 18:46:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1773038 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=plDQCV8U; dkim=fail reason="signature verification failed" header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ZhYEnC6x; dkim-atps=neutral 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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q4vHt72skz23hs for ; Tue, 25 Apr 2023 04:47:06 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id D97003CE588 for ; Mon, 24 Apr 2023 20:47:04 +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 [217.194.8.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 E09CC3CE572 for ; Mon, 24 Apr 2023 20:46:53 +0200 (CEST) Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) (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 23E8F14004E6 for ; Mon, 24 Apr 2023 20:46:52 +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-out2.suse.de (Postfix) with ESMTPS id B6A2A1F855; Mon, 24 Apr 2023 18:46:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1682362011; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+5vAppDXN/seRbBNTClYKAdU7P4+crJ/pv75bKuWjCY=; b=plDQCV8UfHyBJpeR3Q9ZXtw2ZPEgPgTFshxIbEeKwbwMXM28Fg5H96kJBI4ORN0VOwEjIQ fNzxegfBxrO5xhRj7TE9y1q895bZiRsHiOyUwA9Pg87QbFLmB+XyKs/Ls1N+VrcSY1zJz+ h5K+Mej2UR83lnfHAAah/mh4ZMnMyGw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1682362011; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+5vAppDXN/seRbBNTClYKAdU7P4+crJ/pv75bKuWjCY=; b=ZhYEnC6xdwfKc+ghySgWtRRp2ZBfFTMkGgk7aWuIfaJTBx3BENqmPDk/0j622NKPn1PfiM ofrFesrXLT7pmhBg== 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 48F761390E; Mon, 24 Apr 2023 18:46:51 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 4HVEC5vORmSKVwAAMHmgww (envelope-from ); Mon, 24 Apr 2023 18:46:51 +0000 From: Petr Vorel To: ltp@lists.linux.it Date: Mon, 24 Apr 2023 20:46:58 +0200 Message-Id: <20230424184658.2858634-2-pvorel@suse.cz> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230424184658.2858634-1-pvorel@suse.cz> References: <20230424184658.2858634-1-pvorel@suse.cz> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 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_SOFTFAIL, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-6.smtp.seeweb.it Subject: [LTP] [PATCH v2 2/2] nfslock01: Allow to pass parameters 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" Parameter for chars in line and number of lines can be made lower to make debugging faster. Signed-off-by: Petr Vorel --- testcases/network/nfs/nfslock01/nfs_flock.c | 37 +++++++++++-------- .../network/nfs/nfslock01/nfs_flock_dgen.c | 8 ++-- testcases/network/nfs/nfslock01/nfslock01.sh | 20 ++++++---- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/testcases/network/nfs/nfslock01/nfs_flock.c b/testcases/network/nfs/nfslock01/nfs_flock.c index fe345780e..a00a43ceb 100644 --- a/testcases/network/nfs/nfslock01/nfs_flock.c +++ b/testcases/network/nfs/nfslock01/nfs_flock.c @@ -13,17 +13,15 @@ #include #include -#define BYTES 64 -#define LINES 16384 - int main(int argc, char **argv) { - int i, fd, mac; + int i, fd, mac, nchars, nlines; int offset = 0; char buf[BUFSIZ]; - if (argc != 3) { - fprintf(stderr, "Usage: %s \n", argv[0]); + if (argc != 5) { + fprintf(stderr, "Usage: %s \n", + argv[0]); exit(2); } @@ -34,48 +32,55 @@ int main(int argc, char **argv) } mac = atoi(argv[1]); + nchars = atoi(argv[3]); + nlines = atoi(argv[4]); + + if (nchars > BUFSIZ) { + printf("Exceeded the maximum limit of the buffer (%d)\n", BUFSIZ); + exit(3); + } /* * Replace a line of characters by 1's if it is process one - * else with 0's. Number of charcters in any line are BYTES-1, + * else with 0's. Number of charcters in any line are nchars-1, * the last character being a newline character. */ - for (i = 0; i < BYTES - 1; i++) { + for (i = 0; i < nchars - 1; i++) { if (mac == 1) buf[i] = '1'; else buf[i] = '0'; } - buf[BYTES - 1] = '\n'; + buf[nchars - 1] = '\n'; - for (i = 0; i < LINES; i++) { + for (i = 0; i < nlines; i++) { if (mac == 1) { /* Set the offset to even lines */ if ((i % 2) == 0) { if (i == 0) offset = 0; else - offset += 2 * BYTES; + offset += 2 * nchars; } else continue; } else { /* Set the offset to odd lines */ if ((i % 2) == 1) { if (i == 1) - offset = BYTES; + offset = nchars; else - offset += 2 * BYTES; + offset += 2 * nchars; } else continue; } - if (writeb_lock(fd, offset, SEEK_SET, BYTES) < 0) + if (writeb_lock(fd, offset, SEEK_SET, nchars) < 0) printf("failed in writeb_lock, Errno = %d", errno); lseek(fd, offset, SEEK_SET); /* write to the test file */ - write(fd, buf, BYTES); + write(fd, buf, nchars); - if (unb_lock(fd, offset, SEEK_SET, BYTES) < 0) + if (unb_lock(fd, offset, SEEK_SET, nchars) < 0) printf("failed in unb_lock, Errno = %d", errno); } exit(0); diff --git a/testcases/network/nfs/nfslock01/nfs_flock_dgen.c b/testcases/network/nfs/nfslock01/nfs_flock_dgen.c index 129121d9e..4334e911d 100644 --- a/testcases/network/nfs/nfslock01/nfs_flock_dgen.c +++ b/testcases/network/nfs/nfslock01/nfs_flock_dgen.c @@ -16,17 +16,15 @@ int main(int argc, char **argv) FILE *fp; if (argc != 5) { - printf - ("usage: \n"); + printf("usage: \n"); exit(2); } fp = fopen(argv[1], "w"); - nchars = atoi(argv[2]); + nchars = atoi(argv[2]) - 1; if (nchars > BUFSIZ) { - printf("Exceeded the maximum limit of the buffer (%d)\n", - BUFSIZ); + printf("Exceeded the maximum limit of the buffer (%d)\n", BUFSIZ); exit(3); } nlines = atoi(argv[3]); diff --git a/testcases/network/nfs/nfslock01/nfslock01.sh b/testcases/network/nfs/nfslock01/nfslock01.sh index fbcc3c00f..34eeb74a1 100755 --- a/testcases/network/nfs/nfslock01/nfslock01.sh +++ b/testcases/network/nfs/nfslock01/nfslock01.sh @@ -1,6 +1,6 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (c) Linux Test Project, 2002-2022 +# Copyright (c) Linux Test Project, 2002-2023 # Copyright (c) 2016-2018 Oracle and/or its affiliates. All Rights Reserved. # Copyright (c) International Business Machines Corp., 2001 # @@ -13,18 +13,24 @@ TST_SETUP="do_setup" TST_TESTFUNC="do_test" +NCHARS=${NCHARS:-64} +NLINES=${NLINES:-16384} + do_setup() { + local exp_size + nfs_setup tst_res TINFO "creating test files" - ROD nfs_flock_dgen flock_data 63 16384 0 - ROD nfs_flock_dgen flock_odata 63 16384 1 + ROD nfs_flock_dgen flock_data $NCHARS $NLINES 0 + ROD nfs_flock_dgen flock_odata $NCHARS $NLINES 1 - [ "$(wc -c flock_data | awk '{print $1}')" -ne 1048576 ] && \ + exp_size=$(( NCHARS * NLINES )) + [ "$(wc -c flock_data | awk '{print $1}')" -ne $exp_size ] && \ tst_brk TBROK "could not create 'flock_data'" - [ "$(wc -c flock_odata | awk '{print $1}')" -ne 1048576 ] && \ + [ "$(wc -c flock_odata | awk '{print $1}')" -ne $exp_size ] && \ tst_brk TBROK "could not create 'flock_odata'" } @@ -36,9 +42,9 @@ do_test() tst_res TINFO "locking 'flock_idata' file and writing data" - nfs_flock 0 flock_idata & + nfs_flock 0 flock_idata $NCHARS $NLINES & local pids=$! - nfs_flock 1 flock_idata & + nfs_flock 1 flock_idata $NCHARS $NLINES & pids="$pids $!" tst_res TINFO "waiting for pids: $pids"