Page MenuHomeFreeBSD
Differential D23627

Mark more nodes as CTLFLAG_MPSAFE or CTLFLAG_NEEDGIANT (M of N)
ClosedPublic
Actions

Authored by kaktus on Feb 11 2020, 9:04 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Apr 6, 4:07 PM
Unknown Object (File)
Mar 11 2025, 12:29 AM
Unknown Object (File)
Feb 24 2025, 5:54 PM
Unknown Object (File)
Feb 22 2025, 4:12 PM
Unknown Object (File)
Feb 18 2025, 8:53 PM
Unknown Object (File)
Feb 18 2025, 6:26 PM
Unknown Object (File)
Feb 11 2025, 9:29 PM
Unknown Object (File)
Feb 3 2025, 7:30 PM
View All 43 Files
Subscribers
emaste
imp

Details

Reviewers
kib
asomers
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rS358275: Mark more nodes as CTLFLAG_MPSAFE or CTLFLAG_NEEDGIANT (8 of many)
Summary

r357614 added CTLFLAG_NEEDGIANT to make it easier to find nodes that are still not MPSAFE (or already are but aren’t properly marked). Use it in preparation for a general review of all nodes.
This is non-functional change that adds annotations to SYSCTL_NODE and SYSCTL_PROC nodes using one of the soon-to-be-required flags.

You’re asked for a review based on src/MAINTAINERS entry.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
head/
sys/
fs/
fuse/
6 lines

Diff 68739

View Options

head/sys/fs/fuse/fuse_main.c

Show First 20 Lines • Show All 409 Lines • ▼ Show 20 Lines
} }
/* /*
* Read the vdev config from a device. Return the number of valid labels that * Read the vdev config from a device. Return the number of valid labels that
* were found. The vdev config will be returned in config if and only if at * were found. The vdev config will be returned in config if and only if at
* least one valid label was found. * least one valid label was found.
*/ */
static int static int
vdev_geom_read_config(struct g_consumer *cp, nvlist_t **config) vdev_geom_read_config(struct g_consumer *cp, nvlist_t **configp)
{ {
struct g_provider *pp; struct g_provider *pp;
nvlist_t *config;
vdev_phys_t *vdev_lists[VDEV_LABELS]; vdev_phys_t *vdev_lists[VDEV_LABELS];
char *buf; char *buf;
size_t buflen; size_t buflen;
uint64_t psize, state, txg; uint64_t psize, state, txg;
off_t offsets[VDEV_LABELS]; off_t offsets[VDEV_LABELS];
off_t size; off_t size;
off_t sizes[VDEV_LABELS]; off_t sizes[VDEV_LABELS];
int cmds[VDEV_LABELS]; int cmds[VDEV_LABELS];
int errors[VDEV_LABELS]; int errors[VDEV_LABELS];
int l, nlabels; int l, nlabels;
g_topology_assert_not(); g_topology_assert_not();
pp = cp->provider; pp = cp->provider;
ZFS_LOG(1, "Reading config from %s...", pp->name); ZFS_LOG(1, "Reading config from %s...", pp->name);
psize = pp->mediasize; psize = pp->mediasize;
psize = P2ALIGN(psize, (uint64_t)sizeof(vdev_label_t)); psize = P2ALIGN(psize, (uint64_t)sizeof(vdev_label_t));
size = sizeof(*vdev_lists[0]) + pp->sectorsize - size = sizeof(*vdev_lists[0]) + pp->sectorsize -
((sizeof(*vdev_lists[0]) - 1) % pp->sectorsize) - 1; ((sizeof(*vdev_lists[0]) - 1) % pp->sectorsize) - 1;
buflen = sizeof(vdev_lists[0]->vp_nvlist); buflen = sizeof(vdev_lists[0]->vp_nvlist);
*config = NULL;
/* Create all of the IO requests */ /* Create all of the IO requests */
for (l = 0; l < VDEV_LABELS; l++) { for (l = 0; l < VDEV_LABELS; l++) {
cmds[l] = BIO_READ; cmds[l] = BIO_READ;
vdev_lists[l] = kmem_alloc(size, KM_SLEEP); vdev_lists[l] = kmem_alloc(size, KM_SLEEP);
offsets[l] = vdev_label_offset(psize, l, 0) + VDEV_SKIP_SIZE; offsets[l] = vdev_label_offset(psize, l, 0) + VDEV_SKIP_SIZE;
sizes[l] = size; sizes[l] = size;
errors[l] = 0; errors[l] = 0;
ASSERT(offsets[l] % pp->sectorsize == 0); ASSERT(offsets[l] % pp->sectorsize == 0);
} }
/* Issue the IO requests */ /* Issue the IO requests */
vdev_geom_io(cp, cmds, (void**)vdev_lists, offsets, sizes, errors, vdev_geom_io(cp, cmds, (void**)vdev_lists, offsets, sizes, errors,
VDEV_LABELS); VDEV_LABELS);
/* Parse the labels */ /* Parse the labels */
config = *configp = NULL;
nlabels = 0; nlabels = 0;
for (l = 0; l < VDEV_LABELS; l++) { for (l = 0; l < VDEV_LABELS; l++) {
if (errors[l] != 0) if (errors[l] != 0)
continue; continue;
buf = vdev_lists[l]->vp_nvlist; buf = vdev_lists[l]->vp_nvlist;
if (nvlist_unpack(buf, buflen, config, 0) != 0) if (nvlist_unpack(buf, buflen, &config, 0) != 0)
continue; continue;
if (nvlist_lookup_uint64(*config, ZPOOL_CONFIG_POOL_STATE, if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_STATE,
&state) != 0 || state > POOL_STATE_L2CACHE) { &state) != 0 || state > POOL_STATE_L2CACHE) {
nvlist_free(*config); nvlist_free(config);
*config = NULL;
continue; continue;
} }
if (state != POOL_STATE_SPARE && if (state != POOL_STATE_SPARE &&
state != POOL_STATE_L2CACHE && state != POOL_STATE_L2CACHE &&
(nvlist_lookup_uint64(*config, ZPOOL_CONFIG_POOL_TXG, (nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_TXG,
&txg) != 0 || txg == 0)) { &txg) != 0 || txg == 0)) {
nvlist_free(*config); nvlist_free(config);
*config = NULL;
continue; continue;
} }
if (*configp != NULL)
nvlist_free(*configp);
*configp = config;
nlabels++; nlabels++;
} }
/* Free the label storage */ /* Free the label storage */
for (l = 0; l < VDEV_LABELS; l++) for (l = 0; l < VDEV_LABELS; l++)
kmem_free(vdev_lists[l], size); kmem_free(vdev_lists[l], size);
▲ Show 20 Lines • Show All 664 Lines • Show Last 20 Lines