From: Ferruh Yigit <ferruh.yigit@intel.com>
To: Thomas Monjalon <thomas@monjalon.net>
Cc: dev@dpdk.org, Ferruh Yigit <ferruh.yigit@intel.com>,
stable@dpdk.org, Jianfeng Tan <jianfeng.tan@intel.com>,
Jingjing Wu <jingjing.wu@intel.com>,
Shijith Thotton <shijith.thotton@caviumnetworks.com>,
Gregory Etelson <gregory@weka.io>,
Harish Patil <harish.patil@cavium.com>,
George Prekas <george.prekas@epfl.ch>,
Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>,
Rasesh Mody <rasesh.mody@cavium.com>,
Lee Roberts <lee.roberts@hpe.com>,
Stephen Hemminger <stephen@networkplumber.org>
Subject: [dpdk-dev] [PATCH v2] igb_uio: prevent reset for a list of devices
Date: Mon, 6 Nov 2017 18:48:15 +0000 [thread overview]
Message-ID: <20171106184815.9953-1-ferruh.yigit@intel.com> (raw)
In-Reply-To: <20171103223822.28852-1-ferruh.yigit@intel.com>
Some devices are having problem on device reset that happens during DPDK
application exit [1].
Create a static list of devices and exclude them from device reset.
[1]
http://dpdk.org/ml/archives/dev/2017-November/080927.html
Fixes: b58eedfc7dd5 ("igb_uio: issue FLR during open and release of device file")
Cc: stable@dpdk.org
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
Cc: Jianfeng Tan <jianfeng.tan@intel.com>
Cc: Jingjing Wu <jingjing.wu@intel.com>
Cc: Shijith Thotton <shijith.thotton@caviumnetworks.com>
Cc: Gregory Etelson <gregory@weka.io>
Cc: Harish Patil <harish.patil@cavium.com>
Cc: George Prekas <george.prekas@epfl.ch>
Cc: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
Cc: Rasesh Mody <rasesh.mody@cavium.com>
Cc: Lee Roberts <lee.roberts@hpe.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
This is alternative approach to
http://dpdk.org/dev/patchwork/patch/31144/
v2:
* more concise function, no change in functionality
---
lib/librte_eal/linuxapp/igb_uio/compat.h | 19 ++++++++++++++++++-
lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 8 +++++++-
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/lib/librte_eal/linuxapp/igb_uio/compat.h b/lib/librte_eal/linuxapp/igb_uio/compat.h
index 30508f35c..5d7223124 100644
--- a/lib/librte_eal/linuxapp/igb_uio/compat.h
+++ b/lib/librte_eal/linuxapp/igb_uio/compat.h
@@ -133,4 +133,21 @@ static bool pci_check_and_mask_intx(struct pci_dev *pdev)
#define HAVE_PCI_MSI_MASK_IRQ 1
#endif
-
+#define BROADCOM_PCI_VENDOR_ID 0x14E4
+static const struct pci_device_id no_reset_pci_tbl[] = {
+ { PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, 0x168a) }, /* 57800 */
+ { PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, 0x164f) }, /* 57711 */
+ { PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, 0x168e) }, /* 57810 */
+ { PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, 0x163d) }, /* 57811 */
+ { PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, 0x168d) }, /* 57840_OBS */
+ { PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, 0x16a1) }, /* 57840_4_10 */
+ { PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, 0x16a2) }, /* 57840_2_20 */
+ { PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, 0x16ae) }, /* 57810_MF */
+ { PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, 0x163e) }, /* 57811_MF */
+ { PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, 0x16a4) }, /* 57840_MF */
+ { PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, 0x16a9) }, /* 57800_VF */
+ { PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, 0x16af) }, /* 57810_VF */
+ { PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, 0x163f) }, /* 57811_VF */
+ { PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, 0x16ad) }, /* 57840_VF */
+ { 0 },
+};
diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
index fd320d87d..037e02267 100644
--- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
+++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
@@ -348,6 +348,11 @@ igbuio_pci_open(struct uio_info *info, struct inode *inode)
return 0;
}
+static bool is_device_excluded_from_reset(struct pci_dev *pdev)
+{
+ return !!pci_match_id(no_reset_pci_tbl, pdev);
+}
+
static int
igbuio_pci_release(struct uio_info *info, struct inode *inode)
{
@@ -360,7 +365,8 @@ igbuio_pci_release(struct uio_info *info, struct inode *inode)
/* stop the device from further DMA */
pci_clear_master(dev);
- pci_reset_function(dev);
+ if (!is_device_excluded_from_reset(dev))
+ pci_reset_function(dev);
return 0;
}
--
2.13.6
next prev parent reply other threads:[~2017-11-06 18:48 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-03 22:38 [dpdk-dev] [PATCH] " Ferruh Yigit
2017-11-03 23:03 ` Thomas Monjalon
2017-11-04 0:56 ` Mody, Rasesh
2017-11-06 18:48 ` Ferruh Yigit [this message]
2017-11-06 23:55 ` [dpdk-dev] [dpdk-stable] [PATCH v2] " Thomas Monjalon
2017-11-07 11:50 ` Chas Williams
2017-11-07 13:02 ` Thomas Monjalon
2017-11-07 18:12 ` Chas Williams
2017-11-07 18:49 ` Ferruh Yigit
2017-11-07 20:47 ` Chas Williams
2017-11-07 22:26 ` Ferruh Yigit
2017-11-08 12:00 ` Chas Williams
2017-11-10 1:40 ` Ferruh Yigit
2017-11-13 23:46 ` Stephen Hemminger
2017-11-07 13:13 ` Stephen Hemminger
2017-11-07 18:14 ` Chas Williams
2017-11-09 17:20 ` [dpdk-dev] ugb_uio: r3.8xlarge bind failure Gregory Etelson
2017-11-10 1:42 ` Ferruh Yigit
2017-11-10 2:11 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2017-11-10 6:36 ` [dpdk-dev] " Gregory Etelson
2017-11-15 15:44 ` Ferruh Yigit
2017-11-15 16:30 ` Gregory Etelson
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=20171106184815.9953-1-ferruh.yigit@intel.com \
--to=ferruh.yigit@intel.com \
--cc=dev@dpdk.org \
--cc=george.prekas@epfl.ch \
--cc=gregory@weka.io \
--cc=harish.patil@cavium.com \
--cc=jianfeng.tan@intel.com \
--cc=jingjing.wu@intel.com \
--cc=lee.roberts@hpe.com \
--cc=rasesh.mody@cavium.com \
--cc=sergio.gonzalez.monroy@intel.com \
--cc=shijith.thotton@caviumnetworks.com \
--cc=stable@dpdk.org \
--cc=stephen@networkplumber.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).