[dpdk-dev] [PATCH v2] net/ice: support device-specific DDP package loading

[Ting Xu]

This patch adds the feature that supports loading DDP package
according to the device serial number. Prior to loading the
default DDP package (ice.pkg), the driver will check for the
presence of a device-specific DDP package with the name containing
64-bit PCIe Device Serial Number (ice-.pkg)
during initialization. Users can use "lspci -vs" to get the device
serial number.
The pkg search path are /lib/firmware/updates/intel/ice/ddp/ and
/lib/firmware/intel/ice/ddp/. If the package exists, the driver
will download it to the device instead of the default one. The
loaded package type (OS default or Comms) will be stored in
ice_adapter->active_pkg_type. The package version is stored in
ice_hw->active_pkg_ver. These fields can be used in other features.

Signed-off-by: Ting Xu 
---
 drivers/net/ice/ice_ethdev.c | 131 ++-
 drivers/net/ice/ice_ethdev.h |   8 +++
 2 files changed, 138 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 686d6f00f..5d0689df0 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -28,7 +28,15 @@ static const char * const ice_valid_args[] = {
 };
 
 #define ICE_DFLT_OUTER_TAG_TYPE ICE_AQ_VSI_OUTER_TAG_VLAN_9100
+
+/* DDP package search path */
 #define ICE_DFLT_PKG_FILE "/lib/firmware/intel/ice/ddp/ice.pkg"
+#define ICE_PKG_FILE_SEARCH_PATH_DEFAULT "/lib/firmware/intel/ice/ddp/"
+#define ICE_PKG_FILE_SEARCH_PATH_UPDATES "/lib/firmware/updates/intel/ice/ddp/"
+
+#define ICE_OS_DEFAULT_PKG_NAME"ICE OS Default Package"
+#define ICE_COMMS_PKG_NAME "ICE COMMS Package"
+#define ICE_MAX_PKG_FILENAME_SIZE   256
 
 int ice_logtype_init;
 int ice_logtype_driver;
@@ -1265,15 +1273,133 @@ ice_pf_setup(struct ice_pf *pf)
return 0;
 }
 
+/* PCIe configuration space setting */
+#define PCI_CFG_SPACE_SIZE  256
+#define PCI_CFG_SPACE_EXP_SIZE  4096
+#define PCI_EXT_CAP_ID(header)  (int)((header) & 0x)
+#define PCI_EXT_CAP_NEXT(header)(((header) >> 20) & 0xffc)
+#define PCI_EXT_CAP_ID_DSN  0x03
+
+static int
+ice_pci_find_next_ext_capability(struct rte_pci_device *dev, int cap)
+{
+   uint32_t header;
+   int ttl;
+   int pos = PCI_CFG_SPACE_SIZE;
+
+   /* minimum 8 bytes per capability */
+   ttl = (PCI_CFG_SPACE_EXP_SIZE - PCI_CFG_SPACE_SIZE) / 8;
+
+   if (rte_pci_read_config(dev, &header, 4, pos) < 0) {
+   PMD_INIT_LOG(ERR, "ice error reading extended capabilities\n");
+   return -1;
+   }
+
+   /*
+* If we have no capabilities, this is indicated by cap ID,
+* cap version and next pointer all being 0.
+*/
+   if (header == 0)
+   return 0;
+
+   while (ttl-- > 0) {
+   if (PCI_EXT_CAP_ID(header) == cap)
+   return pos;
+
+   pos = PCI_EXT_CAP_NEXT(header);
+
+   if (pos < PCI_CFG_SPACE_SIZE)
+   break;
+
+   if (rte_pci_read_config(dev, &header, 4, pos) < 0) {
+   PMD_INIT_LOG(ERR, "ice error reading extended 
capabilities\n");
+   return -1;
+   }
+   }
+
+   return 0;
+}
+
+/* Extract device serial number from PCIe Configuration Space and
+ * determine the pkg file path according to the DSN.
+ */
+static int
+ice_pkg_file_search_path(struct rte_pci_device *pci_dev, char *pkg_file)
+{
+   int pos;
+   char opt_ddp_filename[ICE_MAX_PKG_FILENAME_SIZE];
+   uint32_t dword;
+   uint32_t dsn_low, dsn_high;
+
+   pos = ice_pci_find_next_ext_capability(pci_dev, PCI_EXT_CAP_ID_DSN);
+
+   if (pos) {
+   rte_pci_read_config(pci_dev, &dword, 4, pos + 4);
+   dsn_low = dword;
+   rte_pci_read_config(pci_dev, &dword, 4, pos + 8);
+   dsn_high = dword;
+   snprintf(opt_ddp_filename, ICE_MAX_PKG_FILENAME_SIZE,
+"ice-%08x%08x.pkg", dsn_high, dsn_low);
+   } else {
+   PMD_INIT_LOG(INFO, "Failed to read device serial number\n");
+   strncpy(pkg_file, ICE_DFLT_PKG_FILE, ICE_MAX_PKG_FILENAME_SIZE);
+
+   return 0;
+   }
+
+   strncpy(pkg_file, ICE_PKG_FILE_SEARCH_PATH_UPDATES,
+   ICE_MAX_PKG_FILENAME_SIZE);
+   if (!access(strncat(pkg_file, opt_ddp_filename,
+   ICE_MAX_PKG_FILENAME_SIZE - strlen(pkg_file) - 1), 0))
+   return 0;
+
+   strncpy(pkg_file, ICE_PKG_FILE_SEARCH_PATH_DEFAULT,
+   ICE_MAX_PKG_FILENAME_SIZE);
+   if (!access(strncat(pkg_file, opt_ddp_filename,
+   ICE_MAX_PKG_FILENAME_SIZE - strlen(pkg_file) - 1), 0))
+   return 0;
+
+   strncpy(pkg_file, ICE_DFLT_PKG_FILE, ICE_MAX_PKG_FILENAME_SIZE);
+   return 0;
+}
+
+static enum ice_pkg_type
+ice_get_pkg_type(struct ice_hw *hw)
+{
+   enum ice_pkg_type p

Re: [dpdk-dev] [RFC v3] net/memif: allow for full key size in socket name

[Jakub Grajciar -X (jgrajcia - PANTHEON TECHNOLOGIES at Cisco)]

> -Original Message-
> From: Stephen Hemminger 
> Sent: Tuesday, July 16, 2019 7:21 PM
> To: dev@dpdk.org; Jakub Grajciar -X (jgrajcia - PANTHEON TECHNOLOGIES at
> Cisco) 
> Cc: Stephen Hemminger 
> Subject: [RFC v3] net/memif: allow for full key size in socket name
> 
> The key size for memif is 256 but the unix domain socket structure has
> space for 100 bytes. Change it to use a larger buffer and not hard
> code the keysize everywhere.
> 
> Not sure what purpose of socket is anyway since there is no code
> which connects to it in the current tree anyway?

See memif_connect_slave in memif_socket.c

> 
> Still an RFC, have no way to test.
> 
> Signed-off-by: Stephen Hemminger 

Tested-by: Jakub Grajciar 

Re: [dpdk-dev] [PATCH] net/af_xdp: enable support for unaligned umem chunks

[Loftus, Ciara]

> 
> This patch enables the unaligned chunks feature for AF_XDP which allows
> chunks to be placed at arbitrary places in the umem, as opposed to them
> being required to be aligned to 2k. This allows for DPDK application
> mempools to be mapped directly into the umem and in turn enable zero
> copy transfer between umem and the PMD.
> 
> This patch replaces the zero copy via external mbuf mechanism introduced in
> commit e9ff8bb71943 ("net/af_xdp: enable zero copy by external mbuf").
> The pmd_zero copy vdev argument is also removed as now the PMD will
> auto-detect presence of the unaligned chunks feature and enable it if so and
> otherwise fall back to copy mode if not detected.
> 
> When enabled, this feature significantly improves single-core performance
> of the PMD.
> 
> Signed-off-by: Ciara Loftus 
> Signed-off-by: Kevin Laatz 
> ---

Apologies for omitting this detail from the original mail.
Those wishing to try out this feature need to first apply this series which is 
currently under review to their kernel tree:
https://lore.kernel.org/bpf/20190827022531.15060-1-kevin.la...@intel.com/T/#u

Thanks,
Ciara

Re: [dpdk-dev] [PATCH 02/22] net/hns3: add some definitions for data structure and macro

[Gavin Hu (Arm Technology China)]

Hi Xavier,

> -Original Message-
> From: dev  On Behalf Of Wei Hu (Xavier)
> Sent: Friday, August 23, 2019 9:47 PM
> To: dev@dpdk.org
> Cc: linux...@huawei.com; xavier_hu...@163.com;
> liudongdo...@huawei.com; forest.zhouch...@huawei.com
> Subject: [dpdk-dev] [PATCH 02/22] net/hns3: add some definitions for data
> structure and macro
>
> This patch adds some data structure definitions, macro definitions and
> inline functions for hns3 PMD drivers.
>
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Hao Chen 
> Signed-off-by: Huisong Li 
> ---
>  drivers/net/hns3/hns3_ethdev.h | 609
> +
>  1 file changed, 609 insertions(+)
>  create mode 100644 drivers/net/hns3/hns3_ethdev.h
>
> diff --git a/drivers/net/hns3/hns3_ethdev.h
> b/drivers/net/hns3/hns3_ethdev.h
> new file mode 100644
> index 000..bfb54f2
> --- /dev/null
> +++ b/drivers/net/hns3/hns3_ethdev.h
> @@ -0,0 +1,609 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2018-2019 Hisilicon Limited.
> + */
> +
> +#ifndef _HNS3_ETHDEV_H_
> +#define _HNS3_ETHDEV_H_
> +
> +#include 
> +#include 
> +
> +/* Vendor ID */
> +#define PCI_VENDOR_ID_HUAWEI 0x19e5
> +
> +/* Device IDs */
> +#define HNS3_DEV_ID_GE   0xA220
> +#define HNS3_DEV_ID_25GE 0xA221
> +#define HNS3_DEV_ID_25GE_RDMA0xA222
> +#define HNS3_DEV_ID_50GE_RDMA0xA224
> +#define HNS3_DEV_ID_100G_RDMA_MACSEC 0xA226
> +#define HNS3_DEV_ID_100G_VF  0xA22E
> +#define HNS3_DEV_ID_100G_RDMA_PFC_VF 0xA22F
> +
> +#define HNS3_UC_MACADDR_NUM  96
> +#define HNS3_MC_MACADDR_NUM  128
> +
> +#define HNS3_MAX_BD_SIZE 65535
> +#define HNS3_MAX_TX_BD_PER_PKT   8
> +#define HNS3_MAX_FRAME_LEN   9728
> +#define HNS3_MIN_FRAME_LEN   64
> +#define HNS3_VLAN_TAG_SIZE   4
> +#define HNS3_DEFAULT_RX_BUF_LEN  2048
> +
> +#define HNS3_ETH_OVERHEAD \
> + (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN +
> HNS3_VLAN_TAG_SIZE * 2)
> +#define HNS3_PKTLEN_TO_MTU(pktlen)   ((pktlen) -
> HNS3_ETH_OVERHEAD)
> +#define HNS3_MAX_MTU (HNS3_MAX_FRAME_LEN -
> HNS3_ETH_OVERHEAD)
> +#define HNS3_DEFAULT_MTU 1500UL
> +#define HNS3_DEFAULT_FRAME_LEN   (HNS3_DEFAULT_MTU +
> HNS3_ETH_OVERHEAD)
> +
> +#define HNS3_4_TCS   4
> +#define HNS3_8_TCS   8
> +#define HNS3_MAX_TC_NUM  8
> +
> +#define HNS3_MAX_PF_NUM  8
> +#define HNS3_UMV_TBL_SIZE3072
> +#define HNS3_DEFAULT_UMV_SPACE_PER_PF \
> + (HNS3_UMV_TBL_SIZE / HNS3_MAX_PF_NUM)
> +
> +#define HNS3_PF_CFG_BLOCK_SIZE   32
> +#define HNS3_PF_CFG_DESC_NUM \
> + (HNS3_PF_CFG_BLOCK_SIZE / HNS3_CFG_RD_LEN_BYTES)
> +
> +#define HNS3_DEFAULT_ENABLE_PFC_NUM  0
> +
> +#define HNS3_INTR_UNREG_FAIL_RETRY_CNT   5
> +#define HNS3_INTR_UNREG_FAIL_DELAY_MS500
> +
> +#define HNS3_QUIT_RESET_CNT  10
> +#define HNS3_QUIT_RESET_DELAY_MS 100
> +
> +#define HNS3_POLL_RESPONE_MS 1
> +
> +#define HNS3_MAX_USER_PRIO   8
> +#define HNS3_PG_NUM  4
> +enum hns3_fc_mode {
> + HNS3_FC_NONE,
> + HNS3_FC_RX_PAUSE,
> + HNS3_FC_TX_PAUSE,
> + HNS3_FC_FULL,
> + HNS3_FC_DEFAULT
> +};
> +
> +#define HNS3_SCH_MODE_SP 0
> +#define HNS3_SCH_MODE_DWRR   1
> +struct hns3_pg_info {
> + uint8_t pg_id;
> + uint8_t pg_sch_mode;  /* 0: sp; 1: dwrr */
> + uint8_t tc_bit_map;
> + uint32_t bw_limit;
> + uint8_t tc_dwrr[HNS3_MAX_TC_NUM];
> +};
> +
> +struct hns3_tc_info {
> + uint8_t tc_id;
> + uint8_t tc_sch_mode;  /* 0: sp; 1: dwrr */
> + uint8_t pgid;
> + uint32_t bw_limit;
> + uint8_t up_to_tc_map; /* user priority maping on the TC */
> +};
> +
> +struct hns3_dcb_info {
> + uint8_t num_tc;
> + uint8_t num_pg; /* It must be 1 if vNET-Base schd */
> + uint8_t pg_dwrr[HNS3_PG_NUM];
> + uint8_t prio_tc[HNS3_MAX_USER_PRIO];
> + struct hns3_pg_info pg_info[HNS3_PG_NUM];
> + struct hns3_tc_info tc_info[HNS3_MAX_TC_NUM];
> + uint8_t hw_pfc_map; /* Allow for packet drop or not on this TC */
> + uint8_t pfc_en; /* Pfc enabled or not for user priority */
> +};
> +
> +enum hns3_fc_status {
> + HNS3_FC_STATUS_NONE,
> + HNS3_FC_STATUS_MAC_PAUSE,
> + HNS3_FC_STATUS_PFC,
> +};
> +
> +struct hns3_tc_queue_info {
> + uint8_t tqp_offset; /* TQP offset from base TQP */
> + uint8_t tqp_count;  /* Total TQPs */
> + uint8_t tc; /* TC index */
> + bool enable;/* If this TC is enable or not */
> +};
> +
> +struct hns3_cfg {
> + uint8_t vmdq_vport_num;
> + uint8_t tc_num;
> + uint16_t tqp_desc_num;
> + uint16_t rx_buf_len;
> + uint16_t rss_size_max;
> + uint8_t phy_add

Re: [dpdk-dev] [PATCH] net/null: update license text to SPDX format

[Ferruh Yigit]

On 8/30/2019 4:57 AM, Tetsuya Mukawa wrote:
> Signed-off-by: Tetsuya Mukawa 

Reviewed-by: Ferruh Yigit 

Applied to dpdk-next-net/master, thanks.

[dpdk-dev] [RFC] net/i40e: enable multi-queue Rx interrupt for VF

[lunyuan.cui]

This patch enable VF can support multi-queue Rx interrupt.

Current implementation is that only one Rx queue can support interrupt,
because all queues are mapped in the same vector id.

What this patch fixes is mapping different interrupt vectors to each queue.
In addition, the maximum number of interrupt vector on i40evf is 4,
so there's a limit on the interrupt vector.

Signed-off-by: lunyuan.cui 
---
 drivers/net/i40e/i40e_ethdev_vf.c | 80 ++-
 1 file changed, 57 insertions(+), 23 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c 
b/drivers/net/i40e/i40e_ethdev_vf.c
index 308fb9835..9d1af3804 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -645,6 +645,8 @@ i40evf_configure_vsi_queues(struct rte_eth_dev *dev)
return ret;
 }
 
+#define RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF   4
+
 static int
 i40evf_config_irq_map(struct rte_eth_dev *dev)
 {
@@ -655,38 +657,70 @@ i40evf_config_irq_map(struct rte_eth_dev *dev)
struct virtchnl_irq_map_info *map_info;
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
+   uint16_t nb_msix = RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF;
uint32_t vector_id;
int i, err;
 
if (dev->data->dev_conf.intr_conf.rxq != 0 &&
-   rte_intr_allow_others(intr_handle))
+   rte_intr_allow_others(intr_handle)) {
+   nb_msix = RTE_MIN(intr_handle->nb_efd, nb_msix);
vector_id = I40E_RX_VEC_START;
-   else
+   } else
vector_id = I40E_MISC_VEC_ID;
 
