gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move sys_shmget() into arch-dependent code

Browse Source
This commit is contained in:
NAKAMURA Gou
2016-03-17 21:22:35 +09:00
parent 1761acc4c3
commit d65135c040
3 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/x86/kernel/syscall.c
View File

@@ -25,6 +25,7 @@
#include <kmalloc.h> #include <kmalloc.h>
#include <uio.h> #include <uio.h>
#include <mman.h> #include <mman.h>
#include <shm.h>
void terminate(int, int); void terminate(int, int);
extern long do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact); extern long do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact);
@@ -1326,3 +1327,18 @@ SYSCALL_DECLARE(clone)
ihk_mc_syscall_arg4(ctx), ihk_mc_syscall_pc(ctx), ihk_mc_syscall_arg4(ctx), ihk_mc_syscall_pc(ctx),
ihk_mc_syscall_sp(ctx)); ihk_mc_syscall_sp(ctx));
} }
SYSCALL_DECLARE(shmget)
{
const key_t key = ihk_mc_syscall_arg0(ctx);
const size_t size = ihk_mc_syscall_arg1(ctx);
const int shmflg = ihk_mc_syscall_arg2(ctx);
int shmid;
dkprintf("shmget(%#lx,%#lx,%#x)\n", key, size, shmflg);
shmid = do_shmget(key, size, shmflg);
dkprintf("shmget(%#lx,%#lx,%#x): %d\n", key, size, shmflg, shmid);
return shmid;
} /* sys_shmget() */

2
kernel/include/syscall.h
View File

@@ -364,5 +364,7 @@ void reset_cputime();
void set_cputime(int mode); void set_cputime(int mode);
intptr_t do_mmap(intptr_t addr0, size_t len0, int prot, int flags, int fd, intptr_t do_mmap(intptr_t addr0, size_t len0, int prot, int flags, int fd,
off_t off0); off_t off0);
typedef int32_t key_t;
int do_shmget(key_t key, size_t size, int shmflg);
#endif #endif

29
kernel/syscall.c
View File

