From patchwork Tue Apr 10 02:32:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 896468 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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: ozlabs.org; dmarc=none (p=none dis=none) header.from=cn.fujitsu.com Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Ks196Gs2z9s1l for ; Tue, 10 Apr 2018 12:43:25 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 27D9B3E7729 for ; Tue, 10 Apr 2018 04:43:23 +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]) by picard.linux.it (Postfix) with ESMTP id 6EE0C3E7131 for ; Tue, 10 Apr 2018 04:43:18 +0200 (CEST) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-6.smtp.seeweb.it (Postfix) with ESMTP id 459851400530 for ; Tue, 10 Apr 2018 04:43:16 +0200 (CEST) X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="38729262" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 10 Apr 2018 10:43:12 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 4CD3D4725563; Tue, 10 Apr 2018 10:43:08 +0800 (CST) Received: from RHEL7U5Alpha_SERVER.g08.fujitsu.local (10.167.220.185) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.361.1; Tue, 10 Apr 2018 10:43:06 +0800 From: Xiao Yang To: Date: Tue, 10 Apr 2018 10:32:38 +0800 Message-ID: <1523327559-22075-1-git-send-email-yangx.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <20180409125757.GA26048@rei.lan> References: <20180409125757.GA26048@rei.lan> MIME-Version: 1.0 X-Originating-IP: [10.167.220.185] X-yoursite-MailScanner-ID: 4CD3D4725563.A84C2 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: yangx.jy@cn.fujitsu.com X-Spam-Status: No, score=-0.0 required=7.0 tests=T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-6.smtp.seeweb.it Cc: ltp@lists.linux.it Subject: [LTP] [PATCH v4 1/2] preadv/preadv03.c: Add new testcase X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 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" Check the basic functionality of the preadv(2) for the file opened with O_DIRECT in all filesystem. Signed-off-by: Xiao Yang --- runtest/ltplite | 1 + runtest/stress.part3 | 1 + runtest/syscalls | 2 + testcases/kernel/syscalls/.gitignore | 2 + testcases/kernel/syscalls/preadv/preadv03.c | 140 ++++++++++++++++++++++++++++ 5 files changed, 146 insertions(+) create mode 100644 testcases/kernel/syscalls/preadv/preadv03.c diff --git a/runtest/ltplite b/runtest/ltplite index 15dc0c2..e8c6900 100644 --- a/runtest/ltplite +++ b/runtest/ltplite @@ -589,6 +589,7 @@ pread03 pread03 preadv01 preadv01 preadv02 preadv02 +preadv03 preadv03 profil01 profil01 diff --git a/runtest/stress.part3 b/runtest/stress.part3 index 2a7747c..be912c8 100644 --- a/runtest/stress.part3 +++ b/runtest/stress.part3 @@ -496,6 +496,7 @@ pread03 pread03 preadv01 preadv01 preadv02 preadv02 +preadv03 preadv03 profil01 profil01 diff --git a/runtest/syscalls b/runtest/syscalls index 76ab082..fb71c38 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -821,6 +821,8 @@ preadv01 preadv01 preadv01_64 preadv01_64 preadv02 preadv02 preadv02_64 preadv02_64 +preadv03 preadv03 +preadv03_64 preadv03_64 profil01 profil01 diff --git a/testcases/kernel/syscalls/.gitignore b/testcases/kernel/syscalls/.gitignore index eea606e..ec2af68 100644 --- a/testcases/kernel/syscalls/.gitignore +++ b/testcases/kernel/syscalls/.gitignore @@ -696,6 +696,8 @@ /preadv/preadv01_64 /preadv/preadv02 /preadv/preadv02_64 +/preadv/preadv03 +/preadv/preadv03_64 /profil/profil01 /pselect/pselect01 /pselect/pselect01_64 diff --git a/testcases/kernel/syscalls/preadv/preadv03.c b/testcases/kernel/syscalls/preadv/preadv03.c new file mode 100644 index 0000000..f7850e3 --- /dev/null +++ b/testcases/kernel/syscalls/preadv/preadv03.c @@ -0,0 +1,140 @@ +/* + * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. + * Author: Xiao Yang + * + * 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, see . + */ + +/* + * Description: + * Check the basic functionality of the preadv(2) for the file + * opened with O_DIRECT in all filesystem. + * Preadv(2) should succeed to read the expected content of data + * and after reading the file, the file offset is not changed. + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include "tst_test.h" +#include "preadv.h" + +#define MNTPOINT "mntpoint" +#define FNAME MNTPOINT"/file" + +static int fd, dev_fd; +static long blksz, org_off; +static char *pop_buf; + +static struct iovec rd_iovec[] = { + {NULL, 0}, + {NULL, 0}, +}; + +static struct tcase { + int count; + off_t *offset; + ssize_t *size; + char content; +} tcases[] = { + {1, &org_off, &blksz, 0x61}, + {2, &org_off, &blksz, 0x61}, + {1, &blksz, &blksz, 0x62}, +}; + +static void verify_direct_preadv(unsigned int n) +{ + int i; + char *vec; + struct tcase *tc = &tcases[n]; + + vec = rd_iovec[0].iov_base; + memset(vec, 0x00, blksz); + + SAFE_LSEEK(fd, 0, SEEK_SET); + + TEST(preadv(fd, rd_iovec, tc->count, *tc->offset)); + if (TEST_RETURN < 0) { + tst_res(TFAIL | TTERRNO, "Preadv(O_DIRECT) fails"); + return; + } + + if (TEST_RETURN != *tc->size) { + tst_res(TFAIL, "Preadv(O_DIRECT) read %li bytes, expected %zi", + TEST_RETURN, *tc->size); + return; + } + + for (i = 0; i < *tc->size; i++) { + if (vec[i] != tc->content) + break; + } + + if (i < *tc->size) { + tst_res(TFAIL, "Buffer wrong at %i have %02x expected %02x", + i, vec[i], tc->content); + return; + } + + if (SAFE_LSEEK(fd, 0, SEEK_CUR) != 0) { + tst_res(TFAIL, "Preadv(O_DIRECT) has changed file offset"); + return; + } + + tst_res(TPASS, "Preadv(O_DIRECT) read %zi bytes successfully " + "with content '%c' expectedly", *tc->size, tc->content); +} + +static void setup(void) +{ + dev_fd = SAFE_OPEN(tst_device->dev, O_RDWR); + SAFE_IOCTL(dev_fd, BLKSSZGET, &blksz); + + fd = SAFE_OPEN(FNAME, O_RDWR | O_CREAT | O_DIRECT, 0644); + + pop_buf = SAFE_MEMALIGN(blksz, blksz); + memset(pop_buf, 0x61, blksz); + SAFE_WRITE(1, fd, pop_buf, blksz); + + memset(pop_buf, 0x62, blksz); + SAFE_WRITE(1, fd, pop_buf, blksz); + + rd_iovec[0].iov_base = SAFE_MEMALIGN(blksz, blksz); + rd_iovec[0].iov_len = blksz; +} + +static void cleanup(void) +{ + free(pop_buf); + free(rd_iovec[0].iov_base); + + if (dev_fd > 0) + SAFE_CLOSE(dev_fd); + if (fd > 0) + SAFE_CLOSE(fd); +} + +static struct tst_test test = { + .tcnt = ARRAY_SIZE(tcases), + .setup = setup, + .cleanup = cleanup, + .test = verify_direct_preadv, + .min_kver = "2.6.30", + .mntpoint = MNTPOINT, + .mount_device = 1, + .all_filesystems = 1, +}; From patchwork Tue Apr 10 02:32:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 896467 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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: ozlabs.org; dmarc=none (p=none dis=none) header.from=cn.fujitsu.com Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Ks152cq7z9s1l for ; Tue, 10 Apr 2018 12:43:21 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id B2CFB3E7722 for ; Tue, 10 Apr 2018 04:43:18 +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]) by picard.linux.it (Postfix) with ESMTP id E12B03E6573 for ; Tue, 10 Apr 2018 04:43:16 +0200 (CEST) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-6.smtp.seeweb.it (Postfix) with ESMTP id AF3E11400530 for ; Tue, 10 Apr 2018 04:43:13 +0200 (CEST) X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="38729261" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 10 Apr 2018 10:43:12 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 96B6248AE77F; Tue, 10 Apr 2018 10:43:09 +0800 (CST) Received: from RHEL7U5Alpha_SERVER.g08.fujitsu.local (10.167.220.185) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.361.1; Tue, 10 Apr 2018 10:43:08 +0800 From: Xiao Yang To: Date: Tue, 10 Apr 2018 10:32:39 +0800 Message-ID: <1523327559-22075-2-git-send-email-yangx.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1523327559-22075-1-git-send-email-yangx.jy@cn.fujitsu.com> References: <20180409125757.GA26048@rei.lan> <1523327559-22075-1-git-send-email-yangx.jy@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.220.185] X-yoursite-MailScanner-ID: 96B6248AE77F.AA720 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: yangx.jy@cn.fujitsu.com X-Spam-Status: No, score=-0.0 required=7.0 tests=T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-6.smtp.seeweb.it Cc: ltp@lists.linux.it Subject: [LTP] [PATCH v4 2/2] pwritev/pwritev03.c: Add new testcase X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 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" Check the basic functionality of the pwritev(2) for the file opened with O_DIRECT in all filesystem. Signed-off-by: Xiao Yang --- runtest/ltplite | 1 + runtest/stress.part3 | 1 + runtest/syscalls | 2 + testcases/kernel/syscalls/.gitignore | 2 + testcases/kernel/syscalls/pwritev/pwritev03.c | 139 ++++++++++++++++++++++++++ 5 files changed, 145 insertions(+) create mode 100644 testcases/kernel/syscalls/pwritev/pwritev03.c diff --git a/runtest/ltplite b/runtest/ltplite index e8c6900..1f4d91c 100644 --- a/runtest/ltplite +++ b/runtest/ltplite @@ -612,6 +612,7 @@ pwrite04_64 pwrite04_64 pwritev01 pwritev01 pwritev02 pwritev02 +pwritev03 pwritev03 read01 read01 read02 read02 diff --git a/runtest/stress.part3 b/runtest/stress.part3 index be912c8..96f7953 100644 --- a/runtest/stress.part3 +++ b/runtest/stress.part3 @@ -517,6 +517,7 @@ pwrite04_64 pwrite04_64 pwritev01 pwritev01 pwritev02 pwritev02 +pwritev03 pwritev03 read01 read01 read02 read02 diff --git a/runtest/syscalls b/runtest/syscalls index fb71c38..8461b94 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -865,6 +865,8 @@ pwritev01 pwritev01 pwritev01_64 pwritev01_64 pwritev02 pwritev02 pwritev02_64 pwritev02_64 +pwritev03 pwritev03 +pwritev03_64 pwritev03_64 quotactl01 quotactl01 quotactl02 quotactl02 diff --git a/testcases/kernel/syscalls/.gitignore b/testcases/kernel/syscalls/.gitignore index ec2af68..c3bc662 100644 --- a/testcases/kernel/syscalls/.gitignore +++ b/testcases/kernel/syscalls/.gitignore @@ -726,6 +726,8 @@ /pwritev/pwritev01_64 /pwritev/pwritev02 /pwritev/pwritev02_64 +/pwritev/pwritev03 +/pwritev/pwritev03_64 /quotactl/quotactl01 /quotactl/quotactl02 /quotactl/quotactl03 diff --git a/testcases/kernel/syscalls/pwritev/pwritev03.c b/testcases/kernel/syscalls/pwritev/pwritev03.c new file mode 100644 index 0000000..2dacde9 --- /dev/null +++ b/testcases/kernel/syscalls/pwritev/pwritev03.c @@ -0,0 +1,139 @@ +/* + * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. + * Author: Xiao Yang + * + * 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, see . + */ + +/* + * Description: + * Check the basic functionality of the pwritev(2) for the file + * opened with O_DIRECT in all filesystem. + * pwritev(2) should succeed to write the expected content of data + * and after writing the file, the file offset is not changed. + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include "tst_test.h" +#include "pwritev.h" +#include "tst_safe_prw.h" + +#define MNTPOINT "mntpoint" +#define FNAME MNTPOINT"/file" + +static char *initbuf, *preadbuf; +static int fd, dev_fd; +static long blksz, org_off; + +static struct iovec wr_iovec[] = { + {NULL, 0}, + {NULL, 0}, +}; + +static struct tcase { + int count; + off_t *offset; + ssize_t *size; +} tcases[] = { + {1, &org_off, &blksz}, + {2, &org_off, &blksz}, + {1, &blksz, &blksz}, +}; + +static void verify_direct_pwritev(unsigned int n) +{ + int i; + struct tcase *tc = &tcases[n]; + + SAFE_PWRITE(1, fd, initbuf, blksz * 2, 0); + + TEST(pwritev(fd, wr_iovec, tc->count, *tc->offset)); + if (TEST_RETURN < 0) { + tst_res(TFAIL | TTERRNO, "Pwritev(O_DIRECT) fails"); + return; + } + + if (TEST_RETURN != *tc->size) { + tst_res(TFAIL, "Pwritev(O_DIRECT) wrote %li bytes, expected %zi", + TEST_RETURN, *tc->size); + return; + } + + if (SAFE_LSEEK(fd, 0, SEEK_CUR) != 0) { + tst_res(TFAIL, "Pwritev(O_DIRECT) had changed file offset"); + return; + } + + memset(preadbuf, 0x00, blksz); + SAFE_PREAD(1, fd, preadbuf, *tc->size, *tc->offset); + + for (i = 0; i < *tc->size; i++) { + if (preadbuf[i] != 0x61) + break; + } + + if (i != *tc->size) { + tst_res(TFAIL, "Buffer wrong at %i have %02x expected 0x61", + i, preadbuf[i]); + return; + } + + tst_res(TPASS, "Pwritev(O_DIRECT) wrote %zi bytes successfully " + "with content 'a' expectedly ", *tc->size); +} + +static void setup(void) +{ + dev_fd = SAFE_OPEN(tst_device->dev, O_RDWR); + SAFE_IOCTL(dev_fd, BLKSSZGET, &blksz); + + fd = SAFE_OPEN(FNAME, O_RDWR | O_CREAT | O_DIRECT, 0644); + + initbuf = SAFE_MEMALIGN(blksz, blksz * 2); + memset(initbuf, 0x00, blksz * 2); + + preadbuf = SAFE_MEMALIGN(blksz, blksz); + + wr_iovec[0].iov_base = SAFE_MEMALIGN(blksz, blksz); + wr_iovec[0].iov_len = blksz; + memset(wr_iovec[0].iov_base, 0x61, blksz); +} + +static void cleanup(void) +{ + free(initbuf); + free(preadbuf); + free(wr_iovec[0].iov_base); + + if (dev_fd > 0) + SAFE_CLOSE(dev_fd); + if (fd > 0) + SAFE_CLOSE(fd); +} + +static struct tst_test test = { + .tcnt = ARRAY_SIZE(tcases), + .setup = setup, + .cleanup = cleanup, + .test = verify_direct_pwritev, + .min_kver = "2.6.30", + .mntpoint = MNTPOINT, + .mount_device = 1, + .all_filesystems = 1, +};