inpcb: apply smr_advance(9)/smr_wait(9) trick only to reusable sockets
ClosedPublic
Actions

Authored by glebius on Mar 4 2026, 9:39 PM.

Details

Reviewers

markj
pouria

Group Reviewers

network

Commits

rG202370905f11: inpcb: apply smr_advance(9)/smr_wait(9) trick only to reusable sockets

Summary

The protocols marked with PR_CONNREQUIRED can never go through pr_connect
after being disconnected. This is a tiny improvement of fdb987bebddf0.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 71550
Build 68433: arc lint + arc unit

Event Timeline

glebius created this revision.Mar 4 2026, 9:39 PM

Herald added a reviewer: pouria. · View Herald TranscriptMar 4 2026, 9:39 PM

Herald added subscribers: melifaro, ae, imp. · View Herald Transcript

Harbormaster completed remote builds in B71187: Diff 173156.Mar 4 2026, 9:39 PM

glebius requested review of this revision.Mar 4 2026, 9:39 PM

This removes the smr_advance() calls, but also the clearing of the addr/port. Is it intentional?

I don't see a point in clearing the addresses either. Speculatively (didn't check!) it should even fix getsockname(2) on a disconnected TCP connection.

In D55661#1274834, @glebius wrote:

I don't see a point in clearing the addresses either. Speculatively (didn't check!) it should even fix getsockname(2) on a disconnected TCP connection.

I don't see much point either, but the code has done this since at least 1994. But ok, I think this change is functionally a no-op anyway, since only the UDP code uses these functions...?

sys/netinet6/in6_pcb.c
515–516	This comment applies to the smr_advance() call, so should be moved to make that more clear. Same thing above.

Adjust comment placement per Mark's suggestion.

Harbormaster completed remote builds in B71550: Diff 173950.Mar 19 2026, 7:18 PM

glebius added a child revision: D55966: inpcb: retire the inpcbinfo list lock.Mar 19 2026, 7:19 PM

I'll write a manual for in_pcb someday...

sys/netinet/in_pcb.c
1430	style
sys/netinet6/in6_pcb.c
516

This revision is now accepted and ready to land.Mar 19 2026, 9:57 PM

markj accepted this revision.Mar 20 2026, 2:07 AM

markj added inline comments.

sys/netinet/in_pcb.c
1430	+1

Use == 0 to check flags.

This revision now requires review to proceed.Mar 20 2026, 8:27 PM

Harbormaster completed remote builds in B71597: Diff 174039.Mar 20 2026, 8:27 PM

In D55661#1274968, @markj wrote:

In D55661#1274834, @glebius wrote:

I don't see a point in clearing the addresses either. Speculatively (didn't check!) it should even fix getsockname(2) on a disconnected TCP connection.

I don't see much point either, but the code has done this since at least 1994. But ok, I think this change is functionally a no-op anyway, since only the UDP code uses these functions...?