mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-03 15:55:19 +00:00
Code Issues Releases Wiki Activity

netdev-dpdk: Print port name in offload API messages.

Browse Source 
This is useful for understanding which flows offloaded to
which ports.

Code refactored a bit to reduce number of casts.

Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Signed-off-by: Ian Stokes <ian.stokes@intel.com>
This commit is contained in:
Ilya Maximets
2018-10-19 16:51:14 +03:00
committed by Ian Stokes
parent 5752eae485
commit faf71e4922
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/netdev-dpdk.c
View File

@@ -4528,14 +4528,14 @@ end_proto_check:
free(rss); free(rss);
if (!flow) { if (!flow) {
VLOG_ERR("rte flow creat error: %u : message : %s\n", VLOG_ERR("%s: rte flow creat error: %u : message : %s\n",
error.type, error.message); netdev_get_name(netdev), error.type, error.message);
ret = -1; ret = -1;
goto out; goto out;
} }
ufid_to_rte_flow_associate(ufid, flow); ufid_to_rte_flow_associate(ufid, flow);
VLOG_DBG("installed flow %p by ufid "UUID_FMT"\n", VLOG_DBG("%s: installed flow %p by ufid "UUID_FMT"\n",
flow, UUID_ARGS((struct uuid *)ufid)); netdev_get_name(netdev), flow, UUID_ARGS((struct uuid *)ufid));
out: out:
free(patterns.items); free(patterns.items);
@@ -4639,9 +4639,10 @@ err:
} }
static int static int
netdev_dpdk_destroy_rte_flow(struct netdev_dpdk *dev, netdev_dpdk_destroy_rte_flow(struct netdev *netdev,
const ovs_u128 *ufid, const ovs_u128 *ufid,
struct rte_flow *rte_flow) { struct rte_flow *rte_flow) {
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
struct rte_flow_error error; struct rte_flow_error error;
int ret; int ret;
@@ -4650,11 +4651,12 @@ netdev_dpdk_destroy_rte_flow(struct netdev_dpdk *dev,
ret = rte_flow_destroy(dev->port_id, rte_flow, &error); ret = rte_flow_destroy(dev->port_id, rte_flow, &error);
if (ret == 0) { if (ret == 0) {
ufid_to_rte_flow_disassociate(ufid); ufid_to_rte_flow_disassociate(ufid);
VLOG_DBG("removed rte flow %p associated with ufid " UUID_FMT "\n", VLOG_DBG("%s: removed rte flow %p associated with ufid " UUID_FMT "\n",
rte_flow, UUID_ARGS((struct uuid *)ufid)); netdev_get_name(netdev), rte_flow,
UUID_ARGS((struct uuid *)ufid));
} else { } else {
VLOG_ERR("rte flow destroy error: %u : message : %s\n", VLOG_ERR("%s: rte flow destroy error: %u : message : %s\n",
error.type, error.message); netdev_get_name(netdev), error.type, error.message);
} }
ovs_mutex_unlock(&dev->mutex); ovs_mutex_unlock(&dev->mutex);
@@ -4675,8 +4677,7 @@ netdev_dpdk_flow_put(struct netdev *netdev, struct match *match,
*/ */
rte_flow = ufid_to_rte_flow_find(ufid); rte_flow = ufid_to_rte_flow_find(ufid);
if (rte_flow) { if (rte_flow) {
ret = netdev_dpdk_destroy_rte_flow(netdev_dpdk_cast(netdev), ret = netdev_dpdk_destroy_rte_flow(netdev, ufid, rte_flow);
ufid, rte_flow);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@@ -4701,8 +4702,7 @@ netdev_dpdk_flow_del(struct netdev *netdev, const ovs_u128 *ufid,
return -1; return -1;
} }
return netdev_dpdk_destroy_rte_flow(netdev_dpdk_cast(netdev), return netdev_dpdk_destroy_rte_flow(netdev, ufid, rte_flow);
ufid, rte_flow);
} }
#define DPDK_FLOW_OFFLOAD_API \ #define DPDK_FLOW_OFFLOAD_API \