Date: Wed, 15 Sep 2010 18:33:12 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 183814 for review Message-ID: <201009151833.o8FIXCCM064973@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@183814?ac=10 Change 183814 by trasz@trasz_victim on 2010/09/15 18:32:12 Drop a wrong KASSERT, break out resetting per-vmspace counters into its own routine. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#9 edit .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#21 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#9 (text+ko) ==== @@ -2438,11 +2438,6 @@ vm_map_entry_t cur; int count = 0; -#if 0 - /* Panics the kernel at startup. */ - KASSERT(vm_map_locked(map), ("vm_map not locked")); -#endif - for (cur = map->header.next; cur != &map->header; cur = cur->next) { vm_object_t object; ==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#21 (text+ko) ==== @@ -311,6 +311,20 @@ vmspace_zinit, vmspace_zfini, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); } +#ifdef CONTAINERS +static void +vmspace_container_reset(struct proc *p) +{ + + rusage_set(p, RUSAGE_DATA, 0); + rusage_set(p, RUSAGE_STACK, 0); + rusage_set(p, RUSAGE_RSS, 0); + rusage_set(p, RUSAGE_MEMLOCK, 0); + rusage_set(p, RUSAGE_VMEM, 0); + rusage_set(p, RUSAGE_SWAP, 0); +} +#endif + static inline void vmspace_dofree(struct vmspace *vm) { @@ -413,12 +427,7 @@ vmspace_dofree(vm); } #ifdef CONTAINERS - rusage_set(p, RUSAGE_DATA, 0); - rusage_set(p, RUSAGE_STACK, 0); - rusage_set(p, RUSAGE_RSS, 0); - rusage_set(p, RUSAGE_MEMLOCK, 0); - rusage_set(p, RUSAGE_VMEM, 0); - rusage_set(p, RUSAGE_SWAP, 0); + vmspace_container_reset(p); #endif }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009151833.o8FIXCCM064973>