mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-02 23:35:27 +00:00
Code Issues Releases Wiki Activity

netdev-dpdk: Configure flow control only when necessary.

Browse Source 
It is not necessary to touch the physical device each time, if the
configuration has not been changed. Also, few style issues fixed.

Thread-safety annotation added to 'dpdk_set_rxq_config()'. It was
missed while previous refactoring of the flow control configuration.

Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Tested-by: Sugesh Chandran <sugesh.chandran@intel.com>
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
This commit is contained in:
Ilya Maximets
2016-09-30 10:48:45 +03:00
committed by Daniele Di Proietto
parent b685696b8c
commit b614c894ee
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/netdev-dpdk.c
View File

@@ -1095,6 +1095,7 @@ netdev_dpdk_get_config(const struct netdev *netdev, struct smap *args)
static void static void
dpdk_set_rxq_config(struct netdev_dpdk *dev, const struct smap *args) dpdk_set_rxq_config(struct netdev_dpdk *dev, const struct smap *args)
OVS_REQUIRES(dev->mutex)
{ {
int new_n_rxq; int new_n_rxq;
@@ -1126,6 +1127,12 @@ static int
netdev_dpdk_set_config(struct netdev *netdev, const struct smap *args) netdev_dpdk_set_config(struct netdev *netdev, const struct smap *args)
{ {
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev); struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
bool rx_fc_en, tx_fc_en, autoneg;
enum rte_eth_fc_mode fc_mode;
static const enum rte_eth_fc_mode fc_mode_set[2][2] = {
{RTE_FC_NONE, RTE_FC_TX_PAUSE},
{RTE_FC_RX_PAUSE, RTE_FC_FULL }
};
ovs_mutex_lock(&dev->mutex); ovs_mutex_lock(&dev->mutex);
@@ -1138,19 +1145,16 @@ netdev_dpdk_set_config(struct netdev *netdev, const struct smap *args)
NIC_PORT_DEFAULT_TXQ_SIZE, NIC_PORT_DEFAULT_TXQ_SIZE,
&dev->requested_txq_size); &dev->requested_txq_size);
/* Flow control support is only available for DPDK Ethernet ports. */
bool rx_fc_en = false;
bool tx_fc_en = false;
enum rte_eth_fc_mode fc_mode_set[2][2] =
{{RTE_FC_NONE, RTE_FC_TX_PAUSE},
{RTE_FC_RX_PAUSE, RTE_FC_FULL}
};
rx_fc_en = smap_get_bool(args, "rx-flow-ctrl", false); rx_fc_en = smap_get_bool(args, "rx-flow-ctrl", false);
tx_fc_en = smap_get_bool(args, "tx-flow-ctrl", false); tx_fc_en = smap_get_bool(args, "tx-flow-ctrl", false);
dev->fc_conf.autoneg = smap_get_bool(args, "flow-ctrl-autoneg", false); autoneg = smap_get_bool(args, "flow-ctrl-autoneg", false);
dev->fc_conf.mode = fc_mode_set[tx_fc_en][rx_fc_en];
fc_mode = fc_mode_set[tx_fc_en][rx_fc_en];
if (dev->fc_conf.mode != fc_mode || autoneg != dev->fc_conf.autoneg) {
dev->fc_conf.mode = fc_mode;
dev->fc_conf.autoneg = autoneg;
dpdk_eth_flow_ctrl_setup(dev); dpdk_eth_flow_ctrl_setup(dev);
}
ovs_mutex_unlock(&dev->mutex); ovs_mutex_unlock(&dev->mutex);