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

Add allow_oversubscribe kernel argument

Browse Source 
It's not allowed in the default setting.
Execute mcreboot.sh with -O option to allow it.

refs #1072
This commit is contained in:
Masamichi Takagi
2018-03-10 13:08:38 +09:00
parent b1ea6eb82a
commit fe42481d6f
5 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/x86_64/tools/mcreboot-smp-x86.sh.in
View File

@@ -46,8 +46,9 @@ turbo=""
ihk_irq="" ihk_irq=""
umask_old=`umask` umask_old=`umask`
idle_halt="" idle_halt=""
allow_oversubscribe=""
while getopts :tk:c:m:o:f:r:q:i:d:e:h OPT while getopts :tk:c:m:o:f:r:q:i:d:e:hO OPT
do do
case ${OPT} in case ${OPT} in
f) facility=${OPTARG} f) facility=${OPTARG}
@@ -74,6 +75,8 @@ do
;; ;;
h) idle_halt="idle_halt" h) idle_halt="idle_halt"
;; ;;
O) allow_oversubscribe="allow_oversubscribe"
;;
*) echo "invalid option -${OPT}" >&2 *) echo "invalid option -${OPT}" >&2
exit 1 exit 1
esac esac
@@ -419,7 +422,7 @@ if ! ${SBINDIR}/ihkosctl 0 load ${KERNDIR}/mckernel.img; then
fi fi
# Set kernel arguments # Set kernel arguments
if ! ${SBINDIR}/ihkosctl 0 kargs "hidos $turbo $idle_halt dump_level=${DUMP_LEVEL} $extra_kopts"; then if ! ${SBINDIR}/ihkosctl 0 kargs "hidos $turbo $idle_halt dump_level=${DUMP_LEVEL} $extra_kopts $allow_oversubscribe"; then
echo "error: setting kernel arguments" >&2 echo "error: setting kernel arguments" >&2
error_exit "os_created" error_exit "os_created"
fi fi

1
kernel/include/process.h
View File

@@ -278,6 +278,7 @@ struct resource_set {
extern struct list_head resource_set_list; extern struct list_head resource_set_list;
extern mcs_rwlock_lock_t resource_set_lock; extern mcs_rwlock_lock_t resource_set_lock;
extern int idle_halt; extern int idle_halt;
extern int allow_oversubscribe;
struct process_hash { struct process_hash {
struct list_head list[HASH_SIZE]; struct list_head list[HASH_SIZE];

6
kernel/init.c
View File

@@ -150,6 +150,12 @@ static void parse_kargs(void)
if (ptr) { if (ptr) {
idle_halt = 1; idle_halt = 1;
} }
/* allow_oversubscribe option */
ptr = find_command_line("allow_oversubscribe");
if (ptr) {
allow_oversubscribe = 1;
}
} }
extern void ihk_mc_get_boot_time(unsigned long *tv_sec, unsigned long *tv_nsec); extern void ihk_mc_get_boot_time(unsigned long *tv_sec, unsigned long *tv_nsec);

1
kernel/process.c
View File

@@ -101,6 +101,7 @@ struct list_head resource_set_list;
mcs_rwlock_lock_t resource_set_lock; mcs_rwlock_lock_t resource_set_lock;
int idle_halt = 0; int idle_halt = 0;
int allow_oversubscribe = 0;
void void
init_process(struct process *proc, struct process *parent) init_process(struct process *proc, struct process *parent)

6
kernel/syscall.c
View File

@@ -2343,6 +2343,7 @@ unsigned long do_fork(int clone_flags, unsigned long newsp,
struct syscall_request request1 IHK_DMA_ALIGN; struct syscall_request request1 IHK_DMA_ALIGN;
int ptrace_event = 0; int ptrace_event = 0;
int termsig = clone_flags & 0x000000ff; int termsig = clone_flags & 0x000000ff;
const struct ihk_mc_cpu_info *cpu_info = ihk_mc_get_cpu_info();
dkprintf("do_fork,flags=%08x,newsp=%lx,ptidptr=%lx,ctidptr=%lx,tls=%lx,curpc=%lx,cursp=%lx", dkprintf("do_fork,flags=%08x,newsp=%lx,ptidptr=%lx,ctidptr=%lx,tls=%lx,curpc=%lx,cursp=%lx",
clone_flags, newsp, parent_tidptr, child_tidptr, tlsblock_base, curpc, cursp); clone_flags, newsp, parent_tidptr, child_tidptr, tlsblock_base, curpc, cursp);
@@ -2382,6 +2383,11 @@ unsigned long do_fork(int clone_flags, unsigned long newsp,
return -EINVAL; return -EINVAL;
} }
if (!allow_oversubscribe && rusage->num_threads >= cpu_info->ncpus) {
kprintf("%s: ERROR: CPU oversubscription is not allowed. Specify -O option in mcreboot.sh to allow it.\n", __FUNCTION__);
return -EINVAL;
}
cpuid = obtain_clone_cpuid(&old->cpu_set); cpuid = obtain_clone_cpuid(&old->cpu_set);
if (cpuid == -1) { if (cpuid == -1) {
kprintf("do_fork,core not available\n"); kprintf("do_fork,core not available\n");