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

Commit d5aed9c0 authored by Simon Guo's avatar Simon Guo Committed by Linus Torvalds
Browse files

selftest: move seek_to_smaps_entry() out of mlock2-tests.c 

Function seek_to_smaps_entry() can be useful for other selftest
functionalities, so move it out to header file.

Link: http://lkml.kernel.org/r/1473325970-11393-3-git-send-email-wei.guo.simon@gmail.com


Signed-off-by: default avatarSimon Guo <wei.guo.simon@gmail.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Eric B Munson <emunson@akamai.com>
Cc: Simon Guo <wei.guo.simon@gmail.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Alexey Klimov <klimov.linux@gmail.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Thierry Reding <treding@nvidia.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1448d4d8

tools/testing/selftests/vm/mlock2-tests.c

+0 −42
Original line number Original line Diff line number Diff line 
#define _GNU_SOURCE

#define _GNU_SOURCE

#include <sys/mman.h>

#include <sys/mman.h>

#include <stdint.h>

#include <stdint.h>

#include <stdio.h>

#include <stdlib.h>

#include <unistd.h>

#include <unistd.h>

#include <string.h>

#include <string.h>

#include <sys/time.h>

#include <sys/time.h>
@@ -119,46 +117,6 @@ static uint64_t get_kpageflags(unsigned long pfn) 
	return flags;

	return flags;

}

}





static FILE *seek_to_smaps_entry(unsigned long addr)

{

	FILE *file;

	char *line = NULL;

	size_t size = 0;

	unsigned long start, end;

	char perms[5];

	unsigned long offset;

	char dev[32];

	unsigned long inode;

	char path[BUFSIZ];



	file = fopen("/proc/self/smaps", "r");

	if (!file) {

		perror("fopen smaps");

		_exit(1);

	}



	while (getline(&line, &size, file) > 0) {

		if (sscanf(line, "%lx-%lx %s %lx %s %lu %s\n",

			   &start, &end, perms, &offset, dev, &inode, path) < 6)

			goto next;



		if (start <= addr && addr < end)

			goto out;



next:

		free(line);

		line = NULL;

		size = 0;

	}



	fclose(file);

	file = NULL;



out:

	free(line);

	return file;

}



#define VMFLAGS "VmFlags:"

#define VMFLAGS "VmFlags:"





static bool is_vmflag_set(unsigned long addr, const char *vmflag)

static bool is_vmflag_set(unsigned long addr, const char *vmflag)

tools/testing/selftests/vm/mlock2.h

+42 −0
Original line number Original line Diff line number Diff line 
#include <syscall.h>

#include <syscall.h>

#include <errno.h>

#include <errno.h>

#include <stdio.h>

#include <stdlib.h>





#ifndef MLOCK_ONFAULT

#ifndef MLOCK_ONFAULT

#define MLOCK_ONFAULT 1

#define MLOCK_ONFAULT 1
@@ -18,3 +20,43 @@ static int mlock2_(void *start, size_t len, int flags) 
	return -1;

	return -1;

#endif

#endif

}

}



static FILE *seek_to_smaps_entry(unsigned long addr)

{

	FILE *file;

	char *line = NULL;

	size_t size = 0;

	unsigned long start, end;

	char perms[5];

	unsigned long offset;

	char dev[32];

	unsigned long inode;

	char path[BUFSIZ];



	file = fopen("/proc/self/smaps", "r");

	if (!file) {

		perror("fopen smaps");

		_exit(1);

	}



	while (getline(&line, &size, file) > 0) {

		if (sscanf(line, "%lx-%lx %s %lx %s %lu %s\n",

			   &start, &end, perms, &offset, dev, &inode, path) < 6)

			goto next;



		if (start <= addr && addr < end)

			goto out;



next:

		free(line);

		line = NULL;

		size = 0;

	}



	fclose(file);

	file = NULL;



out:

	free(line);

	return file;

}