10173 loader: support newer ZFS versions

Review Request #1340 — Created Jan. 4, 2019 and submitted Jan. 10, 2019, 7:11 p.m.

Information
Owner:	tsoome
Repository:	illumos-gate
Branch:
Bugs:	10173
Depends On:
Commit:	d184b69...
Reviewers
Groups:	general
People:

Description

zfsboot: support newer ZFS versions
declare v3 objset size/layout to fix userboot and possibly other loader issues

- fix for userboot assertion failure in zfs_dev_close in free due to out of bounds write
- fix for zfs_alloc / zfs_free mismatch assertion failure when booting GPT on BIOS

https://svnweb.freebsd.org/changeset/base/342747

Testing Done

Issues

0
0
2
0
All Issues: 2

Description	From	Last Updated
Please, remove the hyphen.	domag02	Jan. 7, 2019, 2:15 p.m.
#define OBJSET_PAD0_SIZE (OBJSET_PHYS_SIZE_V2 - \ sizeof (dnode_phys_t) * 3 - sizeof (zil_header_t) - \ sizeof (uint64_t) * 2 - 2 ...	domag02	Jan. 7, 2019, 2:39 p.m.


Missing blanks around binary operators.
New constants for padding sizes. (Optional)

usr/src/boot/sys/cddl/boot/zfs/zfsimpl.h (Diff revision 1)

Show all issues


#define OBJSET_PAD0_SIZE    (OBJSET_PHYS_SIZE_V2 -  \
    sizeof (dnode_phys_t) * 3 - sizeof (zil_header_t) - \
    sizeof (uint64_t) * 2 - 2 * ZIO_OBJSET_MAC_LEN)
#define OBJSET_PAD1_SIZE    (OBJSET_PHYS_SIZE_V3 -  \
    OBJSET_PHYS_SIZE_V2 - sizeof (dnode_phys_t))

typedef struct objset_phys {
    dnode_phys_t os_meta_dnode;
    zil_header_t os_zil_header;
    uint64_t os_type;
    uint64_t os_flags;
    uint8_t os_portable_mac[ZIO_OBJSET_MAC_LEN];
    uint8_t os_local_mac[ZIO_OBJSET_MAC_LEN];
    char os_pad0[OBJSET_PAD0_SIZE];
    dnode_phys_t os_userused_dnode;
    dnode_phys_t os_groupused_dnode;
    dnode_phys_t os_projectused_dnode;
    char os_pad1[OBJSET_PAD1_SIZE];
} objset_phys_t;