2015-05-12 12:56:07 +00:00
|
|
|
#ifndef _NET_FLOW_DISSECTOR_H
|
|
|
|
#define _NET_FLOW_DISSECTOR_H
|
2011-11-28 05:22:18 +00:00
|
|
|
|
2015-05-12 12:56:15 +00:00
|
|
|
/**
|
|
|
|
* struct flow_dissector_key_basic:
|
|
|
|
* @thoff: Transport header offset
|
|
|
|
* @n_proto: Network header protocol (eg. IPv4/IPv6)
|
|
|
|
* @ip_proto: Transport header protocol (eg. TCP/UDP)
|
|
|
|
*/
|
|
|
|
struct flow_dissector_key_basic {
|
|
|
|
u16 thoff;
|
|
|
|
__be16 n_proto;
|
|
|
|
u8 ip_proto;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* struct flow_dissector_key_addrs:
|
|
|
|
* @src: source ip address in case of IPv4
|
|
|
|
* For IPv6 it contains 32bit hash of src address
|
|
|
|
* @dst: destination ip address in case of IPv4
|
|
|
|
* For IPv6 it contains 32bit hash of dst address
|
|
|
|
*/
|
|
|
|
struct flow_dissector_key_addrs {
|
|
|
|
/* (src,dst) must be grouped, in the same way than in IP header */
|
|
|
|
__be32 src;
|
|
|
|
__be32 dst;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* flow_dissector_key_tp_ports:
|
|
|
|
* @ports: port numbers of Transport header
|
|
|
|
* port16[0]: src port number
|
|
|
|
* port16[1]: dst port number
|
|
|
|
*/
|
|
|
|
struct flow_dissector_key_ports {
|
|
|
|
union {
|
|
|
|
__be32 ports;
|
|
|
|
__be16 port16[2];
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
enum flow_dissector_key_id {
|
|
|
|
FLOW_DISSECTOR_KEY_BASIC, /* struct flow_dissector_key_basic */
|
|
|
|
FLOW_DISSECTOR_KEY_IPV4_ADDRS, /* struct flow_dissector_key_addrs */
|
|
|
|
FLOW_DISSECTOR_KEY_IPV6_HASH_ADDRS, /* struct flow_dissector_key_addrs */
|
|
|
|
FLOW_DISSECTOR_KEY_PORTS, /* struct flow_dissector_key_ports */
|
|
|
|
|
|
|
|
FLOW_DISSECTOR_KEY_MAX,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct flow_dissector_key {
|
|
|
|
enum flow_dissector_key_id key_id;
|
|
|
|
size_t offset; /* offset of struct flow_dissector_key_*
|
|
|
|
in target the struct */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct flow_dissector {
|
|
|
|
unsigned int used_keys; /* each bit repesents presence of one key id */
|
|
|
|
unsigned short int offset[FLOW_DISSECTOR_KEY_MAX];
|
|
|
|
};
|
|
|
|
|
2014-06-23 10:37:58 +00:00
|
|
|
/* struct flow_keys:
|
|
|
|
* @src: source ip address in case of IPv4
|
|
|
|
* For IPv6 it contains 32bit hash of src address
|
|
|
|
* @dst: destination ip address in case of IPv4
|
|
|
|
* For IPv6 it contains 32bit hash of dst address
|
|
|
|
* @ports: port numbers of Transport header
|
|
|
|
* port16[0]: src port number
|
|
|
|
* port16[1]: dst port number
|
|
|
|
* @thoff: Transport header offset
|
|
|
|
* @n_proto: Network header protocol (eg. IPv4/IPv6)
|
|
|
|
* @ip_proto: Transport header protocol (eg. TCP/UDP)
|
|
|
|
* All the members, except thoff, are in network byte order.
|
|
|
|
*/
|
2011-11-28 05:22:18 +00:00
|
|
|
struct flow_keys {
|
flow_dissector: use a 64bit load/store
Le lundi 28 novembre 2011 à 19:06 -0500, David Miller a écrit :
> From: Dimitris Michailidis <dm@chelsio.com>
> Date: Mon, 28 Nov 2011 08:25:39 -0800
>
> >> +bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys
> >> *flow)
> >> +{
> >> + int poff, nhoff = skb_network_offset(skb);
> >> + u8 ip_proto;
> >> + u16 proto = skb->protocol;
> >
> > __be16 instead of u16 for proto?
>
> I'll take care of this when I apply these patches.
( CC trimmed )
Thanks David !
Here is a small patch to use one 64bit load/store on x86_64 instead of
two 32bit load/stores.
[PATCH net-next] flow_dissector: use a 64bit load/store
gcc compiler is smart enough to use a single load/store if we
memcpy(dptr, sptr, 8) on x86_64, regardless of
CONFIG_CC_OPTIMIZE_FOR_SIZE
In IP header, daddr immediately follows saddr, this wont change in the
future. We only need to make sure our flow_keys (src,dst) fields wont
break the rule.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-11-28 20:30:35 +00:00
|
|
|
/* (src,dst) must be grouped, in the same way than in IP header */
|
2011-11-28 05:22:18 +00:00
|
|
|
__be32 src;
|
|
|
|
__be32 dst;
|
|
|
|
union {
|
|
|
|
__be32 ports;
|
|
|
|
__be16 port16[2];
|
|
|
|
};
|
2015-02-04 21:31:54 +00:00
|
|
|
u16 thoff;
|
|
|
|
__be16 n_proto;
|
|
|
|
u8 ip_proto;
|
2011-11-28 05:22:18 +00:00
|
|
|
};
|
|
|
|
|
2015-05-12 12:56:15 +00:00
|
|
|
void skb_flow_dissector_init(struct flow_dissector *flow_dissector,
|
|
|
|
const struct flow_dissector_key *key,
|
|
|
|
unsigned int key_count);
|
2014-08-23 19:13:41 +00:00
|
|
|
bool __skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow,
|
2014-08-26 00:03:47 +00:00
|
|
|
void *data, __be16 proto, int nhoff, int hlen);
|
2015-05-12 12:56:07 +00:00
|
|
|
|
|
|
|
static inline bool skb_flow_dissect(const struct sk_buff *skb,
|
|
|
|
struct flow_keys *flow)
|
2014-08-23 19:13:41 +00:00
|
|
|
{
|
2014-08-26 00:03:47 +00:00
|
|
|
return __skb_flow_dissect(skb, flow, NULL, 0, 0, 0);
|
2014-08-23 19:13:41 +00:00
|
|
|
}
|
2015-05-12 12:56:07 +00:00
|
|
|
|
2014-08-23 19:13:41 +00:00
|
|
|
__be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,
|
|
|
|
void *data, int hlen_proto);
|
2015-05-12 12:56:07 +00:00
|
|
|
|
|
|
|
static inline __be32 skb_flow_get_ports(const struct sk_buff *skb,
|
|
|
|
int thoff, u8 ip_proto)
|
2014-08-23 19:13:41 +00:00
|
|
|
{
|
|
|
|
return __skb_flow_get_ports(skb, thoff, ip_proto, NULL, 0);
|
|
|
|
}
|
2015-05-12 12:56:07 +00:00
|
|
|
|
2014-07-02 04:32:05 +00:00
|
|
|
u32 flow_hash_from_keys(struct flow_keys *keys);
|
2015-05-12 12:56:11 +00:00
|
|
|
void __skb_get_hash(struct sk_buff *skb);
|
2015-05-12 12:56:09 +00:00
|
|
|
u32 skb_get_poff(const struct sk_buff *skb);
|
|
|
|
u32 __skb_get_poff(const struct sk_buff *skb, void *data,
|
|
|
|
const struct flow_keys *keys, int hlen);
|
2015-05-12 12:56:07 +00:00
|
|
|
|
2015-05-01 18:30:17 +00:00
|
|
|
/* struct flow_keys_digest:
|
|
|
|
*
|
|
|
|
* This structure is used to hold a digest of the full flow keys. This is a
|
|
|
|
* larger "hash" of a flow to allow definitively matching specific flows where
|
|
|
|
* the 32 bit skb->hash is not large enough. The size is limited to 16 bytes so
|
|
|
|
* that it can by used in CB of skb (see sch_choke for an example).
|
|
|
|
*/
|
|
|
|
#define FLOW_KEYS_DIGEST_LEN 16
|
|
|
|
struct flow_keys_digest {
|
|
|
|
u8 data[FLOW_KEYS_DIGEST_LEN];
|
|
|
|
};
|
|
|
|
|
|
|
|
void make_flow_keys_digest(struct flow_keys_digest *digest,
|
|
|
|
const struct flow_keys *flow);
|
|
|
|
|
2011-11-28 05:22:18 +00:00
|
|
|
#endif
|