From patchwork Fri Jul 10 06:39:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xu X-Patchwork-Id: 1326517 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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: 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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B33Lt5R9pz9sRK for ; Fri, 10 Jul 2020 16:40:04 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 1CD663C53A5 for ; Fri, 10 Jul 2020 08:39:56 +0200 (CEST) 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]) by picard.linux.it (Postfix) with ESMTP id 88DE23C5390 for ; Fri, 10 Jul 2020 08:39:53 +0200 (CEST) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-2.smtp.seeweb.it (Postfix) with ESMTP id 6C9156016F7 for ; Fri, 10 Jul 2020 08:39:51 +0200 (CEST) X-IronPort-AV: E=Sophos;i="5.75,334,1589212800"; d="scan'208";a="96046301" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 10 Jul 2020 14:39:48 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id 881964CE4BDE; Fri, 10 Jul 2020 14:39:44 +0800 (CST) Received: from localhost.localdomain (10.167.220.84) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 10 Jul 2020 14:39:46 +0800 From: Yang Xu To: Date: Fri, 10 Jul 2020 14:39:48 +0800 Message-ID: <1594363189-20972-1-git-send-email-xuyang2018.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <20200708140034.GD7276@yuki.lan> References: <20200708140034.GD7276@yuki.lan> MIME-Version: 1.0 X-Originating-IP: [10.167.220.84] X-ClientProxiedBy: G08CNEXCHPEKD06.g08.fujitsu.local (10.167.33.205) To G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) X-yoursite-MailScanner-ID: 881964CE4BDE.AF923 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: xuyang2018.jy@cn.fujitsu.com X-Spam-Status: No, score=0.3 required=7.0 tests=KHOP_HELO_FCRDNS, SPF_HELO_NONE, SPF_NONE autolearn=disabled version=3.4.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH v2 1/2] syscalls/ioctl_loop06: Using LOOP_CONFIGURE to test invalid block size 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: , Cc: ltp@lists.linux.it Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Since kernel commit 3448914e8cc5("loop: Add LOOP_CONFIGURE ioctl"), it can set the correct block size immediately by setting loop_config.block_size. Signed-off-by: Yang Xu --- .../kernel/syscalls/ioctl/ioctl_loop06.c | 89 +++++++++++++++---- 1 file changed, 73 insertions(+), 16 deletions(-) diff --git a/testcases/kernel/syscalls/ioctl/ioctl_loop06.c b/testcases/kernel/syscalls/ioctl/ioctl_loop06.c index 096ec9363..2f172a09d 100644 --- a/testcases/kernel/syscalls/ioctl/ioctl_loop06.c +++ b/testcases/kernel/syscalls/ioctl/ioctl_loop06.c @@ -3,8 +3,8 @@ * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved. * Author: Yang Xu * - * This is a basic ioctl error test about loopdevice - * LOOP_SET_BLOCK_SIZE. + * This is a basic error test about the invalid block size of loopdevice + * by using LOOP_SET_BLOCK_SIZE or LOOP_CONFIGURE ioctl. */ #include @@ -15,41 +15,86 @@ #include "tst_test.h" static char dev_path[1024]; -static int dev_num, dev_fd, attach_flag; +static int dev_num, dev_fd, file_fd, attach_flag, loop_configure_sup = 1; static unsigned int invalid_value, half_value, unalign_value; +static struct loop_config loopconfig; static struct tcase { unsigned int *setvalue; - int exp_err; + int ioctl_flag; char *message; } tcases[] = { - {&half_value, EINVAL, "arg < 512"}, - {&invalid_value, EINVAL, "arg > PAGE_SIZE"}, - {&unalign_value, EINVAL, "arg != power_of_2"}, + {&half_value, LOOP_SET_BLOCK_SIZE, + "Using LOOP_SET_BLOCK_SIZE with arg < 512"}, + + {&invalid_value, LOOP_SET_BLOCK_SIZE, + "Using LOOP_SET_BLOCK_SIZE with arg > PAGE_SIZE"}, + + {&unalign_value, LOOP_SET_BLOCK_SIZE, + "Using LOOP_SET_BLOCK_SIZE with arg != power_of_2"}, + + {&half_value, LOOP_CONFIGURE, + "Using LOOP_CONFIGURE with block_size < 512"}, + + {&invalid_value, LOOP_CONFIGURE, + "Using LOOP_CONFIGURE with block_size > PAGE_SIZE"}, + + {&unalign_value, LOOP_CONFIGURE, + "Using LOOP_CONFIGURE with block_size != power_of_2"}, }; static void verify_ioctl_loop(unsigned int n) +{ + if (tcases[n].ioctl_flag == LOOP_CONFIGURE) + TEST(ioctl(dev_fd, LOOP_CONFIGURE, &loopconfig)); + else + TEST(ioctl(dev_fd, LOOP_SET_BLOCK_SIZE, *(tcases[n].setvalue))); + + if (TST_RET == 0) { + tst_res(TFAIL, "Set block size succeed unexpectedly"); + if (tcases[n].ioctl_flag == LOOP_CONFIGURE) + TST_RETRY_FUNC(ioctl(dev_fd, LOOP_CLR_FD, 0), TST_RETVAL_EQ0); + return; + } + if (TST_ERR == EINVAL) + tst_res(TPASS | TTERRNO, "Set block size failed as expected"); + else + tst_res(TFAIL | TTERRNO, "Set block size failed expected EINVAL got"); +} + +static void run(unsigned int n) { struct tcase *tc = &tcases[n]; tst_res(TINFO, "%s", tc->message); - TEST(ioctl(dev_fd, LOOP_SET_BLOCK_SIZE, *(tc->setvalue))); - if (TST_RET == 0) { - tst_res(TFAIL, "LOOP_SET_BLOCK_SIZE succeed unexpectedly"); + if (tc->ioctl_flag == LOOP_SET_BLOCK_SIZE) { + if (!attach_flag) { + tst_attach_device(dev_path, "test.img"); + attach_flag = 1; + } + verify_ioctl_loop(n); return; } - if (TST_ERR == tc->exp_err) { - tst_res(TPASS | TTERRNO, "LOOP_SET_BLOCK_SIZE failed as expected"); - } else { - tst_res(TFAIL | TTERRNO, "LOOP_SET_BLOCK_SIZE failed expected %s got", - tst_strerrno(tc->exp_err)); + if (tc->ioctl_flag == LOOP_CONFIGURE && !loop_configure_sup) { + tst_res(TCONF, "LOOP_CONFIGURE ioctl not supported"); + return; + } + if (attach_flag) { + SAFE_CLOSE(dev_fd); + tst_detach_device(dev_path); + attach_flag = 0; } + if (dev_fd < 0) + dev_fd = SAFE_OPEN(dev_path, O_RDWR); + loopconfig.block_size = *(tc->setvalue); + verify_ioctl_loop(n); } static void setup(void) { unsigned int pg_size; + int ret; dev_num = tst_find_free_loopdev(dev_path, sizeof(dev_path)); if (dev_num < 0) @@ -67,12 +112,24 @@ static void setup(void) if (ioctl(dev_fd, LOOP_SET_BLOCK_SIZE, 512) && errno == EINVAL) tst_brk(TCONF, "LOOP_SET_BLOCK_SIZE is not supported"); + + file_fd = SAFE_OPEN("test.img", O_RDWR); + loopconfig.fd = -1; + ret = ioctl(dev_fd, LOOP_CONFIGURE, &loopconfig); + if (ret && errno != EBADF) { + tst_res(TINFO | TERRNO, "LOOP_CONFIGURE is not supported"); + loop_configure_sup = 0; + return; + } + loopconfig.fd = file_fd; } static void cleanup(void) { if (dev_fd > 0) SAFE_CLOSE(dev_fd); + if (file_fd > 0) + SAFE_CLOSE(file_fd); if (attach_flag) tst_detach_device(dev_path); } @@ -80,7 +137,7 @@ static void cleanup(void) static struct tst_test test = { .setup = setup, .cleanup = cleanup, - .test = verify_ioctl_loop, + .test = run, .tcnt = ARRAY_SIZE(tcases), .needs_root = 1, .needs_tmpdir = 1, From patchwork Fri Jul 10 06:39:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xu X-Patchwork-Id: 1326518 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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: 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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B33Lw05wQz9sRf for ; Fri, 10 Jul 2020 16:40:07 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 73FB13C5399 for ; Fri, 10 Jul 2020 08:40:05 +0200 (CEST) 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 [217.194.8.2]) by picard.linux.it (Postfix) with ESMTP id 4FB1E3C539F for ; Fri, 10 Jul 2020 08:39:56 +0200 (CEST) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-2.smtp.seeweb.it (Postfix) with ESMTP id E884A6018C1 for ; Fri, 10 Jul 2020 08:39:54 +0200 (CEST) X-IronPort-AV: E=Sophos;i="5.75,334,1589212800"; d="scan'208";a="96046308" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 10 Jul 2020 14:39:54 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id CEC0349B1116; Fri, 10 Jul 2020 14:39:48 +0800 (CST) Received: from localhost.localdomain (10.167.220.84) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 10 Jul 2020 14:39:50 +0800 From: Yang Xu To: Date: Fri, 10 Jul 2020 14:39:49 +0800 Message-ID: <1594363189-20972-2-git-send-email-xuyang2018.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1594363189-20972-1-git-send-email-xuyang2018.jy@cn.fujitsu.com> References: <20200708140034.GD7276@yuki.lan> <1594363189-20972-1-git-send-email-xuyang2018.jy@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.220.84] X-ClientProxiedBy: G08CNEXCHPEKD06.g08.fujitsu.local (10.167.33.205) To G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) X-yoursite-MailScanner-ID: CEC0349B1116.AE147 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: xuyang2018.jy@cn.fujitsu.com X-Spam-Status: No, score=0.3 required=7.0 tests=KHOP_HELO_FCRDNS, SPF_HELO_NONE, SPF_NONE autolearn=disabled version=3.4.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH v2 2/2] syscalls/ioctl_loop05: Using LOOP_CONFIGURE to set direct io 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: , Cc: ltp@lists.linux.it Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Since kernel commit 3448914e8cc5("loop: Add LOOP_CONFIGURE ioctl"), it can explicitly request direct I/O mode by setting LO_FLAGS_DIRECT_IO in loop_config.info.lo_flags. Signed-off-by: Yang Xu --- .../kernel/syscalls/ioctl/ioctl_loop05.c | 154 +++++++++++++----- 1 file changed, 117 insertions(+), 37 deletions(-) diff --git a/testcases/kernel/syscalls/ioctl/ioctl_loop05.c b/testcases/kernel/syscalls/ioctl/ioctl_loop05.c index e3c14faab..6abb27998 100644 --- a/testcases/kernel/syscalls/ioctl/ioctl_loop05.c +++ b/testcases/kernel/syscalls/ioctl/ioctl_loop05.c @@ -19,6 +19,9 @@ * enabled but falls back to buffered I/O later on. This is the case at least * for Btrfs. Because of that the test passes both with failure as well as * success with non-zero offset. + * + * Also use LOOP_CONFIGURE to test this by setting LO_FLAGS_DIRECT_IO + * in loop_config.info.lo_flags. */ #include @@ -32,8 +35,36 @@ #define DIO_MESSAGE "In dio mode" #define NON_DIO_MESSAGE "In non dio mode" -static char dev_path[1024], sys_loop_diopath[1024], backing_file_path[1024];; +static char dev_path[1024], sys_loop_diopath[1024], backing_file_path[1024]; static int dev_num, dev_fd, block_devfd, attach_flag, logical_block_size; +static int file_fd, loop_configure_sup = 1; +static struct loop_config loopconfig; +static struct loop_info loopinfo; + +static struct tcase { + int multi; /*logical_block_size / 2 as unit */ + int dio_value; + int ioctl_flag; + char *message; +} tcases[] = { + {0, 1, LOOP_SET_DIRECT_IO, + "Using LOOP_SET_DIRET_IO without setting lo_offset or sizelimit"}, + + {2, 1, LOOP_SET_DIRECT_IO, + "Using LOOP_SET_DIRECT_IO With offset equal to logical_block_size"}, + + {1, 0, LOOP_SET_DIRECT_IO, + "Using LOOP_SET_DIRECT_IO with offset less than logical_block_size"}, + + {0, 1, LOOP_CONFIGURE, + "Using LOOP_CONFIGURE without setting lo_offset or sizelimit"}, + + {2, 1, LOOP_CONFIGURE, + "Using LOOP_CONFIGURE With offset equal to logical_block_size"}, + + {1, 0, LOOP_CONFIGURE, + "Using LOOP_CONFIGURE witg offset less than logical_block_size"}, +}; static void check_dio_value(int flag) { @@ -42,61 +73,94 @@ static void check_dio_value(int flag) memset(&loopinfoget, 0, sizeof(loopinfoget)); SAFE_IOCTL(dev_fd, LOOP_GET_STATUS, &loopinfoget); - tst_res(TINFO, "%s", flag ? DIO_MESSAGE : NON_DIO_MESSAGE); if (loopinfoget.lo_flags & LO_FLAGS_DIRECT_IO) - tst_res(flag ? TPASS : TFAIL, "lo_flags has LO_FLAGS_DIRECT_IO flag"); + tst_res(flag ? TPASS : TFAIL, + "%s, lo_flags has LO_FLAGS_DIRECT_IO flag", + flag ? DIO_MESSAGE : NON_DIO_MESSAGE); else - tst_res(flag ? TFAIL : TPASS, "lo_flags doesn't have LO_FLAGS_DIRECT_IO flag"); + tst_res(flag ? TFAIL : TPASS, + "%s, lo_flags doesn't have LO_FLAGS_DIRECT_IO flag", + flag ? DIO_MESSAGE : NON_DIO_MESSAGE); TST_ASSERT_INT(sys_loop_diopath, flag); } -static void verify_ioctl_loop(void) +static void verify_ioctl_loop(unsigned int n) { - struct loop_info loopinfo; - - memset(&loopinfo, 0, sizeof(loopinfo)); - TST_RETRY_FUNC(ioctl(dev_fd, LOOP_SET_STATUS, &loopinfo), TST_RETVAL_EQ0); + if (tcases[n].ioctl_flag == LOOP_SET_DIRECT_IO) { + TST_RETRY_FUNC(ioctl(dev_fd, LOOP_SET_STATUS, &loopinfo), TST_RETVAL_EQ0); + + TEST(ioctl(dev_fd, LOOP_SET_DIRECT_IO, 1)); + if (TST_RET == 0) { + if (tcases[n].dio_value) + tst_res(TPASS, "set direct io succeeded"); + else + tst_res(TPASS, "set direct io succeeded, offset is ignored"); + check_dio_value(1); + SAFE_IOCTL(dev_fd, LOOP_SET_DIRECT_IO, 0); + return; + } + if (TST_ERR == EINVAL && !tcases[n].dio_value) + tst_res(TPASS | TTERRNO, + "set direct io failed as expected"); + else + tst_res(TFAIL | TTERRNO, "set direct io failed"); + return; + } + /* + * When we call loop_configure ioctl successfully and detach it, + * the subquent loop_configure without non-zero lo_offset or + * sizelimit may trigger the blk_update_request I/O error. + * To avoid this, sleep 1s to ensure last blk_update_request has + * completed. + */ + sleep(1); + /* + * loop_cofigure calls loop_update_dio() function, it will ignore + * the result of setting dio. It is different from loop_set_dio. + */ + TST_RETRY_FUNC(ioctl(dev_fd, LOOP_CONFIGURE, &loopconfig), TST_RETVAL_EQ0); + check_dio_value(tcases[n].dio_value); + TST_RETRY_FUNC(ioctl(dev_fd, LOOP_CLR_FD, 0), TST_RETVAL_EQ0); +} - tst_res(TINFO, "Without setting lo_offset or sizelimit"); - SAFE_IOCTL(dev_fd, LOOP_SET_DIRECT_IO, 1); - check_dio_value(1); +static void run(unsigned int n) +{ + struct tcase *tc = &tcases[n]; - SAFE_IOCTL(dev_fd, LOOP_SET_DIRECT_IO, 0); - check_dio_value(0); + tst_res(TINFO, "%s", tc->message); - tst_res(TINFO, "With offset equal to logical_block_size"); - loopinfo.lo_offset = logical_block_size; - TST_RETRY_FUNC(ioctl(dev_fd, LOOP_SET_STATUS, &loopinfo), TST_RETVAL_EQ0); - TEST(ioctl(dev_fd, LOOP_SET_DIRECT_IO, 1)); - if (TST_RET == 0) { - tst_res(TPASS, "LOOP_SET_DIRECT_IO succeeded"); - check_dio_value(1); + if (tc->ioctl_flag == LOOP_SET_DIRECT_IO) { + if (!attach_flag) { + tst_attach_device(dev_path, "test.img"); + attach_flag = 1; + } SAFE_IOCTL(dev_fd, LOOP_SET_DIRECT_IO, 0); - } else { - tst_res(TFAIL | TTERRNO, "LOOP_SET_DIRECT_IO failed"); + check_dio_value(0); + loopinfo.lo_offset = logical_block_size * tc->multi / 2; + verify_ioctl_loop(n); + return; } - - tst_res(TINFO, "With nonzero offset less than logical_block_size"); - loopinfo.lo_offset = logical_block_size / 2; - TST_RETRY_FUNC(ioctl(dev_fd, LOOP_SET_STATUS, &loopinfo), TST_RETVAL_EQ0); - - TEST(ioctl(dev_fd, LOOP_SET_DIRECT_IO, 1)); - if (TST_RET == 0) { - tst_res(TPASS, "LOOP_SET_DIRECT_IO succeeded, offset is ignored"); - SAFE_IOCTL(dev_fd, LOOP_SET_DIRECT_IO, 0); + if (tc->ioctl_flag == LOOP_CONFIGURE && !loop_configure_sup) { + tst_res(TCONF, "LOOP_CONFIGURE ioctl not supported"); return; } - if (TST_ERR == EINVAL) - tst_res(TPASS | TTERRNO, "LOOP_SET_DIRECT_IO failed as expected"); - else - tst_res(TFAIL | TTERRNO, "LOOP_SET_DIRECT_IO failed expected EINVAL got"); + if (attach_flag) { + SAFE_CLOSE(dev_fd); + tst_detach_device(dev_path); + attach_flag = 0; + } + if (dev_fd < 0) + dev_fd = SAFE_OPEN(dev_path, O_RDWR); + loopconfig.info.lo_offset = logical_block_size * tc->multi / 2; + verify_ioctl_loop(n); } static void setup(void) { char bd_path[100]; + int ret; if (tst_fs_type(".") == TST_TMPFS_MAGIC) tst_brk(TCONF, "tmpfd doesn't support O_DIRECT flag"); @@ -128,8 +192,21 @@ static void setup(void) SAFE_IOCTL(block_devfd, BLKSSZGET, &logical_block_size); tst_res(TINFO, "backing dev(%s) logical_block_size is %d", bd_path, logical_block_size); SAFE_CLOSE(block_devfd); + if (logical_block_size > 512) TST_RETRY_FUNC(ioctl(dev_fd, LOOP_SET_BLOCK_SIZE, logical_block_size), TST_RETVAL_EQ0); + + file_fd = SAFE_OPEN("test.img", O_RDWR); + loopconfig.fd = -1; + ret = ioctl(dev_fd, LOOP_CONFIGURE, &loopconfig); + if (ret && errno != EBADF) { + tst_res(TINFO | TERRNO, "LOOP_CONFIGURE is not supported"); + loop_configure_sup = 0; + return; + } + loopconfig.block_size = logical_block_size; + loopconfig.fd = file_fd; + loopconfig.info.lo_flags = LO_FLAGS_DIRECT_IO; } static void cleanup(void) @@ -138,6 +215,8 @@ static void cleanup(void) SAFE_CLOSE(dev_fd); if (block_devfd > 0) SAFE_CLOSE(block_devfd); + if (file_fd > 0) + SAFE_CLOSE(file_fd); if (attach_flag) tst_detach_device(dev_path); } @@ -145,7 +224,8 @@ static void cleanup(void) static struct tst_test test = { .setup = setup, .cleanup = cleanup, - .test_all = verify_ioctl_loop, + .test = run, + .tcnt = ARRAY_SIZE(tcases), .needs_root = 1, .needs_tmpdir = 1, .needs_drivers = (const char *const []) {