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

netdev-dpdk: Fix egress policer error detection bug.

Browse Source 
When egress policer is set as a QoS type for a port, an error may occur during
setup if incorrect parameters are used for the rte_meter. If this occurs
the egress policer construct and set functions should free any allocated
memory relevant to the policer and set the QoS configuration pointer to
null. The netdev_dpdk_set_qos function should check the error value returned
for any QoS construct/set calls with an assertion to avoid segfault.
Also this commit modifies egress_policer_qos_set() to correctly lock the QoS
spinlock while the egress policer configuration is updated to avoid
segfault.

Signed-off-by: Ian Stokes <ian.stokes@intel.com>
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
This commit is contained in:
Ian Stokes
2016-08-09 18:20:26 +01:00
committed by Daniele Di Proietto
parent 27373420c8
commit 7ea266e953
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/netdev-dpdk.c
View File

@@ -2745,11 +2745,15 @@ netdev_dpdk_set_qos(struct netdev *netdev,
/* Install new QoS configuration. */ /* Install new QoS configuration. */
error = new_ops->qos_construct(netdev, details); error = new_ops->qos_construct(netdev, details);
ovs_assert((error == 0) == (dev->qos_conf != NULL));
} }
} else { } else {
error = new_ops->qos_construct(netdev, details); error = new_ops->qos_construct(netdev, details);
ovs_assert((error == 0) == (dev->qos_conf != NULL)); }
ovs_assert((error == 0) == (dev->qos_conf != NULL));
if (error) {
VLOG_ERR("Failed to set QoS type %s on port %s, returned error: %s",
type, netdev->name, rte_strerror(-error));
} }
ovs_mutex_unlock(&dev->mutex); ovs_mutex_unlock(&dev->mutex);
@@ -2788,6 +2792,15 @@ egress_policer_qos_construct(struct netdev *netdev,
policer->app_srtcm_params.ebs = 0; policer->app_srtcm_params.ebs = 0;
err = rte_meter_srtcm_config(&policer->egress_meter, err = rte_meter_srtcm_config(&policer->egress_meter,
&policer->app_srtcm_params); &policer->app_srtcm_params);
if (err < 0) {
/* Error occurred during rte_meter creation, destroy the policer
* and set the qos configuration for the netdev dpdk to NULL
*/
free(policer);
dev->qos_conf = NULL;
err = -err;
}
rte_spinlock_unlock(&dev->qos_lock); rte_spinlock_unlock(&dev->qos_lock);
return err; return err;
@@ -2818,15 +2831,27 @@ static int
egress_policer_qos_set(struct netdev *netdev, const struct smap *details) egress_policer_qos_set(struct netdev *netdev, const struct smap *details)
{ {
struct egress_policer *policer; struct egress_policer *policer;
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
int err = 0; int err = 0;
policer = egress_policer_get__(netdev); policer = egress_policer_get__(netdev);
rte_spinlock_lock(&dev->qos_lock);
policer->app_srtcm_params.cir = smap_get_ullong(details, "cir", 0); policer->app_srtcm_params.cir = smap_get_ullong(details, "cir", 0);
policer->app_srtcm_params.cbs = smap_get_ullong(details, "cbs", 0); policer->app_srtcm_params.cbs = smap_get_ullong(details, "cbs", 0);
policer->app_srtcm_params.ebs = 0; policer->app_srtcm_params.ebs = 0;
err = rte_meter_srtcm_config(&policer->egress_meter, err = rte_meter_srtcm_config(&policer->egress_meter,
&policer->app_srtcm_params); &policer->app_srtcm_params);
if (err < 0) {
/* Error occurred during rte_meter creation, destroy the policer
* and set the qos configuration for the netdev dpdk to NULL
*/
free(policer);
dev->qos_conf = NULL;
err = -err;
}
rte_spinlock_unlock(&dev->qos_lock);
return err; return err;
} }