Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29f34d1d authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Linus Torvalds
Browse files

memfd-test: move common code to a shared unit 

The memfd & fuse tests will share more common code in the following
commits to test hugetlb support.

Link: http://lkml.kernel.org/r/20171107122800.25517-9-marcandre.lureau@redhat.com


Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.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 3037aeb9

tools/testing/selftests/memfd/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -12,3 +12,8 @@ fuse_mnt.o: CFLAGS += $(shell pkg-config fuse --cflags) 
include ../lib.mk



$(OUTPUT)/fuse_mnt: LDLIBS += $(shell pkg-config fuse --libs)



$(OUTPUT)/memfd_test: memfd_test.c common.o

$(OUTPUT)/fuse_test: fuse_test.c common.o



EXTRA_CLEAN = common.o

tools/testing/selftests/memfd/common.c

0 → 100644
+46 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#define _GNU_SOURCE

#define __EXPORTED_HEADERS__



#include <stdio.h>

#include <stdlib.h>

#include <linux/fcntl.h>

#include <linux/memfd.h>

#include <unistd.h>

#include <sys/syscall.h>



#include "common.h"



int hugetlbfs_test = 0;



/*

 * Copied from mlock2-tests.c

 */

unsigned long default_huge_page_size(void)

{

	unsigned long hps = 0;

	char *line = NULL;

	size_t linelen = 0;

	FILE *f = fopen("/proc/meminfo", "r");



	if (!f)

		return 0;

	while (getline(&line, &linelen, f) > 0) {

		if (sscanf(line, "Hugepagesize:       %lu kB", &hps) == 1) {

			hps <<= 10;

			break;

		}

	}



	free(line);

	fclose(f);

	return hps;

}



int sys_memfd_create(const char *name, unsigned int flags)

{

	if (hugetlbfs_test)

		flags |= MFD_HUGETLB;



	return syscall(__NR_memfd_create, name, flags);

}

tools/testing/selftests/memfd/common.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#ifndef COMMON_H_

#define COMMON_H_



extern int hugetlbfs_test;



unsigned long default_huge_page_size(void);

int sys_memfd_create(const char *name, unsigned int flags);



#endif

tools/testing/selftests/memfd/fuse_test.c

+2 −6
Original line number Diff line number Diff line
@@ -33,15 +33,11 @@ 
#include <sys/wait.h>

#include <unistd.h>



#include "common.h"



#define MFD_DEF_SIZE 8192

#define STACK_SIZE 65536



static int sys_memfd_create(const char *name,

			    unsigned int flags)

{

	return syscall(__NR_memfd_create, name, flags);

}



static int mfd_assert_new(const char *name, loff_t sz, unsigned int flags)

{

	int r, fd;

tools/testing/selftests/memfd/memfd_test.c

+2 −34
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include <sys/wait.h>

#include <unistd.h>



#include "common.h"



#define MEMFD_STR	"memfd:"

#define MEMFD_HUGE_STR	"memfd-hugetlb:"

#define SHARED_FT_STR	"(shared file-table)"
@@ -29,43 +31,9 @@ 
/*

 * Default is not to test hugetlbfs

 */

static int hugetlbfs_test;

static size_t mfd_def_size = MFD_DEF_SIZE;

static const char *memfd_str = MEMFD_STR;



/*

 * Copied from mlock2-tests.c

 */

static unsigned long default_huge_page_size(void)

{

	unsigned long hps = 0;

	char *line = NULL;

	size_t linelen = 0;

	FILE *f = fopen("/proc/meminfo", "r");



	if (!f)

		return 0;

	while (getline(&line, &linelen, f) > 0) {

		if (sscanf(line, "Hugepagesize:       %lu kB", &hps) == 1) {

			hps <<= 10;

			break;

		}

	}



	free(line);

	fclose(f);

	return hps;

}



static int sys_memfd_create(const char *name,

			    unsigned int flags)

{

	if (hugetlbfs_test)

		flags |= MFD_HUGETLB;



	return syscall(__NR_memfd_create, name, flags);

}



static int mfd_assert_new(const char *name, loff_t sz, unsigned int flags)

{

	int r, fd;