Commit c5c63835 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Linus Torvalds

memfd-test: run fuse test on hugetlb backend memory

Link: http://lkml.kernel.org/r/20171107122800.25517-10-marcandre.lureau@redhat.comSigned-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Suggested-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 29f34d1d
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
#define MFD_DEF_SIZE 8192 #define MFD_DEF_SIZE 8192
#define STACK_SIZE 65536 #define STACK_SIZE 65536
static size_t mfd_def_size = MFD_DEF_SIZE;
static int mfd_assert_new(const char *name, loff_t sz, unsigned int flags) static int mfd_assert_new(const char *name, loff_t sz, unsigned int flags)
{ {
int r, fd; int r, fd;
...@@ -123,7 +125,7 @@ static void *mfd_assert_mmap_shared(int fd) ...@@ -123,7 +125,7 @@ static void *mfd_assert_mmap_shared(int fd)
void *p; void *p;
p = mmap(NULL, p = mmap(NULL,
MFD_DEF_SIZE, mfd_def_size,
PROT_READ | PROT_WRITE, PROT_READ | PROT_WRITE,
MAP_SHARED, MAP_SHARED,
fd, fd,
...@@ -141,7 +143,7 @@ static void *mfd_assert_mmap_private(int fd) ...@@ -141,7 +143,7 @@ static void *mfd_assert_mmap_private(int fd)
void *p; void *p;
p = mmap(NULL, p = mmap(NULL,
MFD_DEF_SIZE, mfd_def_size,
PROT_READ | PROT_WRITE, PROT_READ | PROT_WRITE,
MAP_PRIVATE, MAP_PRIVATE,
fd, fd,
...@@ -174,7 +176,7 @@ static int sealing_thread_fn(void *arg) ...@@ -174,7 +176,7 @@ static int sealing_thread_fn(void *arg)
usleep(200000); usleep(200000);
/* unmount mapping before sealing to avoid i_mmap_writable failures */ /* unmount mapping before sealing to avoid i_mmap_writable failures */
munmap(global_p, MFD_DEF_SIZE); munmap(global_p, mfd_def_size);
/* Try sealing the global file; expect EBUSY or success. Current /* Try sealing the global file; expect EBUSY or success. Current
* kernels will never succeed, but in the future, kernels might * kernels will never succeed, but in the future, kernels might
...@@ -224,7 +226,7 @@ static void join_sealing_thread(pid_t pid) ...@@ -224,7 +226,7 @@ static void join_sealing_thread(pid_t pid)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
static const char zero[MFD_DEF_SIZE]; char *zero;
int fd, mfd, r; int fd, mfd, r;
void *p; void *p;
int was_sealed; int was_sealed;
...@@ -235,6 +237,25 @@ int main(int argc, char **argv) ...@@ -235,6 +237,25 @@ int main(int argc, char **argv)
abort(); abort();
} }
if (argc >= 3) {
if (!strcmp(argv[2], "hugetlbfs")) {
unsigned long hpage_size = default_huge_page_size();
if (!hpage_size) {
printf("Unable to determine huge page size\n");
abort();
}
hugetlbfs_test = 1;
mfd_def_size = hpage_size * 2;
} else {
printf("Unknown option: %s\n", argv[2]);
abort();
}
}
zero = calloc(sizeof(*zero), mfd_def_size);
/* open FUSE memfd file for GUP testing */ /* open FUSE memfd file for GUP testing */
printf("opening: %s\n", argv[1]); printf("opening: %s\n", argv[1]);
fd = open(argv[1], O_RDONLY | O_CLOEXEC); fd = open(argv[1], O_RDONLY | O_CLOEXEC);
...@@ -245,7 +266,7 @@ int main(int argc, char **argv) ...@@ -245,7 +266,7 @@ int main(int argc, char **argv)
/* create new memfd-object */ /* create new memfd-object */
mfd = mfd_assert_new("kern_memfd_fuse", mfd = mfd_assert_new("kern_memfd_fuse",
MFD_DEF_SIZE, mfd_def_size,
MFD_CLOEXEC | MFD_ALLOW_SEALING); MFD_CLOEXEC | MFD_ALLOW_SEALING);
/* mmap memfd-object for writing */ /* mmap memfd-object for writing */
...@@ -264,7 +285,7 @@ int main(int argc, char **argv) ...@@ -264,7 +285,7 @@ int main(int argc, char **argv)
* This guarantees that the receive-buffer is pinned for 1s until the * This guarantees that the receive-buffer is pinned for 1s until the
* data is written into it. The racing ADD_SEALS should thus fail as * data is written into it. The racing ADD_SEALS should thus fail as
* the pages are still pinned. */ * the pages are still pinned. */
r = read(fd, p, MFD_DEF_SIZE); r = read(fd, p, mfd_def_size);
if (r < 0) { if (r < 0) {
printf("read() failed: %m\n"); printf("read() failed: %m\n");
abort(); abort();
...@@ -291,10 +312,10 @@ int main(int argc, char **argv) ...@@ -291,10 +312,10 @@ int main(int argc, char **argv)
* enough to avoid any in-flight writes. */ * enough to avoid any in-flight writes. */
p = mfd_assert_mmap_private(mfd); p = mfd_assert_mmap_private(mfd);
if (was_sealed && memcmp(p, zero, MFD_DEF_SIZE)) { if (was_sealed && memcmp(p, zero, mfd_def_size)) {
printf("memfd sealed during read() but data not discarded\n"); printf("memfd sealed during read() but data not discarded\n");
abort(); abort();
} else if (!was_sealed && !memcmp(p, zero, MFD_DEF_SIZE)) { } else if (!was_sealed && !memcmp(p, zero, mfd_def_size)) {
printf("memfd sealed after read() but data discarded\n"); printf("memfd sealed after read() but data discarded\n");
abort(); abort();
} }
...@@ -303,6 +324,7 @@ int main(int argc, char **argv) ...@@ -303,6 +324,7 @@ int main(int argc, char **argv)
close(fd); close(fd);
printf("fuse: DONE\n"); printf("fuse: DONE\n");
free(zero);
return 0; return 0;
} }
...@@ -10,6 +10,6 @@ set -e ...@@ -10,6 +10,6 @@ set -e
mkdir mnt mkdir mnt
./fuse_mnt ./mnt ./fuse_mnt ./mnt
./fuse_test ./mnt/memfd ./fuse_test ./mnt/memfd $@
fusermount -u ./mnt fusermount -u ./mnt
rmdir ./mnt rmdir ./mnt
...@@ -60,6 +60,7 @@ fi ...@@ -60,6 +60,7 @@ fi
# Run the hugetlbfs test # Run the hugetlbfs test
# #
./memfd_test hugetlbfs ./memfd_test hugetlbfs
./run_fuse_test.sh hugetlbfs
# #
# Give back any huge pages allocated for the test # Give back any huge pages allocated for the test
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment