From ca485ab416cec921aef2fb10e48a12ee41e5eaad Mon Sep 17 00:00:00 2001 From: jpaetzel Date: Fri, 20 Nov 2015 15:13:49 +0000 Subject: MFC 290662 Fix a bug in the CPU % limiting code If you attempt to set a pcpu limit that is higher than 110% using rctl (for instance, you want a jail to be able to use 2 cores on your system so you set pcpu to 200%) the thing you are trying to limit becomes unthrottled. PR: 189870 Submitted by: dustinwenz@ebureau.com Reviewed by: trasz --- sys/kern/kern_racct.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sys/kern') diff --git a/sys/kern/kern_racct.c b/sys/kern/kern_racct.c index 6c69d49..448922a 100644 --- a/sys/kern/kern_racct.c +++ b/sys/kern/kern_racct.c @@ -519,16 +519,16 @@ racct_adjust_resource(struct racct *racct, int resource, /* * There are some cases where the racct %cpu resource would grow - * beyond 100%. - * For example in racct_proc_exit() we add the process %cpu usage - * to the ucred racct containers. If too many processes terminated - * in a short time span, the ucred %cpu resource could grow too much. - * Also, the 4BSD scheduler sometimes returns for a thread more than - * 100% cpu usage. So we set a boundary here to 100%. + * beyond 100% per core. For example in racct_proc_exit() we add + * the process %cpu usage to the ucred racct containers. If too + * many processes terminated in a short time span, the ucred %cpu + * resource could grow too much. Also, the 4BSD scheduler sometimes + * returns for a thread more than 100% cpu usage. So we set a sane + * boundary here to 100% * the maxumum number of CPUs. */ if ((resource == RACCT_PCTCPU) && - (racct->r_resources[RACCT_PCTCPU] > 100 * 1000000)) - racct->r_resources[RACCT_PCTCPU] = 100 * 1000000; + (racct->r_resources[RACCT_PCTCPU] > 100 * 1000000 * (int64_t)MAXCPU)) + racct->r_resources[RACCT_PCTCPU] = 100 * 1000000 * (int64_t)MAXCPU; } static int -- cgit v1.1