[pve-devel] r6153 - pve-kernel-2.6.32-rh/trunk

svn-commits at proxmox.com svn-commits at proxmox.com
Fri Jun 24 11:18:36 CEST 2011


Author: dietmar
Date: 2011-06-24 11:18:36 +0200 (Fri, 24 Jun 2011)
New Revision: 6153

Modified:
   pve-kernel-2.6.32-rh/trunk/put_page_callback-2.6.32.patch.diff
Log:


Modified: pve-kernel-2.6.32-rh/trunk/put_page_callback-2.6.32.patch.diff
===================================================================
--- pve-kernel-2.6.32-rh/trunk/put_page_callback-2.6.32.patch.diff	2011-06-24 08:52:03 UTC (rev 6152)
+++ pve-kernel-2.6.32-rh/trunk/put_page_callback-2.6.32.patch.diff	2011-06-24 09:18:36 UTC (rev 6153)
@@ -48,162 +48,6 @@
  @@ -20,6 +20,7 @@
   
   #include <linux/socket.h>
-@@ -31,7 +31,7 @@
-  
-  #define NPROTO		AF_MAX
-  
--@@ -361,5 +362,44 @@ static const struct proto_ops name##_ops
-+@@ -365,5 +366,44 @@ static const struct proto_ops name##_ops
-  extern struct ratelimit_state net_ratelimit_state;
-  #endif
-  
-@@ -76,10 +76,10 @@
- +
-  #endif /* __KERNEL__ */
-  #endif	/* _LINUX_NET_H */
--diff -upkr linux-2.6.32.1/net/core/dev.c linux-2.6.32.1/net/core/dev.c
----- linux-2.6.32.1/net/core/dev.c	2009-12-03 06:51:21.000000000 +0300
--+++ linux-2.6.32.1/net/core/dev.c	2009-12-16 15:22:16.000000000 +0300
--@@ -2516,7 +2516,7 @@ pull:
-+diff -upr old/net/core/dev.c linux-2.6-2.6.32/net/core/dev.c
-+--- old/net/core/dev.c	2011-06-24 10:12:25.000000000 +0200
-++++ linux-2.6-2.6.32/net/core/dev.c	2011-06-24 10:12:56.000000000 +0200
-+@@ -2932,7 +2932,7 @@ pull:
-  		skb_shinfo(skb)->frags[0].size -= grow;
-  
-  		if (unlikely(!skb_shinfo(skb)->frags[0].size)) {
-@@ -88,10 +88,10 @@
-  			memmove(skb_shinfo(skb)->frags,
-  				skb_shinfo(skb)->frags + 1,
-  				--skb_shinfo(skb)->nr_frags);
--diff -upkr linux-2.6.32.1/net/core/skbuff.c linux-2.6.32.1/net/core/skbuff.c
----- linux-2.6.32.1/net/core/skbuff.c	2009-12-03 06:51:21.000000000 +0300
--+++ linux-2.6.32.1/net/core/skbuff.c	2009-12-16 15:22:16.000000000 +0300
--@@ -76,13 +76,13 @@ static struct kmem_cache *skbuff_fclone_
-+diff -upr old/net/core/skbuff.c linux-2.6-2.6.32/net/core/skbuff.c
-+--- old/net/core/skbuff.c	2011-06-24 10:12:25.000000000 +0200
-++++ linux-2.6-2.6.32/net/core/skbuff.c	2011-06-24 10:12:56.000000000 +0200
-+@@ -77,13 +77,13 @@ static struct kmem_cache *skbuff_fclone_
-  static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
-  				  struct pipe_buffer *buf)
-  {
-@@ -107,7 +107,7 @@
-  }
-  
-  static int sock_pipe_buf_steal(struct pipe_inode_info *pipe,
--@@ -344,7 +344,7 @@ static void skb_release_data(struct sk_b
-+@@ -352,7 +352,7 @@ static void skb_release_data(struct sk_b
-  		if (skb_shinfo(skb)->nr_frags) {
-  			int i;
-  			for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
-@@ -116,7 +116,7 @@
-  		}
-  
-  		if (skb_has_frags(skb))
--@@ -762,7 +762,7 @@ struct sk_buff *pskb_copy(struct sk_buff
-+@@ -794,7 +794,7 @@ struct sk_buff *pskb_copy(struct sk_buff
-  
-  		for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-  			skb_shinfo(n)->frags[i] = skb_shinfo(skb)->frags[i];
-@@ -125,7 +125,7 @@
-  		}
-  		skb_shinfo(n)->nr_frags = i;
-  	}
--@@ -828,7 +828,7 @@ int pskb_expand_head(struct sk_buff *skb
-+@@ -860,7 +860,7 @@ int pskb_expand_head(struct sk_buff *skb
-  	       sizeof(struct skb_shared_info));
-  
-  	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
-@@ -134,7 +134,7 @@
-  
-  	if (skb_has_frags(skb))
-  		skb_clone_fraglist(skb);
--@@ -1102,7 +1102,7 @@ drop_pages:
-+@@ -1134,7 +1134,7 @@ drop_pages:
-  		skb_shinfo(skb)->nr_frags = i;
-  
-  		for (; i < nfrags; i++)
-@@ -143,7 +143,7 @@
-  
-  		if (skb_has_frags(skb))
-  			skb_drop_fraglist(skb);
--@@ -1271,7 +1271,7 @@ pull_pages:
-+@@ -1303,7 +1303,7 @@ pull_pages:
-  	k = 0;
-  	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-  		if (skb_shinfo(skb)->frags[i].size <= eat) {
-@@ -152,7 +152,7 @@
-  			eat -= skb_shinfo(skb)->frags[i].size;
-  		} else {
-  			skb_shinfo(skb)->frags[k] = skb_shinfo(skb)->frags[i];
--@@ -1372,7 +1372,7 @@ EXPORT_SYMBOL(skb_copy_bits);
-+@@ -1404,7 +1404,7 @@ EXPORT_SYMBOL(skb_copy_bits);
-   */
-  static void sock_spd_release(struct splice_pipe_desc *spd, unsigned int i)
-  {
-@@ -161,7 +161,7 @@
-  }
-  
-  static inline struct page *linear_to_page(struct page *page, unsigned int *len,
--@@ -1396,7 +1396,7 @@ new_page:
-+@@ -1428,7 +1428,7 @@ new_page:
-  		off = sk->sk_sndmsg_off;
-  		mlen = PAGE_SIZE - off;
-  		if (mlen < 64 && mlen < *len) {
-@@ -170,7 +170,7 @@
-  			goto new_page;
-  		}
-  
--@@ -1406,7 +1406,7 @@ new_page:
-+@@ -1438,7 +1438,7 @@ new_page:
-  	memcpy(page_address(p) + off, page_address(page) + *offset, *len);
-  	sk->sk_sndmsg_off += *len;
-  	*offset = off;
-@@ -179,7 +179,7 @@
-  
-  	return p;
-  }
--@@ -1427,7 +1427,7 @@ static inline int spd_fill_page(struct s
-+@@ -1459,7 +1459,7 @@ static inline int spd_fill_page(struct s
-  		if (!page)
-  			return 1;
-  	} else
-@@ -188,7 +188,7 @@
-  
-  	spd->pages[spd->nr_pages] = page;
-  	spd->partial[spd->nr_pages].len = *len;
--@@ -2057,7 +2057,7 @@ static inline void skb_split_no_header(s
-+@@ -2089,7 +2089,7 @@ static inline void skb_split_no_header(s
-  				 *    where splitting is expensive.
-  				 * 2. Split is accurately. We make this.
-  				 */
-@@ -197,7 +197,7 @@
-  				skb_shinfo(skb1)->frags[0].page_offset += len - pos;
-  				skb_shinfo(skb1)->frags[0].size -= len - pos;
-  				skb_shinfo(skb)->frags[i].size	= len - pos;
--@@ -2179,7 +2179,7 @@ int skb_shift(struct sk_buff *tgt, struc
-+@@ -2211,7 +2211,7 @@ int skb_shift(struct sk_buff *tgt, struc
-  			to++;
-  
-  		} else {
-@@ -206,7 +206,7 @@
-  			fragto->page = fragfrom->page;
-  			fragto->page_offset = fragfrom->page_offset;
-  			fragto->size = todo;
--@@ -2201,7 +2201,7 @@ int skb_shift(struct sk_buff *tgt, struc
-+@@ -2233,7 +2233,7 @@ int skb_shift(struct sk_buff *tgt, struc
-  		fragto = &skb_shinfo(tgt)->frags[merge];
-  
-  		fragto->size += fragfrom->size;
-@@ -215,7 +215,7 @@
-  	}
-  
-  	/* Reposition in the original skb */
--@@ -2599,7 +2599,7 @@ struct sk_buff *skb_segment(struct sk_bu
-+@@ -2628,7 +2628,7 @@ struct sk_buff *skb_segment(struct sk_bu
-  
-  		while (pos < offset + len && i < nfrags) {
-  			*frag = skb_shinfo(skb)->frags[i];
 @@ -224,19 +224,19 @@
   			size = frag->size;
   
@@ -230,34 +74,6 @@
   		if (skb_can_coalesce(skb, i, page, offset)) {
   			skb_shinfo(skb)->frags[i-1].size += len;
   		} else if (i < MAX_SKB_FRAGS) {
-@@ -245,9 +245,9 @@
-  			skb_fill_page_desc(skb, i, page, offset, len);
-  		} else {
-  			err = -EMSGSIZE;
--diff -upkr linux-2.6.32.1/net/ipv4/Makefile linux-2.6.32.1/net/ipv4/Makefile
----- linux-2.6.32.1/net/ipv4/Makefile	2009-12-03 06:51:21.000000000 +0300
--+++ linux-2.6.32.1/net/ipv4/Makefile	2009-12-16 15:22:16.000000000 +0300
-+diff -upr old/net/ipv4/Makefile linux-2.6-2.6.32/net/ipv4/Makefile
-+--- old/net/ipv4/Makefile	2009-12-03 04:51:21.000000000 +0100
-++++ linux-2.6-2.6.32/net/ipv4/Makefile	2011-06-24 10:12:56.000000000 +0200
- @@ -49,6 +49,7 @@ obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o
-  obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o
-  obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o
-@@ -256,10 +256,10 @@
-  
-  obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \
-  		      xfrm4_output.o
--diff -upkr linux-2.6.32.1/net/ipv4/tcp.c linux-2.6.32.1/net/ipv4/tcp.c
----- linux-2.6.32.1/net/ipv4/tcp.c	2009-12-03 06:51:21.000000000 +0300
--+++ linux-2.6.32.1/net/ipv4/tcp.c	2009-12-16 15:22:16.000000000 +0300
--@@ -799,7 +799,7 @@ new_segment:
-+diff -upr old/net/ipv4/tcp.c linux-2.6-2.6.32/net/ipv4/tcp.c
-+--- old/net/ipv4/tcp.c	2011-06-24 10:12:25.000000000 +0200
-++++ linux-2.6-2.6.32/net/ipv4/tcp.c	2011-06-24 10:27:22.000000000 +0200
-+@@ -827,7 +827,7 @@ new_segment:
-  		if (can_coalesce) {
-  			skb_shinfo(skb)->frags[i - 1].size += copy;
-  		} else {
 @@ -268,16 +268,16 @@
   			skb_fill_page_desc(skb, i, page, offset, copy);
   		}
@@ -297,84 +113,3 @@
   	k = 0;
   	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
   		if (skb_shinfo(skb)->frags[i].size <= eat) {
-@@ -301,63 +301,10 @@
-  			eat -= skb_shinfo(skb)->frags[i].size;
-  		} else {
-  			skb_shinfo(skb)->frags[k] = skb_shinfo(skb)->frags[i];
--diff -upkr linux-2.6.32.1/net/ipv4/tcp_zero_copy.c linux-2.6.32.1/net/ipv4/tcp_zero_copy.c
----- linux-2.6.32.1/net/ipv4/tcp_zero_copy.c	2009-12-08 17:41:11.000000000 +0300
--+++ linux-2.6.32.1/net/ipv4/tcp_zero_copy.c	2009-12-16 15:22:16.000000000 +0300
--@@ -0,0 +1,49 @@
--+/*
--+ *	Support routines for TCP zero copy transmit
--+ *
--+ *	Created by Vladislav Bolkhovitin
--+ *
--+ *	This program is free software; you can redistribute it and/or
--+ *      modify it under the terms of the GNU General Public License
--+ *      version 2 as published by the Free Software Foundation.
--+ */
--+
--+#include <linux/skbuff.h>
--+
--+net_get_page_callback_t net_get_page_callback __read_mostly;
--+EXPORT_SYMBOL(net_get_page_callback);
--+
--+net_put_page_callback_t net_put_page_callback __read_mostly;
--+EXPORT_SYMBOL(net_put_page_callback);
--+
--+/*
--+ * Caller of this function must ensure that at the moment when it's called
--+ * there are no pages in the system with net_priv field set to non-zero
--+ * value. Hence, this function, as well as net_get_page() and net_put_page(),
--+ * don't need any protection.
--+ */
--+int net_set_get_put_page_callbacks(
--+	net_get_page_callback_t get_callback,
--+	net_put_page_callback_t put_callback)
--+{
--+	int res = 0;
--+
--+	if ((net_get_page_callback != NULL) && (get_callback != NULL) &&
--+	    (net_get_page_callback != get_callback)) {
--+		res = -EBUSY;
--+		goto out;
--+	}
--+
--+	if ((net_put_page_callback != NULL) && (put_callback != NULL) &&
--+	    (net_put_page_callback != put_callback)) {
--+		res = -EBUSY;
--+		goto out;
--+	}
--+
--+	net_get_page_callback = get_callback;
--+	net_put_page_callback = put_callback;
--+
--+out:
--+	return res;
--+}
--+EXPORT_SYMBOL(net_set_get_put_page_callbacks);
--diff -upkr linux-2.6.32.1/net/ipv6/ip6_output.c linux-2.6.32.1/net/ipv6/ip6_output.c
----- linux-2.6.32.1/net/ipv6/ip6_output.c	2009-12-03 06:51:21.000000000 +0300
--+++ linux-2.6.32.1/net/ipv6/ip6_output.c	2009-12-16 15:22:16.000000000 +0300
--@@ -1379,7 +1379,7 @@ alloc_new_skb:
-+diff -upr old/net/ipv6/ip6_output.c linux-2.6-2.6.32/net/ipv6/ip6_output.c
-+--- old/net/ipv6/ip6_output.c	2011-06-24 10:12:25.000000000 +0200
-++++ linux-2.6-2.6.32/net/ipv6/ip6_output.c	2011-06-24 10:12:56.000000000 +0200
-+@@ -1389,7 +1389,7 @@ alloc_new_skb:
-  						err = -EMSGSIZE;
-  						goto error;
-  					}
-@@ -366,9 +313,9 @@
-  					skb_fill_page_desc(skb, i, page, sk->sk_sndmsg_off, 0);
-  					frag = &skb_shinfo(skb)->frags[i];
-  				}
--diff -upkr linux-2.6.32.1/net/Kconfig linux-2.6.32.1/net/Kconfig
----- linux-2.6.32.1/net/Kconfig	2009-12-03 06:51:21.000000000 +0300
--+++ linux-2.6.32.1/net/Kconfig	2009-12-16 15:22:16.000000000 +0300
-+diff -upr old/net/Kconfig linux-2.6-2.6.32/net/Kconfig
-+--- old/net/Kconfig	2009-12-03 04:51:21.000000000 +0100
-++++ linux-2.6-2.6.32/net/Kconfig	2011-06-24 10:12:56.000000000 +0200
- @@ -72,6 +72,18 @@ config INET
-  
-  	  Short answer: say Y.



More information about the pve-devel mailing list