summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorMatthew Smith <mgsmith@netgate.com>2020-01-31 15:39:21 -0600
committerDamjan Marion <dmarion@me.com>2020-02-04 09:43:43 +0000
commit0860b2e19365c092f10dd1ce639caaded0e87ded (patch)
tree59502518cc0e34409e97f92688c6735bdab8078b /build
parent8af24b145ce13f03f63250a0fcc0fa3c3bb2adab (diff)
dpdk: patch ixgbe driver to solve race condition
Type: fix Some fiber ports that are managed by the ixgbe PMD have the possibility to get into a state where link can never be brought up. This patch should fix it and will be submitted to upstream DPDK. Change-Id: Ia4d0df2e70d098b2151e513b96e8bd742151e8ce Signed-off-by: Matthew Smith <mgsmith@netgate.com>
Diffstat (limited to 'build')
-rw-r--r--build/external/patches/dpdk_19.08/0001-ixgbe-fix-link-state-timing-issue-on-fiber-ports.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/build/external/patches/dpdk_19.08/0001-ixgbe-fix-link-state-timing-issue-on-fiber-ports.patch b/build/external/patches/dpdk_19.08/0001-ixgbe-fix-link-state-timing-issue-on-fiber-ports.patch
new file mode 100644
index 00000000000..67a6a6a4221
--- /dev/null
+++ b/build/external/patches/dpdk_19.08/0001-ixgbe-fix-link-state-timing-issue-on-fiber-ports.patch
@@ -0,0 +1,49 @@
+From 0b12d6f9be7fe4101223491716d291ad1bf6ec33 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <mgsmith@netgate.com>
+Date: Fri, 31 Jan 2020 11:36:21 -0600
+Subject: [PATCH] ixgbe: fix link state timing issue on fiber ports
+
+With some models of fiber ports (e.g. X552 device ID 0x15ac), it
+is possible when a port is started to experience a timing issue
+which prevents the link from ever being fully set up.
+
+In ixgbe_dev_link_update_share(), if the media type is fiber and the
+link is down, a flag (IXGBE_FLAG_NEED_LINK_CONFIG) is set. A callback
+to ixgbe_dev_setup_link_alarm_handler() is scheduled for 10us later
+which should try to set up the link and clear the flag afterwards.
+
+If the device is started before the flag is cleared, the scheduled
+callback is canceled. This causes the flag to remain set and
+subsequent calls to ixgbe_dev_link_update_share() return
+without trying to retrieve the link state because the flag is set.
+
+In ixgbe_dev_start(), after cancelling the callback, unset the flag
+on the device to avoid this condition.
+---
+ drivers/net/ixgbe/ixgbe_ethdev.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
+index 03fc1f7..3c2936d 100644
+--- a/drivers/net/ixgbe/ixgbe_ethdev.c
++++ b/drivers/net/ixgbe/ixgbe_ethdev.c
+@@ -2598,6 +2598,8 @@ static int eth_ixgbevf_pci_remove(struct rte_pci_device *pci_dev)
+ uint32_t *link_speeds;
+ struct ixgbe_tm_conf *tm_conf =
+ IXGBE_DEV_PRIVATE_TO_TM_CONF(dev->data->dev_private);
++ struct ixgbe_interrupt *intr =
++ IXGBE_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
+
+ PMD_INIT_FUNC_TRACE();
+
+@@ -2614,6 +2616,7 @@ static int eth_ixgbevf_pci_remove(struct rte_pci_device *pci_dev)
+
+ /* Stop the link setup handler before resetting the HW. */
+ rte_eal_alarm_cancel(ixgbe_dev_setup_link_alarm_handler, dev);
++ intr->flags &= ~IXGBE_FLAG_NEED_LINK_CONFIG;
+
+ /* disable uio/vfio intr/eventfd mapping */
+ rte_intr_disable(intr_handle);
+--
+1.8.3.1
+