From owner-svn-src-head@FreeBSD.ORG Thu Nov 15 18:07:18 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EDDA5F5B for ; Thu, 15 Nov 2012 18:07:17 +0000 (UTC) (envelope-from postmaster@mailpod.hostingplatform.com) Received: from atl4mhob08.myregisteredsite.com (atl4mhob08.myregisteredsite.com [209.17.115.46]) by mx1.freebsd.org (Postfix) with ESMTP id 9CC378FC15 for ; Thu, 15 Nov 2012 18:07:17 +0000 (UTC) Received: from mailpod1.hostingplatform.com (mailpod1.networksolutionsemail.com [206.188.198.65]) by atl4mhob08.myregisteredsite.com (8.14.4/8.14.4) with ESMTP id qAFI7GJT028620 for ; Thu, 15 Nov 2012 13:07:16 -0500 Received: (qmail 32364 invoked by uid 0); 15 Nov 2012 16:07:40 -0000 Received: (qmail 29391 invoked by uid 0); 15 Nov 2012 14:33:41 -0000 Received: (qmail 16611 invoked by uid 0); 15 Nov 2012 14:11:50 -0000 Received: from unknown (HELO atl4mhib39.myregisteredsite.com) (209) by 0 with SMTP; 15 Nov 2012 14:11:50 -0000 Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by atl4mhib39.myregisteredsite.com (8.14.4/8.14.4) with ESMTP id qAFEBnq3029037 for ; Thu, 15 Nov 2012 09:11:49 -0500 Received: from hub.freebsd.org (hub.FreeBSD.org [8.8.178.136]) by mx2.freebsd.org (Postfix) with ESMTP id 87FFC3B6AD6; Thu, 15 Nov 2012 14:11:46 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [8.8.178.136]) by hub.freebsd.org (Postfix) with ESMTP id DEDB13C7; Thu, 15 Nov 2012 14:11:46 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E4D22284; Thu, 15 Nov 2012 14:11:34 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C65CD8FC15; Thu, 15 Nov 2012 14:11:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFEBYQb095546; Thu, 15 Nov 2012 14:11:34 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFEBYh9095545; Thu, 15 Nov 2012 14:11:34 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201211151411.qAFEBYh9095545@svn.freebsd.org> From: Edward Tomasz Napierala Date: Thu, 15 Nov 2012 14:11:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r243070 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-SpamScore: 0 X-MailHub-Apparently-To: mjm@michaelmeltzer.com X-MailHub-Forwarded: Yes X-BeenThere: svn-src-head@freebsd.org List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Nov 2012 18:07:18 -0000 Author: trasz Date: Thu Nov 15 14:11:34 2012 New Revision: 243070 URL: http://svnweb.freebsd.org/changeset/base/243070 Log: Fix kassert that's not really valid for %CPU accounting. The problem here is race between decaying the resource usage in containers, and updating per-process usage; basically, the former may cause per-container usage to get smaller than per-process usage. Submitted by: Rudo Tomori Modified: head/sys/kern/kern_racct.c Modified: head/sys/kern/kern_racct.c ============================================================================== --- head/sys/kern/kern_racct.c Thu Nov 15 14:10:51 2012 (r243069) +++ head/sys/kern/kern_racct.c Thu Nov 15 14:11:34 2012 (r243070) @@ -403,7 +403,7 @@ racct_sub_racct(struct racct *dest, cons * Update resource usage in dest. */ for (i = 0; i <= RACCT_MAX; i++) { - if (!RACCT_IS_SLOPPY(i)) { + if (!RACCT_IS_SLOPPY(i) && !RACCT_IS_DECAYING(i)) { KASSERT(dest->r_resources[i] >= 0, ("racct propagation meltdown: dest < 0")); KASSERT(src->r_resources[i] >= 0, @@ -414,7 +414,8 @@ racct_sub_racct(struct racct *dest, cons if (RACCT_CAN_DROP(i)) { dest->r_resources[i] -= src->r_resources[i]; if (dest->r_resources[i] < 0) { - KASSERT(RACCT_IS_SLOPPY(i), + KASSERT(RACCT_IS_SLOPPY(i) || + RACCT_IS_DECAYING(i), ("racct_sub_racct: usage < 0")); dest->r_resources[i] = 0; } _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"