From owner-svn-src-projects@FreeBSD.ORG Sat May 10 14:27:24 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B6779C88; Sat, 10 May 2014 14:27:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A42431B7; Sat, 10 May 2014 14:27:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4AERO8K048411; Sat, 10 May 2014 14:27:24 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4AEROiA048410; Sat, 10 May 2014 14:27:24 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201405101427.s4AEROiA048410@svn.freebsd.org> From: Mark Murray Date: Sat, 10 May 2014 14:27:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r265819 - projects/random_number_generator/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2014 14:27:24 -0000 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