From owner-svn-src-head@freebsd.org Mon Sep 21 18:24:28 2015 Return-Path: Delivered-To: svn-src-head@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 6E916A0520A; Mon, 21 Sep 2015 18:24:28 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-io0-x22c.google.com (mail-io0-x22c.google.com [IPv6:2607:f8b0:4001:c06::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3BC5811DF; Mon, 21 Sep 2015 18:24:28 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by iofb144 with SMTP id b144so129519910iof.1; Mon, 21 Sep 2015 11:24:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=z8xlrPhzgkglqMH/HLV4+eqBPryJ1aUuWAExAQ/A0J8=; b=XTU1ypx5E2+e24QRwt43c8WxYpT5UVVuaF2XowMOcOptzjtJApxrtquvH0rNGAD2eI SWOTFCQqPzLKKq+eo8vl1+dgJArf2vUs4iDjvpAgxd0eH2Xnm9k/eXlCejosgC5Ml8rM W0HsusZKFpZnoQ7groFp3ZVd/1ZdbUwE1n+dmB25rTkH3h6BiMItrib34enBbtmiQm1h DffKRVVfLSoSjaP8Ra58pw6Zg23xZ04GimOqhy/7lYwB+XGo4aRh0GTqa9FmMQLZlwSl ZotrDjxHYNMwmDdQ5r3yTh0YI9M8gc3OuyadmCQQSt0hDMU7HansnYbA+3hqSi8S5N61 MSRQ== MIME-Version: 1.0 X-Received: by 10.107.46.228 with SMTP id u97mr26856823iou.165.1442859867618; Mon, 21 Sep 2015 11:24:27 -0700 (PDT) Received: by 10.36.28.208 with HTTP; Mon, 21 Sep 2015 11:24:27 -0700 (PDT) In-Reply-To: <13e1fdb2-6e22-4371-95e4-a556c357fa8d@me.com> References: <13e1fdb2-6e22-4371-95e4-a556c357fa8d@me.com> Date: Mon, 21 Sep 2015 11:24:27 -0700 Message-ID: Subject: Re: svn commit: r287934 - head/sys/boot/efi/loader From: Adrian Chadd To: Rui Paulo Cc: John Baldwin , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Sep 2015 18:24:28 -0000 Hi, Warner has been working on the modular kernel thing. But honestly, I think we should just start biting that bullet and ship a modules-only GENERIC by default.. -a On 21 September 2015 at 11:02, Rui Paulo wrote: > So, we're going to keep ignoring the problem and keep patching things up? > It's a bit sad that a single driver (pmspcv) is able to cause so much > problems. > > -- > Rui Paulo > > > On Sep 17, 2015, at 01:36 PM, John Baldwin wrote: > > Author: jhb > Date: Thu Sep 17 20:36:46 2015 > New Revision: 287934 > URL: https://svnweb.freebsd.org/changeset/base/287934 > > Log: > The EFI boot loader allocates a single chunk of contiguous memory to > hold the kernel, modules, and any other loaded data. This memory block > is relocated to the kernel's expected location during the transfer of > control from the loader to the kernel. > > The GENERIC kernel on amd64 has recently grown such that a kernel + zfs.ko > no longer fits in the default staging size. Bump the default size from > 32MB to 48MB to provide more breathing room. > > PR: 201679 > Reviewed by: imp > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D3666 > > Modified: > head/sys/boot/efi/loader/copy.c > > Modified: head/sys/boot/efi/loader/copy.c > ============================================================================== > --- head/sys/boot/efi/loader/copy.c Thu Sep 17 20:36:34 2015 > (r287933) > +++ head/sys/boot/efi/loader/copy.c Thu Sep 17 20:36:46 2015 > (r287934) > @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); > #include > > #ifndef EFI_STAGING_SIZE > -#define EFI_STAGING_SIZE 32 > +#define EFI_STAGING_SIZE 48 > #endif > > #define STAGE_PAGES ((EFI_STAGING_SIZE) * 1024 * 1024 / 4096) >