d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/tap: restore state of remote device when closing

Browse Source 
When exiting a DPDK application, the TAP remote was left
with the link down even if it was initially up.

The device flags of the remote netdevice are saved when probing,
and restored when calling the close function.
The remote state is not set down when calling the stop function anymore.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Pascal Mazon <pascal.mazon@6wind.com>
This commit is contained in:
Thomas Monjalon 2017-06-27 14:33:15 +02:00 committed by Ferruh Yigit
parent 856ceb331b
commit 4810d3af83
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/tap/rte_eth_tap.c
View File

@ -569,7 +569,7 @@ tap_link_set_down(struct rte_eth_dev *dev)
struct ifreq ifr = { .ifr_flags = IFF_UP }; struct ifreq ifr = { .ifr_flags = IFF_UP };
dev->data->dev_link.link_status = ETH_LINK_DOWN; dev->data->dev_link.link_status = ETH_LINK_DOWN;
return tap_ioctl(pmd, SIOCSIFFLAGS, &ifr, 0, LOCAL_AND_REMOTE); return tap_ioctl(pmd, SIOCSIFFLAGS, &ifr, 0, LOCAL_ONLY);
} }
static int static int
@ -735,6 +735,12 @@ tap_dev_close(struct rte_eth_dev *dev)
internals->rxq[i].fd = -1; internals->rxq[i].fd = -1;
internals->txq[i].fd = -1; internals->txq[i].fd = -1;
} }
if (internals->remote_if_index) {
/* Restore initial remote state */
ioctl(internals->ioctl_sock, SIOCSIFFLAGS,
&internals->remote_initial_flags);
}
} }
static void static void
@ -1320,6 +1326,11 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,
} }
snprintf(pmd->remote_iface, RTE_ETH_NAME_MAX_LEN, snprintf(pmd->remote_iface, RTE_ETH_NAME_MAX_LEN,
"%s", remote_iface); "%s", remote_iface);
/* Save state of remote device */
tap_ioctl(pmd, SIOCGIFFLAGS, &pmd->remote_initial_flags, 0, REMOTE_ONLY);
/* Replicate remote MAC address */
if (tap_ioctl(pmd, SIOCGIFHWADDR, &ifr, 0, REMOTE_ONLY) < 0) { if (tap_ioctl(pmd, SIOCGIFHWADDR, &ifr, 0, REMOTE_ONLY) < 0) {
RTE_LOG(ERR, PMD, "%s: failed to get %s MAC address.", RTE_LOG(ERR, PMD, "%s: failed to get %s MAC address.",
pmd->name, pmd->remote_iface); pmd->name, pmd->remote_iface);

2
drivers/net/tap/rte_eth_tap.h
View File

@ -37,6 +37,7 @@
#include <sys/queue.h> #include <sys/queue.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <inttypes.h> #include <inttypes.h>
#include <net/if.h>
#include <linux/if_tun.h> #include <linux/if_tun.h>
@ -83,6 +84,7 @@ struct pmd_internals {
char name[RTE_ETH_NAME_MAX_LEN]; /* Internal Tap device name */ char name[RTE_ETH_NAME_MAX_LEN]; /* Internal Tap device name */
uint16_t nb_queues; /* Number of queues supported */ uint16_t nb_queues; /* Number of queues supported */
struct ether_addr eth_addr; /* Mac address of the device port */ struct ether_addr eth_addr; /* Mac address of the device port */
struct ifreq remote_initial_flags; /* Remote netdevice flags on init */
int remote_if_index; /* remote netdevice IF_INDEX */ int remote_if_index; /* remote netdevice IF_INDEX */
int if_index; /* IF_INDEX for the port */ int if_index; /* IF_INDEX for the port */
int ioctl_sock; /* socket for ioctl calls */ int ioctl_sock; /* socket for ioctl calls */