Differential D26297

[unix(4) cleanup 4/8] Simplify unp_disconnect() callers.
ClosedPublic
Actions

Authored by markj on Sep 2 2020, 4:56 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Thu, Oct 16, 12:35 AM

	Unknown Object (File)
	Sun, Oct 12, 9:04 AM

	Unknown Object (File)
	Sat, Oct 11, 4:58 AM

	Unknown Object (File)
	Mon, Sep 29, 11:49 AM

	Unknown Object (File)
	Sat, Sep 20, 7:34 AM

	Unknown Object (File)
	Sep 14 2025, 12:21 AM

	Unknown Object (File)
	Aug 31 2025, 12:06 AM

	Unknown Object (File)
	Aug 25 2025, 12:01 AM

Subscribers

Details

Reviewers: None
Commits: rS365762: Simplify unp_disconnect() callers.

Summary

In all cases, PCBs are unlocked after unp_disconnect() returns. Since
unp_disconnect() may release the last PCB reference, callers may have to
bump the refcount before the call just so that they can release them
again.

Change unp_disconnect() to release PCB locks as well as connection
references. Remove code that bumps and then releases the refcount.
Tighten assertions.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

markj requested review of this revision.Sep 2 2020, 4:56 PM

markj created this revision.

Harbormaster completed remote builds in B33329: Diff 76543.Sep 2 2020, 4:56 PM

markj added a parent revision: D26296: [unix(4) cleanup 3/8] Rename unp_pcb_lock2()..Sep 2 2020, 5:08 PM

markj added a child revision: D26298: [unix(4) cleanup 5/8] Avoid an unnecessary malloc() for dgram sockets..

emaste added a subscriber: emaste.Sep 2 2020, 5:20 PM

Use unp_pcb_unlock_pair().

Harbormaster completed remote builds in B33336: Diff 76550.Sep 2 2020, 5:58 PM

kevans mentioned this in D26295: [unix(4) cleanup 2/8] Improve unix socket refcounting..Sep 3 2020, 5:07 PM

markj added inline comments.Sep 3 2020, 5:46 PM

sys/kern/uipc_usrreq.c
2003 ↗	(On Diff #76550)	There is a bug here, fixed later in the series: if unp_conn == NULL we might in fact be dropping the last reference here.

Don't use unp_pcb_rele_notlast() when we may in fact be releasing the last ref.

Harbormaster completed remote builds in B33400: Diff 76668.Sep 4 2020, 8:14 PM

This revision was not accepted when it landed; it landed in state Needs Review.Sep 15 2020, 7:22 PM

Closed by commit rS365762: Simplify unp_disconnect() callers. (authored by markj). · Explain Why

This revision was automatically updated to reflect the committed changes.

markj added a commit: rS365762: Simplify unp_disconnect() callers..

Herald added a subscriber: imp. · View Herald TranscriptSep 15 2020, 7:22 PM

Revision Contents
Changeset List

Path

Size

head/

sys/

kern/

82 lines

Diff 77068

head/sys/kern/uipc_usrreq.c

Loading...