Page MenuHomeFreeBSD
Differential D21006

swapon before closing trimming fd
ClosedPublic
Actions

Authored by dougm on Jul 20 2019, 4:27 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Nov 18, 11:35 AM
Unknown Object (File)
Thu, Nov 14, 6:26 PM
Unknown Object (File)
Thu, Nov 14, 6:02 PM
Unknown Object (File)
Thu, Nov 14, 11:30 AM
Unknown Object (File)
Thu, Nov 14, 7:34 AM
Unknown Object (File)
Wed, Nov 13, 9:51 PM
Unknown Object (File)
Tue, Nov 12, 6:51 AM
Unknown Object (File)
Tue, Nov 12, 5:19 AM
View All 60 Files
Subscribers
imp

Details

Reviewers
markj
sigsys_gmail.com
Commits
rS350183: In trimming on startup, invoke swapon before closing the fd used for
Summary

To make swapon -E work with geli detach-on-last-close, don't close the trimming fd until after swapon(2) is invoked.

Test Plan

Ask reviewers to confirm that it fixes geli, and doesn't break swapon trimming for anyone else.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

dougm created this revision.Jul 20 2019, 4:27 AM
sigsys_gmail.com added a comment.Jul 20 2019, 4:46 AM

Probably not safe to start trimming the swap device *after* the kernel has been told to start using it for swapping (even if the window is probably small).

dougm updated this revision to Diff 59959.Jul 20 2019, 7:14 AM

Call swapon(2) after trimming, but before closing the trimming fd.

sigsys_gmail.com added a comment.Jul 20 2019, 7:27 AM
In D21006#455769, @dougm wrote:

Call swapon(2) after trimming, but before closing the trimming fd.

Works here. This is cleaner than what I was doing for sure. Got a typo though, it's "Eflag" not "Eflags".

dougm updated this revision to Diff 59960.Jul 20 2019, 7:31 AM

Fix Eflags typo.

markj added inline comments.Jul 20 2019, 6:01 PM
sbin/swapon/swapon.c
765

I think a comment explaining why this function handles both trimming and swapon would be appropriate.

dougm updated this revision to Diff 59966.Jul 20 2019, 6:12 PM
dougm retitled this revision from trim after swapon to swapon before closing trimming fd.
dougm edited the summary of this revision. (Show Details)

Add explanatory comment.

markj accepted this revision.Jul 20 2019, 8:30 PM
This revision is now accepted and ready to land.Jul 20 2019, 8:30 PM
Closed by commit rS350183: In trimming on startup, invoke swapon before closing the fd used for (authored by dougm). · Explain WhyJul 20 2019, 8:47 PM
This revision was automatically updated to reflect the committed changes.
dougm added a commit: rS350183: In trimming on startup, invoke swapon before closing the fd used for.
Herald added a subscriber: imp. · View Herald TranscriptJul 20 2019, 8:47 PM

Revision Contents
Changeset List

PathSize
sbin/
swapon/
16 lines

Diff 59960

View Options

sbin/swapon/swapon.c

Loading...