mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-21 14:49:41 +00:00
Code Issues Releases Wiki Activity

Avoid indeterminate statistics in offload implementations.

Browse Source 
A lot of the offload implementations didn't bother to initialize the
statistics they were supposed to return.  I don't know whether any of
the callers actually use them, but it looked wrong.

Found by inspection.

Acked-by: Ilya Maximets <i.maximets@ovn.org>
Signed-off-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Ben Pfaff
2019-10-25 11:46:24 -07:00
parent cd7ea52172
commit 75ad1cd6e9
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/netdev-dummy.c
View File

@@ -1434,7 +1434,7 @@ netdev_dummy_flow_put(struct netdev *netdev, struct match *match,
struct nlattr *actions OVS_UNUSED, struct nlattr *actions OVS_UNUSED,
size_t actions_len OVS_UNUSED, size_t actions_len OVS_UNUSED,
const ovs_u128 *ufid, struct offload_info *info, const ovs_u128 *ufid, struct offload_info *info,
struct dpif_flow_stats *stats OVS_UNUSED) struct dpif_flow_stats *stats)
{ {
struct netdev_dummy *dev = netdev_dummy_cast(netdev); struct netdev_dummy *dev = netdev_dummy_cast(netdev);
struct offloaded_flow *off_flow; struct offloaded_flow *off_flow;
@@ -1476,12 +1476,15 @@ netdev_dummy_flow_put(struct netdev *netdev, struct match *match,
ds_destroy(&ds); ds_destroy(&ds);
} }
if (stats) {
memset(stats, 0, sizeof *stats);
}
return 0; return 0;
} }
static int static int
netdev_dummy_flow_del(struct netdev *netdev, const ovs_u128 *ufid, netdev_dummy_flow_del(struct netdev *netdev, const ovs_u128 *ufid,
struct dpif_flow_stats *stats OVS_UNUSED) struct dpif_flow_stats *stats)
{ {
struct netdev_dummy *dev = netdev_dummy_cast(netdev); struct netdev_dummy *dev = netdev_dummy_cast(netdev);
struct offloaded_flow *off_flow; struct offloaded_flow *off_flow;
@@ -1521,6 +1524,9 @@ exit:
ds_destroy(&ds); ds_destroy(&ds);
} }
if (stats) {
memset(stats, 0, sizeof *stats);
}
return error ? -1 : 0; return error ? -1 : 0;
} }

10
lib/netdev-offload-dpdk.c
View File

@@ -710,7 +710,7 @@ static int
netdev_offload_dpdk_flow_put(struct netdev *netdev, struct match *match, netdev_offload_dpdk_flow_put(struct netdev *netdev, struct match *match,
struct nlattr *actions, size_t actions_len, struct nlattr *actions, size_t actions_len,
const ovs_u128 *ufid, struct offload_info *info, const ovs_u128 *ufid, struct offload_info *info,
struct dpif_flow_stats *stats OVS_UNUSED) struct dpif_flow_stats *stats)
{ {
struct rte_flow *rte_flow; struct rte_flow *rte_flow;
int ret; int ret;
@@ -732,13 +732,16 @@ netdev_offload_dpdk_flow_put(struct netdev *netdev, struct match *match,
return ret; return ret;
} }
if (stats) {
memset(stats, 0, sizeof *stats);
}
return netdev_offload_dpdk_add_flow(netdev, match, actions, return netdev_offload_dpdk_add_flow(netdev, match, actions,
actions_len, ufid, info); actions_len, ufid, info);
} }
static int static int
netdev_offload_dpdk_flow_del(struct netdev *netdev, const ovs_u128 *ufid, netdev_offload_dpdk_flow_del(struct netdev *netdev, const ovs_u128 *ufid,
struct dpif_flow_stats *stats OVS_UNUSED) struct dpif_flow_stats *stats)
{ {
struct rte_flow *rte_flow = ufid_to_rte_flow_find(ufid); struct rte_flow *rte_flow = ufid_to_rte_flow_find(ufid);
@@ -746,6 +749,9 @@ netdev_offload_dpdk_flow_del(struct netdev *netdev, const ovs_u128 *ufid,
return -1; return -1;
} }
if (stats) {
memset(stats, 0, sizeof *stats);
}
return netdev_offload_dpdk_destroy_flow(netdev, ufid, rte_flow); return netdev_offload_dpdk_destroy_flow(netdev, ufid, rte_flow);
} }

5
lib/netdev-offload-tc.c
View File

@@ -1143,7 +1143,7 @@ static int
netdev_tc_flow_put(struct netdev *netdev, struct match *match, netdev_tc_flow_put(struct netdev *netdev, struct match *match,
struct nlattr *actions, size_t actions_len, struct nlattr *actions, size_t actions_len,
const ovs_u128 *ufid, struct offload_info *info, const ovs_u128 *ufid, struct offload_info *info,
struct dpif_flow_stats *stats OVS_UNUSED) struct dpif_flow_stats *stats)
{ {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
enum tc_qdisc_hook hook = get_tc_qdisc_hook(netdev); enum tc_qdisc_hook hook = get_tc_qdisc_hook(netdev);
@@ -1448,6 +1448,9 @@ netdev_tc_flow_put(struct netdev *netdev, struct match *match,
err = tc_replace_flower(ifindex, prio, handle, &flower, block_id, hook); err = tc_replace_flower(ifindex, prio, handle, &flower, block_id, hook);
if (!err) { if (!err) {
if (stats) {
memset(stats, 0, sizeof *stats);
}
add_ufid_tc_mapping(ufid, flower.prio, flower.handle, netdev, ifindex); add_ufid_tc_mapping(ufid, flower.prio, flower.handle, netdev, ifindex);
} }