From owner-svn-src-all@freebsd.org Wed Aug 24 16:40:31 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20667BC3737; Wed, 24 Aug 2016 16:40:31 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 E463C192A; Wed, 24 Aug 2016 16:40:30 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7OGeUxs013750; Wed, 24 Aug 2016 16:40:30 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7OGeUNo013749; Wed, 24 Aug 2016 16:40:30 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201608241640.u7OGeUNo013749@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Wed, 24 Aug 2016 16:40:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r304754 - head/sys/boot/userboot/userboot X-SVN-Group: head 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.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Aug 2016 16:40:31 -0000 Author: tsoome Date: Wed Aug 24 16:40:29 2016 New Revision: 304754 URL: https://svnweb.freebsd.org/changeset/base/304754 Log: Bug 212038 - svn commit: r304321 broken bhyve zvol VM bhyveload hang 100% WCPU As the support for large blocks was enabled in loader zfs code, the heap in userboot was left not changed, resulting with failure of detecting and accessing zfs pools for bhyve virtual machines. This fix does set the heap to use same amount of memory as the zfsloader is using. To make it possible to test and verify loader functions, bhyve is providing very useful option, but it also means, we like to keep feature parity with [zfs]loader as close as possible. PR: 212038 Reported by: dfh0522@gmail.com Reviewed by: allanjude, grehan Approved by: allanjude (mentor) Differential Revision: https://reviews.freebsd.org/D7635 Modified: head/sys/boot/userboot/userboot/main.c Modified: head/sys/boot/userboot/userboot/main.c ============================================================================== --- head/sys/boot/userboot/userboot/main.c Wed Aug 24 16:30:15 2016 (r304753) +++ head/sys/boot/userboot/userboot/main.c Wed Aug 24 16:40:29 2016 (r304754) @@ -46,7 +46,7 @@ static int userboot_zfs_found; /* Minimum version required */ #define USERBOOT_VERSION USERBOOT_VERSION_3 -#define MALLOCSZ (10*1024*1024) +#define MALLOCSZ (64*1024*1024) struct loader_callbacks *callbacks; void *callbacks_arg;