-   map_info = (struct virtchnl_irq_map_info *)cmd_buffer;
-   map_info->num_vectors = 1;
-   map_info->vecmap[0].rxitr_idx = I40E_ITR_INDEX_DEFAULT;
-   map_info->vecmap[0].vsi_id = vf->vsi_res->vsi_id;
-   /* Alway use default dynamic MSIX interrupt */
-   map_info->vecmap[0].vector_id = vector_id;
-   /* Don't map any tx queue */
-   map_info->vecmap[0].txq_map = 0;
-   map_info->vecmap[0].rxq_map = 0;
-   for (i = 0; i < dev->data->nb_rx_queues; i++) {
-   map_info->vecmap[0].rxq_map |= 1 << i;
-   if (rte_intr_dp_is_en(intr_handle))
+   if (rte_intr_dp_is_en(intr_handle)) {
+   for (i = 0; i < dev->data->nb_rx_queues; i++) {
+   memset(cmd_buffer, 0, sizeof(cmd_buffer));
+   map_info = (struct virtchnl_irq_map_info *)cmd_buffer;
+   map_info->num_vectors = 1;
+   map_info->vecmap[0].rxitr_idx = I40E_ITR_INDEX_DEFAULT;
+   map_info->vecmap[0].vsi_id = vf->vsi_res->vsi_id;
+   /* Alway use default dynamic MSIX interrupt */
+   map_info->vecmap[0].vector_id = vector_id;
+   /* Don't map any tx queue */
+   map_info->vecmap[0].txq_map = 0;
+   map_info->vecmap[0].rxq_map = 0;
+   map_info->vecmap[0].rxq_map |= 1 << i;
+
intr_handle->intr_vec[i] = vector_id;
-   }
 
-   args.ops = VIRTCHNL_OP_CONFIG_IRQ_MAP;
-   args.in_args = (u8 *)cmd_buffer;
-   args.in_args_size = sizeof(cmd_buffer);
-   args.out_buffer = vf->aq_resp;
-   args.out_size = I40E_AQ_BUF_SZ;
-   err = i40evf_execute_vf_cmd(dev, &args);
-   if (err)
-   PMD_DRV_LOG(ERR, "fail to execute command OP_ENABLE_QUEUES");
+   args.ops = VIRTCHNL_OP_CONFIG_IRQ_MAP;
+   args.in_args = (u8 *)cmd_buffer;
+   args.in_args_size = sizeof(cmd_buffer);
+   args.out_buffer = vf->aq_resp;
+   args.out_size = I40E_AQ_BUF_SZ;
+   err = i40evf_execute_vf_cmd(dev, &args);
+   if (err) {
+   PMD_DRV_LOG(ERR, "fail to execute command "
+   "OP_ADD_ETHER_ADDRESS");
+   return err;
+   }
+   if ((vector_id != I40E_MISC_VEC_ID) && (nb_msix > 1))
+   vector_id++;
+   nb_msix--;
+   } else {
+   map_info = (struct virtchnl_irq_map_info *)cmd_buffer;
+   map_info->num_vectors = 1;
+   map_info->vecmap[0].rxitr_idx = I40E_ITR_INDEX_DEFAULT;
+   map_info->vecmap[0].vsi_id = vf->vsi_res->vsi_id;
+   /* Alway use default dynamic MSIX interrupt */
+   map_info->vecmap[0].vector_id = vector_id;
+   /* Don't map any tx queue */
+   map_info->vecmap[0].txq_map = 0;
+   map_info->vecmap[0].rxq_map = 0;
+   for (i = 0; i < dev->data->nb_rx_queues; i++)
+   map_info->vecmap[0].rxq_map |= 1 << i;
+
+   args.ops = VIRTCHNL_OP_CONFIG_IRQ_MAP;
+ 

Re: [dpdk-dev] [PATCH 1/2] net/i40e: desc loading is unnecessarily ordered for aarch64

[Gavin Hu (Arm Technology China)]

Hi Honnappa,

> -Original Message-
> From: Honnappa Nagarahalli 
> Sent: Thursday, August 29, 2019 6:10 AM
> To: Gavin Hu (Arm Technology China) ;
> dev@dpdk.org
> Cc: nd ; tho...@monjalon.net; jer...@marvell.com;
> pbhagavat...@marvell.com; qi.z.zh...@intel.com;
> bruce.richard...@intel.com; sta...@dpdk.org; Honnappa Nagarahalli
> ; nd 
> Subject: RE: [PATCH 1/2] net/i40e: desc loading is unnecessarily ordered for
> aarch64
> 
> Thanks Gavin, few comments are inline
> 
> > -Original Message-
> > From: Gavin Hu 
> > Sent: Tuesday, August 13, 2019 5:44 AM
> > To: dev@dpdk.org
> > Cc: nd ; tho...@monjalon.net; jer...@marvell.com;
> > pbhagavat...@marvell.com; Honnappa Nagarahalli
> > ; qi.z.zh...@intel.com;
> > bruce.richard...@intel.com; sta...@dpdk.org
> > Subject: [PATCH 1/2] net/i40e: desc loading is unnecessarily ordered for
> > aarch64
> >
> > For x86, the descriptors needs to be loaded in order, so in between two
> > descriptors loading, there is a compiler barrier in place.
> IMO, we can skip the above as this change applies to Arm platforms. Instead,
> capture this in the code in comments to explain why the ordering of the
> loads is not required. This will help others reading the code.

As the line of code was removed, there is no suitable place to add a comment.
Instead adding it in the commit log makes the story complete and easy to 
understand. 

> [1] For aarch64, a
> > patch [2] is in place to survive with discontinuous DD bits, the barriers 
> > can
> be
> > removed to take full advantage of out-of-order execution.
> >
> > 50% performance gain in the RFC2544 NDR test was measured on
> ThunderX2.
> > 12.50% performan gain in the RFC2544 NDR test was measured on
> Ampere
> > eMAG80 platform.
> >
> > [1]
> >
> http://inbox.dpdk.org/users/039ED4275CED7440929022BC67E7061153D71
> > 548@
> > SHSMSX105.ccr.corp.intel.com/
> > [2] https://mails.dpdk.org/archives/stable/2017-October/003324.html
> >
> > Fixes: ae0eb310f253 ("net/i40e: implement vector PMD for ARM")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Gavin Hu 
> > Reviewed-by: Ruifeng Wang 
> > Reviewed-by: Steve Capper 
> > ---
> >  drivers/net/i40e/i40e_rxtx_vec_neon.c | 1 -
> >  1 file changed, 1 deletion(-)
> >
> > diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c
> > b/drivers/net/i40e/i40e_rxtx_vec_neon.c
> > index 83572ef..e9b 100644
> > --- a/drivers/net/i40e/i40e_rxtx_vec_neon.c
> > +++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c
> > @@ -285,7 +285,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq,
> > struct rte_mbuf **rx_pkts,
> > /* Read desc statuses backwards to avoid race condition */
> > /* A.1 load 4 pkts desc */
> > descs[3] =  vld1q_u64((uint64_t *)(rxdp + 3));
> > -   rte_rmb();
> >
> > /* B.2 copy 2 mbuf point into rx_pkts  */
> > vst1q_u64((uint64_t *)&rx_pkts[pos], mbp1);
> > --
> > 2.7.4

Re: [dpdk-dev] [PATCH 1/2] net/vhost: support TSO disabling

[Maxime Coquelin]

On 6/19/19 8:13 AM, Noa Ezra wrote:
> TSO (TCP Segmentation Offload) is enabled by default on vhost.
> Add the ability to disable TSO on vhost.
> The user should also disable the feature on the virtual machine's xml.
> 
> Signed-off-by: Noa Ezra 
> Reviewed-by: Matan Azrad 
> ---
>  doc/guides/nics/vhost.rst |  5 +
>  drivers/net/vhost/rte_eth_vhost.c | 30 +++---
>  2 files changed, 32 insertions(+), 3 deletions(-)
> 
> diff --git a/doc/guides/nics/vhost.rst b/doc/guides/nics/vhost.rst
> index 23f2e87..8cfda4d 100644
> --- a/doc/guides/nics/vhost.rst
> +++ b/doc/guides/nics/vhost.rst
> @@ -76,6 +76,11 @@ The user can specify below arguments in `--vdev` option.
>  It is used to enable postcopy live-migration support in vhost library.
>  (Default: 0 (disabled))
>  
> +#.  ``tso``:
> +
> +It is used to disable tso support in vhost library.
> +(Default: 1 (enabled))
> +
>  Vhost PMD event handling
>  
>  
> diff --git a/drivers/net/vhost/rte_eth_vhost.c 
> b/drivers/net/vhost/rte_eth_vhost.c
> index b2cda04..a38c235 100644
> --- a/drivers/net/vhost/rte_eth_vhost.c
> +++ b/drivers/net/vhost/rte_eth_vhost.c
> @@ -31,6 +31,7 @@
>  #define ETH_VHOST_DEQUEUE_ZERO_COPY  "dequeue-zero-copy"
>  #define ETH_VHOST_IOMMU_SUPPORT  "iommu-support"
>  #define ETH_VHOST_POSTCOPY_SUPPORT   "postcopy-support"
> +#define ETH_VHOST_VIRTIO_NET_F_HOST_TSO "tso"
>  #define VHOST_MAX_PKT_BURST 32
>  
>  static const char *valid_arguments[] = {
> @@ -40,6 +41,7 @@
>   ETH_VHOST_DEQUEUE_ZERO_COPY,
>   ETH_VHOST_IOMMU_SUPPORT,
>   ETH_VHOST_POSTCOPY_SUPPORT,
> + ETH_VHOST_VIRTIO_NET_F_HOST_TSO,
>   NULL
>  };
>  
> @@ -1200,7 +1202,8 @@ struct vhost_xstats_name_off {
>  
>  static int
>  eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,
> - int16_t queues, const unsigned int numa_node, uint64_t flags)
> + int16_t queues, const unsigned int numa_node, uint64_t flags,
> + uint64_t disable_flags)
>  {
>   const char *name = rte_vdev_device_name(dev);
>   struct rte_eth_dev_data *data;
> @@ -1272,6 +1275,11 @@ struct vhost_xstats_name_off {
>   if (rte_vhost_driver_register(iface_name, flags))
>   goto error;
>  
> + if (disable_flags) {
> + if (rte_vhost_driver_disable_features(iface_name, 
> disable_flags))
> + goto error;
> + }
> +
>   if (rte_vhost_driver_callback_register(iface_name, &vhost_ops) < 0) {
>   VHOST_LOG(ERR, "Can't register callbacks\n");
>   goto error;
> @@ -1334,10 +1342,12 @@ struct vhost_xstats_name_off {
>   char *iface_name;
>   uint16_t queues;
>   uint64_t flags = 0;
> + uint64_t disable_flags = 0;
>   int client_mode = 0;
>   int dequeue_zero_copy = 0;
>   int iommu_support = 0;
>   int postcopy_support = 0;
> + int tso = 1;
>   struct rte_eth_dev *eth_dev;
>   const char *name = rte_vdev_device_name(dev);
>  
> @@ -1419,11 +1429,24 @@ struct vhost_xstats_name_off {
>   flags |= RTE_VHOST_USER_POSTCOPY_SUPPORT;
>   }
>  
> + if (rte_kvargs_count(kvlist, ETH_VHOST_VIRTIO_NET_F_HOST_TSO) == 1) {
> + ret = rte_kvargs_process(kvlist,
> + ETH_VHOST_VIRTIO_NET_F_HOST_TSO,
> + &open_int, &tso);
> + if (ret < 0)
> + goto out_free;
> +
> + if (tso == 0) {
> + disable_flags |= (1ULL << VIRTIO_NET_F_HOST_TSO4);
> + disable_flags |= (1ULL << VIRTIO_NET_F_HOST_TSO6);
> + }
> + }
> +
>   if (dev->device.numa_node == SOCKET_ID_ANY)
>   dev->device.numa_node = rte_socket_id();
>  
>   eth_dev_vhost_create(dev, iface_name, queues, dev->device.numa_node,
> - flags);
> + flags, disable_flags);
>  
>  out_free:
>   rte_kvargs_free(kvlist);
> @@ -1470,7 +1493,8 @@ struct vhost_xstats_name_off {
>   "client=<0|1> "
>   "dequeue-zero-copy=<0|1> "
>   "iommu-support=<0|1> "
> - "postcopy-support=<0|1>");
> + "postcopy-support=<0|1> "
> + "tso=<0|1>");
>  
>  RTE_INIT(vhost_init_log)
>  {
> 

With changing the default to disabled:
Reviewed-by: Maxime Coquelin 

Do you want me to do the change while applying or you prefer sending the
v2?

Thanks,
Maxime

Re: [dpdk-dev] [PATCH 2/2] net/vhost: support mrg-rxbuf disabling

[Maxime Coquelin]

On 6/27/19 7:04 AM, Matan Azrad wrote:
> 
> 
> From: Maxime Coquelin 
>> For functional reasons, I agree. So I that's why I agree with your
>> tso patch as the application has to support it, but that's not the
>> case of the mergeable buffers features.
>
> Performance reasons are not good enough?

 No, that's not what I mean.
 I mean that the application should be able to disable a feature when
 it does not meet the functional requirement.

 For performance tuning, the qemu way is available, and enough.

>>>
>>> I think that this is the point we are not agree on.
>>>
>>> I think that application may want to disable the feature in some cases
>>> because of performance reasons (maybe others too), And in some other
>> cases to work with the feature.
>>>
>>> So, it makes sense IMO to let the application to decide what it wants
>> without any concern about the QEMU configuration.
>>>
>>> Why to not allow to the PMD user to do it by the application (using prob
>> parameters)?
>>
>> I think we should restrict the Virtio features from the Vhost PMD parameter
>> at as min as possible, only to ensure compatibility with the application
>> (iommu, postcopy, tso, ...). One problem I see with providing the possibility
>> to change any Virtio feature at runtime is reconnection.
>>
>> For example, you start your application with enabling mergeable buffers,
>> stop it and restart it without the feature enabled by the application.
>> As the negotiation with the driver is not done again at reconnect time, Qemu
>> will fail.
> 
> Looks like you are describing a new issue in the vhost PMD, it must close the 
> connection when the PMD is closed\removed.
> So, every probe(hotplug add) it will start from scratch.
> 

No, you can close the application and restart it for example without
having to restart the guest. In this case, the feature negotiation is
not done again.

So I remain convinced we should not provide the possibility to disable
any feature that is not dependent on the application.

Megeable buffers is not dependent on the application, as it is only
related to the ring implementation, and it is supported by the DPDK
Vhost library.

Regards,
Maxime

Re: [dpdk-dev] [PATCH 2/2] net/i40e: remove compiler barrier for aarch64

[Gavin Hu (Arm Technology China)]

Hi Honnappa,

> -Original Message-
> From: Honnappa Nagarahalli 
> Sent: Thursday, August 29, 2019 6:49 AM
> To: Gavin Hu (Arm Technology China) ;
> dev@dpdk.org
> Cc: nd ; tho...@monjalon.net; jer...@marvell.com;
> pbhagavat...@marvell.com; qi.z.zh...@intel.com;
> bruce.richard...@intel.com; sta...@dpdk.org; Honnappa Nagarahalli
> ; nd 
> Subject: RE: [PATCH 2/2] net/i40e: remove compiler barrier for aarch64
> 
> >
> > As packet length extraction code was simplified,the ordering was not
> > necessary any more.[1]
> IMO, there is no relationship between the compiler barrier and [1] at least
> on Arm platforms. I suggest we just say 'there is no reason for the compiler
> barrier'.
> I think this compiler barrier is not required for x86/PPC as well.

The compiler barrier was ever really required for x86, as the two accesses to 
the desc[] entry must be ordered. 
After [1] was applied, the first access was removed, then there is no reason 
for the compiler barrier.
For aarch64, it borrows the barrier and does not change according to the new 
code, so the barrier can be removed also.

Hopefully I got the whole story across clearly and completely. 

> 
> >
> > 2% performance gain was measured on Marvell ThunderX2.
> > 4.3% performance gain was measure on Ampere eMAG80
> >
> > [1] http://mails.dpdk.org/archives/dev/2016-April/037529.html
> >
> > Fixes: ae0eb310f253 ("net/i40e: implement vector PMD for ARM")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Gavin Hu 
> > Reviewed-by: Ruifeng Wang 
> > Reviewed-by: Steve Capper 
> > ---
> >  drivers/net/i40e/i40e_rxtx_vec_neon.c | 3 ---
> >  1 file changed, 3 deletions(-)
> >
> > diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c
> > b/drivers/net/i40e/i40e_rxtx_vec_neon.c
> > index e9b..864eb9a 100644
> > --- a/drivers/net/i40e/i40e_rxtx_vec_neon.c
> > +++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c
> > @@ -307,9 +307,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq,
> > struct rte_mbuf **rx_pkts,
> > rte_mbuf_prefetch_part2(rx_pkts[pos + 3]);
> > }
> >
> > -   /* avoid compiler reorder optimization */
> > -   rte_compiler_barrier();
> > -
> > /* pkt 3,4 shift the pktlen field to be 16-bit aligned*/
> > uint32x4_t len3 =
> > vshlq_u32(vreinterpretq_u32_u64(descs[3]),
> > len_shl);
> > --
> > 2.7.4

Re: [dpdk-dev] [Suspected-Phishing][PATCH] net/vhost: add an API for get queue status

[Maxime Coquelin]

Hi Noa,

I was thinking about an alternative that would avoid adding an API.
What about the Vhost-user library to replay the queue status for all
configured queues when the device is ready (i.e. after it has called
its .new_device() callback)?

On 6/24/19 1:08 PM, Noa Ezra wrote:
> Hi,
> What do you say about this patch?
> 
> Thanks,
> Noa.
> 
>> -Original Message-
>> From: Noa Ezra [mailto:n...@mellanox.com]
>> Sent: Wednesday, June 19, 2019 9:15 AM
>> To: maxime.coque...@redhat.com
>> Cc: Matan Azrad ; dev@dpdk.org; Noa Ezra
>> 
>> Subject: [Suspected-Phishing][PATCH] net/vhost: add an API for get queue
>> status
>>
>> Add an API that returns queue status for requested queue in the port.
>> The queue's status can be changed before the user has signed for the queue
>> state event interrupt. In this case the user can't know the current queue's
>> status. This API returns the current status.
>>
>> Signed-off-by: Noa Ezra 
>> Reviewed-by: Matan Azrad 
>> ---
>>  drivers/net/vhost/rte_eth_vhost.c   | 47
>> +
>>  drivers/net/vhost/rte_eth_vhost.h   | 18 +++
>>  drivers/net/vhost/rte_pmd_vhost_version.map |  6 
>>  3 files changed, 71 insertions(+)
>>
>> diff --git a/drivers/net/vhost/rte_eth_vhost.c
>> b/drivers/net/vhost/rte_eth_vhost.c
>> index 9a54020..cad1e5c 100644
>> --- a/drivers/net/vhost/rte_eth_vhost.c
>> +++ b/drivers/net/vhost/rte_eth_vhost.c
>> @@ -855,6 +855,7 @@ struct vhost_xstats_name_off {
>>  /* won't be NULL */
>>  state = vring_states[eth_dev->data->port_id];
>>  rte_spinlock_lock(&state->lock);
>> +
>>  state->cur[vring] = enable;
>>  state->max_vring = RTE_MAX(vring, state->max_vring);
>>  rte_spinlock_unlock(&state->lock);
>> @@ -874,6 +875,52 @@ struct vhost_xstats_name_off {  };
>>
>>  int
>> +rte_eth_vhost_get_queue_status(uint16_t port_id, bool rx, uint16_t
>> queue_id,
>> +bool *queue_status)
>> +{
>> +struct rte_vhost_vring_state *state;
>> +struct internal_list *list;
>> +struct rte_eth_dev *eth_dev;
>> +int found = 0;
>> +uint16_t nb_q = 0;
>> +
>> +if (port_id >= RTE_MAX_ETHPORTS) {
>> +VHOST_LOG(ERR, "Invalid port id\n");
>> +return -1;
>> +}
>> +TAILQ_FOREACH(list, &internal_list, next) {
>> +eth_dev = list->eth_dev;
>> +if (eth_dev->data->port_id == port_id) {
>> +nb_q = rx ? eth_dev->data->nb_rx_queues :
>> +eth_dev->data->nb_tx_queues;
>> +found = 1;
>> +break;
>> +}
>> +}
>> +if (!found) {
>> +VHOST_LOG(ERR, "No device found for port id %u\n",
>> port_id);
>> +return -1;
>> +}
>> +if (queue_id >= nb_q) {
>> +VHOST_LOG(ERR, "Invalid queue id\n");
>> +return -1;
>> +}
>> +
>> +state = vring_states[port_id];
>> +if (!state) {
>> +VHOST_LOG(ERR, "Unused port\n");
>> +return -1;
>> +}
>> +
>> +rte_spinlock_lock(&state->lock);
>> +*queue_status = rx ? state->cur[queue_id * 2 + 1] :
>> +state->cur[queue_id * 2];
>> +rte_spinlock_unlock(&state->lock);
>> +
>> +return 0;
>> +}
>> +
>> +int
>>  rte_eth_vhost_get_queue_event(uint16_t port_id,
>>  struct rte_eth_vhost_queue_event *event)  { diff --git
>> a/drivers/net/vhost/rte_eth_vhost.h b/drivers/net/vhost/rte_eth_vhost.h
>> index 0e68b9f..1e65c69 100644
>> --- a/drivers/net/vhost/rte_eth_vhost.h
>> +++ b/drivers/net/vhost/rte_eth_vhost.h
>> @@ -44,6 +44,24 @@ int rte_eth_vhost_get_queue_event(uint16_t port_id,
>>  struct rte_eth_vhost_queue_event *event);
>>
>>  /**
>> + * Get queue status for specific queue in the port.
>> + *
>> + * @param[in] port_id
>> + *  Port id.
>> + * @param[in] rx
>> + *  True is rx, False if tx
>> + * @paran[in] queue_id
>> + *  Queue_id
>> + * @param[out] queue_status
>> + *  Pointer to a boolean, True is enable, False if disable.
>> + * @return
>> + *  - On success, zero, queue_status is updated.
>> + *  - On failure, a negative value, queue_status is not updated.
>> + */
>> +int rte_eth_vhost_get_queue_status(uint16_t port_id, bool rx, uint16_t
>> queue_id,
>> +bool *queue_status);
>> +
>> +/**
>>   * Get the 'vid' value associated with the specified port.
>>   *
>>   * @return
>> diff --git a/drivers/net/vhost/rte_pmd_vhost_version.map
>> b/drivers/net/vhost/rte_pmd_vhost_version.map
>> index 695db85..1eabfd2 100644
>> --- a/drivers/net/vhost/rte_pmd_vhost_version.map
>> +++ b/drivers/net/vhost/rte_pmd_vhost_version.map
>> @@ -11,3 +11,9 @@ DPDK_16.11 {
>>
>>  rte_eth_vhost_get_vid_from_port_id;
>>  };
>> +
>> +DPDK_19.08 {
>> +global:
>> +
>> +rte_eth_vhost_get_queue_status;
>> +};
>> --
>> 1.8.3.1
> 

[dpdk-dev] [PATCH] security: add statistics definitions and update API

[Radu Nicolau]

Update IPsec statistics struct definition, add per SA
statistics collection enable flag.

Signed-off-by: Radu Nicolau 
---
 lib/librte_security/rte_security.h | 20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/lib/librte_security/rte_security.h 
b/lib/librte_security/rte_security.h
index 96806e3..8a2ff34 100644
--- a/lib/librte_security/rte_security.h
+++ b/lib/librte_security/rte_security.h
@@ -172,6 +172,14 @@ struct rte_security_ipsec_sa_options {
 * * 0: Inner/outer header are not modified.
 */
uint32_t ecn : 1;
+
+   /**< Security statistics
+*
+* * 1: Enable per session security statistics collection for
+*  this SA, if supported by the driver.
+* * 0: Disable per session security statistics collection for this SA.
+*/
+   uint32_t stats : 1;
 };
 
 /** IPSec security association direction */
@@ -482,6 +490,12 @@ struct rte_security_macsec_stats {
 };
 
 struct rte_security_ipsec_stats {
+   uint64_t ipackets;  /**< Successfully received IPsec packets. */
+   uint64_t opackets;  /**< Successfully transmitted IPsec packets.*/
+   uint64_t ibytes;/**< Successfully received IPsec bytes. */
+   uint64_t obytes;/**< Successfully transmitted IPsec bytes. */
+   uint64_t ierrors;   /**< IPsec packets receive/decrypt errors. */
+   uint64_t oerrors;   /**< IPsec packets transmit/encrypt errors. */
uint64_t reserved;
 
 };
@@ -507,10 +521,12 @@ struct rte_security_stats {
  *
  * @param  instancesecurity instance
  * @param  sesssecurity session
+ * If security session is NULL then global (per security instance) statistics
+ * will be retrieved, if supported
  * @param  stats   statistics
  * @return
- *  - On success return 0
- *  - On failure errno
+ *  - On success, return 0
+ *  - On failure, a negative value
  */
 __rte_experimental
 int
-- 
2.7.4

[dpdk-dev] [PATCH] net/ixgbe: remove redundant assignment

[Yong Wang]

Since "link.link_duplex" has been assigned to ETH_LINK_FULL_DUPLEX just
before switch statement, the assignment in switch-case statement is
redundant. Remove it.

Fixes: 82113036e4e5 ("ethdev: redesign link speed config")

Signed-off-by: Yong Wang 
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 03fc1f7..f328d7c 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -4138,7 +4138,6 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused 
struct rte_eth_dev *dev,
link.link_speed = ETH_SPEED_NUM_10M;
else
link.link_speed = ETH_SPEED_NUM_100M;
-   link.link_duplex = ETH_LINK_FULL_DUPLEX;
break;
 
case IXGBE_LINK_SPEED_100_FULL:
-- 
1.8.3.1

Re: [dpdk-dev] [PATCH 00/63 v2] net/ice/base: update base code

[Ye Xiaolong]

On 08/29, Qi Zhang wrote:
>Key Features:
>
>1) Add PPPoE, GTP protocol support for switch, FDIR, RSS
>2) Add Flexible Descriptor support.
>3) Improved package download.
>4) Improved RSS to support inner header
>5) Improved recipe management for switch rule
>
>v2:
>- improved commit log
> 
>Qi Zhang (63):
>  net/ice/base: enhance NVM read
>  net/ice/base: add function to get FW mode
>  net/ice/base: add support for NVM rollback detection
>  net/ice/base: add support to init RXDID descs fields
>  net/ice/base: store number of functions for the device
>  net/ice/base: add read PBA module function
>  net/ice/base: correct argument port info
>  net/ice/base: remove debug code
>  net/ice/base: add SFF EEPROM AQ Command
>  net/ice/base: improve debug print message
>  net/ice/base: add capabilities when in safe mode
>  net/ice/base: add helper functions for PHY caching
>  net/ice/base: add support for reading REPC statistics
>  net/ice/base: adjust DCB INIT for SW mode
>  net/ice/base: add NVM pkg flag
>  net/ice/base: move VSI to VSI group
>  net/ice/base: enable masking for RSS and FD field vectors
>  net/ice/base: resolve static analysis issues
>  net/ice/base: fix memory leak issue
>  net/ice/base: check root pointer for validity
>  net/ice/base: fix type-mismatch
>  net/ice/base: correct overrun Coverty hit
>  net/ice/base: update Boot Configuration Section read of NVM
>  net/ice/base: add support for NVM access commands
>  net/ice/base: add support for GTP and PPPoE protocols
>  net/ice/base: add locks for flow functions
>  net/ice/base: improve switch advanced rule
>  net/ice/base: move function declaration
>  net/ice/base: add 16-byte Flex Rx Descriptor
>  net/ice/base: add 32-byte Flex Rx Desc for Comms package
>  net/ice/base: update flag bits to current specification
>  net/ice/base: add more opcode and macros
>  net/ice/base: set status when global cfg lock is unavailable
>  net/ice/base: initialize driver NVM data earlier
>  net/ice/base: add function to configure Tx AQ command
>  net/ice/base: add support for not locking sideband queue
>  net/ice/base: associate recipes by profile type
>  net/ice/base: return switch error on invalid match criteria
>  net/ice/base: update UDP tunnel switch training packets
>  net/ice/base: improve switch chained recipe
>  net/ice/base: move and add some help function and macros
>  net/ice/base: add routine for tunnel port query
>  net/ice/base: ptype group consolidation
>  net/ice/base: fix for RSS hash on inner UDP port
>  net/ice/base: packet encapsulation for RSS
>  net/ice/base: add RSS support for PPPoE and GTPU
>  net/ice/base: remove unnecessary conditional check
>  net/ice/base: fix flag settings in AQ call
>  net/ice/base: refactor removal of VLAN promiscuous rules
>  net/ice/base: maximize switch recipe words per line
>  net/ice/base: update switch training packets with open ports
>  net/ice/base: remove unnecessary dummy packet finding
>  net/ice/base: remove unnecessary if branch
>  net/ice/base: correct abbreviations
>  net/ice/base: update to register definition file
>  net/ice/base: replace open-code duplication
>  net/ice/base: delay less
>  net/ice/base: add AQC get link topology handle support
>  net/ice/base: remove Rx flex descriptor programming
>  net/ice/base: enable RSS with ether layer for PPPoE
>  net/ice/base: add GENEVE offset
>  net/ice/base: update profile to recipe bitmap array
>  net/ice/base: ignore inverse switch recipes
>
> drivers/net/ice/base/ice_adminq_cmd.h| 221 
> drivers/net/ice/base/ice_bitops.h|  31 ++
> drivers/net/ice/base/ice_common.c| 902 ++
> drivers/net/ice/base/ice_common.h|  48 +-
> drivers/net/ice/base/ice_controlq.c  |  54 +-
> drivers/net/ice/base/ice_controlq.h  |   7 +-
> drivers/net/ice/base/ice_dcb.c   |   6 +-
> drivers/net/ice/base/ice_dcb.h   |   1 +
> drivers/net/ice/base/ice_devids.h|   6 +
> drivers/net/ice/base/ice_flex_pipe.c | 923 ++-
> drivers/net/ice/base/ice_flex_pipe.h |  17 +-
> drivers/net/ice/base/ice_flex_type.h |  35 +-
> drivers/net/ice/base/ice_flow.c  | 368 
> drivers/net/ice/base/ice_flow.h  | 107 +++-
> drivers/net/ice/base/ice_hw_autogen.h|  34 ++
> drivers/net/ice/base/ice_lan_tx_rx.h |  76 ++-
> drivers/net/ice/base/ice_nvm.c   | 294 +-
> drivers/net/ice/base/ice_nvm.h   |  91 +++
> drivers/net/ice/base/ice_osdep.h |   2 +-
> drivers/net/ice/base/ice_protocol_type.h |  40 +-
> drivers/net/ice/base/ice_sched.c |  87 +--
> drivers/net/ice/base/ice_sched.h |   8 +-
> drivers/net/ice/base/ice_switch.c| 784 ++
> drivers/net/ice/base/ice_switch.h|   5 +
> drivers/net/ice/base/ice_type.h  |  77 ++-
> 25 files changed, 3142 insertions(+), 1082 deletions(-)
> create mode 100644 drivers/net/ice/base/ice_nvm.h
>
>-- 
>2.13.6
>

Acked-

Re: [dpdk-dev] [dpdk-stable] 17.11.7-rc1 (LTS) patches review and test

[Ferruh Yigit]

On 8/30/2019 9:42 AM, Wang, FengqinX wrote:
> Hi Ferruh,
> 
> After verify, this fixes works fine after we merge it to stable 17.11.7.

Thanks for verifying this.

> BTW, do we have plan to apply this patch to the stable 17.11.7?

It is a task for 17.11 LTS maintainer, who we don't know yet.

> 
> BRs, Vicky
> 
> -Original Message-
> From: Yigit, Ferruh 
> Sent: Friday, August 30, 2019 12:11 AM
> To: Yongseok Koh ; dpdk stable 
> Cc: dev@dpdk.org; pezh...@redhat.com; si...@redhat.com; Wang, FengqinX 
> ; Chen, Zhaoyan ; Xu, Qian Q 
> ; alia...@mellanox.com; rasl...@mellanox.com
> Subject: Re: [dpdk-stable] 17.11.7-rc1 (LTS) patches review and test
> 
> On 8/15/2019 7:05 PM, Yongseok Koh wrote:
>> Hi all,
>>
>> Here is a list of patches targeted for LTS release 17.11.7. Please 
>> help review and test. The planned date for the final release is Aug 
>> 23, Before that, please shout if anyone has objections with these patches 
>> being applied.
>>
>> Also for the companies committed to running regression tests, please 
>> run the tests and report any issue before the release date.
>>
>> A release candidate tarball can be found at:
>>
>> https://dpdk.org/browse/dpdk-stable/tag/?id=v17.11.7-rc1
>>
>> These patches are located at branch 17.11 of dpdk-stable repo:
>> https://dpdk.org/browse/dpdk-stable/
> 
> 
> I am getting build error [1] with Fedora 30 and gcc [2], the issue seems 
> fixed in the main repo [3].
> 
> 
> 
> [1] [-Werror=address-of-packed-member]
> 
> .../lib/librte_eal/common/eal_common_tailqs.c: In function 
> ‘rte_eal_tailq_lookup’:
> .../lib/librte_eal/common/eal_common_tailqs.c:76:11: error: taking address of 
> packed member of ‘struct rte_mem_config’ may result in an unaligned pointer 
> value [-Werror=address-of-packed-member]
>76 |return &mcfg->tailq_head[i];
>   |   ^~~~
> .../lib/librte_eal/common/eal_common_tailqs.c: In function ‘rte_dump_tailq’:
> .../lib/librte_eal/common/eal_common_tailqs.c:90:23: error: taking address of 
> packed member of ‘struct rte_mem_config’ may result in an unaligned pointer 
> value [-Werror=address-of-packed-member]
>90 |  rte_rwlock_read_lock(&mcfg->qlock);
>   |   ^~~~
> .../lib/librte_eal/common/eal_common_tailqs.c:92:40: error: taking address of 
> packed member of ‘struct rte_mem_config’ may result in an unaligned pointer 
> value [-Werror=address-of-packed-member]
>92 |   const struct rte_tailq_head *tailq = &mcfg->tailq_head[i];
>   |^~~~
> .../lib/librte_eal/common/eal_common_tailqs.c:98:25: error: taking address of 
> packed member of ‘struct rte_mem_config’ may result in an unaligned pointer 
> value [-Werror=address-of-packed-member]
>98 |  rte_rwlock_read_unlock(&mcfg->qlock);
>   | ^~~~
> .../lib/librte_eal/common/eal_common_tailqs.c: In function 
> ‘rte_eal_tailq_create’:
> .../lib/librte_eal/common/eal_common_tailqs.c:111:10: error: taking address 
> of packed member of ‘struct rte_mem_config’ may result in an unaligned 
> pointer value [-Werror=address-of-packed-member]
>   111 |   head = &mcfg->tailq_head[rte_tailqs_count];
>   |
> 
> [2]
> $ lsb_release -a
> LSB Version::core-4.1-amd64:core-4.1-noarch
> Distributor ID: Fedora
> Description:Fedora release 30 (Thirty)
> Release:30
> Codename:   Thirty
> 
> $ gcc --version
> gcc (GCC) 9.1.1 20190503 (Red Hat 9.1.1-1)
> 
> 
> [3]
> Fixes: a385972c3675 ("mk: disable warning for packed member pointer")
> 

[dpdk-dev] [PATCH v5 1/2] app/test: add unit test cases for mbuf library APIs

