From: Yuanhan Liu <yliu@fridaylinux.org>
To: Markus Theil <markus.theil@tu-ilmenau.de>
Cc: Wenzhuo Lu <wenzhuo.lu@intel.com>, dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/igb: fix add/delete of flex filters' has been queued to stable release 17.05.1
Date: Tue, 20 Jun 2017 19:35:26 +0800 [thread overview]
Message-ID: <1497958550-13600-14-git-send-email-yliu@fridaylinux.org> (raw)
In-Reply-To: <1497958550-13600-1-git-send-email-yliu@fridaylinux.org>
Hi,
FYI, your patch has been queued to stable release 17.05.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 06/22/17. So please
shout if anyone has objections.
Thanks.
--yliu
---
>From 4318c5f6057a9ba328d80e2662b94af3492f6391 Mon Sep 17 00:00:00 2001
From: Markus Theil <markus.theil@tu-ilmenau.de>
Date: Mon, 22 May 2017 12:17:50 +0200
Subject: [PATCH] net/igb: fix add/delete of flex filters
[ upstream commit 167e7b9ae531491f10f495587cb59ae271430abb ]
Before this patch, flex_filter->index was always zero when it was read
and used after rte_zmalloc. The corresponding code was therefore moved
into the add and delete parts of the if/else statement.
Fixes: 231d43909a31 ("igb: migrate flex filter to new API")
Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de>
Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---
drivers/net/e1000/igb_ethdev.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 5af3ac8..d18dd48 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -3912,10 +3912,6 @@ eth_igb_add_del_flex_filter(struct rte_eth_dev *dev,
}
wufc = E1000_READ_REG(hw, E1000_WUFC);
- if (flex_filter->index < E1000_MAX_FHFT)
- reg_off = E1000_FHFT(flex_filter->index);
- else
- reg_off = E1000_FHFT_EXT(flex_filter->index - E1000_MAX_FHFT);
if (add) {
if (eth_igb_flex_filter_lookup(&filter_info->flex_list,
@@ -3945,6 +3941,11 @@ eth_igb_add_del_flex_filter(struct rte_eth_dev *dev,
return -ENOSYS;
}
+ if (flex_filter->index < E1000_MAX_FHFT)
+ reg_off = E1000_FHFT(flex_filter->index);
+ else
+ reg_off = E1000_FHFT_EXT(flex_filter->index - E1000_MAX_FHFT);
+
E1000_WRITE_REG(hw, E1000_WUFC, wufc | E1000_WUFC_FLEX_HQ |
(E1000_WUFC_FLX0 << flex_filter->index));
queueing = filter->len |
@@ -3973,6 +3974,11 @@ eth_igb_add_del_flex_filter(struct rte_eth_dev *dev,
return -ENOENT;
}
+ if (it->index < E1000_MAX_FHFT)
+ reg_off = E1000_FHFT(it->index);
+ else
+ reg_off = E1000_FHFT_EXT(it->index - E1000_MAX_FHFT);
+
for (i = 0; i < E1000_FHFT_SIZE_IN_DWD; i++)
E1000_WRITE_REG(hw, reg_off + i * sizeof(uint32_t), 0);
E1000_WRITE_REG(hw, E1000_WUFC, wufc &
--
2.7.4
next prev parent reply other threads:[~2017-06-20 11:37 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-20 11:35 [dpdk-stable] patch 'examples/vhost: fix uninitialized descriptor indexes' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'kni: fix build on RHEL 7.4' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'drivers/net: fix vfio kmod dependency' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'vfio: fix array bounds check' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'app/testpmd: fix creating E-Tag and NVGRE flow rules' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ark: fix buffer not null terminated' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ark: fix return code not checked' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ark: fix null pointer dereference' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ark: fix return value of null not checked' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/i40e/base: fix Tx error stats on VF' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/af_packet: handle possible null pointer' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/af_packet: fix packet bytes counting' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/mlx5: fix completion buffer size' " Yuanhan Liu
2017-06-20 11:35 ` Yuanhan Liu [this message]
2017-06-20 11:35 ` [dpdk-stable] patch 'net/tap: fix some flow collision' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/cxgbe: fix port statistics' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/cxgbe: fix rxq default params for ports under same PF' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/sfc/base: fix error code usage in common code' " Yuanhan Liu
2017-06-20 16:26 ` Andrew Rybchenko
2017-06-22 2:19 ` Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/sfc: add Tx queue flush failed flag for sanity' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/mlx5: fix flow application order on stop/start' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ring: fix adding MAC addresses' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/mlx5: fix exception handling' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/mlx5: fix redundant free of Tx buffer' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/igb: fix checksum valid flags' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ixgbe: fix fdir mask not be reset' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/i40e: exclude internal packet's byte count' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/i40e: fix VF statistics' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/qede: fix VXLAN tunnel Tx offload flag setting' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/liquidio: fix MTU calculation from port configuration' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/bnxt: fix reporting of link status' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'kni: fix build with gcc 7.1' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/enic: " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/mlx5: " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'vhost: fix malloc size too small' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'vhost: fix guest pages memory leak' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'vhost: fix crash on NUMA' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/virtio: zero the whole memory zone' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'lpm: fix index of tbl8' " Yuanhan Liu
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=1497958550-13600-14-git-send-email-yliu@fridaylinux.org \
--to=yliu@fridaylinux.org \
--cc=markus.theil@tu-ilmenau.de \
--cc=stable@dpdk.org \
--cc=wenzhuo.lu@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).