MFC r348554: 9688 aggsum_fini leaks memory
illumos/illumos-gate@29bf2d68be Reviewed by: Serapheim Dimitropoulos <serapheim.dimitro@delphix.com> Reviewed by: Matt Ahrens <matt@delphix.com> Reviewed by: Prashanth Sreenivasa <pks@delphix.com> Reviewed by: Jorgen Lundman <lundman@lundman.net> Reviewed by: Igor Kozhukhov <igor@dilos.org> Approved by: Robert Mustacchi <rm@joyent.com> Author: Paul Dagnelie <pcd@delphix.com>
This commit is contained in:
commit
1b61262505
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=348566
@ -13,7 +13,7 @@
|
|||||||
* CDDL HEADER END
|
* CDDL HEADER END
|
||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2017 by Delphix. All rights reserved.
|
* Copyright (c) 2017, 2018 by Delphix. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/zfs_context.h>
|
#include <sys/zfs_context.h>
|
||||||
@ -99,6 +99,7 @@ aggsum_fini(aggsum_t *as)
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < as->as_numbuckets; i++)
|
for (int i = 0; i < as->as_numbuckets; i++)
|
||||||
mutex_destroy(&as->as_buckets[i].asc_lock);
|
mutex_destroy(&as->as_buckets[i].asc_lock);
|
||||||
|
kmem_free(as->as_buckets, as->as_numbuckets * sizeof (aggsum_bucket_t));
|
||||||
mutex_destroy(&as->as_lock);
|
mutex_destroy(&as->as_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7074,6 +7074,16 @@ arc_state_fini(void)
|
|||||||
multilist_destroy(arc_mru_ghost->arcs_list[ARC_BUFC_DATA]);
|
multilist_destroy(arc_mru_ghost->arcs_list[ARC_BUFC_DATA]);
|
||||||
multilist_destroy(arc_mfu->arcs_list[ARC_BUFC_DATA]);
|
multilist_destroy(arc_mfu->arcs_list[ARC_BUFC_DATA]);
|
||||||
multilist_destroy(arc_mfu_ghost->arcs_list[ARC_BUFC_DATA]);
|
multilist_destroy(arc_mfu_ghost->arcs_list[ARC_BUFC_DATA]);
|
||||||
|
|
||||||
|
aggsum_fini(&arc_meta_used);
|
||||||
|
aggsum_fini(&arc_size);
|
||||||
|
aggsum_fini(&astat_data_size);
|
||||||
|
aggsum_fini(&astat_metadata_size);
|
||||||
|
aggsum_fini(&astat_hdr_size);
|
||||||
|
aggsum_fini(&astat_bonus_size);
|
||||||
|
aggsum_fini(&astat_dnode_size);
|
||||||
|
aggsum_fini(&astat_dbuf_size);
|
||||||
|
aggsum_fini(&astat_l2_hdr_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t
|
uint64_t
|
||||||
@ -7357,8 +7367,13 @@ arc_fini(void)
|
|||||||
mutex_destroy(&arc_adjust_lock);
|
mutex_destroy(&arc_adjust_lock);
|
||||||
cv_destroy(&arc_adjust_waiters_cv);
|
cv_destroy(&arc_adjust_waiters_cv);
|
||||||
|
|
||||||
arc_state_fini();
|
/*
|
||||||
|
* buf_fini() must proceed arc_state_fini() because buf_fin() may
|
||||||
|
* trigger the release of kmem magazines, which can callback to
|
||||||
|
* arc_space_return() which accesses aggsums freed in act_state_fini().
|
||||||
|
*/
|
||||||
buf_fini();
|
buf_fini();
|
||||||
|
arc_state_fini();
|
||||||
|
|
||||||
ASSERT0(arc_loaned_bytes);
|
ASSERT0(arc_loaned_bytes);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user