Commit 33994466 authored Sep 09, 2010 by Hugh Dickins Committed by Linus Torvalds Sep 09, 2010

swap: discard while swapping only if SWAP_FLAG_DISCARD



Tests with recent firmware on Intel X25-M 80GB and OCZ Vertex 60GB SSDs
show a shift since I last tested in December: in part because of firmware
updates, in part because of the necessary move from barriers to awaiting
completion at the block layer.  While discard at swapon still shows as
slightly beneficial on both, discarding 1MB swap cluster when allocating
is now disadvanteous: adds 25% overhead on Intel, adds 230% on OCZ (YMMV).

Surrender: discard as presently implemented is more hindrance than help
for swap; but might prove useful on other devices, or with improvements.
So continue to do the discard at swapon, but make discard while swapping
conditional on a SWAP_FLAG_DISCARD to sys_swapon() (which has been using
only the lower 16 bits of int flags).

We can add a --discard or -d to swapon(8), and a "discard" to swap in
/etc/fstab: matching the mount option for btrfs, ext4, fat, gfs2, nilfs2.

Signed-off-by: Hugh Dickins <hughd@google.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Nigel Cunningham <nigel@tuxonice.net>
Cc: Tejun Heo <tj@kernel.org>
Cc: Jens Axboe <jaxboe@fusionio.com>
Cc: James Bottomley <James.Bottomley@hansenpartnership.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 8f2ae0fa

include/linux/swap.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ struct bio;
		#define SWAP_FLAG_PREFER 0x8000 /* set if swap priority specified */
		#define SWAP_FLAG_PRIO_MASK 0x7fff
		#define SWAP_FLAG_PRIO_SHIFT 0
		#define SWAP_FLAG_DISCARD 0x10000 /* discard swap cluster after use */

		static inline int current_is_kswapd(void)
		{
		@@ -142,7 +143,7 @@ struct swap_extent {
		enum {
		SWP_USED = (1 << 0), /* is slot in swap_info[] used? */
		SWP_WRITEOK = (1 << 1), /* ok to write to this swap? */
		SWP_DISCARDABLE = (1 << 2), /* blkdev supports discard */
		SWP_DISCARDABLE = (1 << 2), /* swapon+blkdev support discard */
		SWP_DISCARDING = (1 << 3), /* now discarding a free cluster */
		SWP_SOLIDSTATE = (1 << 4), /* blkdev seeks are cheap */
		SWP_CONTINUED = (1 << 5), /* swap_map has count continuation */

mm/swapfile.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2047,7 +2047,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
		p->flags \|= SWP_SOLIDSTATE;
		p->cluster_next = 1 + (random32() % p->highest_bit);
		}
		if (discard_swap(p) == 0)
		if (discard_swap(p) == 0 && (swap_flags & SWAP_FLAG_DISCARD))
		p->flags \|= SWP_DISCARDABLE;
		}

Admin message