Page MenuHomeFreeBSD
Differential D42874

tcp: properly initialize LRD while accepting session in syncache
ClosedPublic
Actions

Authored by rscheff on Dec 1 2023, 10:40 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 12, 8:37 AM
Unknown Object (File)
Mar 17 2025, 2:01 AM
Unknown Object (File)
Mar 8 2025, 7:23 AM
Unknown Object (File)
Jan 30 2025, 12:34 AM
Unknown Object (File)
Jan 24 2025, 7:29 AM
Unknown Object (File)
Jan 23 2025, 4:31 PM
Unknown Object (File)
Jan 23 2025, 6:06 AM
Unknown Object (File)
Jan 23 2025, 12:00 AM
View All 65 Files
Subscribers
imp
melifaro

Details

Reviewers
zlei
cc
tuexen
rrs
jtl
glebius
thj
Group Reviewers
transport
Commits
rG544bfa7cea3b: tcp: properly initialize LRD while accepting session in syncache
rGf071abd92e72: tcp: properly initialize LRD while accepting session in syncache
Summary

After the recent LRD related changes, I noted that accept()ed
sessions would not honor the per-session TF_LRD flag.

Initialize this not only in tcp_newtcpcb, but also in syncache_socket.

Test Plan

drop a data segment and the retransmission on a SACK session,
verify that another retransmission happens well before the
retransmission timeout.

MFC: 2 weeks

Diff Detail

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

Event Timeline

rscheff created this revision.Dec 1 2023, 10:40 PM
Herald added a reviewer: transport. · View Herald TranscriptDec 1 2023, 10:40 PM
Herald added subscribers: melifaro, imp. · View Herald Transcript
rscheff requested review of this revision.Dec 1 2023, 10:40 PM
Harbormaster completed remote builds in B54743: Diff 130920.Dec 1 2023, 10:40 PM
rscheff added inline comments.Dec 2 2023, 8:19 AM
sys/netinet/tcp_syncache.c
955–956

Alternatively, the TF_LRD flag could be inherited from the listen socket here with (TF_LRD|TF_NOPUSH|TF_NODELAY)

tuexen added inline comments.Dec 2 2023, 10:46 AM
sys/netinet/tcp_syncache.c
955–956

Inheriting is what I would prefer.

rscheff updated this revision to Diff 130939.Dec 2 2023, 11:12 AM
  • inherit LRD setting from listening socket
Harbormaster completed remote builds in B54751: Diff 130939.Dec 2 2023, 11:12 AM
rscheff marked an inline comment as done.Dec 2 2023, 11:12 AM
tuexen accepted this revision.Dec 2 2023, 11:13 AM
This revision is now accepted and ready to land.Dec 2 2023, 11:13 AM
Closed by commit rGf071abd92e72: tcp: properly initialize LRD while accepting session in syncache (authored by rscheff). · Explain WhyDec 2 2023, 11:52 AM
This revision was automatically updated to reflect the committed changes.
rscheff added a commit: rGf071abd92e72: tcp: properly initialize LRD while accepting session in syncache.
rscheff added a commit: rG544bfa7cea3b: tcp: properly initialize LRD while accepting session in syncache.Dec 16 2023, 10:30 AM

Revision Contents
Changeset List

PathSize
sys/
netinet/
3 lines

Diff 130939

View Options

sys/netinet/tcp_syncache.c

Show First 20 Lines • Show All 215 Lines • ▼ Show 20 Linesprocfile(const char *fn)
for (c = 0; c == 0 || !(lflag || qflag); ) { for (c = 0; c == 0 || !(lflag || qflag); ) {
ln.off += ln.len + 1; ln.off += ln.len + 1;
if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) { if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) {
if (ln.line_no == 0 && matchall) if (ln.line_no == 0 && matchall)
exit(0); exit(0);
else else
break; break;
} }
if (ln.len > 0 && ln.dat[ln.len - 1] == '\n') if (ln.len > 0 && ln.dat[ln.len - 1] == fileeol)
--ln.len; --ln.len;
ln.line_no++; ln.line_no++;
/* Return if we need to skip a binary file */ /* Return if we need to skip a binary file */
if (f->binary && binbehave == BINFILE_SKIP) { if (f->binary && binbehave == BINFILE_SKIP) {
grep_close(f); grep_close(f);
free(ln.file); free(ln.file);
free(f); free(f);
▲ Show 20 Lines • Show All 254 Lines • ▼ Show 20 Lines if ((oflag || color) && m > 0) {
} }
if (!oflag) { if (!oflag) {
if (line->len - a > 0) if (line->len - a > 0)
fwrite(line->dat + a, line->len - a, 1, stdout); fwrite(line->dat + a, line->len - a, 1, stdout);
putchar('\n'); putchar('\n');
} }
} else { } else {
fwrite(line->dat, line->len, 1, stdout); fwrite(line->dat, line->len, 1, stdout);
putchar('\n'); putchar(fileeol);
cemUnsubmitted
Not Done
Inline Actions

Hm, should the nul input separater really be used for outputting matched lines?

And if so, shouldn't it also be used with oflag above?

cem: Hm, should the nul input separater really be used for outputting matched lines? And if so…
kevansAuthorUnsubmitted
Not Done
Inline Actions

So, it depends. If we're supposed to be printing the matched lines, we need to do so faithful to the input file -- i.e., this line, and actually line 491 that I missed (!oflag, but color). Everything else is printing excerpts and should use the standard grep newline separator.

kevans: So, it depends. If we're supposed to be printing the matched lines, we need to do so faithful…
} }
} }