Skip to contentSkip to conversation

mm - swap prefetch magnify

PATCH In review Con Kolivas 2 participants 4 messages Oct 22, 2005 Memory management

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm - swap prefetch magnify

Testing has confirmed much larger prefetch values work well.

Con
---

The current number of pages prefetched by swap_prefetch is very gentle, and we are very cautious about whether prefetching is appropriate or not so we can increase the size substantially.

Make the prefetch size magnitudes larger, being proportional to memory size instead of the square root of it.

Fix the last_free calculation to work better with larger prefetch sizes.

mm/swap_prefetch.c +6 -8
Index: linux-2.6.14-rc5-ck1/mm/swap_prefetch.c
===================================================================
@@ -24,7 +24,7 @@
 #define PREFETCH_INTERVAL (HZ)
 
 /* sysctl - how many SWAP_CLUSTER_MAX pages to prefetch at a time */
-int swap_prefetch = 1;
+int swap_prefetch;
 
 struct swapped_root {
 	unsigned long		busy;		/* vm busy */
@@ -71,9 +71,7 @@ void __init prepare_prefetch(void)
 	mapped_limit = mem / 3 * 2;
 
 	/* Set initial swap_prefetch value according to memory size */
-	mem /= SWAP_CLUSTER_MAX * 1000;
-	while ((mem >>= 1))
-		swap_prefetch++;
+	swap_prefetch = mem / 10000;
 }
 
 /*
@@ -307,10 +305,9 @@ static int prefetch_suitable(void)
 	 * (eg during file reads)
 	 */
 	if (last_free) {
-		if (temp_free + SWAP_CLUSTER_MAX + prefetch_pages() <
-			last_free) {
-				last_free = temp_free;
-				goto out;
+		if (temp_free + SWAP_CLUSTER_MAX < last_free) {
+			last_free = temp_free;
+			goto out;
 		}
 	} else
 		last_free = temp_free;
@@ -375,6 +372,7 @@ static enum trickle_return trickle_swap(
 		case TRICKLE_FAILED:
 			break;
 		case TRICKLE_SUCCESS:
+			last_free--;
 			pages++;
 			break;
 		case TRICKLE_DELAY:
#1 lore raw
Quoted 1 line · Con Kolivas

Testing has confirmed much larger prefetch values work well.

Bah.. Sorry take this one instead. Just make sure that no matter how little ram we have prefetch is enabled.

Con
---

The current number of pages prefetched by swap_prefetch is very gentle, and we are very cautious about whether prefetching is appropriate or not so we can increase the size substantially.

Make the prefetch size magnitudes larger, being proportional to memory size instead of the square root of it.

Fix the last_free calculation to work better with larger prefetch sizes.

mm/swap_prefetch.c +6 -8
Index: linux-2.6.14-rc5-ck1/mm/swap_prefetch.c
===================================================================
@@ -24,7 +24,7 @@
 #define PREFETCH_INTERVAL (HZ)
 
 /* sysctl - how many SWAP_CLUSTER_MAX pages to prefetch at a time */
-int swap_prefetch = 1;
+int swap_prefetch;
 
 struct swapped_root {
 	unsigned long		busy;		/* vm busy */
@@ -71,9 +71,7 @@ void __init prepare_prefetch(void)
 	mapped_limit = mem / 3 * 2;
 
 	/* Set initial swap_prefetch value according to memory size */
-	mem /= SWAP_CLUSTER_MAX * 1000;
-	while ((mem >>= 1))
-		swap_prefetch++;
+	swap_prefetch = mem / 10000 ? : 1;
 }
 
 /*
@@ -307,10 +305,9 @@ static int prefetch_suitable(void)
 	 * (eg during file reads)
 	 */
 	if (last_free) {
-		if (temp_free + SWAP_CLUSTER_MAX + prefetch_pages() <
-			last_free) {
-				last_free = temp_free;
-				goto out;
+		if (temp_free + SWAP_CLUSTER_MAX < last_free) {
+			last_free = temp_free;
+			goto out;
 		}
 	} else
 		last_free = temp_free;
@@ -375,6 +372,7 @@ static enum trickle_return trickle_swap(
 		case TRICKLE_FAILED:
 			break;
 		case TRICKLE_SUCCESS:
+			last_free--;
 			pages++;
 			break;
 		case TRICKLE_DELAY:
#3 lore raw
Quoted 9 lines · Paolo Ciarrocchi
Quoted 5 lines · Con Kolivas
Quoted 1 line · Con Kolivas

Testing has confirmed much larger prefetch values work well.

Bah.. Sorry take this one instead. Just make sure that no matter how little ram we have prefetch is enabled.

Con,
would you be so kind to post more information about the test you've done ?

My concern was to not cause a detriment to performance in any noticeable way. The prefetch sizes were tested on a number of machines with different speed hard drive / ram size combinations to ensure none of the default values ever caused any significant I/O wait, or that heavy memory requiring compiles took any longer to complete as these constantly need new ram allocations and I wanted to ensure that prefetching into ram didn't slow down those allocations. Furthermore, the time taken to actually prefetch the application is now more than 5 times faster because of the larger default prefetch values.

Cheers,
Con