From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from nbfkord-smmo02.seg.att.com (nbfkord-smmo02.seg.att.com [209.65.160.78]) by dpdk.org (Postfix) with ESMTP id 6BF173DC for ; Thu, 9 Mar 2017 12:49:58 +0100 (CET) Received: from unknown [193.34.186.16] (EHLO webmail.solarflare.com) by nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) with ESMTP id 66141c85.2ae002e0a940.1388559.00-2474.3843238.nbfkord-smmo02.seg.att.com (envelope-from ); Thu, 09 Mar 2017 11:49:58 +0000 (UTC) X-MXL-Hash: 58c1416673c6b754-94587dda9131dd5d0f8e7562dedb141c239b7301 Received: from unknown [193.34.186.16] (EHLO webmail.solarflare.com) by nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) over TLS secured channel with ESMTP id 36141c85.0.1388556.00-2245.3843232.nbfkord-smmo02.seg.att.com (envelope-from ); Thu, 09 Mar 2017 11:49:56 +0000 (UTC) X-MXL-Hash: 58c141644fcccbe4-5094d9c72ad48ddd7e94d8479ad3be936eca11df Received: from [192.168.38.17] (84.52.89.52) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Thu, 9 Mar 2017 11:49:47 +0000 To: Olivier Matz , , , , , , , , References: <1488388752-1819-1-git-send-email-olivier.matz@6wind.com> <1488902393-7237-1-git-send-email-olivier.matz@6wind.com> <1488902393-7237-2-git-send-email-olivier.matz@6wind.com> CC: , , From: Andrew Rybchenko Message-ID: <677af603-c3e7-fe3d-7c1c-51e79fef4d70@solarflare.com> Date: Thu, 9 Mar 2017 14:49:42 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <1488902393-7237-2-git-send-email-olivier.matz@6wind.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [84.52.89.52] X-ClientProxiedBy: ocex03.SolarFlarecom.com (10.20.40.36) To ukex01.SolarFlarecom.com (10.17.10.4) X-TM-AS-Product-Ver: SMEX-11.0.0.1191-8.100.1062-22930.003 X-TM-AS-Result: No--8.355900-0.000000-31 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-AnalysisOut: [v=2.1 cv=T6yKOq+Q c=1 sm=1 tr=0 a=8P+NB+fYZDP74ap4g4d9Kw==] X-AnalysisOut: [:17 a=RB3BGLmKESwA:10 a=IkcTkHD0fZMA:10 a=6Iz7jQTuP9IA:10 ] X-AnalysisOut: [a=4YC7WVefAAAA:8 a=zRKbQ67AAAAA:8 a=uUSmQ-OCriOLwM_I3tcA:9] X-AnalysisOut: [ a=QEXdDO2ut3YA:10 a=tPzOKt3quolVTVSLigK1:22 a=PA03WX8tBze] X-AnalysisOut: [izutn5_OT:22] X-Spam: [F=0.3088727689; CM=0.500; S=0.308(2015072901)] X-MAIL-FROM: X-SOURCE-IP: [193.34.186.16] Subject: Re: [dpdk-dev] [PATCH v2 1/6] ethdev: add descriptor status API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2017 11:49:59 -0000 On 03/07/2017 06:59 PM, Olivier Matz wrote: > Introduce a new API to get the status of a descriptor. > > For Rx, it is almost similar to rx_descriptor_done API, except it > differentiates "used" descriptors (which are hold by the driver and not > returned to the hardware). > > For Tx, it is a new API. > > The descriptor_done() API, and probably the rx_queue_count() API could > be replaced by this new API as soon as it is implemented on all PMDs. > > Signed-off-by: Olivier Matz > --- > doc/guides/nics/features/default.ini | 2 + > lib/librte_ether/rte_ethdev.h | 125 +++++++++++++++++++++++++++++++++++ > 2 files changed, 127 insertions(+) > > diff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini > index 9e363ff..0e6a78d 100644 > --- a/doc/guides/nics/features/default.ini > +++ b/doc/guides/nics/features/default.ini > @@ -49,6 +49,8 @@ Inner L3 checksum = > Inner L4 checksum = > Packet type parsing = > Timesync = > +Rx Descriptor Status = > +Tx Descriptor Status = > Basic stats = > Extended stats = > Stats per queue = > diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h > index 97f3e2d..904ecbe 100644 > --- a/lib/librte_ether/rte_ethdev.h > +++ b/lib/librte_ether/rte_ethdev.h > @@ -1179,6 +1179,12 @@ typedef uint32_t (*eth_rx_queue_count_t)(struct rte_eth_dev *dev, > typedef int (*eth_rx_descriptor_done_t)(void *rxq, uint16_t offset); > /**< @internal Check DD bit of specific RX descriptor */ > > +typedef int (*eth_rx_descriptor_status_t)(void *rxq, uint16_t offset); > +/**< @internal Check the status of a Rx descriptor */ > + > +typedef int (*eth_tx_descriptor_status_t)(void *txq, uint16_t offset); > +/**< @internal Check the status of a Tx descriptor */ > + > typedef int (*eth_fw_version_get_t)(struct rte_eth_dev *dev, > char *fw_version, size_t fw_size); > /**< @internal Get firmware information of an Ethernet device. */ > @@ -1483,6 +1489,10 @@ struct eth_dev_ops { > eth_queue_release_t rx_queue_release; /**< Release RX queue. */ > eth_rx_queue_count_t rx_queue_count;/**< Get Rx queue count. */ > eth_rx_descriptor_done_t rx_descriptor_done; /**< Check rxd DD bit. */ > + eth_rx_descriptor_status_t rx_descriptor_status; > + /**< Check the status of a Rx descriptor. */ > + eth_tx_descriptor_status_t tx_descriptor_status; > + /**< Check the status of a Tx descriptor. */ > eth_rx_enable_intr_t rx_queue_intr_enable; /**< Enable Rx queue interrupt. */ > eth_rx_disable_intr_t rx_queue_intr_disable; /**< Disable Rx queue interrupt. */ > eth_tx_queue_setup_t tx_queue_setup;/**< Set up device TX queue. */ > @@ -2768,6 +2778,121 @@ rte_eth_rx_descriptor_done(uint8_t port_id, uint16_t queue_id, uint16_t offset) > dev->data->rx_queues[queue_id], offset); > } > > +#define RTE_ETH_RX_DESC_AVAIL 0 /**< Desc available for hw. */ > +#define RTE_ETH_RX_DESC_DONE 1 /**< Desc done, filled by hw. */ > +#define RTE_ETH_RX_DESC_UNAVAIL 2 /**< Desc used by driver or hw. */ > + > +/** > + * Check the status of a Rx descriptor in the queue > + * > + * It should be called in a similar context than the Rx function: > + * - on a dataplane core > + * - not concurrently on the same queue > + * > + * Since it's a dataplane function, no check is performed on port_id and > + * queue_id. The caller must therefore ensure that the port is enabled > + * and the queue is configured and running. > + * > + * Note: accessing to a random descriptor in the ring may trigger cache > + * misses and have a performance impact. > + * > + * @param port_id > + * A valid port identifier of the Ethernet device which. > + * @param queue_id > + * A valid Rx queue identifier on this port. > + * @param offset > + * The offset of the descriptor starting from tail (0 is the next > + * packet to be received by the driver). > + * > + * @return > + * - (RTE_ETH_RX_DESC_AVAIL): Descriptor is available for the hardware to > + * receive a packet. > + * - (RTE_ETH_RX_DESC_DONE): Descriptor is done, it is filled by hw, but > + * not yet processed by the driver (i.e. in the receive queue). > + * - (RTE_ETH_RX_DESC_UNAVAIL): Descriptor is unavailable, either hold by > + * the driver and not yet returned to hw, or reserved by the hw. > + * - (-EINVAL) bad descriptor offset. > + * - (-ENOTSUP) if the device does not support this function. > + * - (-ENODEV) bad port or queue (only if compiled with debug). > + */ > +static inline int > +rte_eth_rx_descriptor_status(uint8_t port_id, uint16_t queue_id, > + uint16_t offset) > +{ > + struct rte_eth_dev *dev; > + void *rxq; > + > +#ifdef RTE_LIBRTE_ETHDEV_DEBUG > + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); > +#endif > + dev = &rte_eth_devices[port_id]; > +#ifdef RTE_LIBRTE_ETHDEV_DEBUG > + if (queue_id >= dev->data->nb_rx_queues) > + return -ENODEV; > +#endif > + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_descriptor_status, -ENOTSUP); > + rxq = dev->data->rx_queues[queue_id]; > + > + return (*dev->dev_ops->rx_descriptor_status)(rxq, offset); > +} > + > +#define RTE_ETH_TX_DESC_FULL 0 /**< Desc filled for hw, waiting xmit. */ > +#define RTE_ETH_TX_DESC_DONE 1 /**< Desc done, packet is transmitted. */ > +#define RTE_ETH_TX_DESC_UNAVAIL 2 /**< Desc used by driver or hw. */ > + > +/** > + * Check the status of a Tx descriptor in the queue. > + * > + * It should be called in a similar context than the Tx function: > + * - on a dataplane core > + * - not concurrently on the same queue > + * > + * Since it's a dataplane function, no check is performed on port_id and > + * queue_id. The caller must therefore ensure that the port is enabled > + * and the queue is configured and running. > + * > + * Note: accessing to a random descriptor in the ring may trigger cache > + * misses and have a performance impact. > + * > + * @param port_id > + * A valid port identifier of the Ethernet device which. > + * @param queue_id > + * A valid Tx queue identifier on this port. > + * @param offset > + * The offset of the descriptor starting from tail (0 is the place where > + * the next packet will be send). > + * > + * @return > + * - (RTE_ETH_TX_DESC_FULL) Descriptor is being processed by the hw, i.e. > + * in the transmit queue. > + * - (RTE_ETH_TX_DESC_DONE) Hardware is done with this descriptor, it can > + * be reused by the driver. > + * - (RTE_ETH_TX_DESC_UNAVAIL): Descriptor is unavailable, reserved by the > + * driver or the hardware. > + * - (-EINVAL) bad descriptor offset. > + * - (-ENOTSUP) if the device does not support this function. > + * - (-ENODEV) bad port or queue (only if compiled with debug). > + */ > +static inline int rte_eth_tx_descriptor_status(uint8_t port_id, > + uint16_t queue_id, uint16_t offset) > +{ > + struct rte_eth_dev *dev; > + void *txq; > + > +#ifdef RTE_LIBRTE_ETHDEV_DEBUG > + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); > +#endif > + dev = &rte_eth_devices[port_id]; > +#ifdef RTE_LIBRTE_ETHDEV_DEBUG > + if (queue_id >= dev->data->nb_tx_queues) > + return -ENODEV; > +#endif > + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_descriptor_status, -ENOTSUP); > + txq = dev->data->tx_queues[queue_id]; > + > + return (*dev->dev_ops->tx_descriptor_status)(txq, offset); > +} > + > /** > * Send a burst of output packets on a transmit queue of an Ethernet device. > * Reviewed-by: Andrew Rybchenko