[dpdk-dev,v4,1/6] fm10k: implement rx_descriptor_done function
Commit Message
rx_descriptor_done is used by interrupt mode example application
(l3fwd-power) to check rxd DD bit to decide the RX trend,
then l3fwd-power will adjust the cpu frequency according to
the result.
Signed-off-by: Shaopeng He <shaopeng.he@intel.com>
Acked-by: Jing Chen <jing.d.chen@intel.com>
---
drivers/net/fm10k/fm10k.h | 3 +++
drivers/net/fm10k/fm10k_ethdev.c | 1 +
drivers/net/fm10k/fm10k_rxtx.c | 25 +++++++++++++++++++++++++
3 files changed, 29 insertions(+)
Comments
On 12/21/2015 6:20 PM, Shaopeng He wrote:
> rx_descriptor_done is used by interrupt mode example application
> (l3fwd-power) to check rxd DD bit to decide the RX trend,
> then l3fwd-power will adjust the cpu frequency according to
> the result.
>
> Signed-off-by: Shaopeng He <shaopeng.he@intel.com>
> Acked-by: Jing Chen <jing.d.chen@intel.com>
> ---
> drivers/net/fm10k/fm10k.h | 3 +++
> drivers/net/fm10k/fm10k_ethdev.c | 1 +
> drivers/net/fm10k/fm10k_rxtx.c | 25 +++++++++++++++++++++++++
> 3 files changed, 29 insertions(+)
>
> diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h
> index cd38af2..e2f677a 100644
> --- a/drivers/net/fm10k/fm10k.h
> +++ b/drivers/net/fm10k/fm10k.h
> @@ -345,6 +345,9 @@ uint16_t fm10k_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
> uint16_t fm10k_recv_scattered_pkts(void *rx_queue,
> struct rte_mbuf **rx_pkts, uint16_t nb_pkts);
>
> +int
> +fm10k_dev_rx_descriptor_done(void *rx_queue, uint16_t offset);
> +
> uint16_t fm10k_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
> uint16_t nb_pkts);
>
> diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
> index e4aed94..d39c33b 100644
> --- a/drivers/net/fm10k/fm10k_ethdev.c
> +++ b/drivers/net/fm10k/fm10k_ethdev.c
> @@ -2435,6 +2435,7 @@ static const struct eth_dev_ops fm10k_eth_dev_ops = {
> .rx_queue_release = fm10k_rx_queue_release,
> .tx_queue_setup = fm10k_tx_queue_setup,
> .tx_queue_release = fm10k_tx_queue_release,
> + .rx_descriptor_done = fm10k_dev_rx_descriptor_done,
> .reta_update = fm10k_reta_update,
> .reta_query = fm10k_reta_query,
> .rss_hash_update = fm10k_rss_hash_update,
> diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c
> index e958865..36d3002 100644
> --- a/drivers/net/fm10k/fm10k_rxtx.c
> +++ b/drivers/net/fm10k/fm10k_rxtx.c
> @@ -369,6 +369,31 @@ fm10k_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
> return nb_rcv;
> }
>
> +int
> +fm10k_dev_rx_descriptor_done(void *rx_queue, uint16_t offset)
> +{
> + volatile union fm10k_rx_desc *rxdp;
> + struct fm10k_rx_queue *rxq = rx_queue;
> + uint16_t desc;
> + int ret;
> +
> + if (unlikely(offset >= rxq->nb_desc)) {
> + PMD_DRV_LOG(ERR, "Invalid RX queue id %u", offset);
Sorry, here makes my confuse: offset for RX queue id?
> + return 0;
> + }
> +
> + desc = rxq->next_dd + offset;
> + if (desc >= rxq->nb_desc)
> + desc -= rxq->nb_desc;
> +
> + rxdp = &rxq->hw_ring[desc];
> +
> + ret = !!(rxdp->w.status &
> + rte_cpu_to_le_16(FM10K_RXD_STATUS_DD));
> +
> + return ret;
> +}
> +
> static inline void tx_free_descriptors(struct fm10k_tx_queue *q)
> {
> uint16_t next_rs, count = 0;
> -----Original Message-----
> From: Qiu, Michael
> Sent: Tuesday, December 22, 2015 2:51 PM
> To: He, Shaopeng; dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v4 1/6] fm10k: implement
> rx_descriptor_done function
>
> On 12/21/2015 6:20 PM, Shaopeng He wrote:
> > rx_descriptor_done is used by interrupt mode example application
> > (l3fwd-power) to check rxd DD bit to decide the RX trend, then
> > l3fwd-power will adjust the cpu frequency according to the result.
> >
> > Signed-off-by: Shaopeng He <shaopeng.he@intel.com>
> > Acked-by: Jing Chen <jing.d.chen@intel.com>
> > ---
> > drivers/net/fm10k/fm10k.h | 3 +++
> > drivers/net/fm10k/fm10k_ethdev.c | 1 +
> > drivers/net/fm10k/fm10k_rxtx.c | 25 +++++++++++++++++++++++++
> > 3 files changed, 29 insertions(+)
> >
> > diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h
> > index cd38af2..e2f677a 100644
> > --- a/drivers/net/fm10k/fm10k.h
> > +++ b/drivers/net/fm10k/fm10k.h
> > @@ -345,6 +345,9 @@ uint16_t fm10k_recv_pkts(void *rx_queue, struct
> > rte_mbuf **rx_pkts, uint16_t fm10k_recv_scattered_pkts(void
> *rx_queue,
> > struct rte_mbuf **rx_pkts, uint16_t nb_pkts);
> >
> > +int
> > +fm10k_dev_rx_descriptor_done(void *rx_queue, uint16_t offset);
> > +
> > uint16_t fm10k_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
> > uint16_t nb_pkts);
> >
> > diff --git a/drivers/net/fm10k/fm10k_ethdev.c
> > b/drivers/net/fm10k/fm10k_ethdev.c
> > index e4aed94..d39c33b 100644
> > --- a/drivers/net/fm10k/fm10k_ethdev.c
> > +++ b/drivers/net/fm10k/fm10k_ethdev.c
> > @@ -2435,6 +2435,7 @@ static const struct eth_dev_ops
> fm10k_eth_dev_ops = {
> > .rx_queue_release = fm10k_rx_queue_release,
> > .tx_queue_setup = fm10k_tx_queue_setup,
> > .tx_queue_release = fm10k_tx_queue_release,
> > + .rx_descriptor_done = fm10k_dev_rx_descriptor_done,
> > .reta_update = fm10k_reta_update,
> > .reta_query = fm10k_reta_query,
> > .rss_hash_update = fm10k_rss_hash_update,
> > diff --git a/drivers/net/fm10k/fm10k_rxtx.c
> > b/drivers/net/fm10k/fm10k_rxtx.c index e958865..36d3002 100644
> > --- a/drivers/net/fm10k/fm10k_rxtx.c
> > +++ b/drivers/net/fm10k/fm10k_rxtx.c
> > @@ -369,6 +369,31 @@ fm10k_recv_scattered_pkts(void *rx_queue,
> struct rte_mbuf **rx_pkts,
> > return nb_rcv;
> > }
> >
> > +int
> > +fm10k_dev_rx_descriptor_done(void *rx_queue, uint16_t offset) {
> > + volatile union fm10k_rx_desc *rxdp;
> > + struct fm10k_rx_queue *rxq = rx_queue;
> > + uint16_t desc;
> > + int ret;
> > +
> > + if (unlikely(offset >= rxq->nb_desc)) {
> > + PMD_DRV_LOG(ERR, "Invalid RX queue id %u", offset);
>
> Sorry, here makes my confuse: offset for RX queue id?
Good catch, will fix it in next version
>
> > + return 0;
> > + }
> > +
> > + desc = rxq->next_dd + offset;
> > + if (desc >= rxq->nb_desc)
> > + desc -= rxq->nb_desc;
> > +
> > + rxdp = &rxq->hw_ring[desc];
> > +
> > + ret = !!(rxdp->w.status &
> > + rte_cpu_to_le_16(FM10K_RXD_STATUS_DD));
> > +
> > + return ret;
> > +}
> > +
> > static inline void tx_free_descriptors(struct fm10k_tx_queue *q) {
> > uint16_t next_rs, count = 0;
@@ -345,6 +345,9 @@ uint16_t fm10k_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t fm10k_recv_scattered_pkts(void *rx_queue,
struct rte_mbuf **rx_pkts, uint16_t nb_pkts);
+int
+fm10k_dev_rx_descriptor_done(void *rx_queue, uint16_t offset);
+
uint16_t fm10k_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts);
@@ -2435,6 +2435,7 @@ static const struct eth_dev_ops fm10k_eth_dev_ops = {
.rx_queue_release = fm10k_rx_queue_release,
.tx_queue_setup = fm10k_tx_queue_setup,
.tx_queue_release = fm10k_tx_queue_release,
+ .rx_descriptor_done = fm10k_dev_rx_descriptor_done,
.reta_update = fm10k_reta_update,
.reta_query = fm10k_reta_query,
.rss_hash_update = fm10k_rss_hash_update,
@@ -369,6 +369,31 @@ fm10k_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
return nb_rcv;
}
+int
+fm10k_dev_rx_descriptor_done(void *rx_queue, uint16_t offset)
+{
+ volatile union fm10k_rx_desc *rxdp;
+ struct fm10k_rx_queue *rxq = rx_queue;
+ uint16_t desc;
+ int ret;
+
+ if (unlikely(offset >= rxq->nb_desc)) {
+ PMD_DRV_LOG(ERR, "Invalid RX queue id %u", offset);
+ return 0;
+ }
+
+ desc = rxq->next_dd + offset;
+ if (desc >= rxq->nb_desc)
+ desc -= rxq->nb_desc;
+
+ rxdp = &rxq->hw_ring[desc];
+
+ ret = !!(rxdp->w.status &
+ rte_cpu_to_le_16(FM10K_RXD_STATUS_DD));
+
+ return ret;
+}
+
static inline void tx_free_descriptors(struct fm10k_tx_queue *q)
{
uint16_t next_rs, count = 0;