From owner-svn-src-head@FreeBSD.ORG Wed Mar 17 21:18:28 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A19961065678; Wed, 17 Mar 2010 21:18:28 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 77AE98FC0A; Wed, 17 Mar 2010 21:18:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2HLIS4g020101; Wed, 17 Mar 2010 21:18:28 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2HLIS4X020099; Wed, 17 Mar 2010 21:18:28 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201003172118.o2HLIS4X020099@svn.freebsd.org> From: Kip Macy Date: Wed, 17 Mar 2010 21:18:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205266 - head/sys/vm X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list 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: Wed, 17 Mar 2010 21:18:28 -0000 Author: kmacy Date: Wed Mar 17 21:18:28 2010 New Revision: 205266 URL: http://svn.freebsd.org/changeset/base/205266 Log: Cache line align various structures and move volatile counters to not share a cache line with (mostly) immutable state Reviewed by: jeff@ MFC after: 7 days Modified: head/sys/vm/uma_int.h Modified: head/sys/vm/uma_int.h ============================================================================== --- head/sys/vm/uma_int.h Wed Mar 17 21:11:48 2010 (r205265) +++ head/sys/vm/uma_int.h Wed Mar 17 21:18:28 2010 (r205266) @@ -160,6 +160,11 @@ struct uma_hash { }; /* + * align field or structure to cache line + */ +#define UMA_ALIGN __aligned(CACHE_LINE_SIZE) + +/* * Structures for per cpu queues. */ @@ -168,7 +173,7 @@ struct uma_bucket { int16_t ub_cnt; /* Count of free items. */ int16_t ub_entries; /* Max items. */ void *ub_bucket[]; /* actual allocation storage */ -}; +} UMA_ALIGN; typedef struct uma_bucket * uma_bucket_t; @@ -177,7 +182,7 @@ struct uma_cache { uma_bucket_t uc_allocbucket; /* Bucket to allocate from */ u_int64_t uc_allocs; /* Count of allocations */ u_int64_t uc_frees; /* Count of frees */ -}; +} UMA_ALIGN; typedef struct uma_cache * uma_cache_t; @@ -312,11 +317,12 @@ struct uma_zone { uma_init uz_init; /* Initializer for each item */ uma_fini uz_fini; /* Discards memory */ - u_int64_t uz_allocs; /* Total number of allocations */ - u_int64_t uz_frees; /* Total number of frees */ - u_int64_t uz_fails; /* Total number of alloc failures */ u_int32_t uz_flags; /* Flags inherited from kegs */ u_int32_t uz_size; /* Size inherited from kegs */ + + u_int64_t uz_allocs UMA_ALIGN; /* Total number of allocations */ + u_int64_t uz_frees; /* Total number of frees */ + u_int64_t uz_fails; /* Total number of alloc failures */ uint16_t uz_fills; /* Outstanding bucket fills */ uint16_t uz_count; /* Highest value ub_ptr can have */ @@ -324,7 +330,7 @@ struct uma_zone { * This HAS to be the last item because we adjust the zone size * based on NCPU and then allocate the space for the zones. */ - struct uma_cache uz_cpu[1]; /* Per cpu caches */ + struct uma_cache uz_cpu[1] UMA_ALIGN; /* Per cpu caches */ }; /* @@ -341,6 +347,8 @@ struct uma_zone { #define UMA_ZFLAG_INHERIT (UMA_ZFLAG_INTERNAL | UMA_ZFLAG_CACHEONLY | \ UMA_ZFLAG_BUCKET) +#undef UMA_ALIGN + #ifdef _KERNEL /* Internal prototypes */ static __inline uma_slab_t hash_sfind(struct uma_hash *hash, u_int8_t *data);