D9464.id25152.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D9464.id25152.diff
View Options

	Index: head/sys/kern/kern_racct.c
	===================================================================
	--- head/sys/kern/kern_racct.c
	+++ head/sys/kern/kern_racct.c
	@@ -1010,10 +1010,13 @@
	racct_set_locked(p, RACCT_CPU, runtime, 0);
	racct_add_cred_locked(p->p_ucred, RACCT_PCTCPU, pct);

	+ KASSERT(p->p_racct->r_resources[RACCT_RSS] == 0,
	+ ("process reaped with %ju allocated for RSS\n",
	+ p->p_racct->r_resources[RACCT_RSS]));
	for (i = 0; i <= RACCT_MAX; i++) {
	if (p->p_racct->r_resources[i] == 0)
	continue;
	- if (!RACCT_IS_RECLAIMABLE(i))
	+ if (!RACCT_IS_RECLAIMABLE(i))
	continue;
	racct_set_locked(p, i, 0, 0);
	}
	Index: head/sys/vm/vm_pageout.c
	===================================================================
	--- head/sys/vm/vm_pageout.c
	+++ head/sys/vm/vm_pageout.c
	@@ -2268,12 +2268,14 @@
	if (size >= limit) {
	vm_pageout_map_deactivate_pages(
	&vm->vm_map, limit);
	+ size = vmspace_resident_count(vm);
	}
	#ifdef RACCT
	if (racct_enable) {
	rsize = IDX_TO_OFF(size);
	PROC_LOCK(p);
	- racct_set(p, RACCT_RSS, rsize);
	+ if (p->p_state == PRS_NORMAL)
	+ racct_set(p, RACCT_RSS, rsize);
	ravailable = racct_get_available(p, RACCT_RSS);
	PROC_UNLOCK(p);
	if (rsize > ravailable) {
	@@ -2299,7 +2301,8 @@
	size = vmspace_resident_count(vm);
	rsize = IDX_TO_OFF(size);
	PROC_LOCK(p);
	- racct_set(p, RACCT_RSS, rsize);
	+ if (p->p_state == PRS_NORMAL)
	+ racct_set(p, RACCT_RSS, rsize);
	PROC_UNLOCK(p);
	if (rsize > ravailable)
	tryagain = 1;