| Message ID | 20210722075620.472438-1-xiaoyun.li@intel.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Qi Zhang |
| Headers | show |
| Series | net/iavf: fix tx thresh check issue | expand |
| Context | Check | Description |
|---|---|---|
| ci/iol-testing | success | Testing PASS |
| ci/iol-abi-testing | success | Testing PASS |
| ci/intel-Testing | success | Testing PASS |
| ci/Intel-compilation | success | Compilation OK |
| ci/iol-intel-Performance | success | Performance Testing PASS |
| ci/iol-intel-Functional | success | Functional Testing PASS |
| ci/github-robot | success | github build: passed |
| ci/checkpatch | success | coding style OK |
> -----Original Message----- > From: Li, Xiaoyun <xiaoyun.li@intel.com> > Sent: Thursday, July 22, 2021 3:56 PM > To: dev@dpdk.org; Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei > <beilei.xing@intel.com> > Cc: Li, Xiaoyun <xiaoyun.li@intel.com>; stable@dpdk.org > Subject: [PATCH] net/iavf: fix tx thresh check issue > > Function check_tx_thresh is called with wrong parameter. If the check fails, > tx_queue_setup should return error not keep going. > iThis patch fixes above issues. Typo: This Except that, Acked-by: Beilei Xing <beilei.xing@intel.com> > > Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") > Cc: stable@dpdk.org > > Signed-off-by: Xiaoyun Li <xiaoyun.li@intel.com> > --- > drivers/net/iavf/iavf_rxtx.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index > d61b32fcee..e33fe4576b 100644 > --- a/drivers/net/iavf/iavf_rxtx.c > +++ b/drivers/net/iavf/iavf_rxtx.c > @@ -708,7 +708,8 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev, > tx_conf->tx_rs_thresh : DEFAULT_TX_RS_THRESH); > tx_free_thresh = (uint16_t)((tx_conf->tx_free_thresh) ? > tx_conf->tx_free_thresh : DEFAULT_TX_FREE_THRESH); > - check_tx_thresh(nb_desc, tx_rs_thresh, tx_rs_thresh); > + if (check_tx_thresh(nb_desc, tx_rs_thresh, tx_free_thresh) != 0) > + return -EINVAL; > > /* Free memory if needed. */ > if (dev->data->tx_queues[queue_idx]) { > -- > 2.25.1
> -----Original Message----- > From: dev <dev-bounces@dpdk.org> On Behalf Of Xing, Beilei > Sent: Friday, July 23, 2021 10:43 AM > To: Li, Xiaoyun <xiaoyun.li@intel.com>; dev@dpdk.org; Wu, Jingjing > <jingjing.wu@intel.com> > Cc: stable@dpdk.org > Subject: Re: [dpdk-dev] [PATCH] net/iavf: fix tx thresh check issue > > > > > -----Original Message----- > > From: Li, Xiaoyun <xiaoyun.li@intel.com> > > Sent: Thursday, July 22, 2021 3:56 PM > > To: dev@dpdk.org; Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei > > <beilei.xing@intel.com> > > Cc: Li, Xiaoyun <xiaoyun.li@intel.com>; stable@dpdk.org > > Subject: [PATCH] net/iavf: fix tx thresh check issue > > > > Function check_tx_thresh is called with wrong parameter. If the check > > fails, tx_queue_setup should return error not keep going. > > iThis patch fixes above issues. > > Typo: This > > Except that, > Acked-by: Beilei Xing <beilei.xing@intel.com> Applied to dpdk-next-net-intel with typo fix Thanks Qi
diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index d61b32fcee..e33fe4576b 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -708,7 +708,8 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev, tx_conf->tx_rs_thresh : DEFAULT_TX_RS_THRESH); tx_free_thresh = (uint16_t)((tx_conf->tx_free_thresh) ? tx_conf->tx_free_thresh : DEFAULT_TX_FREE_THRESH); - check_tx_thresh(nb_desc, tx_rs_thresh, tx_rs_thresh); + if (check_tx_thresh(nb_desc, tx_rs_thresh, tx_free_thresh) != 0) + return -EINVAL; /* Free memory if needed. */ if (dev->data->tx_queues[queue_idx]) {
Function check_tx_thresh is called with wrong parameter. If the check fails, tx_queue_setup should return error not keep going. iThis patch fixes above issues. Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Cc: stable@dpdk.org Signed-off-by: Xiaoyun Li <xiaoyun.li@intel.com> --- drivers/net/iavf/iavf_rxtx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)