Hi Qiming > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] > Sent: Thursday, May 17, 2018 9:23 PM > To: dev@dpdk.org > Cc: Wu, Jingjing <jingjing.wu@intel.com>; Lu, Wenzhuo > <wenzhuo.lu@intel.com>; Yang, Qiming <qiming.yang@intel.com>; > stable@dpdk.org > Subject: [dpdk-dev] [PATCH] net/ixgbe: fix dcb configuration issue > > This patch removed unnecessary check in ixgbe_check_mq_mode, fixed > historical issue. > > Fixes: 27b609cbd1c6 ("ethdev: move the multi-queue mode check to specific > drivers") > Cc: stable@dpdk.org > > Signed-off-by: Qiming Yang <qiming.yang@intel.com> > --- > drivers/net/ixgbe/ixgbe_ethdev.c | 37 ------------------------------------- > 1 file changed, 37 deletions(-) > > diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c > b/drivers/net/ixgbe/ixgbe_ethdev.c > index f5006bc..9e3ae95 100644 > --- a/drivers/net/ixgbe/ixgbe_ethdev.c > +++ b/drivers/net/ixgbe/ixgbe_ethdev.c > @@ -2300,43 +2300,6 @@ ixgbe_check_mq_mode(struct rte_eth_dev *dev) > } > } > > - /* For DCB mode check our configuration before we go further */ > - if (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) { > - const struct rte_eth_dcb_rx_conf *conf; > - > - if (nb_rx_q != IXGBE_DCB_NB_QUEUES) { > - PMD_INIT_LOG(ERR, "DCB selected, nb_rx_q != %d.", > - IXGBE_DCB_NB_QUEUES); > - return -EINVAL; > - } > - conf = &dev_conf->rx_adv_conf.dcb_rx_conf; > - if (!(conf->nb_tcs == ETH_4_TCS || > - conf->nb_tcs == ETH_8_TCS)) { I guess, we should not remove all check, for nb_tcs, it still valid, right? > - PMD_INIT_LOG(ERR, "DCB selected, nb_tcs != %d" > - " and nb_tcs != %d.", > - ETH_4_TCS, ETH_8_TCS); > - return -EINVAL; > - } > - } > - > - if (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB) { > - const struct rte_eth_dcb_tx_conf *conf; > - > - if (nb_tx_q != IXGBE_DCB_NB_QUEUES) { > - PMD_INIT_LOG(ERR, "DCB, nb_tx_q != %d.", > - IXGBE_DCB_NB_QUEUES); > - return -EINVAL; > - } > - conf = &dev_conf->tx_adv_conf.dcb_tx_conf; > - if (!(conf->nb_tcs == ETH_4_TCS || > - conf->nb_tcs == ETH_8_TCS)) { Same to rx. > - PMD_INIT_LOG(ERR, "DCB selected, nb_tcs != %d" > - " and nb_tcs != %d.", > - ETH_4_TCS, ETH_8_TCS); > - return -EINVAL; > - } > - } > - > /* > * When DCB/VT is off, maximum number of queues changes, > * except for 82598EB, which remains constant. > -- > 2.9.5
This patch removed unnecessary check in ixgbe_check_mq_mode, fixed historical issue. Fixes: 27b609cbd1c6 ("ethdev: move the multi-queue mode check to specific drivers") Cc: stable@dpdk.org Signed-off-by: Qiming Yang <qiming.yang@intel.com> --- drivers/net/ixgbe/ixgbe_ethdev.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index f5006bc..9e3ae95 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -2300,43 +2300,6 @@ ixgbe_check_mq_mode(struct rte_eth_dev *dev) } } - /* For DCB mode check our configuration before we go further */ - if (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) { - const struct rte_eth_dcb_rx_conf *conf; - - if (nb_rx_q != IXGBE_DCB_NB_QUEUES) { - PMD_INIT_LOG(ERR, "DCB selected, nb_rx_q != %d.", - IXGBE_DCB_NB_QUEUES); - return -EINVAL; - } - conf = &dev_conf->rx_adv_conf.dcb_rx_conf; - if (!(conf->nb_tcs == ETH_4_TCS || - conf->nb_tcs == ETH_8_TCS)) { - PMD_INIT_LOG(ERR, "DCB selected, nb_tcs != %d" - " and nb_tcs != %d.", - ETH_4_TCS, ETH_8_TCS); - return -EINVAL; - } - } - - if (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB) { - const struct rte_eth_dcb_tx_conf *conf; - - if (nb_tx_q != IXGBE_DCB_NB_QUEUES) { - PMD_INIT_LOG(ERR, "DCB, nb_tx_q != %d.", - IXGBE_DCB_NB_QUEUES); - return -EINVAL; - } - conf = &dev_conf->tx_adv_conf.dcb_tx_conf; - if (!(conf->nb_tcs == ETH_4_TCS || - conf->nb_tcs == ETH_8_TCS)) { - PMD_INIT_LOG(ERR, "DCB selected, nb_tcs != %d" - " and nb_tcs != %d.", - ETH_4_TCS, ETH_8_TCS); - return -EINVAL; - } - } - /* * When DCB/VT is off, maximum number of queues changes, * except for 82598EB, which remains constant. -- 2.9.5
I'll send v2 later.
> -----Original Message-----
> From: Zhang, Qi Z
> Sent: Thursday, May 17, 2018 9:19 PM
> To: dev@dpdk.org
> Cc: Wu, Jingjing <jingjing.wu@intel.com>; Lu, Wenzhuo
> <wenzhuo.lu@intel.com>; Yang, Qiming <qiming.yang@intel.com>;
> stable@dpdk.org
> Subject: RE: [dpdk-dev] [PATCH] net/ixgbe: fix dcb configuration issue
>
> Hi Qiming
>
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org]
> > Sent: Thursday, May 17, 2018 9:23 PM
> > To: dev@dpdk.org
> > Cc: Wu, Jingjing <jingjing.wu@intel.com>; Lu, Wenzhuo
> > <wenzhuo.lu@intel.com>; Yang, Qiming <qiming.yang@intel.com>;
> > stable@dpdk.org
> > Subject: [dpdk-dev] [PATCH] net/ixgbe: fix dcb configuration issue
> >
> > This patch removed unnecessary check in ixgbe_check_mq_mode, fixed
> > historical issue.
> >
> > Fixes: 27b609cbd1c6 ("ethdev: move the multi-queue mode check to
> > specific
> > drivers")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Qiming Yang <qiming.yang@intel.com>
> > ---
> > drivers/net/ixgbe/ixgbe_ethdev.c | 37
> > -------------------------------------
> > 1 file changed, 37 deletions(-)
> >
> > diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c
> > b/drivers/net/ixgbe/ixgbe_ethdev.c
> > index f5006bc..9e3ae95 100644
> > --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> > +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> > @@ -2300,43 +2300,6 @@ ixgbe_check_mq_mode(struct rte_eth_dev *dev)
> > }
> > }
> >
> > - /* For DCB mode check our configuration before we go further
> */
> > - if (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) {
> > - const struct rte_eth_dcb_rx_conf *conf;
> > -
> > - if (nb_rx_q != IXGBE_DCB_NB_QUEUES) {
> > - PMD_INIT_LOG(ERR, "DCB selected,
> nb_rx_q != %d.",
> > - IXGBE_DCB_NB_QUEUES);
> > - return -EINVAL;
> > - }
> > - conf = &dev_conf->rx_adv_conf.dcb_rx_conf;
> > - if (!(conf->nb_tcs == ETH_4_TCS ||
> > - conf->nb_tcs == ETH_8_TCS)) {
>
> I guess, we should not remove all check, for nb_tcs, it still valid, right?
>
> > - PMD_INIT_LOG(ERR, "DCB selected,
> nb_tcs != %d"
> > - " and nb_tcs != %d.",
> > - ETH_4_TCS, ETH_8_TCS);
> > - return -EINVAL;
> > - }
> > - }
> > -
> > - if (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB) {
> > - const struct rte_eth_dcb_tx_conf *conf;
> > -
> > - if (nb_tx_q != IXGBE_DCB_NB_QUEUES) {
> > - PMD_INIT_LOG(ERR, "DCB, nb_tx_q != %d.",
> > - IXGBE_DCB_NB_QUEUES);
> > - return -EINVAL;
> > - }
> > - conf = &dev_conf->tx_adv_conf.dcb_tx_conf;
> > - if (!(conf->nb_tcs == ETH_4_TCS ||
> > - conf->nb_tcs == ETH_8_TCS)) {
> Same to rx.
> > - PMD_INIT_LOG(ERR, "DCB selected,
> nb_tcs != %d"
> > - " and nb_tcs != %d.",
> > - ETH_4_TCS, ETH_8_TCS);
> > - return -EINVAL;
> > - }
> > - }
> > -
> > /*
> > * When DCB/VT is off, maximum number of queues changes,
> > * except for 82598EB, which remains constant.
> > --
> > 2.9.5
Hi,
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org]
> Sent: Friday, May 18, 2018 5:52 PM
> To: dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>; stable@dpdk.org
> Subject: [dpdk-dev] [PATCH v2] net/ixgbe: fix dcb configuration issue
>
> This patch removed unnecessary check in ixgbe_check_mq_mode, fixed
> historical issue.
>
> Fixes: 27b609cbd1c6 ("ethdev: move the multi-queue mode check to specific
> drivers")
> Cc: stable@dpdk.org
>
> Signed-off-by: Qiming Yang <qiming.yang@intel.com>
Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
> -----Original Message-----
> From: Yang, Qiming
> Sent: Thursday, May 17, 2018 9:23 PM
> To: dev@dpdk.org
> Cc: Wu, Jingjing <jingjing.wu@intel.com>; Lu, Wenzhuo <wenzhuo.lu@intel.com>; Yang,
> Qiming <qiming.yang@intel.com>; stable@dpdk.org
> Subject: [PATCH] net/ixgbe: fix dcb configuration issue
>
> This patch removed unnecessary check in ixgbe_check_mq_mode,
> fixed historical issue.
>
Hi, Qiming
Sorry, I didn't understand why the check is unnecessary, amd what is the historical issue?
Could you add a bit more comments here?
Thanks
Jingjing
This patch removed unnecessary check in ixgbe_check_mq_mode, fixed historical issue. Fixes: 27b609cbd1c6 ("ethdev: move the multi-queue mode check to specific drivers") Cc: stable@dpdk.org Signed-off-by: Qiming Yang <qiming.yang@intel.com> --- drivers/net/ixgbe/ixgbe_ethdev.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index f5006bc..eb92893 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -2304,11 +2304,6 @@ ixgbe_check_mq_mode(struct rte_eth_dev *dev) if (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) { const struct rte_eth_dcb_rx_conf *conf; - if (nb_rx_q != IXGBE_DCB_NB_QUEUES) { - PMD_INIT_LOG(ERR, "DCB selected, nb_rx_q != %d.", - IXGBE_DCB_NB_QUEUES); - return -EINVAL; - } conf = &dev_conf->rx_adv_conf.dcb_rx_conf; if (!(conf->nb_tcs == ETH_4_TCS || conf->nb_tcs == ETH_8_TCS)) { @@ -2322,11 +2317,6 @@ ixgbe_check_mq_mode(struct rte_eth_dev *dev) if (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB) { const struct rte_eth_dcb_tx_conf *conf; - if (nb_tx_q != IXGBE_DCB_NB_QUEUES) { - PMD_INIT_LOG(ERR, "DCB, nb_tx_q != %d.", - IXGBE_DCB_NB_QUEUES); - return -EINVAL; - } conf = &dev_conf->tx_adv_conf.dcb_tx_conf; if (!(conf->nb_tcs == ETH_4_TCS || conf->nb_tcs == ETH_8_TCS)) { -- 2.9.5
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Lu, Wenzhuo
> Sent: Friday, May 18, 2018 11:16 AM
> To: dev; dev@dpdk.org
> Cc: Zhang, Qi Z; Yang, Qiming; stable@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v2] net/ixgbe: fix dcb configuration issue
>
> Hi,
>
>
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org]
> > Sent: Friday, May 18, 2018 5:52 PM
> > To: dev@dpdk.org
> > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, Qiming
> > <qiming.yang@intel.com>; stable@dpdk.org
> > Subject: [dpdk-dev] [PATCH v2] net/ixgbe: fix dcb configuration issue
> >
> > This patch removed unnecessary check in ixgbe_check_mq_mode, fixed
> > historical issue.
> >
> > Fixes: 27b609cbd1c6 ("ethdev: move the multi-queue mode check to
> > specific
> > drivers")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Qiming Yang <qiming.yang@intel.com>
> Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
Applied to dpdk-next-net-intel, thanks!
/Helin