-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tests: add tests for renameat2(2) flags
Since mv(1) doesn't expose the RENAME_* flags we need to have our own variation in the tests/ tree. The tests are fairly obvious functional tests, though in the future (once we solve the d_revalidate issue) we might also add a full-stack overlayfs integration test. Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> Signed-off-by: Pavel Snajdr <snajpa@snajpa.net>
- Loading branch information
Showing
16 changed files
with
417 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/renameat2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
include $(top_srcdir)/config/Rules.am | ||
|
||
pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin | ||
|
||
pkgexec_PROGRAMS = renameat2 | ||
renameat2_SOURCES = renameat2.c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,128 @@ | ||
/* SPDX-License-Identifier: CDDL-1.0 OR MPL-2.0 */ | ||
/* | ||
* CDDL HEADER START | ||
* | ||
* The contents of this file are subject to the terms of the | ||
* Common Development and Distribution License (the "License"). | ||
* You may not use this file except in compliance with the License. | ||
* | ||
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE | ||
* or http://www.opensolaris.org/os/licensing. | ||
* See the License for the specific language governing permissions | ||
* and limitations under the License. | ||
* | ||
* When distributing Covered Code, include this CDDL HEADER in each | ||
* file and include the License file at usr/src/OPENSOLARIS.LICENSE. | ||
* If applicable, add the following below this CDDL HEADER, with the | ||
* fields enclosed by brackets "[]" replaced with your own identifying | ||
* information: Portions Copyright [yyyy] [name of copyright owner] | ||
* | ||
* CDDL HEADER END | ||
*/ | ||
|
||
/* | ||
* Copyright (C) 2019 Aleksa Sarai <cyphar@cyphar.com> | ||
* Copyright (C) 2019 SUSE LLC | ||
*/ | ||
|
||
/* | ||
* mv(1) doesn't currently support RENAME_{EXCHANGE,WHITEOUT} so this is a very | ||
* simple renameat2(2) wrapper for the OpenZFS self-tests. | ||
*/ | ||
|
||
#include <errno.h> | ||
#include <fcntl.h> | ||
#include <unistd.h> | ||
#include <stdio.h> | ||
#include <stdlib.h> | ||
#include <string.h> | ||
#include <sys/syscall.h> | ||
|
||
#ifndef SYS_renameat2 | ||
#ifdef __NR_renameat2 | ||
#define SYS_renameat2 __NR_renameat2 | ||
#elif defined(__x86_64__) | ||
#define SYS_renameat2 316 | ||
#elif defined(__i386__) | ||
#define SYS_renameat2 353 | ||
#elif defined(__arm__) || defined(__aarch64__) | ||
#define SYS_renameat2 382 | ||
#else | ||
#error "SYS_renameat2 not known for this architecture." | ||
#endif | ||
#endif | ||
|
||
#ifndef RENAME_NOREPLACE | ||
#define RENAME_NOREPLACE (1 << 0) /* Don't overwrite target */ | ||
#endif | ||
#ifndef RENAME_EXCHANGE | ||
#define RENAME_EXCHANGE (1 << 1) /* Exchange source and dest */ | ||
#endif | ||
#ifndef RENAME_WHITEOUT | ||
#define RENAME_WHITEOUT (1 << 2) /* Whiteout source */ | ||
#endif | ||
|
||
/* glibc doesn't provide renameat2 wrapper, let's use our own */ | ||
static int | ||
sys_renameat2(int olddirfd, const char *oldpath, | ||
int newdirfd, const char *newpath, unsigned int flags) | ||
{ | ||
int ret = syscall(SYS_renameat2, olddirfd, oldpath, newdirfd, newpath, | ||
flags); | ||
return ((ret < 0) ? -errno : ret); | ||
} | ||
|
||
static void | ||
usage(void) | ||
{ | ||
fprintf(stderr, "usage: renameat2 [-Cnwx] src dst\n"); | ||
exit(1); | ||
} | ||
|
||
static void | ||
check(void) | ||
{ | ||
int err = sys_renameat2(AT_FDCWD, ".", AT_FDCWD, ".", RENAME_EXCHANGE); | ||
exit(err == -ENOSYS); | ||
} | ||
|
||
int | ||
main(int argc, char **argv) | ||
{ | ||
char *src, *dst; | ||
int ch, err; | ||
unsigned int flags = 0; | ||
|
||
while ((ch = getopt(argc, argv, "Cnwx")) >= 0) { | ||
switch (ch) { | ||
case 'C': | ||
check(); | ||
break; | ||
case 'n': | ||
flags |= RENAME_NOREPLACE; | ||
break; | ||
case 'w': | ||
flags |= RENAME_WHITEOUT; | ||
break; | ||
case 'x': | ||
flags |= RENAME_EXCHANGE; | ||
break; | ||
default: | ||
usage(); | ||
break; | ||
} | ||
} | ||
|
||
argc -= optind; | ||
argv += optind; | ||
|
||
if (argc != 2) | ||
usage(); | ||
src = argv[0]; | ||
dst = argv[1]; | ||
|
||
err = sys_renameat2(AT_FDCWD, src, AT_FDCWD, dst, flags); | ||
if (err < 0) | ||
fprintf(stderr, "renameat2: %s", strerror(-err)); | ||
return (err != 0); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,6 +58,7 @@ SUBDIRS = \ | |
refquota \ | ||
refreserv \ | ||
removal \ | ||
renameat2 \ | ||
rename_dirs \ | ||
replacement \ | ||
reservation \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/renameat2 | ||
dist_pkgdata_SCRIPTS = \ | ||
setup.ksh \ | ||
cleanup.ksh \ | ||
renameat2_noreplace.ksh \ | ||
renameat2_exchange.ksh \ | ||
renameat2_whiteout.ksh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
#!/bin/ksh -p | ||
# | ||
# CDDL HEADER START | ||
# | ||
# The contents of this file are subject to the terms of the | ||
# Common Development and Distribution License (the "License"). | ||
# You may not use this file except in compliance with the License. | ||
# | ||
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE | ||
# or http://www.opensolaris.org/os/licensing. | ||
# See the License for the specific language governing permissions | ||
# and limitations under the License. | ||
# | ||
# When distributing Covered Code, include this CDDL HEADER in each | ||
# file and include the License file at usr/src/OPENSOLARIS.LICENSE. | ||
# If applicable, add the following below this CDDL HEADER, with the | ||
# fields enclosed by brackets "[]" replaced with your own identifying | ||
# information: Portions Copyright [yyyy] [name of copyright owner] | ||
# | ||
# CDDL HEADER END | ||
# | ||
|
||
# | ||
# Copyright 2007 Sun Microsystems, Inc. All rights reserved. | ||
# Use is subject to license terms. | ||
# | ||
|
||
# | ||
# Copyright (c) 2013 by Delphix. All rights reserved. | ||
# | ||
|
||
. $STF_SUITE/include/libtest.shlib | ||
|
||
default_cleanup |
63 changes: 63 additions & 0 deletions
63
tests/zfs-tests/tests/functional/renameat2/renameat2_exchange.ksh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
#!/bin/ksh -p | ||
# SPDX-License-Identifier: CDDL-1.0 OR MPL-2.0 | ||
|
||
# | ||
# CDDL HEADER START | ||
# | ||
# The contents of this file are subject to the terms of the | ||
# Common Development and Distribution License (the "License"). | ||
# You may not use this file except in compliance with the License. | ||
# | ||
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE | ||
# or http://www.opensolaris.org/os/licensing. | ||
# See the License for the specific language governing permissions | ||
# and limitations under the License. | ||
# | ||
# When distributing Covered Code, include this CDDL HEADER in each | ||
# file and include the License file at usr/src/OPENSOLARIS.LICENSE. | ||
# If applicable, add the following below this CDDL HEADER, with the | ||
# fields enclosed by brackets "[]" replaced with your own identifying | ||
# information: Portions Copyright [yyyy] [name of copyright owner] | ||
# | ||
# CDDL HEADER END | ||
# | ||
|
||
# | ||
# Copyright (C) 2019 Aleksa Sarai <cyphar@cyphar.com> | ||
# Copyright (C) 2019 SUSE LLC | ||
# | ||
|
||
. $STF_SUITE/include/libtest.shlib | ||
|
||
verify_runnable "both" | ||
|
||
function cleanup | ||
{ | ||
log_must rm -rf $TESTDIR/* | ||
} | ||
|
||
log_assert "ZFS supports RENAME_EXCHANGE." | ||
log_onexit cleanup | ||
|
||
cd $TESTDIR | ||
echo "foo" > foo | ||
echo "bar" > bar | ||
|
||
# Self-exchange is a no-op. | ||
log_must renameat2 -x foo foo | ||
log_must grep '^foo$' foo | ||
|
||
# Basic exchange. | ||
log_must renameat2 -x foo bar | ||
log_must grep '^bar$' foo | ||
log_must grep '^foo$' bar | ||
|
||
# And exchange back. | ||
log_must renameat2 -x foo bar | ||
log_must grep '^foo$' foo | ||
log_must grep '^bar$' bar | ||
|
||
# Exchange with a bad path should fail. | ||
log_mustnot renameat2 -x bar baz | ||
|
||
log_pass "ZFS supports RENAME_EXCHANGE as expected." |
53 changes: 53 additions & 0 deletions
53
tests/zfs-tests/tests/functional/renameat2/renameat2_noreplace.ksh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
#!/bin/ksh -p | ||
# SPDX-License-Identifier: CDDL-1.0 OR MPL-2.0 | ||
|
||
# | ||
# CDDL HEADER START | ||
# | ||
# The contents of this file are subject to the terms of the | ||
# Common Development and Distribution License (the "License"). | ||
# You may not use this file except in compliance with the License. | ||
# | ||
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE | ||
# or http://www.opensolaris.org/os/licensing. | ||
# See the License for the specific language governing permissions | ||
# and limitations under the License. | ||
# | ||
# When distributing Covered Code, include this CDDL HEADER in each | ||
# file and include the License file at usr/src/OPENSOLARIS.LICENSE. | ||
# If applicable, add the following below this CDDL HEADER, with the | ||
# fields enclosed by brackets "[]" replaced with your own identifying | ||
# information: Portions Copyright [yyyy] [name of copyright owner] | ||
# | ||
# CDDL HEADER END | ||
# | ||
|
||
# | ||
# Copyright (C) 2019 Aleksa Sarai <cyphar@cyphar.com> | ||
# Copyright (C) 2019 SUSE LLC | ||
# | ||
|
||
. $STF_SUITE/include/libtest.shlib | ||
|
||
verify_runnable "both" | ||
|
||
function cleanup | ||
{ | ||
log_must rm -rf $TESTDIR/* | ||
} | ||
|
||
log_assert "ZFS supports RENAME_NOREPLACE." | ||
log_onexit cleanup | ||
|
||
cd $TESTDIR | ||
touch foo bar | ||
|
||
# Clobbers should always fail. | ||
log_mustnot renameat2 -n foo foo | ||
log_mustnot renameat2 -n foo bar | ||
log_mustnot renameat2 -n bar foo | ||
|
||
# Regular renames should succeed. | ||
log_must renameat2 -n bar baz | ||
|
||
log_pass "ZFS supports RENAME_NOREPLACE as expected." |
Oops, something went wrong.