diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2013-05-24 15:55:23 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-24 16:22:52 -0700 | 
| commit | 97c9266b11967e6401866b0111af59fa894180bf (patch) | |
| tree | 5aee6fca4b8b12661d53d6570d8175d218eec0cb /tools | |
| parent | 4b949b8af12e24b8a48fa5bb775a13b558d9f4da (diff) | |
| download | olio-linux-3.10-97c9266b11967e6401866b0111af59fa894180bf.tar.xz olio-linux-3.10-97c9266b11967e6401866b0111af59fa894180bf.zip | |
revert "selftest: add simple test for soft-dirty bit"
Revert commit 58c7be84fec8 ("selftest: add simple test for soft-dirty
bit").  This is the self test for Pavel's pagemap2 patches which didn't
actually get merged.
Reported-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/Makefile | 1 | ||||
| -rw-r--r-- | tools/testing/selftests/soft-dirty/Makefile | 10 | ||||
| -rw-r--r-- | tools/testing/selftests/soft-dirty/soft-dirty.c | 114 | 
3 files changed, 0 insertions, 125 deletions
| diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index d4abc59ce1d..0a63658065f 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -6,7 +6,6 @@ TARGETS += memory-hotplug  TARGETS += mqueue  TARGETS += net  TARGETS += ptrace -TARGETS += soft-dirty  TARGETS += vm  all: diff --git a/tools/testing/selftests/soft-dirty/Makefile b/tools/testing/selftests/soft-dirty/Makefile deleted file mode 100644 index a9cdc823d6e..00000000000 --- a/tools/testing/selftests/soft-dirty/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -CFLAGS += -iquote../../../../include/uapi -Wall -soft-dirty: soft-dirty.c - -all: soft-dirty - -clean: -	rm -f soft-dirty - -run_tests: all -	@./soft-dirty || echo "soft-dirty selftests: [FAIL]" diff --git a/tools/testing/selftests/soft-dirty/soft-dirty.c b/tools/testing/selftests/soft-dirty/soft-dirty.c deleted file mode 100644 index aba4f87f87f..00000000000 --- a/tools/testing/selftests/soft-dirty/soft-dirty.c +++ /dev/null @@ -1,114 +0,0 @@ -#include <stdlib.h> -#include <stdio.h> -#include <sys/mman.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/types.h> - -typedef unsigned long long u64; - -#define PME_PRESENT	(1ULL << 63) -#define PME_SOFT_DIRTY	(1Ull << 55) - -#define PAGES_TO_TEST	3 -#ifndef PAGE_SIZE -#define PAGE_SIZE	4096 -#endif - -static void get_pagemap2(char *mem, u64 *map) -{ -	int fd; - -	fd = open("/proc/self/pagemap2", O_RDONLY); -	if (fd < 0) { -		perror("Can't open pagemap2"); -		exit(1); -	} - -	lseek(fd, (unsigned long)mem / PAGE_SIZE * sizeof(u64), SEEK_SET); -	read(fd, map, sizeof(u64) * PAGES_TO_TEST); -	close(fd); -} - -static inline char map_p(u64 map) -{ -	return map & PME_PRESENT ? 'p' : '-'; -} - -static inline char map_sd(u64 map) -{ -	return map & PME_SOFT_DIRTY ? 'd' : '-'; -} - -static int check_pte(int step, int page, u64 *map, u64 want) -{ -	if ((map[page] & want) != want) { -		printf("Step %d Page %d has %c%c, want %c%c\n", -				step, page, -				map_p(map[page]), map_sd(map[page]), -				map_p(want), map_sd(want)); -		return 1; -	} - -	return 0; -} - -static void clear_refs(void) -{ -	int fd; -	char *v = "4"; - -	fd = open("/proc/self/clear_refs", O_WRONLY); -	if (write(fd, v, 3) < 3) { -		perror("Can't clear soft-dirty bit"); -		exit(1); -	} -	close(fd); -} - -int main(void) -{ -	char *mem, x; -	u64 map[PAGES_TO_TEST]; - -	mem = mmap(NULL, PAGES_TO_TEST * PAGE_SIZE, -			PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, 0, 0); - -	x = mem[0]; -	mem[2 * PAGE_SIZE] = 'c'; -	get_pagemap2(mem, map); - -	if (check_pte(1, 0, map, PME_PRESENT)) -		return 1; -	if (check_pte(1, 1, map, 0)) -		return 1; -	if (check_pte(1, 2, map, PME_PRESENT | PME_SOFT_DIRTY)) -		return 1; - -	clear_refs(); -	get_pagemap2(mem, map); - -	if (check_pte(2, 0, map, PME_PRESENT)) -		return 1; -	if (check_pte(2, 1, map, 0)) -		return 1; -	if (check_pte(2, 2, map, PME_PRESENT)) -		return 1; - -	mem[0] = 'a'; -	mem[PAGE_SIZE] = 'b'; -	x = mem[2 * PAGE_SIZE]; -	get_pagemap2(mem, map); - -	if (check_pte(3, 0, map, PME_PRESENT | PME_SOFT_DIRTY)) -		return 1; -	if (check_pte(3, 1, map, PME_PRESENT | PME_SOFT_DIRTY)) -		return 1; -	if (check_pte(3, 2, map, PME_PRESENT)) -		return 1; - -	(void)x; /* gcc warn */ - -	printf("PASS\n"); -	return 0; -} |