aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/flow.h
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
committerGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
commitc71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch)
treeecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/net/flow.h
parentea53c912f8a86a8567697115b6a0d8152beee5c8 (diff)
parent6a00f206debf8a5c8899055726ad127dbeeed098 (diff)
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts: litmus/sched_cedf.c
Diffstat (limited to 'include/net/flow.h')
-rw-r--r--include/net/flow.h223
1 files changed, 149 insertions, 74 deletions
diff --git a/include/net/flow.h b/include/net/flow.h
index bb08692a20b0..c6d5fe5ec1bf 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -10,76 +10,157 @@
10#include <linux/in6.h> 10#include <linux/in6.h>
11#include <asm/atomic.h> 11#include <asm/atomic.h>
12 12
13struct flowi { 13struct flowi_common {
14 int oif; 14 int flowic_oif;
15 int iif; 15 int flowic_iif;
16 __u32 mark; 16 __u32 flowic_mark;
17 __u8 flowic_tos;
18 __u8 flowic_scope;
19 __u8 flowic_proto;
20 __u8 flowic_flags;
21#define FLOWI_FLAG_ANYSRC 0x01
22#define FLOWI_FLAG_PRECOW_METRICS 0x02
23#define FLOWI_FLAG_CAN_SLEEP 0x04
24 __u32 flowic_secid;
25};
17 26
27union flowi_uli {
28 struct {
29 __be16 dport;
30 __be16 sport;
31 } ports;
32
33 struct {
34 __u8 type;
35 __u8 code;
36 } icmpt;
37
38 struct {
39 __le16 dport;
40 __le16 sport;
41 } dnports;
42
43 __be32 spi;
44 __be32 gre_key;
45
46 struct {
47 __u8 type;
48 } mht;
49};
50
51struct flowi4 {
52 struct flowi_common __fl_common;
53#define flowi4_oif __fl_common.flowic_oif
54#define flowi4_iif __fl_common.flowic_iif
55#define flowi4_mark __fl_common.flowic_mark
56#define flowi4_tos __fl_common.flowic_tos
57#define flowi4_scope __fl_common.flowic_scope
58#define flowi4_proto __fl_common.flowic_proto
59#define flowi4_flags __fl_common.flowic_flags
60#define flowi4_secid __fl_common.flowic_secid
61 __be32 daddr;
62 __be32 saddr;
63 union flowi_uli uli;
64#define fl4_sport uli.ports.sport
65#define fl4_dport uli.ports.dport
66#define fl4_icmp_type uli.icmpt.type
67#define fl4_icmp_code uli.icmpt.code
68#define fl4_ipsec_spi uli.spi
69#define fl4_mh_type uli.mht.type
70#define fl4_gre_key uli.gre_key
71};
72
73static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
74 __u32 mark, __u8 tos, __u8 scope,
75 __u8 proto, __u8 flags,
76 __be32 daddr, __be32 saddr,
77 __be16 dport, __be32 sport)
78{
79 fl4->flowi4_oif = oif;
80 fl4->flowi4_iif = 0;
81 fl4->flowi4_mark = mark;
82 fl4->flowi4_tos = tos;
83 fl4->flowi4_scope = scope;
84 fl4->flowi4_proto = proto;
85 fl4->flowi4_flags = flags;
86 fl4->flowi4_secid = 0;
87 fl4->daddr = daddr;
88 fl4->saddr = saddr;
89 fl4->fl4_dport = dport;
90 fl4->fl4_sport = sport;
91}
92
93
94struct flowi6 {
95 struct flowi_common __fl_common;
96#define flowi6_oif __fl_common.flowic_oif
97#define flowi6_iif __fl_common.flowic_iif
98#define flowi6_mark __fl_common.flowic_mark
99#define flowi6_tos __fl_common.flowic_tos
100#define flowi6_scope __fl_common.flowic_scope
101#define flowi6_proto __fl_common.flowic_proto
102#define flowi6_flags __fl_common.flowic_flags
103#define flowi6_secid __fl_common.flowic_secid
104 struct in6_addr daddr;
105 struct in6_addr saddr;
106 __be32 flowlabel;
107 union flowi_uli uli;
108#define fl6_sport uli.ports.sport
109#define fl6_dport uli.ports.dport
110#define fl6_icmp_type uli.icmpt.type
111#define fl6_icmp_code uli.icmpt.code
112#define fl6_ipsec_spi uli.spi
113#define fl6_mh_type uli.mht.type
114#define fl6_gre_key uli.gre_key
115};
116
117struct flowidn {
118 struct flowi_common __fl_common;
119#define flowidn_oif __fl_common.flowic_oif
120#define flowidn_iif __fl_common.flowic_iif
121#define flowidn_mark __fl_common.flowic_mark
122#define flowidn_scope __fl_common.flowic_scope
123#define flowidn_proto __fl_common.flowic_proto
124#define flowidn_flags __fl_common.flowic_flags
125 __le16 daddr;
126 __le16 saddr;
127 union flowi_uli uli;
128#define fld_sport uli.ports.sport
129#define fld_dport uli.ports.dport
130};
131
132struct flowi {
18 union { 133 union {
19 struct { 134 struct flowi_common __fl_common;
20 __be32 daddr; 135 struct flowi4 ip4;
21 __be32 saddr; 136 struct flowi6 ip6;
22 __u8 tos; 137 struct flowidn dn;
23 __u8 scope; 138 } u;
24 } ip4_u; 139#define flowi_oif u.__fl_common.flowic_oif
25 140#define flowi_iif u.__fl_common.flowic_iif
26 struct { 141#define flowi_mark u.__fl_common.flowic_mark
27 struct in6_addr daddr; 142#define flowi_tos u.__fl_common.flowic_tos
28 struct in6_addr saddr; 143#define flowi_scope u.__fl_common.flowic_scope
29 __be32 flowlabel; 144#define flowi_proto u.__fl_common.flowic_proto
30 } ip6_u; 145#define flowi_flags u.__fl_common.flowic_flags
31 146#define flowi_secid u.__fl_common.flowic_secid
32 struct {
33 __le16 daddr;
34 __le16 saddr;
35 __u8 scope;
36 } dn_u;
37 } nl_u;
38#define fld_dst nl_u.dn_u.daddr
39#define fld_src nl_u.dn_u.saddr
40#define fld_scope nl_u.dn_u.scope
41#define fl6_dst nl_u.ip6_u.daddr
42#define fl6_src nl_u.ip6_u.saddr
43#define fl6_flowlabel nl_u.ip6_u.flowlabel
44#define fl4_dst nl_u.ip4_u.daddr
45#define fl4_src nl_u.ip4_u.saddr
46#define fl4_tos nl_u.ip4_u.tos
47#define fl4_scope nl_u.ip4_u.scope
48
49 __u8 proto;
50 __u8 flags;
51#define FLOWI_FLAG_ANYSRC 0x01
52 union {
53 struct {
54 __be16 sport;
55 __be16 dport;
56 } ports;
57
58 struct {
59 __u8 type;
60 __u8 code;
61 } icmpt;
62
63 struct {
64 __le16 sport;
65 __le16 dport;
66 } dnports;
67
68 __be32 spi;
69
70 struct {
71 __u8 type;
72 } mht;
73 } uli_u;
74#define fl_ip_sport uli_u.ports.sport
75#define fl_ip_dport uli_u.ports.dport
76#define fl_icmp_type uli_u.icmpt.type
77#define fl_icmp_code uli_u.icmpt.code
78#define fl_ipsec_spi uli_u.spi
79#define fl_mh_type uli_u.mht.type
80 __u32 secid; /* used by xfrm; see secid.txt */
81} __attribute__((__aligned__(BITS_PER_LONG/8))); 147} __attribute__((__aligned__(BITS_PER_LONG/8)));
82 148
149static inline struct flowi *flowi4_to_flowi(struct flowi4 *fl4)
150{
151 return container_of(fl4, struct flowi, u.ip4);
152}
153
154static inline struct flowi *flowi6_to_flowi(struct flowi6 *fl6)
155{
156 return container_of(fl6, struct flowi, u.ip6);
157}
158
159static inline struct flowi *flowidn_to_flowi(struct flowidn *fldn)
160{
161 return container_of(fldn, struct flowi, u.dn);
162}
163
83#define FLOW_DIR_IN 0 164#define FLOW_DIR_IN 0
84#define FLOW_DIR_OUT 1 165#define FLOW_DIR_OUT 1
85#define FLOW_DIR_FWD 2 166#define FLOW_DIR_FWD 2
@@ -99,20 +180,14 @@ struct flow_cache_ops {
99}; 180};
100 181
101typedef struct flow_cache_object *(*flow_resolve_t)( 182typedef struct flow_cache_object *(*flow_resolve_t)(
102 struct net *net, struct flowi *key, u16 family, 183 struct net *net, const struct flowi *key, u16 family,
103 u8 dir, struct flow_cache_object *oldobj, void *ctx); 184 u8 dir, struct flow_cache_object *oldobj, void *ctx);
104 185
105extern struct flow_cache_object *flow_cache_lookup( 186extern struct flow_cache_object *flow_cache_lookup(
106 struct net *net, struct flowi *key, u16 family, 187 struct net *net, const struct flowi *key, u16 family,
107 u8 dir, flow_resolve_t resolver, void *ctx); 188 u8 dir, flow_resolve_t resolver, void *ctx);
108 189
109extern void flow_cache_flush(void); 190extern void flow_cache_flush(void);
110extern atomic_t flow_cache_genid; 191extern atomic_t flow_cache_genid;
111 192
112static inline int flow_cache_uli_match(struct flowi *fl1, struct flowi *fl2)
113{
114 return (fl1->proto == fl2->proto &&
115 !memcmp(&fl1->uli_u, &fl2->uli_u, sizeof(fl1->uli_u)));
116}
117
118#endif 193#endif
generated by cgit v1.2.2 (git 2.25.0) at 2025-07-03 09:12:39 -0400