On Wed, Nov 6, 2019 at 4:57 PM Sunil Kumar Kori <skori@marvell.com> wrote:
>
> Retrieve burst mode information according to the selected Rx/Tx mode and
> offloads.
>
> Signed-off-by: Sunil Kumar Kori <skori@marvell.com>
> ---
> v3:
> - Rebased the patch over patches.dpdk.org/patch/62368/
> v2:
> - Rebased the patch on latest commit.
> - Update feature matrix for the support.
>
> doc/guides/nics/features/octeontx2.ini | 1 +
> drivers/net/octeontx2/otx2_ethdev.c | 2 +
> drivers/net/octeontx2/otx2_ethdev.h | 4 ++
> drivers/net/octeontx2/otx2_ethdev_ops.c | 87 +++++++++++++++++++++++++
> 4 files changed, 94 insertions(+)
>
>
> +int
> +otx2_rx_burst_mode_get(struct rte_eth_dev *eth_dev,
> + __rte_unused uint16_t queue_id,
> + struct rte_eth_burst_mode *mode)
> +{
> +#define STRING_SIZE 1024
Use RTE_ETH_BURST_MODE_INFO_SIZE instead of hardcoded 1024
> + struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
> + char info[STRING_SIZE] = {'\0'};
No need for intermediate "info", use rte_eth_burst_mode::info
> + ssize_t bytes = 0;
> +
> + if (dev->scalar_ena)
> + bytes += rte_strscpy(info, "Scalar", 7);
Please avoid hardcoding of '7'.
ssize_t sz = 0, rc;
rc = rte_strscpy(mode->info + sz, "Scalar", STRING_SIZE - sz);
if (rc < 0)
goto done;
sz += rc;
rc = rte_strscpy(mode->info + sz, "Vector Neon", STRING_SIZE - sz);
if (rc < 0)
goto done;
sz += rc;
> + else
> + bytes += rte_strscpy(info, "Vector Neon", 12);
> +
> + bytes += rte_strscpy(info + bytes, ", Rx Offloads:", 15);
> +
> + if (dev->rx_offload_flags & NIX_RX_OFFLOAD_RSS_F)
> + bytes += rte_strscpy(info + bytes, " RSS,", 6);
> +
> + if (dev->rx_offload_flags & NIX_RX_OFFLOAD_PTYPE_F)
> + bytes += rte_strscpy(info + bytes, " Ptype,", 8);
@@ -13,6 +13,7 @@ Link status = Y
Link status event = Y
Runtime Rx queue setup = Y
Runtime Tx queue setup = Y
+Burst mode info = Y
Fast mbuf free = Y
Free Tx mbuf on demand = Y
Queue start/stop = Y
@@ -1978,6 +1978,8 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.xstats_get_names_by_id = otx2_nix_xstats_get_names_by_id,
.rxq_info_get = otx2_nix_rxq_info_get,
.txq_info_get = otx2_nix_txq_info_get,
+ .rx_burst_mode_get = otx2_rx_burst_mode_get,
+ .tx_burst_mode_get = otx2_tx_burst_mode_get,
.rx_queue_count = otx2_nix_rx_queue_count,
.rx_descriptor_done = otx2_nix_rx_descriptor_done,
.rx_descriptor_status = otx2_nix_rx_descriptor_status,
@@ -388,6 +388,10 @@ void otx2_nix_rxq_info_get(struct rte_eth_dev *eth_dev, uint16_t queue_id,
struct rte_eth_rxq_info *qinfo);
void otx2_nix_txq_info_get(struct rte_eth_dev *eth_dev, uint16_t queue_id,
struct rte_eth_txq_info *qinfo);
+int otx2_rx_burst_mode_get(struct rte_eth_dev *dev, uint16_t queue_id,
+ struct rte_eth_burst_mode *mode);
+int otx2_tx_burst_mode_get(struct rte_eth_dev *dev, uint16_t queue_id,
+ struct rte_eth_burst_mode *mode);
uint32_t otx2_nix_rx_queue_count(struct rte_eth_dev *eth_dev, uint16_t qidx);
int otx2_nix_tx_done_cleanup(void *txq, uint32_t free_cnt);
int otx2_nix_rx_descriptor_done(void *rxq, uint16_t offset);
@@ -2,6 +2,7 @@
* Copyright(C) 2019 Marvell International Ltd.
*/
+#include <rte_ethdev.h>
#include <rte_mbuf_pool_ops.h>
#include "otx2_ethdev.h"
@@ -221,6 +222,92 @@ otx2_nix_txq_info_get(struct rte_eth_dev *eth_dev, uint16_t queue_id,
qinfo->conf.tx_deferred_start = 0;
}
+int
+otx2_rx_burst_mode_get(struct rte_eth_dev *eth_dev,
+ __rte_unused uint16_t queue_id,
+ struct rte_eth_burst_mode *mode)
+{
+#define STRING_SIZE 1024
+ struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+ char info[STRING_SIZE] = {'\0'};
+ ssize_t bytes = 0;
+
+ if (dev->scalar_ena)
+ bytes += rte_strscpy(info, "Scalar", 7);
+ else
+ bytes += rte_strscpy(info, "Vector Neon", 12);
+
+ bytes += rte_strscpy(info + bytes, ", Rx Offloads:", 15);
+
+ if (dev->rx_offload_flags & NIX_RX_OFFLOAD_RSS_F)
+ bytes += rte_strscpy(info + bytes, " RSS,", 6);
+
+ if (dev->rx_offload_flags & NIX_RX_OFFLOAD_PTYPE_F)
+ bytes += rte_strscpy(info + bytes, " Ptype,", 8);
+
+ if (dev->rx_offload_flags & NIX_RX_OFFLOAD_CHECKSUM_F)
+ bytes += rte_strscpy(info + bytes, " Checksum,", 11);
+
+ if (dev->rx_offload_flags & NIX_RX_OFFLOAD_VLAN_STRIP_F)
+ bytes += rte_strscpy(info + bytes, " VLAN Strip,", 13);
+
+ if (dev->rx_offload_flags & NIX_RX_OFFLOAD_MARK_UPDATE_F)
+ bytes += rte_strscpy(info + bytes, " Mark Update,", 14);
+
+ if (dev->rx_offload_flags & NIX_RX_OFFLOAD_TSTAMP_F)
+ bytes += rte_strscpy(info + bytes, " Timestamp,", 12);
+
+ if (dev->rx_offload_flags & NIX_RX_MULTI_SEG_F)
+ bytes += rte_strscpy(info + bytes, " Scattered,", 12);
+
+ /* Copy required string into output buffer */
+ rte_strscpy(mode->info, info, bytes + 1);
+ return 0;
+}
+
+int
+otx2_tx_burst_mode_get(struct rte_eth_dev *eth_dev,
+ __rte_unused uint16_t queue_id,
+ struct rte_eth_burst_mode *mode)
+{
+#define STRING_SIZE 1024
+ struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+ char info[STRING_SIZE] = {'\0'};
+ ssize_t bytes = 0;
+
+ if (dev->scalar_ena)
+ bytes += rte_strscpy(info, "Scalar", 7);
+ else
+ bytes += rte_strscpy(info, "Vector Neon", 12);
+
+ bytes += rte_strscpy(info + bytes, ", Tx Offloads:", 15);
+
+ if (dev->tx_offload_flags & NIX_TX_OFFLOAD_L3_L4_CSUM_F)
+ bytes += rte_strscpy(info + bytes, " Inner L3/L4 csum,", 19);
+
+ if (dev->tx_offload_flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)
+ bytes += rte_strscpy(info + bytes, " Outer L3/L4 csum,", 19);
+
+ if (dev->tx_offload_flags & NIX_TX_OFFLOAD_VLAN_QINQ_F)
+ bytes += rte_strscpy(info + bytes, " VLAN Insertion,", 16);
+
+ if (dev->tx_offload_flags & NIX_TX_OFFLOAD_MBUF_NOFF_F)
+ bytes += rte_strscpy(info + bytes, " MBUF free disable,", 20);
+
+ if (dev->tx_offload_flags & NIX_TX_OFFLOAD_TSTAMP_F)
+ bytes += rte_strscpy(info + bytes, " Timestamp,", 12);
+
+ if (dev->tx_offload_flags & NIX_TX_OFFLOAD_TSO_F)
+ bytes += rte_strscpy(info + bytes, " TSO,", 6);
+
+ if (dev->tx_offload_flags & NIX_RX_MULTI_SEG_F)
+ bytes += rte_strscpy(info + bytes, " Scattered,", 12);
+
+ /* Copy required string into output buffer */
+ rte_strscpy(mode->info, info, bytes + 1);
+ return 0;
+}
+
static void
nix_rx_head_tail_get(struct otx2_eth_dev *dev,
uint32_t *head, uint32_t *tail, uint16_t queue_idx)