---

yaml --- r: 194801 b: refs/heads/master c: 18e8c13 h: refs/heads/master i: 194799: c9a1249 v: v3
git-mirror · May 7, 2010 · aacd77c · aacd77c
1 parent 14f9a71
commit aacd77c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6bc0149d8f2300bffa03ea6fea3ca39744277a6
+refs/heads/master: 18e8c134f4e984e6639e62846345192816f06d5c
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
@@ -1361,9 +1361,12 @@ static inline int skb_network_offset(const struct sk_buff *skb)
  *
  * Various parts of the networking layer expect at least 32 bytes of
  * headroom, you should not reduce this.
+ * With RPS, we raised NET_SKB_PAD to 64 so that get_rps_cpus() fetches span
+ * a 64 bytes aligned block to fit modern (>= 64 bytes) cache line sizes
+ * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
  */
 #ifndef NET_SKB_PAD
-#define NET_SKB_PAD	32
+#define NET_SKB_PAD	64
 #endif
 
 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);