[Lavanya Govindarajan]

Added new unit test cases to cover the below
functions defined in rte_mbuf.h
rte_validate_tx_offload,
rte_pktmbuf_alloc_bulk,
rte_pktmbuf_read,
rte_pktmbuf_ext_shinfo_init_helper,
rte_pktmbuf_attach_extbuf,
rte_mbuf_ext_refcnt_read,
rte_mbuf_ext_refcnt_update,
rte_mbuf_ext_refcnt_set,
rte_pktmbuf_detach_extbuf

Signed-off-by: Lavanya Govindarajan 
Reviewed-by: Reshma Pattan 
---
 app/test/test_mbuf.c | 773 ++-
 1 file changed, 770 insertions(+), 3 deletions(-)

diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index 2a97afe20..346d9ede4 100644
--- a/app/test/test_mbuf.c
+++ b/app/test/test_mbuf.c
@@ -28,16 +28,28 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include "test.h"
 
+#define MEMPOOL_CACHE_SIZE  32
 #define MBUF_DATA_SIZE  2048
 #define NB_MBUF 128
 #define MBUF_TEST_DATA_LEN  1464
 #define MBUF_TEST_DATA_LEN2 50
+#define MBUF_TEST_DATA_LEN3 256
 #define MBUF_TEST_HDR1_LEN  20
 #define MBUF_TEST_HDR2_LEN  30
 #define MBUF_TEST_ALL_HDRS_LEN  (MBUF_TEST_HDR1_LEN+MBUF_TEST_HDR2_LEN)
+#define MBUF_TEST_SEG_SIZE  64
+#define MBUF_TEST_BURST 8
+#define EXT_BUF_TEST_DATA_LEN   1024
+#define MBUF_MAX_SEG16
+#define MBUF_NO_HEADER 0
+#define MBUF_HEADER1
+#define MBUF_NEG_TEST_READ 2
 
 /* size of private data for mbuf in pktmbuf_pool2 */
 #define MBUF2_PRIV_SIZE 128
@@ -502,7 +514,6 @@ test_attach_from_different_pool(struct rte_mempool 
*pktmbuf_pool,
rte_pktmbuf_free(clone2);
return -1;
 }
-#undef GOTO_FAIL
 
 /*
  * test allocation and free of mbufs
@@ -1121,6 +1132,718 @@ test_tx_offload(void)
return (v1 == v2) ? 0 : -EINVAL;
 }
 
+static int
+test_mbuf_validate_tx_offload(const char *test_name,
+   struct rte_mempool *pktmbuf_pool,
+   uint64_t ol_flags,
+   uint16_t segsize,
+   int expected_retval)
+{
+   struct rte_mbuf *m = NULL;
+   int ret = 0;
+   /* alloc a mbuf and do sanity check */
+   m = rte_pktmbuf_alloc(pktmbuf_pool);
+   if (m == NULL)
+   GOTO_FAIL("%s: mbuf allocation failed!\n", __func__);
+   if (rte_pktmbuf_pkt_len(m) != 0)
+   GOTO_FAIL("%s: Bad packet length\n", __func__);
+   rte_mbuf_sanity_check(m, 0);
+   m->ol_flags = ol_flags;
+   m->tso_segsz = segsize;
+   ret = rte_validate_tx_offload(m);
+   if (ret != expected_retval)
+   GOTO_FAIL("%s(%s): expected ret val: %d; received: %d\n",
+   __func__, test_name, expected_retval, ret);
+   rte_pktmbuf_free(m);
+   m = NULL;
+   return 0;
+fail:
+   if (m) {
+   rte_pktmbuf_free(m);
+   m = NULL;
+   }
+   return -1;
+}
+
+static int
+test_mbuf_validate_tx_offload_one(struct rte_mempool *pktmbuf_pool)
+{
+   /* test to validate tx offload flags */
+   uint64_t ol_flags = 0;
+   /* test to validate if IP checksum is counted only for IPV4 packet */
+   /* set both IP checksum and IPV6 flags */
+   ol_flags |= PKT_TX_IP_CKSUM;
+   ol_flags |= PKT_TX_IPV6;
+   if (test_mbuf_validate_tx_offload("MBUF_TEST_IP_CKSUM_IPV6_SET",
+   pktmbuf_pool,
+   ol_flags, 0, -EINVAL) < 0)
+   GOTO_FAIL("%s failed: IP cksum is set incorrect.\n", __func__);
+   /* resetting ol_flags for next testcase */
+   ol_flags = 0;
+
+   /* test to validate if IP type is set when required */
+   ol_flags |= PKT_TX_L4_MASK;
+   if (test_mbuf_validate_tx_offload("MBUF_TEST_IP_TYPE_NOT_SET",
+   pktmbuf_pool,
+   ol_flags, 0, -EINVAL) < 0)
+   GOTO_FAIL("%s failed: IP type is not set.\n", __func__);
+
+   /* test if IP type is set when TCP SEG is on */
+   ol_flags |= PKT_TX_TCP_SEG;
+   if (test_mbuf_validate_tx_offload("MBUF_TEST_IP_TYPE_NOT_SET",
+   pktmbuf_pool,
+   ol_flags, 0, -EINVAL) < 0)
+   GOTO_FAIL("%s failed: IP type is not set.\n", __func__);
+
+   ol_flags = 0;
+   /* test to confirm IP type (IPV4/IPV6) is set */
+   ol_flags = PKT_TX_L4_MASK;
+   ol_flags |= PKT_TX_IPV6;
+   if (test_mbuf_validate_tx_offload("MBUF_TEST_IP_TYPE_SET",
+   pktmbuf_pool,
+   ol_flags, 0, 0) < 0)
+   GOTO_FAIL("%s failed: tx offload flag error.\n", __func__);
+
+   ol_flags = 0;
+   /* test to check TSO segment size is non-zero */
+   ol_flags |= PKT_TX_IPV4;
+   ol_flags |= PKT_TX_TCP_SEG;
+   /* set 0 tso segment size */
+   if (test_mbuf_validate_tx_offload("MBUF_TEST_NULL_TSO_SEGSZ",
+   pktmbuf_pool,
+   ol_flags, 0, -EINVAL) < 0)
+  

[dpdk-dev] [PATCH v5 0/2] add unit test cases for mbuf library

[Lavanya Govindarajan]

This patchset contains unit testcases added to increase the
functional and decision coverage for the library functions
defined in rte_mbuf.h and rte_mbuf.c

1/2: unit test cases added for rte_mbuf.h
2/2: unit test cases added for rte_mbuf.c

Patch 2/2 depends on 1/2

Signed-off-by: Lavanya Govindarajan 
Signed-off-by: Pallantla Poornima 
Reviewed-by: Reshma Pattan 
Acked-by: Olivier Matz 
---
v5: Made minor coding improvisations as suggested.

v4: Fixed cosmetic errors.

v3: Fixed build issue for environment FD30-64.
Improvised error log messages.

v2: Addressed v1's comments.
Removed rte prefix from the test function names.
Fixed comments given for the below test functions
test_mbuf_validate_tx_offload
test_neg_pktmbuf_alloc_bulk
test_pktmbuf_read_from_offset
test_pktmbuf_read_from_chain
---

Lavanya Govindarajan (1):
  app/test: add unit test cases for mbuf library APIs

Pallantla Poornima (1):
  app/test: add unit test for mbuf flag names

 app/test/test_mbuf.c | 1030 +-
 1 file changed, 1027 insertions(+), 3 deletions(-)

-- 
2.17.2

[dpdk-dev] [PATCH v5 2/2] app/test: add unit test for mbuf flag names

[Lavanya Govindarajan]

From: Pallantla Poornima 

Added UT for the below four functions in test_mbuf.c
rte_get_rx_ol_flag_list
rte_get_tx_ol_flag_list
rte_get_rx_ol_flag_name
rte_get_tx_ol_flag_name

Signed-off-by: Pallantla Poornima 
---
 app/test/test_mbuf.c | 257 +++
 1 file changed, 257 insertions(+)

diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index 346d9ede4..dd1bc25e6 100644
--- a/app/test/test_mbuf.c
+++ b/app/test/test_mbuf.c
@@ -50,6 +50,7 @@
 #define MBUF_NO_HEADER 0
 #define MBUF_HEADER1
 #define MBUF_NEG_TEST_READ 2
+#define VAL_NAME(flag)  { flag, #flag }
 
 /* size of private data for mbuf in pktmbuf_pool2 */
 #define MBUF2_PRIV_SIZE 128
@@ -1132,6 +1133,242 @@ test_tx_offload(void)
return (v1 == v2) ? 0 : -EINVAL;
 }
 
+static int
+test_get_rx_ol_flag_list(void)
+{
+   int len = 6, ret = 0;
+   char buf[256] = "";
+   int buflen = 0;
+
+   /* Test case to check with null buffer */
+   ret = rte_get_rx_ol_flag_list(0, NULL, 0);
+   if (ret != -1)
+   GOTO_FAIL("%s expected: -1, received = %d\n", __func__, ret);
+
+   /* Test case to check with zero buffer len */
+   ret = rte_get_rx_ol_flag_list(PKT_RX_L4_CKSUM_MASK, buf, 0);
+   if (ret != -1)
+   GOTO_FAIL("%s expected: -1, received = %d\n", __func__, ret);
+
+   buflen = strlen(buf);
+   if (buflen != 0)
+   GOTO_FAIL("%s buffer should be empty, received = %d\n",
+   __func__, buflen);
+
+   /* Test case to check with reduced buffer len */
+   ret = rte_get_rx_ol_flag_list(0, buf, len);
+   if (ret != -1)
+   GOTO_FAIL("%s expected: -1, received = %d\n", __func__, ret);
+
+   buflen = strlen(buf);
+   if (buflen != (len - 1))
+   GOTO_FAIL("%s invalid buffer length retrieved, expected: %d,"
+   "received = %d\n", __func__,
+   (len - 1), buflen);
+
+   /* Test case to check with zero mask value */
+   ret = rte_get_rx_ol_flag_list(0, buf, sizeof(buf));
+   if (ret != 0)
+   GOTO_FAIL("%s expected: 0, received = %d\n", __func__, ret);
+
+   buflen = strlen(buf);
+   if (buflen == 0)
+   GOTO_FAIL("%s expected: %s, received length = 0\n", __func__,
+   "non-zero, buffer should not be empty");
+
+   /* Test case to check with valid mask value */
+   ret = rte_get_rx_ol_flag_list(PKT_RX_SEC_OFFLOAD, buf, sizeof(buf));
+   if (ret != 0)
+   GOTO_FAIL("%s expected: 0, received = %d\n", __func__, ret);
+
+   buflen = strlen(buf);
+   if (buflen == 0)
+   GOTO_FAIL("%s expected: %s, received length = 0\n", __func__,
+   "non-zero, buffer should not be empty");
+
+
+   return 0;
+fail:
+   return -1;
+}
+
+static int
+test_get_tx_ol_flag_list(void)
+{
+   int len = 6, ret = 0;
+   char buf[256] = "";
+   int buflen = 0;
+
+   /* Test case to check with null buffer */
+   ret = rte_get_tx_ol_flag_list(0, NULL, 0);
+   if (ret != -1)
+   GOTO_FAIL("%s expected: -1, received = %d\n", __func__, ret);
+
+   /* Test case to check with zero buffer len */
+   ret = rte_get_tx_ol_flag_list(PKT_TX_IP_CKSUM, buf, 0);
+   if (ret != -1)
+   GOTO_FAIL("%s expected: -1, received = %d\n", __func__, ret);
+
+   buflen = strlen(buf);
+   if (buflen != 0) {
+   GOTO_FAIL("%s buffer should be empty, received = %d\n",
+   __func__, buflen);
+   }
+
+   /* Test case to check with reduced buffer len */
+   ret = rte_get_tx_ol_flag_list(0, buf, len);
+   if (ret != -1)
+   GOTO_FAIL("%s expected: -1, received = %d\n", __func__, ret);
+
+   buflen = strlen(buf);
+   if (buflen != (len - 1))
+   GOTO_FAIL("%s invalid buffer length retrieved, expected: %d,"
+   "received = %d\n", __func__,
+   (len - 1), buflen);
+
+   /* Test case to check with zero mask value */
+   ret = rte_get_tx_ol_flag_list(0, buf, sizeof(buf));
+   if (ret != 0)
+   GOTO_FAIL("%s expected: 0, received = %d\n", __func__, ret);
+
+   buflen = strlen(buf);
+   if (buflen == 0)
+   GOTO_FAIL("%s expected: %s, received length = 0\n", __func__,
+   "non-zero, buffer should not be empty");
+
+   /* Test case to check with valid mask value */
+   ret = rte_get_tx_ol_flag_list(PKT_TX_UDP_CKSUM, buf, sizeof(buf));
+   if (ret != 0)
+   GOTO_FAIL("%s expected: 0, received = %d\n", __func__, ret);
+
+   buflen = strlen(buf);
+   if (buflen == 0)
+   GOTO_FAIL("%s expected: %s, received length = 0\n", __func__,
+   "non-zero, buffer

Re: [dpdk-dev] [PATCH] security: add statistics definitions and update API

[Stephen Hemminger]

On Fri, 30 Aug 2019 10:19:20 +0100
Radu Nicolau  wrote:

>  
>  struct rte_security_ipsec_stats {
> + uint64_t ipackets;  /**< Successfully received IPsec packets. */
> + uint64_t opackets;  /**< Successfully transmitted IPsec packets.*/
> + uint64_t ibytes;/**< Successfully received IPsec bytes. */
> + uint64_t obytes;/**< Successfully transmitted IPsec bytes. */
> + uint64_t ierrors;   /**< IPsec packets receive/decrypt errors. */
> + uint64_t oerrors;   /**< IPsec packets transmit/encrypt errors. */
>   uint64_t reserved;
>  
>  };

Why not a second reserved field, then it will be 8*8 64 bytes long
which is cache aligned. And you will have a pair for future counters.

Re: [dpdk-dev] [PATCH 22/22] net/hns3: add hns3 build files

[Ferruh Yigit]

On 8/23/2019 3:08 PM, Jerin Jacob Kollanukkaran wrote:
>> -Original Message-
>> From: dev  On Behalf Of Wei Hu (Xavier)
>> Sent: Friday, August 23, 2019 7:17 PM
>> To: dev@dpdk.org
>> Cc: linux...@huawei.com; xavier_hu...@163.com;
>> liudongdo...@huawei.com; forest.zhouch...@huawei.com
>> Subject: [dpdk-dev] [PATCH 22/22] net/hns3: add hns3 build files
>>
>> This patch add build related files for hns3 PMD driver.
>>
>> Signed-off-by: Wei Hu (Xavier) 
>> Signed-off-by: Min Hu (Connor) 
>> Signed-off-by: Chunsong Feng 
>> Signed-off-by: Hao Chen 
>> Signed-off-by: Huisong Li 
>> ---
>> +# Hisilicon HNS3 PMD driver
>> +#
>> +CONFIG_RTE_LIBRTE_HNS3_PMD=y
> 
> # Please add meson support
> # Move build infra to the first patch

+1 to move this to be beginning of the patchset

> # See git log drivers/net/octeontx2 as example
> 
> 
>> diff --git a/config/common_base b/config/common_base
>> index 8ef75c2..71a2c33 100644
>> --- a/config/common_base
>> +++ b/config/common_base
>> @@ -282,6 +282,11 @@
>> CONFIG_RTE_LIBRTE_E1000_PF_DISABLE_STRIP_CRC=n
>>  CONFIG_RTE_LIBRTE_HINIC_PMD=n
>>
>>  #
>> +# Compile burst-oriented HNS3 PMD driver
>> +#
>> +CONFIG_RTE_LIBRTE_HNS3_PMD=n
>> +
>> +#
>>  # Compile burst-oriented IXGBE PMD driver
>>  #
>>  CONFIG_RTE_LIBRTE_IXGBE_PMD=y
>> diff --git a/config/defconfig_arm64-armv8a-linuxapp-clang
>> b/config/defconfig_arm64-armv8a-linuxapp-clang
>> index d3b4dad..c73f5fb 100644
>> --- a/config/defconfig_arm64-armv8a-linuxapp-clang
>> +++ b/config/defconfig_arm64-armv8a-linuxapp-clang
>> @@ -6,3 +6,5 @@
>>
>>  CONFIG_RTE_TOOLCHAIN="clang"
>>  CONFIG_RTE_TOOLCHAIN_CLANG=y
>> +
>> +CONFIG_RTE_LIBRTE_HNS3_PMD=n
>> diff --git a/doc/guides/nics/features/hns3.ini
>> b/doc/guides/nics/features/hns3.ini
>> new file mode 100644
>> index 000..d38d35e
>> --- /dev/null
>> +++ b/doc/guides/nics/features/hns3.ini
>> @@ -0,0 +1,38 @@
>> +;
>> +; Supported features of the 'hns3' network poll mode driver.
> 
> Add doc changes when driver feature gets added.
> # See git log drivers/net/octeontx2 as example

+1, I put comments on the patches for same thing

> 
>> +;
>> +; Refer to default.ini for the full list of available PMD features.
>> +;
>> +[Features]
>> +Link status  = Y
>> +MTU update   = Y
>> +Jumbo frame  = Y
>> +Promiscuous mode = Y
>> +Allmulticast mode= Y
>> diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst
>> new file mode 100644
>> index 000..c9d0253
>> --- /dev/null
>> +++ b/doc/guides/nics/hns3.rst
>> @@ -0,0 +1,55 @@
>> +..  SPDX-License-Identifier: BSD-3-Clause
>> +Copyright(c) 2018-2019 Hisilicon Limited.
>> +
>> +HNS3 Poll Mode Driver
>> +===
>> +
>> +The Hisilicon Network Subsystem is a long term evolution IP which is
>> +supposed to be used in Hisilicon ICT SoCs such as Kunpeng 920.
>> +
>> +The HNS3 PMD (librte_pmd_hns3) provides poll mode driver support
>> +for hns3(Hisilicon Network Subsystem 3) network engine.
>> +
>> +Features
>> +
>> +
>> +Features of the HNS3 PMD are:
>> +
>> +- Arch support: ARMv8.
> 
> Is it an integrated NIC controller? Why it is supported only on ARMv8?
> The reason why I asking because, Enabling CONFIG_RTE_LIBRTE_HNS3_PMD=y
> only on arm64 will create a case where build fails for arm64 and passes for
> x86. I would like to avoid such disparity. If the build is passing on x86 
> make it
> enable in the common code, not in arm64 config.
> 
> 
>> +- Multiple queues for TX and RX
>> +- Receive Side Scaling (RSS)
>> +- Packet type information
>> +- Checksum offload
>> +- Promiscuous mode
>> +- Multicast mode
>> +- Port hardware statistics
>> +- Jumbo frames
>> +- Link state information
>> +- VLAN stripping
> 
> 
>> +cflags += '-DALLOW_EXPERIMENTAL_API'
>> diff --git a/drivers/net/hns3/rte_pmd_hns3_version.map
>> b/drivers/net/hns3/rte_pmd_hns3_version.map
>> new file mode 100644
>> index 000..3aef967
>> --- /dev/null
>> +++ b/drivers/net/hns3/rte_pmd_hns3_version.map
>> @@ -0,0 +1,3 @@
>> +DPDK_19.08 {
> 
> Change to 19.11
> 

Re: [dpdk-dev] [PATCH 22/22] net/hns3: add hns3 build files

[Ferruh Yigit]

On 8/23/2019 2:47 PM, Wei Hu (Xavier) wrote:
> This patch add build related files for hns3 PMD driver.
> 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Hao Chen 
> Signed-off-by: Huisong Li 
> ---
>  MAINTAINERS  |  7 
>  config/common_armv8a_linux   |  5 +++
>  config/common_base   |  5 +++
>  config/defconfig_arm64-armv8a-linuxapp-clang |  2 +
>  doc/guides/nics/features/hns3.ini| 38 +++
>  doc/guides/nics/hns3.rst | 55 
> 

This file needs to be added to the index file: 'doc/guides/nics/index.rst'

<...>

> diff --git a/config/defconfig_arm64-armv8a-linuxapp-clang 
> b/config/defconfig_arm64-armv8a-linuxapp-clang
> index d3b4dad..c73f5fb 100644
> --- a/config/defconfig_arm64-armv8a-linuxapp-clang
> +++ b/config/defconfig_arm64-armv8a-linuxapp-clang
> @@ -6,3 +6,5 @@
>  
>  CONFIG_RTE_TOOLCHAIN="clang"
>  CONFIG_RTE_TOOLCHAIN_CLANG=y
> +
> +CONFIG_RTE_LIBRTE_HNS3_PMD=n

I can understand the architecture ones, but why clang is not supported? Can you
please add this support?
<...>

> diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst
> new file mode 100644
> index 000..c9d0253
> --- /dev/null
> +++ b/doc/guides/nics/hns3.rst
> @@ -0,0 +1,55 @@
> +..  SPDX-License-Identifier: BSD-3-Clause
> +Copyright(c) 2018-2019 Hisilicon Limited.
> +
> +HNS3 Poll Mode Driver
> +===
> +
> +The Hisilicon Network Subsystem is a long term evolution IP which is
> +supposed to be used in Hisilicon ICT SoCs such as Kunpeng 920.

Can you please add a official link/reference to the product?


<...>

> @@ -0,0 +1,43 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +# Copyright(c) 2018-2019 Hisilicon Limited.
> +
> +include $(RTE_SDK)/mk/rte.vars.mk
> +
> +#
> +# library name
> +#
> +LIB = librte_pmd_hns3.a
> +
> +CFLAGS += -O3
> +CFLAGS += $(WERROR_FLAGS)
> +CFLAGS += -DALLOW_EXPERIMENTAL_API -fsigned-char

Why '-DALLOW_EXPERIMENTAL_API' is required? Can we remove it?

> +
> +LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
> +LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash
> +LDLIBS += -lrte_bus_pci

Are all these libraries really required, like kvargs? Can you please clean the
unused ones?

> +
> +EXPORT_MAP := rte_pmd_hns3_version.map
> +
> +LIBABIVER := 2

It should be 1.

<...>

> +# install this header file
> +SYMLINK-$(CONFIG_RTE_LIBRTE_HNS3_PMD)-include := hns3_ethdev.h

No need to expose the header file, it is not public header.

<...>

> @@ -0,0 +1,19 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +# Copyright(c) 2018-2019 Hisilicon Limited
> +
> +sources = files('hns3_cmd.c',
> + 'hns3_dcb.c',
> + 'hns3_intr.c',
> + 'hns3_ethdev.c',
> + 'hns3_ethdev_vf.c',
> + 'hns3_fdir.c',
> + 'hns3_flow.c',
> + 'hns3_mbx.c',
> + 'hns3_regs.c',
> + 'hns3_rss.c',
> + 'hns3_rxtx.c',
> + 'hns3_stats.c',
> + 'hns3_mp.c')
> +deps += ['hash']
> +
> +cflags += '-DALLOW_EXPERIMENTAL_API'

There is better way to do this in meson, please check other samples. But as the
makefile comment, does it really needed, if so can you please add the
experimental APIs used as a comment, to both meson and Makefile?

> diff --git a/drivers/net/hns3/rte_pmd_hns3_version.map 
> b/drivers/net/hns3/rte_pmd_hns3_version.map
> new file mode 100644
> index 000..3aef967
> --- /dev/null
> +++ b/drivers/net/hns3/rte_pmd_hns3_version.map
> @@ -0,0 +1,3 @@
> +DPDK_19.08 {

DPDK_19.11

Re: [dpdk-dev] [PATCH 22/22] net/hns3: add hns3 build files

[Ferruh Yigit]

On 8/23/2019 2:47 PM, Wei Hu (Xavier) wrote:
> This patch add build related files for hns3 PMD driver.
> 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Hao Chen 
> Signed-off-by: Huisong Li 
> ---
>  MAINTAINERS  |  7 
>  config/common_armv8a_linux   |  5 +++
>  config/common_base   |  5 +++
>  config/defconfig_arm64-armv8a-linuxapp-clang |  2 +
>  doc/guides/nics/features/hns3.ini| 38 +++

There are separate PF and VF drivers in the patchset, this is mostly represent
by to different .ini files, hns3.ini and hns3_vf.ini, and can you please reflect
the feature differences into these files?

Re: [dpdk-dev] [PATCH 04/22] net/hns3: add support for cmd of hns3 PMD driver

[Ferruh Yigit]

On 8/23/2019 2:46 PM, Wei Hu (Xavier) wrote:
> This patch adds support for cmd of hns3 PMD driver, driver can interact
> with firmware through command to complete hardware configuration.
> 
> Signed-off-by: Hao Chen 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Huisong Li 

<...>

> diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
> index bfb54f2..84fcf34 100644
> --- a/drivers/net/hns3/hns3_ethdev.h
> +++ b/drivers/net/hns3/hns3_ethdev.h
> @@ -39,7 +39,6 @@
>  
>  #define HNS3_4_TCS   4
>  #define HNS3_8_TCS   8
> -#define HNS3_MAX_TC_NUM  8

This definition is used by 'hns3_ethdev.h' but moved to 'hns3_cmd.h', and
'hns3_ethdev.h' doesn't include 'hns3_cmd.h', which will force whatever .c file
include 'hns3_ethdev.h' to include 'hns3_cmd.h' before it and these kind of .h
order dependencies are easy to break.
Would it work if 'hns3_ethdev.h' includes 'hns3_cmd.h'

Re: [dpdk-dev] [PATCH 03/22] net/hns3: register hns3 PMD driver

[Ferruh Yigit]

On 8/23/2019 2:46 PM, Wei Hu (Xavier) wrote:
> This patch registers hns3 PMD driver and adds the definition for log
> interfaces.
> 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Hao Chen 
> Signed-off-by: Huisong Li 
<...>

> diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
> new file mode 100644
> index 000..0587a9c
> --- /dev/null
> +++ b/drivers/net/hns3/hns3_ethdev.c
> @@ -0,0 +1,141 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2018-2019 Hisilicon Limited.
> + */
> +
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 

Are all these headers really used at this stage? Can you please clean them and
add later patches when they are required?

<...>

> +static int
> +hns3_dev_init(struct rte_eth_dev *eth_dev)
> +{
> + struct rte_device *dev = eth_dev->device;
> + struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(dev);
> + struct hns3_adapter *hns = eth_dev->data->dev_private;
> + struct hns3_hw *hw = &hns->hw;
> + uint16_t device_id = pci_dev->id.device_id;
> + int ret;
> +
> + PMD_INIT_FUNC_TRACE();
> +
> + if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> + return 0;
> +
> + eth_dev->dev_ops = &hns3_eth_dev_ops;
> + rte_eth_copy_pci_info(eth_dev, pci_dev);

I think no need to call 'rte_eth_copy_pci_info()', it is called by
'rte_eth_dev_pci_generic_probe()' before 'hns3_dev_init()' called.

> +
> + hns->is_vf = false;

There is a separate VF driver, is this field still needed?

> + hw->data = eth_dev->data;
> + hw->adapter_state = HNS3_NIC_INITIALIZED;
> +
> + return 0;

Init should set 'RTE_ETH_DEV_CLOSE_REMOVE' flag, and '.dev_close' should free
the driver allocated resources, which there is not up until this patch:

 +eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;

Re: [dpdk-dev] [PATCH 06/22] net/hns3: add support for MAC address related operations

[Ferruh Yigit]

On 8/23/2019 2:46 PM, Wei Hu (Xavier) wrote:
> This patch adds the following mac address related operations defined in
> struct eth_dev_ops: mac_addr_add, mac_addr_remove, mac_addr_set
> and set_mc_addr_list.
> 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Hao Chen 
> Signed-off-by: Huisong Li 

<...>

> +static int
> +hns3_set_mc_mac_addr_list(struct rte_eth_dev *dev,
> +   struct rte_ether_addr *mc_addr_set,
> +   uint32_t nb_mc_addr)
> +{
> + struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> + struct rte_ether_addr reserved_addr_list[HNS3_MC_MACADDR_NUM];
> + struct rte_ether_addr add_addr_list[HNS3_MC_MACADDR_NUM];
> + struct rte_ether_addr rm_addr_list[HNS3_MC_MACADDR_NUM];
> + struct rte_ether_addr *addr;
> + int reserved_addr_num;
> + int add_addr_num;
> + int rm_addr_num;
> + int mc_addr_num;
> + int num;
> + int ret;
> + int i;
> +
> + /* Check if input parameters are valid */
> + ret = hns3_set_mc_addr_chk_param(hw, mc_addr_set, nb_mc_addr);
> + if (ret)
> + return ret;
> +
> + rte_spinlock_lock(&hw->lock);

Is locking required here?

<...>

> @@ -1582,6 +2394,10 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
>  
>  static const struct eth_dev_ops hns3_eth_dev_ops = {
>   .dev_close  = hns3_dev_close,
> + .mac_addr_add   = hns3_add_mac_addr,
> + .mac_addr_remove= hns3_remove_mac_addr,
> + .mac_addr_set   = hns3_set_default_mac_addr,
> + .set_mc_addr_list   = hns3_set_mc_mac_addr_list,
>  };

Can you please update .ini file in this patch and mark following features as
supported:
Unicast MAC filter
Multicast MAC filter

Re: [dpdk-dev] [PATCH 07/22] net/hns3: add support for some misc operations

[Ferruh Yigit]

On 8/23/2019 2:46 PM, Wei Hu (Xavier) wrote:
> This patch adds the following operations defined in struct eth_dev_ops:
> mtu_set, infos_get and fw_version_get for hns3 PMD driver.
> 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Hao Chen 
> Signed-off-by: Huisong Li 
> ---
>  drivers/net/hns3/hns3_ethdev.c | 137 
> -
>  1 file changed, 136 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
> index 44e21ac..ced9348 100644
> --- a/drivers/net/hns3/hns3_ethdev.c
> +++ b/drivers/net/hns3/hns3_ethdev.c
> @@ -40,6 +40,8 @@
>  int hns3_logtype_init;
>  int hns3_logtype_driver;
>  
> +static int hns3_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
> +

This forward deceleration is not needed.

>  static int
>  hns3_config_tso(struct hns3_hw *hw, unsigned int tso_mss_min,
>   unsigned int tso_mss_max)
> @@ -1000,6 +1002,131 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps)
>  }
>  
>  static int
> +hns3_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
> +{
> + struct hns3_adapter *hns = dev->data->dev_private;
> + uint32_t frame_size = mtu + HNS3_ETH_OVERHEAD;
> + struct hns3_hw *hw = &hns->hw;
> + bool is_jumbo_frame;
> + int ret;
> +
> + if (mtu < RTE_ETHER_MIN_MTU || frame_size > HNS3_MAX_FRAME_LEN) {
> + hns3_err(hw, "Failed to set mtu, mtu(%u) invalid. valid "
> +  "range: %d~%d", mtu, RTE_ETHER_MIN_MTU, HNS3_MAX_MTU);
> + return -EINVAL;
> + }

If 'hns3_dev_infos_get()' sets 'min_mtu' & 'max_mtu' properly, above check will
be done by 'rte_eth_dev_set_mtu()' already.

<...>

> +static void
> +hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info 
> *info)
> +{
> + struct hns3_adapter *hns = eth_dev->data->dev_private;
> + struct hns3_hw *hw = &hns->hw;
> +
> + info->max_rx_queues = hw->tqps_num;
> + info->max_tx_queues = hw->tqps_num;
> + info->max_rx_pktlen = HNS3_MAX_FRAME_LEN; /* CRC included */
> + info->min_rx_bufsize = hw->rx_buf_len;
> + info->max_mac_addrs = HNS3_UC_MACADDR_NUM;
> + info->max_mtu = info->max_rx_pktlen - HNS3_ETH_OVERHEAD;
> + info->min_mtu = RTE_ETHER_MIN_MTU;

'RTE_ETHER_MIN_MTU' is default value and can be skipped.

<...>

> @@ -2394,6 +2521,9 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
>  
>  static const struct eth_dev_ops hns3_eth_dev_ops = {
>   .dev_close  = hns3_dev_close,
> + .mtu_set= hns3_dev_mtu_set,
> + .dev_infos_get  = hns3_dev_infos_get,
> + .fw_version_get = hns3_fw_version_get,

Can you please update .ini file in this patch and mark following features as
supported:
MTU update
FW version

Re: [dpdk-dev] [PATCH 08/22] net/hns3: add support for link update operation

[Ferruh Yigit]

On 8/23/2019 2:46 PM, Wei Hu (Xavier) wrote:
> This patch adds link update operation to hns3 PMD driver.
> 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Hao Chen 
> Signed-off-by: Huisong Li 

<...>

> @@ -2528,6 +2725,7 @@ static const struct eth_dev_ops hns3_eth_dev_ops = {
>   .mac_addr_remove= hns3_remove_mac_addr,
>   .mac_addr_set   = hns3_set_default_mac_addr,
>   .set_mc_addr_list   = hns3_set_mc_mac_addr_list,
> + .link_update= hns3_dev_link_update,

Can you please update .ini file in this patch and mark following features as
supported:
Link status

Re: [dpdk-dev] [PATCH 09/22] net/hns3: add support for flow directory of hns3 PMD driver

[Ferruh Yigit]

On 8/23/2019 2:46 PM, Wei Hu (Xavier) wrote:
> This patch adds support for flow directory of hns3 PMD driver.
> Flow directory feature is only supported in hns3 PF driver.
> It supports the network L2\L3\L4 and tunnel packet creation,
> deletion, flushing, and querying hit statistics.

This patch also adds rte_flow support, can you please add this into commit log?

> 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Hao Chen 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Huisong Li 

<...>

> @@ -2726,6 +2744,7 @@ static const struct eth_dev_ops hns3_eth_dev_ops = {
>   .mac_addr_set   = hns3_set_default_mac_addr,
>   .set_mc_addr_list   = hns3_set_mc_mac_addr_list,
>   .link_update= hns3_dev_link_update,
> + .filter_ctrl= hns3_dev_filter_ctrl,

'hns3_dev_filter_ctrl()' is not exists up until this patch.

This is the problem of not enabling the driver yet, it is very hard to see these
kind of issues. When Makefile/meson patch moved to the begging of the patches
and start to build the driver, these issues will be visible.

>  };
>  
>  static int
> @@ -2739,6 +2758,16 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)
>   int ret;
>  
>   PMD_INIT_FUNC_TRACE();
> + eth_dev->process_private = (struct hns3_process_private *)
> + rte_zmalloc_socket("hns3_filter_list",
> +sizeof(struct hns3_process_private),
> +RTE_CACHE_LINE_SIZE, eth_dev->device->numa_node);
> + if (eth_dev->process_private == NULL) {
> + PMD_INIT_LOG(ERR, "Failed to alloc memory for process private");
> + return -ENOMEM;
> + }
> + /* initialize flow filter lists */
> + hns3_filterlist_init(eth_dev);

Can you please free 'process_private' in, close dev_ops?

[dpdk-dev] [dpdk-announce] Reminder: DPDK Summit NA CFP deadline September 6th

[Trishan de Lanerolle]

Hello DPDK Community,

The CFP for DPDK Summit North America
 2019, happening
November 12-13 in Mountain View, CA, is open.

As with previous DPDK Summits, we are looking for this year’s agenda to
cover the latest developments to the DPDK framework and other related
projects, including plans for future releases, as well as the opportunity
for  DPDK users to discuss how DPDK works in their applications.

The deadline for speaking submissions is September 6th, 2019 (please see
below for additional deadlines).

If you have an exciting DPDK story, use case, application, or plan, we
encourage you to consider submitting for this event.


   -

   The CFP submission page is here:
   
https://docs.google.com/forms/d/e/1FAIpQLSfGPHOfy0m8zBqaTACDUsmwgucQtkMWYM80_BR0K6ZR-B-rsA/viewform




   -

   More details on the event are available here:
   https://www.dpdk.org/event/dpdk-summit-na-mountain-view/


For questions, please contact eve...@dpdk.org



Important dates:SUBMIT PROPOSALS HERE


Submissions must be received by 11:59pm PDT on September 6th , 2019

CFP Open: August 5, 2019

CFP Close: September 6, 2019

CFP Notifications: Week of September 9, 2019

Schedule Announced: Week of September 16, 2019

Slide Due Date: November 5, 2019

Event Dates: November 12 – 13, 2019

-- 
Trishan R. de Lanerolle
Program Manager,  Networking
Linux Foundation
voice: +1.203.699.6401
skype: tdelanerolle
email: tdelanero...@linuxfoundation.org

Re: [dpdk-dev] [PATCH 10/22] net/hns3: add support for RSS of hns3 PMD driver

[Ferruh Yigit]

On 8/23/2019 2:46 PM, Wei Hu (Xavier) wrote:
> This patch adds support for RSS of hns3 PMD driver.
> It included the following functions in file hns3_rss.c:
> 1) Set/query hash key, rss_hf by .rss_hash_update/.rss_hash_conf_get ops
>callback functions.
> 2) Set/query redirection table by .reta_update/.reta_query. ops callback
>functions.
> 3) Set/query hash algorithm by .filter_ctrl ops callback function when
>the 'filter_type' is RTE_ETH_FILTER_HASH.

Legacy filter API is deprecated, there is a recent patch from Thomas to
deprecate documenting this as feature:
Commit 030febb6642c ("doc: remove deprecated ethdev features")

> 
> And it included the following functions in file hns3_flow.c:
> 1) Set hash key, rss_hf, redirection table and algorithm by .create ops
>callback function.
> 2) Disable RSS by .destroy or .flush ops callback function.
> 3) Check the effectiveness of the RSS's configuration by .validate ops
>callback function.
> 
> Signed-off-by: Hao Chen 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Huisong Li 
<...>

