From owner-svn-src-all@FreeBSD.ORG  Sun Jun 22 21:18:25 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 2F4484F2;
 Sun, 22 Jun 2014 21:18:25 +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 1CB9826CD;
 Sun, 22 Jun 2014 21:18:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5MLIO0W075307;
 Sun, 22 Jun 2014 21:18:24 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5MLIOxX075305;
 Sun, 22 Jun 2014 21:18:24 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201406222118.s5MLIOxX075305@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 22 Jun 2014 21:18:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r267750 - stable/10/sys/vm
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jun 2014 21:18:25 -0000

Author: mav
Date: Sun Jun 22 21:18:24 2014
New Revision: 267750
URL: http://svnweb.freebsd.org/changeset/base/267750

Log:
  MFC r267387:
  Allocating new bucket for bucket zone, never take it from the zone itself,
  since it will almost certanly fail.  Take next bigger zone instead.
  
  This situation should not happen with original bucket zones configuration:
  "32 Bucket" zone uses "64 Bucket" and vice versa.  But if "64 Bucket" zone
  lock is congested, zone may grow its bucket size and start biting itself.

Modified:
  stable/10/sys/vm/uma_core.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/vm/uma_core.c
==============================================================================
--- stable/10/sys/vm/uma_core.c	Sun Jun 22 21:16:18 2014	(r267749)
+++ stable/10/sys/vm/uma_core.c	Sun Jun 22 21:18:24 2014	(r267750)
@@ -381,6 +381,8 @@ bucket_alloc(uma_zone_t zone, void *udat
 	if ((uintptr_t)udata & UMA_ZFLAG_CACHEONLY)
 		flags |= M_NOVM;
 	ubz = bucket_zone_lookup(zone->uz_count);
+	if (ubz->ubz_zone == zone && (ubz + 1)->ubz_entries != 0)
+		ubz++;
 	bucket = uma_zalloc_arg(ubz->ubz_zone, udata, flags);
 	if (bucket) {
 #ifdef INVARIANTS