d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rationalize per-cpu zones.

Browse Source 
The 2 provided zones had inconsistent naming between each other
("int" and "64") and other allocator zones (which use bytes).

Follow malloc by naming them "pcpu-" + size in bytes.

This is a step towards replacing ad-hoc per-cpu zones with
general slabs.
This commit is contained in:
Mateusz Guzik 2020-11-05 15:08:56 +00:00
parent 9fe896ec79
commit 2dee296a3d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=367384
6 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/kern_rmlock.c
View File

@ -890,8 +890,8 @@ rms_init(struct rmslock *rms, const char *name)
rms->writers = 0; rms->writers = 0;
rms->readers = 0; rms->readers = 0;
mtx_init(&rms->mtx, name, NULL, MTX_DEF | MTX_NEW); mtx_init(&rms->mtx, name, NULL, MTX_DEF | MTX_NEW);
rms->readers_pcpu = uma_zalloc_pcpu(pcpu_zone_int, M_WAITOK | M_ZERO); rms->readers_pcpu = uma_zalloc_pcpu(pcpu_zone_4, M_WAITOK | M_ZERO);
rms->readers_influx = uma_zalloc_pcpu(pcpu_zone_int, M_WAITOK | M_ZERO); rms->readers_influx = uma_zalloc_pcpu(pcpu_zone_4, M_WAITOK | M_ZERO);
} }
void void
@ -901,8 +901,8 @@ rms_destroy(struct rmslock *rms)
MPASS(rms->writers == 0); MPASS(rms->writers == 0);
MPASS(rms->readers == 0); MPASS(rms->readers == 0);
mtx_destroy(&rms->mtx); mtx_destroy(&rms->mtx);
uma_zfree_pcpu(pcpu_zone_int, rms->readers_pcpu); uma_zfree_pcpu(pcpu_zone_4, rms->readers_pcpu);
uma_zfree_pcpu(pcpu_zone_int, rms->readers_influx); uma_zfree_pcpu(pcpu_zone_4, rms->readers_influx);
} }
static void __noinline static void __noinline

4
sys/kern/subr_counter.c
View File

@ -61,14 +61,14 @@ counter_u64_t
counter_u64_alloc(int flags) counter_u64_alloc(int flags)
{ {
return (uma_zalloc_pcpu(pcpu_zone_64, flags | M_ZERO)); return (uma_zalloc_pcpu(pcpu_zone_8, flags | M_ZERO));
} }
void void
counter_u64_free(counter_u64_t c) counter_u64_free(counter_u64_t c)
{ {
uma_zfree_pcpu(pcpu_zone_64, c); uma_zfree_pcpu(pcpu_zone_8, c);
} }
int int

12
sys/kern/subr_pcpu.c
View File

@ -131,21 +131,19 @@ dpcpu_startup(void *dummy __unused)
SYSINIT(dpcpu, SI_SUB_KLD, SI_ORDER_FIRST, dpcpu_startup, NULL); SYSINIT(dpcpu, SI_SUB_KLD, SI_ORDER_FIRST, dpcpu_startup, NULL);
/* /*
* UMA_PCPU_ZONE zones, that are available for all kernel * UMA_ZONE_PCPU zones for general kernel use.
* consumers. Right now 64 bit zone is used for counter(9)
* and int zone is used for mount point counters.
*/ */
uma_zone_t pcpu_zone_int; uma_zone_t pcpu_zone_4;
uma_zone_t pcpu_zone_64; uma_zone_t pcpu_zone_8;
static void static void
pcpu_zones_startup(void) pcpu_zones_startup(void)
{ {
pcpu_zone_int = uma_zcreate("int pcpu", sizeof(int), pcpu_zone_4 = uma_zcreate("pcpu-4", sizeof(uint32_t),
NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_PCPU); NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_PCPU);
pcpu_zone_64 = uma_zcreate("64 pcpu", sizeof(uint64_t), pcpu_zone_8 = uma_zcreate("pcpu-8", sizeof(uint64_t),
NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_PCPU); NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_PCPU);
} }
SYSINIT(pcpu_zones, SI_SUB_COUNTER, SI_ORDER_FIRST, pcpu_zones_startup, NULL); SYSINIT(pcpu_zones, SI_SUB_COUNTER, SI_ORDER_FIRST, pcpu_zones_startup, NULL);

