![John Hurley](/assets/img/avatar_default.png)
With the introduction of flow_stats_update(), drivers now update the stats
fields of the passed tc_cls_flower_offload struct, rather than call
tcf_exts_stats_update() directly to update the stats of offloaded TC
flower rules. However, if multiple qdiscs are registered to a TC shared
block and a flower rule is applied, then, when getting stats for the rule,
multiple callbacks may be made.
Take this into consideration by modifying flow_stats_update to gather the
stats from all callbacks. Currently, the values in tc_cls_flower_offload
only account for the last stats callback in the list.
Fixes: 3b1903ef97
("flow_offload: add statistics retrieval infrastructure and use it")
Signed-off-by: John Hurley <john.hurley@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
204 lines
5.4 KiB
C
204 lines
5.4 KiB
C
#ifndef _NET_FLOW_OFFLOAD_H
|
|
#define _NET_FLOW_OFFLOAD_H
|
|
|
|
#include <net/flow_dissector.h>
|
|
|
|
struct flow_match {
|
|
struct flow_dissector *dissector;
|
|
void *mask;
|
|
void *key;
|
|
};
|
|
|
|
struct flow_match_basic {
|
|
struct flow_dissector_key_basic *key, *mask;
|
|
};
|
|
|
|
struct flow_match_control {
|
|
struct flow_dissector_key_control *key, *mask;
|
|
};
|
|
|
|
struct flow_match_eth_addrs {
|
|
struct flow_dissector_key_eth_addrs *key, *mask;
|
|
};
|
|
|
|
struct flow_match_vlan {
|
|
struct flow_dissector_key_vlan *key, *mask;
|
|
};
|
|
|
|
struct flow_match_ipv4_addrs {
|
|
struct flow_dissector_key_ipv4_addrs *key, *mask;
|
|
};
|
|
|
|
struct flow_match_ipv6_addrs {
|
|
struct flow_dissector_key_ipv6_addrs *key, *mask;
|
|
};
|
|
|
|
struct flow_match_ip {
|
|
struct flow_dissector_key_ip *key, *mask;
|
|
};
|
|
|
|
struct flow_match_ports {
|
|
struct flow_dissector_key_ports *key, *mask;
|
|
};
|
|
|
|
struct flow_match_icmp {
|
|
struct flow_dissector_key_icmp *key, *mask;
|
|
};
|
|
|
|
struct flow_match_tcp {
|
|
struct flow_dissector_key_tcp *key, *mask;
|
|
};
|
|
|
|
struct flow_match_mpls {
|
|
struct flow_dissector_key_mpls *key, *mask;
|
|
};
|
|
|
|
struct flow_match_enc_keyid {
|
|
struct flow_dissector_key_keyid *key, *mask;
|
|
};
|
|
|
|
struct flow_match_enc_opts {
|
|
struct flow_dissector_key_enc_opts *key, *mask;
|
|
};
|
|
|
|
struct flow_rule;
|
|
|
|
void flow_rule_match_basic(const struct flow_rule *rule,
|
|
struct flow_match_basic *out);
|
|
void flow_rule_match_control(const struct flow_rule *rule,
|
|
struct flow_match_control *out);
|
|
void flow_rule_match_eth_addrs(const struct flow_rule *rule,
|
|
struct flow_match_eth_addrs *out);
|
|
void flow_rule_match_vlan(const struct flow_rule *rule,
|
|
struct flow_match_vlan *out);
|
|
void flow_rule_match_ipv4_addrs(const struct flow_rule *rule,
|
|
struct flow_match_ipv4_addrs *out);
|
|
void flow_rule_match_ipv6_addrs(const struct flow_rule *rule,
|
|
struct flow_match_ipv6_addrs *out);
|
|
void flow_rule_match_ip(const struct flow_rule *rule,
|
|
struct flow_match_ip *out);
|
|
void flow_rule_match_ports(const struct flow_rule *rule,
|
|
struct flow_match_ports *out);
|
|
void flow_rule_match_tcp(const struct flow_rule *rule,
|
|
struct flow_match_tcp *out);
|
|
void flow_rule_match_icmp(const struct flow_rule *rule,
|
|
struct flow_match_icmp *out);
|
|
void flow_rule_match_mpls(const struct flow_rule *rule,
|
|
struct flow_match_mpls *out);
|
|
void flow_rule_match_enc_control(const struct flow_rule *rule,
|
|
struct flow_match_control *out);
|
|
void flow_rule_match_enc_ipv4_addrs(const struct flow_rule *rule,
|
|
struct flow_match_ipv4_addrs *out);
|
|
void flow_rule_match_enc_ipv6_addrs(const struct flow_rule *rule,
|
|
struct flow_match_ipv6_addrs *out);
|
|
void flow_rule_match_enc_ip(const struct flow_rule *rule,
|
|
struct flow_match_ip *out);
|
|
void flow_rule_match_enc_ports(const struct flow_rule *rule,
|
|
struct flow_match_ports *out);
|
|
void flow_rule_match_enc_keyid(const struct flow_rule *rule,
|
|
struct flow_match_enc_keyid *out);
|
|
void flow_rule_match_enc_opts(const struct flow_rule *rule,
|
|
struct flow_match_enc_opts *out);
|
|
|
|
enum flow_action_id {
|
|
FLOW_ACTION_ACCEPT = 0,
|
|
FLOW_ACTION_DROP,
|
|
FLOW_ACTION_TRAP,
|
|
FLOW_ACTION_GOTO,
|
|
FLOW_ACTION_REDIRECT,
|
|
FLOW_ACTION_MIRRED,
|
|
FLOW_ACTION_VLAN_PUSH,
|
|
FLOW_ACTION_VLAN_POP,
|
|
FLOW_ACTION_VLAN_MANGLE,
|
|
FLOW_ACTION_TUNNEL_ENCAP,
|
|
FLOW_ACTION_TUNNEL_DECAP,
|
|
FLOW_ACTION_MANGLE,
|
|
FLOW_ACTION_ADD,
|
|
FLOW_ACTION_CSUM,
|
|
FLOW_ACTION_MARK,
|
|
FLOW_ACTION_WAKE,
|
|
FLOW_ACTION_QUEUE,
|
|
};
|
|
|
|
/* This is mirroring enum pedit_header_type definition for easy mapping between
|
|
* tc pedit action. Legacy TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK is mapped to
|
|
* FLOW_ACT_MANGLE_UNSPEC, which is supported by no driver.
|
|
*/
|
|
enum flow_action_mangle_base {
|
|
FLOW_ACT_MANGLE_UNSPEC = 0,
|
|
FLOW_ACT_MANGLE_HDR_TYPE_ETH,
|
|
FLOW_ACT_MANGLE_HDR_TYPE_IP4,
|
|
FLOW_ACT_MANGLE_HDR_TYPE_IP6,
|
|
FLOW_ACT_MANGLE_HDR_TYPE_TCP,
|
|
FLOW_ACT_MANGLE_HDR_TYPE_UDP,
|
|
};
|
|
|
|
struct flow_action_entry {
|
|
enum flow_action_id id;
|
|
union {
|
|
u32 chain_index; /* FLOW_ACTION_GOTO */
|
|
struct net_device *dev; /* FLOW_ACTION_REDIRECT */
|
|
struct { /* FLOW_ACTION_VLAN */
|
|
u16 vid;
|
|
__be16 proto;
|
|
u8 prio;
|
|
} vlan;
|
|
struct { /* FLOW_ACTION_PACKET_EDIT */
|
|
enum flow_action_mangle_base htype;
|
|
u32 offset;
|
|
u32 mask;
|
|
u32 val;
|
|
} mangle;
|
|
const struct ip_tunnel_info *tunnel; /* FLOW_ACTION_TUNNEL_ENCAP */
|
|
u32 csum_flags; /* FLOW_ACTION_CSUM */
|
|
u32 mark; /* FLOW_ACTION_MARK */
|
|
struct { /* FLOW_ACTION_QUEUE */
|
|
u32 ctx;
|
|
u32 index;
|
|
u8 vf;
|
|
} queue;
|
|
};
|
|
};
|
|
|
|
struct flow_action {
|
|
unsigned int num_entries;
|
|
struct flow_action_entry entries[0];
|
|
};
|
|
|
|
static inline bool flow_action_has_entries(const struct flow_action *action)
|
|
{
|
|
return action->num_entries;
|
|
}
|
|
|
|
#define flow_action_for_each(__i, __act, __actions) \
|
|
for (__i = 0, __act = &(__actions)->entries[0]; __i < (__actions)->num_entries; __act = &(__actions)->entries[++__i])
|
|
|
|
struct flow_rule {
|
|
struct flow_match match;
|
|
struct flow_action action;
|
|
};
|
|
|
|
struct flow_rule *flow_rule_alloc(unsigned int num_actions);
|
|
|
|
static inline bool flow_rule_match_key(const struct flow_rule *rule,
|
|
enum flow_dissector_key_id key)
|
|
{
|
|
return dissector_uses_key(rule->match.dissector, key);
|
|
}
|
|
|
|
struct flow_stats {
|
|
u64 pkts;
|
|
u64 bytes;
|
|
u64 lastused;
|
|
};
|
|
|
|
static inline void flow_stats_update(struct flow_stats *flow_stats,
|
|
u64 bytes, u64 pkts, u64 lastused)
|
|
{
|
|
flow_stats->pkts += pkts;
|
|
flow_stats->bytes += bytes;
|
|
flow_stats->lastused = max_t(u64, flow_stats->lastused, lastused);
|
|
}
|
|
|
|
#endif /* _NET_FLOW_OFFLOAD_H */
|