[LTP] [PATCH v2] Refactoring aiodio_append.c test using LTP API
Andrea Cervesato
andrea.cervesato@suse.com
Mon Dec 6 10:56:52 CET 2021
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
.../kernel/io/ltp-aiodio/aiodio_append.c | 193 +++++++++---------
1 file changed, 91 insertions(+), 102 deletions(-)
diff --git a/testcases/kernel/io/ltp-aiodio/aiodio_append.c b/testcases/kernel/io/ltp-aiodio/aiodio_append.c
index 5d97ed941..31a24393d 100644
--- a/testcases/kernel/io/ltp-aiodio/aiodio_append.c
+++ b/testcases/kernel/io/ltp-aiodio/aiodio_append.c
@@ -1,84 +1,78 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (c) 2004 Daniel McNeil <daniel@osdl.org>
* 2004 Open Source Development Lab
- * 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
- *
- * Module: .c
- * Change History:
- *
- * 2/2004 Marty Ridgeway (mridge@us.ibm.com) Changes to adapt to LTP
+ * 2004 Marty Ridgeway <mridge@us.ibm.com>
+ * Copyright (C) 2021 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
+
+/*\
+ * [Description]
*
-*/
+ * Append zeroed data to a file using libaio while other processes are doing
+ * buffered reads and check if the buffer reads always see zero.
+ */
#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include "config.h"
-#include "test.h"
-
-char *TCID = "aiodio_append";
+#include "tst_test.h"
#ifdef HAVE_LIBAIO
+#include <stdlib.h>
+#include <sys/wait.h>
+#include <unistd.h>
#include <libaio.h>
+#include "common.h"
+#define FILE_NAME "aiodio_append"
#define NUM_CHILDREN 8
+#define NUM_AIO 16
+#define AIO_SIZE (64 * 1024)
+#define FILE_SIZE (64 * 1024)
-#include "common_checkzero.h"
+static int *run_child;
-int read_eof(char *filename)
+static void read_eof(const char *filename, size_t bs)
{
int fd;
- int i;
int r;
- char buf[4096];
+ char *bufptr;
- while ((fd = open(filename, O_RDONLY)) < 0) {
- sleep(1); /* wait for file to be created */
- }
+ while ((fd = open(filename, O_RDONLY, 0666)) < 0)
+ usleep(100);
- for (i = 0; i < 1000000; i++) {
+ bufptr = SAFE_MEMALIGN(getpagesize(), bs);
+
+ tst_res(TINFO, "child %i reading file", getpid());
+ while (*run_child) {
off_t offset;
char *bufoff;
- offset = lseek(fd, SEEK_END, 0);
- r = read(fd, buf, 4096);
- if (r > 0) {
- if ((bufoff = check_zero(buf, r))) {
- fprintf(stderr, "non-zero read at offset %p\n",
- offset + bufoff);
- exit(1);
+ offset = SAFE_LSEEK(fd, 0, SEEK_END);
+ do {
+ r = SAFE_READ(0, fd, bufptr, bs);
+ if (r > 0) {
+ bufoff = check_zero(bufptr, r);
+ if (bufoff) {
+ tst_res(TINFO, "non-zero read at offset %zu",
+ offset + (bufoff - bufptr));
+ free(bufptr);
+ SAFE_CLOSE(fd);
+ return;
+ }
+ offset += r;
}
- }
+ } while (r > 0);
}
- return 0;
-}
-#define NUM_AIO 16
-#define AIO_SIZE 64*1024
+ free(bufptr);
+ SAFE_CLOSE(fd);
+}
/*
* append to the end of a file using AIO DIRECT.
*/
-void aiodio_append(char *filename)
+static void aiodio_append(char *filename, int bcount)
{
int fd;
void *bufptr;
@@ -91,21 +85,13 @@ void aiodio_append(char *filename)
struct io_event event;
struct timespec timeout;
- fd = open(filename, O_DIRECT | O_WRONLY | O_CREAT, 0666);
- if (fd < 0) {
- perror("cannot create file");
- return;
- }
+ fd = SAFE_OPEN(filename, O_DIRECT | O_WRONLY | O_CREAT, 0666);
memset(&myctx, 0, sizeof(myctx));
io_queue_init(NUM_AIO, &myctx);
for (i = 0; i < NUM_AIO; i++) {
- TEST(posix_memalign(&bufptr, 4096, AIO_SIZE));
- if (TEST_RETURN) {
- tst_resm(TBROK | TRERRNO, "cannot malloc aligned memory");
- return;
- }
+ bufptr = SAFE_MEMALIGN(getpagesize(), AIO_SIZE);
memset(bufptr, 0, AIO_SIZE);
io_prep_pwrite(&iocb_array[i], fd, bufptr, AIO_SIZE, offset);
iocbs[i] = &iocb_array[i];
@@ -115,14 +101,14 @@ void aiodio_append(char *filename)
/*
* Start the 1st NUM_AIO requests
*/
- if ((w = io_submit(myctx, NUM_AIO, iocbs)) < 0) {
- fprintf(stderr, "io_submit write returned %d\n", w);
- }
+ w = io_submit(myctx, NUM_AIO, iocbs);
+ if (w < 0)
+ tst_brk(TBROK, "io_submit: %s", tst_strerrno(-w));
/*
* As AIO requests finish, keep issuing more AIOs.
*/
- for (; i < 1000; i++) {
+ for (; i < bcount; i++) {
int n = 0;
struct iocb *iocbp;
@@ -131,56 +117,59 @@ void aiodio_append(char *filename)
iocbp = (struct iocb *)event.obj;
if (n > 0) {
- io_prep_pwrite(iocbp, fd, iocbp->u.c.buf,
- AIO_SIZE, offset);
+ io_prep_pwrite(iocbp, fd, iocbp->u.c.buf, AIO_SIZE, offset);
offset += AIO_SIZE;
- if ((w = io_submit(myctx, 1, &iocbp)) < 0) {
- fprintf(stderr,
- "write %d returned %d\n", i, w);
- }
+ w = io_submit(myctx, 1, &iocbp);
+ if (w < 0)
+ tst_brk(TBROK, "io_submit: %s", tst_strerrno(-w));
}
}
}
}
-int main(int argc, char **argv)
+static void setup(void)
{
- int pid[NUM_CHILDREN];
- int num_children = 1;
+ run_child = SAFE_MMAP(NULL, sizeof(int), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+}
+
+static void cleanup(void)
+{
+ SAFE_MUNMAP(run_child, sizeof(int));
+}
+
+static void run(void)
+{
+ int status;
int i;
- char *filename = argv[1];
-
- printf("Starting aio/dio append test...\n");
-
- for (i = 0; i < num_children; i++) {
- if ((pid[i] = fork()) == 0) {
- /* child */
- return read_eof(filename);
- } else if (pid[i] < 0) {
- /* error */
- perror("fork error");
- break;
- } else {
- /* Parent */
- continue;
+
+ *run_child = 1;
+
+ for (i = 0; i < NUM_CHILDREN; i++) {
+ if (!SAFE_FORK()) {
+ read_eof(FILE_NAME, FILE_SIZE);
+ return;
}
}
- /*
- * Parent appends to end of file using direct i/o
- */
+ tst_res(TINFO, "Parent append to file");
- aiodio_append(filename);
+ aiodio_append(FILE_NAME, 1000);
- for (i = 0; i < num_children; i++) {
- kill(pid[i], SIGTERM);
- }
+ if (SAFE_WAITPID(-1, &status, WNOHANG))
+ tst_res(TFAIL, "Non zero bytes read");
+ else
+ tst_res(TPASS, "All bytes read were zeroed");
- return 0;
+ *run_child = 0;
}
+
+static struct tst_test test = {
+ .test_all = run,
+ .setup = setup,
+ .cleanup = cleanup,
+ .needs_tmpdir = 1,
+ .forks_child = 1,
+};
#else
-int main(void)
-{
- tst_brkm(TCONF, NULL, "test requires libaio and it's development packages");
-}
+TST_TEST_TCONF("test requires libaio and its development packages");
#endif
--
2.34.1
More information about the ltp
mailing list