Illumos 934 - FreeBSD's GPT not recognized

Reviewed by: Alexander Eremin <alexander.r.eremin@gmail.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Andrew Stormont <Andrew.Stormont@nexenta.com>
Reviewed by: Richard Elling <richard.elling@richardelling.com>
Approved by: Gordon Ross <gwr@nexenta.com>

References:
  https://www.illumos.org/issues/934
  https://github.com/illumos/illumos-gate/commit/e21ea67

Ported-by: ilovezfs <ilovezfs@icloud.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #4016

diff --git a/include/sys/efi_partition.h b/include/sys/efi_partition.h
index ee367a574e46bf126c5d18957285e4eb1de74fe1..f3efd646ecd97d35aabd184a604d6ecf3a72614b 100644 (file)
--- a/include/sys/efi_partition.h
+++ b/include/sys/efi_partition.h
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
  */
 
 #ifndef        _SYS_EFI_PARTITION_H
@@ -86,54 +87,64 @@ typedef struct efi_gpe_Attrs {
  * 6a945a3b-1dd2-11b2-99a6-080020736631        V_CACHE
  */
 
-#define        EFI_UNUSED      { 0x00000000, 0x0000, 0x0000, 0x00, 0x00, \
-                           { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }
-#define        EFI_RESV1       { 0x6a96237f, 0x1dd2, 0x11b2, 0x99, 0xa6, \
-                           { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
-#define        EFI_BOOT        { 0x6a82cb45, 0x1dd2, 0x11b2, 0x99, 0xa6, \
-                           { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
-#define        EFI_ROOT        { 0x6a85cf4d, 0x1dd2, 0x11b2, 0x99, 0xa6, \
-                           { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
-#define        EFI_SWAP        { 0x6a87c46f, 0x1dd2, 0x11b2, 0x99, 0xa6, \
-                           { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
-#define        EFI_USR         { 0x6a898cc3, 0x1dd2, 0x11b2, 0x99, 0xa6, \
-                           { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
-#define        EFI_BACKUP      { 0x6a8b642b, 0x1dd2, 0x11b2, 0x99, 0xa6, \
-                           { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
-#define        EFI_RESV2       { 0x6a8d2ac7, 0x1dd2, 0x11b2, 0x99, 0xa6, \
-                           { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
-#define        EFI_VAR         { 0x6a8ef2e9, 0x1dd2, 0x11b2, 0x99, 0xa6, \
-                           { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
-#define        EFI_HOME        { 0x6a90ba39, 0x1dd2, 0x11b2, 0x99, 0xa6, \
-                           { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
-#define        EFI_ALTSCTR     { 0x6a9283a5, 0x1dd2, 0x11b2, 0x99, 0xa6, \
-                           { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
-#define        EFI_RESERVED    { 0x6a945a3b, 0x1dd2, 0x11b2, 0x99, 0xa6, \
-                           { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
-#define        EFI_SYSTEM      { 0xC12A7328, 0xF81F, 0x11d2, 0xBA, 0x4B, \
-                           { 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B } }
-#define        EFI_LEGACY_MBR  { 0x024DEE41, 0x33E7, 0x11d3, 0x9D, 0x69, \
-                           { 0x00, 0x08, 0xC7, 0x81, 0xF3, 0x9F } }
-#define        EFI_SYMC_PUB    { 0x6a9630d1, 0x1dd2, 0x11b2, 0x99, 0xa6, \
-                           { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
-#define        EFI_SYMC_CDS    { 0x6a980767, 0x1dd2, 0x11b2, 0x99, 0xa6, \
-                           { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
-#define        EFI_MSFT_RESV   { 0xE3C9E316, 0x0B5C, 0x4DB8, 0x81, 0x7D, \
-                           { 0xF9, 0x2D, 0xF0, 0x02, 0x15, 0xAE } }
-#define        EFI_DELL_BASIC  { 0xebd0a0a2, 0xb9e5, 0x4433, 0x87, 0xc0, \
-                           { 0x68, 0xb6, 0xb7, 0x26, 0x99, 0xc7 } }
-#define        EFI_DELL_RAID   { 0xa19d880f, 0x05fc, 0x4d3b, 0xa0, 0x06, \
-                           { 0x74, 0x3f, 0x0f, 0x84, 0x91, 0x1e } }
-#define        EFI_DELL_SWAP   { 0x0657fd6d, 0xa4ab, 0x43c4, 0x84, 0xe5, \
-                           { 0x09, 0x33, 0xc8, 0x4b, 0x4f, 0x4f } }
-#define        EFI_DELL_LVM    { 0xe6d6d379, 0xf507, 0x44c2, 0xa2, 0x3c, \
-                           { 0x23, 0x8f, 0x2a, 0x3d, 0xf9, 0x28 } }
-#define        EFI_DELL_RESV   { 0x8da63339, 0x0007, 0x60c0, 0xc4, 0x36, \
-                           { 0x08, 0x3a, 0xc8, 0x23, 0x09, 0x08 } }
-#define        EFI_AAPL_HFS    { 0x48465300, 0x0000, 0x11aa, 0xaa, 0x11, \
-                           { 0x00, 0x30, 0x65, 0x43, 0xec, 0xac } }
-#define        EFI_AAPL_UFS    { 0x55465300, 0x0000, 0x11aa, 0xaa, 0x11, \
-                           { 0x00, 0x30, 0x65, 0x43, 0xec, 0xac } }
+#define        EFI_UNUSED              { 0x00000000, 0x0000, 0x0000, 0x00, 0x00, \
+                                   { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }
+#define        EFI_RESV1               { 0x6a96237f, 0x1dd2, 0x11b2, 0x99, 0xa6, \
+                                   { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
+#define        EFI_BOOT                { 0x6a82cb45, 0x1dd2, 0x11b2, 0x99, 0xa6, \
+                                   { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
+#define        EFI_ROOT                { 0x6a85cf4d, 0x1dd2, 0x11b2, 0x99, 0xa6, \
+                                   { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
+#define        EFI_SWAP                { 0x6a87c46f, 0x1dd2, 0x11b2, 0x99, 0xa6, \
+                                   { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
+#define        EFI_USR                 { 0x6a898cc3, 0x1dd2, 0x11b2, 0x99, 0xa6, \
+                                   { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
+#define        EFI_BACKUP              { 0x6a8b642b, 0x1dd2, 0x11b2, 0x99, 0xa6, \
+                                   { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
+#define        EFI_RESV2               { 0x6a8d2ac7, 0x1dd2, 0x11b2, 0x99, 0xa6, \
+                                   { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
+#define        EFI_VAR                 { 0x6a8ef2e9, 0x1dd2, 0x11b2, 0x99, 0xa6, \
+                                   { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
+#define        EFI_HOME                { 0x6a90ba39, 0x1dd2, 0x11b2, 0x99, 0xa6, \
+                                   { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
+#define        EFI_ALTSCTR             { 0x6a9283a5, 0x1dd2, 0x11b2, 0x99, 0xa6, \
+                                   { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
+#define        EFI_RESERVED            { 0x6a945a3b, 0x1dd2, 0x11b2, 0x99, 0xa6, \
+                                   { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
+#define        EFI_SYSTEM              { 0xC12A7328, 0xF81F, 0x11d2, 0xBA, 0x4B, \
+                                   { 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B } }
+#define        EFI_LEGACY_MBR          { 0x024DEE41, 0x33E7, 0x11d3, 0x9D, 0x69, \
+                                   { 0x00, 0x08, 0xC7, 0x81, 0xF3, 0x9F } }
+#define        EFI_SYMC_PUB            { 0x6a9630d1, 0x1dd2, 0x11b2, 0x99, 0xa6, \
+                                   { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
+#define        EFI_SYMC_CDS            { 0x6a980767, 0x1dd2, 0x11b2, 0x99, 0xa6, \
+                                   { 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
+#define        EFI_MSFT_RESV           { 0xE3C9E316, 0x0B5C, 0x4DB8, 0x81, 0x7D, \
+                                   { 0xF9, 0x2D, 0xF0, 0x02, 0x15, 0xAE } }
+#define        EFI_DELL_BASIC          { 0xebd0a0a2, 0xb9e5, 0x4433, 0x87, 0xc0, \
+                                   { 0x68, 0xb6, 0xb7, 0x26, 0x99, 0xc7 } }
+#define        EFI_DELL_RAID           { 0xa19d880f, 0x05fc, 0x4d3b, 0xa0, 0x06, \
+                                   { 0x74, 0x3f, 0x0f, 0x84, 0x91, 0x1e } }
+#define        EFI_DELL_SWAP           { 0x0657fd6d, 0xa4ab, 0x43c4, 0x84, 0xe5, \
+                                   { 0x09, 0x33, 0xc8, 0x4b, 0x4f, 0x4f } }
+#define        EFI_DELL_LVM            { 0xe6d6d379, 0xf507, 0x44c2, 0xa2, 0x3c, \
+                                   { 0x23, 0x8f, 0x2a, 0x3d, 0xf9, 0x28 } }
+#define        EFI_DELL_RESV           { 0x8da63339, 0x0007, 0x60c0, 0xc4, 0x36, \
+                                   { 0x08, 0x3a, 0xc8, 0x23, 0x09, 0x08 } }
+#define        EFI_AAPL_HFS            { 0x48465300, 0x0000, 0x11aa, 0xaa, 0x11, \
+                                   { 0x00, 0x30, 0x65, 0x43, 0xec, 0xac } }
+#define        EFI_AAPL_UFS            { 0x55465300, 0x0000, 0x11aa, 0xaa, 0x11, \
+                                   { 0x00, 0x30, 0x65, 0x43, 0xec, 0xac } }
+#define        EFI_FREEBSD_BOOT        { 0x83bd6b9d, 0x7f41, 0x11dc, 0xbe, 0x0b, \
+                                   { 0x00, 0x15, 0x60, 0xb8, 0x4f, 0x0f } }
+#define        EFI_FREEBSD_SWAP        { 0x516e7cb5, 0x6ecf, 0x11d6, 0x8f, 0xf8, \
+                                   { 0x00, 0x02, 0x2d, 0x09, 0x71, 0x2b } }
+#define        EFI_FREEBSD_UFS         { 0x516e7cb6, 0x6ecf, 0x11d6, 0x8f, 0xf8, \
+                                   { 0x00, 0x02, 0x2d, 0x09, 0x71, 0x2b } }
+#define        EFI_FREEBSD_VINUM       { 0x516e7cb8, 0x6ecf, 0x11d6, 0x8f, 0xf8, \
+                                   { 0x00, 0x02, 0x2d, 0x09, 0x71, 0x2b } }
+#define        EFI_FREEBSD_ZFS         { 0x516e7cba, 0x6ecf, 0x11d6, 0x8f, 0xf8, \
+                                   { 0x00, 0x02, 0x2d, 0x09, 0x71, 0x2b } }
 
 /* minimum # of bytes for partition table entires, per EFI spec */
 #define        EFI_MIN_ARRAY_SIZE      (16 * 1024)

diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c
index 785cfe63b2962bd1b53f34c8fe4f121ccd154a5f..bb90503751541579814e953eaa33fa39b522ac24 100644 (file)
--- a/lib/libefi/rdwr_efi.c
+++ b/lib/libefi/rdwr_efi.c
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
  */
 
 #include <stdio.h>
@@ -69,7 +70,12 @@ static struct uuid_to_ptag {
        { EFI_DELL_LVM },
        { EFI_DELL_RESV },
        { EFI_AAPL_HFS },
-       { EFI_AAPL_UFS }
+       { EFI_AAPL_UFS },
+       { EFI_FREEBSD_BOOT },
+       { EFI_FREEBSD_SWAP },
+       { EFI_FREEBSD_UFS },
+       { EFI_FREEBSD_VINUM },
+       { EFI_FREEBSD_ZFS }
 };
 
 /*