16
sys/kern/vfs_mount.c
View File

@ -127,13 +127,13 @@ mount_init(void *mem, int size, int flags)
mtx_init(&mp->mnt_mtx, "struct mount mtx", NULL, MTX_DEF); mtx_init(&mp->mnt_mtx, "struct mount mtx", NULL, MTX_DEF);
mtx_init(&mp->mnt_listmtx, "struct mount vlist mtx", NULL, MTX_DEF); mtx_init(&mp->mnt_listmtx, "struct mount vlist mtx", NULL, MTX_DEF);
lockinit(&mp->mnt_explock, PVFS, "explock", 0, 0); lockinit(&mp->mnt_explock, PVFS, "explock", 0, 0);
mp->mnt_thread_in_ops_pcpu = uma_zalloc_pcpu(pcpu_zone_int, mp->mnt_thread_in_ops_pcpu = uma_zalloc_pcpu(pcpu_zone_4,
M_WAITOK | M_ZERO); M_WAITOK | M_ZERO);
mp->mnt_ref_pcpu = uma_zalloc_pcpu(pcpu_zone_int, mp->mnt_ref_pcpu = uma_zalloc_pcpu(pcpu_zone_4,
M_WAITOK | M_ZERO); M_WAITOK | M_ZERO);
mp->mnt_lockref_pcpu = uma_zalloc_pcpu(pcpu_zone_int, mp->mnt_lockref_pcpu = uma_zalloc_pcpu(pcpu_zone_4,
M_WAITOK | M_ZERO); M_WAITOK | M_ZERO);
mp->mnt_writeopcount_pcpu = uma_zalloc_pcpu(pcpu_zone_int, mp->mnt_writeopcount_pcpu = uma_zalloc_pcpu(pcpu_zone_4,
M_WAITOK | M_ZERO); M_WAITOK | M_ZERO);
mp->mnt_ref = 0; mp->mnt_ref = 0;
mp->mnt_vfs_ops = 1; mp->mnt_vfs_ops = 1;
@ -147,10 +147,10 @@ mount_fini(void *mem, int size)
struct mount *mp; struct mount *mp;
mp = (struct mount *)mem; mp = (struct mount *)mem;
uma_zfree_pcpu(pcpu_zone_int, mp->mnt_writeopcount_pcpu); uma_zfree_pcpu(pcpu_zone_4, mp->mnt_writeopcount_pcpu);
uma_zfree_pcpu(pcpu_zone_int, mp->mnt_lockref_pcpu); uma_zfree_pcpu(pcpu_zone_4, mp->mnt_lockref_pcpu);
uma_zfree_pcpu(pcpu_zone_int, mp->mnt_ref_pcpu); uma_zfree_pcpu(pcpu_zone_4, mp->mnt_ref_pcpu);
uma_zfree_pcpu(pcpu_zone_int, mp->mnt_thread_in_ops_pcpu); uma_zfree_pcpu(pcpu_zone_4, mp->mnt_thread_in_ops_pcpu);
lockdestroy(&mp->mnt_explock); lockdestroy(&mp->mnt_explock);
mtx_destroy(&mp->mnt_listmtx); mtx_destroy(&mp->mnt_listmtx);
mtx_destroy(&mp->mnt_mtx); mtx_destroy(&mp->mnt_mtx);

2
sys/sys/param.h
View File

@ -60,7 +60,7 @@
* in the range 5 to 9. * in the range 5 to 9.
*/ */
#undef __FreeBSD_version #undef __FreeBSD_version
#define __FreeBSD_version 1300125 /* Master, propagated to newvers */ #define __FreeBSD_version 1300126 /* Master, propagated to newvers */
/* /*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,

4
sys/vm/uma.h
View File

@ -666,8 +666,8 @@ size_t uma_zone_memory(uma_zone_t zone);
/* /*
* Common UMA_ZONE_PCPU zones. * Common UMA_ZONE_PCPU zones.
*/ */
extern uma_zone_t pcpu_zone_int; extern uma_zone_t pcpu_zone_4;
extern uma_zone_t pcpu_zone_64; extern uma_zone_t pcpu_zone_8;
/* /*
* Exported statistics structures to be used by user space monitoring tools. * Exported statistics structures to be used by user space monitoring tools.