@@ -3527,11 +3527,8 @@ int shmobj_list_lookup_by_index(int index, struct shmobj **objp)
return 0; return 0;
} /* shmobj_list_lookup_by_index() */ } /* shmobj_list_lookup_by_index() */
SYSCALL_DECLARE(shmget) int do_shmget(const key_t key, const size_t size, const int shmflg)
{ {
const key_t key = ihk_mc_syscall_arg0(ctx);
const size_t size = ihk_mc_syscall_arg1(ctx);
const int shmflg = ihk_mc_syscall_arg2(ctx);
struct thread *thread = cpu_local_var(current); struct thread *thread = cpu_local_var(current);
struct process *proc = thread->proc; struct process *proc = thread->proc;
time_t now = time(); time_t now = time();
@@ -3540,10 +3537,10 @@ SYSCALL_DECLARE(shmget)
struct shmid_ds ads; struct shmid_ds ads;
struct shmobj *obj; struct shmobj *obj;
dkprintf("shmget(%#lx,%#lx,%#x)\n", key, size, shmflg); dkprintf("do_shmget(%#lx,%#lx,%#x)\n", key, size, shmflg);
if (size < the_shminfo.shmmin) { if (size < the_shminfo.shmmin) {
dkprintf("shmget(%#lx,%#lx,%#x): -EINVAL\n", key, size, shmflg); dkprintf("do_shmget(%#lx,%#lx,%#x): -EINVAL\n", key, size, shmflg);
return -EINVAL; return -EINVAL;
} }
@@ -3556,17 +3553,17 @@ SYSCALL_DECLARE(shmget)
} }
else if (error) { else if (error) {
shmobj_list_unlock(); shmobj_list_unlock();
dkprintf("shmget(%#lx,%#lx,%#x): lookup: %d\n", key, size, shmflg, error); dkprintf("do_shmget(%#lx,%#lx,%#x): lookup: %d\n", key, size, shmflg, error);
return error; return error;
} }
if (!obj && !(shmflg & IPC_CREAT)) { if (!obj && !(shmflg & IPC_CREAT)) {
shmobj_list_unlock(); shmobj_list_unlock();
dkprintf("shmget(%#lx,%#lx,%#x): -ENOENT\n", key, size, shmflg); dkprintf("do_shmget(%#lx,%#lx,%#x): -ENOENT\n", key, size, shmflg);
return -ENOENT; return -ENOENT;
} }
if (obj && (shmflg & IPC_CREAT) && (shmflg & IPC_EXCL)) { if (obj && (shmflg & IPC_CREAT) && (shmflg & IPC_EXCL)) {
shmobj_list_unlock(); shmobj_list_unlock();
dkprintf("shmget(%#lx,%#lx,%#x): -EEXIST\n", key, size, shmflg); dkprintf("do_shmget(%#lx,%#lx,%#x): -EEXIST\n", key, size, shmflg);
return -EEXIST; return -EEXIST;
} }
} }
@@ -3592,24 +3589,24 @@ SYSCALL_DECLARE(shmget)
} }
if (req & ~obj->ds.shm_perm.mode) { if (req & ~obj->ds.shm_perm.mode) {
shmobj_list_unlock(); shmobj_list_unlock();
dkprintf("shmget(%#lx,%#lx,%#x): -EINVAL\n", key, size, shmflg); dkprintf("do_shmget(%#lx,%#lx,%#x): -EINVAL\n", key, size, shmflg);
return -EACCES; return -EACCES;
} }
} }
if (obj->ds.shm_segsz < size) { if (obj->ds.shm_segsz < size) {
shmobj_list_unlock(); shmobj_list_unlock();
dkprintf("shmget(%#lx,%#lx,%#x): -EINVAL\n", key, size, shmflg); dkprintf("do_shmget(%#lx,%#lx,%#x): -EINVAL\n", key, size, shmflg);
return -EINVAL; return -EINVAL;
} }
shmid = make_shmid(obj); shmid = make_shmid(obj);
shmobj_list_unlock(); shmobj_list_unlock();
dkprintf("shmget(%#lx,%#lx,%#x): %d\n", key, size, shmflg, shmid); dkprintf("do_shmget(%#lx,%#lx,%#x): %d\n", key, size, shmflg, shmid);
return shmid; return shmid;
} }
if (the_shm_info.used_ids >= the_shminfo.shmmni) { if (the_shm_info.used_ids >= the_shminfo.shmmni) {
shmobj_list_unlock(); shmobj_list_unlock();
dkprintf("shmget(%#lx,%#lx,%#x): -ENOSPC\n", key, size, shmflg); dkprintf("do_shmget(%#lx,%#lx,%#x): -ENOSPC\n", key, size, shmflg);
return -ENOSPC; return -ENOSPC;
} }
@@ -3627,7 +3624,7 @@ SYSCALL_DECLARE(shmget)
error = shmobj_create_indexed(&ads, &obj); error = shmobj_create_indexed(&ads, &obj);
if (error) { if (error) {
shmobj_list_unlock(); shmobj_list_unlock();
dkprintf("shmget(%#lx,%#lx,%#x): shmobj_create: %d\n", key, size, shmflg, error); dkprintf("do_shmget(%#lx,%#lx,%#x): shmobj_create: %d\n", key, size, shmflg, error);
return error; return error;
} }
@@ -3640,9 +3637,9 @@ SYSCALL_DECLARE(shmget)
shmobj_list_unlock(); shmobj_list_unlock();
memobj_release(&obj->memobj); memobj_release(&obj->memobj);
dkprintf("shmget(%#lx,%#lx,%#x): %d\n", key, size, shmflg, shmid); dkprintf("do_shmget(%#lx,%#lx,%#x): %d\n", key, size, shmflg, shmid);
return shmid; return shmid;
} /* sys_shmget() */ } /* do_shmget()() */
SYSCALL_DECLARE(shmat) SYSCALL_DECLARE(shmat)
{ {