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

netdev-dpdk: Fix netdev_dpdk_get_features().

Browse Source 
This commit fixes netdev_dpdk_get_features() by initializing a bitmap
that represents current features to zero and accounting for non defined
link speed values in the OpenFlow spec.

The current approach for retrieving netdev dpdk features uses a
pointer allocated in the stack without being initialized. As such there
is no guarantee that the bitmap will be accurate. Fix this by declaring
and initializing local variable 'feature' to be used when building the
bitmap, with its value then assigned to the pointer. Also account for
link speeds not defined in the OpenFlow spec by defaulting to
NETDEV_F_OTHER for undefined link speeds.

Fixes: 8a9562d21a ("dpif-netdev: Add DPDK netdev.")
Acked-by: Ilya Maximets <i.maximets@samsung.com>
Co-authored-by: Flavio Leitner <fbl@sysclose.org>
Signed-off-by: Flavio Leitner <fbl@sysclose.org>
Signed-off-by: Ian Stokes <ian.stokes@intel.com>
This commit is contained in:
Ian Stokes
2018-10-24 11:35:17 +01:00
parent 6c95dbf96b
commit dfcb5b8ad5
1 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
lib/netdev-dpdk.c
View File

@@ -2707,43 +2707,57 @@ netdev_dpdk_get_features(const struct netdev *netdev,
{
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
struct rte_eth_link link;
uint32_t feature = 0;
ovs_mutex_lock(&dev->mutex);
link = dev->link;
ovs_mutex_unlock(&dev->mutex);
if (link.link_duplex == ETH_LINK_HALF_DUPLEX) {
if (link.link_speed == ETH_SPEED_NUM_10M) {
*current = NETDEV_F_10MB_HD;
/* Match against OpenFlow defined link speed values. */
if (link.link_duplex == ETH_LINK_FULL_DUPLEX) {
switch (link.link_speed) {
case ETH_SPEED_NUM_10M:
feature |= NETDEV_F_10MB_FD;
break;
case ETH_SPEED_NUM_100M:
feature |= NETDEV_F_100MB_FD;
break;
case ETH_SPEED_NUM_1G:
feature |= NETDEV_F_1GB_FD;
break;
case ETH_SPEED_NUM_10G:
feature |= NETDEV_F_10GB_FD;
break;
case ETH_SPEED_NUM_40G:
feature |= NETDEV_F_40GB_FD;
break;
case ETH_SPEED_NUM_100G:
feature |= NETDEV_F_100GB_FD;
break;
default:
feature |= NETDEV_F_OTHER;
}
if (link.link_speed == ETH_SPEED_NUM_100M) {
*current = NETDEV_F_100MB_HD;
}
if (link.link_speed == ETH_SPEED_NUM_1G) {
*current = NETDEV_F_1GB_HD;
}
} else if (link.link_duplex == ETH_LINK_FULL_DUPLEX) {
if (link.link_speed == ETH_SPEED_NUM_10M) {
*current = NETDEV_F_10MB_FD;
}
if (link.link_speed == ETH_SPEED_NUM_100M) {
*current = NETDEV_F_100MB_FD;
}
if (link.link_speed == ETH_SPEED_NUM_1G) {
*current = NETDEV_F_1GB_FD;
}
if (link.link_speed == ETH_SPEED_NUM_10G) {
*current = NETDEV_F_10GB_FD;
}
if (link.link_speed == ETH_SPEED_NUM_40G) {
*current = NETDEV_F_40GB_FD;
} else if (link.link_duplex == ETH_LINK_HALF_DUPLEX) {
switch (link.link_speed) {
case ETH_SPEED_NUM_10M:
feature |= NETDEV_F_10MB_HD;
break;
case ETH_SPEED_NUM_100M:
feature |= NETDEV_F_100MB_HD;
break;
case ETH_SPEED_NUM_1G:
feature |= NETDEV_F_1GB_HD;
break;
default:
feature |= NETDEV_F_OTHER;
}
}
if (link.link_autoneg) {
*current |= NETDEV_F_AUTONEG;
feature |= NETDEV_F_AUTONEG;
}
*current = feature;
*advertised = *supported = *peer = 0;
return 0;