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

Commit f45d9fc9 authored by Gennady Sharapov's avatar Gennady Sharapov Committed by Linus Torvalds
Browse files

[PATCH] uml: move libc-dependent skas memory mapping code 



The serial UML OS-abstraction layer patch (um/kernel/skas dir).

This moves all systemcalls from skas/mem_user.c file under os-Linux dir and
join skas/mem_user.c and skas/mem.c files.

Signed-off-by: default avatarGennady Sharapov <gennady.v.sharapov@intel.com>
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4abfbf40

arch/um/include/os.h

+17 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "../os/include/file.h"

#include "sysdep/ptrace.h"

#include "kern_util.h"

#include "skas/mm_id.h"



#define OS_TYPE_FILE 1 

#define OS_TYPE_DIR 2
@@ -255,4 +256,20 @@ extern void user_time_init(void); 
extern void uml_idle_timer(void);

extern unsigned long long os_nsecs(void);



/* skas/mem.c */

extern long run_syscall_stub(struct mm_id * mm_idp,

			     int syscall, unsigned long *args, long expected,

			     void **addr, int done);

extern long syscall_stub_data(struct mm_id * mm_idp,

			      unsigned long *data, int data_count,

			      void **addr, void **stub_addr);

extern int map(struct mm_id * mm_idp, unsigned long virt,

	       unsigned long len, int r, int w, int x, int phys_fd,

	       unsigned long long offset, int done, void **data);

extern int unmap(struct mm_id * mm_idp, void *addr, unsigned long len,

		 int done, void **data);

extern int protect(struct mm_id * mm_idp, unsigned long addr,

		   unsigned long len, int r, int w, int x, int done,

		   void **data);



#endif

arch/um/include/skas/skas.h

+0 −14
Original line number Diff line number Diff line
@@ -24,14 +24,6 @@ extern void userspace(union uml_pt_regs *regs); 
extern void new_thread_proc(void *stack, void (*handler)(int sig));

extern void new_thread_handler(int sig);

extern void handle_syscall(union uml_pt_regs *regs);

extern int map(struct mm_id * mm_idp, unsigned long virt,

	       unsigned long len, int r, int w, int x, int phys_fd,

	       unsigned long long offset, int done, void **data);

extern int unmap(struct mm_id * mm_idp, void *addr, unsigned long len,

		 int done, void **data);

extern int protect(struct mm_id * mm_idp, unsigned long addr,

		   unsigned long len, int r, int w, int x, int done,

		   void **data);

extern void user_signal(int sig, union uml_pt_regs *regs, int pid);

extern int new_mm(unsigned long stack);

extern int start_userspace(unsigned long stub_stack);
@@ -39,11 +31,5 @@ extern int copy_context_skas0(unsigned long stack, int pid); 
extern void get_skas_faultinfo(int pid, struct faultinfo * fi);

extern long execute_syscall_skas(void *r);

extern unsigned long current_stub_stack(void);

extern long run_syscall_stub(struct mm_id * mm_idp,

			     int syscall, unsigned long *args, long expected,

			     void **addr, int done);

extern long syscall_stub_data(struct mm_id * mm_idp,

			      unsigned long *data, int data_count,

			      void **addr, void **stub_addr);



#endif

arch/um/kernel/skas/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# Licensed under the GPL

#



obj-y := clone.o exec_kern.o mem.o mem_user.o mmu.o process.o process_kern.o \

obj-y := clone.o exec_kern.o mem.o mmu.o process.o process_kern.o \

	syscall.o tlb.o uaccess.o



USER_OBJS := process.o clone.o

arch/um/os-Linux/skas/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
# Licensed under the GPL

#



obj-y := trap.o

obj-y := mem.o trap.o



USER_OBJS := trap.o

USER_OBJS := mem.o trap.o



include arch/um/scripts/Makefile.rules

arch/um/kernel/skas/mem_user.c→arch/um/os-Linux/skas/mem.c

+102 −100
Original line number Diff line number Diff line
@@ -45,13 +45,14 @@ int single_count = 0; 
int multi_count = 0;

int multi_op_count = 0;



static long do_syscall_stub(struct mm_id *mm_idp, void **addr)

static inline long do_syscall_stub(struct mm_id * mm_idp, void **addr)

{

	unsigned long regs[MAX_REG_NR];

	int n;

	long ret, offset;

	unsigned long * data;

	unsigned long * syscall;

	long ret, offset;

        int n, pid = mm_idp->u.pid;

	int pid = mm_idp->u.pid;



	if(proc_mm)

#warning Need to look up userspace_pid by cpu
@@ -63,6 +64,7 @@ static long do_syscall_stub(struct mm_id *mm_idp, void **addr) 
	regs[REGS_IP_INDEX] = UML_CONFIG_STUB_CODE +

		((unsigned long) &batch_syscall_stub -

		 (unsigned long) &__syscall_stub_start);



	n = ptrace_setregs(pid, regs);

	if(n < 0)

		panic("do_syscall_stub : PTRACE_SETREGS failed, errno = %d\n",
@@ -80,6 +82,8 @@ static long do_syscall_stub(struct mm_id *mm_idp, void **addr) 
	if (offset) {

		data = (unsigned long *)(mm_idp->stack +

					 offset - UML_CONFIG_STUB_DATA);

		printk("do_syscall_stub : ret = %d, offset = %d, "

		       "data = 0x%x\n", ret, offset, data);

		syscall = (unsigned long *)((unsigned long)data + data[0]);

		printk("do_syscall_stub: syscall %ld failed, return value = "

		       "0x%lx, expected return value = 0x%lx\n",
@@ -235,8 +239,6 @@ int unmap(struct mm_id * mm_idp, void *addr, unsigned long len, int done, 


		ret = run_syscall_stub(mm_idp, __NR_munmap, args, 0,

				       data, done);

                if(ret < 0)

                        printk("munmap stub failed, errno = %d\n", ret);

	}



	return ret;
@@ -250,9 +252,9 @@ int protect(struct mm_id * mm_idp, unsigned long addr, unsigned long len, 


	prot = (r ? PROT_READ : 0) | (w ? PROT_WRITE : 0) |

		(x ? PROT_EXEC : 0);



	if(proc_mm){

		int fd = mm_idp->u.mm_fd;



		protect = ((struct proc_mm_op) { .op	= MM_MPROTECT,

					   .u	=

					   { .mprotect	=