From: Qi Zhang <qi.z.zhang@intel.com>
To: thomas@monjalon.net, anatoly.burakov@intel.com
Cc: konstantin.ananyev@intel.com, dev@dpdk.org,
bruce.richardson@intel.com, ferruh.yigit@intel.com,
benjamin.h.shelton@intel.com, narender.vangati@intel.com,
Qi Zhang <qi.z.zhang@intel.com>,
stable@dpdk.org
Subject: [dpdk-stable] [PATCH v9 02/19] bus/pci: fix PCI address compare
Date: Fri, 6 Jul 2018 22:18:09 +0800 [thread overview]
Message-ID: <20180706141826.204044-3-qi.z.zhang@intel.com> (raw)
In-Reply-To: <20180706141826.204044-1-qi.z.zhang@intel.com>
When use memcmp to compare two PCI address, sizeof(struct rte_pci_addr)
is 4 bytes aligned, and it is 8. While only 7 byte of struct rte_pci_addr
is valid. So compare the 8th byte will cause the unexpected result, which
happens when repeatedly attach/detach a device.
Fixes: c752998b5e2e ("pci: introduce library and driver")
Cc: stable@dpdk.org
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
drivers/bus/pci/linux/pci_vfio.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index aeeaa9ed8..dd25c3542 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -43,6 +43,17 @@ static struct rte_tailq_elem rte_vfio_tailq = {
};
EAL_REGISTER_TAILQ(rte_vfio_tailq)
+/* Compair two pci address */
+static int pci_addr_cmp(struct rte_pci_addr *addr1, struct rte_pci_addr *addr2)
+{
+ if (addr1->domain == addr2->domain &&
+ addr1->bus == addr2->bus &&
+ addr1->devid == addr2->devid &&
+ addr1->function == addr2->function)
+ return 0;
+ return 1;
+}
+
int
pci_vfio_read_config(const struct rte_intr_handle *intr_handle,
void *buf, size_t len, off_t offs)
@@ -642,7 +653,7 @@ pci_vfio_unmap_resource(struct rte_pci_device *dev)
vfio_res_list = RTE_TAILQ_CAST(rte_vfio_tailq.head, mapped_pci_res_list);
/* Get vfio_res */
TAILQ_FOREACH(vfio_res, vfio_res_list, next) {
- if (memcmp(&vfio_res->pci_addr, &dev->addr, sizeof(dev->addr)))
+ if (pci_addr_cmp(&vfio_res->pci_addr, &dev->addr))
continue;
break;
}
--
2.13.6
next parent reply other threads:[~2018-07-06 14:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180607123849.14439-1-qi.z.zhang@intel.com>
[not found] ` <20180706141826.204044-1-qi.z.zhang@intel.com>
2018-07-06 14:18 ` Qi Zhang [this message]
[not found] ` <20180709033706.27858-1-qi.z.zhang@intel.com>
2018-07-09 3:36 ` [dpdk-stable] [PATCH v10 " Qi Zhang
[not found] ` <20180711030917.181098-1-qi.z.zhang@intel.com>
2018-07-11 3:09 ` [dpdk-stable] [PATCH v11 " Qi Zhang
[not found] ` <20180711134808.254054-1-qi.z.zhang@intel.com>
2018-07-11 13:47 ` [dpdk-stable] [PATCH v12 " Qi Zhang
[not found] ` <20180712011514.45006-1-qi.z.zhang@intel.com>
2018-07-12 1:14 ` [dpdk-stable] [PATCH v13 " Qi Zhang
2018-07-12 9:24 ` Burakov, Anatoly
2018-07-12 9:32 ` [dpdk-stable] [dpdk-dev] " Gaëtan Rivet
2018-07-12 11:57 ` Zhang, Qi Z
2018-07-12 11:53 ` [dpdk-stable] " Zhang, Qi Z
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180706141826.204044-3-qi.z.zhang@intel.com \
--to=qi.z.zhang@intel.com \
--cc=anatoly.burakov@intel.com \
--cc=benjamin.h.shelton@intel.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=konstantin.ananyev@intel.com \
--cc=narender.vangati@intel.com \
--cc=stable@dpdk.org \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).