From: Kevin Traynor <ktraynor@redhat.com>
To: Xiaoyun Li <xiaoyun.li@intel.com>
Cc: Qi Zhang <qi.z.zhang@intel.com>, dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/ixgbe: fix overwriting RSS RETA' has been queued to stable release 18.08.1
Date: Fri, 14 Dec 2018 17:51:53 +0000 [thread overview]
Message-ID: <20181214175203.24908-9-ktraynor@redhat.com> (raw)
In-Reply-To: <20181214175203.24908-1-ktraynor@redhat.com>
Hi,
FYI, your patch has been queued to stable release 18.08.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/18/18. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.
Thanks.
Kevin Traynor
---
>From 3e3c5bb1e4761a17fc11c2f4630f7ef455b59d37 Mon Sep 17 00:00:00 2001
From: Xiaoyun Li <xiaoyun.li@intel.com>
Date: Tue, 4 Dec 2018 12:37:57 +0800
Subject: [PATCH] net/ixgbe: fix overwriting RSS RETA
[ upstream commit 8832837c6e64a75be31f32c49da261db15054c0d ]
When starting the device, the RSS table is initialized. So the RSS
update before device_start would be overwritten. This patch allows users
to update the RSS reta table before device_start.
Fixes: db5b65301dde ("ethdev: allow to set RSS hash computation flags and/or key")
Signed-off-by: Xiaoyun Li <xiaoyun.li@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
drivers/net/ixgbe/ixgbe_ethdev.c | 11 +++++++++++
drivers/net/ixgbe/ixgbe_ethdev.h | 3 +++
drivers/net/ixgbe/ixgbe_rxtx.c | 22 +++++++++++++---------
3 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 9de9c0c3e..15cf47c24 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -2794,4 +2794,6 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
{
struct rte_eth_link link;
+ struct ixgbe_adapter *adapter =
+ (struct ixgbe_adapter *)dev->data->dev_private;
struct ixgbe_hw *hw =
IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -2854,4 +2856,6 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
/* reset hierarchy commit */
tm_conf->committed = false;
+
+ adapter->rss_reta_updated = 0;
}
@@ -4785,4 +4789,6 @@ ixgbe_dev_rss_reta_update(struct rte_eth_dev *dev,
uint32_t reta, r;
uint16_t idx, shift;
+ struct ixgbe_adapter *adapter =
+ (struct ixgbe_adapter *)dev->data->dev_private;
struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
uint32_t reta_reg;
@@ -4826,4 +4832,5 @@ ixgbe_dev_rss_reta_update(struct rte_eth_dev *dev,
IXGBE_WRITE_REG(hw, reta_reg, reta);
}
+ adapter->rss_reta_updated = 1;
return 0;
@@ -5149,4 +5156,6 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev)
{
struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct ixgbe_adapter *adapter =
+ (struct ixgbe_adapter *)dev->data->dev_private;
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
@@ -5178,4 +5187,6 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev)
intr_handle->intr_vec = NULL;
}
+
+ adapter->rss_reta_updated = 0;
}
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h
index d0b93968b..565c69c9e 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.h
+++ b/drivers/net/ixgbe/ixgbe_ethdev.h
@@ -491,4 +491,7 @@ struct ixgbe_adapter {
struct rte_timecounter tx_tstamp_tc;
struct ixgbe_tm_conf tm_conf;
+
+ /* For RSS reta table update */
+ uint8_t rss_reta_updated;
};
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 1ea7ae59f..337a1a50c 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -3421,4 +3421,5 @@ ixgbe_rss_configure(struct rte_eth_dev *dev)
{
struct rte_eth_rss_conf rss_conf;
+ struct ixgbe_adapter *adapter;
struct ixgbe_hw *hw;
uint32_t reta;
@@ -3429,4 +3430,5 @@ ixgbe_rss_configure(struct rte_eth_dev *dev)
PMD_INIT_FUNC_TRACE();
+ adapter = (struct ixgbe_adapter *)dev->data->dev_private;
hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -3438,14 +3440,16 @@ ixgbe_rss_configure(struct rte_eth_dev *dev)
* little-endian order.
*/
- reta = 0;
- for (i = 0, j = 0; i < sp_reta_size; i++, j++) {
- reta_reg = ixgbe_reta_reg_get(hw->mac.type, i);
+ if (adapter->rss_reta_updated == 0) {
+ reta = 0;
+ for (i = 0, j = 0; i < sp_reta_size; i++, j++) {
+ reta_reg = ixgbe_reta_reg_get(hw->mac.type, i);
- if (j == dev->data->nb_rx_queues)
- j = 0;
- reta = (reta << 8) | j;
- if ((i & 3) == 3)
- IXGBE_WRITE_REG(hw, reta_reg,
- rte_bswap32(reta));
+ if (j == dev->data->nb_rx_queues)
+ j = 0;
+ reta = (reta << 8) | j;
+ if ((i & 3) == 3)
+ IXGBE_WRITE_REG(hw, reta_reg,
+ rte_bswap32(reta));
+ }
}
--
2.19.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2018-12-14 17:49:47.967073482 +0000
+++ 0009-net-ixgbe-fix-overwriting-RSS-RETA.patch 2018-12-14 17:49:47.000000000 +0000
@@ -1,14 +1,15 @@
-From 8832837c6e64a75be31f32c49da261db15054c0d Mon Sep 17 00:00:00 2001
+From 3e3c5bb1e4761a17fc11c2f4630f7ef455b59d37 Mon Sep 17 00:00:00 2001
From: Xiaoyun Li <xiaoyun.li@intel.com>
Date: Tue, 4 Dec 2018 12:37:57 +0800
Subject: [PATCH] net/ixgbe: fix overwriting RSS RETA
+[ upstream commit 8832837c6e64a75be31f32c49da261db15054c0d ]
+
When starting the device, the RSS table is initialized. So the RSS
update before device_start would be overwritten. This patch allows users
to update the RSS reta table before device_start.
Fixes: db5b65301dde ("ethdev: allow to set RSS hash computation flags and/or key")
-Cc: stable@dpdk.org
Signed-off-by: Xiaoyun Li <xiaoyun.li@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
@@ -19,44 +20,44 @@
3 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
-index 91ba6201d..749311048 100644
+index 9de9c0c3e..15cf47c24 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
-@@ -2791,4 +2791,6 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
+@@ -2794,4 +2794,6 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
{
struct rte_eth_link link;
+ struct ixgbe_adapter *adapter =
+ (struct ixgbe_adapter *)dev->data->dev_private;
struct ixgbe_hw *hw =
IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-@@ -2851,4 +2853,6 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
+@@ -2854,4 +2856,6 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
/* reset hierarchy commit */
tm_conf->committed = false;
+
+ adapter->rss_reta_updated = 0;
}
-@@ -4780,4 +4784,6 @@ ixgbe_dev_rss_reta_update(struct rte_eth_dev *dev,
+@@ -4785,4 +4789,6 @@ ixgbe_dev_rss_reta_update(struct rte_eth_dev *dev,
uint32_t reta, r;
uint16_t idx, shift;
+ struct ixgbe_adapter *adapter =
+ (struct ixgbe_adapter *)dev->data->dev_private;
struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
uint32_t reta_reg;
-@@ -4821,4 +4827,5 @@ ixgbe_dev_rss_reta_update(struct rte_eth_dev *dev,
+@@ -4826,4 +4832,5 @@ ixgbe_dev_rss_reta_update(struct rte_eth_dev *dev,
IXGBE_WRITE_REG(hw, reta_reg, reta);
}
+ adapter->rss_reta_updated = 1;
return 0;
-@@ -5144,4 +5151,6 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev)
+@@ -5149,4 +5156,6 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev)
{
struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct ixgbe_adapter *adapter =
+ (struct ixgbe_adapter *)dev->data->dev_private;
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
-@@ -5173,4 +5182,6 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev)
+@@ -5178,4 +5187,6 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev)
intr_handle->intr_vec = NULL;
}
+
@@ -76,22 +77,22 @@
};
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
-index 7771d0e6d..9a79d18e4 100644
+index 1ea7ae59f..337a1a50c 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
-@@ -3419,4 +3419,5 @@ ixgbe_rss_configure(struct rte_eth_dev *dev)
+@@ -3421,4 +3421,5 @@ ixgbe_rss_configure(struct rte_eth_dev *dev)
{
struct rte_eth_rss_conf rss_conf;
+ struct ixgbe_adapter *adapter;
struct ixgbe_hw *hw;
uint32_t reta;
-@@ -3427,4 +3428,5 @@ ixgbe_rss_configure(struct rte_eth_dev *dev)
+@@ -3429,4 +3430,5 @@ ixgbe_rss_configure(struct rte_eth_dev *dev)
PMD_INIT_FUNC_TRACE();
+ adapter = (struct ixgbe_adapter *)dev->data->dev_private;
hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-@@ -3436,14 +3438,16 @@ ixgbe_rss_configure(struct rte_eth_dev *dev)
+@@ -3438,14 +3440,16 @@ ixgbe_rss_configure(struct rte_eth_dev *dev)
* little-endian order.
*/
- reta = 0;
next prev parent reply other threads:[~2018-12-14 17:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-14 17:51 [dpdk-stable] patch 'net/ixgbe/base: add LHA ID' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/bnx2x: cleanup info logs' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'examples/bond: fix crash when there is no active slave' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/mlx5: fix function documentation' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/ifcvf: fix typo on struct name' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/i40e: fix getting RSS configuration' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/ixgbe: fix Rx LRO capability offload for x550' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/i40e: fix overwriting RSS RETA' " Kevin Traynor
2018-12-14 17:51 ` Kevin Traynor [this message]
2018-12-14 17:51 ` [dpdk-stable] patch 'net/i40e: fix port close' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/mlx5: fix validation of Rx queue number' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'ethdev: fix typo in queue setup error log' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'doc: fix a typo in testpmd guide' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/cxgbe: fix control queue mbuf pool naming convention' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'drivers/net: fix several Tx prepare functions' " Kevin Traynor
2018-12-14 17:52 ` [dpdk-stable] patch 'vhost: fix crash after mmap failure' " Kevin Traynor
2018-12-14 17:52 ` [dpdk-stable] patch 'vhost: fix double read of descriptor flags' " Kevin Traynor
2018-12-14 17:52 ` [dpdk-stable] patch 'net/i40e: revert fix offload not supported mask' " Kevin Traynor
2018-12-14 17:52 ` [dpdk-stable] patch 'net/i40e: remove redundant reset of queue number' " Kevin Traynor
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=20181214175203.24908-9-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=qi.z.zhang@intel.com \
--cc=stable@dpdk.org \
--cc=xiaoyun.li@intel.com \
/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).