kernel/3.1[02]: move MTD root device setup code to mtdcore
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.10 / 621-sched_act_connmark.patch
1 --- /dev/null
2 +++ b/net/sched/act_connmark.c
3 @@ -0,0 +1,148 @@
4 +/*
5 + * Copyright (c) 2011 Felix Fietkau <nbd@openwrt.org>
6 + *
7 + * This program is free software; you can redistribute it and/or modify it
8 + * under the terms and conditions of the GNU General Public License,
9 + * version 2, as published by the Free Software Foundation.
10 + *
11 + * This program is distributed in the hope it will be useful, but WITHOUT
12 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
14 + * more details.
15 + *
16 + * You should have received a copy of the GNU General Public License along with
17 + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
18 + * Place - Suite 330, Boston, MA 02111-1307 USA.
19 + */
20 +
21 +#include <linux/module.h>
22 +#include <linux/init.h>
23 +#include <linux/kernel.h>
24 +#include <linux/skbuff.h>
25 +#include <linux/rtnetlink.h>
26 +#include <linux/pkt_cls.h>
27 +#include <linux/ip.h>
28 +#include <linux/ipv6.h>
29 +#include <net/netlink.h>
30 +#include <net/pkt_sched.h>
31 +#include <net/act_api.h>
32 +
33 +#include <net/netfilter/nf_conntrack.h>
34 +#include <net/netfilter/nf_conntrack_core.h>
35 +
36 +#define TCA_ACT_CONNMARK 20
37 +
38 +#define CONNMARK_TAB_MASK 3
39 +static struct tcf_common *tcf_connmark_ht[CONNMARK_TAB_MASK + 1];
40 +static u32 connmark_idx_gen;
41 +static DEFINE_RWLOCK(connmark_lock);
42 +
43 +static struct tcf_hashinfo connmark_hash_info = {
44 + .htab = tcf_connmark_ht,
45 + .hmask = CONNMARK_TAB_MASK,
46 + .lock = &connmark_lock,
47 +};
48 +
49 +static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
50 + struct tcf_result *res)
51 +{
52 + struct nf_conn *c;
53 + enum ip_conntrack_info ctinfo;
54 + int proto;
55 + int r;
56 +
57 + if (skb->protocol == htons(ETH_P_IP)) {
58 + if (skb->len < sizeof(struct iphdr))
59 + goto out;
60 + proto = PF_INET;
61 + } else if (skb->protocol == htons(ETH_P_IPV6)) {
62 + if (skb->len < sizeof(struct ipv6hdr))
63 + goto out;
64 + proto = PF_INET6;
65 + } else
66 + goto out;
67 +
68 + r = nf_conntrack_in(dev_net(skb->dev), proto, NF_INET_PRE_ROUTING, skb);
69 + if (r != NF_ACCEPT)
70 + goto out;
71 +
72 + c = nf_ct_get(skb, &ctinfo);
73 + if (!c)
74 + goto out;
75 +
76 + skb->mark = c->mark;
77 + nf_conntrack_put(skb->nfct);
78 + skb->nfct = NULL;
79 +
80 +out:
81 + return TC_ACT_PIPE;
82 +}
83 +
84 +static int tcf_connmark_init(struct net *net, struct nlattr *nla,
85 + struct nlattr *est, struct tc_action *a,
86 + int ovr, int bind)
87 +{
88 + struct tcf_common *pc;
89 + int ret = 0;
90 +
91 + pc = tcf_hash_check(0, a, bind, &connmark_hash_info);
92 + if (!pc) {
93 + pc = tcf_hash_create(0, est, a, sizeof(*pc), bind,
94 + &connmark_idx_gen, &connmark_hash_info);
95 + if (IS_ERR(pc))
96 + return PTR_ERR(pc);
97 +
98 + tcf_hash_insert(pc, &connmark_hash_info);
99 + ret = ACT_P_CREATED;
100 + } else {
101 + if (!ovr) {
102 + tcf_hash_release(pc, bind, &connmark_hash_info);
103 + return -EEXIST;
104 + }
105 + }
106 +
107 + return ret;
108 +}
109 +
110 +static inline int tcf_connmark_cleanup(struct tc_action *a, int bind)
111 +{
112 + if (a->priv)
113 + return tcf_hash_release(a->priv, bind, &connmark_hash_info);
114 + return 0;
115 +}
116 +
117 +static inline int tcf_connmark_dump(struct sk_buff *skb, struct tc_action *a,
118 + int bind, int ref)
119 +{
120 + return skb->len;
121 +}
122 +
123 +static struct tc_action_ops act_connmark_ops = {
124 + .kind = "connmark",
125 + .hinfo = &connmark_hash_info,
126 + .type = TCA_ACT_CONNMARK,
127 + .capab = TCA_CAP_NONE,
128 + .owner = THIS_MODULE,
129 + .act = tcf_connmark,
130 + .dump = tcf_connmark_dump,
131 + .cleanup = tcf_connmark_cleanup,
132 + .init = tcf_connmark_init,
133 + .walk = tcf_generic_walker,
134 +};
135 +
136 +MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
137 +MODULE_DESCRIPTION("Connection tracking mark restoring");
138 +MODULE_LICENSE("GPL");
139 +
140 +static int __init connmark_init_module(void)
141 +{
142 + return tcf_register_action(&act_connmark_ops);
143 +}
144 +
145 +static void __exit connmark_cleanup_module(void)
146 +{
147 + tcf_unregister_action(&act_connmark_ops);
148 +}
149 +
150 +module_init(connmark_init_module);
151 +module_exit(connmark_cleanup_module);
152 --- a/net/sched/Kconfig
153 +++ b/net/sched/Kconfig
154 @@ -670,6 +670,19 @@ config NET_ACT_CSUM
155 To compile this code as a module, choose M here: the
156 module will be called act_csum.
157
158 +config NET_ACT_CONNMARK
159 + tristate "Connection Tracking Marking"
160 + depends on NET_CLS_ACT
161 + depends on NF_CONNTRACK
162 + depends on NF_CONNTRACK_MARK
163 + ---help---
164 + Say Y here to restore the connmark from a scheduler action
165 +
166 + If unsure, say N.
167 +
168 + To compile this code as a module, choose M here: the
169 + module will be called act_connmark.
170 +
171 config NET_CLS_IND
172 bool "Incoming device classification"
173 depends on NET_CLS_U32 || NET_CLS_FW
174 --- a/net/sched/Makefile
175 +++ b/net/sched/Makefile
176 @@ -16,6 +16,7 @@ obj-$(CONFIG_NET_ACT_PEDIT) += act_pedit
177 obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o
178 obj-$(CONFIG_NET_ACT_SKBEDIT) += act_skbedit.o
179 obj-$(CONFIG_NET_ACT_CSUM) += act_csum.o
180 +obj-$(CONFIG_NET_ACT_CONNMARK) += act_connmark.o
181 obj-$(CONFIG_NET_SCH_FIFO) += sch_fifo.o
182 obj-$(CONFIG_NET_SCH_CBQ) += sch_cbq.o
183 obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o