d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loader: setting vdev size based on label asize is not working

Browse Source 
Because we need to read asize from vdev_tree. We also need to consider
different vdev type difference.

Reviewed by:	allanjude
Sponsored by:	Netflix, Klara Inc.
Differential Revision:	https://reviews.freebsd.org/D25586
This commit is contained in:
Toomas Soome 2020-07-09 13:19:00 +00:00
parent b23a7fbaab
commit 1a4b982e1e
1 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
stand/libsa/zfs/zfsimpl.c
View File

@ -1586,6 +1586,57 @@ vdev_label_read(vdev_t *vd, int l, void *buf, uint64_t offset,
return (vdev_read_phys(vd, &bp, buf, off, size));
}
static uint64_t
vdev_get_label_asize(nvlist_t *nvl)
{
nvlist_t *vdevs;
uint64_t asize;
const char *type;
int len;
asize = 0;
/* Get vdev tree */
if (nvlist_find(nvl, ZPOOL_CONFIG_VDEV_TREE, DATA_TYPE_NVLIST,
NULL, &vdevs, NULL) != 0)
return (asize);
/*
* Get vdev type. We will calculate asize for raidz, mirror and disk.
* For raidz, the asize is raw size of all children.
*/
if (nvlist_find(vdevs, ZPOOL_CONFIG_TYPE, DATA_TYPE_STRING,
NULL, &type, &len) != 0)
goto done;
if (memcmp(type, VDEV_TYPE_MIRROR, len) != 0 &&
memcmp(type, VDEV_TYPE_DISK, len) != 0 &&
memcmp(type, VDEV_TYPE_RAIDZ, len) != 0)
goto done;
if (nvlist_find(vdevs, ZPOOL_CONFIG_ASIZE, DATA_TYPE_UINT64,
NULL, &asize, NULL) != 0)
goto done;
if (memcmp(type, VDEV_TYPE_RAIDZ, len) == 0) {
nvlist_t *kids;
int nkids;
if (nvlist_find(vdevs, ZPOOL_CONFIG_CHILDREN,
DATA_TYPE_NVLIST_ARRAY, &nkids, &kids, NULL) != 0) {
asize = 0;
goto done;
}
asize /= nkids;
nvlist_destroy(kids);
}
asize += VDEV_LABEL_START_SIZE + VDEV_LABEL_END_SIZE;
done:
nvlist_destroy(vdevs);
return (asize);
}
static nvlist_t *
vdev_label_read_config(vdev_t *vd, uint64_t txg)
{
@ -1631,10 +1682,9 @@ vdev_label_read_config(vdev_t *vd, uint64_t txg)
* Use asize from pool config. We need this
* because we can get bad value from BIOS.
*/
if (nvlist_find(nvl, ZPOOL_CONFIG_ASIZE,
DATA_TYPE_UINT64, NULL, &asize, NULL) == 0) {
vd->v_psize = asize +
VDEV_LABEL_START_SIZE + VDEV_LABEL_END_SIZE;
asize = vdev_get_label_asize(nvl);
if (asize != 0) {
vd->v_psize = asize;
}
}
nvlist_destroy(tmp);