Skip to contentSkip to conversation

syscalls/ioctl08: add file deduplication testcases

PATCH New Christian Amann 3 participants 4 messages Mar 22, 2019 – Jul 3, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 syscalls/ioctl08: add file deduplication testcases

This adds tests for the ioctl request FIDEDUPERANGE on a btrfs device.

These tests set the contents of two files, and checks if the following entities are set correctly after the ioctl call:

- errno (set by ioctl)
- number of deduplicated bytes
- status field of the file_dedupe_range_info struct

---
 configure.ac                               |   1 +
 m4/ltp-ioctl.m4                            |  22 +++++
 runtest/syscalls                           |   1 +
 testcases/kernel/syscalls/ioctl/.gitignore |   1 +
 testcases/kernel/syscalls/ioctl/ioctl08.c  | 131 +++++++++++++++++++++++++++++
 5 files changed, 156 insertions(+)
 create mode 100644 m4/ltp-ioctl.m4
 create mode 100644 testcases/kernel/syscalls/ioctl/ioctl08.c
configure.ac +1 -0
index f05db9d2e..6a16138bb 100644
@@ -236,6 +236,7 @@ LTP_CHECK_PERF_EVENT
 LTP_CHECK_SYNCFS
 LTP_CHECK_SYNC_FILE_RANGE
 LTP_CHECK_FTS_H
+LTP_CHECK_FIDEDUPE
 
 if test "x$with_numa" = xyes; then
 	LTP_CHECK_SYSCALL_NUMA
