Skip to content

Commit

Permalink
netdev-dpdk: Print port name in offload API messages.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
igsilya authored and istokes committed Nov 2, 2018
1 parent 3eb47ae commit 6043249
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions lib/netdev-dpdk.c
Expand Up @@ -4528,14 +4528,14 @@ netdev_dpdk_add_rte_flow_offload(struct netdev *netdev,

free(rss);
if (!flow) {
VLOG_ERR("rte flow creat error: %u : message : %s\n",
error.type, error.message);
VLOG_ERR("%s: rte flow creat error: %u : message : %s\n",
netdev_get_name(netdev), error.type, error.message);
ret = -1;
goto out;
}
ufid_to_rte_flow_associate(ufid, flow);
VLOG_DBG("installed flow %p by ufid "UUID_FMT"\n",
flow, UUID_ARGS((struct uuid *)ufid));
VLOG_DBG("%s: installed flow %p by ufid "UUID_FMT"\n",
netdev_get_name(netdev), flow, UUID_ARGS((struct uuid *)ufid));

out:
free(patterns.items);
Expand Down Expand Up @@ -4639,9 +4639,10 @@ netdev_dpdk_validate_flow(const struct match *match) {
}

static int
netdev_dpdk_destroy_rte_flow(struct netdev_dpdk *dev,
netdev_dpdk_destroy_rte_flow(struct netdev *netdev,
const ovs_u128 *ufid,
struct rte_flow *rte_flow) {
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
struct rte_flow_error error;
int ret;

Expand All @@ -4650,11 +4651,12 @@ netdev_dpdk_destroy_rte_flow(struct netdev_dpdk *dev,
ret = rte_flow_destroy(dev->port_id, rte_flow, &error);
if (ret == 0) {
ufid_to_rte_flow_disassociate(ufid);
VLOG_DBG("removed rte flow %p associated with ufid " UUID_FMT "\n",
rte_flow, UUID_ARGS((struct uuid *)ufid));
VLOG_DBG("%s: removed rte flow %p associated with ufid " UUID_FMT "\n",
netdev_get_name(netdev), rte_flow,
UUID_ARGS((struct uuid *)ufid));
} else {
VLOG_ERR("rte flow destroy error: %u : message : %s\n",
error.type, error.message);
VLOG_ERR("%s: rte flow destroy error: %u : message : %s\n",
netdev_get_name(netdev), error.type, error.message);
}

ovs_mutex_unlock(&dev->mutex);
Expand All @@ -4675,8 +4677,7 @@ netdev_dpdk_flow_put(struct netdev *netdev, struct match *match,
*/
rte_flow = ufid_to_rte_flow_find(ufid);
if (rte_flow) {
ret = netdev_dpdk_destroy_rte_flow(netdev_dpdk_cast(netdev),
ufid, rte_flow);
ret = netdev_dpdk_destroy_rte_flow(netdev, ufid, rte_flow);
if (ret < 0) {
return ret;
}
Expand All @@ -4701,8 +4702,7 @@ netdev_dpdk_flow_del(struct netdev *netdev, const ovs_u128 *ufid,
return -1;
}

return netdev_dpdk_destroy_rte_flow(netdev_dpdk_cast(netdev),
ufid, rte_flow);
return netdev_dpdk_destroy_rte_flow(netdev, ufid, rte_flow);
}

#define DPDK_FLOW_OFFLOAD_API \
Expand Down

0 comments on commit 6043249

Please sign in to comment.