X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=linux-2.6-520-vnet%2B.patch;h=f425f62a9d8e00d33f77aa56a67346b518d4d06a;hb=refs%2Fheads%2Flibertas;hp=271729f13f84fd9442f5a4c46d132206e1581d4e;hpb=f61fd5f77a3322f54ddeee2d902bbb58dfee15f9;p=linux-2.6.git diff --git a/linux-2.6-520-vnet+.patch b/linux-2.6-520-vnet+.patch index 271729f13..f425f62a9 100644 --- a/linux-2.6-520-vnet+.patch +++ b/linux-2.6-520-vnet+.patch @@ -1,7 +1,7 @@ -diff -Nurp linux-2.6.22-510/include/linux/netfilter/xt_MARK.h linux-2.6.22-520/include/linux/netfilter/xt_MARK.h ---- linux-2.6.22-510/include/linux/netfilter/xt_MARK.h 2006-06-18 03:49:35.000000000 +0200 -+++ linux-2.6.22-520/include/linux/netfilter/xt_MARK.h 2008-02-15 20:36:43.000000000 +0100 -@@ -11,6 +11,7 @@ enum { +diff -Nurb linux-2.6.22-510/include/linux/netfilter/xt_MARK.h linux-2.6.22-520/include/linux/netfilter/xt_MARK.h +--- linux-2.6.22-510/include/linux/netfilter/xt_MARK.h 2007-07-08 19:32:17.000000000 -0400 ++++ linux-2.6.22-520/include/linux/netfilter/xt_MARK.h 2008-06-06 17:07:56.000000000 -0400 +@@ -11,6 +11,7 @@ XT_MARK_SET=0, XT_MARK_AND, XT_MARK_OR, @@ -9,9 +9,9 @@ diff -Nurp linux-2.6.22-510/include/linux/netfilter/xt_MARK.h linux-2.6.22-520/i }; struct xt_mark_target_info_v1 { -diff -Nurp linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h ---- linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h 2008-02-15 20:36:43.000000000 +0100 +diff -Nurb linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h +--- linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h 2008-06-06 17:07:56.000000000 -0400 @@ -0,0 +1,14 @@ +#ifndef _XT_SETXID_H_target +#define _XT_SETXID_H_target @@ -27,9 +27,9 @@ diff -Nurp linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h linux-2.6.22-520 +}; + +#endif /*_XT_SETXID_H_target*/ -diff -Nurp linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h ---- linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h 2006-06-18 03:49:35.000000000 +0200 -+++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h 2008-02-15 20:36:43.000000000 +0100 +diff -Nurb linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h +--- linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h 2007-07-08 19:32:17.000000000 -0400 ++++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h 2008-06-06 17:07:56.000000000 -0400 @@ -12,6 +12,7 @@ #define IPT_MARK_SET XT_MARK_SET #define IPT_MARK_AND XT_MARK_AND @@ -38,9 +38,9 @@ diff -Nurp linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h linux-2.6.22 #define ipt_mark_target_info_v1 xt_mark_target_info_v1 -diff -Nurp linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h ---- linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h 2008-02-15 20:36:43.000000000 +0100 +diff -Nurb linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h +--- linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h 2008-06-06 17:07:56.000000000 -0400 @@ -0,0 +1,13 @@ +#ifndef _IPT_SETXID_H_target +#define _IPT_SETXID_H_target @@ -55,10 +55,10 @@ diff -Nurp linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h linux-2.6. +#define ipt_setxid_target_info_v1 xt_setxid_target_info_v1 + +#endif /*_IPT_SETXID_H_target*/ -diff -Nurp linux-2.6.22-510/include/linux/skbuff.h linux-2.6.22-520/include/linux/skbuff.h ---- linux-2.6.22-510/include/linux/skbuff.h 2007-07-22 00:00:24.000000000 +0200 -+++ linux-2.6.22-520/include/linux/skbuff.h 2008-02-15 20:36:43.000000000 +0100 -@@ -302,6 +302,7 @@ struct sk_buff { +diff -Nurb linux-2.6.22-510/include/linux/skbuff.h linux-2.6.22-520/include/linux/skbuff.h +--- linux-2.6.22-510/include/linux/skbuff.h 2007-07-08 19:32:17.000000000 -0400 ++++ linux-2.6.22-520/include/linux/skbuff.h 2008-06-06 17:07:56.000000000 -0400 +@@ -302,6 +302,7 @@ #endif __u32 mark; @@ -66,10 +66,10 @@ diff -Nurp linux-2.6.22-510/include/linux/skbuff.h linux-2.6.22-520/include/linu sk_buff_data_t transport_header; sk_buff_data_t network_header; -diff -Nurp linux-2.6.22-510/include/linux/socket.h linux-2.6.22-520/include/linux/socket.h ---- linux-2.6.22-510/include/linux/socket.h 2007-07-22 00:00:24.000000000 +0200 -+++ linux-2.6.22-520/include/linux/socket.h 2008-02-15 20:36:43.000000000 +0100 -@@ -288,6 +288,8 @@ struct ucred { +diff -Nurb linux-2.6.22-510/include/linux/socket.h linux-2.6.22-520/include/linux/socket.h +--- linux-2.6.22-510/include/linux/socket.h 2007-07-08 19:32:17.000000000 -0400 ++++ linux-2.6.22-520/include/linux/socket.h 2008-06-06 17:07:56.000000000 -0400 +@@ -288,6 +288,8 @@ #define SOL_TIPC 271 #define SOL_RXRPC 272 @@ -78,11 +78,11 @@ diff -Nurp linux-2.6.22-510/include/linux/socket.h linux-2.6.22-520/include/linu /* IPX options */ #define IPX_TYPE 1 -diff -Nurp linux-2.6.22-510/include/linux/vserver/network.h linux-2.6.22-520/include/linux/vserver/network.h ---- linux-2.6.22-510/include/linux/vserver/network.h 2008-02-15 20:36:27.000000000 +0100 -+++ linux-2.6.22-520/include/linux/vserver/network.h 2008-02-15 20:36:43.000000000 +0100 -@@ -45,6 +45,8 @@ static inline uint64_t __nxf_init_set(vo - /* network caps */ +diff -Nurb linux-2.6.22-510/include/linux/vserver/network.h linux-2.6.22-520/include/linux/vserver/network.h +--- linux-2.6.22-510/include/linux/vserver/network.h 2008-06-06 17:07:48.000000000 -0400 ++++ linux-2.6.22-520/include/linux/vserver/network.h 2008-06-06 17:07:56.000000000 -0400 +@@ -47,6 +47,8 @@ + #define NXC_TUN_CREATE 0x00000001 #define NXC_RAW_ICMP 0x00000100 +#define NXC_RAW_SOCKET 0x00000200 @@ -90,171 +90,23 @@ diff -Nurp linux-2.6.22-510/include/linux/vserver/network.h linux-2.6.22-520/inc /* address types */ -diff -Nurp linux-2.6.22-510/include/linux/vserver/network.h.orig linux-2.6.22-520/include/linux/vserver/network.h.orig ---- linux-2.6.22-510/include/linux/vserver/network.h.orig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.22-520/include/linux/vserver/network.h.orig 2008-02-15 20:36:27.000000000 +0100 -@@ -0,0 +1,144 @@ -+#ifndef _VX_NETWORK_H -+#define _VX_NETWORK_H -+ -+#include -+ -+ -+#define MAX_N_CONTEXT 65535 /* Arbitrary limit */ -+ -+ -+/* network flags */ -+ -+#define NXF_INFO_PRIVATE 0x00000008 -+ -+#define NXF_SINGLE_IP 0x00000100 -+#define NXF_LBACK_REMAP 0x00000200 -+#define NXF_LBACK_ALLOW 0x00000400 -+ -+#define NXF_HIDE_NETIF 0x02000000 -+#define NXF_HIDE_LBACK 0x04000000 -+ -+#define NXF_STATE_SETUP (1ULL << 32) -+#define NXF_STATE_ADMIN (1ULL << 34) -+ -+#define NXF_SC_HELPER (1ULL << 36) -+#define NXF_PERSISTENT (1ULL << 38) -+ -+#define NXF_ONE_TIME (0x0005ULL << 32) -+ -+ -+#define NXF_INIT_SET (__nxf_init_set()) -+ -+static inline uint64_t __nxf_init_set(void) { -+ return NXF_STATE_ADMIN -+#ifdef CONFIG_VSERVER_AUTO_LBACK -+ | NXF_LBACK_REMAP -+ | NXF_HIDE_LBACK -+#endif -+#ifdef CONFIG_VSERVER_AUTO_SINGLE -+ | NXF_SINGLE_IP -+#endif -+ | NXF_HIDE_NETIF; -+} -+ -+ -+/* network caps */ -+ -+#define NXC_RAW_ICMP 0x00000100 -+ -+ -+/* address types */ -+ -+#define NXA_TYPE_IPV4 0x0001 -+#define NXA_TYPE_IPV6 0x0002 -+ -+#define NXA_TYPE_NONE 0x0000 -+#define NXA_TYPE_ANY 0x00FF -+ -+#define NXA_TYPE_ADDR 0x0010 -+#define NXA_TYPE_MASK 0x0020 -+#define NXA_TYPE_RANGE 0x0040 -+ -+#define NXA_MASK_ALL (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE) -+ -+#define NXA_MOD_BCAST 0x0100 -+#define NXA_MOD_LBACK 0x0200 -+ -+#define NXA_LOOPBACK 0x1000 -+ -+#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK) -+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK) -+ -+#ifdef __KERNEL__ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+struct nx_addr_v4 { -+ struct nx_addr_v4 *next; -+ struct in_addr ip[2]; -+ struct in_addr mask; -+ uint16_t type; -+ uint16_t flags; -+}; -+ -+struct nx_addr_v6 { -+ struct nx_addr_v6 *next; -+ struct in6_addr ip; -+ struct in6_addr mask; -+ uint32_t prefix; -+ uint16_t type; -+ uint16_t flags; -+}; -+ -+struct nx_info { -+ struct hlist_node nx_hlist; /* linked list of nxinfos */ -+ nid_t nx_id; /* vnet id */ -+ atomic_t nx_usecnt; /* usage count */ -+ atomic_t nx_tasks; /* tasks count */ -+ int nx_state; /* context state */ -+ -+ uint64_t nx_flags; /* network flag word */ -+ uint64_t nx_ncaps; /* network capabilities */ -+ -+ struct in_addr v4_lback; /* Loopback address */ -+ struct in_addr v4_bcast; /* Broadcast address */ -+ struct nx_addr_v4 v4; /* First/Single ipv4 address */ -+#ifdef CONFIG_IPV6 -+ struct nx_addr_v6 v6; /* First/Single ipv6 address */ -+#endif -+ char nx_name[65]; /* network context name */ -+}; -+ -+ -+/* status flags */ -+ -+#define NXS_HASHED 0x0001 -+#define NXS_SHUTDOWN 0x0100 -+#define NXS_RELEASED 0x8000 -+ -+extern struct nx_info *lookup_nx_info(int); -+ -+extern int get_nid_list(int, unsigned int *, int); -+extern int nid_is_hashed(nid_t); -+ -+extern int nx_migrate_task(struct task_struct *, struct nx_info *); -+ -+extern long vs_net_change(struct nx_info *, unsigned int); -+ -+struct sock; -+ -+ -+#define NX_IPV4(n) ((n)->v4.type != NXA_TYPE_NONE) -+#ifdef CONFIG_IPV6 -+#define NX_IPV6(n) ((n)->v6.type != NXA_TYPE_NONE) -+#else -+#define NX_IPV6(n) (0) -+#endif -+ -+#endif /* __KERNEL__ */ -+#endif /* _VX_NETWORK_H */ -diff -Nurp linux-2.6.22-510/include/net/netfilter/nf_conntrack.h linux-2.6.22-520/include/net/netfilter/nf_conntrack.h ---- linux-2.6.22-510/include/net/netfilter/nf_conntrack.h 2007-07-22 00:00:24.000000000 +0200 -+++ linux-2.6.22-520/include/net/netfilter/nf_conntrack.h 2008-02-15 20:36:43.000000000 +0100 -@@ -131,6 +131,9 @@ struct nf_conn +diff -Nurb linux-2.6.22-510/include/net/netfilter/nf_conntrack.h linux-2.6.22-520/include/net/netfilter/nf_conntrack.h +--- linux-2.6.22-510/include/net/netfilter/nf_conntrack.h 2007-07-08 19:32:17.000000000 -0400 ++++ linux-2.6.22-520/include/net/netfilter/nf_conntrack.h 2008-06-06 17:07:56.000000000 -0400 +@@ -131,6 +131,9 @@ /* Storage reserved for other modules: */ union nf_conntrack_proto proto; + /* PLANETLAB. VNET-specific */ -+ xid_t xid[IP_CT_DIR_MAX]; ++ int xid[IP_CT_DIR_MAX]; + /* features dynamically at the end: helper, nat (both optional) */ char data[0]; }; -diff -Nurp linux-2.6.22-510/include/net/raw.h linux-2.6.22-520/include/net/raw.h ---- linux-2.6.22-510/include/net/raw.h 2007-05-04 15:55:46.000000000 +0200 -+++ linux-2.6.22-520/include/net/raw.h 2008-02-15 20:36:43.000000000 +0100 -@@ -36,7 +36,7 @@ extern rwlock_t raw_v4_lock; +diff -Nurb linux-2.6.22-510/include/net/raw.h linux-2.6.22-520/include/net/raw.h +--- linux-2.6.22-510/include/net/raw.h 2007-07-08 19:32:17.000000000 -0400 ++++ linux-2.6.22-520/include/net/raw.h 2008-06-06 17:07:56.000000000 -0400 +@@ -36,7 +36,7 @@ extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num, __be32 raddr, __be32 laddr, @@ -263,9 +115,97 @@ diff -Nurp linux-2.6.22-510/include/net/raw.h linux-2.6.22-520/include/net/raw.h extern int raw_v4_input(struct sk_buff *skb, struct iphdr *iph, int hash); -diff -Nurp linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c ---- linux-2.6.22-510/net/core/skbuff.c 2007-07-22 00:00:25.000000000 +0200 -+++ linux-2.6.22-520/net/core/skbuff.c 2008-02-15 20:36:44.000000000 +0100 +diff -Nurb linux-2.6.22-510/net/core/dev.c linux-2.6.22-520/net/core/dev.c +--- linux-2.6.22-510/net/core/dev.c 2008-06-06 17:07:48.000000000 -0400 ++++ linux-2.6.22-520/net/core/dev.c 2008-06-06 17:07:56.000000000 -0400 +@@ -1803,6 +1803,7 @@ + * the ingress scheduler, you just cant add policies on ingress. + * + */ ++ + static int ing_filter(struct sk_buff *skb) + { + struct Qdisc *q; +@@ -1832,13 +1833,20 @@ + } + #endif + ++/* The code already makes the assumption that packet handlers run ++ * sequentially on the same CPU. -Sapan */ ++DEFINE_PER_CPU(int, sknid_elevator); ++ + int netif_receive_skb(struct sk_buff *skb) + { + struct packet_type *ptype, *pt_prev; + struct net_device *orig_dev; + int ret = NET_RX_DROP; ++ int *cur_elevator=&__get_cpu_var(sknid_elevator); + __be16 type; + ++ *cur_elevator = 0; ++ + /* if we've gotten here through NAPI, check netpoll */ + if (skb->dev->poll && netpoll_rx(skb)) + return NET_RX_DROP; +@@ -1873,8 +1881,9 @@ + + list_for_each_entry_rcu(ptype, &ptype_all, list) { + if (!ptype->dev || ptype->dev == skb->dev) { +- if (pt_prev) ++ if (pt_prev) { + ret = deliver_skb(skb, pt_prev, orig_dev); ++ } + pt_prev = ptype; + } + } +@@ -1912,8 +1921,22 @@ + } + } + ++ /* We don't want the packet handlers to throw the packet away ++ * if we want the taps to treat it again - Sapan */ ++ if (*cur_elevator) { ++ atomic_inc(&skb->users); ++ } ++ + if (pt_prev) { + ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev); ++ if (*cur_elevator > 0) { ++ skb->skb_tag = *cur_elevator; ++ list_for_each_entry_rcu(ptype, &ptype_all, list) { ++ if (!ptype->dev || ptype->dev == skb->dev) { ++ ret = deliver_skb(skb, ptype, orig_dev); ++ } ++ } ++ } + } else { + kfree_skb(skb); + /* Jamal, now you will not able to escape explaining +@@ -1922,6 +1945,13 @@ + ret = NET_RX_DROP; + } + ++ if (*cur_elevator) { ++ /* We have a packet */ ++ kfree_skb(skb); ++ } ++ ++ *cur_elevator=0; ++ + out: + rcu_read_unlock(); + return ret; +@@ -3780,6 +3810,7 @@ + EXPORT_SYMBOL(net_enable_timestamp); + EXPORT_SYMBOL(net_disable_timestamp); + EXPORT_SYMBOL(dev_get_flags); ++EXPORT_PER_CPU_SYMBOL(sknid_elevator); + + #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) + EXPORT_SYMBOL(br_handle_frame_hook); +diff -Nurb linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c +--- linux-2.6.22-510/net/core/skbuff.c 2007-07-08 19:32:17.000000000 -0400 ++++ linux-2.6.22-520/net/core/skbuff.c 2008-06-06 17:07:56.000000000 -0400 @@ -56,6 +56,7 @@ #include #include @@ -274,15 +214,15 @@ diff -Nurp linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c #include #include -@@ -174,6 +175,7 @@ struct sk_buff *__alloc_skb(unsigned int +@@ -174,6 +175,7 @@ skb->data = data; skb_reset_tail_pointer(skb); skb->end = skb->tail + size; -+ skb->skb_tag = nx_current_nid(); ++ if (!in_interrupt()) skb->skb_tag = nx_current_nid(); else skb->skb_tag = 0; /* make sure we initialize shinfo sequentially */ shinfo = skb_shinfo(skb); atomic_set(&shinfo->dataref, 1); -@@ -443,6 +445,8 @@ struct sk_buff *skb_clone(struct sk_buff +@@ -443,6 +445,8 @@ C(tail); C(end); @@ -291,7 +231,7 @@ diff -Nurp linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c atomic_inc(&(skb_shinfo(skb)->dataref)); skb->cloned = 1; -@@ -492,6 +496,7 @@ static void copy_skb_header(struct sk_bu +@@ -492,6 +496,7 @@ new->tc_index = old->tc_index; #endif skb_copy_secmark(new, old); @@ -299,10 +239,10 @@ diff -Nurp linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c atomic_set(&new->users, 1); skb_shinfo(new)->gso_size = skb_shinfo(old)->gso_size; skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs; -diff -Nurp linux-2.6.22-510/net/core/sock.c linux-2.6.22-520/net/core/sock.c ---- linux-2.6.22-510/net/core/sock.c 2008-02-15 20:36:20.000000000 +0100 -+++ linux-2.6.22-520/net/core/sock.c 2008-02-15 20:36:44.000000000 +0100 -@@ -444,6 +444,19 @@ set_sndbuf: +diff -Nurb linux-2.6.22-510/net/core/sock.c linux-2.6.22-520/net/core/sock.c +--- linux-2.6.22-510/net/core/sock.c 2008-06-06 17:07:48.000000000 -0400 ++++ linux-2.6.22-520/net/core/sock.c 2008-06-06 17:07:56.000000000 -0400 +@@ -444,6 +444,19 @@ } goto set_sndbuf; @@ -322,7 +262,7 @@ diff -Nurp linux-2.6.22-510/net/core/sock.c linux-2.6.22-520/net/core/sock.c case SO_RCVBUF: /* Don't error on this BSD doesn't and if you think about it this is right. Otherwise apps have to -@@ -573,7 +586,7 @@ set_rcvbuf: +@@ -573,7 +586,7 @@ char devname[IFNAMSIZ]; /* Sorry... */ @@ -331,19 +271,19 @@ diff -Nurp linux-2.6.22-510/net/core/sock.c linux-2.6.22-520/net/core/sock.c ret = -EPERM; break; } -diff -Nurp linux-2.6.22-510/net/ipv4/af_inet.c linux-2.6.22-520/net/ipv4/af_inet.c ---- linux-2.6.22-510/net/ipv4/af_inet.c 2008-02-15 20:36:20.000000000 +0100 -+++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-02-15 21:33:42.000000000 +0100 -@@ -178,6 +178,8 @@ static int inet_autobind(struct sock *sk +diff -Nurb linux-2.6.22-510/net/ipv4/af_inet.c linux-2.6.22-520/net/ipv4/af_inet.c +--- linux-2.6.22-510/net/ipv4/af_inet.c 2008-06-06 17:07:48.000000000 -0400 ++++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-06-06 17:07:56.000000000 -0400 +@@ -178,6 +178,8 @@ return -EAGAIN; } inet->sport = htons(inet->num); + sk->sk_xid = vx_current_xid(); -+ sk->sk_nid = nx_current_nid(); ++ if (!in_interrupt()) sk->sk_nid = nx_current_nid(); else sk->sk_nid=0; } release_sock(sk); return 0; -@@ -312,6 +314,9 @@ lookup_protocol: +@@ -312,6 +314,9 @@ if ((protocol == IPPROTO_ICMP) && nx_capable(answer->capability, NXC_RAW_ICMP)) goto override; @@ -353,10 +293,10 @@ diff -Nurp linux-2.6.22-510/net/ipv4/af_inet.c linux-2.6.22-520/net/ipv4/af_inet if (answer->capability > 0 && !capable(answer->capability)) goto out_rcu_unlock; override: -diff -Nurp linux-2.6.22-510/net/ipv4/icmp.c linux-2.6.22-520/net/ipv4/icmp.c ---- linux-2.6.22-510/net/ipv4/icmp.c 2008-02-15 20:36:42.000000000 +0100 -+++ linux-2.6.22-520/net/ipv4/icmp.c 2008-02-15 20:36:44.000000000 +0100 -@@ -709,7 +709,7 @@ static void icmp_unreach(struct sk_buff +diff -Nurb linux-2.6.22-510/net/ipv4/icmp.c linux-2.6.22-520/net/ipv4/icmp.c +--- linux-2.6.22-510/net/ipv4/icmp.c 2008-06-06 17:07:55.000000000 -0400 ++++ linux-2.6.22-520/net/ipv4/icmp.c 2008-06-06 17:07:56.000000000 -0400 +@@ -709,7 +709,7 @@ if ((raw_sk = sk_head(&raw_v4_htable[hash])) != NULL) { while ((raw_sk = __raw_v4_lookup(raw_sk, protocol, iph->daddr, iph->saddr, @@ -365,10 +305,10 @@ diff -Nurp linux-2.6.22-510/net/ipv4/icmp.c linux-2.6.22-520/net/ipv4/icmp.c raw_err(raw_sk, skb, info); raw_sk = sk_next(raw_sk); iph = (struct iphdr *)skb->data; -diff -Nurp linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_options.c ---- linux-2.6.22-510/net/ipv4/ip_options.c 2007-07-22 00:00:25.000000000 +0200 -+++ linux-2.6.22-520/net/ipv4/ip_options.c 2008-02-15 20:36:44.000000000 +0100 -@@ -409,7 +409,7 @@ int ip_options_compile(struct ip_options +diff -Nurb linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_options.c +--- linux-2.6.22-510/net/ipv4/ip_options.c 2007-07-08 19:32:17.000000000 -0400 ++++ linux-2.6.22-520/net/ipv4/ip_options.c 2008-06-06 17:07:56.000000000 -0400 +@@ -409,7 +409,7 @@ optptr[2] += 8; break; default: @@ -377,7 +317,7 @@ diff -Nurp linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_o pp_ptr = optptr + 3; goto error; } -@@ -445,7 +445,7 @@ int ip_options_compile(struct ip_options +@@ -445,7 +445,7 @@ opt->router_alert = optptr - iph; break; case IPOPT_CIPSO: @@ -386,7 +326,7 @@ diff -Nurp linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_o pp_ptr = optptr; goto error; } -@@ -458,7 +458,7 @@ int ip_options_compile(struct ip_options +@@ -458,7 +458,7 @@ case IPOPT_SEC: case IPOPT_SID: default: @@ -395,10 +335,10 @@ diff -Nurp linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_o pp_ptr = optptr; goto error; } -diff -Nurp linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c ---- linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c 2008-02-15 20:35:53.000000000 +0100 -+++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2008-02-15 20:36:44.000000000 +0100 -@@ -49,6 +49,8 @@ static void dump_packet(const struct nf_ +diff -Nurb linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c +--- linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c 2008-06-06 17:07:43.000000000 -0400 ++++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2008-06-06 17:07:56.000000000 -0400 +@@ -49,6 +49,8 @@ else logflags = NF_LOG_MASK; @@ -407,10 +347,10 @@ diff -Nurp linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c linux-2.6.22-520/net/ip ih = skb_header_pointer(skb, iphoff, sizeof(_iph), &_iph); if (ih == NULL) { printk("TRUNCATED"); -diff -Nurp linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c ---- linux-2.6.22-510/net/ipv4/raw.c 2008-02-15 20:36:20.000000000 +0100 -+++ linux-2.6.22-520/net/ipv4/raw.c 2008-02-15 20:36:44.000000000 +0100 -@@ -103,7 +103,7 @@ static void raw_v4_unhash(struct sock *s +diff -Nurb linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c +--- linux-2.6.22-510/net/ipv4/raw.c 2008-06-06 17:07:48.000000000 -0400 ++++ linux-2.6.22-520/net/ipv4/raw.c 2008-06-06 17:07:56.000000000 -0400 +@@ -103,7 +103,7 @@ struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num, __be32 raddr, __be32 laddr, @@ -419,7 +359,7 @@ diff -Nurp linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c { struct hlist_node *node; -@@ -112,6 +112,7 @@ struct sock *__raw_v4_lookup(struct sock +@@ -112,6 +112,7 @@ if (inet->num == num && !(inet->daddr && inet->daddr != raddr) && @@ -427,7 +367,7 @@ diff -Nurp linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c v4_sock_addr_match(sk->sk_nx_info, inet, laddr) && !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)) goto found; /* gotcha */ -@@ -161,7 +162,7 @@ int raw_v4_input(struct sk_buff *skb, st +@@ -161,7 +162,7 @@ goto out; sk = __raw_v4_lookup(__sk_head(head), iph->protocol, iph->saddr, iph->daddr, @@ -436,7 +376,7 @@ diff -Nurp linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c while (sk) { delivered = 1; -@@ -174,7 +175,7 @@ int raw_v4_input(struct sk_buff *skb, st +@@ -174,7 +175,7 @@ } sk = __raw_v4_lookup(sk_next(sk), iph->protocol, iph->saddr, iph->daddr, @@ -445,7 +385,7 @@ diff -Nurp linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c } out: read_unlock(&raw_v4_lock); -@@ -315,7 +316,7 @@ static int raw_send_hdrinc(struct sock * +@@ -315,7 +316,7 @@ } err = -EPERM; @@ -454,10 +394,10 @@ diff -Nurp linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c sk->sk_nx_info && !v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND)) goto error_free; -diff -Nurp linux-2.6.22-510/net/netfilter/Kconfig linux-2.6.22-520/net/netfilter/Kconfig ---- linux-2.6.22-510/net/netfilter/Kconfig 2007-07-22 00:00:27.000000000 +0200 -+++ linux-2.6.22-520/net/netfilter/Kconfig 2008-02-15 20:36:44.000000000 +0100 -@@ -389,6 +389,13 @@ config NETFILTER_XT_TARGET_TCPMSS +diff -Nurb linux-2.6.22-510/net/netfilter/Kconfig linux-2.6.22-520/net/netfilter/Kconfig +--- linux-2.6.22-510/net/netfilter/Kconfig 2007-07-08 19:32:17.000000000 -0400 ++++ linux-2.6.22-520/net/netfilter/Kconfig 2008-06-06 17:07:56.000000000 -0400 +@@ -389,6 +389,13 @@ To compile it as a module, choose M here. If unsure, say N. @@ -471,10 +411,10 @@ diff -Nurp linux-2.6.22-510/net/netfilter/Kconfig linux-2.6.22-520/net/netfilter config NETFILTER_XT_MATCH_COMMENT tristate '"comment" match support' depends on NETFILTER_XTABLES -diff -Nurp linux-2.6.22-510/net/netfilter/Makefile linux-2.6.22-520/net/netfilter/Makefile ---- linux-2.6.22-510/net/netfilter/Makefile 2007-07-21 23:58:59.000000000 +0200 -+++ linux-2.6.22-520/net/netfilter/Makefile 2008-02-15 20:36:44.000000000 +0100 -@@ -37,6 +37,7 @@ obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_co +diff -Nurb linux-2.6.22-510/net/netfilter/Makefile linux-2.6.22-520/net/netfilter/Makefile +--- linux-2.6.22-510/net/netfilter/Makefile 2007-07-08 19:32:17.000000000 -0400 ++++ linux-2.6.22-520/net/netfilter/Makefile 2008-06-06 17:07:56.000000000 -0400 +@@ -37,6 +37,7 @@ obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o # targets @@ -482,10 +422,10 @@ diff -Nurp linux-2.6.22-510/net/netfilter/Makefile linux-2.6.22-520/net/netfilte obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIFY) += xt_CLASSIFY.o obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o -diff -Nurp linux-2.6.22-510/net/netfilter/nf_conntrack_core.c linux-2.6.22-520/net/netfilter/nf_conntrack_core.c ---- linux-2.6.22-510/net/netfilter/nf_conntrack_core.c 2007-07-22 00:00:27.000000000 +0200 -+++ linux-2.6.22-520/net/netfilter/nf_conntrack_core.c 2008-02-15 20:36:44.000000000 +0100 -@@ -726,6 +726,8 @@ init_conntrack(const struct nf_conntrack +diff -Nurb linux-2.6.22-510/net/netfilter/nf_conntrack_core.c linux-2.6.22-520/net/netfilter/nf_conntrack_core.c +--- linux-2.6.22-510/net/netfilter/nf_conntrack_core.c 2007-07-08 19:32:17.000000000 -0400 ++++ linux-2.6.22-520/net/netfilter/nf_conntrack_core.c 2008-06-06 17:07:56.000000000 -0400 +@@ -726,6 +726,8 @@ /* Overload tuple linked list to put us in unconfirmed list. */ list_add(&conntrack->tuplehash[IP_CT_DIR_ORIGINAL].list, &unconfirmed); @@ -494,9 +434,9 @@ diff -Nurp linux-2.6.22-510/net/netfilter/nf_conntrack_core.c linux-2.6.22-520/n write_unlock_bh(&nf_conntrack_lock); -diff -Nurp linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilter/xt_MARK.c ---- linux-2.6.22-510/net/netfilter/xt_MARK.c 2007-07-21 23:59:00.000000000 +0200 -+++ linux-2.6.22-520/net/netfilter/xt_MARK.c 2008-02-15 20:36:44.000000000 +0100 +diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilter/xt_MARK.c +--- linux-2.6.22-510/net/netfilter/xt_MARK.c 2007-07-08 19:32:17.000000000 -0400 ++++ linux-2.6.22-520/net/netfilter/xt_MARK.c 2008-06-07 17:55:26.000000000 -0400 @@ -5,13 +5,18 @@ * 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 @@ -516,7 +456,7 @@ diff -Nurp linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilt #include #include -@@ -21,6 +26,48 @@ MODULE_DESCRIPTION("ip[6]tables MARK mod +@@ -21,6 +26,48 @@ MODULE_ALIAS("ipt_MARK"); MODULE_ALIAS("ip6t_MARK"); @@ -565,66 +505,114 @@ diff -Nurp linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilt static unsigned int target_v0(struct sk_buff **pskb, const struct net_device *in, -@@ -44,7 +91,7 @@ target_v1(struct sk_buff **pskb, +@@ -35,6 +82,8 @@ + return XT_CONTINUE; + } + ++extern DEFINE_PER_CPU(int, sknid_elevator); ++ + static unsigned int + target_v1(struct sk_buff **pskb, + const struct net_device *in, +@@ -44,7 +93,20 @@ const void *targinfo) { const struct xt_mark_target_info_v1 *markinfo = targinfo; - int mark = 0; ++ enum ip_conntrack_info ctinfo; ++ struct sock *connection_sk; ++ int dif; ++ struct nf_conn *ct; ++ extern struct inet_hashinfo tcp_hashinfo; ++ enum ip_conntrack_dir dir; ++ int *curtag; ++ u_int32_t src_ip; ++ u_int32_t dst_ip; ++ u_int16_t proto, src_port; ++ u_int32_t ip; ++ u_int16_t port; ++ + int mark = -1; switch (markinfo->mode) { case XT_MARK_SET: -@@ -58,8 +105,49 @@ target_v1(struct sk_buff **pskb, +@@ -58,13 +120,74 @@ case XT_MARK_OR: mark = (*pskb)->mark | markinfo->mark; break; + -+ case XT_MARK_COPYXID: { -+ enum ip_conntrack_info ctinfo; -+ struct sock *connection_sk; -+ int dif; -+ -+ struct nf_conn *ct = nf_ct_get((*pskb), &ctinfo); -+ extern struct inet_hashinfo tcp_hashinfo; -+ enum ip_conntrack_dir dir; -+ -+ if (!ct) -+ break; -+ dir = CTINFO2DIR(ctinfo); -+ u_int32_t src_ip = ct->tuplehash[dir].tuple.src.u3.ip; -+ u_int16_t src_port = get_src_port(&ct->tuplehash[dir].tuple); -+ -+ u_int32_t ip; -+ u_int16_t port; -+ -+ dif = ((struct rtable *)(*pskb)->dst)->rt_iif; -+ ip = ct->tuplehash[dir].tuple.dst.u3.ip; -+ port = get_dst_port(&ct->tuplehash[dir].tuple); -+ -+ if ((*pskb)->sk) -+ connection_sk = (*pskb)->sk; -+ else { -+ connection_sk = inet_lookup(&tcp_hashinfo, src_ip, src_port, ip, port, dif); -+ } -+ -+ if (connection_sk) { -+ connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir]; -+ ct->xid[!dir]=connection_sk->sk_xid; -+ connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = connection_sk->sk_xid; -+ if (connection_sk->sk_xid != 0) -+ mark = connection_sk->sk_xid; -+ if (connection_sk != (*pskb)->sk) -+ sock_put(connection_sk); -+ } -+ break; -+ } ++ case XT_MARK_COPYXID: ++ ++ ct = nf_ct_get((*pskb), &ctinfo); ++ if (!ct) ++ break; ++ ++ dir = CTINFO2DIR(ctinfo); ++ src_ip = ct->tuplehash[dir].tuple.src.u3.ip; ++ dst_ip = ct->tuplehash[dir].tuple.dst.u3.ip; ++ src_port = get_src_port(&ct->tuplehash[dir].tuple); ++ proto = ct->tuplehash[dir].tuple.dst.protonum; ++ ++ dif = ((struct rtable *)(*pskb)->dst)->rt_iif; ++ ip = ct->tuplehash[dir].tuple.dst.u3.ip; ++ port = get_dst_port(&ct->tuplehash[dir].tuple); ++ ++ if (proto == 1 || proto == 17) { ++ if ((*pskb)->mark>0) /* The packet is marked, it's going out */ ++ { ++ //if (ct->xid[0]>0 && ct->xid[0]!=(*pskb)->mark) ++ /*printk(KERN_CRIT "xt_MARK log: %d/%d/%d/%d\n",ct->xid[0],(*pskb)->mark,hooknum==NF_IP_LOCAL_IN,proto);*/ ++ ++ ct->xid[0]=(*pskb)->mark; } -+ if (mark != -1) ++ if (ct->xid[0] > 0) { ++ mark = ct->xid[0]; ++ } ++ ++ } ++ else if (proto == 6) { ++ if ((*pskb)->sk) { ++ connection_sk = (*pskb)->sk; ++ sock_hold(connection_sk); ++ } ++ else ++ connection_sk = inet_lookup_established(&tcp_hashinfo, src_ip, src_port, ip, port, dif); ++ ++ ++ if (connection_sk) { ++ if (connection_sk->sk_state == TCP_TIME_WAIT) { ++ inet_twsk_put(inet_twsk(connection_sk)); ++ break; ++ } ++ connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir]; ++ ct->xid[!dir]=connection_sk->sk_nid; ++ if (connection_sk->sk_nid != 0) ++ mark = connection_sk->sk_nid; ++ sock_put(connection_sk); ++ } ++ else ++ mark = -1 ; ++ } ++ break; ++ } ++ if (mark != -1) { (*pskb)->mark = mark; ++ } ++ ++ curtag=&__get_cpu_var(sknid_elevator); ++ if (mark > 0 && *curtag==-2) ++ { ++ *curtag = mark; ++ } return XT_CONTINUE; } -@@ -92,7 +180,8 @@ checkentry_v1(const char *tablename, + +- + static int + checkentry_v0(const char *tablename, + const void *entry, +@@ -92,7 +215,8 @@ if (markinfo->mode != XT_MARK_SET && markinfo->mode != XT_MARK_AND @@ -634,9 +622,9 @@ diff -Nurp linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilt printk(KERN_WARNING "MARK: unknown mode %u\n", markinfo->mode); return 0; -diff -Nurp linux-2.6.22-510/net/netfilter/xt_SETXID.c linux-2.6.22-520/net/netfilter/xt_SETXID.c ---- linux-2.6.22-510/net/netfilter/xt_SETXID.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.22-520/net/netfilter/xt_SETXID.c 2008-02-15 20:36:44.000000000 +0100 +diff -Nurb linux-2.6.22-510/net/netfilter/xt_SETXID.c linux-2.6.22-520/net/netfilter/xt_SETXID.c +--- linux-2.6.22-510/net/netfilter/xt_SETXID.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.22-520/net/netfilter/xt_SETXID.c 2008-06-06 17:07:56.000000000 -0400 @@ -0,0 +1,79 @@ +#include +#include @@ -717,9 +705,9 @@ diff -Nurp linux-2.6.22-510/net/netfilter/xt_SETXID.c linux-2.6.22-520/net/netfi + +module_init(init); +module_exit(fini); -diff -Nurp linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/af_packet.c ---- linux-2.6.22-510/net/packet/af_packet.c 2007-07-22 00:00:27.000000000 +0200 -+++ linux-2.6.22-520/net/packet/af_packet.c 2008-02-15 22:28:15.000000000 +0100 +diff -Nurb linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/af_packet.c +--- linux-2.6.22-510/net/packet/af_packet.c 2007-07-08 19:32:17.000000000 -0400 ++++ linux-2.6.22-520/net/packet/af_packet.c 2008-06-07 18:30:41.000000000 -0400 @@ -78,6 +78,7 @@ #include #include @@ -728,7 +716,44 @@ diff -Nurp linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/a #ifdef CONFIG_INET #include -@@ -324,6 +325,9 @@ static int packet_sendmsg_spkt(struct ki +@@ -246,10 +247,13 @@ + + static const struct proto_ops packet_ops_spkt; + ++extern DEFINE_PER_CPU(int, sknid_elevator); + static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev) + { + struct sock *sk; + struct sockaddr_pkt *spkt; ++ int tag = skb->skb_tag; ++ int *elevator=&__get_cpu_var(sknid_elevator); + + /* + * When we registered the protocol we saved the socket in the data +@@ -269,6 +273,22 @@ + * so that this procedure is noop. + */ + ++ /* ++ * (18:05:41) daniel_hozac: where? ++ * (18:05:58) daniel_hozac: we already have filters on PF_PACKET, don't we? ++ * (18:05:58) er: in packet_rcv_skpt ++ * (18:07:33) daniel_hozac: oh, that's evil. ++ */ ++ ++ if (sk->sk_nx_info && !(tag == 1 || sk->sk_nid == tag)) { ++ *elevator=-2; ++ goto out; ++ } ++ else if (!sk->sk_nx_info && *elevator) { ++ /* Root has already seen this packet */ ++ goto out; ++ } ++ + if (skb->pkt_type == PACKET_LOOPBACK) + goto out; + +@@ -324,6 +344,9 @@ __be16 proto=0; int err; @@ -738,33 +763,42 @@ diff -Nurp linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/a /* * Get and verify the address. */ -@@ -420,6 +424,10 @@ static inline unsigned int run_filter(st +@@ -420,6 +443,17 @@ unsigned int res) { struct sk_filter *filter; + int tag = skb->skb_tag; ++ int *elevator=&__get_cpu_var(sknid_elevator); + -+ if (sk->sk_nx_info && !(tag == 1 || sk->sk_nid == tag)) ++ if (sk->sk_nx_info && !(tag == 1 || sk->sk_nid == tag)) { ++ *elevator=-2; ++ return 0; ++ } ++ else if (!sk->sk_nx_info && *elevator) { ++ /* Root has already seen this packet */ + return 0; ++ } rcu_read_lock_bh(); filter = rcu_dereference(sk->sk_filter); -@@ -711,6 +719,9 @@ static int packet_sendmsg(struct kiocb * +@@ -711,6 +745,9 @@ unsigned char *addr; int ifindex, err, reserve = 0; -+ if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND)) ++ if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND)) + return -EPERM; + /* * Get and verify the address. */ -@@ -984,7 +995,7 @@ static int packet_create(struct socket * +@@ -984,8 +1021,9 @@ __be16 proto = (__force __be16)protocol; /* weird, but documented */ int err; - if (!capable(CAP_NET_RAW)) + if (!nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) return -EPERM; ++ if (sock->type != SOCK_DGRAM && sock->type != SOCK_RAW && sock->type != SOCK_PACKET) + return -ESOCKTNOSUPPORT;