From owner-cvs-src@FreeBSD.ORG Wed Oct 24 21:33:00 2007 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D501016A41A; Wed, 24 Oct 2007 21:33:00 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C1C6213C4BE; Wed, 24 Oct 2007 21:33:00 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9OLX0bP085379; Wed, 24 Oct 2007 21:33:00 GMT (envelope-from jhb@repoman.freebsd.org) Received: (from jhb@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9OLX05K085372; Wed, 24 Oct 2007 21:33:00 GMT (envelope-from jhb) Message-Id: <200710242133.l9OLX05K085372@repoman.freebsd.org> From: John Baldwin Date: Wed, 24 Oct 2007 21:33:00 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/sys gpt.h src/lib/libstand Makefile src/sbin/gpt Makefile add.c boot.c gpt.8 gpt.c gpt.h show.c src/sys/boot/common ufsread.c src/sys/boot/i386 Makefile src/sys/boot/i386/gptboot Makefile gptboot.c gptldr.S ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Oct 2007 21:33:00 -0000 jhb 2007-10-24 21:33:00 UTC FreeBSD src repository Modified files: sys/sys gpt.h lib/libstand Makefile sbin/gpt Makefile add.c gpt.8 gpt.c gpt.h show.c sys/boot/common ufsread.c sys/boot/i386 Makefile sys/boot/i386/gptboot Makefile gptboot.c sys/boot/i386/libi386 biosdisk.c devicename.c sys/geom/part g_part.c g_part.h g_part_gpt.c Added files: sbin/gpt boot.c sys/boot/i386/gptboot gptldr.S sys/boot/i386/pmbr Makefile pmbr.s Log: First cut at support for booting a GPT labeled disk via the BIOS bootstrap on i386 and amd64 machines. The overall process is that /boot/pmbr lives in the PMBR (similar to /boot/mbr for MBR disks) and is responsible for locating and loading /boot/gptboot. /boot/gptboot is similar to /boot/boot except that it groks GPT rather than MBR + bsdlabel. Unlike /boot/boot, /boot/gptboot lives in its own dedicated GPT partition with a new "FreeBSD boot" type. This partition does not have a fixed size in that /boot/pmbr will load the entire partition into the lower 640k. However, it is limited in that it can only be 545k. That's still a lot better than the current 7.5k limit for boot2 on MBR. gptboot mostly acts just like boot2 in that it reads /boot.config and loads up /boot/loader. Some more details: - Include uuid_equal() and uuid_is_nil() in libstand. - Add a new 'boot' command to gpt(8) which makes a GPT disk bootable using /boot/pmbr and /boot/gptboot. Note that the disk must have some free space for the boot partition. - This required exposing the backend of the 'add' function as a gpt_add_part() function to the rest of gpt(8). 'boot' uses this to create a boot partition if needed. - Don't cripple cgbase() in the UFS boot code for /boot/gptboot so that it can handle a filesystem > 1.5 TB. - /boot/gptboot has a simple loader (gptldr) that doesn't do any I/O unlike boot1 since /boot/pmbr loads all of gptboot up front. The C portion of gptboot (gptboot.c) has been repocopied from boot2.c. The primary changes are to parse the GPT to find a root filesystem and to use 64-bit disk addresses. Currently gptboot assumes that the first UFS partition on the disk is the / filesystem, but this algorithm will likely be improved in the future. - Teach the biosdisk driver in /boot/loader to understand GPT tables. GPT partitions are identified as 'disk0pX:' (e.g. disk0p2:) which is similar to the /dev names the kernel uses (e.g. /dev/ad0p2). - Add a new "freebsd-boot" alias to g_part() for the new boot UUID. MFC after: 1 month Discussed with: marcel (some things might still change, but am committing what I have so far) Revision Changes Path 1.59 +4 -0 src/lib/libstand/Makefile 1.8 +2 -2 src/sbin/gpt/Makefile 1.16 +44 -32 src/sbin/gpt/add.c 1.1 +266 -0 src/sbin/gpt/boot.c (new) 1.18 +43 -2 src/sbin/gpt/gpt.8 1.17 +1 -0 src/sbin/gpt/gpt.c 1.12 +2 -0 src/sbin/gpt/gpt.h 1.15 +3 -0 src/sbin/gpt/show.c 1.15 +1 -1 src/sys/boot/common/ufsread.c 1.22 +2 -2 src/sys/boot/i386/Makefile 1.61 +25 -52 src/sys/boot/i386/gptboot/Makefile 1.85 +117 -71 src/sys/boot/i386/gptboot/gptboot.c 1.1 +123 -0 src/sys/boot/i386/gptboot/gptldr.S (new) 1.52 +307 -35 src/sys/boot/i386/libi386/biosdisk.c 1.9 +29 -12 src/sys/boot/i386/libi386/devicename.c 1.1 +14 -0 src/sys/boot/i386/pmbr/Makefile (new) 1.1 +221 -0 src/sys/boot/i386/pmbr/pmbr.s (new) 1.11 +1 -0 src/sys/geom/part/g_part.c 1.5 +1 -0 src/sys/geom/part/g_part.h 1.5 +8 -0 src/sys/geom/part/g_part_gpt.c 1.12 +3 -1 src/sys/sys/gpt.h