[PATCH] uml: move libc code out of mem_user.c and tempfile.c (0f80bc85) · Commits · e / devices / android_kernel_fairphone_FP4

arch/um/include/mem_user.h

+0 −15

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,6 @@ extern unsigned long task_size;

	extern void check_devanon(void);		extern void check_devanon(void);
	extern int init_mem_user(void);		extern int init_mem_user(void);
	extern int create_mem_file(unsigned long len);
	extern void setup_memory(void *entry);		extern void setup_memory(void *entry);
	extern unsigned long find_iomem(char driver, unsigned long len_out);		extern unsigned long find_iomem(char driver, unsigned long len_out);
	extern int init_maps(unsigned long physmem, unsigned long iomem,		extern int init_maps(unsigned long physmem, unsigned long iomem,
	@@ -64,20 +63,6 @@ extern unsigned long phys_offset(unsigned long phys);
	extern void unmap_physmem(void);		extern void unmap_physmem(void);
	extern void map_memory(unsigned long virt, unsigned long phys,		extern void map_memory(unsigned long virt, unsigned long phys,
	unsigned long len, int r, int w, int x);		unsigned long len, int r, int w, int x);
	extern int protect_memory(unsigned long addr, unsigned long len,
	int r, int w, int x, int must_succeed);
	extern unsigned long get_kmem_end(void);		extern unsigned long get_kmem_end(void);
	extern void check_tmpexec(void);

	#endif		#endif

	/*
	* Overrides for Emacs so that we follow Linus's tabbing style.
	* Emacs will notice this stuff at the end of the file and automatically
	* adjust the settings for this buffer only. This must remain at the end
	* of the file.
	* ---------------------------------------------------------------------------
	* Local variables:
	* c-file-style: "linux"
	* End:
	*/

arch/um/include/os.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -157,6 +157,9 @@ extern int os_lock_file(int fd, int excl);
	extern void os_early_checks(void);		extern void os_early_checks(void);
	extern int can_do_skas(void);		extern int can_do_skas(void);

			/* mem.c */
			extern int create_mem_file(unsigned long len);

	/* process.c */		/* process.c */
	extern unsigned long os_process_pc(int pid);		extern unsigned long os_process_pc(int pid);
	extern int os_process_parent(int pid);		extern int os_process_parent(int pid);
	@@ -181,6 +184,8 @@ extern unsigned long long os_usecs(void);
	/* tt.c		/* tt.c
	* for tt mode only (will be deleted in future...)		* for tt mode only (will be deleted in future...)
	*/		*/
			extern int protect_memory(unsigned long addr, unsigned long len,
			int r, int w, int x, int must_succeed);
	extern void forward_pending_sigio(int target);		extern void forward_pending_sigio(int target);
	extern int start_fork_tramp(void *arg, unsigned long temp_stack,		extern int start_fork_tramp(void *arg, unsigned long temp_stack,
	int clone_flags, int (tramp)(void ));		int clone_flags, int (tramp)(void ));

arch/um/kernel/Makefile

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,7 @@ obj-y = config.o exec_kern.o exitcode.o \
	helper.o init_task.o irq.o irq_user.o ksyms.o main.o mem.o mem_user.o \		helper.o init_task.o irq.o irq_user.o ksyms.o main.o mem.o mem_user.o \
	physmem.o process_kern.o ptrace.o reboot.o resource.o sigio_user.o \		physmem.o process_kern.o ptrace.o reboot.o resource.o sigio_user.o \
	sigio_kern.o signal_kern.o signal_user.o smp.o syscall_kern.o sysrq.o \		sigio_kern.o signal_kern.o signal_user.o smp.o syscall_kern.o sysrq.o \
	tempfile.o time.o time_kern.o tlb.o trap_kern.o trap_user.o \		time.o time_kern.o tlb.o trap_kern.o trap_user.o \
	uaccess_user.o um_arch.o umid.o user_util.o		uaccess_user.o um_arch.o umid.o user_util.o

	obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o		obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
	@@ -24,8 +24,8 @@ obj-$(CONFIG_MODE_SKAS) += skas/

	user-objs-$(CONFIG_TTY_LOG) += tty_log.o		user-objs-$(CONFIG_TTY_LOG) += tty_log.o

	USER_OBJS := $(user-objs-y) config.o helper.o main.o tempfile.o time.o \		USER_OBJS := $(user-objs-y) config.o helper.o main.o time.o tty_log.o umid.o \
	tty_log.o umid.o user_util.o		user_util.o

	include arch/um/scripts/Makefile.rules		include arch/um/scripts/Makefile.rules

arch/um/kernel/init_task.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -13,6 +13,7 @@
	#include "asm/pgtable.h"		#include "asm/pgtable.h"
	#include "user_util.h"		#include "user_util.h"
	#include "mem_user.h"		#include "mem_user.h"
			#include "os.h"

	static struct fs_struct init_fs = INIT_FS;		static struct fs_struct init_fs = INIT_FS;
	struct mm_struct init_mm = INIT_MM(init_mm);		struct mm_struct init_mm = INIT_MM(init_mm);
	@@ -45,8 +46,8 @@ __attribute__((__section__(".data.init_task"))) =

	void unprotect_stack(unsigned long stack)		void unprotect_stack(unsigned long stack)
	{		{
	protect_memory(stack, (1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE,		os_protect_memory((void ) stack, (1 << CONFIG_KERNEL_STACK_ORDER) PAGE_SIZE,
	1, 1, 0, 1);		1, 1, 0);
	}		}

	/*		/*

arch/um/kernel/mem_user.c

+1 −204

Original line number	Original line	Diff line number	Diff line
	@@ -48,219 +48,16 @@
	#include "tempfile.h"		#include "tempfile.h"
	#include "kern_constants.h"		#include "kern_constants.h"

	#define TEMPNAME_TEMPLATE "vm_file-XXXXXX"

	static int create_tmp_file(unsigned long len)
	{
	int fd, err;
	char zero;

	fd = make_tempfile(TEMPNAME_TEMPLATE, NULL, 1);
	if(fd < 0) {
	os_print_error(fd, "make_tempfile");
	exit(1);
	}

	err = os_mode_fd(fd, 0777);
	if(err < 0){
	os_print_error(err, "os_mode_fd");
	exit(1);
	}
	err = os_seek_file(fd, len);
	if(err < 0){
	os_print_error(err, "os_seek_file");
	exit(1);
	}
	zero = 0;
	err = os_write_file(fd, &zero, 1);
	if(err != 1){
	os_print_error(err, "os_write_file");
	exit(1);
	}

	return(fd);
	}

	void check_tmpexec(void)
	{
	void *addr;
	int err, fd = create_tmp_file(UM_KERN_PAGE_SIZE);

	addr = mmap(NULL, UM_KERN_PAGE_SIZE,
	PROT_READ \| PROT_WRITE \| PROT_EXEC, MAP_PRIVATE, fd, 0);
	printf("Checking PROT_EXEC mmap in /tmp...");
	fflush(stdout);
	if(addr == MAP_FAILED){
	err = errno;
	perror("failed");
	if(err == EPERM)
	printf("/tmp must be not mounted noexec\n");
	exit(1);
	}
	printf("OK\n");
	munmap(addr, UM_KERN_PAGE_SIZE);

	os_close_file(fd);
	}

	static int have_devanon = 0;

	void check_devanon(void)
	{
	int fd;

	printk("Checking for /dev/anon on the host...");
	fd = open("/dev/anon", O_RDWR);
	if(fd < 0){
	printk("Not available (open failed with errno %d)\n", errno);
	return;
	}

	printk("OK\n");
	have_devanon = 1;
	}

	static int create_anon_file(unsigned long len)
	{
	void *addr;
	int fd;

	fd = open("/dev/anon", O_RDWR);
	if(fd < 0) {
	os_print_error(fd, "opening /dev/anon");
	exit(1);
	}

	addr = mmap(NULL, len, PROT_READ \| PROT_WRITE, MAP_PRIVATE, fd, 0);
	if(addr == MAP_FAILED){
	perror("mapping physmem file");
	exit(1);
	}
	munmap(addr, len);

	return(fd);
	}

	int create_mem_file(unsigned long len)
	{
	int err, fd;

	if(have_devanon)
	fd = create_anon_file(len);
	else fd = create_tmp_file(len);

	err = os_set_exec_close(fd, 1);
	if(err < 0)
	os_print_error(err, "exec_close");
	return(fd);
	}

	struct iomem_region *iomem_regions = NULL;		struct iomem_region *iomem_regions = NULL;
	int iomem_size = 0;		int iomem_size = 0;

	static int __init parse_iomem(char str, int add)		extern int parse_iomem(char str, int add) __init;
	{
	struct iomem_region *new;
	struct uml_stat buf;
	char file, driver;
	int fd, err, size;

	driver = str;
	file = strchr(str,',');
	if(file == NULL){
	printf("parse_iomem : failed to parse iomem\n");
	goto out;
	}
	*file = '\0';
	file++;
	fd = os_open_file(file, of_rdwr(OPENFLAGS()), 0);
	if(fd < 0){
	os_print_error(fd, "parse_iomem - Couldn't open io file");
	goto out;
	}

	err = os_stat_fd(fd, &buf);
	if(err < 0){
	os_print_error(err, "parse_iomem - cannot stat_fd file");
	goto out_close;
	}

	new = malloc(sizeof(*new));
	if(new == NULL){
	perror("Couldn't allocate iomem_region struct");
	goto out_close;
	}

	size = (buf.ust_size + UM_KERN_PAGE_SIZE) & ~(UM_KERN_PAGE_SIZE - 1);

	*new = ((struct iomem_region) { .next = iomem_regions,
	.driver = driver,
	.fd = fd,
	.size = size,
	.phys = 0,
	.virt = 0 });
	iomem_regions = new;
	iomem_size += new->size + UM_KERN_PAGE_SIZE;

	return(0);
	out_close:
	os_close_file(fd);
	out:
	return(1);
	}

	__uml_setup("iomem=", parse_iomem,		__uml_setup("iomem=", parse_iomem,
	"iomem=<name>,<file>\n"		"iomem=<name>,<file>\n"
	" Configure <file> as an IO memory region named <name>.\n\n"		" Configure <file> as an IO memory region named <name>.\n\n"
	);		);

	int protect_memory(unsigned long addr, unsigned long len, int r, int w, int x,
	int must_succeed)
	{
	int err;

	err = os_protect_memory((void *) addr, len, r, w, x);
	if(err < 0){
	if(must_succeed)
	panic("protect failed, err = %d", -err);
	else return(err);
	}
	return(0);
	}

	#if 0
	/* Debugging facility for dumping stuff out to the host, avoiding the timing
	* problems that come with printf and breakpoints.
	* Enable in case of emergency.
	*/

	int logging = 1;
	int logging_fd = -1;

	int logging_line = 0;
	char logging_buf[512];

	void log(char *fmt, ...)
	{
	va_list ap;
	struct timeval tv;
	struct openflags flags;

	if(logging == 0) return;
	if(logging_fd < 0){
	flags = of_create(of_trunc(of_rdwr(OPENFLAGS())));
	logging_fd = os_open_file("log", flags, 0644);
	}
	gettimeofday(&tv, NULL);
	sprintf(logging_buf, "%d\t %u.%u ", logging_line++, tv.tv_sec,
	tv.tv_usec);
	va_start(ap, fmt);
	vsprintf(&logging_buf[strlen(logging_buf)], fmt, ap);
	va_end(ap);
	write(logging_fd, logging_buf, strlen(logging_buf));
	}
	#endif

	/*		/*
	* Overrides for Emacs so that we follow Linus's tabbing style.		* Overrides for Emacs so that we follow Linus's tabbing style.
	* Emacs will notice this stuff at the end of the file and automatically		* Emacs will notice this stuff at the end of the file and automatically