[dpdk-dev] [PATCH] pci: fix closing an unopened file descriptor
Thomas Monjalon
thomas.monjalon at 6wind.com
Thu Sep 12 17:28:46 CEST 2013
04/09/2013 09:34, Tetsuya Mukawa :
> If CONFIG_RTE_EAL_UNBIND_PORTS is set and virtio-net is used, an unopened
> file descriptor will be illegally closed in the finalized phase of EAL.
> The fix adds a correct initial value to the file descriptor, and check it
> before closing it.
>
> Signed-off-by: Tetsuya Mukawa <mukawa at igel.co.jp>
Thanks for the patch.
I have reproduced the issue only once.
It seems that fd 0 is open most of the time.
But the patch seems OK so I applied it with light modifications:
---
pci: fix closing an unopened file descriptor
If CONFIG_RTE_EAL_UNBIND_PORTS is set and a non Intel PMD is used, an unopened
file descriptor will be illegally closed in the finalized phase of EAL.
The fix adds a correct initial value to the file descriptor, and check it
before closing it.
Signed-off-by: Tetsuya Mukawa <mukawa at igel.co.jp>
Acked-by: Thomas Monjalon <thomas.monjalon at 6wind.com>
--- a/lib/librte_eal/linuxapp/eal/eal_pci.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci.c
@@ -514,6 +514,7 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t
bus,
}
memset(dev, 0, sizeof(*dev));
+ dev->intr_handle.fd = -1;
dev->addr.domain = domain;
dev->addr.bus = bus;
dev->addr.devid = devid;
@@ -718,7 +719,7 @@ pci_exit_process(struct rte_pci_device *dev)
RTE_LOG(ERR, EAL, "Error with munmap\n");
return -1;
}
- if (close(dev->intr_handle.fd) == -1){
+ if ((dev->intr_handle.fd != -1) && (close(dev->intr_handle.fd) == -1)) {
RTE_LOG(ERR, EAL, "Error closing interrupt handle\n");
return -1;
}
More information about the dev
mailing list