m4/ltp-ioctl.m4 new file +22 -0
new file mode 100644
index 000000000..c7e3814c5
@@ -0,0 +1,22 @@
+dnl
+dnl Copyright (c) 2019 SUSE LLC
+dnl Author: Christian Amann <[email protected]>
+dnl
+dnl This program is free software;  you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY;  without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+dnl the GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program;  if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+
+AC_DEFUN([LTP_CHECK_FIDEDUPE],[
+AC_CHECK_TYPES([struct file_dedupe_range],,,[#include <linux/fs.h>])
+])
runtest/syscalls +1 -0
index a13d51918..0f9f985b2 100644
@@ -499,6 +499,7 @@ ioctl05      ioctl05
 ioctl06      ioctl06
 
 ioctl07      ioctl07
+ioctl08      ioctl08
 
 inotify_init1_01 inotify_init1_01
 inotify_init1_02 inotify_init1_02
testcases/kernel/syscalls/ioctl/.gitignore +1 -0
index 79516a17c..4d480a0ed 100644
@@ -5,3 +5,4 @@
 /ioctl05
 /ioctl06
 /ioctl07
+/ioctl08
testcases/kernel/syscalls/ioctl/ioctl08.c new file +131 -0

131 lines not on this page · raw message

Signature · 1 line
2.16.4
#1 lore raw

PATCH v2 1/1 syscalls/ioctl08: add file deduplication testcases

Hi Christian,

Quoted 10 lines

This adds tests for the ioctl request FIDEDUPERANGE on a btrfs device.

These tests set the contents of two files, and checks if the following entities are set correctly after the ioctl call:

- errno (set by ioctl)
- number of deduplicated bytes
- status field of the file_dedupe_range_info struct

...

Quoted 13 lines

+++ b/testcases/kernel/syscalls/ioctl/ioctl08.c

(quoted diff) +11 -0
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2019 SUSE LLC
+ * Author: Christian Amann <[email protected]>
+ *
+ */
+
+/*
+ * Tests the ioctl functionality to deduplicate fileranges using
+ * btrfs filesystem.
+ *

Review line 21

Quoted 10 lines
(quoted diff) +10 -0
+ * 1)	Sets the same contents for two files and deduplicates it.
+ *	Deduplicates 3 bytes and set the status to
+ *	FILE_DEDUPE_RANGE_SAME.
+ * 2)	Sets different content for two files and tries to
+ *	deduplicate it. 0 bytes get deduplicated and status is
+ *	set to FILE_DEDUPE_RANGE_DIFFERS.
+ * 3)	Sets same content for two files but sets the length to
+ *	deduplicate to -1. ioctl(FIDEDUPERANGE) fails with EINVAL.
+ */
+

LGTM, going to apply it with adding
#include "config.h" here (that's needed for detecting HAVE_STRUCT_FILE_DEDUPE_RANGE
+ some minor comment cleanup (see complete diff below).

Review line 28

Quoted 7 lines
(quoted diff) +7 -0
+#include <stdlib.h>
+#include "tst_test.h"
+#include <sys/ioctl.h>
+#include <errno.h>
+
+#ifdef HAVE_STRUCT_FILE_DEDUPE_RANGE
+#include <linux/fs.h>

Kind regards,
Petr

ltp-ioctl.m4 +1 -16
index c7e3814c5..81187867c 100644
@@ -1,21 +1,6 @@
-dnl
+dnl SPDX-License-Identifier: GPL-2.0-or-later
 dnl Copyright (c) 2019 SUSE LLC
 dnl Author: Christian Amann <[email protected]>
-dnl
-dnl This program is free software;  you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY;  without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-dnl the GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program;  if not, write to the Free Software
-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-dnl
 
 AC_DEFUN([LTP_CHECK_FIDEDUPE],[
 AC_CHECK_TYPES([struct file_dedupe_range],,,[#include <linux/fs.h>])
kernel/syscalls/ioctl/ioctl08.c +2 -4
index 302482dd6..8de80048c 100644
@@ -3,9 +3,6 @@
  * Copyright (c) 2019 SUSE LLC
  * Author: Christian Amann <[email protected]>
  *
- */
-
-/*
  * Tests the ioctl functionality to deduplicate fileranges using
  * btrfs filesystem.
  *
@@ -19,10 +16,11 @@
  *	deduplicate to -1. ioctl(FIDEDUPERANGE) fails with EINVAL.
  */
 
+#include "config.h"
 #include <stdlib.h>
-#include "tst_test.h"
 #include <sys/ioctl.h>
 #include <errno.h>
+#include "tst_test.h"
 
 #ifdef HAVE_STRUCT_FILE_DEDUPE_RANGE
 #include <linux/fs.h>
#2 lore raw

PATCH v2 1/1 syscalls/ioctl08: add file deduplication testcases

Quoted 32 lines · Petr Vorel

Hi Christian,

Quoted 10 lines

This adds tests for the ioctl request FIDEDUPERANGE on a btrfs device.

These tests set the contents of two files, and checks if the following entities are set correctly after the ioctl call:

- errno (set by ioctl)
- number of deduplicated bytes
- status field of the file_dedupe_range_info struct

...

Quoted 17 lines

+++ b/testcases/kernel/syscalls/ioctl/ioctl08.c

(quoted diff) +15 -0
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2019 SUSE LLC
+ * Author: Christian Amann <[email protected]>
+ *
+ */
+
+/*
+ * Tests the ioctl functionality to deduplicate fileranges using
+ * btrfs filesystem.
+ *
+ * 1)        Sets the same contents for two files and deduplicates it.
+ *   Deduplicates 3 bytes and set the status to
+ *   FILE_DEDUPE_RANGE_SAME.
+ * 2)        Sets different content for two files and tries to
Quoted 8 lines

Review line 21

Quoted 6 lines
(quoted diff) +6 -0
+ *   deduplicate it. 0 bytes get deduplicated and status is
+ *   set to FILE_DEDUPE_RANGE_DIFFERS.
+ * 3)        Sets same content for two files but sets the length to
+ *   deduplicate to -1. ioctl(FIDEDUPERANGE) fails with EINVAL.
+ */
+

LGTM, going to apply it with adding
#include "config.h" here (that's needed for detecting HAVE_STRUCT_FILE_DEDUPE_RANGE

FYI, This test fails on kernel without btrfs support.

WARNING: failed to open /dev/btrfs-control, skipping device
registration: No such file or directory
safe_macros.c:757: BROK: tst_test.c:752: mount(/dev/loop0, mnt_point, btrfs, 0, (nil)) failed: ENODEV

Thanks,
Amir.

#3 lore raw

PATCH v2 1/1 syscalls/ioctl08: add file deduplication testcases

Hi,

Quoted 6 lines

FYI, This test fails on kernel without btrfs support.

WARNING: failed to open /dev/btrfs-control, skipping device
registration: No such file or directory
safe_macros.c:757: BROK: tst_test.c:752: mount(/dev/loop0, mnt_point, btrfs, 0, (nil)) failed: ENODEV

FYI: patch sent
https://patchwork.ozlabs.org/patch/1126923/

Quoted 2 lines

Thanks,
Amir.

Kind regards,
Petr