Page MenuHomeFreeBSD
Differential D38824

Actually get/set the correct values when inquiring TCP_PCAP_[IN/OUT]
ClosedPublic
Actions

Authored by rscheff on Feb 28 2023, 5:07 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 11, 2:24 PM
Unknown Object (File)
Feb 23 2025, 11:17 PM
Unknown Object (File)
Feb 16 2025, 7:38 AM
Unknown Object (File)
Feb 4 2025, 10:24 AM
Unknown Object (File)
Jan 24 2025, 7:33 AM
Unknown Object (File)
Dec 24 2024, 6:42 PM
Unknown Object (File)
Dec 4 2024, 4:22 PM
Unknown Object (File)
Dec 4 2024, 12:30 AM
View All 86 Files
Subscribers
imp
melifaro

Details

Reviewers
tuexen
glebius
cc
rrs
jtl
Group Reviewers
transport
Commits
rG9b3d6127716e: tcp: Make TCP PCAP buffer properly configurable.
rG2be7e3df7275: tcp: Make TCP PCAP buffer properly configurable.
rG399a5655e6ed: tcp: Make TCP PCAP buffer properly configurable.
Summary

Just stumbled upon this while looking at sources.

Seems like a fleeting error trying to reference the sopt_name implicitly.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 50068
Build 46960: arc lint + arc unit

Event Timeline

rscheff created this revision.Feb 28 2023, 5:07 PM
Herald added a reviewer: transport. · View Herald TranscriptFeb 28 2023, 5:07 PM
Herald added subscribers: melifaro, imp. · View Herald Transcript
rscheff requested review of this revision.Feb 28 2023, 5:07 PM
Harbormaster completed remote builds in B50067: Diff 118086.Feb 28 2023, 5:07 PM
cc requested changes to this revision.Feb 28 2023, 5:48 PM
cc added inline comments.
sys/netinet/tcp_usrreq.c
1669

This shall not compile. Dropped this line by accident?

This revision now requires changes to proceed.Feb 28 2023, 5:48 PM
rscheff updated this revision to Diff 118087.Feb 28 2023, 5:55 PM
  • remove fat-finger line deletion
Harbormaster completed remote builds in B50068: Diff 118087.Feb 28 2023, 5:55 PM
tuexen accepted this revision.Feb 28 2023, 6:23 PM
glebius accepted this revision.Feb 28 2023, 8:09 PM

Looks a trivial fix to me, that doesn't need a review to be checked in.

cc accepted this revision.Feb 28 2023, 8:15 PM
This revision is now accepted and ready to land.Feb 28 2023, 8:15 PM
Closed by commit rG399a5655e6ed: tcp: Make TCP PCAP buffer properly configurable. (authored by rscheff). · Explain WhyFeb 28 2023, 8:16 PM
This revision was automatically updated to reflect the committed changes.
rscheff added a commit: rG399a5655e6ed: tcp: Make TCP PCAP buffer properly configurable..
rscheff added a commit: rG2be7e3df7275: tcp: Make TCP PCAP buffer properly configurable..Mar 3 2023, 9:29 PM
rscheff added a commit: rG9b3d6127716e: tcp: Make TCP PCAP buffer properly configurable..

Revision Contents
Changeset List

PathSize
sys/
netinet/
6 lines

Diff 118087

View Options

sys/netinet/tcp_usrreq.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