From patchwork Mon Jan 9 12:52:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Palethorpe X-Patchwork-Id: 1723331 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=213.254.12.146; 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.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=Yg1QzoSe; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NrDPq5dY2z23fc for ; Mon, 9 Jan 2023 23:53:02 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 6ADBB3CCB7E for ; Mon, 9 Jan 2023 13:52:59 +0100 (CET) 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 125083CB5A0 for ; Mon, 9 Jan 2023 13:52:57 +0100 (CET) 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-3.smtp.seeweb.it (Postfix) with ESMTPS id 9EFD21A0088C for ; Mon, 9 Jan 2023 13:52:57 +0100 (CET) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 155D64375; Mon, 9 Jan 2023 12:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1673268775; 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=6K5+i1usSHJFOuHtuEeHp8XTQeghPKK0TpIWiC1cjeA=; b=Yg1QzoSe/FReLGDz++LZnBH6PwhJGHQ0kVOg+WgvviZwmn+Oji0YfZOUeCNU60Zu/C3Pjq Bvygai8M9gslbYn1EcHkcP797nbcnNuDX2iDcazjb2Ce1RamtQqziaCG0KvMc++pFNJNAG U5uXR2If4tMU1BYY3ne3KGk8IFvZ7jI= Received: from g78.cable.virginm.net (unknown [10.163.28.198]) by relay2.suse.de (Postfix) with ESMTP id CF41B2C141; Mon, 9 Jan 2023 12:52:54 +0000 (UTC) To: ltp@lists.linux.it Date: Mon, 9 Jan 2023 12:52:32 +0000 Message-Id: <20230109125234.4232-1-rpalethorpe@suse.com> X-Mailer: git-send-email 2.39.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 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 1/3] aiocp.c: TCONF on O_DIRECT on tmpfs 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: , X-Patchwork-Original-From: Richard Palethorpe via ltp From: Richard Palethorpe Reply-To: Richard Palethorpe Cc: Richard Palethorpe Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" From: Petr Vorel O_DIRECT is not supported on tmpfs. This flag is added by -f option, thus cannot be filtered with .skip_filesystems. Signed-off-by: Petr Vorel Reviewed-by: Richard Palethorpe --- testcases/kernel/io/ltp-aiodio/aiocp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testcases/kernel/io/ltp-aiodio/aiocp.c b/testcases/kernel/io/ltp-aiodio/aiocp.c index ee893ab11..275000f3e 100644 --- a/testcases/kernel/io/ltp-aiodio/aiocp.c +++ b/testcases/kernel/io/ltp-aiodio/aiocp.c @@ -240,6 +240,9 @@ static void setup(void) if (strncmp(str_oflag, "SYNC", 4) == 0) { dstflags |= O_SYNC; } else if (strncmp(str_oflag, "DIRECT", 6) == 0) { + if (tst_fs_type(".") == TST_TMPFS_MAGIC) + tst_brk(TCONF, "O_DIRECT not supported on tmpfs"); + srcflags |= O_DIRECT; dstflags |= O_DIRECT; } From patchwork Mon Jan 9 12:52:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Palethorpe X-Patchwork-Id: 1723332 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=213.254.12.146; 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.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=Ovz4j4+p; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (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 4NrDQ11S0Zz23fc for ; Mon, 9 Jan 2023 23:53:13 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id B13F03CCB83 for ; Mon, 9 Jan 2023 13:53:09 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [IPv6:2001:4b78:1:20::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 picard.linux.it (Postfix) with ESMTPS id 7F3403CB5A0 for ; Mon, 9 Jan 2023 13:52:58 +0100 (CET) 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-2.smtp.seeweb.it (Postfix) with ESMTPS id AEF8A600635 for ; Mon, 9 Jan 2023 13:52:57 +0100 (CET) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 4D1B2340BB; Mon, 9 Jan 2023 12:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1673268775; 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=+djHWY71XQ/WoDBMvlFZu52NAQZ78r4R5740Fjx+USQ=; b=Ovz4j4+pXT/7aF0D5aN9ulZlYXkosiXVsx+XTUynlJQ3Mpj1fjarP1Bv1XgdFzoKl87Fhi Q8eZWO4n7cy2+MGwFiq2oBMOq3N5BD5I/c59nY5eK58adNk3DUJnpx2YBNBc6X4VRf7YMz XfxBzHgaScB35WKg5MG1s3SfCON1SrQ= Received: from g78.cable.virginm.net (unknown [10.163.28.198]) by relay2.suse.de (Postfix) with ESMTP id 247A22C142; Mon, 9 Jan 2023 12:52:55 +0000 (UTC) To: ltp@lists.linux.it Date: Mon, 9 Jan 2023 12:52:33 +0000 Message-Id: <20230109125234.4232-2-rpalethorpe@suse.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230109125234.4232-1-rpalethorpe@suse.com> References: <20230109125234.4232-1-rpalethorpe@suse.com> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-2.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 autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH 2/3] aiocp: Don't use O_DIRECT when writing random file 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: , X-Patchwork-Original-From: Richard Palethorpe via ltp From: Richard Palethorpe Reply-To: Richard Palethorpe Cc: Richard Palethorpe Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" The initial write doesn't need to use O_DIRECT and could fail because the write sizes were not aligned. This drops O_DIRECT on the initial write. Also it switches to using the static data from tst_rand_data. This is better for reproducibility. Signed-off-by: Richard Palethorpe --- testcases/kernel/io/ltp-aiodio/aiocp.c | 36 ++++++-------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/testcases/kernel/io/ltp-aiodio/aiocp.c b/testcases/kernel/io/ltp-aiodio/aiocp.c index 275000f3e..cace924a2 100644 --- a/testcases/kernel/io/ltp-aiodio/aiocp.c +++ b/testcases/kernel/io/ltp-aiodio/aiocp.c @@ -27,6 +27,8 @@ #include #include "common.h" +#include "tst_rand_data.h" + static const char *srcname = "srcfile.bin"; static const char *dstname = "dstfile.bin"; @@ -55,35 +57,13 @@ static int iocb_free_count; static void fill_with_rand_data(int fd, long long size) { - const int bufsize = 64 * 1024; - const int lower = 'a'; - const int upper = 'z'; - char buf[bufsize]; - long long i = 0, j; - long long length, towrite; - - srand(time(NULL)); - - for (j = 0; j < bufsize; j++) - buf[j] = (rand() % (upper - lower + 1)) + lower; + long long i = size; - if (size <= bufsize) { - SAFE_WRITE(0, fd, buf, size); - return; + while (i > 0) { + SAFE_WRITE(1, fd, tst_rand_data, + MIN((long long)tst_rand_data_len, i)); + i -= tst_rand_data_len; } - - while (i < size) { - if (!tst_remaining_runtime()) - tst_brk(TCONF, "Out of runtime!"); - - length = rand() % (bufsize / 2) + bufsize / 2; - towrite = MIN(length, size - i); - - i += towrite; - - SAFE_WRITE(1, fd, buf, towrite); - } - SAFE_FSYNC(fd); } @@ -266,7 +246,7 @@ static void setup(void) tst_res(TINFO, "Fill %s with random data", srcname); - srcfd = SAFE_OPEN(srcname, srcflags | O_RDWR | O_CREAT, 0666); + srcfd = SAFE_OPEN(srcname, (srcflags & ~O_DIRECT) | O_RDWR | O_CREAT, 0666); fill_with_rand_data(srcfd, filesize); SAFE_CLOSE(srcfd); } From patchwork Mon Jan 9 12:52:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Palethorpe X-Patchwork-Id: 1723333 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.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=aZDI2XIx; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NrDQD2jlMz23fc for ; Mon, 9 Jan 2023 23:53:24 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id A18C23CCBDC for ; Mon, 9 Jan 2023 13:53:19 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [IPv6:2001:4b78:1:20::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 874BD3CCB6F for ; Mon, 9 Jan 2023 13:52:57 +0100 (CET) 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-2.smtp.seeweb.it (Postfix) with ESMTPS id 991A360025A for ; Mon, 9 Jan 2023 13:52:56 +0100 (CET) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 8AF534377; Mon, 9 Jan 2023 12:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1673268775; 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=gvC+OVc4oxjsWqy/LqOc7u2VGLS50uJsrLjnsdH0pI0=; b=aZDI2XIxq2/xqSpPODdQmo6xgUcXXoJwk4dNlKu5K7CQnEjz31WTwCgcV/3ZUX/8H4Uv8x CeJSZ8x+rvJisCKoM9GfyounfKCRdlj88TP5d1IdC3sRgO4AC1yaEfLVbeVpctuW5vj7kD nDJZl3MoRcpVsp8G7BiAAqSOvI7SVXE= Received: from g78.cable.virginm.net (unknown [10.163.28.198]) by relay2.suse.de (Postfix) with ESMTP id 5A82D2C142; Mon, 9 Jan 2023 12:52:55 +0000 (UTC) To: ltp@lists.linux.it Date: Mon, 9 Jan 2023 12:52:34 +0000 Message-Id: <20230109125234.4232-3-rpalethorpe@suse.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230109125234.4232-1-rpalethorpe@suse.com> References: <20230109125234.4232-1-rpalethorpe@suse.com> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-2.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 autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH 3/3] aiocp: Don't try to get tmpfs blocksize 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: , X-Patchwork-Original-From: Richard Palethorpe via ltp From: Richard Palethorpe Reply-To: Richard Palethorpe Cc: Richard Palethorpe Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" TMPFS is backed by RAM and RAM is partitioned into "pages" not "blocks". I don't know if TMPFS has a block size defined somewhere and if this is accessible. Regardless it makes no sense to get it's backing block device properties. Signed-off-by: Richard Palethorpe --- testcases/kernel/io/ltp-aiodio/aiocp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testcases/kernel/io/ltp-aiodio/aiocp.c b/testcases/kernel/io/ltp-aiodio/aiocp.c index cace924a2..bc0e209b2 100644 --- a/testcases/kernel/io/ltp-aiodio/aiocp.c +++ b/testcases/kernel/io/ltp-aiodio/aiocp.c @@ -228,7 +228,10 @@ static void setup(void) } } - alignment = tst_dev_block_size("."); + if (tst_fs_type(".") == TST_TMPFS_MAGIC) + alignment = getpagesize(); + else + alignment = tst_dev_block_size("."); if (dstflags & O_DIRECT && aio_blksize % alignment) tst_brk(TCONF, "Block size is not multiple of drive block size");