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
F82037129: D25787.id74878.diff
Wed, Apr 24, 9:08 PM
F82005710: D25787.id74840.diff
Wed, Apr 24, 10:25 AM
Unknown Object (File)
Thu, Apr 18, 1:36 PM
Unknown Object (File)
Thu, Apr 18, 8:28 AM
Unknown Object (File)
Tue, Apr 16, 9:37 AM
Unknown Object (File)
Tue, Apr 16, 5:41 AM
Unknown Object (File)
Mar 7 2024, 11:45 PM
Unknown Object (File)
Feb 20 2024, 3:16 AM
View All 45 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

Lint
Lint Skipped
Unit
Tests Skipped

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
283

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

priv_check() != 0

218

Might be, make this KASSERT

263

Move oc declaration above statics.

284

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

292

Again, make this KASSERT

299

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
sys/
vm/
127 lines
4 lines

Diff 74866

View Options

sys/vm/swap_pager.c

Loading...
View Options

sys/vm/vm.h

Loading...