Page MenuHomeFreeBSD
Differential D25787

vm: fix swap reservation leak
ClosedPublic
Actions

Authored by mjg on Jul 23 2020, 1:35 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Jun 17, 11:17 PM
Unknown Object (File)
Tue, Jun 17, 10:36 PM
Unknown Object (File)
Tue, Jun 17, 8:00 PM
Unknown Object (File)
Sat, Jun 14, 9:57 PM
Unknown Object (File)
Wed, Jun 11, 10:22 PM
Unknown Object (File)
Jun 5 2025, 7:12 AM
Unknown Object (File)
May 19 2025, 4:06 AM
Unknown Object (File)
May 13 2025, 7:23 AM
View All Files
Subscribers
imp

Details

Reviewers
markj
kib
Commits
rS363472: vm: fix swap reservation leak and clean up surrounding code
Summary

If per-uid limit is exceeded, the cleanup fails to subtract from the global counter.

While here cleanup the code.

Diff Detail

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

Event Timeline

mjg created this revision.Jul 23 2020, 1:35 PM
Herald added a subscriber: imp. · View Herald TranscriptJul 23 2020, 1:35 PM
mjg requested review of this revision.Jul 23 2020, 1:35 PM
Harbormaster completed remote builds in B32510: Diff 74840.Jul 23 2020, 1:35 PM
kib added a comment.Jul 23 2020, 8:22 PM

Since you are doing cleanups, perhaps change the return type to bool, there and for swap_reserve().

sys/vm/swap_pager.c
247 ↗(On Diff #74840)

Please invert all conditions and s/||/&&/

mjg updated this revision to Diff 74866.Jul 24 2020, 12:37 AM
  • way more refactoring

I'm working on a patch to introduce per-cpu counting here so this serves as a good prep.

kib added inline comments.Jul 24 2020, 11:06 AM
sys/vm/swap_pager.c
216 ↗(On Diff #74866)

priv_check() != 0

218 ↗(On Diff #74866)

Might be, make this KASSERT

263 ↗(On Diff #74866)

Move oc declaration above statics.

284 ↗(On Diff #74866)

if (r > s && (oc & _ALLOW_NONWIRED) != 0) {

292 ↗(On Diff #74866)

Again, make this KASSERT

299 ↗(On Diff #74866)

And this

mjg updated this revision to Diff 74877.Jul 24 2020, 11:34 AM
  • address feedback
mjg updated this revision to Diff 74878.Jul 24 2020, 11:40 AM
  • missed one
kib accepted this revision.Jul 24 2020, 12:09 PM
This revision is now accepted and ready to land.Jul 24 2020, 12:09 PM
Closed by commit rS363472: vm: fix swap reservation leak and clean up surrounding code (authored by mjg). · Explain WhyJul 24 2020, 1:23 PM
This revision was automatically updated to reflect the committed changes.
mjg added a commit: rS363472: vm: fix swap reservation leak and clean up surrounding code.

Revision Contents
Changeset List

PathSize
head/
sys/
vm/
141 lines
6 lines

Diff 74879

View Options

head/sys/vm/swap_pager.c

Loading...
View Options

head/sys/vm/vm.h

Loading...