Date: Sat, 10 May 2014 14:27:24 +0000 (UTC) From: Mark Murray <markm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r265819 - projects/random_number_generator/sys/vm Message-ID: <201405101427.s4AEROiA048410@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markm Date: Sat May 10 14:27:24 2014 New Revision: 265819 URL: http://svnweb.freebsd.org/changeset/base/265819 Log: Make it clear that the harveting hooks in uma_core are not to be merged to CURRENT. Requested by: rwatson Modified: projects/random_number_generator/sys/vm/uma_core.c Modified: projects/random_number_generator/sys/vm/uma_core.c ============================================================================== --- projects/random_number_generator/sys/vm/uma_core.c Sat May 10 14:24:12 2014 (r265818) +++ projects/random_number_generator/sys/vm/uma_core.c Sat May 10 14:27:24 2014 (r265819) @@ -2098,6 +2098,7 @@ uma_zalloc_arg(uma_zone_t zone, void *ud int lockfail; int cpu; + /* XXX: FIX!! Do not commit this to CURRENT!! MarkM */ random_harvest(&(zone->uz_name), sizeof(void *), 1, RANDOM_UMA_ALLOC); /* This is the fast path allocation */ @@ -2130,6 +2131,7 @@ uma_zalloc_arg(uma_zone_t zone, void *ud zone->uz_fini(item, zone->uz_size); return (NULL); } + /* XXX: FIX!! Do not commit this to CURRENT!! MarkM */ random_harvest(&item, sizeof(void *), 1, RANDOM_UMA_ALLOC); return (item); } @@ -2173,6 +2175,7 @@ zalloc_start: #endif if (flags & M_ZERO) uma_zero_item(item, zone); + /* XXX: FIX!! Do not commit this to CURRENT!! MarkM */ random_harvest(&item, sizeof(void *), 1, RANDOM_UMA_ALLOC); return (item); } @@ -2294,6 +2297,7 @@ zalloc_start: zalloc_item: item = zone_alloc_item(zone, udata, flags); + /* XXX: FIX!! Do not commit this to CURRENT!! MarkM */ random_harvest(&item, sizeof(void *), 1, RANDOM_UMA_ALLOC); return (item); } @@ -2648,6 +2652,7 @@ uma_zfree_arg(uma_zone_t zone, void *ite entropy.uz_name = zone->uz_name; entropy.item = item; + /* XXX: FIX!! Do not commit this to CURRENT!! MarkM */ random_harvest(&entropy, sizeof(struct entropy), 2, RANDOM_UMA_ALLOC); #ifdef UMA_DEBUG_ALLOC_1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405101427.s4AEROiA048410>