* [dpdk-dev] [PATCH v2] net/i40e: fix compile error @ 2017-02-20 0:08 Qi Zhang 2017-02-20 11:43 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit 2017-02-20 18:11 ` [dpdk-dev] [PATCH v3] " Qi Zhang 0 siblings, 2 replies; 7+ messages in thread From: Qi Zhang @ 2017-02-20 0:08 UTC (permalink / raw) To: jingjing.wu, helin.zhang; +Cc: dev, Qi Zhang, stable This patch fix the compile error when RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC is disabled. Fixes: 9ed94e5bb04e ("i40e: add vector Rx") Cc: stable@dpdk.org Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> --- drivers/net/i40e/i40e_rxtx.c | 2 +- drivers/net/i40e/i40e_rxtx.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 48429cc..40f4a45 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -2209,11 +2209,11 @@ i40e_reset_rx_queue(struct i40e_rx_queue *rxq) for (i = 0; i < len * sizeof(union i40e_rx_desc); i++) ((volatile char *)rxq->rx_ring)[i] = 0; -#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC memset(&rxq->fake_mbuf, 0x0, sizeof(rxq->fake_mbuf)); for (i = 0; i < RTE_PMD_I40E_RX_MAX_BURST; ++i) rxq->sw_ring[rxq->nb_rx_desc + i].mbuf = &rxq->fake_mbuf; +#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC rxq->rx_nb_avail = 0; rxq->rx_next_avail = 0; rxq->rx_free_trigger = (uint16_t)(rxq->rx_free_thresh - 1); diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h index 9df8a56..4f7f319 100644 --- a/drivers/net/i40e/i40e_rxtx.h +++ b/drivers/net/i40e/i40e_rxtx.h @@ -119,11 +119,11 @@ struct i40e_rx_queue { uint16_t nb_rx_hold; /**< number of held free RX desc */ struct rte_mbuf *pkt_first_seg; /**< first segment of current packet */ struct rte_mbuf *pkt_last_seg; /**< last segment of current packet */ + struct rte_mbuf fake_mbuf; /**< dummy mbuf */ #ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC uint16_t rx_nb_avail; /**< number of staged packets ready */ uint16_t rx_next_avail; /**< index of next staged packets */ uint16_t rx_free_trigger; /**< triggers rx buffer allocation */ - struct rte_mbuf fake_mbuf; /**< dummy mbuf */ struct rte_mbuf *rx_stage[RTE_PMD_I40E_RX_MAX_BURST * 2]; #endif -- 2.7.4 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH v2] net/i40e: fix compile error 2017-02-20 0:08 [dpdk-dev] [PATCH v2] net/i40e: fix compile error Qi Zhang @ 2017-02-20 11:43 ` Ferruh Yigit 2017-02-21 1:02 ` Zhang, Qi Z 2017-02-20 18:11 ` [dpdk-dev] [PATCH v3] " Qi Zhang 1 sibling, 1 reply; 7+ messages in thread From: Ferruh Yigit @ 2017-02-20 11:43 UTC (permalink / raw) To: Qi Zhang, jingjing.wu, helin.zhang; +Cc: dev, stable On 2/20/2017 12:08 AM, Qi Zhang wrote: > This patch fix the compile error when RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC > is disabled. Compile error: CC i40e_rxtx_vec_sse.o .../drivers/net/i40e/i40e_rxtx_vec_sse.c:72:26: error: no member named 'fake_mbuf' in 'struct i40e_rx_queue' rxep[i].mbuf = &rxq->fake_mbuf; ~~~ ^ > > Fixes: 9ed94e5bb04e ("i40e: add vector Rx") > Cc: stable@dpdk.org > > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> > --- > drivers/net/i40e/i40e_rxtx.c | 2 +- > drivers/net/i40e/i40e_rxtx.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c > index 48429cc..40f4a45 100644 > --- a/drivers/net/i40e/i40e_rxtx.c > +++ b/drivers/net/i40e/i40e_rxtx.c > @@ -2209,11 +2209,11 @@ i40e_reset_rx_queue(struct i40e_rx_queue *rxq) > for (i = 0; i < len * sizeof(union i40e_rx_desc); i++) > ((volatile char *)rxq->rx_ring)[i] = 0; > > -#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC > memset(&rxq->fake_mbuf, 0x0, sizeof(rxq->fake_mbuf)); > for (i = 0; i < RTE_PMD_I40E_RX_MAX_BURST; ++i) > rxq->sw_ring[rxq->nb_rx_desc + i].mbuf = &rxq->fake_mbuf; > > +#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC Hi Qi, Just to double check, below update in i40e_rxtx.h is enough to fix the build error. Can you please confirm assigning fake_mbuf to sw_ring[] is required step, independent from RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC enabled or not? And it can be good to document this in commit log. Thanks, ferruh > rxq->rx_nb_avail = 0; > rxq->rx_next_avail = 0; > rxq->rx_free_trigger = (uint16_t)(rxq->rx_free_thresh - 1); > diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h > index 9df8a56..4f7f319 100644 > --- a/drivers/net/i40e/i40e_rxtx.h > +++ b/drivers/net/i40e/i40e_rxtx.h > @@ -119,11 +119,11 @@ struct i40e_rx_queue { > uint16_t nb_rx_hold; /**< number of held free RX desc */ > struct rte_mbuf *pkt_first_seg; /**< first segment of current packet */ > struct rte_mbuf *pkt_last_seg; /**< last segment of current packet */ > + struct rte_mbuf fake_mbuf; /**< dummy mbuf */ > #ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC > uint16_t rx_nb_avail; /**< number of staged packets ready */ > uint16_t rx_next_avail; /**< index of next staged packets */ > uint16_t rx_free_trigger; /**< triggers rx buffer allocation */ > - struct rte_mbuf fake_mbuf; /**< dummy mbuf */ > struct rte_mbuf *rx_stage[RTE_PMD_I40E_RX_MAX_BURST * 2]; > #endif > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH v2] net/i40e: fix compile error 2017-02-20 11:43 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit @ 2017-02-21 1:02 ` Zhang, Qi Z 0 siblings, 0 replies; 7+ messages in thread From: Zhang, Qi Z @ 2017-02-21 1:02 UTC (permalink / raw) To: Yigit, Ferruh, Wu, Jingjing, Zhang, Helin; +Cc: dev, stable Hi Ferruh: > -----Original Message----- > From: Yigit, Ferruh > Sent: Monday, February 20, 2017 7:44 PM > To: Zhang, Qi Z <qi.z.zhang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; > Zhang, Helin <helin.zhang@intel.com> > Cc: dev@dpdk.org; stable@dpdk.org > Subject: Re: [dpdk-stable] [PATCH v2] net/i40e: fix compile error > > On 2/20/2017 12:08 AM, Qi Zhang wrote: > > This patch fix the compile error when > > RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC > > is disabled. > > Compile error: > CC i40e_rxtx_vec_sse.o > .../drivers/net/i40e/i40e_rxtx_vec_sse.c:72:26: > error: no member named 'fake_mbuf' in 'struct i40e_rx_queue' > rxep[i].mbuf = &rxq->fake_mbuf; > ~~~ ^ > > > > > Fixes: 9ed94e5bb04e ("i40e: add vector Rx") > > Cc: stable@dpdk.org > > > > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> > > --- > > drivers/net/i40e/i40e_rxtx.c | 2 +- > > drivers/net/i40e/i40e_rxtx.h | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/net/i40e/i40e_rxtx.c > > b/drivers/net/i40e/i40e_rxtx.c index 48429cc..40f4a45 100644 > > --- a/drivers/net/i40e/i40e_rxtx.c > > +++ b/drivers/net/i40e/i40e_rxtx.c > > @@ -2209,11 +2209,11 @@ i40e_reset_rx_queue(struct i40e_rx_queue > *rxq) > > for (i = 0; i < len * sizeof(union i40e_rx_desc); i++) > > ((volatile char *)rxq->rx_ring)[i] = 0; > > > > -#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC > > memset(&rxq->fake_mbuf, 0x0, sizeof(rxq->fake_mbuf)); > > for (i = 0; i < RTE_PMD_I40E_RX_MAX_BURST; ++i) > > rxq->sw_ring[rxq->nb_rx_desc + i].mbuf = &rxq->fake_mbuf; > > > > +#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC > > Hi Qi, > > Just to double check, below update in i40e_rxtx.h is enough to fix the build > error. > > Can you please confirm assigning fake_mbuf to sw_ring[] is required step, > independent from RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC enabled or not? I think it's necessary to assign fake_mbuf for couple additional entries in sw_ring Because there is no place to initialize these entries (i40e_rxq_rearm only cover entries round in nb_rx_desc) while _recv_raw_pkts_vec require these entries in some situation.(though only RTE_I40E_DESCS_PER_LOOP-1 entries are required, but we can reuse the code) > And it can be good to document this in commit log. OK, I will add it in v3 > > Thanks, > ferruh > > > > rxq->rx_nb_avail = 0; > > rxq->rx_next_avail = 0; > > rxq->rx_free_trigger = (uint16_t)(rxq->rx_free_thresh - 1); diff > > --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h > > index 9df8a56..4f7f319 100644 > > --- a/drivers/net/i40e/i40e_rxtx.h > > +++ b/drivers/net/i40e/i40e_rxtx.h > > @@ -119,11 +119,11 @@ struct i40e_rx_queue { > > uint16_t nb_rx_hold; /**< number of held free RX desc */ > > struct rte_mbuf *pkt_first_seg; /**< first segment of current packet */ > > struct rte_mbuf *pkt_last_seg; /**< last segment of current packet > > */ > > + struct rte_mbuf fake_mbuf; /**< dummy mbuf */ > > #ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC > > uint16_t rx_nb_avail; /**< number of staged packets ready */ > > uint16_t rx_next_avail; /**< index of next staged packets */ > > uint16_t rx_free_trigger; /**< triggers rx buffer allocation */ > > - struct rte_mbuf fake_mbuf; /**< dummy mbuf */ > > struct rte_mbuf *rx_stage[RTE_PMD_I40E_RX_MAX_BURST * 2]; #endif > > > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* [dpdk-dev] [PATCH v3] net/i40e: fix compile error 2017-02-20 0:08 [dpdk-dev] [PATCH v2] net/i40e: fix compile error Qi Zhang 2017-02-20 11:43 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit @ 2017-02-20 18:11 ` Qi Zhang 2017-02-21 8:15 ` [dpdk-dev] [dpdk-stable] " De Lara Guarch, Pablo 2017-02-22 17:51 ` Ferruh Yigit 1 sibling, 2 replies; 7+ messages in thread From: Qi Zhang @ 2017-02-20 18:11 UTC (permalink / raw) To: jingjing.wu, helin.zhang; +Cc: dev, Qi Zhang, stable This patch fix the compile error when RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC is disabled. fake_mbuf is also required to be initialized and assigned to additional sw_ring entries for vector PMD. Fixes: 9ed94e5bb04e ("i40e: add vector Rx") Cc: stable@dpdk.org Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> --- drivers/net/i40e/i40e_rxtx.c | 2 +- drivers/net/i40e/i40e_rxtx.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 48429cc..40f4a45 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -2209,11 +2209,11 @@ i40e_reset_rx_queue(struct i40e_rx_queue *rxq) for (i = 0; i < len * sizeof(union i40e_rx_desc); i++) ((volatile char *)rxq->rx_ring)[i] = 0; -#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC memset(&rxq->fake_mbuf, 0x0, sizeof(rxq->fake_mbuf)); for (i = 0; i < RTE_PMD_I40E_RX_MAX_BURST; ++i) rxq->sw_ring[rxq->nb_rx_desc + i].mbuf = &rxq->fake_mbuf; +#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC rxq->rx_nb_avail = 0; rxq->rx_next_avail = 0; rxq->rx_free_trigger = (uint16_t)(rxq->rx_free_thresh - 1); diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h index 9df8a56..4f7f319 100644 --- a/drivers/net/i40e/i40e_rxtx.h +++ b/drivers/net/i40e/i40e_rxtx.h @@ -119,11 +119,11 @@ struct i40e_rx_queue { uint16_t nb_rx_hold; /**< number of held free RX desc */ struct rte_mbuf *pkt_first_seg; /**< first segment of current packet */ struct rte_mbuf *pkt_last_seg; /**< last segment of current packet */ + struct rte_mbuf fake_mbuf; /**< dummy mbuf */ #ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC uint16_t rx_nb_avail; /**< number of staged packets ready */ uint16_t rx_next_avail; /**< index of next staged packets */ uint16_t rx_free_trigger; /**< triggers rx buffer allocation */ - struct rte_mbuf fake_mbuf; /**< dummy mbuf */ struct rte_mbuf *rx_stage[RTE_PMD_I40E_RX_MAX_BURST * 2]; #endif -- 2.7.4 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH v3] net/i40e: fix compile error 2017-02-20 18:11 ` [dpdk-dev] [PATCH v3] " Qi Zhang @ 2017-02-21 8:15 ` De Lara Guarch, Pablo 2017-02-22 1:04 ` Zhang, Qi Z 2017-02-22 17:51 ` Ferruh Yigit 1 sibling, 1 reply; 7+ messages in thread From: De Lara Guarch, Pablo @ 2017-02-21 8:15 UTC (permalink / raw) To: Zhang, Qi Z, Wu, Jingjing, Zhang, Helin; +Cc: dev, Zhang, Qi Z, stable Hi Qi, > -----Original Message----- > From: stable [mailto:stable-bounces@dpdk.org] On Behalf Of Qi Zhang > Sent: Monday, February 20, 2017 6:12 PM > To: Wu, Jingjing; Zhang, Helin > Cc: dev@dpdk.org; Zhang, Qi Z; stable@dpdk.org > Subject: [dpdk-stable] [PATCH v3] net/i40e: fix compile error > > This patch fix the compile error when > RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC > is disabled. fake_mbuf is also required to be initialized and assigned to > additional sw_ring entries for vector PMD. > > Fixes: 9ed94e5bb04e ("i40e: add vector Rx") > Cc: stable@dpdk.org > > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> > --- Please, try to remember to include the changes you have made in the different revisions, after the "---". Thanks, Pablo ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH v3] net/i40e: fix compile error 2017-02-21 8:15 ` [dpdk-dev] [dpdk-stable] " De Lara Guarch, Pablo @ 2017-02-22 1:04 ` Zhang, Qi Z 0 siblings, 0 replies; 7+ messages in thread From: Zhang, Qi Z @ 2017-02-22 1:04 UTC (permalink / raw) To: De Lara Guarch, Pablo, Wu, Jingjing, Zhang, Helin; +Cc: dev, stable Thanks for reminder, will follow:) > -----Original Message----- > From: De Lara Guarch, Pablo > Sent: Tuesday, February 21, 2017 4:15 PM > To: Zhang, Qi Z <qi.z.zhang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; > Zhang, Helin <helin.zhang@intel.com> > Cc: dev@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>; stable@dpdk.org > Subject: RE: [dpdk-stable] [PATCH v3] net/i40e: fix compile error > > Hi Qi, > > > -----Original Message----- > > From: stable [mailto:stable-bounces@dpdk.org] On Behalf Of Qi Zhang > > Sent: Monday, February 20, 2017 6:12 PM > > To: Wu, Jingjing; Zhang, Helin > > Cc: dev@dpdk.org; Zhang, Qi Z; stable@dpdk.org > > Subject: [dpdk-stable] [PATCH v3] net/i40e: fix compile error > > > > This patch fix the compile error when > > RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC > > is disabled. fake_mbuf is also required to be initialized and assigned > > to additional sw_ring entries for vector PMD. > > > > Fixes: 9ed94e5bb04e ("i40e: add vector Rx") > > Cc: stable@dpdk.org > > > > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> > > --- > > Please, try to remember to include the changes you have made in the different > revisions, after the "---". > > Thanks, > Pablo > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH v3] net/i40e: fix compile error 2017-02-20 18:11 ` [dpdk-dev] [PATCH v3] " Qi Zhang 2017-02-21 8:15 ` [dpdk-dev] [dpdk-stable] " De Lara Guarch, Pablo @ 2017-02-22 17:51 ` Ferruh Yigit 1 sibling, 0 replies; 7+ messages in thread From: Ferruh Yigit @ 2017-02-22 17:51 UTC (permalink / raw) To: Qi Zhang, jingjing.wu, helin.zhang; +Cc: dev, stable On 2/20/2017 6:11 PM, Qi Zhang wrote: > This patch fix the compile error when RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC > is disabled. fake_mbuf is also required to be initialized and assigned to > additional sw_ring entries for vector PMD. > > Fixes: 9ed94e5bb04e ("i40e: add vector Rx") > Cc: stable@dpdk.org > > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> Fixes: 4861cde46116 ("i40e: new poll mode driver") Applied to dpdk-next-net/master, thanks. ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-02-22 17:51 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-02-20 0:08 [dpdk-dev] [PATCH v2] net/i40e: fix compile error Qi Zhang 2017-02-20 11:43 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit 2017-02-21 1:02 ` Zhang, Qi Z 2017-02-20 18:11 ` [dpdk-dev] [PATCH v3] " Qi Zhang 2017-02-21 8:15 ` [dpdk-dev] [dpdk-stable] " De Lara Guarch, Pablo 2017-02-22 1:04 ` Zhang, Qi Z 2017-02-22 17:51 ` Ferruh Yigit
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).