From 0b3e4ab9bf96aba051f9fce88062250dc86ee328 Mon Sep 17 00:00:00 2001 From: Pascal Mazon Date: Wed, 22 Mar 2017 09:40:00 +0100 Subject: [PATCH] net/tap: improve link update Reflect device link status according to the state of the tap netdevice and the remote netdevice (if any). If both are UP and RUNNING, then the device link status is set to ETH_LINK_UP, otherwise ETH_LINK_DOWN. Signed-off-by: Pascal Mazon Acked-by: Keith Wiles --- drivers/net/tap/rte_eth_tap.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 1570aef297..54122fd13c 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -443,6 +443,14 @@ tap_ioctl(struct pmd_internals *pmd, unsigned long request, * If there is a remote netdevice, apply ioctl on it, then apply it on * the tap netdevice. */ + if (request == SIOCGIFFLAGS && !set) { + /* + * Special case for getting flags. If set is given, + * then return the flags from the remote netdevice only. + * Otherwise return the flags from the tap netdevice. + */ + remote = 0; + } apply: if (remote) snprintf(ifr->ifr_name, IFNAMSIZ, "%s", pmd->remote_iface); @@ -458,6 +466,10 @@ apply: else ifr->ifr_flags &= ~req_flags; break; + case SIOCGIFFLAGS: + if (remote && set) + remote = 0; /* don't loop */ + break; case SIOCGIFHWADDR: /* Set remote MAC on the tap netdevice */ if (!remote && pmd->remote_if_index) { @@ -674,9 +686,25 @@ tap_tx_queue_release(void *queue) } static int -tap_link_update(struct rte_eth_dev *dev __rte_unused, - int wait_to_complete __rte_unused) +tap_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused) { + struct rte_eth_link *dev_link = &dev->data->dev_link; + struct pmd_internals *pmd = dev->data->dev_private; + struct ifreq ifr = { .ifr_flags = 0 }; + + if (pmd->remote_if_index) { + tap_ioctl(pmd, SIOCGIFFLAGS, &ifr, 1); + if (!(ifr.ifr_flags & IFF_UP) || + !(ifr.ifr_flags & IFF_RUNNING)) { + dev_link->link_status = ETH_LINK_DOWN; + return 0; + } + } + tap_ioctl(pmd, SIOCGIFFLAGS, &ifr, 0); + dev_link->link_status = + ((ifr.ifr_flags & IFF_UP) && (ifr.ifr_flags & IFF_RUNNING) ? + ETH_LINK_UP : + ETH_LINK_DOWN); return 0; } -- 2.20.1