* Re: [dpdk-stable] [PATCH v2] net/tap: fix device removal when no queues exist
2018-05-17 9:47 ` Ophir Munk
@ 2018-05-17 12:59 ` Wiles, Keith
2018-05-18 8:38 ` Ophir Munk
2018-05-18 8:26 ` [dpdk-stable] [PATCH v3] " Ophir Munk
2018-05-18 8:27 ` Ophir Munk
2 siblings, 1 reply; 13+ messages in thread
From: Wiles, Keith @ 2018-05-17 12:59 UTC (permalink / raw)
To: Ophir Munk
Cc: dev, Pascal Mazon, Thomas Monjalon, Olga Shern, Shahaf Shuler, stable
> On May 17, 2018, at 2:47 AM, Ophir Munk <ophirmu@mellanox.com> wrote:
>
> TAP device is created following its first queue creation. Multiple
> queues can be added or removed over time. In Linux terminology those
> are file descriptors which are opened or closed over time. As long as
> the number of opened file descriptors is positive - TAP device will
> appear as a Linux device. In case all queues are released (the
> equivalent of all file descriptors being closed) the TAP device will
> be removed. This can lead to abnormalities in different scenarios
> where the TAP device should exist even if all its queues are released.
> In order to make TAP existence independent of its number of queues -
> an extra file descriptor is opened on TAP creation and is closed on
> TAP closure. It's only purpose is to serve as a keep-alive mechanism
> for the TAP device.
>
> Fixes: bf7b7f437b49 ("net/tap: create netdevice during probing")
> Cc: stable@dpdk.org
>
> Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
> ---
> v1:
> Initial release
> v2:
> Reword commit message (a fixing patch)
>
> drivers/net/tap/rte_eth_tap.c | 31 ++++++++++++++++++++++++-------
> drivers/net/tap/rte_eth_tap.h | 1 +
> 2 files changed, 25 insertions(+), 7 deletions(-)
I did not see where ka_fd is set to -1 at startup, just in case we fail before the first open attempt and possible hit the close code in the remove routine. I did not look at the complete driver, but I think it maybe reasonable to add that initial variable setup.
>
> diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
> index c006d07..6901edc 100644
> --- a/drivers/net/tap/rte_eth_tap.c
> +++ b/drivers/net/tap/rte_eth_tap.c
> @@ -929,6 +929,15 @@ tap_dev_close(struct rte_eth_dev *dev)
> ioctl(internals->ioctl_sock, SIOCSIFFLAGS,
> &internals->remote_initial_flags);
> }
> +
> + if (internals->ka_fd != -1) {
> + close(internals->ka_fd);
> + internals->ka_fd = -1;
> + }
> + /*
> + * Since TUN device has no more opened file descriptors
> + * it will be removed from kernel
> + */
> }
>
> static void
> @@ -1561,13 +1570,18 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,
> rte_memcpy(&pmd->eth_addr, mac_addr, sizeof(*mac_addr));
> }
>
> - /* Immediately create the netdevice (this will create the 1st queue). */
> - /* rx queue */
> - if (tap_setup_queue(dev, pmd, 0, 1) == -1)
> - goto error_exit;
> - /* tx queue */
> - if (tap_setup_queue(dev, pmd, 0, 0) == -1)
> + /*
> + * Allocate a TUN device keep-alive file descriptor that will only be
> + * closed when the TUN device itself is closed or removed.
> + * This keep-alive file descriptor will guarantee that the TUN device
> + * exists even when all of its queues are closed
> + */
> + pmd->ka_fd = tun_alloc(pmd);
> + if (pmd->ka_fd < 0) {
> + pmd->ka_fd = -1;
> + TAP_LOG(ERR, "Unable to create %s interface", tuntap_name);
> goto error_exit;
> + }
>
> ifr.ifr_mtu = dev->data->mtu;
> if (tap_ioctl(pmd, SIOCSIFMTU, &ifr, 1, LOCAL_AND_REMOTE) < 0)
> @@ -1961,9 +1975,12 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)
>
> close(internals->ioctl_sock);
> rte_free(eth_dev->data->dev_private);
> -
> rte_eth_dev_release_port(eth_dev);
>
> + if (internals->ka_fd != -1) {
> + close(internals->ka_fd);
> + internals->ka_fd = -1;
> + }
> return 0;
> }
>
> diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h
> index babe42d..575dce4 100644
> --- a/drivers/net/tap/rte_eth_tap.h
> +++ b/drivers/net/tap/rte_eth_tap.h
> @@ -81,6 +81,7 @@ struct pmd_internals {
> struct rx_queue rxq[RTE_PMD_TAP_MAX_QUEUES]; /* List of RX queues */
> struct tx_queue txq[RTE_PMD_TAP_MAX_QUEUES]; /* List of TX queues */
> struct rte_intr_handle intr_handle; /* LSC interrupt handle. */
> + int ka_fd; /* keep-alive file descriptor */
> };
>
> /* tap_intr.c */
> --
> 2.7.4
>
Regards,
Keith
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-stable] [PATCH v2] net/tap: fix device removal when no queues exist
2018-05-17 12:59 ` Wiles, Keith
@ 2018-05-18 8:38 ` Ophir Munk
0 siblings, 0 replies; 13+ messages in thread
From: Ophir Munk @ 2018-05-18 8:38 UTC (permalink / raw)
To: Wiles, Keith
Cc: dev, Pascal Mazon, Thomas Monjalon, Olga Shern, Shahaf Shuler, stable
Hi Keith,
Please find comments inline
> -----Original Message-----
> From: Wiles, Keith [mailto:keith.wiles@intel.com]
> Sent: Thursday, May 17, 2018 4:00 PM
> To: Ophir Munk <ophirmu@mellanox.com>
> Cc: dev@dpdk.org; Pascal Mazon <pascal.mazon@6wind.com>; Thomas
> Monjalon <thomas@monjalon.net>; Olga Shern <olgas@mellanox.com>;
> Shahaf Shuler <shahafs@mellanox.com>; stable@dpdk.org
> Subject: Re: [PATCH v2] net/tap: fix device removal when no queues exist
>
>
>
> > On May 17, 2018, at 2:47 AM, Ophir Munk <ophirmu@mellanox.com>
> wrote:
> >
> > TAP device is created following its first queue creation. Multiple
> > queues can be added or removed over time. In Linux terminology those
> > are file descriptors which are opened or closed over time. As long as
> > the number of opened file descriptors is positive - TAP device will
> > appear as a Linux device. In case all queues are released (the
> > equivalent of all file descriptors being closed) the TAP device will
> > be removed. This can lead to abnormalities in different scenarios
> > where the TAP device should exist even if all its queues are released.
> > In order to make TAP existence independent of its number of queues -
> > an extra file descriptor is opened on TAP creation and is closed on
> > TAP closure. It's only purpose is to serve as a keep-alive mechanism
> > for the TAP device.
> >
> > Fixes: bf7b7f437b49 ("net/tap: create netdevice during probing")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
> > ---
> > v1:
> > Initial release
> > v2:
> > Reword commit message (a fixing patch)
> >
> > drivers/net/tap/rte_eth_tap.c | 31 ++++++++++++++++++++++++-------
> > drivers/net/tap/rte_eth_tap.h | 1 +
> > 2 files changed, 25 insertions(+), 7 deletions(-)
>
> I did not see where ka_fd is set to -1 at startup, just in case we fail before the
> first open attempt and possible hit the close code in the remove routine. I did
> not look at the complete driver, but I think it maybe reasonable to add that
> initial variable setup.
>
Your concern is in place. However, please note that ka_fd is allocated and initialized to 0 as part of private device structure initialization during the call to:
dev = rte_eth_vdev_allocate(vdev, sizeof(*pmd));
Therefore it is guaranteed to be 0 in case we fail before the first open attempt and if we hit the close code we will not be closing anything wrong (closing a 0 fd has no effect).
While reading the code again I have noticed that tun_alloc() always return -1 so no need to reassign ka_fd to -1 after calling tun_alloc. Also I have fixed a typo in the commit message: It's --> Its.
I have sent v3 with the above small changes.
> >
> > diff --git a/drivers/net/tap/rte_eth_tap.c
> > b/drivers/net/tap/rte_eth_tap.c index c006d07..6901edc 100644
> > --- a/drivers/net/tap/rte_eth_tap.c
> > +++ b/drivers/net/tap/rte_eth_tap.c
> > @@ -929,6 +929,15 @@ tap_dev_close(struct rte_eth_dev *dev)
> > ioctl(internals->ioctl_sock, SIOCSIFFLAGS,
> > &internals->remote_initial_flags);
> > }
> > +
> > + if (internals->ka_fd != -1) {
> > + close(internals->ka_fd);
> > + internals->ka_fd = -1;
> > + }
> > + /*
> > + * Since TUN device has no more opened file descriptors
> > + * it will be removed from kernel
> > + */
> > }
> >
> > static void
> > @@ -1561,13 +1570,18 @@ eth_dev_tap_create(struct rte_vdev_device
> *vdev, char *tap_name,
> > rte_memcpy(&pmd->eth_addr, mac_addr,
> sizeof(*mac_addr));
> > }
> >
> > - /* Immediately create the netdevice (this will create the 1st queue).
> */
> > - /* rx queue */
> > - if (tap_setup_queue(dev, pmd, 0, 1) == -1)
> > - goto error_exit;
> > - /* tx queue */
> > - if (tap_setup_queue(dev, pmd, 0, 0) == -1)
> > + /*
> > + * Allocate a TUN device keep-alive file descriptor that will only be
> > + * closed when the TUN device itself is closed or removed.
> > + * This keep-alive file descriptor will guarantee that the TUN device
> > + * exists even when all of its queues are closed
> > + */
> > + pmd->ka_fd = tun_alloc(pmd);
> > + if (pmd->ka_fd < 0) {
> > + pmd->ka_fd = -1;
> > + TAP_LOG(ERR, "Unable to create %s interface",
> tuntap_name);
> > goto error_exit;
> > + }
> >
> > ifr.ifr_mtu = dev->data->mtu;
> > if (tap_ioctl(pmd, SIOCSIFMTU, &ifr, 1, LOCAL_AND_REMOTE) < 0)
> @@
> > -1961,9 +1975,12 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)
> >
> > close(internals->ioctl_sock);
> > rte_free(eth_dev->data->dev_private);
> > -
> > rte_eth_dev_release_port(eth_dev);
> >
> > + if (internals->ka_fd != -1) {
> > + close(internals->ka_fd);
> > + internals->ka_fd = -1;
> > + }
> > return 0;
> > }
> >
> > diff --git a/drivers/net/tap/rte_eth_tap.h
> > b/drivers/net/tap/rte_eth_tap.h index babe42d..575dce4 100644
> > --- a/drivers/net/tap/rte_eth_tap.h
> > +++ b/drivers/net/tap/rte_eth_tap.h
> > @@ -81,6 +81,7 @@ struct pmd_internals {
> > struct rx_queue rxq[RTE_PMD_TAP_MAX_QUEUES]; /* List of RX
> queues */
> > struct tx_queue txq[RTE_PMD_TAP_MAX_QUEUES]; /* List of TX
> queues */
> > struct rte_intr_handle intr_handle; /* LSC interrupt handle. */
> > + int ka_fd; /* keep-alive file descriptor */
> > };
> >
> > /* tap_intr.c */
> > --
> > 2.7.4
> >
>
> Regards,
> Keith
^ permalink raw reply [flat|nested] 13+ messages in thread
* [dpdk-stable] [PATCH v3] net/tap: fix device removal when no queues exist
2018-05-17 9:47 ` Ophir Munk
2018-05-17 12:59 ` Wiles, Keith
@ 2018-05-18 8:26 ` Ophir Munk
2018-05-18 8:27 ` Ophir Munk
2 siblings, 0 replies; 13+ messages in thread
From: Ophir Munk @ 2018-05-18 8:26 UTC (permalink / raw)
To: Ophir Munk; +Cc: stable
TAP device is created following its first queue creation. Multiple
queues can be added or removed over time. In Linux terminology those
are file descriptors which are opened or closed over time. As long as
the number of opened file descriptors is positive - TAP device will
appear as a Linux device. In case all queues are released (the
equivalent of all file descriptors being closed) the TAP device will
be removed. This can lead to abnormalities in different scenarios
where the TAP device should exist even if all its queues are released.
In order to make TAP existence independent of its number of queues -
an extra file descriptor is opened on TAP creation and is closed on
TAP closure. Its only purpose is to serve as a keep-alive mechanism
for the TAP device.
Fixes: bf7b7f437b49 ("net/tap: create netdevice during probing")
Cc: stable@dpdk.org
Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
---
v1:
Initial release
v2:
Reword commit message (a fixing patch)
v3:
Following review comments (return value of ka_fd)
and commit message type fixing
drivers/net/tap/rte_eth_tap.c | 30 +++++++++++++++++++++++-------
drivers/net/tap/rte_eth_tap.h | 1 +
2 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index c006d07..4518a85 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -929,6 +929,15 @@ tap_dev_close(struct rte_eth_dev *dev)
ioctl(internals->ioctl_sock, SIOCSIFFLAGS,
&internals->remote_initial_flags);
}
+
+ if (internals->ka_fd != -1) {
+ close(internals->ka_fd);
+ internals->ka_fd = -1;
+ }
+ /*
+ * Since TUN device has no more opened file descriptors
+ * it will be removed from kernel
+ */
}
static void
@@ -1561,13 +1570,17 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,
rte_memcpy(&pmd->eth_addr, mac_addr, sizeof(*mac_addr));
}
- /* Immediately create the netdevice (this will create the 1st queue). */
- /* rx queue */
- if (tap_setup_queue(dev, pmd, 0, 1) == -1)
- goto error_exit;
- /* tx queue */
- if (tap_setup_queue(dev, pmd, 0, 0) == -1)
+ /*
+ * Allocate a TUN device keep-alive file descriptor that will only be
+ * closed when the TUN device itself is closed or removed.
+ * This keep-alive file descriptor will guarantee that the TUN device
+ * exists even when all of its queues are closed
+ */
+ pmd->ka_fd = tun_alloc(pmd);
+ if (pmd->ka_fd == -1) {
+ TAP_LOG(ERR, "Unable to create %s interface", tuntap_name);
goto error_exit;
+ }
ifr.ifr_mtu = dev->data->mtu;
if (tap_ioctl(pmd, SIOCSIFMTU, &ifr, 1, LOCAL_AND_REMOTE) < 0)
@@ -1961,9 +1974,12 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)
close(internals->ioctl_sock);
rte_free(eth_dev->data->dev_private);
-
rte_eth_dev_release_port(eth_dev);
+ if (internals->ka_fd != -1) {
+ close(internals->ka_fd);
+ internals->ka_fd = -1;
+ }
return 0;
}
diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h
index babe42d..575dce4 100644
--- a/drivers/net/tap/rte_eth_tap.h
+++ b/drivers/net/tap/rte_eth_tap.h
@@ -81,6 +81,7 @@ struct pmd_internals {
struct rx_queue rxq[RTE_PMD_TAP_MAX_QUEUES]; /* List of RX queues */
struct tx_queue txq[RTE_PMD_TAP_MAX_QUEUES]; /* List of TX queues */
struct rte_intr_handle intr_handle; /* LSC interrupt handle. */
+ int ka_fd; /* keep-alive file descriptor */
};
/* tap_intr.c */
--
2.7.4
^ permalink raw reply [flat|nested] 13+ messages in thread* [dpdk-stable] [PATCH v3] net/tap: fix device removal when no queues exist
2018-05-17 9:47 ` Ophir Munk
2018-05-17 12:59 ` Wiles, Keith
2018-05-18 8:26 ` [dpdk-stable] [PATCH v3] " Ophir Munk
@ 2018-05-18 8:27 ` Ophir Munk
2018-05-21 7:52 ` [dpdk-stable] [PATCH v4] " Ophir Munk
2018-05-21 7:54 ` Ophir Munk
2 siblings, 2 replies; 13+ messages in thread
From: Ophir Munk @ 2018-05-18 8:27 UTC (permalink / raw)
To: dev, Pascal Mazon, Keith Wiles
Cc: Thomas Monjalon, Olga Shern, Ophir Munk, Shahaf Shuler, stable
TAP device is created following its first queue creation. Multiple
queues can be added or removed over time. In Linux terminology those
are file descriptors which are opened or closed over time. As long as
the number of opened file descriptors is positive - TAP device will
appear as a Linux device. In case all queues are released (the
equivalent of all file descriptors being closed) the TAP device will
be removed. This can lead to abnormalities in different scenarios
where the TAP device should exist even if all its queues are released.
In order to make TAP existence independent of its number of queues -
an extra file descriptor is opened on TAP creation and is closed on
TAP closure. Its only purpose is to serve as a keep-alive mechanism
for the TAP device.
Fixes: bf7b7f437b49 ("net/tap: create netdevice during probing")
Cc: stable@dpdk.org
Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
---
v1:
Initial release
v2:
Reword commit message (a fixing patch)
v3:
Following review comments (return value of ka_fd)
and commit message typo fixing
drivers/net/tap/rte_eth_tap.c | 30 +++++++++++++++++++++++-------
drivers/net/tap/rte_eth_tap.h | 1 +
2 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index c006d07..4518a85 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -929,6 +929,15 @@ tap_dev_close(struct rte_eth_dev *dev)
ioctl(internals->ioctl_sock, SIOCSIFFLAGS,
&internals->remote_initial_flags);
}
+
+ if (internals->ka_fd != -1) {
+ close(internals->ka_fd);
+ internals->ka_fd = -1;
+ }
+ /*
+ * Since TUN device has no more opened file descriptors
+ * it will be removed from kernel
+ */
}
static void
@@ -1561,13 +1570,17 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,
rte_memcpy(&pmd->eth_addr, mac_addr, sizeof(*mac_addr));
}
- /* Immediately create the netdevice (this will create the 1st queue). */
- /* rx queue */
- if (tap_setup_queue(dev, pmd, 0, 1) == -1)
- goto error_exit;
- /* tx queue */
- if (tap_setup_queue(dev, pmd, 0, 0) == -1)
+ /*
+ * Allocate a TUN device keep-alive file descriptor that will only be
+ * closed when the TUN device itself is closed or removed.
+ * This keep-alive file descriptor will guarantee that the TUN device
+ * exists even when all of its queues are closed
+ */
+ pmd->ka_fd = tun_alloc(pmd);
+ if (pmd->ka_fd == -1) {
+ TAP_LOG(ERR, "Unable to create %s interface", tuntap_name);
goto error_exit;
+ }
ifr.ifr_mtu = dev->data->mtu;
if (tap_ioctl(pmd, SIOCSIFMTU, &ifr, 1, LOCAL_AND_REMOTE) < 0)
@@ -1961,9 +1974,12 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)
close(internals->ioctl_sock);
rte_free(eth_dev->data->dev_private);
-
rte_eth_dev_release_port(eth_dev);
+ if (internals->ka_fd != -1) {
+ close(internals->ka_fd);
+ internals->ka_fd = -1;
+ }
return 0;
}
diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h
index babe42d..575dce4 100644
--- a/drivers/net/tap/rte_eth_tap.h
+++ b/drivers/net/tap/rte_eth_tap.h
@@ -81,6 +81,7 @@ struct pmd_internals {
struct rx_queue rxq[RTE_PMD_TAP_MAX_QUEUES]; /* List of RX queues */
struct tx_queue txq[RTE_PMD_TAP_MAX_QUEUES]; /* List of TX queues */
struct rte_intr_handle intr_handle; /* LSC interrupt handle. */
+ int ka_fd; /* keep-alive file descriptor */
};
/* tap_intr.c */
--
2.7.4
^ permalink raw reply [flat|nested] 13+ messages in thread* [dpdk-stable] [PATCH v4] net/tap: fix device removal when no queues exist
2018-05-18 8:27 ` Ophir Munk
@ 2018-05-21 7:52 ` Ophir Munk
2018-05-21 7:54 ` Ophir Munk
1 sibling, 0 replies; 13+ messages in thread
From: Ophir Munk @ 2018-05-21 7:52 UTC (permalink / raw)
To: Ophir Munk; +Cc: stable
TAP device is created following its first queue creation. Multiple
queues can be added or removed over time. In Linux terminology those
are file descriptors which are opened or closed over time. As long as
the number of opened file descriptors is positive - TAP device will
appear as a Linux device. In case all queues are released (the
equivalent of all file descriptors being closed) the TAP device will
be removed. This can lead to abnormalities in different scenarios
where the TAP device should exist even if all its queues are released.
In order to make TAP existence independent of its number of queues -
an extra file descriptor is opened on TAP creation and is closed on
TAP closure. Its only purpose is to serve as a keep-alive mechanism
for the TAP device.
Fixes: bf7b7f437b49 ("net/tap: create netdevice during probing")
Cc: stable@dpdk.org
Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
---
v1:
Initial release
v2:
Reword commit message (a fixing patch)
v3:
Following review comments (return value of ka_fd)
and commit message typo fixing
v4:
Explicit setting ka_fd = -1 in eth_dev_tap_create() call
drivers/net/tap/rte_eth_tap.c | 31 ++++++++++++++++++++++++-------
drivers/net/tap/rte_eth_tap.h | 1 +
2 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index c006d07..52ef799 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -929,6 +929,15 @@ tap_dev_close(struct rte_eth_dev *dev)
ioctl(internals->ioctl_sock, SIOCSIFFLAGS,
&internals->remote_initial_flags);
}
+
+ if (internals->ka_fd != -1) {
+ close(internals->ka_fd);
+ internals->ka_fd = -1;
+ }
+ /*
+ * Since TUN device has no more opened file descriptors
+ * it will be removed from kernel
+ */
}
static void
@@ -1549,6 +1558,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,
dev->intr_handle = &pmd->intr_handle;
/* Presetup the fds to -1 as being not valid */
+ pmd->ka_fd = -1;
for (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) {
pmd->rxq[i].fd = -1;
pmd->txq[i].fd = -1;
@@ -1561,13 +1571,17 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,
rte_memcpy(&pmd->eth_addr, mac_addr, sizeof(*mac_addr));
}
- /* Immediately create the netdevice (this will create the 1st queue). */
- /* rx queue */
- if (tap_setup_queue(dev, pmd, 0, 1) == -1)
- goto error_exit;
- /* tx queue */
- if (tap_setup_queue(dev, pmd, 0, 0) == -1)
+ /*
+ * Allocate a TUN device keep-alive file descriptor that will only be
+ * closed when the TUN device itself is closed or removed.
+ * This keep-alive file descriptor will guarantee that the TUN device
+ * exists even when all of its queues are closed
+ */
+ pmd->ka_fd = tun_alloc(pmd);
+ if (pmd->ka_fd == -1) {
+ TAP_LOG(ERR, "Unable to create %s interface", tuntap_name);
goto error_exit;
+ }
ifr.ifr_mtu = dev->data->mtu;
if (tap_ioctl(pmd, SIOCSIFMTU, &ifr, 1, LOCAL_AND_REMOTE) < 0)
@@ -1961,9 +1975,12 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)
close(internals->ioctl_sock);
rte_free(eth_dev->data->dev_private);
-
rte_eth_dev_release_port(eth_dev);
+ if (internals->ka_fd != -1) {
+ close(internals->ka_fd);
+ internals->ka_fd = -1;
+ }
return 0;
}
diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h
index babe42d..575dce4 100644
--- a/drivers/net/tap/rte_eth_tap.h
+++ b/drivers/net/tap/rte_eth_tap.h
@@ -81,6 +81,7 @@ struct pmd_internals {
struct rx_queue rxq[RTE_PMD_TAP_MAX_QUEUES]; /* List of RX queues */
struct tx_queue txq[RTE_PMD_TAP_MAX_QUEUES]; /* List of TX queues */
struct rte_intr_handle intr_handle; /* LSC interrupt handle. */
+ int ka_fd; /* keep-alive file descriptor */
};
/* tap_intr.c */
--
2.7.4
^ permalink raw reply [flat|nested] 13+ messages in thread* [dpdk-stable] [PATCH v4] net/tap: fix device removal when no queues exist
2018-05-18 8:27 ` Ophir Munk
2018-05-21 7:52 ` [dpdk-stable] [PATCH v4] " Ophir Munk
@ 2018-05-21 7:54 ` Ophir Munk
2018-05-21 12:52 ` Wiles, Keith
2018-05-23 4:50 ` [dpdk-stable] [dpdk-dev] " Varghese, Vipin
1 sibling, 2 replies; 13+ messages in thread
From: Ophir Munk @ 2018-05-21 7:54 UTC (permalink / raw)
To: dev, Pascal Mazon, Keith Wiles
Cc: Thomas Monjalon, Olga Shern, Ophir Munk, Shahaf Shuler, stable
TAP device is created following its first queue creation. Multiple
queues can be added or removed over time. In Linux terminology those
are file descriptors which are opened or closed over time. As long as
the number of opened file descriptors is positive - TAP device will
appear as a Linux device. In case all queues are released (the
equivalent of all file descriptors being closed) the TAP device will
be removed. This can lead to abnormalities in different scenarios
where the TAP device should exist even if all its queues are released.
In order to make TAP existence independent of its number of queues -
an extra file descriptor is opened on TAP creation and is closed on
TAP closure. Its only purpose is to serve as a keep-alive mechanism
for the TAP device.
Fixes: bf7b7f437b49 ("net/tap: create netdevice during probing")
Cc: stable@dpdk.org
Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
---
v1:
Initial release
v2:
Reword commit message (a fixing patch)
v3:
Following review comments (return value of ka_fd)
and commit message typo fixing
v4:
Explicit setting pmd->ka_fd = -1 in eth_dev_tap_create()
drivers/net/tap/rte_eth_tap.c | 31 ++++++++++++++++++++++++-------
drivers/net/tap/rte_eth_tap.h | 1 +
2 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index c006d07..52ef799 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -929,6 +929,15 @@ tap_dev_close(struct rte_eth_dev *dev)
ioctl(internals->ioctl_sock, SIOCSIFFLAGS,
&internals->remote_initial_flags);
}
+
+ if (internals->ka_fd != -1) {
+ close(internals->ka_fd);
+ internals->ka_fd = -1;
+ }
+ /*
+ * Since TUN device has no more opened file descriptors
+ * it will be removed from kernel
+ */
}
static void
@@ -1549,6 +1558,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,
dev->intr_handle = &pmd->intr_handle;
/* Presetup the fds to -1 as being not valid */
+ pmd->ka_fd = -1;
for (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) {
pmd->rxq[i].fd = -1;
pmd->txq[i].fd = -1;
@@ -1561,13 +1571,17 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,
rte_memcpy(&pmd->eth_addr, mac_addr, sizeof(*mac_addr));
}
- /* Immediately create the netdevice (this will create the 1st queue). */
- /* rx queue */
- if (tap_setup_queue(dev, pmd, 0, 1) == -1)
- goto error_exit;
- /* tx queue */
- if (tap_setup_queue(dev, pmd, 0, 0) == -1)
+ /*
+ * Allocate a TUN device keep-alive file descriptor that will only be
+ * closed when the TUN device itself is closed or removed.
+ * This keep-alive file descriptor will guarantee that the TUN device
+ * exists even when all of its queues are closed
+ */
+ pmd->ka_fd = tun_alloc(pmd);
+ if (pmd->ka_fd == -1) {
+ TAP_LOG(ERR, "Unable to create %s interface", tuntap_name);
goto error_exit;
+ }
ifr.ifr_mtu = dev->data->mtu;
if (tap_ioctl(pmd, SIOCSIFMTU, &ifr, 1, LOCAL_AND_REMOTE) < 0)
@@ -1961,9 +1975,12 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)
close(internals->ioctl_sock);
rte_free(eth_dev->data->dev_private);
-
rte_eth_dev_release_port(eth_dev);
+ if (internals->ka_fd != -1) {
+ close(internals->ka_fd);
+ internals->ka_fd = -1;
+ }
return 0;
}
diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h
index babe42d..575dce4 100644
--- a/drivers/net/tap/rte_eth_tap.h
+++ b/drivers/net/tap/rte_eth_tap.h
@@ -81,6 +81,7 @@ struct pmd_internals {
struct rx_queue rxq[RTE_PMD_TAP_MAX_QUEUES]; /* List of RX queues */
struct tx_queue txq[RTE_PMD_TAP_MAX_QUEUES]; /* List of TX queues */
struct rte_intr_handle intr_handle; /* LSC interrupt handle. */
+ int ka_fd; /* keep-alive file descriptor */
};
/* tap_intr.c */
--
2.7.4
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-stable] [PATCH v4] net/tap: fix device removal when no queues exist
2018-05-21 7:54 ` Ophir Munk
@ 2018-05-21 12:52 ` Wiles, Keith
2018-05-21 15:12 ` Ferruh Yigit
2018-05-23 4:50 ` [dpdk-stable] [dpdk-dev] " Varghese, Vipin
1 sibling, 1 reply; 13+ messages in thread
From: Wiles, Keith @ 2018-05-21 12:52 UTC (permalink / raw)
To: Ophir Munk
Cc: dev, Pascal Mazon, Thomas Monjalon, Olga Shern, Shahaf Shuler, stable
> On May 21, 2018, at 2:54 AM, Ophir Munk <ophirmu@mellanox.com> wrote:
>
> TAP device is created following its first queue creation. Multiple
> queues can be added or removed over time. In Linux terminology those
> are file descriptors which are opened or closed over time. As long as
> the number of opened file descriptors is positive - TAP device will
> appear as a Linux device. In case all queues are released (the
> equivalent of all file descriptors being closed) the TAP device will
> be removed. This can lead to abnormalities in different scenarios
> where the TAP device should exist even if all its queues are released.
> In order to make TAP existence independent of its number of queues -
> an extra file descriptor is opened on TAP creation and is closed on
> TAP closure. Its only purpose is to serve as a keep-alive mechanism
> for the TAP device.
>
> Fixes: bf7b7f437b49 ("net/tap: create netdevice during probing")
> Cc: stable@dpdk.org
>
> Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
> ---
> v1:
> Initial release
> v2:
> Reword commit message (a fixing patch)
> v3:
> Following review comments (return value of ka_fd)
> and commit message typo fixing
> v4:
> Explicit setting pmd->ka_fd = -1 in eth_dev_tap_create()
>
Acked by: Keith Wiles <keith.wiles@intel.com>
Regards,
Keith
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-stable] [PATCH v4] net/tap: fix device removal when no queues exist
2018-05-21 12:52 ` Wiles, Keith
@ 2018-05-21 15:12 ` Ferruh Yigit
0 siblings, 0 replies; 13+ messages in thread
From: Ferruh Yigit @ 2018-05-21 15:12 UTC (permalink / raw)
To: Wiles, Keith, Ophir Munk
Cc: dev, Pascal Mazon, Thomas Monjalon, Olga Shern, Shahaf Shuler, stable
On 5/21/2018 1:52 PM, Wiles, Keith wrote:
>
>
>> On May 21, 2018, at 2:54 AM, Ophir Munk <ophirmu@mellanox.com> wrote:
>>
>> TAP device is created following its first queue creation. Multiple
>> queues can be added or removed over time. In Linux terminology those
>> are file descriptors which are opened or closed over time. As long as
>> the number of opened file descriptors is positive - TAP device will
>> appear as a Linux device. In case all queues are released (the
>> equivalent of all file descriptors being closed) the TAP device will
>> be removed. This can lead to abnormalities in different scenarios
>> where the TAP device should exist even if all its queues are released.
>> In order to make TAP existence independent of its number of queues -
>> an extra file descriptor is opened on TAP creation and is closed on
>> TAP closure. Its only purpose is to serve as a keep-alive mechanism
>> for the TAP device.
>>
>> Fixes: bf7b7f437b49 ("net/tap: create netdevice during probing")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
>> ---
>> v1:
>> Initial release
>> v2:
>> Reword commit message (a fixing patch)
>> v3:
>> Following review comments (return value of ka_fd)
>> and commit message typo fixing
>> v4:
>> Explicit setting pmd->ka_fd = -1 in eth_dev_tap_create()
>>
>
> Acked by: Keith Wiles <keith.wiles@intel.com>
Applied to dpdk-next-net/master, thanks.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [dpdk-stable] [dpdk-dev] [PATCH v4] net/tap: fix device removal when no queues exist
2018-05-21 7:54 ` Ophir Munk
2018-05-21 12:52 ` Wiles, Keith
@ 2018-05-23 4:50 ` Varghese, Vipin
2018-05-23 4:53 ` Wiles, Keith
1 sibling, 1 reply; 13+ messages in thread
From: Varghese, Vipin @ 2018-05-23 4:50 UTC (permalink / raw)
To: Ophir Munk, dev, Pascal Mazon, Wiles, Keith
Cc: Thomas Monjalon, Olga Shern, Shahaf Shuler, stable
Hi Ophir,
One suggestion shared inline to email
<Snipped>
>
> diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index
> c006d07..52ef799 100644
> --- a/drivers/net/tap/rte_eth_tap.c
> +++ b/drivers/net/tap/rte_eth_tap.c
> @@ -929,6 +929,15 @@ tap_dev_close(struct rte_eth_dev *dev)
> ioctl(internals->ioctl_sock, SIOCSIFFLAGS,
> &internals->remote_initial_flags);
> }
> +
> + if (internals->ka_fd != -1) {
> + close(internals->ka_fd);
Do we need to notify the user which fd is been closed via LOG DEBUG?
> + internals->ka_fd = -1;
> + }
> + /*
> + * Since TUN device has no more opened file descriptors
> + * it will be removed from kernel
> + */
> }
>
> static void
> @@ -1549,6 +1558,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev,
> char *tap_name,
> dev->intr_handle = &pmd->intr_handle;
>
> /* Presetup the fds to -1 as being not valid */
> + pmd->ka_fd = -1;
> for (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) {
> pmd->rxq[i].fd = -1;
> pmd->txq[i].fd = -1;
> @@ -1561,13 +1571,17 @@ eth_dev_tap_create(struct rte_vdev_device *vdev,
> char *tap_name,
> rte_memcpy(&pmd->eth_addr, mac_addr,
> sizeof(*mac_addr));
> }
>
> - /* Immediately create the netdevice (this will create the 1st queue). */
> - /* rx queue */
> - if (tap_setup_queue(dev, pmd, 0, 1) == -1)
> - goto error_exit;
> - /* tx queue */
> - if (tap_setup_queue(dev, pmd, 0, 0) == -1)
> + /*
> + * Allocate a TUN device keep-alive file descriptor that will only be
> + * closed when the TUN device itself is closed or removed.
> + * This keep-alive file descriptor will guarantee that the TUN device
> + * exists even when all of its queues are closed
> + */
> + pmd->ka_fd = tun_alloc(pmd);
> + if (pmd->ka_fd == -1) {
> + TAP_LOG(ERR, "Unable to create %s interface", tuntap_name);
> goto error_exit;
> + }
>
> ifr.ifr_mtu = dev->data->mtu;
> if (tap_ioctl(pmd, SIOCSIFMTU, &ifr, 1, LOCAL_AND_REMOTE) < 0) @@
> -1961,9 +1975,12 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)
>
> close(internals->ioctl_sock);
> rte_free(eth_dev->data->dev_private);
> -
> rte_eth_dev_release_port(eth_dev);
>
> + if (internals->ka_fd != -1) {
> + close(internals->ka_fd);
> + internals->ka_fd = -1;
> + }
> return 0;
> }
>
> diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h index
> babe42d..575dce4 100644
> --- a/drivers/net/tap/rte_eth_tap.h
> +++ b/drivers/net/tap/rte_eth_tap.h
> @@ -81,6 +81,7 @@ struct pmd_internals {
> struct rx_queue rxq[RTE_PMD_TAP_MAX_QUEUES]; /* List of RX
> queues */
> struct tx_queue txq[RTE_PMD_TAP_MAX_QUEUES]; /* List of TX queues
> */
> struct rte_intr_handle intr_handle; /* LSC interrupt handle. */
> + int ka_fd; /* keep-alive file descriptor */
> };
>
> /* tap_intr.c */
> --
> 2.7.4
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-stable] [dpdk-dev] [PATCH v4] net/tap: fix device removal when no queues exist
2018-05-23 4:50 ` [dpdk-stable] [dpdk-dev] " Varghese, Vipin
@ 2018-05-23 4:53 ` Wiles, Keith
2018-05-23 5:22 ` Varghese, Vipin
0 siblings, 1 reply; 13+ messages in thread
From: Wiles, Keith @ 2018-05-23 4:53 UTC (permalink / raw)
To: Varghese, Vipin
Cc: Ophir Munk, dev, Pascal Mazon, Thomas Monjalon, Olga Shern,
Shahaf Shuler, stable
> On May 22, 2018, at 11:50 PM, Varghese, Vipin <vipin.varghese@intel.com> wrote:
>
> Hi Ophir,
>
> One suggestion shared inline to email
>
> <Snipped>
>
>>
>> diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index
>> c006d07..52ef799 100644
>> --- a/drivers/net/tap/rte_eth_tap.c
>> +++ b/drivers/net/tap/rte_eth_tap.c
>> @@ -929,6 +929,15 @@ tap_dev_close(struct rte_eth_dev *dev)
>> ioctl(internals->ioctl_sock, SIOCSIFFLAGS,
>> &internals->remote_initial_flags);
>> }
>> +
>> + if (internals->ka_fd != -1) {
>> + close(internals->ka_fd);
>
> Do we need to notify the user which fd is been closed via LOG DEBUG?
Why would we want to have a LOG DEBUG here, it would make the debug output a bit chatty IMO. I mean you could have one, but it seems ok as it is to me.
>
>> + internals->ka_fd = -1;
>> + }
>> + /*
>> + * Since TUN device has no more opened file descriptors
>> + * it will be removed from kernel
>> + */
>> }
>>
>> static void
>> @@ -1549,6 +1558,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev,
>> char *tap_name,
>> dev->intr_handle = &pmd->intr_handle;
>>
>> /* Presetup the fds to -1 as being not valid */
>> + pmd->ka_fd = -1;
>> for (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) {
>> pmd->rxq[i].fd = -1;
>> pmd->txq[i].fd = -1;
>> @@ -1561,13 +1571,17 @@ eth_dev_tap_create(struct rte_vdev_device *vdev,
>> char *tap_name,
>> rte_memcpy(&pmd->eth_addr, mac_addr,
>> sizeof(*mac_addr));
>> }
>>
>> - /* Immediately create the netdevice (this will create the 1st queue). */
>> - /* rx queue */
>> - if (tap_setup_queue(dev, pmd, 0, 1) == -1)
>> - goto error_exit;
>> - /* tx queue */
>> - if (tap_setup_queue(dev, pmd, 0, 0) == -1)
>> + /*
>> + * Allocate a TUN device keep-alive file descriptor that will only be
>> + * closed when the TUN device itself is closed or removed.
>> + * This keep-alive file descriptor will guarantee that the TUN device
>> + * exists even when all of its queues are closed
>> + */
>> + pmd->ka_fd = tun_alloc(pmd);
>> + if (pmd->ka_fd == -1) {
>> + TAP_LOG(ERR, "Unable to create %s interface", tuntap_name);
>> goto error_exit;
>> + }
>>
>> ifr.ifr_mtu = dev->data->mtu;
>> if (tap_ioctl(pmd, SIOCSIFMTU, &ifr, 1, LOCAL_AND_REMOTE) < 0) @@
>> -1961,9 +1975,12 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)
>>
>> close(internals->ioctl_sock);
>> rte_free(eth_dev->data->dev_private);
>> -
>> rte_eth_dev_release_port(eth_dev);
>>
>> + if (internals->ka_fd != -1) {
>> + close(internals->ka_fd);
>> + internals->ka_fd = -1;
>> + }
>> return 0;
>> }
>>
>> diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h index
>> babe42d..575dce4 100644
>> --- a/drivers/net/tap/rte_eth_tap.h
>> +++ b/drivers/net/tap/rte_eth_tap.h
>> @@ -81,6 +81,7 @@ struct pmd_internals {
>> struct rx_queue rxq[RTE_PMD_TAP_MAX_QUEUES]; /* List of RX
>> queues */
>> struct tx_queue txq[RTE_PMD_TAP_MAX_QUEUES]; /* List of TX queues
>> */
>> struct rte_intr_handle intr_handle; /* LSC interrupt handle. */
>> + int ka_fd; /* keep-alive file descriptor */
>> };
>>
>> /* tap_intr.c */
>> --
>> 2.7.4
>
Regards,
Keith
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-stable] [dpdk-dev] [PATCH v4] net/tap: fix device removal when no queues exist
2018-05-23 4:53 ` Wiles, Keith
@ 2018-05-23 5:22 ` Varghese, Vipin
0 siblings, 0 replies; 13+ messages in thread
From: Varghese, Vipin @ 2018-05-23 5:22 UTC (permalink / raw)
To: Wiles, Keith
Cc: Ophir Munk, dev, Pascal Mazon, Thomas Monjalon, Olga Shern,
Shahaf Shuler, stable
Sure, shared a suggestion. If not required can drop the same.
> -----Original Message-----
> From: Wiles, Keith
> Sent: Wednesday, May 23, 2018 10:24 AM
> To: Varghese, Vipin <vipin.varghese@intel.com>
> Cc: Ophir Munk <ophirmu@mellanox.com>; dev@dpdk.org; Pascal Mazon
> <pascal.mazon@6wind.com>; Thomas Monjalon <thomas@monjalon.net>;
> Olga Shern <olgas@mellanox.com>; Shahaf Shuler <shahafs@mellanox.com>;
> stable@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v4] net/tap: fix device removal when no queues
> exist
>
>
>
> > On May 22, 2018, at 11:50 PM, Varghese, Vipin <vipin.varghese@intel.com>
> wrote:
> >
> > Hi Ophir,
> >
> > One suggestion shared inline to email
> >
> > <Snipped>
> >
> >>
> >> diff --git a/drivers/net/tap/rte_eth_tap.c
> >> b/drivers/net/tap/rte_eth_tap.c index
> >> c006d07..52ef799 100644
> >> --- a/drivers/net/tap/rte_eth_tap.c
> >> +++ b/drivers/net/tap/rte_eth_tap.c
> >> @@ -929,6 +929,15 @@ tap_dev_close(struct rte_eth_dev *dev)
> >> ioctl(internals->ioctl_sock, SIOCSIFFLAGS,
> >> &internals->remote_initial_flags);
> >> }
> >> +
> >> + if (internals->ka_fd != -1) {
> >> + close(internals->ka_fd);
> >
> > Do we need to notify the user which fd is been closed via LOG DEBUG?
>
> Why would we want to have a LOG DEBUG here, it would make the debug
> output a bit chatty IMO. I mean you could have one, but it seems ok as it is to
> me.
>
> >
> >> + internals->ka_fd = -1;
> >> + }
> >> + /*
> >> + * Since TUN device has no more opened file descriptors
> >> + * it will be removed from kernel
> >> + */
> >> }
> >>
> >> static void
> >> @@ -1549,6 +1558,7 @@ eth_dev_tap_create(struct rte_vdev_device
> >> *vdev, char *tap_name,
> >> dev->intr_handle = &pmd->intr_handle;
> >>
> >> /* Presetup the fds to -1 as being not valid */
> >> + pmd->ka_fd = -1;
> >> for (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) {
> >> pmd->rxq[i].fd = -1;
> >> pmd->txq[i].fd = -1;
> >> @@ -1561,13 +1571,17 @@ eth_dev_tap_create(struct rte_vdev_device
> >> *vdev, char *tap_name,
> >> rte_memcpy(&pmd->eth_addr, mac_addr,
> sizeof(*mac_addr));
> >> }
> >>
> >> - /* Immediately create the netdevice (this will create the 1st queue). */
> >> - /* rx queue */
> >> - if (tap_setup_queue(dev, pmd, 0, 1) == -1)
> >> - goto error_exit;
> >> - /* tx queue */
> >> - if (tap_setup_queue(dev, pmd, 0, 0) == -1)
> >> + /*
> >> + * Allocate a TUN device keep-alive file descriptor that will only be
> >> + * closed when the TUN device itself is closed or removed.
> >> + * This keep-alive file descriptor will guarantee that the TUN device
> >> + * exists even when all of its queues are closed
> >> + */
> >> + pmd->ka_fd = tun_alloc(pmd);
> >> + if (pmd->ka_fd == -1) {
> >> + TAP_LOG(ERR, "Unable to create %s interface", tuntap_name);
> >> goto error_exit;
> >> + }
> >>
> >> ifr.ifr_mtu = dev->data->mtu;
> >> if (tap_ioctl(pmd, SIOCSIFMTU, &ifr, 1, LOCAL_AND_REMOTE) < 0) @@
> >> -1961,9 +1975,12 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)
> >>
> >> close(internals->ioctl_sock);
> >> rte_free(eth_dev->data->dev_private);
> >> -
> >> rte_eth_dev_release_port(eth_dev);
> >>
> >> + if (internals->ka_fd != -1) {
> >> + close(internals->ka_fd);
> >> + internals->ka_fd = -1;
> >> + }
> >> return 0;
> >> }
> >>
> >> diff --git a/drivers/net/tap/rte_eth_tap.h
> >> b/drivers/net/tap/rte_eth_tap.h index
> >> babe42d..575dce4 100644
> >> --- a/drivers/net/tap/rte_eth_tap.h
> >> +++ b/drivers/net/tap/rte_eth_tap.h
> >> @@ -81,6 +81,7 @@ struct pmd_internals {
> >> struct rx_queue rxq[RTE_PMD_TAP_MAX_QUEUES]; /* List of RX
> queues */
> >> struct tx_queue txq[RTE_PMD_TAP_MAX_QUEUES]; /* List of TX queues
> */
> >> struct rte_intr_handle intr_handle; /* LSC interrupt handle. */
> >> + int ka_fd; /* keep-alive file descriptor */
> >> };
> >>
> >> /* tap_intr.c */
> >> --
> >> 2.7.4
> >
>
> Regards,
> Keith
^ permalink raw reply [flat|nested] 13+ messages in thread