fdc2d30371
In #13871, zfs_vdev_aggregation_limit_non_rotating and zfs_vdev_aggregation_limit being signed was pointed out as a possible reason not to eliminate an unnecessary MAX(unsigned, 0) since the unsigned value was assigned from them. There is no reason for these module parameters to be signed and upon inspection, it was found that there are a number of other module parameters that are signed, but should not be, so we make them unsigned. Making them unsigned made it clear that some other variables in the code should also be unsigned, so we also make those unsigned. This prevents users from setting negative values that could potentially cause bad behaviors. It also makes the code slightly easier to understand. Mostly module parameters that deal with timeouts, limits, bitshifts and percentages are made unsigned by this. Any that are boolean are left signed, since whether booleans should be considered signed or unsigned does not matter. Making zfs_arc_lotsfree_percent unsigned caused a `zfs_arc_lotsfree_percent >= 0` check to become redundant, so it was removed. Removing the check was also necessary to prevent a compiler error from -Werror=type-limits. Several end of line comments had to be moved to their own lines because replacing int with uint_t caused us to exceed the 80 character limit enforced by cstyle.pl. The following were kept signed because they are passed to taskq_create(), which expects signed values and modifying the OpenSolaris/Illumos DDI is out of scope of this patch: * metaslab_load_pct * zfs_sync_taskq_batch_pct * zfs_zil_clean_taskq_nthr_pct * zfs_zil_clean_taskq_minalloc * zfs_zil_clean_taskq_maxalloc * zfs_arc_prune_task_threads Also, negative values in those parameters was found to be harmless. The following were left signed because either negative values make sense, or more analysis was needed to determine whether negative values should be disallowed: * zfs_metaslab_switch_threshold * zfs_pd_bytes_max * zfs_livelist_min_percent_shared zfs_multihost_history was made static to be consistent with other parameters. A number of module parameters were marked as signed, but in reality referenced unsigned variables. upgrade_errlog_limit is one of the numerous examples. In the case of zfs_vdev_async_read_max_active, it was already uint32_t, but zdb had an extern int declaration for it. Interestingly, the documentation in zfs.4 was right for upgrade_errlog_limit despite the module parameter being wrongly marked, while the documentation for zfs_vdev_async_read_max_active (and friends) was wrong. It was also wrong for zstd_abort_size, which was unsigned, but was documented as signed. Also, the documentation in zfs.4 incorrectly described the following parameters as ulong when they were int: * zfs_arc_meta_adjust_restarts * zfs_override_estimate_recordsize They are now uint_t as of this patch and thus the man page has been updated to describe them as uint. dbuf_state_index was left alone since it does nothing and perhaps should be removed in another patch. If any module parameters were missed, they were not found by `grep -r 'ZFS_MODULE_PARAM' | grep ', INT'`. I did find a few that grep missed, but only because they were in files that had hits. This patch intentionally did not attempt to address whether some of these module parameters should be elevated to 64-bit parameters, because the length of a long on 32-bit is 32-bit. Lastly, it was pointed out during review that uint_t is a better match for these variables than uint32_t because FreeBSD kernel parameter definitions are designed for uint_t, whose bit width can change in future memory models. As a result, we change the existing parameters that are uint32_t to use uint_t. Reviewed-by: Alexander Motin <mav@FreeBSD.org> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Neal Gompa <ngompa@datto.com> Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu> Closes #13875
97 lines
2.6 KiB
C
97 lines
2.6 KiB
C
/*
|
|
* CDDL HEADER START
|
|
*
|
|
* This file and its contents are supplied under the terms of the
|
|
* Common Development and Distribution License ("CDDL"), version 1.0.
|
|
* You may only use this file in accordance with the terms of version
|
|
* 1.0 of the CDDL.
|
|
*
|
|
* A full copy of the text of the CDDL should have accompanied this
|
|
* source. A copy of the CDDL is also available via the Internet at
|
|
* http://www.illumos.org/license/CDDL.
|
|
*
|
|
* CDDL HEADER END
|
|
*/
|
|
|
|
/*
|
|
* Copyright (c) 2014, 2019 by Delphix. All rights reserved.
|
|
*/
|
|
|
|
#ifndef _SYS_VDEV_REMOVAL_H
|
|
#define _SYS_VDEV_REMOVAL_H
|
|
|
|
#include <sys/spa.h>
|
|
#include <sys/bpobj.h>
|
|
#include <sys/vdev_indirect_mapping.h>
|
|
#include <sys/vdev_indirect_births.h>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
typedef struct spa_vdev_removal {
|
|
uint64_t svr_vdev_id;
|
|
uint64_t svr_max_offset_to_sync[TXG_SIZE];
|
|
/* Thread performing a vdev removal. */
|
|
kthread_t *svr_thread;
|
|
/* Segments left to copy from the current metaslab. */
|
|
range_tree_t *svr_allocd_segs;
|
|
kmutex_t svr_lock;
|
|
kcondvar_t svr_cv;
|
|
boolean_t svr_thread_exit;
|
|
|
|
/*
|
|
* New mappings to write out each txg.
|
|
*/
|
|
list_t svr_new_segments[TXG_SIZE];
|
|
|
|
/*
|
|
* Ranges that were freed while a mapping was in flight. This is
|
|
* a subset of the ranges covered by vdev_im_new_segments.
|
|
*/
|
|
range_tree_t *svr_frees[TXG_SIZE];
|
|
|
|
/*
|
|
* Number of bytes which we have finished our work for
|
|
* in each txg. This could be data copied (which will be part of
|
|
* the mappings in vdev_im_new_segments), or data freed before
|
|
* we got around to copying it.
|
|
*/
|
|
uint64_t svr_bytes_done[TXG_SIZE];
|
|
|
|
/* List of leaf zap objects to be unlinked */
|
|
nvlist_t *svr_zaplist;
|
|
} spa_vdev_removal_t;
|
|
|
|
typedef struct spa_condensing_indirect {
|
|
/*
|
|
* New mappings to write out each txg.
|
|
*/
|
|
list_t sci_new_mapping_entries[TXG_SIZE];
|
|
|
|
vdev_indirect_mapping_t *sci_new_mapping;
|
|
} spa_condensing_indirect_t;
|
|
|
|
extern int spa_remove_init(spa_t *);
|
|
extern void spa_restart_removal(spa_t *);
|
|
extern int spa_condense_init(spa_t *);
|
|
extern void spa_condense_fini(spa_t *);
|
|
extern void spa_start_indirect_condensing_thread(spa_t *);
|
|
extern void spa_vdev_condense_suspend(spa_t *);
|
|
extern int spa_vdev_remove(spa_t *, uint64_t, boolean_t);
|
|
extern void free_from_removing_vdev(vdev_t *, uint64_t, uint64_t);
|
|
extern int spa_removal_get_stats(spa_t *, pool_removal_stat_t *);
|
|
extern void svr_sync(spa_t *, dmu_tx_t *);
|
|
extern void spa_vdev_remove_suspend(spa_t *);
|
|
extern int spa_vdev_remove_cancel(spa_t *);
|
|
extern void spa_vdev_removal_destroy(spa_vdev_removal_t *);
|
|
extern uint64_t spa_remove_max_segment(spa_t *);
|
|
|
|
extern uint_t vdev_removal_max_span;
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* _SYS_VDEV_REMOVAL_H */
|