c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-24 03:08:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix dspace underflow bug

Browse Source 
Since spa_dspace accounts only normal allocation class space,
spa_nonallocating_dspace should do the same.  Otherwise we may get
negative overflow or respective assertion spa_update_dspace() if
removed special/dedup vdev is bigger than all normal class space.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Allan Jude <allan@klarasystems.com>
Signed-off-by: Paul Dagnelie <paul.dagnelie@klarasystems.com>
Closes #17183
This commit is contained in:
Paul Dagnelie
2025-04-01 06:23:43 -07:00
committed by GitHub
parent 11ca12dbd3
commit 367d34b3aa
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zfs/vdev.c
+20 -2
View File
@@ -1515,6 +1515,25 @@ vdev_metaslab_group_create(vdev_t *vd)
}
}
void
vdev_update_nonallocating_space(vdev_t *vd, boolean_t add)
{
spa_t *spa = vd->vdev_spa;
if (vd->vdev_mg->mg_class != spa_normal_class(spa))
return;
uint64_t raw_space = metaslab_group_get_space(vd->vdev_mg);
uint64_t dspace = spa_deflate(spa) ?
vdev_deflated_space(vd, raw_space) : raw_space;
if (add) {
spa->spa_nonallocating_dspace += dspace;
} else {
ASSERT3U(spa->spa_nonallocating_dspace, >=, dspace);
spa->spa_nonallocating_dspace -= dspace;
}
}
int
vdev_metaslab_init(vdev_t *vd, uint64_t txg)
{
@@ -1626,8 +1645,7 @@ vdev_metaslab_init(vdev_t *vd, uint64_t txg)
*/
if (vd->vdev_noalloc) {
/* track non-allocating vdev space */
spa->spa_nonallocating_dspace += spa_deflate(spa) ?
vd->vdev_stat.vs_dspace : vd->vdev_stat.vs_space;
vdev_update_nonallocating_space(vd, B_TRUE);
} else if (!expanding) {
metaslab_group_activate(vd->vdev_mg);
if (vd->vdev_log_mg != NULL)