> @@ -2744,6 +2748,10 @@ static const struct eth_dev_ops hns3_eth_dev_ops = {
>   .mac_addr_set   = hns3_set_default_mac_addr,
>   .set_mc_addr_list   = hns3_set_mc_mac_addr_list,
>   .link_update= hns3_dev_link_update,
> + .rss_hash_update= hns3_dev_rss_hash_update,
> + .rss_hash_conf_get  = hns3_dev_rss_hash_conf_get,
> + .reta_update= hns3_dev_rss_reta_update,
> + .reta_query = hns3_dev_rss_reta_query,

Can you please update .ini file in this patch and mark following features as
supported:
RSS key update
RSS reta update

For 'RSS hash' datapath update is also required, I am not sure in which patch
that support it added.

Re: [dpdk-dev] [PATCH 11/22] net/hns3: add support for flow control of hns3 PMD driver

[Ferruh Yigit]

On 8/23/2019 2:47 PM, Wei Hu (Xavier) wrote:
> This patch adds support for MAC PAUSE flow control and priority flow
> control of hns3 PMD driver. All user priorities(up) must be mapped to
> tc0 when MAC PAUSE flow control is enabled. Ups can be mapped to other
> tcs driver permit when PFC is enabled. Flow control function by default
> is turned off to ensure that app startup state is the same each time.

As far as I can see the patch both enable DCB and flow control, can you please
either split the patch or update the commit log to cover both features?

> 
> Signed-off-by: Huisong Li 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Hao Chen 

<...>

>  static const struct eth_dev_ops hns3_eth_dev_ops = {
>   .dev_close  = hns3_dev_close,
>   .mtu_set= hns3_dev_mtu_set,
>   .dev_infos_get  = hns3_dev_infos_get,
>   .fw_version_get = hns3_fw_version_get,
> + .flow_ctrl_get  = hns3_flow_ctrl_get,
> + .flow_ctrl_set  = hns3_flow_ctrl_set,
> + .priority_flow_ctrl_set = hns3_priority_flow_ctrl_set,

Can you please update .ini file in this patch and mark following features as
supported:
Flow control

>   .mac_addr_add   = hns3_add_mac_addr,
>   .mac_addr_remove= hns3_remove_mac_addr,
>   .mac_addr_set   = hns3_set_default_mac_addr,
> @@ -2753,6 +2949,7 @@ static const struct eth_dev_ops hns3_eth_dev_ops = {
>   .reta_update= hns3_dev_rss_reta_update,
>   .reta_query = hns3_dev_rss_reta_query,
>   .filter_ctrl= hns3_dev_filter_ctrl,
> + .get_dcb_info   = hns3_get_dcb_info,

Can you please update .ini file in this patch and mark following features as
supported:
DCB

Re: [dpdk-dev] [PATCH 12/22] net/hns3: add support for VLAN of hns3 PMD driver

[Ferruh Yigit]

On 8/23/2019 2:47 PM, Wei Hu (Xavier) wrote:
> This patch adds support for VLAN related operation of hns3 PMD driver.
> 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Hao Chen 
> Signed-off-by: Huisong Li 

<...>

> @@ -2949,6 +3615,10 @@ static const struct eth_dev_ops hns3_eth_dev_ops = {
>   .reta_update= hns3_dev_rss_reta_update,
>   .reta_query = hns3_dev_rss_reta_query,
>   .filter_ctrl= hns3_dev_filter_ctrl,
> + .vlan_filter_set= hns3_vlan_filter_set,
> + .vlan_tpid_set  = hns3_vlan_tpid_set,
> + .vlan_offload_set   = hns3_vlan_offload_set,
> + .vlan_pvid_set  = hns3_vlan_pvid_set,

Can you please update .ini file in this patch and mark following features as
supported:
VLAN filter
VLAN offload

Re: [dpdk-dev] [PATCH 13/22] net/hns3: add support for mailbox of hns3 PMD driver

[Ferruh Yigit]

On 8/23/2019 2:47 PM, Wei Hu (Xavier) wrote:
> This patch adds support for mailbox of hns3 PMD driver, mailbox is
> used for communication between PF and VF driver.
> 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Hao Chen 
> Signed-off-by: Huisong Li 

<...>

> @@ -27,6 +27,7 @@
>  #include 
>  
>  #include "hns3_cmd.h"
> +#include "hns3_mbx.h"

Why need to include the new header if .c file is not using from the header? Same
for other .c files below.

<...>

> @@ -0,0 +1,337 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2018-2019 Hisilicon Limited.
> + */
> +
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 

Same comment for all .c files in the driver, above inclusion list feels like a
copy/paste, can you please include only necessary headers?

Re: [dpdk-dev] [PATCH 14/22] net/hns3: add support for hns3 VF PMD driver

[Ferruh Yigit]

On 8/23/2019 2:47 PM, Wei Hu (Xavier) wrote:
> This patch adds support for hns3 VF PMD driver.
> 
> In current version, we only support VF device is bound to vfio_pci or
> igb_uio and then taken over by DPDK when PF device is taken over by kernel
> mode hns3 ethdev driver, VF is not supported when PF devcie is taken over
> by DPDK.

I think better to say 'when PF is driven by DPDK driver' than 'when PF device is
taken over by DPDK'.

Can you please this (VF only supported when PF is driver by kernel) in your
documentation please?
And perhaps VF driver support in feature list to highlight it...

> 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Hao Chen 
> Signed-off-by: Huisong Li 

Re: [dpdk-dev] [PATCH 22/22] net/hns3: add hns3 build files

[Ferruh Yigit]

On 8/23/2019 2:47 PM, Wei Hu (Xavier) wrote:
> This patch add build related files for hns3 PMD driver.
> 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Hao Chen 
> Signed-off-by: Huisong Li 
> ---
>  MAINTAINERS  |  7 
>  config/common_armv8a_linux   |  5 +++
>  config/common_base   |  5 +++
>  config/defconfig_arm64-armv8a-linuxapp-clang |  2 +
>  doc/guides/nics/features/hns3.ini| 38 +++
>  doc/guides/nics/hns3.rst | 55 
> 
>  drivers/net/Makefile |  1 +
>  drivers/net/hns3/Makefile| 43 ++
>  drivers/net/hns3/meson.build | 19 ++
>  drivers/net/hns3/rte_pmd_hns3_version.map|  3 ++
>  drivers/net/meson.build  |  1 +
>  mk/rte.app.mk|  1 +

Can you also update the release notes to announce the new PMD:
'doc/guides/rel_notes/release_19_11.rst'

Re: [dpdk-dev] [PATCH 15/22] net/hns3: add package and queue related operation

[Ferruh Yigit]

On 8/23/2019 2:47 PM, Wei Hu (Xavier) wrote:
> This patch adds queue related operation, package sending and
> receiving function codes.
> 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Min Wang (Jushui) 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Hao Chen 
> Signed-off-by: Huisong Li 

<...>

> +
> +#define __packed __attribute__((packed))
> +/* hardware spec ring buffer format */
> +__packed struct hns3_desc {

Can you use existing '__rte_packed' instead?

Re: [dpdk-dev] [PATCH 16/22] net/hns3: add start stop configure promiscuous ops

[Ferruh Yigit]

On 8/23/2019 2:47 PM, Wei Hu (Xavier) wrote:
> This patch adds dev_start, dev_stop, dev_configure, promiscuous_enable,
> promiscuous_disable, allmulticast_enable, allmulticast_disable,
> dev_infos_get related function codes.
> 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Hao Chen 
> Signed-off-by: Huisong Li 

<...>

> @@ -3626,6 +4031,7 @@ static const struct eth_dev_ops hns3_eth_dev_ops = {
>   .vlan_offload_set   = hns3_vlan_offload_set,
>   .vlan_pvid_set  = hns3_vlan_pvid_set,
>   .get_dcb_info   = hns3_get_dcb_info,
> + .dev_supported_ptypes_get = hns3_dev_supported_ptypes_get,

'hns3_dev_supported_ptypes_get' has been defined in previous patch, what do you
thinks defining and using in same patch?

Re: [dpdk-dev] [PATCH 21/22] net/hns3: add multiple process support for hns3 PMD driver

[Ferruh Yigit]

On 8/23/2019 2:47 PM, Wei Hu (Xavier) wrote:
> This patch adds multiple process support for hns3 PMD driver.
> Multi-process support selection queue by configuring RSS or
> flow director. The primary process supports various management
> ops, and the secondary process only supports queries ops.
> The primary process notifies the secondary processes to start
> or stop tranceiver.
> 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Min Wang (Jushui) 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Hao Chen 
> Signed-off-by: Huisong Li 

<...>

> @@ -1556,6 +1559,25 @@ static const struct eth_dev_ops hns3vf_eth_dev_ops = {
>   .dev_supported_ptypes_get = hns3_dev_supported_ptypes_get,
>  };
>  
> +static const struct eth_dev_ops hns3vf_eth_dev_secondary_ops = {
> + .stats_get  = hns3_stats_get,
> + .stats_reset= hns3_stats_reset,
> + .xstats_get = hns3_dev_xstats_get,
> + .xstats_get_names   = hns3_dev_xstats_get_names,
> + .xstats_reset   = hns3_dev_xstats_reset,
> + .xstats_get_by_id   = hns3_dev_xstats_get_by_id,
> + .xstats_get_names_by_id = hns3_dev_xstats_get_names_by_id,
> + .dev_infos_get  = hns3vf_dev_infos_get,
> + .link_update= hns3vf_dev_link_update,
> + .rss_hash_update= hns3_dev_rss_hash_update,
> + .rss_hash_conf_get  = hns3_dev_rss_hash_conf_get,
> + .reta_update= hns3_dev_rss_reta_update,
> + .reta_query = hns3_dev_rss_reta_query,
> + .filter_ctrl= hns3_dev_filter_ctrl,
> + .get_reg= hns3_get_regs,
> + .dev_supported_ptypes_get = hns3_dev_supported_ptypes_get,
> +};
> +

There shouldn't need to define separate dev_ops for the secondary processes,
what is the difference of this one used for primary process, why not use that 
one?

<...>

> +/*
> + * Initialize by secondary process.
> + */
> +void hns3_mp_init_secondary(void)
> +{
> + rte_mp_action_register(HNS3_MP_NAME, mp_secondary_handle);

What is this handler for? Most of the case the MP communication is done in eal
level and nothing need to be done in the driver level.

Re: [dpdk-dev] [PATCH 19/22] net/hns3: add stats related ops for hns3 PMD driver

[Ferruh Yigit]

On 8/23/2019 2:47 PM, Wei Hu (Xavier) wrote:
> This patch adds stats_get, stats_reset, xstats_get, xstats_get_names
> xstats_reset, xstats_get_by_id and xstats_get_names_by_id related
> function codes.
> 
> Signed-off-by: Wei Hu (Xavier) 
> Signed-off-by: Hao Chen 
> Signed-off-by: Chunsong Feng 
> Signed-off-by: Min Hu (Connor) 
> Signed-off-by: Huisong Li 

<...>

> + for (i = 0; i < size; i++) {
> + if (ids[i] >= cnt_stats) {
> + PMD_INIT_LOG(ERR, "id value is invalid");
> + return -EINVAL;
> + }
> + strncpy(xstats_names[i].name, xstats_names_copy[ids[i]].name,
> + strlen(xstats_names_copy[ids[i]].name));

Getting following warning from this line:

.../drivers/net/hns3/hns3_stats.c: In function
‘hns3_dev_xstats_get_names_by_id’:

.../drivers/net/hns3/hns3_stats.c:825:3: error: ‘strncpy’ output truncated
before terminating nul copying as many bytes from a string as its length
[-Werror=stringop-truncation]
  825 |   strncpy(xstats_names[i].name, xstats_names_copy[ids[i]].name,

  |   ^
  826 |strlen(xstats_names_copy[ids[i]].name));

  |~~~

Re: [dpdk-dev] [PATCH 00/22] add hns3 ethernet PMD driver

[Ferruh Yigit]

On 8/23/2019 2:46 PM, Wei Hu (Xavier) wrote:
> The Hisilicon Network Subsystem is a long term evolution IP which is
> supposed to be used in Hisilicon ICT SoCs such as Kunpeng 920.
> 
> This series add DPDK rte_ethdev poll mode driver for hns3(Hisilicon
> Network Subsystem 3) network engine.
> 
> Wei Hu (Xavier) (22):
>   net/hns3: add hardware registers definition
>   net/hns3: add some definitions for data structure and macro
>   net/hns3: register hns3 PMD driver
>   net/hns3: add support for cmd of hns3 PMD driver
>   net/hns3: add the initialization of hns3 PMD driver
>   net/hns3: add support for MAC address related operations
>   net/hns3: add support for some misc operations
>   net/hns3: add support for link update operation
>   net/hns3: add support for flow directory of hns3 PMD driver
>   net/hns3: add support for RSS of hns3 PMD driver
>   net/hns3: add support for flow control of hns3 PMD driver
>   net/hns3: add support for VLAN of hns3 PMD driver
>   net/hns3: add support for mailbox of hns3 PMD driver
>   net/hns3: add support for hns3 VF PMD driver
>   net/hns3: add package and queue related operation
>   net/hns3: add start stop configure promiscuous ops
>   net/hns3: add dump register ops for hns3 PMD driver
>   net/hns3: add abnormal interrupt process for hns3 PMD driver
>   net/hns3: add stats related ops for hns3 PMD driver
>   net/hns3: add reset related process for hns3 PMD driver
>   net/hns3: add multiple process support for hns3 PMD driver
>   net/hns3: add hns3 build files
> 

There are some build error for 32-bit [1], I am aware that 32-bit is not in the
supported arch list, but build error are just related to the log format
identifiers, it is good practice to use 'PRIx64' and friends which will also fix
the build issue.

[1]
In file included from .../drivers/net/hns3/hns3_regs.c:35:



.../drivers/net/hns3/hns3_regs.c: In function ‘hns3_get_32_bit_regs’:



.../drivers/net/hns3/hns3_logs.h:16:38: error: format ‘%ld’ expects argument of
type ‘long int’, but argument 6 has type ‘unsigned int’ [-Werror=format=]


   16 |  rte_log(level, hns3_logtype_driver, "%s %s(): " fmt, \



  |  ^~~



.../drivers/net/hns3/hns3_logs.h:20:2: note: in expansion of macro
‘PMD_DRV_LOG_RAW’


   20 |  PMD_DRV_LOG_RAW(hw, RTE_LOG_ERR, fmt "\n", ## args)



  |  ^~~



.../drivers/net/hns3/hns3_regs.c:177:3: note: in expansion of macro ‘hns3_err’



  177 |   hns3_err(hw, "Failed to allocate %ld bytes needed to "



  |   ^~~~



.../drivers/net/hns3/hns3_regs.c:177:38: note: format string is defined here



  177 |   hns3_err(hw, "Failed to allocate %ld bytes needed to "



  |~~^



  |  |



  |  long int



  |%d

Re: [dpdk-dev] [PATCH] net/af_xdp: enable support for unaligned umem chunks

[William Tu]

Hi Ciara,

I haven't tried this patch but have a question.

On Thu, Aug 29, 2019 at 8:04 AM Ciara Loftus  wrote:
>
> This patch enables the unaligned chunks feature for AF_XDP which allows
> chunks to be placed at arbitrary places in the umem, as opposed to them
> being required to be aligned to 2k. This allows for DPDK application
> mempools to be mapped directly into the umem and in turn enable zero copy
> transfer between umem and the PMD.
>
> This patch replaces the zero copy via external mbuf mechanism introduced
> in commit e9ff8bb71943 ("net/af_xdp: enable zero copy by external mbuf").
> The pmd_zero copy vdev argument is also removed as now the PMD will
> auto-detect presence of the unaligned chunks feature and enable it if so
> and otherwise fall back to copy mode if not detected.
>
> When enabled, this feature significantly improves single-core performance
> of the PMD.

Why using unaligned chunk feature improve performance?
Existing external mbuf already has zero copy between umem and PMD, and your
patch also does the same thing. So the improvement is from somewhere else?

Thank you
William

>
> Signed-off-by: Ciara Loftus 
> Signed-off-by: Kevin Laatz 
> ---
>  doc/guides/nics/af_xdp.rst |   1 -
>  doc/guides/rel_notes/release_19_11.rst |   9 +
>  drivers/net/af_xdp/rte_eth_af_xdp.c| 304 ++---
>  3 files changed, 231 insertions(+), 83 deletions(-)
>

Re: [dpdk-dev] [PATCH v3 2/4] doc: changes to abi policy introducing major abi versions

[Kevin Traynor]

Hi Ray,

On 15/08/2019 11:23, Ray Kinsella wrote:
> This policy change introduces major ABI versions, these are
> declared every year, typically aligned with the LTS release
> and are supported by subsequent releases in the following year.
> This change is intended to improve ABI stabilty for those projects
> consuming DPDK.
> 
> Signed-off-by: Ray Kinsella 
> ---
>  doc/guides/contributing/abi_policy.rst | 308 
> -
>  doc/guides/contributing/stable.rst |  38 ++--
>  2 files changed, 245 insertions(+), 101 deletions(-)
> 
> diff --git a/doc/guides/contributing/abi_policy.rst 
> b/doc/guides/contributing/abi_policy.rst
> index 55bacb4..6190bdc 100644
> --- a/doc/guides/contributing/abi_policy.rst
> +++ b/doc/guides/contributing/abi_policy.rst
> @@ -1,33 +1,46 @@
>  ..  SPDX-License-Identifier: BSD-3-Clause
> -Copyright 2018 The DPDK contributors
> +Copyright 2019 The DPDK contributors
>  
> -.. abi_api_policy:
> +.. _abi_policy:
>  
> -DPDK ABI/API policy
> -===
> +ABI Policy
> +==
>  
>  Description
>  ---
>  
> -This document details some methods for handling ABI management in the DPDK.
> +This document details the management policy that ensures the long-term 
> stability
> +of the DPDK ABI and API.
>  
>  General Guidelines
>  --
>  
> -#. Whenever possible, ABI should be preserved
> -#. ABI/API may be changed with a deprecation process
> -#. The modification of symbols can generally be managed with versioning
> -#. Libraries or APIs marked in ``experimental`` state may change without 
> constraint
> -#. New APIs will be marked as ``experimental`` for at least one release to 
> allow
> -   any issues found by users of the new API to be fixed quickly
> -#. The addition of symbols is generally not problematic
> -#. The removal of symbols generally is an ABI break and requires bumping of 
> the
> -   LIBABIVER macro
> -#. Updates to the minimum hardware requirements, which drop support for 
> hardware which
> -   was previously supported, should be treated as an ABI change.
> -
> -What is an ABI
> -~~
> +#. Major ABI versions are declared every **year** and are then supported for 
> one
> +   year, typically aligned with the :ref:`LTS release `.
> +#. The ABI version is managed at a project level in DPDK, with the ABI 
> version
> +   reflected in all :ref:`library's soname `.
> +#. The ABI should be preserved and not changed lightly. ABI changes must 
> follow
> +   the outlined :ref:`deprecation process `.
> +#. The addition of symbols is generally not problematic. The modification of
> +   symbols is managed with :ref:`ABI Versioning `.
> +#. The removal of symbols is considered an :ref:`ABI breakage 
> `,
> +   once approved these will form part of the next ABI version.
> +#. Libraries or APIs marked as :ref:`Experimental ` are 
> not
> +   considered part of an ABI version and may change without constraint.
> +#. Updates to the :ref:`minimum hardware requirements `, which drop
> +   support for hardware which was previously supported, should be treated as 
> an
> +   ABI change.
> +
> +.. note::
> +
> +   In 2019, the DPDK community stated it's intention to move to ABI stable
> +   releases, over a number of release cycles. Beginning with maintaining ABI
> +   stability through one year of DPDK releases starting from DPDK 19.11. This
> +   policy will be reviewed in 2020, with intention of lengthening the 
> stability
> +   period.
> +
> +What is an ABI?
> +~~~
>  
>  An ABI (Application Binary Interface) is the set of runtime interfaces 
> exposed
>  by a library. It is similar to an API (Application Programming Interface) but
> @@ -39,30 +52,67 @@ Therefore, in the case of dynamic linking, it is critical 
> that an ABI is
>  preserved, or (when modified), done in such a way that the application is 
> unable
>  to behave improperly or in an unexpected fashion.
>  
> +What is an ABI version?
> +~~~
>  
> -ABI/API Deprecation
> 
> +An ABI version is an instance of a library's ABI at a specific release. 
> Certain
> +releases are considered by the community to be milestone releases, the yearly
> +LTS for example. Supporting those milestone release's ABI for some number of
> +subsequent releases is desirable to facilitate application upgrade. Those ABI
> +version's aligned with milestones release are therefore called 'ABI major
> +versions' and are supported for some number of releases.
> +
> +More details on major ABI version can be found in the :ref:`ABI versioning
> +` guide.
>  
>  The DPDK ABI policy
> -~~~
> +---
> +
> +A major ABI version is declared every year, aligned with that year's LTS
> +release, e.g. v19.11. This ABI version is then supported for one year by all
> +subsequent releases within that time period, until the next LTS release, e.g.
> +v20.11.
> +
> +At the declaration of a major ABI version, major

[dpdk-dev] [PATCH v2 04/13] net/bnxt: inform firmware about IF state changes

[Ajit Khaparde]

From: Kalesh AP 

Use latest firmware API to inform firmware about IF state changes.
Firmware has the option to clean up resources during IF down and
to require the driver to reserve resources again during IF up.

Signed-off-by: Kalesh AP 
Reviewed-by: Santoshkumar Karanappa Rastapur 
Reviewed-by: Somnath Kotur 
Reviewed-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt.h|  1 +
 drivers/net/bnxt/bnxt_ethdev.c |  4 
 drivers/net/bnxt/bnxt_hwrm.c   | 35 ++
 drivers/net/bnxt/bnxt_hwrm.h   |  1 +
 4 files changed, 41 insertions(+)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 8797b032e..394a2a941 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -370,6 +370,7 @@ struct bnxt {
 #define BNXT_FLAG_STINGRAY (1 << 14)
 #define BNXT_FLAG_FW_RESET (1 << 15)
 #define BNXT_FLAG_FATAL_ERROR  (1 << 16)
+#define BNXT_FLAG_FW_CAP_IF_CHANGE (1 << 17)
 #define BNXT_FLAG_EXT_STATS_SUPPORTED  (1 << 29)
 #define BNXT_FLAG_NEW_RM   (1 << 30)
 #define BNXT_FLAG_INIT_DONE(1U << 31)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index e545802ce..385492db5 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -803,6 +803,8 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS);
}
 
+   bnxt_hwrm_if_change(bp, 1);
+
rc = bnxt_init_chip(bp);
if (rc)
goto error;
@@ -829,6 +831,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
return 0;
 
 error:
+   bnxt_hwrm_if_change(bp, 0);
bnxt_shutdown_nic(bp);
bnxt_free_tx_mbufs(bp);
bnxt_free_rx_mbufs(bp);
@@ -895,6 +898,7 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
bnxt_free_tx_mbufs(bp);
bnxt_free_rx_mbufs(bp);
bnxt_shutdown_nic(bp);
+   bnxt_hwrm_if_change(bp, 0);
bp->dev_stopped = 1;
 }
 
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index b27dbe87e..17c7b5e9e 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -716,6 +716,11 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp)
rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
 
HWRM_CHECK_RESULT();
+
+   flags = rte_le_to_cpu_32(resp->flags);
+   if (flags & HWRM_FUNC_DRV_RGTR_OUTPUT_FLAGS_IF_CHANGE_SUPPORTED)
+   bp->flags |= BNXT_FLAG_FW_CAP_IF_CHANGE;
+
HWRM_UNLOCK();
 
bp->flags |= BNXT_FLAG_REGISTERED;
@@ -4649,3 +4654,33 @@ int bnxt_hwrm_set_mac(struct bnxt *bp)
 
return rc;
 }
+
+int bnxt_hwrm_if_change(struct bnxt *bp, bool state)
+{
+   struct hwrm_func_drv_if_change_output *resp = bp->hwrm_cmd_resp_addr;
+   struct hwrm_func_drv_if_change_input req = {0};
+   int rc;
+
+   if (!(bp->flags & BNXT_FLAG_FW_CAP_IF_CHANGE))
+   return 0;
+
+   /* Do not issue FUNC_DRV_IF_CHANGE during reset recovery.
+* If we issue FUNC_DRV_IF_CHANGE with flags down before
+* FUNC_DRV_UNRGTR, FW resets before FUNC_DRV_UNRGTR
+*/
+   if (!state && (bp->flags & BNXT_FLAG_FW_RESET))
+   return 0;
+
+   HWRM_PREP(req, FUNC_DRV_IF_CHANGE, BNXT_USE_CHIMP_MB);
+
+   if (state)
+   req.flags =
+   rte_cpu_to_le_32(HWRM_FUNC_DRV_IF_CHANGE_INPUT_FLAGS_UP);
+
+   rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
+
+   HWRM_CHECK_RESULT();
+   HWRM_UNLOCK();
+
+   return rc;
+}
diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h
index a03620532..2f57e950b 100644
--- a/drivers/net/bnxt/bnxt_hwrm.h
+++ b/drivers/net/bnxt/bnxt_hwrm.h
@@ -201,4 +201,5 @@ int bnxt_hwrm_tunnel_redirect_query(struct bnxt *bp, 
uint32_t *type);
 int bnxt_hwrm_tunnel_redirect_info(struct bnxt *bp, uint8_t tun_type,
   uint16_t *dst_fid);
 int bnxt_hwrm_set_mac(struct bnxt *bp);
+int bnxt_hwrm_if_change(struct bnxt *bp, bool state);
 #endif
-- 
2.20.1 (Apple Git-117)

[dpdk-dev] [PATCH v2 00/13] bnxt patchset to support device error recovery

[Ajit Khaparde]

This patchset adds support to monitor the health of the firmware and the
underlying device and recover to an operational state in case of error.
We can also detect if a FW upgrade is in progress and quiesce all
access to the device and recover once FW indicates everything is ready.

Patchset against dpdk-next-net. Please apply.

Kalesh AP (13):
  net/bnxt: add FW reset HWRM command
  net/bnxt: prevent device access when device is in reset
  net/bnxt: handle reset notify async event from FW
  net/bnxt: inform firmware about IF state changes
  net/bnxt: handle fatal event from FW under error conditions
  net/bnxt: query firmware error recovery capabilities
  net/bnxt: map status registers for FW health monitoring
  net/bnxt: advertise error recovery capability and handle async event
  net/bnxt: add code for periodic FW health monitoring
  net/bnxt: add support for FW reset
  net/bnxt: reduce verbosity of logs
  net/bnxt: use BIT macro instead of bit fields
  net/bnxt: avoid null pointer dereference

 drivers/net/bnxt/bnxt.h| 130 +++-
 drivers/net/bnxt/bnxt_cpr.c|  80 +++
 drivers/net/bnxt/bnxt_cpr.h|  18 +
 drivers/net/bnxt/bnxt_ethdev.c | 815 -
 drivers/net/bnxt/bnxt_hwrm.c   | 200 +-
 drivers/net/bnxt/bnxt_hwrm.h   |   7 +
 drivers/net/bnxt/bnxt_ring.c   |  45 +-
 drivers/net/bnxt/bnxt_ring.h   |   1 +
 drivers/net/bnxt/bnxt_rxq.c|  25 +
 drivers/net/bnxt/bnxt_rxr.c|  17 +
 drivers/net/bnxt/bnxt_rxr.h|   2 +
 drivers/net/bnxt/bnxt_stats.c  |  34 +-
 drivers/net/bnxt/bnxt_txq.c|   7 +
 drivers/net/bnxt/bnxt_txr.c|  27 +
 drivers/net/bnxt/bnxt_txr.h|   2 +
 drivers/net/bnxt/bnxt_util.h   |   4 +
 drivers/net/bnxt/bnxt_vnic.c   |   7 +-
 drivers/net/bnxt/hsi_struct_def_dpdk.h | 137 +
 18 files changed, 1343 insertions(+), 215 deletions(-)

-- 
2.20.1 (Apple Git-117)

[dpdk-dev] [PATCH v2 01/13] net/bnxt: add FW reset HWRM command

[Ajit Khaparde]

From: Kalesh AP 

This patch adds new FW reset HWRM command.
This command allows the host software to reset the underlying hardware
if a device error is detected.
Code using this command will be added in future patch.

Signed-off-by: Kalesh AP 
Reviewed-by: Somnath Kotur 
Reviewed-by: Ajit Khaparde 
---
 drivers/net/bnxt/hsi_struct_def_dpdk.h | 137 +
 1 file changed, 137 insertions(+)

diff --git a/drivers/net/bnxt/hsi_struct_def_dpdk.h 
b/drivers/net/bnxt/hsi_struct_def_dpdk.h
index 6c98c1d6d..009571725 100644
--- a/drivers/net/bnxt/hsi_struct_def_dpdk.h
+++ b/drivers/net/bnxt/hsi_struct_def_dpdk.h
@@ -33621,4 +33621,141 @@ struct hwrm_nvm_validate_option_cmd_err {
uint8_t unused_0[7];
 } __attribute__((packed));
 
+/*
+ * hwrm_fw_reset *
+ **/
+
+
+/* hwrm_fw_reset_input (size:192b/24B) */
+struct hwrm_fw_reset_input {
+   /* The HWRM command request type. */
+   uint16_treq_type;
+   /*
+* The completion ring to send the completion event on. This should
+* be the NQ ID returned from the `nq_alloc` HWRM command.
+*/
+   uint16_tcmpl_ring;
+   /*
+* The sequence ID is used by the driver for tracking multiple
+* commands. This ID is treated as opaque data by the firmware and
+* the value is returned in the `hwrm_resp_hdr` upon completion.
+*/
+   uint16_tseq_id;
+   /*
+* The target ID of the command:
+* * 0x0-0xFFF8 - The function ID
+* * 0xFFF8-0xFFFE - Reserved for internal processors
+* * 0x - HWRM
+*/
+   uint16_ttarget_id;
+   /*
+* A physical address pointer pointing to a host buffer that the
+* command's response data will be written. This can be either a host
+* physical address (HPA) or a guest physical address (GPA) and must
+* point to a physically contiguous block of memory.
+*/
+   uint64_tresp_addr;
+   /* Type of embedded processor. */
+   uint8_t embedded_proc_type;
+   /* Boot Processor */
+   #define HWRM_FW_RESET_INPUT_EMBEDDED_PROC_TYPE_BOOT \
+   UINT32_C(0x0)
+   /* Management Processor */
+   #define HWRM_FW_RESET_INPUT_EMBEDDED_PROC_TYPE_MGMT \
+   UINT32_C(0x1)
+   /* Network control processor */
+   #define HWRM_FW_RESET_INPUT_EMBEDDED_PROC_TYPE_NETCTRL \
+   UINT32_C(0x2)
+   /* RoCE control processor */
+   #define HWRM_FW_RESET_INPUT_EMBEDDED_PROC_TYPE_ROCE \
+   UINT32_C(0x3)
+   /*
+* Host (in multi-host environment): This is only valid if requester is 
IPC.
+* Reinit host hardware resources and PCIe.
+*/
+   #define HWRM_FW_RESET_INPUT_EMBEDDED_PROC_TYPE_HOST \
+   UINT32_C(0x4)
+   /* AP processor complex (in multi-host environment). Use host_idx to 
control which core is reset */
+   #define HWRM_FW_RESET_INPUT_EMBEDDED_PROC_TYPE_AP \
+   UINT32_C(0x5)
+   /* Reset all blocks of the chip (including all processors) */
+   #define HWRM_FW_RESET_INPUT_EMBEDDED_PROC_TYPE_CHIP \
+   UINT32_C(0x6)
+   /*
+* Host (in multi-host environment): This is only valid if requester is 
IPC.
+* Reinit host hardware resources.
+*/
+   #define HWRM_FW_RESET_INPUT_EMBEDDED_PROC_TYPE_HOST_RESOURCE_REINIT \
+   UINT32_C(0x7)
+   #define HWRM_FW_RESET_INPUT_EMBEDDED_PROC_TYPE_LAST \
+   HWRM_FW_RESET_INPUT_EMBEDDED_PROC_TYPE_HOST_RESOURCE_REINIT
+   /* Type of self reset. */
+   uint8_t selfrst_status;
+   /* No Self Reset */
+   #define HWRM_FW_RESET_INPUT_SELFRST_STATUS_SELFRSTNONE \
+   UINT32_C(0x0)
+   /* Self Reset as soon as possible to do so safely */
+   #define HWRM_FW_RESET_INPUT_SELFRST_STATUS_SELFRSTASAP \
+   UINT32_C(0x1)
+   /* Self Reset on PCIe Reset */
+   #define HWRM_FW_RESET_INPUT_SELFRST_STATUS_SELFRSTPCIERST \
+   UINT32_C(0x2)
+   /* Self Reset immediately after notification to all clients. */
+   #define HWRM_FW_RESET_INPUT_SELFRST_STATUS_SELFRSTIMMEDIATE \
+   UINT32_C(0x3)
+   #define HWRM_FW_RESET_INPUT_SELFRST_STATUS_LAST \
+   HWRM_FW_RESET_INPUT_SELFRST_STATUS_SELFRSTIMMEDIATE
+   /*
+* Indicate which host is being reset. 0 means first host.
+* Only valid when embedded_proc_type is host in multihost
+* environment
+*/
+   uint8_t host_idx;
+   uint8_t flags;
+   /*
+* When this bit is '1', then the core firmware initiates
+* the reset only after graceful shut down of all registered instances.
+* If not, the device will continue with the existing firmware.
+*/
+   #define HWRM_FW_RESET_INPUT_FLAGS_RESET_GRACEFUL UINT32_C(0x1)
+   uint8_t unused_0[4];
+} __attribute_

[dpdk-dev] [PATCH v2 03/13] net/bnxt: handle reset notify async event from FW

[Ajit Khaparde]

From: Kalesh AP 

When the FW upgrade is initiated the current instance
of FW issues a HWRM_ASYNC_EVENT_CMPL_EVENT_ID_RESET_NOTIFY
async notification to the driver. On receiving this notification,
the PMD shall quiesce itself and poll on the HWRM_VER_GET FW
command at regular intervals.

Once the VER_GET command succeeds, the driver should go through
the rediscovery process and re-initialize the device.

Also register with FW for the reset notify async event.

Signed-off-by: Kalesh AP 
Reviewed-by: Ajit Khaparde 
Reviewed-by: Somnath Kotur 
---
 drivers/net/bnxt/bnxt.h|  13 
 drivers/net/bnxt/bnxt_cpr.c|  16 +
 drivers/net/bnxt/bnxt_cpr.h|   1 +
 drivers/net/bnxt/bnxt_ethdev.c | 109 -
 drivers/net/bnxt/bnxt_hwrm.c   |  39 +---
 drivers/net/bnxt/bnxt_hwrm.h   |   2 +
 6 files changed, 157 insertions(+), 23 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 37b4c717d..8797b032e 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -333,6 +333,16 @@ struct bnxt_ctx_mem_info {
struct bnxt_ctx_pg_info *tqm_mem[BNXT_MAX_TC_Q];
 };
 
+/* Maximum Firmware Reset bail out value in milliseconds */
+#define BNXT_MAX_FW_RESET_TIMEOUT  6000
+/* Minimum time required for the firmware readiness in milliseconds */
+#define BNXT_MIN_FW_READY_TIMEOUT  2000
+/* Frequency for the firmware readiness check in milliseconds */
+#define BNXT_FW_READY_WAIT_INTERVAL100
+
+#define US_PER_MS  1000
+#define NS_PER_US  1000
+
 #define BNXT_HWRM_SHORT_REQ_LENsizeof(struct hwrm_short_input)
 struct bnxt {
void*bar0;
@@ -463,6 +473,9 @@ struct bnxt {
struct bnxt_ptp_cfg *ptp_cfg;
uint16_tvf_resv_strategy;
struct bnxt_ctx_mem_info*ctx;
+
+   uint16_tfw_reset_min_msecs;
+   uint16_tfw_reset_max_msecs;
 };
 
 int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int wait_to_complete);
diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c
index 655bcf1a8..62a16d2ed 100644
--- a/drivers/net/bnxt/bnxt_cpr.c
+++ b/drivers/net/bnxt/bnxt_cpr.c
@@ -4,6 +4,7 @@
  */
 
 #include 
+#include 
 
 #include "bnxt.h"
 #include "bnxt_cpr.h"
@@ -40,6 +41,21 @@ void bnxt_handle_async_event(struct bnxt *bp,
case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PORT_CONN_NOT_ALLOWED:
PMD_DRV_LOG(INFO, "Port conn async event\n");
break;
+   case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_RESET_NOTIFY:
+   /* timestamp_lo/hi values are in units of 100ms */
+   bp->fw_reset_max_msecs = async_cmp->timestamp_hi ?
+   rte_le_to_cpu_16(async_cmp->timestamp_hi) * 100 :
+   BNXT_MAX_FW_RESET_TIMEOUT;
+   bp->fw_reset_min_msecs = async_cmp->timestamp_lo ?
+   async_cmp->timestamp_lo * 100 :
+   BNXT_MIN_FW_READY_TIMEOUT;
+   PMD_DRV_LOG(INFO,
+   "Firmware non-fatal reset event received\n");
+
+   bp->flags |= BNXT_FLAG_FW_RESET;
+   rte_eal_alarm_set(US_PER_MS, bnxt_dev_reset_and_resume,
+ (void *)bp);
+   break;
default:
PMD_DRV_LOG(INFO, "handle_async_event id = 0x%x\n", event_id);
break;
diff --git a/drivers/net/bnxt/bnxt_cpr.h b/drivers/net/bnxt/bnxt_cpr.h
index 8c6a34b61..f48293b96 100644
--- a/drivers/net/bnxt/bnxt_cpr.h
+++ b/drivers/net/bnxt/bnxt_cpr.h
@@ -106,5 +106,6 @@ struct bnxt;
 void bnxt_handle_async_event(struct bnxt *bp, struct cmpl_base *cmp);
 void bnxt_handle_fwd_req(struct bnxt *bp, struct cmpl_base *cmp);
 int bnxt_event_hwrm_resp_handler(struct bnxt *bp, struct cmpl_base *cmp);
+void bnxt_dev_reset_and_resume(void *arg);
 
 #endif
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 33ff4a5a7..e545802ce 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -11,6 +11,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "bnxt.h"
 #include "bnxt_cpr.h"
@@ -166,6 +167,8 @@ static int bnxt_vlan_offload_set_op(struct rte_eth_dev 
*dev, int mask);
 static void bnxt_print_link_info(struct rte_eth_dev *eth_dev);
 static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu);
 static int bnxt_dev_uninit(struct rte_eth_dev *eth_dev);
+static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev);
+static int bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev);
 
 int is_bnxt_in_error(struct bnxt *bp)
 {
@@ -201,19 +204,25 @@ static uint16_t  bnxt_rss_hash_tbl_size(const struct bnxt 
*bp)
return bnxt_rss_ctxts(bp) * BNXT_RSS_ENTRIES_PER_CTX_THOR;
 }
 
-static void bnxt_free_mem(struct bnxt *bp)
+static void bnxt_free_mem(struct bnxt *bp, bool reconfig)
 {
bnxt_

[dpdk-dev] [PATCH v2 02/13] net/bnxt: prevent device access when device is in reset

[Ajit Khaparde]

From: Kalesh AP 

Refactor init and uninit functions so that the driver can fail
the eth_dev_ops callbacks and accessing Tx and Rx queues
when device is in reset or in error state.

Transmit and receive queues are freed during reset cleanup and
reallocated during recovery. So we block all data path handling
in this state. The eth_dev dev_started field is updated depending
on the status of the device.

Signed-off-by: Kalesh AP 
Reviewed-by: Ajit Khaparde 
Reviewed-by: Santoshkumar Karanappa Rastapur 
Reviewed-by: Somnath Kotur 
---
 drivers/net/bnxt/bnxt.h|   3 +
 drivers/net/bnxt/bnxt_ethdev.c | 455 ++---
 drivers/net/bnxt/bnxt_hwrm.c   |   2 -
 drivers/net/bnxt/bnxt_ring.c   |  32 +++
 drivers/net/bnxt/bnxt_ring.h   |   1 +
 drivers/net/bnxt/bnxt_rxq.c|  25 ++
 drivers/net/bnxt/bnxt_rxr.c|  17 ++
 drivers/net/bnxt/bnxt_rxr.h|   2 +
 drivers/net/bnxt/bnxt_stats.c  |  34 ++-
 drivers/net/bnxt/bnxt_txq.c|   7 +
 drivers/net/bnxt/bnxt_txr.c|  27 ++
 drivers/net/bnxt/bnxt_txr.h|   2 +
 12 files changed, 454 insertions(+), 153 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 0c9f994ea..37b4c717d 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -358,6 +358,8 @@ struct bnxt {
 #define BNXT_FLAG_DFLT_VNIC_SET(1 << 12)
 #define BNXT_FLAG_THOR_CHIP(1 << 13)
 #define BNXT_FLAG_STINGRAY (1 << 14)
+#define BNXT_FLAG_FW_RESET (1 << 15)
+#define BNXT_FLAG_FATAL_ERROR  (1 << 16)
 #define BNXT_FLAG_EXT_STATS_SUPPORTED  (1 << 29)
 #define BNXT_FLAG_NEW_RM   (1 << 30)
 #define BNXT_FLAG_INIT_DONE(1U << 31)
@@ -465,6 +467,7 @@ struct bnxt {
 
 int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int wait_to_complete);
 int bnxt_rcv_msg_from_vf(struct bnxt *bp, uint16_t vf_id, void *msg);
+int is_bnxt_in_error(struct bnxt *bp);
 
 bool is_bnxt_supported(struct rte_eth_dev *dev);
 bool bnxt_stratus_device(struct bnxt *bp);
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 6685ee7d9..33ff4a5a7 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -167,6 +167,16 @@ static void bnxt_print_link_info(struct rte_eth_dev 
*eth_dev);
 static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu);
 static int bnxt_dev_uninit(struct rte_eth_dev *eth_dev);
 
+int is_bnxt_in_error(struct bnxt *bp)
+{
+   if (bp->flags & BNXT_FLAG_FATAL_ERROR)
+   return -EIO;
+   if (bp->flags & BNXT_FLAG_FW_RESET)
+   return -EBUSY;
+
+   return 0;
+}
+
 /***/
 
 /*
@@ -207,6 +217,10 @@ static int bnxt_alloc_mem(struct bnxt *bp)
 {
int rc;
 
+   rc = bnxt_alloc_ring_grps(bp);
+   if (rc)
+   goto alloc_mem_err;
+
rc = bnxt_alloc_async_ring_struct(bp);
if (rc)
goto alloc_mem_err;
@@ -501,6 +515,9 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev 
*eth_dev,
uint16_t max_vnics, i, j, vpool, vrxq;
unsigned int max_rx_rings;
 
+   if (is_bnxt_in_error(bp))
+   return;
+
/* MAC Specifics */
dev_info->max_mac_addrs = bp->max_l2_ctx;
dev_info->max_hash_mac_addrs = 0;
@@ -602,6 +619,10 @@ static int bnxt_dev_configure_op(struct rte_eth_dev 
*eth_dev)
bp->tx_nr_rings = eth_dev->data->nb_tx_queues;
bp->rx_nr_rings = eth_dev->data->nb_rx_queues;
 
+   rc = is_bnxt_in_error(bp);
+   if (rc)
+   return rc;
+
if (BNXT_VF(bp) && (bp->flags & BNXT_FLAG_NEW_RM)) {
rc = bnxt_hwrm_check_vf_rings(bp);
if (rc) {
@@ -791,8 +812,10 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
 
eth_dev->rx_pkt_burst = bnxt_receive_function(eth_dev);
eth_dev->tx_pkt_burst = bnxt_transmit_function(eth_dev);
+
bnxt_enable_int(bp);
bp->flags |= BNXT_FLAG_INIT_DONE;
+   eth_dev->data->dev_started = 1;
bp->dev_stopped = 0;
return 0;
 
@@ -835,6 +858,11 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
 
+   eth_dev->data->dev_started = 0;
+   /* Prevent crashes when queues are still in use */
+   eth_dev->rx_pkt_burst = &bnxt_dummy_recv_pkts;
+   eth_dev->tx_pkt_burst = &bnxt_dummy_xmit_pkts;
+
bnxt_disable_int(bp);
 
/* disable uio/vfio intr/eventfd mapping */
@@ -889,6 +917,9 @@ static void bnxt_mac_addr_remove_op(struct rte_eth_dev 
*eth_dev,
struct bnxt_filter_info *filter, *temp_filter;
uint32_t i;
 
+   if (is_bnxt_in_error(bp))
+   return;
+
/*
 * Loop through all VNICs from the specified filter flow pools to
 * remove the corresponding MAC addr filter
@@ -924,6 +955,10 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev 
*eth_dev

[dpdk-dev] [PATCH v2 06/13] net/bnxt: query firmware error recovery capabilities

[Ajit Khaparde]

From: Kalesh AP 

In Driver initiated error recovery process, driver has to know about
the registers offset and values to initiate FW reset. The HWRM command
HWRM_ERROR_RECOVERY_QCFG is used to obtain all the registers and values
required to initiate FW reset. This command response includes
FW heart_beat register, health status register, Error counter register,
register offsets and values to do chip reset if firmware crashes and
becomes unresponsive.

Signed-off-by: Kalesh AP 
Reviewed-by: Somnath Kotur 
Signed-off-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt.h| 27 +++
 drivers/net/bnxt/bnxt_ethdev.c | 10 
 drivers/net/bnxt/bnxt_hwrm.c   | 89 ++
 drivers/net/bnxt/bnxt_hwrm.h   |  1 +
 4 files changed, 127 insertions(+)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 394a2a941..19bd13a7f 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -343,6 +343,29 @@ struct bnxt_ctx_mem_info {
 #define US_PER_MS  1000
 #define NS_PER_US  1000
 
+struct bnxt_error_recovery_info {
+   /* All units in milliseconds */
+   uint32_tdriver_polling_freq;
+   uint32_tmaster_func_wait_period;
+   uint32_tnormal_func_wait_period;
+   uint32_tmaster_func_wait_period_after_reset;
+   uint32_tmax_bailout_time_after_reset;
+#define BNXT_FW_STATUS_REG 0
+#define BNXT_FW_HEARTBEAT_CNT_REG  1
+#define BNXT_FW_RECOVERY_CNT_REG   2
+#define BNXT_FW_RESET_INPROG_REG   3
+   uint32_tstatus_regs[4];
+   uint32_treset_inprogress_reg_mask;
+#define BNXT_NUM_RESET_REG 16
+   uint8_t reg_array_cnt;
+   uint32_treset_reg[BNXT_NUM_RESET_REG];
+   uint32_treset_reg_val[BNXT_NUM_RESET_REG];
+   uint8_t delay_after_reset[BNXT_NUM_RESET_REG];
+#define BNXT_FLAG_ERROR_RECOVERY_HOST  (1 << 0)
+#define BNXT_FLAG_ERROR_RECOVERY_CO_CPU(1 << 1)
+   uint32_tflags;
+};
+
 #define BNXT_HWRM_SHORT_REQ_LENsizeof(struct hwrm_short_input)
 struct bnxt {
void*bar0;
@@ -371,6 +394,7 @@ struct bnxt {
 #define BNXT_FLAG_FW_RESET (1 << 15)
 #define BNXT_FLAG_FATAL_ERROR  (1 << 16)
 #define BNXT_FLAG_FW_CAP_IF_CHANGE (1 << 17)
+#define BNXT_FLAG_FW_CAP_ERROR_RECOVERY(1 << 18)
 #define BNXT_FLAG_EXT_STATS_SUPPORTED  (1 << 29)
 #define BNXT_FLAG_NEW_RM   (1 << 30)
 #define BNXT_FLAG_INIT_DONE(1U << 31)
@@ -477,6 +501,9 @@ struct bnxt {
 
uint16_tfw_reset_min_msecs;
uint16_tfw_reset_max_msecs;
+
+   /* Struct to hold adapter error recovery related info */
+   struct bnxt_error_recovery_info *recovery_info;
 };
 
 int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int wait_to_complete);
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index a917e0440..7a1142947 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -4070,6 +4070,11 @@ static int bnxt_init_fw(struct bnxt *bp)
if (rc)
return rc;
 
+   /* Get the adapter error recovery support info */
+   rc = bnxt_hwrm_error_recovery_qcfg(bp);
+   if (rc)
+   bp->flags &= ~BNXT_FLAG_FW_CAP_ERROR_RECOVERY;
+
if (mtu >= RTE_ETHER_MIN_MTU && mtu <= BNXT_MAX_MTU &&
mtu != bp->eth_dev->data->mtu)
bp->eth_dev->data->mtu = mtu;
@@ -4227,6 +4232,11 @@ bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev)
if (!reconfig_dev)
bnxt_free_hwrm_resources(bp);
 
+   if (bp->recovery_info != NULL) {
+   rte_free(bp->recovery_info);
+   bp->recovery_info = NULL;
+   }
+
return rc;
 }
 
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 17c7b5e9e..e2c993936 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -626,6 +626,13 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
if (flags & HWRM_FUNC_QCAPS_OUTPUT_FLAGS_EXT_STATS_SUPPORTED)
bp->flags |= BNXT_FLAG_EXT_STATS_SUPPORTED;
 
+   if (flags & HWRM_FUNC_QCAPS_OUTPUT_FLAGS_ERROR_RECOVERY_CAPABLE) {
+   bp->flags |= BNXT_FLAG_FW_CAP_ERROR_RECOVERY;
+   PMD_DRV_LOG(DEBUG, "Adapter Error recovery SUPPORTED\n");
+   } else {
+   bp->flags &= ~BNXT_FLAG_FW_CAP_ERROR_RECOVERY;
+   }
+
HWRM_UNLOCK();
 
return rc;
@@ -4684,3 +4691,85 @@ int bnxt_hwrm_if_change(struct bnxt *bp, bool state)
 
return rc;
 }
+
+int bnxt_hwrm_error_recovery_qcfg(struct bnxt *bp)
+{
+   struct hwrm_error_recovery_qcfg_output *resp = bp->hwrm_cmd_resp_addr;
+   struct bnxt_error_recovery_info *info;
+   struct hwrm_error_recovery_qcfg_input req = {0};
+   uint32_t flags = 0;
+   unsigned int i;
+   int

[dpdk-dev] [PATCH v2 09/13] net/bnxt: add code for periodic FW health monitoring

[Ajit Khaparde]

From: Kalesh AP 

Periodically poll the FW heartbeat register and FW recovery counter
registers to check the FW health. Polling frequency will be
advertised by the FW in HWRM_ERROR_RECOVERY_QCFG response.
Schedule the task upon receiving the async event from FW.

Signed-off-by: Kalesh AP 
Reviewed-by: Ajit Khaparde 
Reviewed-by: Somnath Kotur 
---
 drivers/net/bnxt/bnxt.h|  6 +++
 drivers/net/bnxt/bnxt_cpr.c| 10 
 drivers/net/bnxt/bnxt_ethdev.c | 89 ++
 3 files changed, 105 insertions(+)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index f9147a9a8..5579e127c 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -368,6 +368,9 @@ struct bnxt_error_recovery_info {
 #define BNXT_FLAG_MASTER_FUNC  (1 << 2)
 #define BNXT_FLAG_RECOVERY_ENABLED (1 << 3)
uint32_tflags;
+
+   uint32_tlast_heart_beat;
+   uint32_tlast_reset_counter;
 };
 
 /* address space location of register */
@@ -415,6 +418,7 @@ struct bnxt {
 #define BNXT_FLAG_FATAL_ERROR  (1 << 16)
 #define BNXT_FLAG_FW_CAP_IF_CHANGE (1 << 17)
 #define BNXT_FLAG_FW_CAP_ERROR_RECOVERY(1 << 18)
+#define BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED(1 << 19)
 #define BNXT_FLAG_EXT_STATS_SUPPORTED  (1 << 29)
 #define BNXT_FLAG_NEW_RM   (1 << 30)
 #define BNXT_FLAG_INIT_DONE(1U << 31)
@@ -531,6 +535,8 @@ int bnxt_rcv_msg_from_vf(struct bnxt *bp, uint16_t vf_id, 
void *msg);
 int is_bnxt_in_error(struct bnxt *bp);
 
 int bnxt_map_fw_health_status_regs(struct bnxt *bp);
+uint32_t bnxt_read_fw_status_reg(struct bnxt *bp, uint32_t index);
+void bnxt_schedule_fw_health_check(struct bnxt *bp);
 
 bool is_bnxt_supported(struct rte_eth_dev *dev);
 bool bnxt_stratus_device(struct bnxt *bp);
diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c
index a70301adc..3cedb891e 100644
--- a/drivers/net/bnxt/bnxt_cpr.c
+++ b/drivers/net/bnxt/bnxt_cpr.c
@@ -90,6 +90,16 @@ void bnxt_handle_async_event(struct bnxt *bp,
PMD_DRV_LOG(INFO, "recovery enabled(%d), master function(%d)\n",
bnxt_is_recovery_enabled(bp),
bnxt_is_master_func(bp));
+
+   if (bp->flags & BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED)
+   return;
+
+   info->last_heart_beat =
+   bnxt_read_fw_status_reg(bp, BNXT_FW_HEARTBEAT_CNT_REG);
+   info->last_reset_counter =
+   bnxt_read_fw_status_reg(bp, BNXT_FW_RECOVERY_CNT_REG);
+
+   bnxt_schedule_fw_health_check(bp);
break;
default:
PMD_DRV_LOG(INFO, "handle_async_event id = 0x%x\n", event_id);
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index a0de259da..62a4a65fb 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -3607,6 +3607,94 @@ void bnxt_dev_reset_and_resume(void *arg)
PMD_DRV_LOG(ERR, "Error setting recovery alarm");
 }
 
+uint32_t bnxt_read_fw_status_reg(struct bnxt *bp, uint32_t index)
+{
+   struct bnxt_error_recovery_info *info = bp->recovery_info;
+   uint32_t reg = info->status_regs[index];
+   uint32_t type, offset, val = 0;
+
+   type = BNXT_FW_STATUS_REG_TYPE(reg);
+   offset = BNXT_FW_STATUS_REG_OFF(reg);
+
+   switch (type) {
+   case BNXT_FW_STATUS_REG_TYPE_CFG:
+   rte_pci_read_config(bp->pdev, &val, sizeof(val), offset);
+   break;
+   case BNXT_FW_STATUS_REG_TYPE_GRC:
+   offset = info->mapped_status_regs[index];
+   /* FALLTHROUGH */
+   case BNXT_FW_STATUS_REG_TYPE_BAR0:
+   val = rte_le_to_cpu_32(rte_read32((uint8_t *)bp->bar0 +
+  offset));
+   break;
+   }
+
+   return val;
+}
+
+/* Driver should poll FW heartbeat, reset_counter with the frequency
+ * advertised by FW in HWRM_ERROR_RECOVERY_QCFG.
+ * When the driver detects heartbeat stop or change in reset_counter,
+ * it has to trigger a reset to recover from the error condition.
+ * A “master PF” is the function who will have the privilege to
+ * initiate the chimp reset. The master PF will be elected by the
+ * firmware and will be notified through async message.
+ */
+static void bnxt_check_fw_health(void *arg)
+{
+   struct bnxt *bp = arg;
+   struct bnxt_error_recovery_info *info = bp->recovery_info;
+   uint32_t val = 0;
+
+   if (!info || !bnxt_is_recovery_enabled(bp) ||
+   is_bnxt_in_error(bp))
+   return;
+
+   val = bnxt_read_fw_status_reg(bp, BNXT_FW_HEARTBEAT_CNT_REG);
+   if (val == info->last_heart_beat)
+   goto reset;
+
+   info->last_heart_beat = val;
+
+   val = bnxt_read_fw_status_reg(bp, BNXT_FW_RECOVERY_CNT_REG);
+   if (val != info->last_reset_counter)
+   goto reset;
+
+   info->last_res

[dpdk-dev] [PATCH v2 05/13] net/bnxt: handle fatal event from FW under error conditions

[Ajit Khaparde]

From: Kalesh AP 

When firmware hit some unrecoverable error conditions, firmware initiate
the recovery by sending an async event EVENT_CMPL_EVENT_ID_RESET_NOTIFY
with data1 set to RESET_NOTIFY_EVENT_DATA1_REASON_CODE_FW_EXCEPTION_FATAL
to all host drivers and will reset the chip.

The recovery procedure is same sequence as the one for hot FW upgrade.

Signed-off-by: Kalesh AP 
Reviewed-by: Somnath Kotur 
Reviewed-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt_cpr.c| 13 +++--
 drivers/net/bnxt/bnxt_cpr.h|  5 +
 drivers/net/bnxt/bnxt_ethdev.c |  3 +++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c
index 62a16d2ed..0b2eeef8f 100644
--- a/drivers/net/bnxt/bnxt_cpr.c
+++ b/drivers/net/bnxt/bnxt_cpr.c
@@ -21,6 +21,7 @@ void bnxt_handle_async_event(struct bnxt *bp,
struct hwrm_async_event_cmpl *async_cmp =
(struct hwrm_async_event_cmpl *)cmp;
uint16_t event_id = rte_le_to_cpu_16(async_cmp->event_id);
+   uint32_t event_data;
 
/* TODO: HWRM async events are not defined yet */
/* Needs to handle: link events, error events, etc. */
@@ -42,6 +43,7 @@ void bnxt_handle_async_event(struct bnxt *bp,
PMD_DRV_LOG(INFO, "Port conn async event\n");
break;
case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_RESET_NOTIFY:
+   event_data = rte_le_to_cpu_32(async_cmp->event_data1);
/* timestamp_lo/hi values are in units of 100ms */
bp->fw_reset_max_msecs = async_cmp->timestamp_hi ?
rte_le_to_cpu_16(async_cmp->timestamp_hi) * 100 :
@@ -49,8 +51,15 @@ void bnxt_handle_async_event(struct bnxt *bp,
bp->fw_reset_min_msecs = async_cmp->timestamp_lo ?
async_cmp->timestamp_lo * 100 :
BNXT_MIN_FW_READY_TIMEOUT;
-   PMD_DRV_LOG(INFO,
-   "Firmware non-fatal reset event received\n");
+   if ((event_data & EVENT_DATA1_REASON_CODE_MASK) ==
+   EVENT_DATA1_REASON_CODE_FW_EXCEPTION_FATAL) {
+   PMD_DRV_LOG(INFO,
+   "Firmware fatal reset event received\n");
+   bp->flags |= BNXT_FLAG_FATAL_ERROR;
+   } else {
+   PMD_DRV_LOG(INFO,
+   "Firmware non-fatal reset event 
received\n");
+   }
 
bp->flags |= BNXT_FLAG_FW_RESET;
rte_eal_alarm_set(US_PER_MS, bnxt_dev_reset_and_resume,
diff --git a/drivers/net/bnxt/bnxt_cpr.h b/drivers/net/bnxt/bnxt_cpr.h
index f48293b96..b61bafa0e 100644
--- a/drivers/net/bnxt/bnxt_cpr.h
+++ b/drivers/net/bnxt/bnxt_cpr.h
@@ -108,4 +108,9 @@ void bnxt_handle_fwd_req(struct bnxt *bp, struct cmpl_base 
*cmp);
 int bnxt_event_hwrm_resp_handler(struct bnxt *bp, struct cmpl_base *cmp);
 void bnxt_dev_reset_and_resume(void *arg);
 
+#define EVENT_DATA1_REASON_CODE_FW_EXCEPTION_FATAL \
+   
HWRM_ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_FW_EXCEPTION_FATAL
+#define EVENT_DATA1_REASON_CODE_MASK   \
+   HWRM_ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_MASK
+
 #endif
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 385492db5..a917e0440 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -3512,6 +3512,9 @@ static void bnxt_dev_recover(void *arg)
int timeout = bp->fw_reset_max_msecs;
int rc = 0;
 
+   /* Clear Error flag so that device re-init should happen */
+   bp->flags &= ~BNXT_FLAG_FATAL_ERROR;
+
do {
rc = bnxt_hwrm_ver_get(bp);
if (rc == 0)
-- 
2.20.1 (Apple Git-117)

[dpdk-dev] [PATCH v2 07/13] net/bnxt: map status registers for FW health monitoring

[Ajit Khaparde]

From: Kalesh AP 

HWRM_ERROR_RECOVERY_QCFG command returns the FW status registers offset
for periodic firmware health check monitoring. Map them to GRC window 2.

Signed-off-by: Kalesh AP 
Reviewed-by: Somnath Kotur 
Signed-off-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt.h| 22 -
 drivers/net/bnxt/bnxt_ethdev.c | 44 ++
 drivers/net/bnxt/bnxt_hwrm.c   |  4 
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 19bd13a7f..1da09569d 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -354,7 +354,9 @@ struct bnxt_error_recovery_info {
 #define BNXT_FW_HEARTBEAT_CNT_REG  1
 #define BNXT_FW_RECOVERY_CNT_REG   2
 #define BNXT_FW_RESET_INPROG_REG   3
-   uint32_tstatus_regs[4];
+#define BNXT_FW_STATUS_REG_CNT 4
+   uint32_tstatus_regs[BNXT_FW_STATUS_REG_CNT];
+   uint32_tmapped_status_regs[BNXT_FW_STATUS_REG_CNT];
uint32_treset_inprogress_reg_mask;
 #define BNXT_NUM_RESET_REG 16
uint8_t reg_array_cnt;
@@ -366,6 +368,22 @@ struct bnxt_error_recovery_info {
uint32_tflags;
 };
 
+/* address space location of register */
+#define BNXT_FW_STATUS_REG_TYPE_MASK   3
+/* register is located in PCIe config space */
+#define BNXT_FW_STATUS_REG_TYPE_CFG0
+/* register is located in GRC address space */
+#define BNXT_FW_STATUS_REG_TYPE_GRC1
+/* register is located in BAR0  */
+#define BNXT_FW_STATUS_REG_TYPE_BAR0   2
+/* register is located in BAR1  */
+#define BNXT_FW_STATUS_REG_TYPE_BAR1   3
+
+#define BNXT_FW_STATUS_REG_TYPE(reg)   ((reg) & BNXT_FW_STATUS_REG_TYPE_MASK)
+#define BNXT_FW_STATUS_REG_OFF(reg)((reg) & ~BNXT_FW_STATUS_REG_TYPE_MASK)
+
+#define BNXT_GRCP_WINDOW_2_BASE0x2000
+
 #define BNXT_HWRM_SHORT_REQ_LENsizeof(struct hwrm_short_input)
 struct bnxt {
void*bar0;
@@ -510,6 +528,8 @@ int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int 
wait_to_complete);
 int bnxt_rcv_msg_from_vf(struct bnxt *bp, uint16_t vf_id, void *msg);
 int is_bnxt_in_error(struct bnxt *bp);
 
+int bnxt_map_fw_health_status_regs(struct bnxt *bp);
+
 bool is_bnxt_supported(struct rte_eth_dev *dev);
 bool bnxt_stratus_device(struct bnxt *bp);
 extern const struct rte_flow_ops bnxt_flow_ops;
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 7a1142947..a0de259da 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -3496,6 +3496,49 @@ static const struct eth_dev_ops bnxt_dev_ops = {
.timesync_read_tx_timestamp = bnxt_timesync_read_tx_timestamp,
 };
 
+int bnxt_map_fw_health_status_regs(struct bnxt *bp)
+{
+   struct bnxt_error_recovery_info *info = bp->recovery_info;
+   uint32_t reg_base = 0x;
+   int i;
+
+   /* Only pre-map the monitoring GRC registers using window 2 */
+   for (i = 0; i < BNXT_FW_STATUS_REG_CNT; i++) {
+   uint32_t reg = info->status_regs[i];
+
+   if (BNXT_FW_STATUS_REG_TYPE(reg) != BNXT_FW_STATUS_REG_TYPE_GRC)
+   continue;
+
+   if (reg_base == 0x)
+   reg_base = reg & 0xf000;
+   if ((reg & 0xf000) != reg_base)
+   return -ERANGE;
+
+   /* Use mask 0xffc as the Lower 2 bits indicates
+* address space location
+*/
+   info->mapped_status_regs[i] = BNXT_GRCP_WINDOW_2_BASE +
+   (reg & 0xffc);
+   }
+
+   if (reg_base == 0x)
+   return 0;
+
+   rte_write32(reg_base, (uint8_t *)bp->bar0 +
+   BNXT_GRCPF_REG_WINDOW_BASE_OUT + 4);
+
+   return 0;
+}
+
+static void bnxt_unmap_fw_health_status_regs(struct bnxt *bp)
+{
+   if (!(bp->flags & BNXT_FLAG_FW_CAP_ERROR_RECOVERY))
+   return;
+
+   rte_write32(0, (uint8_t *)bp->bar0 +
+   BNXT_GRCPF_REG_WINDOW_BASE_OUT + 4);
+}
+
 static void bnxt_dev_cleanup(struct bnxt *bp)
 {
bnxt_set_hwrm_link_config(bp, false);
@@ -4226,6 +4269,7 @@ bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev)
bnxt_free_int(bp);
bnxt_free_mem(bp, reconfig_dev);
bnxt_hwrm_func_buf_unrgtr(bp);
+   bnxt_unmap_fw_health_status_regs(bp);
rc = bnxt_hwrm_func_driver_unregister(bp, 0);
bp->flags &= ~BNXT_FLAG_REGISTERED;
bnxt_free_ctx_mem(bp);
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index e2c993936..2d9c43c98 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -4767,6 +4767,10 @@ int bnxt_hwrm_error_recovery_qcfg(struct bnxt *bp)
 err:
HWRM_UNLOCK();
 
+   /* Map the FW status registers */
+   if (!rc)
+   rc = bnxt_map_fw_health

[dpdk-dev] [PATCH v2 10/13] net/bnxt: add support for FW reset

[Ajit Khaparde]

From: Kalesh AP 

Added code to perform FW_RESET. When the driver detects error in FW,
it has to initiate the recovery by resetting the cores. FW advertise
the method to do a core reset, reset register offsets and values
to perform reset in response of HWRM_ERROR_RECOVERY_QCFG command.

There are 2 ways to recover from the error.
1. Master function issues core resets to recover from error.
2. Master function detects chimp dead condition and notify the Kong
   processor about the chimp dead case through FW_RESET HWRM command.
   Kong Processor send an RESET_NOTIFY async event with
   REASON_CODE_FW_EXCEPTION_FATAL to all the PF’s/VF’s that
   chimp is dead and it is going to reset the chimp.

Signed-off-by: Kalesh AP 
Reviewed-by: Somnath Kotur 
Reviewed-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt.h|   1 +
 drivers/net/bnxt/bnxt_ethdev.c | 104 -
 drivers/net/bnxt/bnxt_hwrm.c   |  26 +
 drivers/net/bnxt/bnxt_hwrm.h   |   1 +
 4 files changed, 131 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 5579e127c..a1a8cd534 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -388,6 +388,7 @@ struct bnxt_error_recovery_info {
 #define BNXT_FW_STATUS_REG_OFF(reg)((reg) & ~BNXT_FW_STATUS_REG_TYPE_MASK)
 
 #define BNXT_GRCP_WINDOW_2_BASE0x2000
+#define BNXT_GRCP_WINDOW_3_BASE0x3000
 
 #define BNXT_HWRM_SHORT_REQ_LENsizeof(struct hwrm_short_input)
 struct bnxt {
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 62a4a65fb..76f9e197f 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -3496,6 +3496,19 @@ static const struct eth_dev_ops bnxt_dev_ops = {
.timesync_read_tx_timestamp = bnxt_timesync_read_tx_timestamp,
 };
 
+static uint32_t bnxt_map_reset_regs(struct bnxt *bp, uint32_t reg)
+{
+   uint32_t offset;
+
+   /* Only pre-map the reset GRC registers using window 3 */
+   rte_write32(reg & 0xf000, (uint8_t *)bp->bar0 +
+   BNXT_GRCPF_REG_WINDOW_BASE_OUT + 8);
+
+   offset = BNXT_GRCP_WINDOW_3_BASE + (reg & 0xffc);
+
+   return offset;
+}
+
 int bnxt_map_fw_health_status_regs(struct bnxt *bp)
 {
struct bnxt_error_recovery_info *info = bp->recovery_info;
@@ -3539,6 +3552,34 @@ static void bnxt_unmap_fw_health_status_regs(struct bnxt 
*bp)
BNXT_GRCPF_REG_WINDOW_BASE_OUT + 4);
 }
 
+static void bnxt_write_fw_reset_reg(struct bnxt *bp, uint32_t index)
+{
+   struct bnxt_error_recovery_info *info = bp->recovery_info;
+   uint32_t delay = info->delay_after_reset[index];
+   uint32_t val = info->reset_reg_val[index];
+   uint32_t reg = info->reset_reg[index];
+   uint32_t type, offset;
+
+   type = BNXT_FW_STATUS_REG_TYPE(reg);
+   offset = BNXT_FW_STATUS_REG_OFF(reg);
+
+   switch (type) {
+   case BNXT_FW_STATUS_REG_TYPE_CFG:
+   rte_pci_write_config(bp->pdev, &val, sizeof(val), offset);
+   break;
+   case BNXT_FW_STATUS_REG_TYPE_GRC:
+   offset = bnxt_map_reset_regs(bp, offset);
+   rte_write32(val, (uint8_t *)bp->bar0 + offset);
+   break;
+   case BNXT_FW_STATUS_REG_TYPE_BAR0:
+   rte_write32(val, (uint8_t *)bp->bar0 + offset);
+   break;
+   }
+   /* wait on a specific interval of time until core reset is complete */
+   if (delay)
+   rte_delay_ms(delay);
+}
+
 static void bnxt_dev_cleanup(struct bnxt *bp)
 {
bnxt_set_hwrm_link_config(bp, false);
@@ -3632,6 +3673,59 @@ uint32_t bnxt_read_fw_status_reg(struct bnxt *bp, 
uint32_t index)
return val;
 }
 
+static int bnxt_fw_reset_all(struct bnxt *bp)
+{
+   struct bnxt_error_recovery_info *info = bp->recovery_info;
+   uint32_t i;
+   int rc = 0;
+
+   if (info->flags & BNXT_FLAG_ERROR_RECOVERY_HOST) {
+   /* Reset through master function driver */
+   for (i = 0; i < info->reg_array_cnt; i++)
+   bnxt_write_fw_reset_reg(bp, i);
+   /* Wait for time specified by FW after triggering reset */
+   rte_delay_ms(info->master_func_wait_period_after_reset);
+   } else if (info->flags & BNXT_FLAG_ERROR_RECOVERY_CO_CPU) {
+   /* Reset with the help of Kong processor */
+   rc = bnxt_hwrm_fw_reset(bp);
+   if (rc)
+   PMD_DRV_LOG(ERR, "Failed to reset FW\n");
+   }
+
+   return rc;
+}
+
+static void bnxt_fw_reset_cb(void *arg)
+{
+   struct bnxt *bp = arg;
+   struct bnxt_error_recovery_info *info = bp->recovery_info;
+   int rc = 0;
+
+   /* Only Master function can do FW reset */
+   if (bnxt_is_master_func(bp) &&
+   bnxt_is_recovery_enabled(bp)) {
+   rc = bnxt_fw_reset_all(bp);
+   if (rc) {
+  

[dpdk-dev] [PATCH v2 08/13] net/bnxt: advertise error recovery capability and handle async event

[Ajit Khaparde]

From: Kalesh AP 

1. Advertise HWRM_FUNC_DRV_RGTR_INPUT_FLAGS_ERROR_RECOVERY_SUPPORT flag
   in the FUNC_DRV_RGTR command.
2. request for the async event ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY
   in the FUNC_DRV_RGTR command.
3. handle the async event EVENT_ID_ERROR_RECOVERY from FW.

Error recovery support will be used by firmware only if all the driver
instances support error recovery process.

Signed-off-by: Kalesh AP 
Reviewed-by: Somnath Kotur 
Signed-off-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt.h  |  2 ++
 drivers/net/bnxt/bnxt_cpr.c  | 45 
 drivers/net/bnxt/bnxt_cpr.h  | 12 ++
 drivers/net/bnxt/bnxt_hwrm.c |  5 
 drivers/net/bnxt/bnxt_hwrm.h |  2 ++
 5 files changed, 66 insertions(+)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 1da09569d..f9147a9a8 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -365,6 +365,8 @@ struct bnxt_error_recovery_info {
uint8_t delay_after_reset[BNXT_NUM_RESET_REG];
 #define BNXT_FLAG_ERROR_RECOVERY_HOST  (1 << 0)
 #define BNXT_FLAG_ERROR_RECOVERY_CO_CPU(1 << 1)
+#define BNXT_FLAG_MASTER_FUNC  (1 << 2)
+#define BNXT_FLAG_RECOVERY_ENABLED (1 << 3)
uint32_tflags;
 };
 
diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c
index 0b2eeef8f..a70301adc 100644
--- a/drivers/net/bnxt/bnxt_cpr.c
+++ b/drivers/net/bnxt/bnxt_cpr.c
@@ -21,6 +21,7 @@ void bnxt_handle_async_event(struct bnxt *bp,
struct hwrm_async_event_cmpl *async_cmp =
(struct hwrm_async_event_cmpl *)cmp;
uint16_t event_id = rte_le_to_cpu_16(async_cmp->event_id);
+   struct bnxt_error_recovery_info *info;
uint32_t event_data;
 
/* TODO: HWRM async events are not defined yet */
@@ -65,6 +66,31 @@ void bnxt_handle_async_event(struct bnxt *bp,
rte_eal_alarm_set(US_PER_MS, bnxt_dev_reset_and_resume,
  (void *)bp);
break;
+   case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY:
+   info = bp->recovery_info;
+
+   if (!info)
+   return;
+
+   PMD_DRV_LOG(INFO, "Error recovery async event received\n");
+
+   event_data = rte_le_to_cpu_32(async_cmp->event_data1) &
+   EVENT_DATA1_FLAGS_MASK;
+
+   if (event_data & EVENT_DATA1_FLAGS_MASTER_FUNC)
+   info->flags |= BNXT_FLAG_MASTER_FUNC;
+   else
+   info->flags &= ~BNXT_FLAG_MASTER_FUNC;
+
+   if (event_data & EVENT_DATA1_FLAGS_RECOVERY_ENABLED)
+   info->flags |= BNXT_FLAG_RECOVERY_ENABLED;
+   else
+   info->flags &= ~BNXT_FLAG_RECOVERY_ENABLED;
+
+   PMD_DRV_LOG(INFO, "recovery enabled(%d), master function(%d)\n",
+   bnxt_is_recovery_enabled(bp),
+   bnxt_is_master_func(bp));
+   break;
default:
PMD_DRV_LOG(INFO, "handle_async_event id = 0x%x\n", event_id);
break;
@@ -186,3 +212,22 @@ int bnxt_event_hwrm_resp_handler(struct bnxt *bp, struct 
cmpl_base *cmp)
 
return evt;
 }
+
+bool bnxt_is_master_func(struct bnxt *bp)
+{
+   if (bp->recovery_info->flags & BNXT_FLAG_MASTER_FUNC)
+   return true;
+
+   return false;
+}
+
+bool bnxt_is_recovery_enabled(struct bnxt *bp)
+{
+   struct bnxt_error_recovery_info *info;
+
+   info = bp->recovery_info;
+   if (info && (info->flags & BNXT_FLAG_RECOVERY_ENABLED))
+   return true;
+
+   return false;
+}
diff --git a/drivers/net/bnxt/bnxt_cpr.h b/drivers/net/bnxt/bnxt_cpr.h
index b61bafa0e..f118bda36 100644
--- a/drivers/net/bnxt/bnxt_cpr.h
+++ b/drivers/net/bnxt/bnxt_cpr.h
@@ -113,4 +113,16 @@ void bnxt_dev_reset_and_resume(void *arg);
 #define EVENT_DATA1_REASON_CODE_MASK   \
HWRM_ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_MASK
 
+#define EVENT_DATA1_FLAGS_MASK \
+   HWRM_ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_MASK
+
+#define EVENT_DATA1_FLAGS_MASTER_FUNC  \
+   HWRM_ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_MASTER_FUNC
+
+#define EVENT_DATA1_FLAGS_RECOVERY_ENABLED \
+   HWRM_ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_RECOVERY_ENABLED
+
+bool bnxt_is_recovery_enabled(struct bnxt *bp);
+bool bnxt_is_master_func(struct bnxt *bp);
+
 #endif
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 2d9c43c98..350e867bf 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -685,6 +685,8 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp)
return 0;
 
flags = HWRM_FUNC_DRV_RGTR_INPUT_FLAGS_HOT_RESET_SUPPORT;
+   if (bp->flags & BNXT_FLAG_FW_CAP_ERROR_RECO

[dpdk-dev] [PATCH v2 13/13] net/bnxt: avoid null pointer dereference

[Ajit Khaparde]

From: Kalesh AP 

Commit "bd0a14c99f65" enables the creation of a dedicated completion
ring for asynchronous event handling instead of handling these
events on a receive completion ring on non Stingray Platforms.

This causes a segfault due to NULL pointer defreference in
bnxt_alloc_async_cp_ring() on stingray. Fix this by checking the
pointer validity before accessing it.

Fixes: bd0a14c99f65 ("net/bnxt: use dedicated CPR for async events")
Cc: sta...@dpdk.org

Signed-off-by: Kalesh AP 
Signed-off-by: Ajit Kumar Khaparde 
Reviewed-by: Rahul Gupta 
Reviewed-by: Lance Richardson 
---
 drivers/net/bnxt/bnxt_ring.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index 2f57e038a..ec17783cf 100644
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -694,13 +694,15 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
 int bnxt_alloc_async_cp_ring(struct bnxt *bp)
 {
struct bnxt_cp_ring_info *cpr = bp->async_cp_ring;
-   struct bnxt_ring *cp_ring = cpr->cp_ring_struct;
+   struct bnxt_ring *cp_ring;
uint8_t ring_type;
int rc;
 
-   if (BNXT_NUM_ASYNC_CPR(bp) == 0)
+   if (BNXT_NUM_ASYNC_CPR(bp) == 0 || cpr == NULL)
return 0;
 
+   cp_ring = cpr->cp_ring_struct;
+
if (BNXT_HAS_NQ(bp))
ring_type = HWRM_RING_ALLOC_INPUT_RING_TYPE_NQ;
else
-- 
2.20.1 (Apple Git-117)

[dpdk-dev] [PATCH v2 11/13] net/bnxt: reduce verbosity of logs

[Ajit Khaparde]

From: Kalesh AP 

When IOMMU is available, EAL picks IOVA as VA as the default IOVA mode.
This causes the bnxt driver to log warning messages saying
"Memzone physical address same as virtual." and "Using rte_mem_virt2iova()"
during load.

Reduce the verbosity of logs to DEBUG.

Signed-off-by: Kalesh AP 
Reviewed-by: Lance Richardson 
Reviewed-by: Somnath Kotur 
Reviewed-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt_ethdev.c | 21 +
 drivers/net/bnxt/bnxt_ring.c   |  7 +++
 drivers/net/bnxt/bnxt_vnic.c   |  7 +++
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 76f9e197f..b94c9a122 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -3890,10 +3890,9 @@ static int bnxt_alloc_ctx_mem_blk(__rte_unused struct 
bnxt *bp,
memset(mz->addr, 0, mz->len);
mz_phys_addr = mz->iova;
if ((unsigned long)mz->addr == mz_phys_addr) {
-   PMD_DRV_LOG(WARNING,
-   "Memzone physical address same as virtual.\n");
-   PMD_DRV_LOG(WARNING,
-   "Using rte_mem_virt2iova()\n");
+   PMD_DRV_LOG(DEBUG,
+   "physical address same as virtual\n");
+   PMD_DRV_LOG(DEBUG, "Using rte_mem_virt2iova()\n");
mz_phys_addr = rte_mem_virt2iova(mz->addr);
if (mz_phys_addr == RTE_BAD_IOVA) {
PMD_DRV_LOG(ERR,
@@ -3926,10 +3925,9 @@ static int bnxt_alloc_ctx_mem_blk(__rte_unused struct 
bnxt *bp,
memset(mz->addr, 0, mz->len);
mz_phys_addr = mz->iova;
if ((unsigned long)mz->addr == mz_phys_addr) {
-   PMD_DRV_LOG(WARNING,
+   PMD_DRV_LOG(DEBUG,
"Memzone physical address same as virtual.\n");
-   PMD_DRV_LOG(WARNING,
-   "Using rte_mem_virt2iova()\n");
+   PMD_DRV_LOG(DEBUG, "Using rte_mem_virt2iova()\n");
for (sz = 0; sz < mem_size; sz += BNXT_PAGE_SIZE)
rte_mem_lock_page(((char *)mz->addr) + sz);
mz_phys_addr = rte_mem_virt2iova(mz->addr);
@@ -4117,9 +4115,9 @@ static int bnxt_alloc_stats_mem(struct bnxt *bp)
memset(mz->addr, 0, mz->len);
mz_phys_addr = mz->iova;
if ((unsigned long)mz->addr == mz_phys_addr) {
-   PMD_DRV_LOG(WARNING,
+   PMD_DRV_LOG(DEBUG,
"Memzone physical address same as virtual.\n");
-   PMD_DRV_LOG(WARNING,
+   PMD_DRV_LOG(DEBUG,
"Using rte_mem_virt2iova()\n");
mz_phys_addr = rte_mem_virt2iova(mz->addr);
if (mz_phys_addr == RTE_BAD_IOVA) {
@@ -4155,10 +4153,9 @@ static int bnxt_alloc_stats_mem(struct bnxt *bp)
memset(mz->addr, 0, mz->len);
mz_phys_addr = mz->iova;
if ((unsigned long)mz->addr == mz_phys_addr) {
-   PMD_DRV_LOG(WARNING,
+   PMD_DRV_LOG(DEBUG,
"Memzone physical address same as virtual\n");
-   PMD_DRV_LOG(WARNING,
-   "Using rte_mem_virt2iova()\n");
+   PMD_DRV_LOG(DEBUG, "Using rte_mem_virt2iova()\n");
mz_phys_addr = rte_mem_virt2iova(mz->addr);
if (mz_phys_addr == RTE_BAD_IOVA) {
PMD_DRV_LOG(ERR,
diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index f19865c83..2f57e038a 100644
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -212,10 +212,9 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
mz_phys_addr_base = mz->iova;
mz_phys_addr = mz->iova;
if ((unsigned long)mz->addr == mz_phys_addr_base) {
-   PMD_DRV_LOG(WARNING,
-   "Memzone physical address same as virtual.\n");
-   PMD_DRV_LOG(WARNING,
-   "Using rte_mem_virt2iova()\n");
+   PMD_DRV_LOG(DEBUG,
+   "Memzone physical address same as virtual.\n");
+   PMD_DRV_LOG(DEBUG, "Using rte_mem_virt2iova()\n");
for (sz = 0; sz < total_alloc_len; sz += getpagesize())
rte_mem_lock_page(((char *)mz->addr) + sz);
mz_phys_addr_base = rte_mem_virt2iova(mz->addr);
diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c
index 98415633e..9ea99388b 100644
--- a/drivers/net/bnxt/bnxt_vnic.c
+++ b/drivers/net/bnxt/bnxt_vnic.c
@@ -150,10 +150,9 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)
}
mz_phys_addr = mz->iova;
if ((unsigned long)mz->addr == mz_phys_addr) {
-   PMD_DRV_LOG(WARNING,
-   "Memzone physical address s

[dpdk-dev] [PATCH v2 12/13] net/bnxt: use BIT macro instead of bit fields

[Ajit Khaparde]

From: Kalesh AP 

use BIT macro instead of bit fields.

Signed-off-by: Kalesh AP 
Reviewed-by: Somnath Kotur 
Signed-off-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt.h  | 75 ++--
 drivers/net/bnxt/bnxt_util.h |  4 ++
 2 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index a1a8cd534..ac602fe52 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -19,6 +19,7 @@
 #include 
 
 #include "bnxt_cpr.h"
+#include "bnxt_util.h"
 
 #define BNXT_MAX_MTU   9574
 #define VLAN_TAG_SIZE  4
@@ -198,16 +199,16 @@ struct bnxt_ptp_cfg {
struct bnxt *bp;
 #define BNXT_MAX_TX_TS 1
uint16_trxctl;
-#define BNXT_PTP_MSG_SYNC  (1 << 0)
-#define BNXT_PTP_MSG_DELAY_REQ (1 << 1)
-#define BNXT_PTP_MSG_PDELAY_REQ(1 << 2)
-#define BNXT_PTP_MSG_PDELAY_RESP   (1 << 3)
-#define BNXT_PTP_MSG_FOLLOW_UP (1 << 8)
-#define BNXT_PTP_MSG_DELAY_RESP(1 << 9)
-#define BNXT_PTP_MSG_PDELAY_RESP_FOLLOW_UP (1 << 10)
-#define BNXT_PTP_MSG_ANNOUNCE  (1 << 11)
-#define BNXT_PTP_MSG_SIGNALING (1 << 12)
-#define BNXT_PTP_MSG_MANAGEMENT(1 << 13)
+#define BNXT_PTP_MSG_SYNC  BIT(0)
+#define BNXT_PTP_MSG_DELAY_REQ BIT(1)
+#define BNXT_PTP_MSG_PDELAY_REQBIT(2)
+#define BNXT_PTP_MSG_PDELAY_RESP   BIT(3)
+#define BNXT_PTP_MSG_FOLLOW_UP BIT(8)
+#define BNXT_PTP_MSG_DELAY_RESPBIT(9)
+#define BNXT_PTP_MSG_PDELAY_RESP_FOLLOW_UP BIT(10)
+#define BNXT_PTP_MSG_ANNOUNCE  BIT(11)
+#define BNXT_PTP_MSG_SIGNALING BIT(12)
+#define BNXT_PTP_MSG_MANAGEMENTBIT(13)
 #define BNXT_PTP_MSG_EVENTS(BNXT_PTP_MSG_SYNC |\
 BNXT_PTP_MSG_DELAY_REQ |   \
 BNXT_PTP_MSG_PDELAY_REQ |  \
@@ -363,10 +364,10 @@ struct bnxt_error_recovery_info {
uint32_treset_reg[BNXT_NUM_RESET_REG];
uint32_treset_reg_val[BNXT_NUM_RESET_REG];
uint8_t delay_after_reset[BNXT_NUM_RESET_REG];
-#define BNXT_FLAG_ERROR_RECOVERY_HOST  (1 << 0)
-#define BNXT_FLAG_ERROR_RECOVERY_CO_CPU(1 << 1)
-#define BNXT_FLAG_MASTER_FUNC  (1 << 2)
-#define BNXT_FLAG_RECOVERY_ENABLED (1 << 3)
+#define BNXT_FLAG_ERROR_RECOVERY_HOST  BIT(0)
+#define BNXT_FLAG_ERROR_RECOVERY_CO_CPUBIT(1)
+#define BNXT_FLAG_MASTER_FUNC  BIT(2)
+#define BNXT_FLAG_RECOVERY_ENABLED BIT(3)
uint32_tflags;
 
uint32_tlast_heart_beat;
@@ -400,29 +401,29 @@ struct bnxt {
void*doorbell_base;
 
uint32_tflags;
-#define BNXT_FLAG_REGISTERED   (1 << 0)
-#define BNXT_FLAG_VF   (1 << 1)
-#define BNXT_FLAG_PORT_STATS   (1 << 2)
-#define BNXT_FLAG_JUMBO(1 << 3)
-#define BNXT_FLAG_SHORT_CMD(1 << 4)
-#define BNXT_FLAG_UPDATE_HASH  (1 << 5)
-#define BNXT_FLAG_PTP_SUPPORTED(1 << 6)
-#define BNXT_FLAG_MULTI_HOST(1 << 7)
-#define BNXT_FLAG_EXT_RX_PORT_STATS(1 << 8)
-#define BNXT_FLAG_EXT_TX_PORT_STATS(1 << 9)
-#define BNXT_FLAG_KONG_MB_EN   (1 << 10)
-#define BNXT_FLAG_TRUSTED_VF_EN(1 << 11)
-#define BNXT_FLAG_DFLT_VNIC_SET(1 << 12)
-#define BNXT_FLAG_THOR_CHIP(1 << 13)
-#define BNXT_FLAG_STINGRAY (1 << 14)
-#define BNXT_FLAG_FW_RESET (1 << 15)
-#define BNXT_FLAG_FATAL_ERROR  (1 << 16)
-#define BNXT_FLAG_FW_CAP_IF_CHANGE (1 << 17)
-#define BNXT_FLAG_FW_CAP_ERROR_RECOVERY(1 << 18)
-#define BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED(1 << 19)
-#define BNXT_FLAG_EXT_STATS_SUPPORTED  (1 << 29)
-#define BNXT_FLAG_NEW_RM   (1 << 30)
-#define BNXT_FLAG_INIT_DONE(1U << 31)
+#define BNXT_FLAG_REGISTERED   BIT(0)
+#define BNXT_FLAG_VF   BIT(1)
+#define BNXT_FLAG_PORT_STATS   BIT(2)
+#define BNXT_FLAG_JUMBOBIT(3)
+#define BNXT_FLAG_SHORT_CMDBIT(4)
+#define BNXT_FLAG_UPDATE_HASH  BIT(5)
+#define BNXT_FLAG_PTP_SUPPORTEDBIT(6)
+#define BNXT_FLAG_MULTI_HOST   BIT(7)
+#define BNXT_FLAG_EXT_RX_PORT_STATSBIT(8)
+#define BNXT_FLAG_EXT_TX_PORT_STATSBIT(9)
+#define BNXT_FLAG_KONG_MB_EN   BIT(10)
+#define BNXT_FLAG_TRUSTED_VF_ENBIT(11)
+#define BNXT_FLAG_DFLT_VNIC_SETBIT(12)
+#define BNXT_FLAG_THOR_CHIPBIT(13)
+#define BNXT_FLAG_STINGRAY BIT(14)
+#define BNXT_FLAG_FW_RESET BIT(15)
+#define BNXT_FLAG_F

[dpdk-dev] [PATCH 1/7] net/bnxt: fix thor tqm entry allocation

[Lance Richardson]

The current TQM backing store size isn't sufficient to allow 512
transmit rings. Fix by correcting TQM SP queue size calculation.

Fixes: f8168ca0e690 ("net/bnxt: support thor controller")
Signed-off-by: Lance Richardson 
Reviewed-by: Ajit Kumar Khaparde 
---
 drivers/net/bnxt/bnxt_ethdev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index b94c9a122..e4c7b7c2a 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -4057,7 +4057,9 @@ int bnxt_alloc_ctx_mem(struct bnxt *bp)
if (rc)
return rc;
 
-   entries = ctx->qp_max_l2_entries;
+   entries = ctx->qp_max_l2_entries +
+ ctx->vnic_max_vnic_entries +
+ ctx->tqm_min_entries_per_ring;
entries = bnxt_roundup(entries, ctx->tqm_entries_multiple);
entries = clamp_t(uint32_t, entries, ctx->tqm_min_entries_per_ring,
  ctx->tqm_max_entries_per_ring);
-- 
2.17.1

[dpdk-dev] [PATCH 2/7] net/bnxt: fix ring alignment for thor-based adapters

[Lance Richardson]

When using transmit/receive queue sizes smaller than 256, alignment
requirements are not being met for Thor-based adapters. Fix by
forcing memory addresses used for transmit/receive/aggregation ring
allocations to be on 4K boundaries.

Fixes: f8168ca0e690 ("net/bnxt: support thor controller")
Signed-off-by: Lance Richardson 
Reviewed-by: Ajit Kumar Khaparde 
---
 drivers/net/bnxt/bnxt_ring.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index ec17783cf..bc8b92b04 100644
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -162,18 +162,21 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
int nq_ring_len = BNXT_CHIP_THOR(bp) ? cp_ring_len : 0;
 
int tx_ring_start = nq_ring_start + nq_ring_len;
+   tx_ring_start = RTE_ALIGN(tx_ring_start, 4096);
int tx_ring_len = tx_ring_info ?
RTE_CACHE_LINE_ROUNDUP(tx_ring_info->tx_ring_struct->ring_size *
   sizeof(struct tx_bd_long)) : 0;
tx_ring_len = RTE_ALIGN(tx_ring_len, 4096);
 
int rx_ring_start = tx_ring_start + tx_ring_len;
+   rx_ring_start = RTE_ALIGN(rx_ring_start, 4096);
int rx_ring_len =  rx_ring_info ?
RTE_CACHE_LINE_ROUNDUP(rx_ring_info->rx_ring_struct->ring_size *
sizeof(struct rx_prod_pkt_bd)) : 0;
rx_ring_len = RTE_ALIGN(rx_ring_len, 4096);
 
int ag_ring_start = rx_ring_start + rx_ring_len;
+   ag_ring_start = RTE_ALIGN(ag_ring_start, 4096);
int ag_ring_len = rx_ring_len * AGG_RING_SIZE_FACTOR;
ag_ring_len = RTE_ALIGN(ag_ring_len, 4096);
 
-- 
2.17.1

[dpdk-dev] [PATCH 0/7] bnxt patchset for thor and bnxt vector PMD

[Lance Richardson]

Fixes and enhancements for adapters based on the BCM57500
controller and the bnxt vector PMD.

Patch set is against dpdk-next-net.

**Note** this patch series is dependent on the "bnxt patchset to support
device error recovery" series.

Lance Richardson (7):
  net/bnxt: fix thor tqm entry allocation
  net/bnxt: fix ring alignment for thor-based adapters
  net/bnxt: use common receive/transmit NQ ring
  net/bnxt: use correct default Rx queue for thor
  net/bnxt: add support for LRO for thor adapters
  net/bnxt: fix scatter receive offload capability
  net/bnxt: improve CPR handling in vector PMD

 doc/guides/rel_notes/release_19_11.rst |   6 ++
 drivers/net/bnxt/bnxt.h|  17 
 drivers/net/bnxt/bnxt_ethdev.c |  19 +++-
 drivers/net/bnxt/bnxt_hwrm.c   |  43 ++---
 drivers/net/bnxt/bnxt_hwrm.h   |   1 +
 drivers/net/bnxt/bnxt_ring.c   | 124 +
 drivers/net/bnxt/bnxt_ring.h   |   3 +-
 drivers/net/bnxt/bnxt_rxq.c|   8 +-
 drivers/net/bnxt/bnxt_rxq.h|   1 -
 drivers/net/bnxt/bnxt_rxr.c|  99 +++-
 drivers/net/bnxt/bnxt_rxr.h|  41 ++--
 drivers/net/bnxt/bnxt_rxtx_vec_sse.c   |  26 +-
 drivers/net/bnxt/bnxt_txq.c|   4 +-
 drivers/net/bnxt/bnxt_txq.h|   1 -
 drivers/net/bnxt/bnxt_txr.c|  25 -
 15 files changed, 256 insertions(+), 162 deletions(-)

-- 
2.17.1

[dpdk-dev] [PATCH 3/7] net/bnxt: use common receive/transmit NQ ring

[Lance Richardson]

Thor queue scaling is currently limited by the number of NQs that
can be allocated. Fix by using a common NQ for all receive/transmit
rings instead of allocating a separate NQ for each ring.

Fixes: f8168ca0e690 ("net/bnxt: support thor controller")
Signed-off-by: Lance Richardson 
Reviewed-by: Somnath Kotur 
Reviewed-by: Ajit Kumar Khaparde 
---
 drivers/net/bnxt/bnxt.h|   1 +
 drivers/net/bnxt/bnxt_ethdev.c |   5 ++
 drivers/net/bnxt/bnxt_hwrm.c   |   7 +--
 drivers/net/bnxt/bnxt_ring.c   | 107 ++---
 drivers/net/bnxt/bnxt_ring.h   |   2 +
 drivers/net/bnxt/bnxt_rxq.c|   4 +-
 drivers/net/bnxt/bnxt_rxq.h|   1 -
 drivers/net/bnxt/bnxt_rxr.c|  27 -
 drivers/net/bnxt/bnxt_txq.c|   4 +-
 drivers/net/bnxt/bnxt_txq.h|   1 -
 drivers/net/bnxt/bnxt_txr.c|  25 
 11 files changed, 84 insertions(+), 100 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index ac602fe52..3e508ca1f 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -459,6 +459,7 @@ struct bnxt {
 
/* Default completion ring */
struct bnxt_cp_ring_info*async_cp_ring;
+   struct bnxt_cp_ring_info*rxtx_nq_ring;
uint32_tmax_ring_grps;
struct bnxt_ring_grp_info   *grp_info;
 
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index e4c7b7c2a..c2ab8df7b 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -220,6 +220,7 @@ static void bnxt_free_mem(struct bnxt *bp, bool reconfig)
bnxt_free_rx_rings(bp);
}
bnxt_free_async_cp_ring(bp);
+   bnxt_free_rxtx_nq_ring(bp);
 }
 
 static int bnxt_alloc_mem(struct bnxt *bp, bool reconfig)
@@ -250,6 +251,10 @@ static int bnxt_alloc_mem(struct bnxt *bp, bool reconfig)
if (rc)
goto alloc_mem_err;
 
+   rc = bnxt_alloc_rxtx_nq_ring(bp);
+   if (rc)
+   goto alloc_mem_err;
+
return 0;
 
 alloc_mem_err:
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index bd2cc01e1..4b1230453 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -2175,11 +2175,8 @@ void bnxt_free_hwrm_rx_ring(struct bnxt *bp, int 
queue_index)
bp->grp_info[queue_index].ag_fw_ring_id =
INVALID_HW_RING_ID;
}
-   if (cpr->cp_ring_struct->fw_ring_id != INVALID_HW_RING_ID) {
+   if (cpr->cp_ring_struct->fw_ring_id != INVALID_HW_RING_ID)
bnxt_free_cp_ring(bp, cpr);
-   if (rxq->nq_ring)
-   bnxt_free_nq_ring(bp, rxq->nq_ring);
-   }
 
if (BNXT_HAS_RING_GRPS(bp))
bp->grp_info[queue_index].cp_fw_ring_id = INVALID_HW_RING_ID;
@@ -2211,8 +2208,6 @@ int bnxt_free_all_hwrm_rings(struct bnxt *bp)
if (cpr->cp_ring_struct->fw_ring_id != INVALID_HW_RING_ID) {
bnxt_free_cp_ring(bp, cpr);
cpr->cp_ring_struct->fw_ring_id = INVALID_HW_RING_ID;
-   if (txq->nq_ring)
-   bnxt_free_nq_ring(bp, txq->nq_ring);
}
}
 
diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index bc8b92b04..85a10c584 100644
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -125,7 +125,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
int cp_vmem_len = RTE_CACHE_LINE_ROUNDUP(cp_ring->vmem_size);
cp_vmem_len = RTE_ALIGN(cp_vmem_len, 128);
 
-   int nq_vmem_len = BNXT_CHIP_THOR(bp) ?
+   int nq_vmem_len = nq_ring_info ?
RTE_CACHE_LINE_ROUNDUP(cp_ring->vmem_size) : 0;
nq_vmem_len = RTE_ALIGN(nq_vmem_len, 128);
 
@@ -159,7 +159,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
nq_ring_start = cp_ring_start + cp_ring_len;
nq_ring_start = RTE_ALIGN(nq_ring_start, 4096);
 
-   int nq_ring_len = BNXT_CHIP_THOR(bp) ? cp_ring_len : 0;
+   int nq_ring_len = nq_ring_info ? cp_ring_len : 0;
 
int tx_ring_start = nq_ring_start + nq_ring_len;
tx_ring_start = RTE_ALIGN(tx_ring_start, 4096);
@@ -399,12 +399,12 @@ static void bnxt_set_db(struct bnxt *bp,
 }
 
 static int bnxt_alloc_cmpl_ring(struct bnxt *bp, int queue_index,
-   struct bnxt_cp_ring_info *cpr,
-   struct bnxt_cp_ring_info *nqr)
+   struct bnxt_cp_ring_info *cpr)
 {
struct bnxt_ring *cp_ring = cpr->cp_ring_struct;
uint32_t nq_ring_id = HWRM_NA_SIGNATURE;
int cp_ring_index = queue_index + BNXT_NUM_ASYNC_CPR(bp);
+   struct bnxt_cp_ring_info *nqr = bp->rxtx_nq_ring;
uint8_t ring_type;
int rc = 0;
 
@@ -432,31 +432,85 @@ static int bnxt_alloc_cmpl_ring(struct bnxt *bp, int 
queue_index,
return 0;
 }

[dpdk-dev] [PATCH 5/7] net/bnxt: add support for LRO for thor adapters

[Lance Richardson]

Add support for LRO for adapters based on Thor (BCM57500).

Signed-off-by: Lance Richardson 
Reviewed-by: Ajit Kumar Khaparde 
---
 doc/guides/rel_notes/release_19_11.rst |  6 +++
 drivers/net/bnxt/bnxt.h| 16 ++
 drivers/net/bnxt/bnxt_ethdev.c |  4 ++
 drivers/net/bnxt/bnxt_hwrm.c   | 33 ++--
 drivers/net/bnxt/bnxt_hwrm.h   |  1 +
 drivers/net/bnxt/bnxt_ring.c   | 14 +++--
 drivers/net/bnxt/bnxt_ring.h   |  1 -
 drivers/net/bnxt/bnxt_rxq.c|  4 +-
 drivers/net/bnxt/bnxt_rxr.c| 72 +++---
 drivers/net/bnxt/bnxt_rxr.h| 41 ---
 10 files changed, 155 insertions(+), 37 deletions(-)

diff --git a/doc/guides/rel_notes/release_19_11.rst 
b/doc/guides/rel_notes/release_19_11.rst
index 27cfbd9e3..a044db46f 100644
--- a/doc/guides/rel_notes/release_19_11.rst
+++ b/doc/guides/rel_notes/release_19_11.rst
@@ -56,6 +56,12 @@ New Features
  Also, make sure to start the actual text at the margin.
  =
 
+* **Updated the Broadcom bnxt PMD.**
+
+  Updated the Broadcom bnxt PMD. The major enhancements include:
+
+  * Added LRO support for BCM57500 adapters.
+
 
 Removed Items
 -
diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 3e508ca1f..6da5126a8 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -34,6 +34,21 @@
 #define BNXT_MAX_RX_RING_DESC  8192
 #define BNXT_DB_SIZE   0x80
 
+#define TPA_MAX_AGGS   64
+#define TPA_MAX_AGGS_TH1024
+
+#define TPA_MAX_NUM_SEGS   32
+#define TPA_MAX_SEGS_TH8 /* 32 segments in 4-segment units */
+#define TPA_MAX_SEGS   5 /* 32 segments in log2 units */
+
+#define BNXT_TPA_MAX_AGGS(bp) \
+   (BNXT_CHIP_THOR(bp) ? TPA_MAX_AGGS_TH : \
+TPA_MAX_AGGS)
+
+#define BNXT_TPA_MAX_SEGS(bp) \
+   (BNXT_CHIP_THOR(bp) ? TPA_MAX_SEGS_TH : \
+ TPA_MAX_SEGS)
+
 #ifdef RTE_ARCH_ARM64
 #define BNXT_NUM_ASYNC_CPR(bp) (BNXT_STINGRAY(bp) ? 0 : 1)
 #else
@@ -506,6 +521,7 @@ struct bnxt {
uint16_tmax_rx_em_flows;
uint16_tmax_vnics;
uint16_tmax_stat_ctx;
+   uint16_tmax_tpa_v2;
uint16_tfirst_vf_id;
uint16_tvlan;
struct bnxt_pf_info pf;
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index c2ab8df7b..227960d4e 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -4303,6 +4303,10 @@ static int bnxt_init_fw(struct bnxt *bp)
if (rc)
return rc;
 
+   rc = bnxt_hwrm_vnic_qcaps(bp);
+   if (rc)
+   return rc;
+
rc = bnxt_hwrm_func_qcfg(bp, &mtu);
if (rc)
return rc;
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 4d8866ac1..404e52491 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -656,6 +656,27 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp)
return rc;
 }
 
+int bnxt_hwrm_vnic_qcaps(struct bnxt *bp)
+{
+   int rc = 0;
+   struct hwrm_vnic_qcaps_input req = {.req_type = 0 };
+   struct hwrm_vnic_qcaps_output *resp = bp->hwrm_cmd_resp_addr;
+
+   HWRM_PREP(req, VNIC_QCAPS, BNXT_USE_CHIMP_MB);
+
+   req.target_id = rte_cpu_to_le_16(0x);
+
+   rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
+
+   HWRM_CHECK_RESULT();
+
+   bp->max_tpa_v2 = rte_le_to_cpu_16(resp->max_aggs_supported);
+
+   HWRM_UNLOCK();
+
+   return rc;
+}
+
 int bnxt_hwrm_func_reset(struct bnxt *bp)
 {
int rc = 0;
@@ -1878,8 +1899,11 @@ int bnxt_hwrm_vnic_tpa_cfg(struct bnxt *bp,
struct hwrm_vnic_tpa_cfg_input req = {.req_type = 0 };
struct hwrm_vnic_tpa_cfg_output *resp = bp->hwrm_cmd_resp_addr;
 
-   if (BNXT_CHIP_THOR(bp))
-   return 0;
+   if (BNXT_CHIP_THOR(bp) && !bp->max_tpa_v2) {
+   if (enable)
+   PMD_DRV_LOG(ERR, "No HW support for LRO\n");
+   return -ENOTSUP;
+   }
 
HWRM_PREP(req, VNIC_TPA_CFG, BNXT_USE_CHIMP_MB);
 
@@ -1895,9 +1919,8 @@ int bnxt_hwrm_vnic_tpa_cfg(struct bnxt *bp,
HWRM_VNIC_TPA_CFG_INPUT_FLAGS_GRO |
HWRM_VNIC_TPA_CFG_INPUT_FLAGS_AGG_WITH_ECN |
HWRM_VNIC_TPA_CFG_INPUT_FLAGS_AGG_WITH_SAME_GRE_SEQ);
-   req.max_agg_segs = rte_cpu_to_le_16(5);
-   req.max_aggs =
-   rte_cpu_to_le_16(HWRM_VNIC_TPA_CFG_INPUT_MAX_AGGS_MAX);
+   req.max_agg_segs = rte_cpu_to_le_16(BNXT_TPA_MAX_AGGS(bp));
+   req.max_aggs = rte_cpu_to_le_16(BNXT_TPA_MAX_SEGS(bp));
req.min_agg_len = rte_cpu_to_le_32(512);

[dpdk-dev] [PATCH 4/7] net/bnxt: use correct default Rx queue for thor

[Lance Richardson]

Use first receive queue assigned to VNIC as the default receive queue
when configuring Thor VNICs. This is necessary e.g. in order for flow
redirection to a specific receive queue to work correctly.

Fixes: f8168ca0e690 ("net/bnxt: support thor controller")
Signed-off-by: Lance Richardson 
Reviewed-by: Ajit Kumar Khaparde 
---
 drivers/net/bnxt/bnxt_hwrm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 4b1230453..4d8866ac1 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -1580,7 +1580,8 @@ int bnxt_hwrm_vnic_cfg(struct bnxt *bp, struct 
bnxt_vnic_info *vnic)
HWRM_PREP(req, VNIC_CFG, BNXT_USE_CHIMP_MB);
 
if (BNXT_CHIP_THOR(bp)) {
-   struct bnxt_rx_queue *rxq = bp->eth_dev->data->rx_queues[0];
+   struct bnxt_rx_queue *rxq =
+   bp->eth_dev->data->rx_queues[vnic->start_grp_id];
struct bnxt_rx_ring_info *rxr = rxq->rx_ring;
struct bnxt_cp_ring_info *cpr = rxq->cp_ring;
 
-- 
2.17.1

[dpdk-dev] [PATCH 6/7] net/bnxt: fix scatter receive offload capability

[Lance Richardson]

Scattered receive is supported but not included in receive offload
capabilities. Fix by adding it and including in scattered receive
calculation.

Fixes: 9c1507d96ab8 ("net/bnxt: switch to the new offload API")
Signed-off-by: Lance Richardson 
Reviewed-by: Ajit Kumar Khaparde 
---
 drivers/net/bnxt/bnxt_ethdev.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 227960d4e..7e756ea45 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -161,7 +161,8 @@ static const struct rte_pci_id bnxt_pci_id_map[] = {
 DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM | \
 DEV_RX_OFFLOAD_JUMBO_FRAME | \
 DEV_RX_OFFLOAD_KEEP_CRC | \
-DEV_RX_OFFLOAD_TCP_LRO)
+DEV_RX_OFFLOAD_TCP_LRO | \
+DEV_RX_OFFLOAD_SCATTER)
 
 static int bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask);
 static void bnxt_print_link_info(struct rte_eth_dev *eth_dev);
@@ -725,6 +726,9 @@ static int bnxt_scattered_rx(struct rte_eth_dev *eth_dev)
uint16_t buf_size;
int i;
 
+   if (eth_dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER)
+   return 1;
+
for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
struct bnxt_rx_queue *rxq = eth_dev->data->rx_queues[i];
 
-- 
2.17.1

[dpdk-dev] [PATCH 7/7] net/bnxt: improve CPR handling in vector PMD

[Lance Richardson]

Reduce overhead of CPR descriptor validity checking in vector
receive and transmit functions.

Preserve raw cpr consumer index in vector transmit completion
function.

Remove an unneeded prefetch (per benchmarking) from vector
transmit completion function.

Fixes: bc4a000f2f53 ("net/bnxt: implement SSE vector mode")
Signed-off-by: Lance Richardson 
Reviewed-by: Ajit Kumar Khaparde 
---
 drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 26 --
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c 
b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
index 2e6e83c94..980fddb1f 100644
--- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
+++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
@@ -245,10 +245,6 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf 
**rx_pkts,
if (!CMP_VALID(rxcmp, raw_cons, cpr->cp_ring_struct))
break;
 
-   cpr->valid = FLIP_VALID(cons,
-   cpr->cp_ring_struct->ring_mask,
-   cpr->valid);
-
if (likely(CMP_TYPE(rxcmp) == RX_PKT_CMPL_TYPE_RX_L2)) {
struct rx_pkt_cmpl_hi *rxcmp1;
uint32_t tmp_raw_cons;
@@ -272,10 +268,6 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf 
**rx_pkts,
rte_prefetch0(mbuf);
rxr->rx_buf_ring[cons].mbuf = NULL;
 
-   cpr->valid = FLIP_VALID(cp_cons,
-   cpr->cp_ring_struct->ring_mask,
-   cpr->valid);
-
/* Set constant fields from mbuf initializer. */
_mm_store_si128((__m128i *)&mbuf->rearm_data,
mbuf_init);
@@ -318,22 +310,13 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf 
**rx_pkts,
 
rxq->rxrearm_nb += nb_rx_pkts;
cpr->cp_raw_cons = raw_cons;
+   cpr->valid = !!(cpr->cp_raw_cons & cpr->cp_ring_struct->ring_size);
if (nb_rx_pkts || evt)
bnxt_db_cq(cpr);
 
return nb_rx_pkts;
 }
 
-static inline void bnxt_next_cmpl(struct bnxt_cp_ring_info *cpr, uint32_t *idx,
- bool *v, uint32_t inc)
-{
-   *idx += inc;
-   if (unlikely(*idx == cpr->cp_ring_struct->ring_size)) {
-   *v = !*v;
-   *idx = 0;
-   }
-}
-
 static void
 bnxt_tx_cmp_vec(struct bnxt_tx_queue *txq, int nr_pkts)
 {
@@ -379,10 +362,8 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq)
cons = RING_CMPL(ring_mask, raw_cons);
txcmp = (struct tx_cmpl *)&cp_desc_ring[cons];
 
-   if (!CMPL_VALID(txcmp, cpr->valid))
+   if (!CMP_VALID(txcmp, raw_cons, cp_ring_struct))
break;
-   bnxt_next_cmpl(cpr, &cons, &cpr->valid, 1);
-   rte_prefetch0(&cp_desc_ring[cons]);
 
if (likely(CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2))
nb_tx_pkts += txcmp->opaque;
@@ -390,9 +371,10 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq)
RTE_LOG_DP(ERR, PMD,
   "Unhandled CMP type %02x\n",
   CMP_TYPE(txcmp));
-   raw_cons = cons;
+   raw_cons = NEXT_RAW_CMP(raw_cons);
} while (nb_tx_pkts < ring_mask);
 
+   cpr->valid = !!(raw_cons & cp_ring_struct->ring_size);
if (nb_tx_pkts) {
bnxt_tx_cmp_vec(txq, nb_tx_pkts);
cpr->cp_raw_cons = raw_cons;
-- 
2.17.1

Re: [dpdk-dev] [PATCH 22/22] net/hns3: add hns3 build files

[Wei Hu (Xavier)]

On 2019/8/30 11:22, Wei Hu (Xavier) wrote:
> Hi,  Jerin
>
>
> On 2019/8/23 22:08, Jerin Jacob Kollanukkaran wrote:
>>> -Original Message-
>>> From: dev  On Behalf Of Wei Hu (Xavier)
>>> Sent: Friday, August 23, 2019 7:17 PM
>>> To: dev@dpdk.org
>>> Cc: linux...@huawei.com; xavier_hu...@163.com;
>>> liudongdo...@huawei.com; forest.zhouch...@huawei.com
>>> Subject: [dpdk-dev] [PATCH 22/22] net/hns3: add hns3 build files
>>>
>>> This patch add build related files for hns3 PMD driver.
>>>
>>> Signed-off-by: Wei Hu (Xavier) 
>>> Signed-off-by: Min Hu (Connor) 
>>> Signed-off-by: Chunsong Feng 
>>> Signed-off-by: Hao Chen 
>>> Signed-off-by: Huisong Li 
>>> ---
>>> +# Hisilicon HNS3 PMD driver
>>> +#
>>> +CONFIG_RTE_LIBRTE_HNS3_PMD=y
>> # Please add meson support
> This patch already contains meson support,  thanks
>> # Move build infra to the first patch
>> # See git log drivers/net/octeontx2 as example
> OK, I will  adjust the order of the patches in this series and send V2.
>>
>>> diff --git a/config/common_base b/config/common_base
>>> index 8ef75c2..71a2c33 100644
>>> --- a/config/common_base
>>> +++ b/config/common_base
>>> @@ -282,6 +282,11 @@
>>> CONFIG_RTE_LIBRTE_E1000_PF_DISABLE_STRIP_CRC=n
>>>  CONFIG_RTE_LIBRTE_HINIC_PMD=n
>>>
>>>  #
>>> +# Compile burst-oriented HNS3 PMD driver
>>> +#
>>> +CONFIG_RTE_LIBRTE_HNS3_PMD=n
>>> +
>>> +#
>>>  # Compile burst-oriented IXGBE PMD driver
>>>  #
>>>  CONFIG_RTE_LIBRTE_IXGBE_PMD=y
>>> diff --git a/config/defconfig_arm64-armv8a-linuxapp-clang
>>> b/config/defconfig_arm64-armv8a-linuxapp-clang
>>> index d3b4dad..c73f5fb 100644
>>> --- a/config/defconfig_arm64-armv8a-linuxapp-clang
>>> +++ b/config/defconfig_arm64-armv8a-linuxapp-clang
>>> @@ -6,3 +6,5 @@
>>>
>>>  CONFIG_RTE_TOOLCHAIN="clang"
>>>  CONFIG_RTE_TOOLCHAIN_CLANG=y
>>> +
>>> +CONFIG_RTE_LIBRTE_HNS3_PMD=n
>>> diff --git a/doc/guides/nics/features/hns3.ini
>>> b/doc/guides/nics/features/hns3.ini
>>> new file mode 100644
>>> index 000..d38d35e
>>> --- /dev/null
>>> +++ b/doc/guides/nics/features/hns3.ini
>>> @@ -0,0 +1,38 @@
>>> +;
>>> +; Supported features of the 'hns3' network poll mode driver.
>> Add doc changes when driver feature gets added.
>> # See git log drivers/net/octeontx2 as example
> OK, I will modify the patches and send V2.
> Thanks
>>> +;
>>> +; Refer to default.ini for the full list of available PMD features.
>>> +;
>>> +[Features]
>>> +Link status  = Y
>>> +MTU update   = Y
>>> +Jumbo frame  = Y
>>> +Promiscuous mode = Y
>>> +Allmulticast mode= Y
>>> diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst
>>> new file mode 100644
>>> index 000..c9d0253
>>> --- /dev/null
>>> +++ b/doc/guides/nics/hns3.rst
>>> @@ -0,0 +1,55 @@
>>> +..  SPDX-License-Identifier: BSD-3-Clause
>>> +Copyright(c) 2018-2019 Hisilicon Limited.
>>> +
>>> +HNS3 Poll Mode Driver
>>> +===
>>> +
>>> +The Hisilicon Network Subsystem is a long term evolution IP which is
>>> +supposed to be used in Hisilicon ICT SoCs such as Kunpeng 920.
>>> +
>>> +The HNS3 PMD (librte_pmd_hns3) provides poll mode driver support
>>> +for hns3(Hisilicon Network Subsystem 3) network engine.
>>> +
>>> +Features
>>> +
>>> +
>>> +Features of the HNS3 PMD are:
>>> +
>>> +- Arch support: ARMv8.
>> Is it an integrated NIC controller? Why it is supported only on ARMv8?
>> The reason why I asking because, Enabling CONFIG_RTE_LIBRTE_HNS3_PMD=y
>> only on arm64 will create a case where build fails for arm64 and passes for
>> x86. I would like to avoid such disparity. If the build is passing on x86 
>> make it
>> enable in the common code, not in arm64 config.
> Currently this network engine is integrated in the SoCs, the SoCs can be
> used
> as a PCIe EP integrated NIC controllers or be used as universal cpus on
> the device,
> such as servers. The network engine is accessed by ARM cores in the SoCs.
> We will enabling CONFIG_RTE_LIBRTE_HNS3_PMD=y in common_linux config in V2.
> Thanks.
Hi,  Jerin

as a PCIe EP integrated NIC controllers -> as a PCIe EP Intelligent
NIC controllers

Since it is currently only accessed by ARM cores on SoCs,
maybe it is also reasonable to compile only on ARMv8, right?

Regards

Xaiver
>>> +- Multiple queues for TX and RX
>>> +- Receive Side Scaling (RSS)
>>> +- Packet type information
>>> +- Checksum offload
>>> +- Promiscuous mode
>>> +- Multicast mode
>>> +- Port hardware statistics
>>> +- Jumbo frames
>>> +- Link state information
>>> +- VLAN stripping
>>> +cflags += '-DALLOW_EXPERIMENTAL_API'
>>> diff --git a/drivers/net/hns3/rte_pmd_hns3_version.map
>>> b/drivers/net/hns3/rte_pmd_hns3_version.map
>>> new file mode 100644
>>> index 000..3aef967
>>> --- /dev/null
>>> +++ b/drivers/net/hns3/rte_pmd_hns3_version.map
>>> @@ -0,0 +1,3 @@
>>> +DPDK_19.08 {
>> Change to 19.11
> OK, I will modify the patches and send V2. Thanks.
>
> Regards
> Xavier
>>
>>
>
> ___