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

Merge branch 'development' of pccluster.org:mckernel into development

Browse Source
This commit is contained in:
Tomoki Shirasawa
2017-11-22 10:53:33 +09:00
parent d273a2f58b 4e7069d499
commit c9fa445f54
46 changed files with 460 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
kernel/include/futex.h
View File

@@ -117,78 +117,9 @@
#include <arch/system.h>
#endif
#ifdef POSTK_DEBUG_ARCH_DEP_8 /* arch depend hide */
#else
static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
{
int op = (encoded_op >> 28) & 7;
int cmp = (encoded_op >> 24) & 15;
int oparg = (encoded_op << 8) >> 20;
int cmparg = (encoded_op << 20) >> 20;
int oldval = 0, ret, tem;
if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
oparg = 1 << oparg;
#ifdef __UACCESS__
if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
return -EFAULT;
#endif
switch (op) {
case FUTEX_OP_SET:
__futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
break;
case FUTEX_OP_ADD:
__futex_atomic_op1("lock; xaddl %0, %2", ret, oldval,
uaddr, oparg);
break;
case FUTEX_OP_OR:
__futex_atomic_op2("orl %4, %3", ret, oldval, uaddr, oparg);
break;
case FUTEX_OP_ANDN:
__futex_atomic_op2("andl %4, %3", ret, oldval, uaddr, ~oparg);
break;
case FUTEX_OP_XOR:
__futex_atomic_op2("xorl %4, %3", ret, oldval, uaddr, oparg);
break;
default:
ret = -ENOSYS;
}
if (!ret) {
switch (cmp) {
case FUTEX_OP_CMP_EQ:
ret = (oldval == cmparg);
break;
case FUTEX_OP_CMP_NE:
ret = (oldval != cmparg);
break;
case FUTEX_OP_CMP_LT:
ret = (oldval < cmparg);
break;
case FUTEX_OP_CMP_GE:
ret = (oldval >= cmparg);
break;
case FUTEX_OP_CMP_LE:
ret = (oldval <= cmparg);
break;
case FUTEX_OP_CMP_GT:
ret = (oldval > cmparg);
break;
default:
ret = -ENOSYS;
}
}
return ret;
}
#endif /* arch depend hide */
#endif // __KERNEL__
#endif // _ASM_X86_FUTEX_H
#define FUTEX_HASHBITS 8 /* 256 entries in each futex hash tbl */
#define FUT_OFF_INODE 1 /* We set bit 0 if key has a reference on inode */

16
kernel/process.c
View File

@@ -1466,14 +1466,6 @@ static int remap_one_page(void *arg0, page_table_t pt, pte_t *ptep,
dkprintf("remap_one_page(%p,%p,%p %#lx,%p,%d)\n",
arg0, pt, ptep, *ptep, pgaddr, pgshift);
/* XXX: NYI: large pages */
if (pgsize != PAGE_SIZE) {
error = -E2BIG;
ekprintf("remap_one_page(%p,%p,%p %#lx,%p,%d):%d\n",
arg0, pt, ptep, *ptep, pgaddr, pgshift, error);
goto out;
}
off = args->off + ((uintptr_t)pgaddr - args->start);
pte_make_fileoff(off, 0, pgsize, &apte);
@@ -1509,6 +1501,7 @@ int remap_process_memory_range(struct process_vm *vm, struct vm_range *range,
{
struct rfp_args args;
int error;
unsigned int retval;
dkprintf("remap_process_memory_range(%p,%p,%#lx,%#lx,%#lx)\n",
vm, range, start, end, off);
@@ -1519,6 +1512,13 @@ int remap_process_memory_range(struct process_vm *vm, struct vm_range *range,
args.off = off;
args.memobj = range->memobj;
retval = __sync_val_compare_and_swap(&range->pgshift, 0, PAGE_SHIFT);
if (retval != 0 && retval != PAGE_SHIFT) {
error = -E2BIG;
ekprintf("%s: pgshift is too big (%d) failed:%d\n", __func__, retval, error);
goto out;
}
error = visit_pte_range(vm->address_space->page_table, (void *)start,
(void *)end, range->pgshift, VPTEF_DEFAULT,
&remap_one_page, &args);