git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: s/ODPAT_/ODP_ACTION_ATTR_/ to fit new naming scheme.
[sliver-openvswitch.git]
/
lib
/
dpif-netdev.c
diff --git
a/lib/dpif-netdev.c
b/lib/dpif-netdev.c
index
80b890f
..
417ed6e
100644
(file)
--- a/
lib/dpif-netdev.c
+++ b/
lib/dpif-netdev.c
@@
-111,7
+111,7
@@
struct dp_netdev_flow {
struct flow key;
/* Statistics. */
struct flow key;
/* Statistics. */
-
struct timespec used; /* Last used time
. */
+
long long int used; /* Last used time, in monotonic msecs
. */
long long int packet_count; /* Number of packets matched. */
long long int byte_count; /* Number of bytes matched. */
uint16_t tcp_ctl; /* Bitwise-OR of seen tcp_ctl values. */
long long int packet_count; /* Number of packets matched. */
long long int byte_count; /* Number of bytes matched. */
uint16_t tcp_ctl; /* Bitwise-OR of seen tcp_ctl values. */
@@
-621,14
+621,12
@@
dp_netdev_lookup_flow(const struct dp_netdev *dp, const struct flow *key)
}
static void
}
static void
-get_
odp_flow_stats(struct dp_netdev_flow *flow, struct odp
_flow_stats *stats)
+get_
dpif_flow_stats(struct dp_netdev_flow *flow, struct dpif
_flow_stats *stats)
{
stats->n_packets = flow->packet_count;
stats->n_bytes = flow->byte_count;
{
stats->n_packets = flow->packet_count;
stats->n_bytes = flow->byte_count;
- stats->used_sec = flow->used.tv_sec;
- stats->used_nsec = flow->used.tv_nsec;
+ stats->used = flow->used;
stats->tcp_flags = TCP_FLAGS(flow->tcp_ctl);
stats->tcp_flags = TCP_FLAGS(flow->tcp_ctl);
- stats->reserved = 0;
}
static int
}
static int
@@
-658,9
+656,9
@@
dpif_netdev_flow_from_nlattrs(const struct nlattr *key, uint32_t key_len,
}
static int
}
static int
-dpif_netdev_flow_get(const struct dpif *dpif,
int flags,
+dpif_netdev_flow_get(const struct dpif *dpif,
const struct nlattr *nl_key, size_t nl_key_len,
const struct nlattr *nl_key, size_t nl_key_len,
- struct ofpbuf **actionsp, struct
odp
_flow_stats *stats)
+ struct ofpbuf **actionsp, struct
dpif
_flow_stats *stats)
{
struct dp_netdev *dp = get_dp_netdev(dpif);
struct dp_netdev_flow *flow;
{
struct dp_netdev *dp = get_dp_netdev(dpif);
struct dp_netdev_flow *flow;
@@
-678,14
+676,11
@@
dpif_netdev_flow_get(const struct dpif *dpif, int flags,
}
if (stats) {
}
if (stats) {
- get_
odp
_flow_stats(flow, stats);
+ get_
dpif
_flow_stats(flow, stats);
}
if (actionsp) {
*actionsp = ofpbuf_clone_data(flow->actions, flow->actions_len);
}
}
if (actionsp) {
*actionsp = ofpbuf_clone_data(flow->actions, flow->actions_len);
}
- if (flags & ODPFF_ZERO_TCP_FLAGS) {
- flow->tcp_ctl = 0;
- }
return 0;
}
return 0;
}
@@
-706,43
+701,43
@@
dpif_netdev_validate_actions(const struct nlattr *actions,
}
switch (type) {
}
switch (type) {
- case ODP
AT
_OUTPUT:
+ case ODP
_ACTION_ATTR
_OUTPUT:
if (nl_attr_get_u32(a) >= MAX_PORTS) {
return EINVAL;
}
break;
if (nl_attr_get_u32(a) >= MAX_PORTS) {
return EINVAL;
}
break;
- case ODP
AT
_CONTROLLER:
- case ODP
AT
_DROP_SPOOFED_ARP:
+ case ODP
_ACTION_ATTR
_CONTROLLER:
+ case ODP
_ACTION_ATTR
_DROP_SPOOFED_ARP:
break;
break;
- case ODP
AT
_SET_DL_TCI:
+ case ODP
_ACTION_ATTR
_SET_DL_TCI:
*mutates = true;
if (nl_attr_get_be16(a) & htons(VLAN_CFI)) {
return EINVAL;
}
break;
*mutates = true;
if (nl_attr_get_be16(a) & htons(VLAN_CFI)) {
return EINVAL;
}
break;
- case ODP
AT
_SET_NW_TOS:
+ case ODP
_ACTION_ATTR
_SET_NW_TOS:
*mutates = true;
if (nl_attr_get_u8(a) & IP_ECN_MASK) {
return EINVAL;
}
break;
*mutates = true;
if (nl_attr_get_u8(a) & IP_ECN_MASK) {
return EINVAL;
}
break;
- case ODP
AT
_STRIP_VLAN:
- case ODP
AT
_SET_DL_SRC:
- case ODP
AT
_SET_DL_DST:
- case ODP
AT
_SET_NW_SRC:
- case ODP
AT
_SET_NW_DST:
- case ODP
AT
_SET_TP_SRC:
- case ODP
AT
_SET_TP_DST:
+ case ODP
_ACTION_ATTR
_STRIP_VLAN:
+ case ODP
_ACTION_ATTR
_SET_DL_SRC:
+ case ODP
_ACTION_ATTR
_SET_DL_DST:
+ case ODP
_ACTION_ATTR
_SET_NW_SRC:
+ case ODP
_ACTION_ATTR
_SET_NW_DST:
+ case ODP
_ACTION_ATTR
_SET_TP_SRC:
+ case ODP
_ACTION_ATTR
_SET_TP_DST:
*mutates = true;
break;
*mutates = true;
break;
- case ODP
AT
_SET_TUNNEL:
- case ODP
AT
_SET_PRIORITY:
- case ODP
AT
_POP_PRIORITY:
+ case ODP
_ACTION_ATTR
_SET_TUNNEL:
+ case ODP
_ACTION_ATTR
_SET_PRIORITY:
+ case ODP
_ACTION_ATTR
_POP_PRIORITY:
default:
return EOPNOTSUPP;
}
default:
return EOPNOTSUPP;
}
@@
-792,18
+787,17
@@
add_flow(struct dpif *dpif, const struct flow *key,
static void
clear_stats(struct dp_netdev_flow *flow)
{
static void
clear_stats(struct dp_netdev_flow *flow)
{
- flow->used.tv_sec = 0;
- flow->used.tv_nsec = 0;
+ flow->used = 0;
flow->packet_count = 0;
flow->byte_count = 0;
flow->tcp_ctl = 0;
}
static int
flow->packet_count = 0;
flow->byte_count = 0;
flow->tcp_ctl = 0;
}
static int
-dpif_netdev_flow_put(struct dpif *dpif,
int
flags,
+dpif_netdev_flow_put(struct dpif *dpif,
enum dpif_flow_put_flags
flags,
const struct nlattr *nl_key, size_t nl_key_len,
const struct nlattr *actions, size_t actions_len,
const struct nlattr *nl_key, size_t nl_key_len,
const struct nlattr *actions, size_t actions_len,
- struct
odp
_flow_stats *stats)
+ struct
dpif
_flow_stats *stats)
{
struct dp_netdev *dp = get_dp_netdev(dpif);
struct dp_netdev_flow *flow;
{
struct dp_netdev *dp = get_dp_netdev(dpif);
struct dp_netdev_flow *flow;
@@
-817,7
+811,7
@@
dpif_netdev_flow_put(struct dpif *dpif, int flags,
flow = dp_netdev_lookup_flow(dp, &key);
if (!flow) {
flow = dp_netdev_lookup_flow(dp, &key);
if (!flow) {
- if (flags &
ODPPF
_CREATE) {
+ if (flags &
DPIF_FP
_CREATE) {
if (hmap_count(&dp->flow_table) < MAX_FLOWS) {
if (stats) {
memset(stats, 0, sizeof *stats);
if (hmap_count(&dp->flow_table) < MAX_FLOWS) {
if (stats) {
memset(stats, 0, sizeof *stats);
@@
-830,13
+824,13
@@
dpif_netdev_flow_put(struct dpif *dpif, int flags,
return ENOENT;
}
} else {
return ENOENT;
}
} else {
- if (flags &
ODPPF
_MODIFY) {
+ if (flags &
DPIF_FP
_MODIFY) {
int error = set_flow_actions(flow, actions, actions_len);
if (!error) {
if (stats) {
int error = set_flow_actions(flow, actions, actions_len);
if (!error) {
if (stats) {
- get_
odp
_flow_stats(flow, stats);
+ get_
dpif
_flow_stats(flow, stats);
}
}
- if (flags &
ODPPF
_ZERO_STATS) {
+ if (flags &
DPIF_FP
_ZERO_STATS) {
clear_stats(flow);
}
}
clear_stats(flow);
}
}
@@
-850,7
+844,7
@@
dpif_netdev_flow_put(struct dpif *dpif, int flags,
static int
dpif_netdev_flow_del(struct dpif *dpif,
const struct nlattr *nl_key, size_t nl_key_len,
static int
dpif_netdev_flow_del(struct dpif *dpif,
const struct nlattr *nl_key, size_t nl_key_len,
- struct
odp
_flow_stats *stats)
+ struct
dpif
_flow_stats *stats)
{
struct dp_netdev *dp = get_dp_netdev(dpif);
struct dp_netdev_flow *flow;
{
struct dp_netdev *dp = get_dp_netdev(dpif);
struct dp_netdev_flow *flow;
@@
-865,7
+859,7
@@
dpif_netdev_flow_del(struct dpif *dpif,
flow = dp_netdev_lookup_flow(dp, &key);
if (flow) {
if (stats) {
flow = dp_netdev_lookup_flow(dp, &key);
if (flow) {
if (stats) {
- get_
odp
_flow_stats(flow, stats);
+ get_
dpif
_flow_stats(flow, stats);
}
dp_netdev_free_flow(dp, flow);
return 0;
}
dp_netdev_free_flow(dp, flow);
return 0;
@@
-879,7
+873,7
@@
struct dp_netdev_flow_state {
uint32_t offset;
struct nlattr *actions;
uint32_t keybuf[ODPUTIL_FLOW_KEY_U32S];
uint32_t offset;
struct nlattr *actions;
uint32_t keybuf[ODPUTIL_FLOW_KEY_U32S];
- struct
odp
_flow_stats stats;
+ struct
dpif
_flow_stats stats;
};
static int
};
static int
@@
-898,7
+892,7
@@
static int
dpif_netdev_flow_dump_next(const struct dpif *dpif, void *state_,
const struct nlattr **key, size_t *key_len,
const struct nlattr **actions, size_t *actions_len,
dpif_netdev_flow_dump_next(const struct dpif *dpif, void *state_,
const struct nlattr **key, size_t *key_len,
const struct nlattr **actions, size_t *actions_len,
- const struct
odp
_flow_stats **stats)
+ const struct
dpif
_flow_stats **stats)
{
struct dp_netdev_flow_state *state = state_;
struct dp_netdev *dp = get_dp_netdev(dpif);
{
struct dp_netdev_flow_state *state = state_;
struct dp_netdev *dp = get_dp_netdev(dpif);
@@
-932,7
+926,7
@@
dpif_netdev_flow_dump_next(const struct dpif *dpif, void *state_,
}
if (stats) {
}
if (stats) {
- get_
odp
_flow_stats(flow, &state->stats);
+ get_
dpif
_flow_stats(flow, &state->stats);
*stats = &state->stats;
}
*stats = &state->stats;
}
@@
-1002,12
+996,8
@@
static int
dpif_netdev_recv_set_mask(struct dpif *dpif, int listen_mask)
{
struct dpif_netdev *dpif_netdev = dpif_netdev_cast(dpif);
dpif_netdev_recv_set_mask(struct dpif *dpif, int listen_mask)
{
struct dpif_netdev *dpif_netdev = dpif_netdev_cast(dpif);
- if (!(listen_mask & ~ODPL_ALL)) {
- dpif_netdev->listen_mask = listen_mask;
- return 0;
- } else {
- return EINVAL;
- }
+ dpif_netdev->listen_mask = listen_mask;
+ return 0;
}
static struct dp_netdev_queue *
}
static struct dp_netdev_queue *
@@
-1064,7
+1054,7
@@
static void
dp_netdev_flow_used(struct dp_netdev_flow *flow, struct flow *key,
const struct ofpbuf *packet)
{
dp_netdev_flow_used(struct dp_netdev_flow *flow, struct flow *key,
const struct ofpbuf *packet)
{
-
time_timespec(&flow->used
);
+
flow->used = time_msec(
);
flow->packet_count++;
flow->byte_count += packet->size;
if (key->dl_type == htons(ETH_TYPE_IP) && key->nw_proto == IPPROTO_TCP) {
flow->packet_count++;
flow->byte_count += packet->size;
if (key->dl_type == htons(ETH_TYPE_IP) && key->nw_proto == IPPROTO_TCP) {
@@
-1096,7
+1086,7
@@
dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port,
dp->n_hit++;
} else {
dp->n_missed++;
dp->n_hit++;
} else {
dp->n_missed++;
- dp_netdev_output_control(dp, packet,
_ODPL_MISS_NR
, &key, 0);
+ dp_netdev_output_control(dp, packet,
DPIF_UC_MISS
, &key, 0);
}
}
}
}
@@
-1225,7
+1215,7
@@
dp_netdev_set_nw_addr(struct ofpbuf *packet, const struct flow *key,
uint16_t type = nl_attr_type(a);
uint32_t *field;
uint16_t type = nl_attr_type(a);
uint32_t *field;
- field = type == ODP
AT
_SET_NW_SRC ? &nh->ip_src : &nh->ip_dst;
+ field = type == ODP
_ACTION_ATTR
_SET_NW_SRC ? &nh->ip_src : &nh->ip_dst;
if (key->nw_proto == IP_TYPE_TCP && packet->l7) {
struct tcp_header *th = packet->l4;
th->tcp_csum = recalc_csum32(th->tcp_csum, *field, ip);
if (key->nw_proto == IP_TYPE_TCP && packet->l7) {
struct tcp_header *th = packet->l4;
th->tcp_csum = recalc_csum32(th->tcp_csum, *field, ip);
@@
-1271,12
+1261,14
@@
dp_netdev_set_tp_port(struct ofpbuf *packet, const struct flow *key,
if (key->nw_proto == IPPROTO_TCP && packet->l7) {
struct tcp_header *th = packet->l4;
if (key->nw_proto == IPPROTO_TCP && packet->l7) {
struct tcp_header *th = packet->l4;
- field = type == ODPAT_SET_TP_SRC ? &th->tcp_src : &th->tcp_dst;
+ field = (type == ODP_ACTION_ATTR_SET_TP_SRC
+ ? &th->tcp_src : &th->tcp_dst);
th->tcp_csum = recalc_csum16(th->tcp_csum, *field, port);
*field = port;
} else if (key->nw_proto == IPPROTO_UDP && packet->l7) {
struct udp_header *uh = packet->l4;
th->tcp_csum = recalc_csum16(th->tcp_csum, *field, port);
*field = port;
} else if (key->nw_proto == IPPROTO_UDP && packet->l7) {
struct udp_header *uh = packet->l4;
- field = type == ODPAT_SET_TP_SRC ? &uh->udp_src : &uh->udp_dst;
+ field = (type == ODP_ACTION_ATTR_SET_TP_SRC
+ ? &uh->udp_src : &uh->udp_dst);
uh->udp_csum = recalc_csum16(uh->udp_csum, *field, port);
*field = port;
} else {
uh->udp_csum = recalc_csum16(uh->udp_csum, *field, port);
*field = port;
} else {
@@
-1367,46
+1359,46
@@
dp_netdev_execute_actions(struct dp_netdev *dp,
NL_ATTR_FOR_EACH_UNSAFE (a, left, actions, actions_len) {
switch (nl_attr_type(a)) {
NL_ATTR_FOR_EACH_UNSAFE (a, left, actions, actions_len) {
switch (nl_attr_type(a)) {
- case ODP
AT
_OUTPUT:
+ case ODP
_ACTION_ATTR
_OUTPUT:
dp_netdev_output_port(dp, packet, nl_attr_get_u32(a));
break;
dp_netdev_output_port(dp, packet, nl_attr_get_u32(a));
break;
- case ODP
AT
_CONTROLLER:
- dp_netdev_output_control(dp, packet,
_ODPL_ACTION_NR
,
+ case ODP
_ACTION_ATTR
_CONTROLLER:
+ dp_netdev_output_control(dp, packet,
DPIF_UC_ACTION
,
key, nl_attr_get_u64(a));
break;
key, nl_attr_get_u64(a));
break;
- case ODP
AT
_SET_DL_TCI:
+ case ODP
_ACTION_ATTR
_SET_DL_TCI:
dp_netdev_set_dl_tci(packet, nl_attr_get_be16(a));
break;
dp_netdev_set_dl_tci(packet, nl_attr_get_be16(a));
break;
- case ODP
AT
_STRIP_VLAN:
+ case ODP
_ACTION_ATTR
_STRIP_VLAN:
dp_netdev_strip_vlan(packet);
break;
dp_netdev_strip_vlan(packet);
break;
- case ODP
AT
_SET_DL_SRC:
+ case ODP
_ACTION_ATTR
_SET_DL_SRC:
dp_netdev_set_dl_src(packet, nl_attr_get_unspec(a, ETH_ADDR_LEN));
break;
dp_netdev_set_dl_src(packet, nl_attr_get_unspec(a, ETH_ADDR_LEN));
break;
- case ODP
AT
_SET_DL_DST:
+ case ODP
_ACTION_ATTR
_SET_DL_DST:
dp_netdev_set_dl_dst(packet, nl_attr_get_unspec(a, ETH_ADDR_LEN));
break;
dp_netdev_set_dl_dst(packet, nl_attr_get_unspec(a, ETH_ADDR_LEN));
break;
- case ODP
AT
_SET_NW_SRC:
- case ODP
AT
_SET_NW_DST:
+ case ODP
_ACTION_ATTR
_SET_NW_SRC:
+ case ODP
_ACTION_ATTR
_SET_NW_DST:
dp_netdev_set_nw_addr(packet, key, a);
break;
dp_netdev_set_nw_addr(packet, key, a);
break;
- case ODP
AT
_SET_NW_TOS:
+ case ODP
_ACTION_ATTR
_SET_NW_TOS:
dp_netdev_set_nw_tos(packet, key, nl_attr_get_u8(a));
break;
dp_netdev_set_nw_tos(packet, key, nl_attr_get_u8(a));
break;
- case ODP
AT
_SET_TP_SRC:
- case ODP
AT
_SET_TP_DST:
+ case ODP
_ACTION_ATTR
_SET_TP_SRC:
+ case ODP
_ACTION_ATTR
_SET_TP_DST:
dp_netdev_set_tp_port(packet, key, a);
break;
dp_netdev_set_tp_port(packet, key, a);
break;
- case ODP
AT
_DROP_SPOOFED_ARP:
+ case ODP
_ACTION_ATTR
_DROP_SPOOFED_ARP:
if (dp_netdev_is_spoofed_arp(packet, key)) {
return 0;
}
if (dp_netdev_is_spoofed_arp(packet, key)) {
return 0;
}
@@
-1422,7
+1414,6
@@
const struct dpif_class dpif_netdev_class = {
NULL, /* enumerate */
dpif_netdev_open,
dpif_netdev_close,
NULL, /* enumerate */
dpif_netdev_open,
dpif_netdev_close,
- NULL, /* get_all_names */
dpif_netdev_destroy,
dpif_netdev_get_stats,
dpif_netdev_get_drop_frags,
dpif_netdev_destroy,
dpif_netdev_get_stats,
dpif_netdev_get_drop_frags,