Re: [dpdk-dev] [PATCH v5 1/2] ethdev: add level support for RSS offload types

[Ajit Khaparde]

On Tue, Aug 18, 2020 at 11:05 PM  wrote:

> From: Kiran Kumar K 
>
> This patch reserves 2 bits as input selection to select Inner and
> outer layers for RSS computation. It is combined with existing
> ETH_RSS_* to choose Inner or outer layers for L2, L3 and L4.
> This functionality already exists in rte_flow through level parameter in
> RSS action configuration rte_flow_action_rss.
>
> Signed-off-by: Kiran Kumar K 
> ---
> V5 Changes:
> * Added support to set rss level type from port config in testpmd
>
>  app/test-pmd/cmdline.c | 11 ++-
>  app/test-pmd/parameters.c  |  6 ++
>
Can you split this into testpmd and ethdev patches.
Becomes easy to reference, fix.

 lib/librte_ethdev/rte_ethdev.h | 27 +++
>  3 files changed, 43 insertions(+), 1 deletion(-)
>
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index 0a6ed85f3..4eafee8c8 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -2334,7 +2334,16 @@ cmd_config_rss_parsed(void *parsed_result,
> rss_conf.rss_hf = ETH_RSS_GTPU;
> else if (!strcmp(res->value, "none"))
> rss_conf.rss_hf = 0;
> -   else if (!strcmp(res->value, "default"))
> +   else if (!strcmp(res->value, "level-inner")) {
> +   rss_hf &= (~ETH_RSS_LEVEL_MASK);
> +   rss_conf.rss_hf = (rss_hf | ETH_RSS_LEVEL_INNER);
> +   } else if (!strcmp(res->value, "level-outer")) {
> +   rss_hf &= (~ETH_RSS_LEVEL_MASK);
> +   rss_conf.rss_hf = (rss_hf | ETH_RSS_LEVEL_OUTER);
> +   } else if (!strcmp(res->value, "level-inner-outer")) {
> +   rss_hf &= (~ETH_RSS_LEVEL_MASK);
> +   rss_conf.rss_hf = (rss_hf | ETH_RSS_LEVEL_INNER_OUTER);
> +   } else if (!strcmp(res->value, "default"))
> use_default = 1;
> else if (isdigit(res->value[0]) && atoi(res->value) > 0 &&
> atoi(res->value) < 64)
> diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
> index 7cb0e3d6e..5f669ff24 100644
> --- a/app/test-pmd/parameters.c
> +++ b/app/test-pmd/parameters.c
> @@ -632,6 +632,8 @@ launch_args_parse(int argc, char** argv)
> { "forward-mode",   1, 0, 0 },
> { "rss-ip", 0, 0, 0 },
> { "rss-udp",0, 0, 0 },
> +   { "rss-outer",  0, 0, 0 },
> +   { "rss-inner-outer",0, 0, 0 },
> { "rxq",1, 0, 0 },
> { "txq",1, 0, 0 },
> { "rxd",1, 0, 0 },
> @@ -1051,6 +1053,10 @@ launch_args_parse(int argc, char** argv)
> rss_hf = ETH_RSS_IP;
> if (!strcmp(lgopts[opt_idx].name, "rss-udp"))
> rss_hf = ETH_RSS_UDP;
> +   if (!strcmp(lgopts[opt_idx].name, "rss-outer"))
> +   rss_hf |= ETH_RSS_LEVEL_OUTER;
> +   if (!strcmp(lgopts[opt_idx].name,
> "rss-inner-outer"))
> +   rss_hf |= ETH_RSS_LEVEL_INNER_OUTER;
> if (!strcmp(lgopts[opt_idx].name, "rxq")) {
> n = atoi(optarg);
> if (n >= 0 && check_nb_rxq((queueid_t)n)
> == 0)
> diff --git a/lib/librte_ethdev/rte_ethdev.h
> b/lib/librte_ethdev/rte_ethdev.h
> index d29930fd8..28184cc85 100644
> --- a/lib/librte_ethdev/rte_ethdev.h
> +++ b/lib/librte_ethdev/rte_ethdev.h
> @@ -552,6 +552,33 @@ struct rte_eth_rss_conf {
>  #define RTE_ETH_RSS_L3_PRE64  (1ULL << 53)
>  #define RTE_ETH_RSS_L3_PRE96  (1ULL << 52)
>
> +/*
> + * We use the following macros to combine with the above layers to choose
> + * inner and outer layers or both for RSS computation.
> + * Note: Default is 0: inner layers, 1: outer layers, 2: both
> + * bit 50 and 51 are reserved for this.
> + */
> +
> +/**
> + * Level 0, It basically stands for the innermost encapsulation level RSS
> + * can be performed on according to PMD and device capabilities.
> + */
> +#define ETH_RSS_LEVEL_INNER(0ULL << 50)
> +/**
> + * Level 1, It basically stands for the outermost encapsulation level RSS
> + * can be performed on according to PMD and device capabilities.
> + */
> +#define ETH_RSS_LEVEL_OUTER(1ULL << 50)
> +/**
> + * Level 2, It basically stands for the both inner and outermost
> + * encapsulation level RSS can be performed on according to PMD and
> + * device capabilities.
> + */
> +#define ETH_RSS_LEVEL_INNER_OUTER  (2ULL << 50)
> +#define ETH_RSS_LEVEL_MASK(3ULL << 50)
> +
> +#define ETH_RSS_LEVEL(rss_hf) ((rss_hf & ETH_RSS_LEVEL_MASK) >> 50)
> +
>  /**
>   * For input set change of hash filter, if SRC_ONLY and DST_ONLY of
>   * the same level are used simultaneously, it is the same 

Re: [dpdk-dev] [PATCH] app/testpmd: fix flow rules list after port stop

[Gregory Etelson]

Hello,

Is this patch scheduled for merge with dpdk.org ?
Please update me.

Regards,
Gregory

> -Original Message-
> From: Gregory Etelson 
> Sent: Monday, August 10, 2020 19:15
> To: dev@dpdk.org
> Cc: Gregory Etelson ; Matan Azrad
> ; Raslan Darawsheh ;
> sta...@dpdk.org; Ori Kam ; Wenzhuo Lu
> ; Beilei Xing ; Bernard
> Iremonger 
> Subject: [PATCH] app/testpmd: fix flow rules list after port stop
> 
> According to current RTE API, port flow rules must not be kept after port
> stop.
> 
> Testpmd did not flush port flow rules after `port stop' command was called.
> As the result, after the port was restarted, it showed bogus flow rules.
> 
> Fixes: ce8d561418d4 ("app/testpmd: add port configuration settings")
> 
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Gregory Etelson 
> Acked-by: Ori Kam 
> ---
>  app/test-pmd/testpmd.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index
> 7842c3b781..4ba5c41c6e 100644
> --- a/app/test-pmd/testpmd.c
> +++ b/app/test-pmd/testpmd.c
> @@ -2627,6 +2627,9 @@ stop_port(portid_t pid)
>   RTE_PORT_HANDLING) == 0)
>   continue;
> 
> + if (port->flow_list)
> + port_flow_flush(pi);
> +
>   rte_eth_dev_stop(pi);
> 
>   if (rte_atomic16_cmpset(&(port->port_status),
> --
> 2.25.1

[dpdk-dev] [PATCH v3 0/3] minor updates for getting queue info

[Wei Hu (Xavier)]

This series include 3 patches.
One patch is a minor update to add checking whether the related Tx or Rx
queue has been setuped in the rte_eth_rx_queue_info_get and
rte_eth_tx_queue_info_get API function to avoid illegal address access.

And the other two patches for hns3 PMD driver.

Huisong Li (1):
  net/hns3: support getting Tx and Rx queue information

Wei Hu (Xavier) (2):
  net/hns3: report Rx drop packets enable configuration
  ethdev: check if queue setupped when getting queue info

 drivers/net/hns3/hns3_ethdev.c| 11 +
 drivers/net/hns3/hns3_ethdev_vf.c | 11 +
 drivers/net/hns3/hns3_rxtx.c  | 39 +++
 drivers/net/hns3/hns3_rxtx.h  |  5 +++-
 lib/librte_ethdev/rte_ethdev.c| 16 +
 5 files changed, 81 insertions(+), 1 deletion(-)

-- 
2.27.0

[dpdk-dev] [PATCH v3 2/3] net/hns3: support getting Tx and Rx queue information

[Wei Hu (Xavier)]

From: Huisong Li 

This patch adds support for querying Rx/Tx queue information.

Signed-off-by: Huisong Li 
Signed-off-by: Wei Hu (Xavier) 
---
 drivers/net/hns3/hns3_ethdev.c|  2 ++
 drivers/net/hns3/hns3_ethdev_vf.c |  2 ++
 drivers/net/hns3/hns3_rxtx.c  | 33 +++
 drivers/net/hns3/hns3_rxtx.h  |  5 -
 4 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index bcbbd7e81..fab1914c3 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -5422,6 +5422,8 @@ static const struct eth_dev_ops hns3_eth_dev_ops = {
.tx_queue_release   = hns3_dev_tx_queue_release,
.rx_queue_intr_enable   = hns3_dev_rx_queue_intr_enable,
.rx_queue_intr_disable  = hns3_dev_rx_queue_intr_disable,
+   .rxq_info_get   = hns3_rxq_info_get,
+   .txq_info_get   = hns3_txq_info_get,
.dev_configure  = hns3_dev_configure,
.flow_ctrl_get  = hns3_flow_ctrl_get,
.flow_ctrl_set  = hns3_flow_ctrl_set,
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c 
b/drivers/net/hns3/hns3_ethdev_vf.c
index 3156ed7f5..60b576b02 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -2482,6 +2482,8 @@ static const struct eth_dev_ops hns3vf_eth_dev_ops = {
.tx_queue_release   = hns3_dev_tx_queue_release,
.rx_queue_intr_enable   = hns3_dev_rx_queue_intr_enable,
.rx_queue_intr_disable  = hns3_dev_rx_queue_intr_disable,
+   .rxq_info_get   = hns3_rxq_info_get,
+   .txq_info_get   = hns3_txq_info_get,
.dev_configure  = hns3vf_dev_configure,
.mac_addr_add   = hns3vf_add_mac_addr,
.mac_addr_remove= hns3vf_remove_mac_addr,
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index 3e5e32e38..57dcf0242 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -2820,3 +2820,36 @@ void hns3_set_rxtx_function(struct rte_eth_dev *eth_dev)
eth_dev->tx_pkt_prepare = hns3_dummy_rxtx_burst;
}
 }
+
+void
+hns3_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+ struct rte_eth_rxq_info *qinfo)
+{
+   struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+   struct hns3_rx_queue *rxq = dev->data->rx_queues[queue_id];
+
+   qinfo->mp = rxq->mb_pool;
+   qinfo->nb_desc = rxq->nb_rx_desc;
+   qinfo->scattered_rx = dev->data->scattered_rx;
+
+   /*
+* If there are no available Rx buffer descriptors, incoming packets
+* are always dropped by hardware based on hns3 network engine.
+*/
+   qinfo->conf.rx_drop_en = 1;
+   qinfo->conf.offloads = dev->data->dev_conf.rxmode.offloads;
+   qinfo->conf.rx_free_thresh = rxq->rx_free_thresh;
+   qinfo->conf.rx_deferred_start = rxq->rx_deferred_start;
+}
+
+void
+hns3_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+ struct rte_eth_txq_info *qinfo)
+{
+   struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+   struct hns3_tx_queue *txq = dev->data->tx_queues[queue_id];
+
+   qinfo->nb_desc = txq->nb_tx_desc;
+   qinfo->conf.offloads = dev->data->dev_conf.txmode.offloads;
+   qinfo->conf.tx_deferred_start = txq->tx_deferred_start;
+}
diff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h
index 0d20a27c8..f1fb3b56a 100644
--- a/drivers/net/hns3/hns3_rxtx.h
+++ b/drivers/net/hns3/hns3_rxtx.h
@@ -402,5 +402,8 @@ int hns3_set_fake_rx_or_tx_queues(struct rte_eth_dev *dev, 
uint16_t nb_rx_q,
 int hns3_config_gro(struct hns3_hw *hw, bool en);
 int hns3_restore_gro_conf(struct hns3_hw *hw);
 void hns3_update_all_queues_pvid_state(struct hns3_hw *hw);
-
+void hns3_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+  struct rte_eth_rxq_info *qinfo);
+void hns3_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+  struct rte_eth_txq_info *qinfo);
 #endif /* _HNS3_RXTX_H_ */
-- 
2.27.0

[dpdk-dev] [PATCH v3 3/3] ethdev: check if queue setupped when getting queue info

[Wei Hu (Xavier)]

From: "Wei Hu (Xavier)" 

This patch adds checking whether the related Tx or Rx queue has been
setuped in the rte_eth_rx_queue_info_get and rte_eth_tx_queue_info_get
API function to avoid illegal address access.

Signed-off-by: Wei Hu (Xavier) 
---
 lib/librte_ethdev/rte_ethdev.c | 16 
 1 file changed, 16 insertions(+)

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 7858ad5f1..0503c7929 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -4670,6 +4670,14 @@ rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t 
queue_id,
return -EINVAL;
}
 
+   if (dev->data->rx_queues[queue_id] == NULL) {
+   RTE_ETHDEV_LOG(ERR,
+  "Rx queue %"PRIu16" of device with port_id=%"
+  PRIu16" has not been setuped\n",
+  queue_id, port_id);
+   return -EINVAL;
+   }
+
if (rte_eth_dev_is_rx_hairpin_queue(dev, queue_id)) {
RTE_ETHDEV_LOG(INFO,
"Can't get hairpin Rx queue %"PRIu16" info of device 
with port_id=%"PRIu16"\n",
@@ -4701,6 +4709,14 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t 
queue_id,
return -EINVAL;
}
 
+   if (dev->data->tx_queues[queue_id] == NULL) {
+   RTE_ETHDEV_LOG(ERR,
+  "Tx queue %"PRIu16" of device with port_id=%"
+  PRIu16" has not been setuped\n",
+  queue_id, port_id);
+   return -EINVAL;
+   }
+
if (rte_eth_dev_is_tx_hairpin_queue(dev, queue_id)) {
RTE_ETHDEV_LOG(INFO,
"Can't get hairpin Tx queue %"PRIu16" info of device 
with port_id=%"PRIu16"\n",
-- 
2.27.0

[dpdk-dev] [PATCH v3 1/3] net/hns3: report Rx drop packets enable configuration

[Wei Hu (Xavier)]

From: "Wei Hu (Xavier)" 

Currently, if there are not available Rx buffer descriptors in recieving
direction based on hns3 network engine, incoming packets will always be
dropped by hardware. This patch reports the '.rx_drop_en' information to
DPDK framework in the '.dev_infos_get', '.rxq_info_get' and
'.rx_queue_setup' ops implementation function.

Signed-off-by: Huisong Li 
Signed-off-by: Wei Hu (Xavier) 
---
 drivers/net/hns3/hns3_ethdev.c| 9 +
 drivers/net/hns3/hns3_ethdev_vf.c | 9 +
 drivers/net/hns3/hns3_rxtx.c  | 6 ++
 3 files changed, 24 insertions(+)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 81e773046..bcbbd7e81 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2495,6 +2495,15 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct 
rte_eth_dev_info *info)
.nb_mtu_seg_max = HNS3_MAX_NON_TSO_BD_PER_PKT,
};
 
+   info->default_rxconf = (struct rte_eth_rxconf) {
+   /*
+* If there are no available Rx buffer descriptors, incoming
+* packets are always dropped by hardware based on hns3 network
+* engine.
+*/
+   .rx_drop_en = 1,
+   };
+
info->vmdq_queue_num = 0;
 
info->reta_size = HNS3_RSS_IND_TBL_SIZE;
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c 
b/drivers/net/hns3/hns3_ethdev_vf.c
index 1d2941f0e..3156ed7f5 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -947,6 +947,15 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct 
rte_eth_dev_info *info)
.nb_mtu_seg_max = HNS3_MAX_NON_TSO_BD_PER_PKT,
};
 
+   info->default_rxconf = (struct rte_eth_rxconf) {
+   /*
+* If there are no available Rx buffer descriptors, incoming
+* packets are always dropped by hardware based on hns3 network
+* engine.
+*/
+   .rx_drop_en = 1,
+   };
+
info->vmdq_queue_num = 0;
 
info->reta_size = HNS3_RSS_IND_TBL_SIZE;
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index c0f798159..3e5e32e38 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -1251,6 +1251,12 @@ hns3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t 
idx, uint16_t nb_desc,
return -EINVAL;
}
 
+   if (conf->rx_drop_en == 0)
+   hns3_warn(hw, "if there are no available Rx descriptors,"
+ "incoming packets are always dropped. input parameter"
+ " conf->rx_drop_en(%u) is uneffective.",
+ conf->rx_drop_en);
+
if (dev->data->rx_queues[idx]) {
hns3_rx_queue_release(dev->data->rx_queues[idx]);
dev->data->rx_queues[idx] = NULL;
-- 
2.27.0

Re: [dpdk-dev] [PATCH V2] net/hns3: support getting Tx and Rx queue information

[Wei Hu (Xavier)]

Hi, Ferruh Yigit

On 2020/8/20 0:19, Ferruh Yigit wrote:

On 8/18/2020 4:07 AM, Wei Hu (Xavier) wrote:

From: Huisong Li 

This patch adds support for querying Rx/Tx queue information.

Currently, if there are not available Rx buffer descriptors in receiving
direction based on hns3 network engine, incoming packets will always be
dropped by hardware. This patch reports the '.rx_drop_en' information to
DPDK framework in the '.dev_infos_get', '.rxq_info_get' and
'.rx_queue_setup' ops implementation function.

Signed-off-by: Huisong Li 
Signed-off-by: Wei Hu (Xavier) 

<...>


@@ -2495,6 +2495,15 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct 
rte_eth_dev_info *info)
.nb_mtu_seg_max = HNS3_MAX_NON_TSO_BD_PER_PKT,
};
  
+	info->default_rxconf = (struct rte_eth_rxconf) {

+   /*
+* If there are no available Rx buffer descriptors, incoming
+* packets are always dropped by hardware based on hns3 network
+* engine.
+*/
+   .rx_drop_en = 1,
+   };

Can you please separate this into two patches, first one for 'rx_drop_en'
related changes to existing code, second one to add queue info get functions?

And you may prefer to request backporting the 'rx_drop_en' patch.


Thanks for you suggestion.

I will update them in V3.



<...>

+void
+hns3_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+ struct rte_eth_rxq_info *qinfo)
+{
+   struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+   struct hns3_rx_queue *rxq = dev->data->rx_queues[queue_id];
+
+   if (rxq == NULL) {
+   hns3_err(hw, "queue pointer of rx queue_id (%u) is NULL.",
+queue_id);
+   return;
+   }

'rxq' should not be 'NULL' at this stage, because of the "queue_id >=
dev->data->nb_rx_queues" check in 'rte_eth_rx_queue_info_get()'.
Can you please check if it can be 'NULL' and if it can be, better to check it in
the ethdev API, instead of doing in each PMD, both for 'rxq' & 'txq'.


OK, I will send a email to add check rxq & txq in the 
rte_eth_rx_queue_info_get


and rte_eth_tx_queue_info_get API function.

Thanks, Xavier.

Re: [dpdk-dev] [PATCH v7 1/5] net/bnxt: add support for aarch32

[Juraj Linkeš]

From: Ruifeng Wang 
Sent: Thursday, August 20, 2020 5:00 AM
To: Ajit Khaparde (ajit.khapa...@broadcom.com) ; 
Juraj Linkeš 
Cc: Bruce Richardson ; Aaron Conole 
; maicolgabr...@hotmail.com; dpdk-dev ; nd 

Subject: RE: [dpdk-dev] [PATCH v7 1/5] net/bnxt: add support for aarch32

From: Ajit Khaparde 
mailto:ajit.khapa...@broadcom.com>>
Sent: Thursday, August 20, 2020 1:46 AM
To: Juraj Linkeš mailto:juraj.lin...@pantheon.tech>>
Cc: Bruce Richardson 
mailto:bruce.richard...@intel.com>>; Aaron Conole 
mailto:acon...@redhat.com>>; 
maicolgabr...@hotmail.com; dpdk-dev 
mailto:dev@dpdk.org>>; Ruifeng Wang 
mailto:ruifeng.w...@arm.com>>
Subject: Re: [dpdk-dev] [PATCH v7 1/5] net/bnxt: add support for aarch32



On Fri, Aug 14, 2020 at 3:32 AM Juraj Linkeš 
mailto:juraj.lin...@pantheon.tech>> wrote:
From: Ruifeng Wang mailto:ruifeng.w...@arm.com>>

Expand vector PMD support to aarch32.

Signed-off-by: Ruifeng Wang mailto:ruifeng.w...@arm.com>>
---
 drivers/net/bnxt/Makefile   | 2 +-
 drivers/net/bnxt/bnxt_rxq.h | 2 +-
 drivers/net/bnxt/bnxt_rxr.h | 2 +-
 drivers/net/bnxt/bnxt_txr.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/bnxt/Makefile b/drivers/net/bnxt/Makefile
index 0c5b74918..06a47dc49 100644
--- a/drivers/net/bnxt/Makefile
+++ b/drivers/net/bnxt/Makefile
@@ -43,7 +43,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += rte_pmd_bnxt.c
 ifeq ($(CONFIG_RTE_ARCH_X86), y)
 SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxtx_vec_sse.c
 endif
-ifeq ($(CONFIG_RTE_ARCH_ARM64), y)
+ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),)
 SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxtx_vec_neon.c
 endif
Thanks for the changes.
With makefiles being deprecated, I don't think this will be required.
That said, I don't see drivers/net/bnxt/meson.build being modified.
Is that not required?

[Ruifeng] No, the meson.build doesn’t require to be modified.
It uses different method to flag inclusion of bnxt_rxtx_vec_neon.c and is 
compatible with aarch32 build.

[Juraj] Since the makefile changes are not needed, I'll remove them in the next 
version.


diff --git a/drivers/net/bnxt/bnxt_rxq.h b/drivers/net/bnxt/bnxt_rxq.h
index d5ce3b6d5..1c4027711 100644
--- a/drivers/net/bnxt/bnxt_rxq.h
+++ b/drivers/net/bnxt/bnxt_rxq.h
@@ -22,7 +22,7 @@ struct bnxt_rx_queue {
uint16_tnb_rx_hold; /* num held free RX desc */
uint16_trx_free_thresh; /* max free RX desc to hold */
uint16_tqueue_id; /* RX queue index */
-#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64)
+#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64) || defined(RTE_ARCH_ARM)
uint16_trxrearm_nb; /* number of descs to reinit. */
uint16_trxrearm_start; /* next desc index to reinit. */
 #endif
diff --git a/drivers/net/bnxt/bnxt_rxr.h b/drivers/net/bnxt/bnxt_rxr.h
index 2bf46cd91..e2fba1647 100644
--- a/drivers/net/bnxt/bnxt_rxr.h
+++ b/drivers/net/bnxt/bnxt_rxr.h
@@ -221,7 +221,7 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq);
 int bnxt_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id);
 int bnxt_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id);

-#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64)
+#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64) || defined(RTE_ARCH_ARM)
 uint16_t bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts);
 int bnxt_rxq_vec_setup(struct bnxt_rx_queue *rxq);
diff --git a/drivers/net/bnxt/bnxt_txr.h b/drivers/net/bnxt/bnxt_txr.h
index 7715c11b8..38e5ac9df 100644
--- a/drivers/net/bnxt/bnxt_txr.h
+++ b/drivers/net/bnxt/bnxt_txr.h
@@ -59,7 +59,7 @@ uint16_t bnxt_xmit_pkts(void *tx_queue, struct rte_mbuf 
**tx_pkts,
   uint16_t nb_pkts);
 uint16_t bnxt_dummy_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
  uint16_t nb_pkts);
-#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64)
+#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64) || defined(RTE_ARCH_ARM)
 uint16_t bnxt_xmit_pkts_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts);
 #endif
--
2.20.1

[dpdk-dev] DPDK Release Status Meeting 20/08/2020

[Ferruh Yigit]

Minutes 20 August 2020
--

Agenda:
* Release Dates
* Highlights
* 20.08 retrospective
* LTS
* Opens

Participants:
* Arm
* Broadcom
* Debian/Microsoft
* Intel
* Marvell
* Nvidia
* NXP
* Red Hat


Release Dates
-

* v20.11 dates
  * Proposal/V1:Friday, 11 September 2020
  * -rc1:   Friday, 9 October 2020
  * -rc2:   Friday, 23 October 2020
  * Release:Friday, 13 November 2020


Highlights
--

* No roadmap received yet. 20.11 is expected to be a big release, please send
  roadmaps to help managing the project.

* Need support for crypto tree. There are four new PMDs for this release and
  Akhil won't be available for some time. We need additional support on reviews.


20.08 retrospective
---

* 20.08 released on Sun, 09 Aug
  * http://inbox.dpdk.org/dev/8108418.8U4FE8ErZL@thomas/

* Overall able to hit the dates without much deviation in original plan

* Not much improvement on doc maintainership

* Short time between -rc1 & -rc2 didn't give enough time for bug fixes
  * If we have flexibility we can ensure a minimum time in between

* There were many features, not all able to make into release
  * Overall this is affecting all vendors
  * A process update to assign patches to reviewers will be voted in techboard
  * Different solutions discussed in the past, this is recurring problem

* vhost maintainer changes recovered quickly

* Inactive sub-trees removed, good to dynamically add/remove them


LTS
---

* v19.11.4-rc1 is out, please test
  * http://inbox.dpdk.org/dev/20200818181222.8462-1-bl...@debian.org/T/#u
  * 200+ commits merged
  * Intel will start testing it
  * Target release date is 31 August.


Opens
-

* event/dlb PMD may need some support for upstreaming, will follow in Intel.



DPDK Release Status Meetings


The DPDK Release Status Meeting is intended for DPDK Committers to discuss the
status of the master tree and sub-trees, and for project managers to track
progress or milestone dates.

The meeting occurs on every Thursdays at 8:30 UTC. on https://meet.jit.si/DPDK

If you wish to attend just send an email to
"John McNamara " for the invite.

Re: [dpdk-dev] [PATCH] net/ark: fix meson build

[Ferruh Yigit]

On 8/19/2020 9:45 PM, Ed Czeck wrote:
> * Rename net/ark specific CONFIG_RTE macros to local macros.
> * Change condition of ARK_PAD_TX to match behavior of meson build
> to makefile build.
> * Install header file needed for dynamic library.
> * Update doc as required.
> 
> Signed-off-by: Ed Czeck 
> ---
>  doc/guides/nics/ark.rst | 24 ++--
>  drivers/net/ark/ark_logs.h  | 16 +++-
>  drivers/net/ark/meson.build |  2 ++
>  3 files changed, 23 insertions(+), 19 deletions(-)
> 
> diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst
> index 06e8c3374..4d8920cd0 100644
> --- a/doc/guides/nics/ark.rst
> +++ b/doc/guides/nics/ark.rst
> @@ -124,27 +124,31 @@ Configuration Information
>  
>  **DPDK Configuration Parameters**
>  
> -  The following configuration options are available for the ARK PMD:
> +  The following compile-time configuration options are available for the ARK 
> PMD:
>  
> -   * **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables inclusion
> - of the ARK PMD driver in the DPDK compilation.
> +   * **ARK_NOPAD_TX**:  When enabled TX
> + packets are not padded to 60 bytes to support downstream MACS.
>  
> -   * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y):  When enabled TX
> - packets are padded to 60 bytes to support downstream MACS.
> -
> -   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_RX** (default n): Enables or disables 
> debug
> +   * **ARK_DEBUG_RX**: Enables debug
>   logging and internal checking of RX ingress logic within the ARK PMD 
> driver.
>  
> -   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TX** (default n): Enables or disables 
> debug
> +   * **ARK_DEBUG_TX**: Enables debug
>   logging and internal checking of TX egress logic within the ARK PMD 
> driver.
>  
> -   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS** (default n): Enables or disables 
> debug
> +   * **ARK_DEBUG_STATS**: Enables debug
>   logging of detailed packet and performance statistics gathered in
>   the PMD and FPGA.
>  
> -   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE** (default n): Enables or disables 
> debug
> +   * **ARK_DEBUG_TRACE**: Enables debug
>   logging of detailed PMD events and status.

Logging can be controlled in runtime, that is what we should use.
In data path, we use compile time flags because of the performance issues. So OK
to have 'CONFIG_RTE_LIBRTE_ARK_DEBUG_RX' & 'CONFIG_RTE_LIBRTE_ARK_DEBUG_TX' as
compile time flag, but why having compile time flag for rest?

>  
> +Note that enabling debugging options may affect system performance.
> +These options may be set by specifying them in CFLAG
> +environment before the meson build set.   E.g.::
> +
> +export CFLAGS="-DARK_DEBUG_TRACE"
> +meson build
> +

When you passed the flag as above, it is still global to all components in the
DPDK, this is not just for ark. What is the motivation to remove the
"RET_LIBRTE_" prefix?

>  
>  Building DPDK
>  -
> diff --git a/drivers/net/ark/ark_logs.h b/drivers/net/ark/ark_logs.h
> index 44aac6102..125583475 100644
> --- a/drivers/net/ark/ark_logs.h
> +++ b/drivers/net/ark/ark_logs.h
> @@ -6,14 +6,12 @@
>  #define _ARK_DEBUG_H_
>  
>  #include 
> -#include 
> -
>  
>  /* Configuration option to pad TX packets to 60 bytes */
> -#ifdef RTE_LIBRTE_ARK_PAD_TX
> -#define ARK_TX_PAD_TO_60   1
> -#else
> +#ifdef ARK_NOPAD_TX
>  #define ARK_TX_PAD_TO_60   0
> +#else
> +#define ARK_TX_PAD_TO_60   1
>  #endif

So you don't want to convert this to runtime configuration.

The point we are reducing compile time flags:
1) It forks the code paths and by time it leave not tested, even not compiled
code paths which may cause rotten code by time.

2) Multiple code paths will lead deployment problems. When you deploy an
application, you won't able to change the compile time configuration in customer
environment and need to re-compile (most probably re-test) and re-deploy it.
Also there is not easy way to figure out from binary in customer environment
that with which compile time flags it has been built.

Switching to CFLAGS="..." doesn't make above concerns go away and indeed it
makes (1) worst since hides the config options within the driver. Previously it
was possible to trigger each config option and do testing using scripts, now
since config options are hidden in driver we can't do even that.

Can you please detail why "ARK_TX_PAD_TO_60" is needed exactly?
And can you please justify why it has to be compile time config option?

<...>

> @@ -11,3 +11,5 @@ sources = files('ark_ddm.c',
>   'ark_pktgen.c',
>   'ark_rqp.c',
>   'ark_udm.c')
> +
> +install_headers('ark_ext.h')
> 

Installing PMD header file is not required but this has an unique usage.

Ark PMD is wrapper to the external shared library which should implement the
functions that has prototypes in the 'ark_ext.h'.

Since this header is not needed by users of the dpdk library, but needed by
extension developers for the ark PMD, I think the header should not be 
installed.

Re: [dpdk-dev] [PATCH] net: add a new network PMD named txgbe

[Ferruh Yigit]

On 8/20/2020 4:02 AM, Jiawen Wu wrote:
> This is a new network PMD named txgbe provides poll mode driver support for 
> Wangxun 10Gb Ethernet NICs.
> 
> Beijing WangXun Technology Co., Ltd. is a high-tech company specializing in 
> the design of high-end integrated circuit chips and providing independent 
> innovation solutions for enterprise network and storage products. Founded in 
> May 2014, the company is headquartered in Beijing YuQuanHuiGu Science and 
> Technology Park, with branches in Hangzhou City. Welcome to reach us on 
> website https://www.net-swift.com.
> 
> This patch is created base on the main branch in main repository. Our goal is 
> to validate and commit txgbe driver into the 20.11 official release, and then 
> continue the development and maintenance in community.
> 
> Waiting for your reviews sincerely.
> 
> Signed-off-by: Jiawen Wu 

Hi Jiawen,

Thanks for the patch.

Without looking into any detail, a very high level comment is, it is very hard
to review a new PMD (40K+ loc) as a single patch.

Can you please split the patch into multiple patches, which gradually build the
PMD by adding a feature with each patch, starting from an empty skeleton.

Last as few upstreamed PMDs as example:
ionic:
https://patches.dpdk.org/project/dpdk/list/?series=8206&state=%2A&archive=both

pfe:
https://patches.dpdk.org/project/dpdk/list/?series=6777&state=%2A&archive=both

octeontx2 (one of the good samples I suggest checking):
https://patches.dpdk.org/project/dpdk/list/?series=5302&state=%2A&archive=both


Also you can skip all Makefile build system related changes, since it will be
removed in this release, no need to spend time for it.

Thanks,
ferruh

[dpdk-dev] [PATCH] usertools/dpdk-devbind: add support for PCI wildcards

[Bruce Richardson]

When binding or unbinding a range of devices, it can be useful to use
wildcards to specify the devices rather than repeating the same prefix
multiple times. We can use the python "glob" module to give us this
functionality - at least for PCI devices - by checking /sys for matching
files.

Examples of use from my system:

./dpdk-devbind.py -b vfio-pci 80:04.*
./dpdk-devbind.py -u 80:04.[2-7]

The first example binds eight devices, 80:04.0..80:04.7, to vfio-pci. The
second then unbinds six of those devices, 80:04.2..80:04.7, from any
driver.

Signed-off-by: Bruce Richardson 
---
 usertools/dpdk-devbind.py | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py
index 86b6b53c40..70ed7bce9d 100755
--- a/usertools/dpdk-devbind.py
+++ b/usertools/dpdk-devbind.py
@@ -8,6 +8,7 @@
 import os
 import getopt
 import subprocess
+from glob import glob
 from os.path import exists, abspath, dirname, basename
 
 if sys.version_info.major < 3:
@@ -689,6 +690,16 @@ def parse_args():
 else:
 b_flag = arg
 
+# resolve any PCI globs in the args
+new_args = []
+sysfs_path = "/sys/bus/pci/devices/"
+for arg in args:
+globbed_arg = glob(sysfs_path + arg) + glob(sysfs_path + ":" + arg)
+if globbed_arg:
+new_args.extend([a[len(sysfs_path):] for a in globbed_arg])
+else:
+new_args.append(arg)
+args = new_args
 
 def do_arg_actions():
 '''do the actual action requested by the user'''
-- 
2.25.1

[dpdk-dev] [PATCH v2 00/37] remove make support in DPDK

[Ciara Power]

v2:
  - Fixed comments on v1.
  - Removed additional make references.
  - Added some meson replacements where necessary.
  - Added dummy root Makefile.

As previously decided [1] and communicated via deprecation notice [2], the
make build system is to be removed in the 20.11 release.

This patchset removes support for compiling DPDK with the legacy make
build system. Some make support is maintained for example applications,
where pkg-config is used rather than the legacy make method.

References to the make build system are removed from all documentation,
please review to see if replacement meson instructions are needed in some cases.

[1] https://mails.dpdk.org/archives/dev/2020-April/162839.html 
[2] 
http://git.dpdk.org/dpdk/commit/?id=a5449d78d1413e7bd1d66f6e70884e46cfb5e673 

Bruce Richardson (6):
  examples/multi_process: convert to pkg-config-based build
  examples/vm_power_manager: convert to use DPDK pkg-config
  examples/vm_power_manager: convert guest cli to pkg-config
  examples/ethtool: convert to pkg-config-based build
  build: create dummy Makefile
  doc/guides: remove use of DPDK make build system

Ciara Power (28):
  examples: remove legacy sections of makefiles
  build: remove makefiles and mk directory
  config: remove all config files used by make
  examples: remove old build system references
  buildtools: remove all scripts for use with make
  devtools: remove use of make in scripts
  app/test: remove references to make
  drivers: remove references to make config options
  lib: remove references to make config options
  doc: remove deprecation notice for make
  doc: remove references to make in bbdev guides
  doc: remove references to make in compressdev guides
  doc: remove references to make in contributing guides
  doc: remove references to make in cryptodev guides
  doc: remove references to make in eventdev guides
  doc: remove references to make in FreeBSD gsg guide
  doc: remove references to make in howto guides
  doc: remove references to make in Linux gsg guides
  doc: remove references to make in mempool guides
  doc: remove references to make in NIC guides
  doc: remove references to make in platform guides
  doc: remove references to make in prog guides
  doc: remove references to make in rawdev guides
  doc: remove references to make in sample app guides
  doc: remove references to make in vdpadevs guides
  doc: remove reference to make in tools guides
  doc: remove references to make in testpmd guides
  doc: update quick build doc to remove make references

Kevin Laatz (3):
  examples/server_node_efd: convert to pkg-config-based build
  examples/ka-agent: convert to pkg-config-based build
  examples/pthread: convert to pkg-config-based build

 GNUmakefile   |   17 -
 MAINTAINERS   |   12 +-
 Makefile  |7 +-
 app/Makefile  |   34 -
 app/pdump/Makefile|   18 -
 app/proc-info/Makefile|   14 -
 app/test-acl/Makefile |   17 -
 app/test-bbdev/Makefile   |   30 -
 app/test-bbdev/test-bbdev.py  |   11 +-
 app/test-cmdline/Makefile |   24 -
 app/test-compress-perf/Makefile   |   19 -
 app/test-crypto-perf/Makefile |   28 -
 app/test-eventdev/Makefile|   32 -
 app/test-fib/Makefile |   18 -
 app/test-flow-perf/Makefile   |   26 -
 app/test-pipeline/Makefile|   33 -
 app/test-pmd/Makefile |   73 --
 app/test-regex/Makefile   |   13 -
 app/test-sad/Makefile |   17 -
 app/test/Makefile |  310 -
 app/test/test_cryptodev.c |   89 +-
 app/test/test_cryptodev_asym.c|   18 +-
 buildtools/Makefile   |9 -
 buildtools/auto-config-h.sh   |  108 --
 buildtools/call-sphinx-build.py   |5 +-
 buildtools/gen-build-mk.sh|   23 -
 buildtools/gen-config-h.sh|   15 -
 buildtools/pmdinfogen/Makefile|   20 -
 buildtools/relpath.sh |   76 --
 config/common_armv8a_linux|   43 -
 config/common_base| 1154 -
 config/common_freebsd |   15 -
 config/common_linux   |   68 -
 config/defconfig_arm-armv7a-linux-gcc |1 -
 config/defconfig_arm-armv7a-linuxapp-gcc  |   49 -
 config/defconfig_arm64-armada-linux-gcc   |1 -
 config/defconfig_arm64-armada-linuxapp-gcc|   41 -
 config/defconfig_arm64-armv8a-linux-clang |1 -
 config/defconfig_arm64-armv8a-linux-gcc   |1 -
 config/defconfig_arm64-armv8a-linuxapp-clang  |8 -
 c

[dpdk-dev] [PATCH v2 01/37] examples: remove legacy sections of makefiles

[Ciara Power]

The example app makefiles contained sections using the legacy method of
compiling with make. These are no longer needed, and are removed,
leaving only the section that uses pkg-config for the make build.

Signed-off-by: Ciara Power 
---
 examples/bbdev_app/Makefile | 23 ++-
 examples/bond/Makefile  | 34 ++
 examples/cmdline/Makefile   | 29 ++-
 examples/distributor/Makefile   | 30 ++-
 examples/eventdev_pipeline/Makefile | 23 ++-
 examples/fips_validation/Makefile   | 34 ++
 examples/flow_classify/Makefile | 29 ++-
 examples/flow_filtering/Makefile| 23 ++-
 examples/helloworld/Makefile| 23 ++-
 examples/ioat/Makefile  | 22 ++
 examples/ip_fragmentation/Makefile  | 29 ++-
 examples/ip_pipeline/Makefile   | 36 ++-
 examples/ip_reassembly/Makefile | 29 ++-
 examples/ipsec-secgw/Makefile   | 36 ++-
 examples/ipv4_multicast/Makefile| 29 ++-
 examples/kni/Makefile   | 27 ++
 examples/l2fwd-cat/Makefile | 38 ++---
 examples/l2fwd-crypto/Makefile  | 28 ++
 examples/l2fwd-event/Makefile   | 22 ++
 examples/l2fwd-jobstats/Makefile| 23 ++-
 examples/l2fwd-keepalive/Makefile   | 23 ++-
 examples/l2fwd/Makefile | 23 ++-
 examples/l3fwd-acl/Makefile | 28 ++
 examples/l3fwd-graph/Makefile   | 23 ++-
 examples/l3fwd-power/Makefile   | 36 ++-
 examples/l3fwd/Makefile | 23 ++-
 examples/link_status_interrupt/Makefile | 22 ++
 examples/ntb/Makefile   | 32 ++---
 examples/packet_ordering/Makefile   | 22 ++
 examples/ptpclient/Makefile | 28 ++
 examples/qos_meter/Makefile | 28 ++
 examples/qos_sched/Makefile | 31 ++--
 examples/rxtx_callbacks/Makefile| 31 ++--
 examples/service_cores/Makefile | 28 ++
 examples/skeleton/Makefile  | 29 ++-
 examples/tep_termination/Makefile   | 27 ++
 examples/timer/Makefile | 28 ++
 examples/vdpa/Makefile  | 32 ++---
 examples/vhost/Makefile | 30 ++-
 examples/vhost_blk/Makefile | 31 ++--
 examples/vhost_crypto/Makefile  | 31 ++--
 examples/vmdq/Makefile  | 23 ++-
 examples/vmdq_dcb/Makefile  | 31 ++--
 43 files changed, 129 insertions(+), 1078 deletions(-)

diff --git a/examples/bbdev_app/Makefile b/examples/bbdev_app/Makefile
index 3c8eb75a4e..2f156736d1 100644
--- a/examples/bbdev_app/Makefile
+++ b/examples/bbdev_app/Makefile
@@ -8,7 +8,9 @@ APP = bbdev
 SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
+ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
+$(error "no installation of DPDK found")
+endif
 
 all: shared
 .PHONY: shared static
@@ -39,22 +41,3 @@ build:
 clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
test -d build && rmdir -p build || true
-
-else
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a 
.config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard 
$(RTE_SDK)/*/.config)
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-include $(RTE_SDK)/mk/rte.extapp.mk
-
-endif
diff --git a/examples/bond/Makefile b/examples/bond/Makefile
index 4e4289e151..4e560f574c 100644
--- a/examples/bond/Makefile
+++ b/examples/bond/Makefile
@@ -8,7 +8,9 @@ APP = bond_app
 SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
+ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
+$(error "no installation of DPDK found")
+endif
 
 all: shared
 .PHONY: shared static
@@ -41,33 +43,3 @@ build:
 clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
test -d build && rmdir -p build || true
-
-else
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a 
.config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard 
$(

[dpdk-dev] [PATCH v2 02/37] examples/multi_process: convert to pkg-config-based build

[Ciara Power]

From: Bruce Richardson 

Remove references to the old make build system and use pkg-config for
building these examples.

Signed-off-by: Bruce Richardson 
---
 examples/multi_process/Makefile   | 21 ++--
 .../multi_process/client_server_mp/Makefile   | 19 ++-
 .../client_server_mp/mp_client/Makefile   | 44 
 .../client_server_mp/mp_server/Makefile   | 51 +++
 examples/multi_process/hotplug_mp/Makefile| 46 -
 examples/multi_process/simple_mp/Makefile | 44 +++-
 examples/multi_process/symmetric_mp/Makefile  | 44 +++-
 7 files changed, 167 insertions(+), 102 deletions(-)

diff --git a/examples/multi_process/Makefile b/examples/multi_process/Makefile
index 7f7e68d912..f0a999745a 100644
--- a/examples/multi_process/Makefile
+++ b/examples/multi_process/Makefile
@@ -1,18 +1,7 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
+subdirs := client_server_mp hotplug_mp simple_mp symmetric_mp
 
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
+.PHONY: all static shared clean $(subdirs)
+all static shared clean: $(subdirs)
 
-# Default target, detect a build directory, by looking for a path with a 
.config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard 
$(RTE_SDK)/*/.config)
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += client_server_mp
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += simple_mp
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += symmetric_mp
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp
-
-include $(RTE_SDK)/mk/rte.extsubdir.mk
+$(subdirs):
+   $(MAKE) -C $@ $(MAKECMDGOALS)
diff --git a/examples/multi_process/client_server_mp/Makefile 
b/examples/multi_process/client_server_mp/Makefile
index fe7a8af605..e8debdfd9a 100644
--- a/examples/multi_process/client_server_mp/Makefile
+++ b/examples/multi_process/client_server_mp/Makefile
@@ -1,16 +1,7 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
+subdirs := mp_client mp_server
 
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
+.PHONY: all static shared clean $(subdirs)
+all static shared clean: $(subdirs)
 
-# Default target, detect a build directory, by looking for a path with a 
.config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard 
$(RTE_SDK)/*/.config)
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_client
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_server
-
-include $(RTE_SDK)/mk/rte.extsubdir.mk
+$(subdirs):
+   $(MAKE) -C $@ $(MAKECMDGOALS)
diff --git a/examples/multi_process/client_server_mp/mp_client/Makefile 
b/examples/multi_process/client_server_mp/mp_client/Makefile
index 7c447feba3..b723e545b7 100644
--- a/examples/multi_process/client_server_mp/mp_client/Makefile
+++ b/examples/multi_process/client_server_mp/mp_client/Makefile
@@ -1,21 +1,43 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2010-2014 Intel Corporation
 
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, can be overridden by command line or environment
-include $(RTE_SDK)/mk/rte.vars.mk
-
 # binary name
 APP = mp_client
 
 # all source are stored in SRCS-y
 SRCS-y := client.c
 
-CFLAGS += $(WERROR_FLAGS) -O3
-CFLAGS += -I$(SRCDIR)/../shared
-CFLAGS += -DALLOW_EXPERIMENTAL_API
+CFLAGS += -I../shared
+
+# Build using pkg-config variables if possible
+ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
+$(error "no installation of DPDK found")
+endif
+
+all: shared
+.PHONY: shared static
+shared: build/$(APP)-shared
+   ln -sf $(APP)-shared build/$(APP)
+static: build/$(APP)-static
+   ln -sf $(APP)-static build/$(APP)
+
+PKGCONF ?= pkg-config
+
+PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
+LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
+LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
+
+build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
+   $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
+
+build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build
+   $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC)
+
+build:
+   @mkdir -p $@
 
-include $(RTE_SDK)/mk/rte.extapp.mk
+.PHONY: clean
+clean:
+   rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
+   test -d build && rmdir -p build || true
diff --git a/examples/multi_process/client_server_mp/mp_server/Makefile 
b/examples/multi_process/client_server_mp/mp_server/Makefile
index 50ebf1d7da..f49260a256 100644
--- a/examples/multi_process/client_server_mp/mp_server/Makefile
+++ b/examples/multi_process/client_server_mp/mp_server/Makefile
@@ -1,34 +1,43 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2010-2014 Intel Corporation
 
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SD

[dpdk-dev] [PATCH v2 03/37] examples/server_node_efd: convert to pkg-config-based build

[Ciara Power]

From: Kevin Laatz 

Remove references to the old make build system and use pkg-config for
building these examples.

Signed-off-by: Kevin Laatz 
---
 examples/server_node_efd/Makefile| 18 +++--
 examples/server_node_efd/node/Makefile   | 46 +++--
 examples/server_node_efd/server/Makefile | 51 +++-
 3 files changed, 72 insertions(+), 43 deletions(-)

diff --git a/examples/server_node_efd/Makefile 
b/examples/server_node_efd/Makefile
index cc2ea8b566..e4a4a94a79 100644
--- a/examples/server_node_efd/Makefile
+++ b/examples/server_node_efd/Makefile
@@ -1,16 +1,10 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016-2017 Intel Corporation
+# Copyright(c) 2016-2020 Intel Corporation
 
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
+subdirs := node server
 
-# Default target, detect a build directory, by looking for a path with a 
.config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard 
$(RTE_SDK)/*/.config)
+.PHONY: all static shared clean $(subdirs)
+all static shared clean: $(subdirs)
 
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += server
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += node
-
-include $(RTE_SDK)/mk/rte.extsubdir.mk
+$(subdirs):
+   $(MAKE) -C $@ $(MAKECMDGOALS)
diff --git a/examples/server_node_efd/node/Makefile 
b/examples/server_node_efd/node/Makefile
index ecc551e1d6..a4efef42dc 100644
--- a/examples/server_node_efd/node/Makefile
+++ b/examples/server_node_efd/node/Makefile
@@ -1,12 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016-2017 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, can be overridden by command line or environment
-include $(RTE_SDK)/mk/rte.vars.mk
+# Copyright(c) 2016-2020 Intel Corporation
 
 # binary name
 APP = node
@@ -14,8 +7,37 @@ APP = node
 # all source are stored in SRCS-y
 SRCS-y := node.c
 
-CFLAGS += $(WERROR_FLAGS) -O3
-CFLAGS += -I$(SRCDIR)/../shared
-CFLAGS += -DALLOW_EXPERIMENTAL_API
+CFLAGS += -I../shared
+
+# Build using pkg-config variables if possible
+ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
+$(error "no installation of DPDK found")
+endif
+
+all: shared
+.PHONY: shared static
+shared: build/$(APP)-shared
+   ln -sf $(APP)-shared build/$(APP)
+static: build/$(APP)-static
+   ln -sf $(APP)-static build/$(APP)
+
+PKGCONF ?= pkg-config
+
+PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
+LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
+LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
+
+build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
+   $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
+
+build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build
+   $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC)
+
+build:
+   @mkdir -p $@
 
-include $(RTE_SDK)/mk/rte.extapp.mk
+.PHONY: clean
+clean:
+   rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
+   test -d build && rmdir -p build || true
diff --git a/examples/server_node_efd/server/Makefile 
b/examples/server_node_efd/server/Makefile
index acbd12ae23..106e1abd74 100644
--- a/examples/server_node_efd/server/Makefile
+++ b/examples/server_node_efd/server/Makefile
@@ -1,30 +1,43 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016-2017 Intel Corporation
+# Copyright(c) 2016-2020 Intel Corporation
 
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
+# binary name
+APP = server
 
-# Default target, detect a build directory, by looking for a path with a 
.config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard 
$(RTE_SDK)/*/.config)
+# all source are stored in SRCS-y
+SRCS-y := main.c init.c args.c
 
-include $(RTE_SDK)/mk/rte.vars.mk
+CFLAGS += -I../shared
 
-ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-$(error This application can only operate in a linux environment, \
-please change the definition of the RTE_TARGET environment variable)
+# Build using pkg-config variables if possible
+ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
+$(error "no installation of DPDK found")
 endif
 
-# binary name
-APP = server
+all: shared
+.PHONY: shared static
+shared: build/$(APP)-shared
+   ln -sf $(APP)-shared build/$(APP)
+static: build/$(APP)-static
+   ln -sf $(APP)-static build/$(APP)
 
-# all source are stored in SRCS-y
-SRCS-y := main.c init.c args.c
+PKGCONF ?= pkg-config
+
+PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
+LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
+LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
+
+build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
+   $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
 
-INC := $(sort $(wildcard *.h)

[dpdk-dev] [PATCH v2 04/37] examples/ka-agent: convert to pkg-config-based build

[Ciara Power]

From: Kevin Laatz 

Remove references to the old make build system and use pkg-config for
building these examples.

Signed-off-by: Kevin Laatz 
---
 examples/l2fwd-keepalive/ka-agent/Makefile | 51 --
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/examples/l2fwd-keepalive/ka-agent/Makefile 
b/examples/l2fwd-keepalive/ka-agent/Makefile
index 8d5061b178..700137c2e2 100644
--- a/examples/l2fwd-keepalive/ka-agent/Makefile
+++ b/examples/l2fwd-keepalive/ka-agent/Makefile
@@ -1,14 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a 
.config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard 
$(RTE_SDK)/*/.config)
-
-include $(RTE_SDK)/mk/rte.vars.mk
+# Copyright(c) 2016-2020 Intel Corporation
 
 # binary name
 APP = ka-agent
@@ -16,7 +7,39 @@ APP = ka-agent
 # all source are stored in SRCS-y
 SRCS-y := main.c
 
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)/../
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-LDFLAGS += -lrt
-include $(RTE_SDK)/mk/rte.extapp.mk
+CFLAGS += -I..
+
+# Build using pkg-config variables if possible
+ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
+$(error "no installation of DPDK found")
+endif
+
+all: shared
+.PHONY: shared static
+shared: build/$(APP)-shared
+   ln -sf $(APP)-shared build/$(APP)
+static: build/$(APP)-static
+   ln -sf $(APP)-static build/$(APP)
+
+LDFLAGS += -lpthread -lrt
+
+PKGCONF ?= pkg-config
+
+PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
+LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
+LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
+
+build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
+   $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
+
+build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build
+   $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC)
+
+build:
+   @mkdir -p $@
+
+.PHONY: clean
+clean:
+   rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
+   test -d build && rmdir -p build || true
-- 
2.17.1

[dpdk-dev] [PATCH v2 05/37] examples/pthread: convert to pkg-config-based build

[Ciara Power]

From: Kevin Laatz 

Remove references to the old make build system and use pkg-config for
building these examples.

Signed-off-by: Kevin Laatz 
---
 examples/performance-thread/Makefile  | 21 +++
 examples/performance-thread/common/common.mk  |  6 +-
 .../performance-thread/l3fwd-thread/Makefile  | 47 +++-
 .../performance-thread/pthread_shim/Makefile  | 56 +--
 4 files changed, 83 insertions(+), 47 deletions(-)

diff --git a/examples/performance-thread/Makefile 
b/examples/performance-thread/Makefile
index 08158914c3..ef88722d3c 100644
--- a/examples/performance-thread/Makefile
+++ b/examples/performance-thread/Makefile
@@ -1,21 +1,14 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Intel Corporation
+# Copyright(c) 2015-2020 Intel Corporation
 
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a 
.config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard 
$(RTE_SDK)/*/.config)
+subdirs := l3fwd-thread pthread_shim
 
-include $(RTE_SDK)/mk/rte.vars.mk
+.PHONY: all static shared clean $(subdirs)
+all static shared clean: $(subdirs)
 
-ifeq ($(filter y,$(CONFIG_RTE_ARCH_X86_64) $(CONFIG_RTE_ARCH_ARM64)),)
+ifeq ($(filter $(shell uname -m),x86_64 arm64),)
 $(error This application is only supported for x86_64 and arm64 targets)
 endif
 
-DIRS-y += l3fwd-thread
-DIRS-y += pthread_shim
-
-
-include $(RTE_SDK)/mk/rte.extsubdir.mk
+$(subdirs):
+   $(MAKE) -C $@ $(MAKECMDGOALS)
diff --git a/examples/performance-thread/common/common.mk 
b/examples/performance-thread/common/common.mk
index 5e2b18a9ff..a33e2ab038 100644
--- a/examples/performance-thread/common/common.mk
+++ b/examples/performance-thread/common/common.mk
@@ -8,9 +8,9 @@
 
 MKFILE_PATH=$(abspath $(dir $(lastword $(MAKEFILE_LIST
 
-ifeq ($(CONFIG_RTE_ARCH_X86_64),y)
+ifeq ($(shell uname -m),x86_64)
 ARCH_PATH += $(MKFILE_PATH)/arch/x86
-else ifeq ($(CONFIG_RTE_ARCH_ARM64),y)
+else ifeq ($(shell uname -m),arm64)
 ARCH_PATH += $(MKFILE_PATH)/arch/arm64
 endif
 
@@ -18,4 +18,4 @@ VPATH := $(MKFILE_PATH) $(ARCH_PATH)
 
 SRCS-y += lthread.c lthread_sched.c lthread_cond.c lthread_tls.c 
lthread_mutex.c lthread_diag.c ctx.c
 
-INCLUDES += -I$(MKFILE_PATH) -I$(ARCH_PATH)
+CFLAGS += -I$(MKFILE_PATH) -I$(ARCH_PATH)
diff --git a/examples/performance-thread/l3fwd-thread/Makefile 
b/examples/performance-thread/l3fwd-thread/Makefile
index c6cf05a438..ca1a5d087e 100644
--- a/examples/performance-thread/l3fwd-thread/Makefile
+++ b/examples/performance-thread/l3fwd-thread/Makefile
@@ -1,14 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2015 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a 
.config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard 
$(RTE_SDK)/*/.config)
-
-include $(RTE_SDK)/mk/rte.vars.mk
+# Copyright(c) 2010-2020 Intel Corporation
 
 # binary name
 APP = l3fwd-thread
@@ -16,9 +7,39 @@ APP = l3fwd-thread
 # all source are stored in SRCS-y
 SRCS-y := main.c
 
-include $(RTE_SDK)/examples/performance-thread/common/common.mk
+include ../common/common.mk
 
-CFLAGS += -O3 -g $(USER_FLAGS) $(INCLUDES) $(WERROR_FLAGS)
 CFLAGS += -DALLOW_EXPERIMENTAL_API
 
-include $(RTE_SDK)/mk/rte.extapp.mk
+# Build using pkg-config variables if possible
+ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
+$(error "no installation of DPDK found")
+endif
+
+all: shared
+.PHONY: shared static
+shared: build/$(APP)-shared
+   ln -sf $(APP)-shared build/$(APP)
+static: build/$(APP)-static
+   ln -sf $(APP)-static build/$(APP)
+
+PKGCONF ?= pkg-config
+
+PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
+LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
+LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
+
+build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
+   $(CC) $(CFLAGS) $(filter %.c,$^) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
+
+build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build
+   $(CC) $(CFLAGS) $(filter %.c,$^) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
+
+build:
+   @mkdir -p $@
+
+.PHONY: clean
+clean:
+   rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
+   test -d build && rmdir -p build || true
diff --git a/examples/performance-thread/pthread_shim/Makefile 
b/examples/performance-thread/pthread_shim/Makefile
index cdadf2cb77..6b19ff63fe 100644
--- a/examples/performance-thread/pthread_shim/Makefile
+++ b/examples/performance-thread/pthread_shim/Makefile
@@ -1,33 +1,55 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path

[dpdk-dev] [PATCH v2 06/37] examples/vm_power_manager: convert to use DPDK pkg-config

[Ciara Power]

From: Bruce Richardson 

Convert the build of the vm_power_manager app over to use DPDK from
pkg-config rather than using RTE_SDK/RTE_TARGET.

Signed-off-by: Bruce Richardson 
---
 examples/vm_power_manager/Makefile | 74 ++
 1 file changed, 35 insertions(+), 39 deletions(-)

diff --git a/examples/vm_power_manager/Makefile 
b/examples/vm_power_manager/Makefile
index 65c2ad179e..87b9744d8c 100644
--- a/examples/vm_power_manager/Makefile
+++ b/examples/vm_power_manager/Makefile
@@ -1,65 +1,61 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
+# Copyright(c) 2010-2020 Intel Corporation
 
-ifneq ($(shell pkg-config --atleast-version=0.9.3 libvirt; echo $$?), 0)
-$(error vm_power_manager requires libvirt >= 0.9.3)
-else
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
+# Build using pkg-config variables if possible
+ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
+$(error "no installation of DPDK found")
 endif
 
-# Default target, detect a build directory, by looking for a path with a 
.config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard 
$(RTE_SDK)/*/.config)
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
 # binary name
 APP = vm_power_mgr
 
 # all source are stored in SRCS-y
 SRCS-y := main.c vm_power_cli.c power_manager.c channel_manager.c
 SRCS-y += channel_monitor.c parse.c
-ifeq ($(CONFIG_RTE_ARCH_X86_64),y)
+ifeq ($(shell uname -m),x86_64)
 SRCS-y += oob_monitor_x86.c
 else
 SRCS-y += oob_monitor_nop.c
 endif
 
-CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -DALLOW_EXPERIMENTAL_API
+all: shared
+.PHONY: shared static
+shared: build/$(APP)-shared
+   ln -sf $(APP)-shared build/$(APP)
+static: build/$(APP)-static
+   ln -sf $(APP)-static build/$(APP)
 
-LDLIBS += -lvirt
+PKGCONF ?= pkg-config
 
-JANSSON := $(shell pkg-config --exists jansson; echo $$?)
-ifeq ($(JANSSON), 0)
-LDLIBS += $(shell pkg-config --libs jansson)
-CFLAGS += -DUSE_JANSSON
-endif
+PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
+LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
+LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
 
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
-
-ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)
-LDLIBS += -lrte_pmd_ixgbe
+ifneq ($(shell $(PKGCONF) --atleast-version=0.9.3 libvirt; echo $$?), 0)
+$(error vm_power_manager requires libvirt >= 0.9.3)
 endif
+LDFLAGS += $(shell $(PKGCONF) --libs libvirt)
 
-ifeq ($(CONFIG_RTE_LIBRTE_I40E_PMD),y)
-LDLIBS += -lrte_pmd_i40e
+JANSSON := $(shell $(PKGCONF) --exists jansson; echo $$?)
+ifeq ($(JANSSON), 0)
+LDFLAGS += $(shell $(PKGCONF) --libs jansson)
+CFLAGS += -DUSE_JANSSON
 endif
 
-ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD),y)
-LDLIBS += -lrte_pmd_bnxt
-endif
+# for shared library builds, we need to explicitly link these PMDs
+LDFLAGS_SHARED += -lrte_pmd_ixgbe -lrte_pmd_i40e -lrte_pmd_bnxt
 
-endif
+build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
+   $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
 
-# workaround for a gcc bug with noreturn attribute
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-CFLAGS_main.o += -Wno-return-type
-endif
+build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build
+   $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC)
 
-include $(RTE_SDK)/mk/rte.extapp.mk
+build:
+   @mkdir -p $@
 
-endif # libvirt check
+.PHONY: clean
+clean:
+   rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
+   test -d build && rmdir -p build || true
-- 
2.17.1

[dpdk-dev] [PATCH v2 07/37] examples/vm_power_manager: convert guest cli to pkg-config

[Ciara Power]

From: Bruce Richardson 

Convert the makefile for the vm_power_manager/guest_cli utility to build
using pkg-config rather than the old build system.

Signed-off-by: Bruce Richardson 
---
 examples/vm_power_manager/guest_cli/Makefile | 50 
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/examples/vm_power_manager/guest_cli/Makefile 
b/examples/vm_power_manager/guest_cli/Makefile
index 67cf081936..b84deec574 100644
--- a/examples/vm_power_manager/guest_cli/Makefile
+++ b/examples/vm_power_manager/guest_cli/Makefile
@@ -1,14 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a 
.config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard 
$(RTE_SDK)/*/.config)
-
-include $(RTE_SDK)/mk/rte.vars.mk
+# Copyright(c) 2010-2020 Intel Corporation
 
 # binary name
 APP = guest_vm_power_mgr
@@ -16,14 +7,35 @@ APP = guest_vm_power_mgr
 # all source are stored in SRCS-y
 SRCS-y := main.c vm_power_cli_guest.c parse.c
 
-CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-# workaround for a gcc bug with noreturn attribute
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-CFLAGS_main.o += -Wno-return-type
+# Build using pkg-config variables if possible
+ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
+$(error "no installation of DPDK found")
 endif
 
-include $(RTE_SDK)/mk/rte.extapp.mk
+all: shared
+.PHONY: shared static
+shared: build/$(APP)-shared
+   ln -sf $(APP)-shared build/$(APP)
+static: build/$(APP)-static
+   ln -sf $(APP)-static build/$(APP)
+
+PKGCONF ?= pkg-config
+
+PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
+LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
+LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
+
+build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
+   $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
+
+build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build
+   $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC)
+
+build:
+   @mkdir -p $@
+
+.PHONY: clean
+clean:
+   rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
+   test -d build && rmdir -p build || true
-- 
2.17.1

[dpdk-dev] [PATCH v2 08/37] examples/ethtool: convert to pkg-config-based build

[Ciara Power]

From: Bruce Richardson 

Remove references to the old DPDK build system from the makefiles, and use
pkg-config provided flags instead.

Signed-off-by: Bruce Richardson 
---
 examples/ethtool/Makefile | 26 +++
 examples/ethtool/ethtool-app/Makefile | 56 +++-
 examples/ethtool/lib/Makefile | 62 ---
 3 files changed, 79 insertions(+), 65 deletions(-)

diff --git a/examples/ethtool/Makefile b/examples/ethtool/Makefile
index d3b97bb50b..a1a80c44e6 100644
--- a/examples/ethtool/Makefile
+++ b/examples/ethtool/Makefile
@@ -1,23 +1,11 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Intel Corporation
+# Copyright(c) 2015-2020 Intel Corporation
 
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
+subdirs := lib ethtool-app
 
-# Default target, detect a build directory, by looking for a path with a 
.config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard 
$(RTE_SDK)/*/.config)
+.PHONY: all static shared clean $(subdirs)
+all static shared clean: $(subdirs)
 
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-$(info This application can only operate in a linux environment, \
-please change the definition of the RTE_TARGET environment variable)
-else
-
-DIRS-y += lib ethtool-app
-endif
-
-DEPDIRS-ethtool-app := lib
-
-include $(RTE_SDK)/mk/rte.extsubdir.mk
+ethtool-app: lib
+$(subdirs):
+   $(MAKE) -C $@ $(MAKECMDGOALS)
diff --git a/examples/ethtool/ethtool-app/Makefile 
b/examples/ethtool/ethtool-app/Makefile
index 20ac0d3240..5ebeb200a8 100644
--- a/examples/ethtool/ethtool-app/Makefile
+++ b/examples/ethtool/ethtool-app/Makefile
@@ -1,14 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a 
.config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard 
$(RTE_SDK)/*/.config)
-
-include $(RTE_SDK)/mk/rte.vars.mk
+# Copyright(c) 2010-2020 Intel Corporation
 
 # binary name
 APP = ethtool
@@ -16,17 +7,40 @@ APP = ethtool
 # all source are stored in SRCS-y
 SRCS-y := main.c ethapp.c
 
-CFLAGS += -O3 -pthread -I$(SRCDIR)/../lib
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-LDLIBS += -L$(subst ethtool-app,lib,$(RTE_OUTPUT))/lib
-LDLIBS += -lrte_ethtool
+CFLAGS += -I../lib
+LDFLAGS += -L../lib/build
+LDFLAGS_STATIC = -l:librte_ethtool.a
+LDFLAGS_SHARED = -lrte_ethtool
 
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
-ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)
-LDLIBS += -lrte_pmd_ixgbe
-endif
+# Build using pkg-config variables if possible
+ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
+$(error "no installation of DPDK found")
 endif
 
-include $(RTE_SDK)/mk/rte.extapp.mk
+all: shared
+.PHONY: shared static
+shared: build/$(APP)-shared
+   ln -sf $(APP)-shared build/$(APP)
+static: build/$(APP)-static
+   ln -sf $(APP)-static build/$(APP)
+
+PKGCONF ?= pkg-config
+
+PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
+LDFLAGS_SHARED += $(shell $(PKGCONF) --libs libdpdk)
+LDFLAGS_STATIC += $(shell $(PKGCONF) --static --libs libdpdk)
+
+build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
+   $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
+
+build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build
+   $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC)
+
+build:
+   @mkdir -p $@
+
+.PHONY: clean
+clean:
+   rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
+   test -d build && rmdir -p build || true
diff --git a/examples/ethtool/lib/Makefile b/examples/ethtool/lib/Makefile
index 6494741270..3bc2b9d8ba 100644
--- a/examples/ethtool/lib/Makefile
+++ b/examples/ethtool/lib/Makefile
@@ -1,37 +1,49 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Intel Corporation
+# Copyright(c) 2015-2020 Intel Corporation
 
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a 
.config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard 
$(RTE_SDK)/*/.config)
 
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-$(error This application can only operate in a linux environment, \
-please change the definition of the RTE_TARGET environment variable)
+ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
+$(error "no installation of DPDK found")
+endif
+ifneq ($(shell uname),Linux)
+$(error This application can only operate in a linux environment)
 endif
 
-# library name
-LIB = librte_ethtool.a
-
-LIBABIVER := 0.1
+PKGCONF ?= pkg-config
 
-# all source are stored in SRC-Y
-SRCS-y := rte_ethtool.c
+# library name
+LIB = librte_ethtool.so
+LIB_STATIC = librte_ethtool

[dpdk-dev] [PATCH v2 09/37] build: create dummy Makefile

[Ciara Power]

From: Bruce Richardson 

This patch modifies the root Makefile to act as a dummy Makefile for
when the make support is removed from DPDK in subsequent patches.

Signed-off-by: Bruce Richardson 
---
 Makefile | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 571277aa5a..4a9c17a9de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
+# Copyright(c) 2010-2020 Intel Corporation
 
-.error Error please compile using GNU Make (gmake)
+.PHONY: all
+all:
+   @echo "To build DPDK please use meson and ninja as described at"
+   @echo "https://core.dpdk.org/doc/quick-start/";
-- 
2.17.1

[dpdk-dev] [PATCH v2 11/37] config: remove all config files used by make

[Ciara Power]

Make is not supported for compiling DPDK, the config files are no
longer needed.

Signed-off-by: Ciara Power 
---
 config/common_armv8a_linux|   43 -
 config/common_base| 1154 -
 config/common_freebsd |   15 -
 config/common_linux   |   68 -
 config/defconfig_arm-armv7a-linux-gcc |1 -
 config/defconfig_arm-armv7a-linuxapp-gcc  |   49 -
 config/defconfig_arm64-armada-linux-gcc   |1 -
 config/defconfig_arm64-armada-linuxapp-gcc|   41 -
 config/defconfig_arm64-armv8a-linux-clang |1 -
 config/defconfig_arm64-armv8a-linux-gcc   |1 -
 config/defconfig_arm64-armv8a-linuxapp-clang  |8 -
 config/defconfig_arm64-armv8a-linuxapp-gcc|9 -
 config/defconfig_arm64-bluefield-linux-gcc|1 -
 config/defconfig_arm64-bluefield-linuxapp-gcc |   18 -
 config/defconfig_arm64-dpaa-linux-gcc |1 -
 config/defconfig_arm64-dpaa-linuxapp-gcc  |   31 -
 config/defconfig_arm64-emag-linux-gcc |1 -
 config/defconfig_arm64-emag-linuxapp-gcc  |   11 -
 config/defconfig_arm64-n1sdp-linux-gcc|1 -
 config/defconfig_arm64-n1sdp-linuxapp-gcc |   14 -
 config/defconfig_arm64-octeontx2-linux-gcc|1 -
 config/defconfig_arm64-octeontx2-linuxapp-gcc |   18 -
 config/defconfig_arm64-stingray-linux-gcc |1 -
 config/defconfig_arm64-stingray-linuxapp-gcc  |   14 -
 config/defconfig_arm64-thunderx-linux-gcc |1 -
 config/defconfig_arm64-thunderx-linuxapp-gcc  |   17 -
 config/defconfig_arm64-thunderx2-linux-gcc|1 -
 config/defconfig_arm64-thunderx2-linuxapp-gcc |   12 -
 config/defconfig_arm64-xgene1-linux-gcc   |1 -
 config/defconfig_arm64-xgene1-linuxapp-gcc|8 -
 config/defconfig_i686-native-linux-gcc|1 -
 config/defconfig_i686-native-linux-icc|1 -
 config/defconfig_i686-native-linuxapp-gcc |   66 -
 config/defconfig_i686-native-linuxapp-icc |   66 -
 config/defconfig_ppc_64-power8-linux-gcc  |1 -
 config/defconfig_ppc_64-power8-linuxapp-gcc   |   35 -
 config/defconfig_x86_64-native-bsdapp-clang   |   14 -
 config/defconfig_x86_64-native-bsdapp-gcc |   14 -
 config/defconfig_x86_64-native-freebsd-clang  |1 -
 config/defconfig_x86_64-native-freebsd-gcc|1 -
 config/defconfig_x86_64-native-linux-clang|1 -
 config/defconfig_x86_64-native-linux-gcc  |1 -
 config/defconfig_x86_64-native-linux-icc  |1 -
 config/defconfig_x86_64-native-linuxapp-clang |   14 -
 config/defconfig_x86_64-native-linuxapp-gcc   |   14 -
 config/defconfig_x86_64-native-linuxapp-icc   |   29 -
 config/defconfig_x86_x32-native-linux-gcc |1 -
 config/defconfig_x86_x32-native-linuxapp-gcc  |   46 -
 48 files changed, 1850 deletions(-)
 delete mode 100644 config/common_armv8a_linux
 delete mode 100644 config/common_base
 delete mode 100644 config/common_freebsd
 delete mode 100644 config/common_linux
 delete mode 12 config/defconfig_arm-armv7a-linux-gcc
 delete mode 100644 config/defconfig_arm-armv7a-linuxapp-gcc
 delete mode 12 config/defconfig_arm64-armada-linux-gcc
 delete mode 100644 config/defconfig_arm64-armada-linuxapp-gcc
 delete mode 12 config/defconfig_arm64-armv8a-linux-clang
 delete mode 12 config/defconfig_arm64-armv8a-linux-gcc
 delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-clang
 delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-gcc
 delete mode 12 config/defconfig_arm64-bluefield-linux-gcc
 delete mode 100644 config/defconfig_arm64-bluefield-linuxapp-gcc
 delete mode 12 config/defconfig_arm64-dpaa-linux-gcc
 delete mode 100644 config/defconfig_arm64-dpaa-linuxapp-gcc
 delete mode 12 config/defconfig_arm64-emag-linux-gcc
 delete mode 100644 config/defconfig_arm64-emag-linuxapp-gcc
 delete mode 12 config/defconfig_arm64-n1sdp-linux-gcc
 delete mode 100644 config/defconfig_arm64-n1sdp-linuxapp-gcc
 delete mode 12 config/defconfig_arm64-octeontx2-linux-gcc
 delete mode 100644 config/defconfig_arm64-octeontx2-linuxapp-gcc
 delete mode 12 config/defconfig_arm64-stingray-linux-gcc
 delete mode 100644 config/defconfig_arm64-stingray-linuxapp-gcc
 delete mode 12 config/defconfig_arm64-thunderx-linux-gcc
 delete mode 100644 config/defconfig_arm64-thunderx-linuxapp-gcc
 delete mode 12 config/defconfig_arm64-thunderx2-linux-gcc
 delete mode 100644 config/defconfig_arm64-thunderx2-linuxapp-gcc
 delete mode 12 config/defconfig_arm64-xgene1-linux-gcc
 delete mode 100644 config/defconfig_arm64-xgene1-linuxapp-gcc
 delete mode 12 config/defconfig_i686-native-linux-gcc
 delete mode 12 config/defconfig_i686-native-linux-icc
 delete mode 100644 config/defconfig_i686-native-linuxapp-gcc
 delete mode 100644 config/defconfig_i686-native-linuxapp-icc
 delete mode 12 config/defconfig_ppc_64-power8-linux-gcc
 delete mode 100644 config/defconfig_ppc_64-power8-linuxap

[dpdk-dev] [PATCH v2 13/37] buildtools: remove all scripts for use with make

[Ciara Power]

Make is no longer supported for compiling DPDK, scripts used with make
are no longer needed.

Signed-off-by: Ciara Power 
---
 MAINTAINERS |   4 --
 buildtools/auto-config-h.sh | 108 
 buildtools/gen-build-mk.sh  |  23 
 buildtools/gen-config-h.sh  |  15 -
 buildtools/relpath.sh   |  76 -
 5 files changed, 226 deletions(-)
 delete mode 100755 buildtools/auto-config-h.sh
 delete mode 100755 buildtools/gen-build-mk.sh
 delete mode 100755 buildtools/gen-config-h.sh
 delete mode 100755 buildtools/relpath.sh

diff --git a/MAINTAINERS b/MAINTAINERS
index ccaecabea0..392150fc3b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -102,10 +102,6 @@ Build System
 M: Thomas Monjalon 
 F: Makefile
 F: config/
-F: buildtools/auto-config-h.sh
-F: buildtools/gen-build-mk.sh
-F: buildtools/gen-config-h.sh
-F: buildtools/relpath.sh
 F: doc/build-sdk-quick.txt
 F: doc/guides/prog_guide/build_app.rst
 F: doc/guides/prog_guide/dev_kit_*
diff --git a/buildtools/auto-config-h.sh b/buildtools/auto-config-h.sh
deleted file mode 100755
index 5b613c35fc..00
--- a/buildtools/auto-config-h.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2014-2015 6WIND S.A.
-#
-# Crude script to detect whether particular types, macros and functions are
-# defined by trying to compile a file with a given header. Can be used to
-# perform cross-platform checks since the resulting object file is not
-# executed.
-#
-# Set VERBOSE=1 in the environment to display compiler output and errors.
-#
-# CC, CPPFLAGS, CFLAGS, EXTRA_CPPFLAGS and EXTRA_CFLAGS are taken from the
-# environment.
-#
-# AUTO_CONFIG_CFLAGS may append additional CFLAGS without modifying the
-# above variables.
-
-file=${1:?output file name required (config.h)}
-macro=${2:?output macro name required (HAVE_*)}
-include=${3:?include name required (foo.h)}
-type=${4:?object type required (define, enum, type, field, func)}
-name=${5:?define/type/function name required}
-
-: ${CC:=cc}
-
-temp=$(mktemp -t dpdk.${0##*/}.c.XX)
-
-case $type in
-define)
-   code="\
-#ifndef $name
-#error $name not defined
-#endif
-"
-   ;;
-enum)
-   code="\
-long test = $name;
-"
-   ;;
-type)
-   code="\
-$name test;
-"
-   ;;
-field)
-   code="\
-void test(void)
-{
-   ${name%%.*} test_;
-
-   (void)test_.${name#*.};
-}
-"
-   ;;
-func)
-   code="\
-void (*test)() = (void (*)())$name;
-"
-   ;;
-*)
-   unset error
-   : ${error:?unknown object type \"$type\"}
-   exit
-esac
-
-if [ "${VERBOSE}" = 1 ]
-then
-   err=2
-   out=1
-   eol='
-'
-else
-   exec 3> /dev/null ||
-   exit
-   err=3
-   out=3
-   eol=' '
-fi &&
-printf 'Looking for %s %s in %s.%s' \
-   "${name}" "${type}" "${include}" "${eol}" &&
-printf "\
-#include <%s>
-
-%s
-" "$include" "$code" > "${temp}" &&
-if ${CC} ${CPPFLAGS} ${EXTRA_CPPFLAGS} ${CFLAGS} ${EXTRA_CFLAGS} \
-   ${AUTO_CONFIG_CFLAGS} \
-   -xc -c -o ${temp}.o "${temp}" 1>&${out} 2>&${err}
-then
-   rm -f "${temp}" "${temp}.o"
-   printf "\
-#ifndef %s
-#define %s 1
-#endif /* %s */
-
-" "${macro}" "${macro}" "${macro}" >> "${file}" &&
-   printf 'Defining %s.\n' "${macro}"
-else
-   rm -f "${temp}" "${temp}.o"
-   printf "\
-/* %s is not defined. */
-
-" "${macro}" >> "${file}" &&
-   printf 'Not defining %s.\n' "${macro}"
-fi
-
-exit
diff --git a/buildtools/gen-build-mk.sh b/buildtools/gen-build-mk.sh
deleted file mode 100755
index 636920b638..00
--- a/buildtools/gen-build-mk.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-# Auto-generate a Makefile in build directory
-# Args:
-#   $1: path of project src root
-
-echo "# Automatically generated by gen-build-mk.sh"
-echo
-echo "ifdef O"
-echo "ifeq (\"\$(origin O)\", \"command line\")"
-echo "\$(error \"Cannot specify O= as you are already in a build directory\")"
-echo "endif"
-echo "endif"
-echo
-echo "MAKEFLAGS += --no-print-directory"
-echo
-echo "all:"
-echo " @\$(MAKE) -C $1 O=\$(CURDIR)"
-echo
-echo "%::"
-echo " @\$(MAKE) -C $1 O=\$(CURDIR) \$@"
diff --git a/buildtools/gen-config-h.sh b/buildtools/gen-config-h.sh
deleted file mode 100755
index a8c2006339..00
--- a/buildtools/gen-config-h.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-echo "#ifndef __RTE_CONFIG_H"
-echo "#define __RTE_CONFIG_H"
-grep CONFIG_ $1 |
-grep -v '^[ \t]*#' |
-sed 's,CONFIG_\(.*\)=y.*$,#undef \1\
-#define \1 1,' |
-sed 's,CONFIG_\(.*\)=n.*$,#undef \1,' |
-sed 's,CONFIG_\(.*\)=\(.*\)$,#undef \1\
-#define \1 \2,' |
-sed 's,\# CONFIG_\(.*\) is not set$,#undef \1,'
-echo "#endif /* __RTE_CONFIG_H */"
diff --git a/buildtools/relpath.sh b/buildtools/relpath.sh
deleted file mod

[dpdk-dev] [PATCH v2 12/37] examples: remove old build system references

[Ciara Power]

Remove the references to RTE_SDK and RTE_TARGET environment variables from
the build instructions in the comments of the various BPF files, and in
the ipsec-secgw common definition script.

Signed-off-by: Ciara Power 
Signed-off-by: Bruce Richardson 

---

Ask for maintainer to review changes and suggest alternatives to the
values added in replacement of environment variables.
---
 examples/bpf/t2.c|  6 --
 examples/bpf/t3.c| 10 ++
 examples/ipsec-secgw/test/common_defs.sh |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/examples/bpf/t2.c b/examples/bpf/t2.c
index 9878eaf7bd..b9bce746c0 100644
--- a/examples/bpf/t2.c
+++ b/examples/bpf/t2.c
@@ -9,8 +9,10 @@
  * (PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED).
  * Doesn't touch contents of packet data.
  * To compile:
- * clang -O2 -I${RTE_SDK}/${RTE_TARGET}/include \
- * -target bpf -Wno-int-to-void-pointer-cast -c t2.c
+ * clang -O2 -target bpf -Wno-int-to-void-pointer-cast -c t2.c
+ *
+ * NOTE: if DPDK is not installed system-wide, add compiler flag with path
+ * to DPDK rte_mbuf.h file, e.g. "clang -I/path/to/dpdk/headers -O2 ..."
  */
 
 #include 
diff --git a/examples/bpf/t3.c b/examples/bpf/t3.c
index f58ff64b3b..66faf80cc5 100644
--- a/examples/bpf/t3.c
+++ b/examples/bpf/t3.c
@@ -8,13 +8,15 @@
  * Dump the mbuf into stdout if it is an ARP packet (aka tcpdump 'arp').
  *
  * To compile on x86:
- * clang -O2 -U __GNUC__ -I${RTE_SDK}/${RTE_TARGET}/include \
- * -target bpf -Wno-int-to-void-pointer-cast -c t3.c
+ * clang -O2 -U __GNUC__ -target bpf -Wno-int-to-void-pointer-cast -c t3.c
  *
  * To compile on ARM:
- * clang -O2 -I/usr/include/aarch64-linux-gnu \
- * -I${RTE_SDK}/${RTE_TARGET}/include -target bpf \
+ * clang -O2 -I/usr/include/aarch64-linux-gnu -target bpf \
  * -Wno-int-to-void-pointer-cast -c t3.c
+ *
+ * NOTE: if DPDK is not installed system-wide, add compiler flag with path
+ * to DPDK rte_mbuf.h file to above commands,
+ * e.g. "clang -I/path/to/dpdk/headers -O2 ..."
  */
 
 #include 
diff --git a/examples/ipsec-secgw/test/common_defs.sh 
b/examples/ipsec-secgw/test/common_defs.sh
index df680805b8..f22eb3ab12 100644
--- a/examples/ipsec-secgw/test/common_defs.sh
+++ b/examples/ipsec-secgw/test/common_defs.sh
@@ -34,8 +34,8 @@ LOCAL_IPV4=192.168.31.92
 REMOTE_IPV6=fd12:3456:789a:0031::::0014
 LOCAL_IPV6=fd12:3456:789a:0031::::0092
 
-DPDK_PATH=${RTE_SDK:-${PWD}}
-DPDK_BUILD=${RTE_TARGET:-x86_64-native-linux-gcc}
+DPDK_PATH=${PWD}
+DPDK_BUILD="build"
 DPDK_VARS=""
 
 # by default ipsec-secgw can't deal with multi-segment packets
-- 
2.17.1

[dpdk-dev] [PATCH v2 14/37] devtools: remove use of make in scripts

[Ciara Power]

Make is no longer supported, the test script for make builds is no
longer required. Uses of make in other tool scripts are replaced.

Signed-off-by: Ciara Power 
---
 MAINTAINERS|   1 -
 devtools/build-tags.sh |  14 +-
 devtools/check-includes.sh |   3 +-
 devtools/git-log-fixes.sh  |   2 +-
 devtools/test-build.sh | 315 -
 5 files changed, 4 insertions(+), 331 deletions(-)
 delete mode 100755 devtools/test-build.sh

diff --git a/MAINTAINERS b/MAINTAINERS
index 392150fc3b..0fec96558e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -90,7 +90,6 @@ F: devtools/checkpatches.sh
 F: devtools/get-maintainer.sh
 F: devtools/git-log-fixes.sh
 F: devtools/load-devel-config
-F: devtools/test-build.sh
 F: devtools/test-meson-builds.sh
 F: devtools/words-case.txt
 F: license/
diff --git a/devtools/build-tags.sh b/devtools/build-tags.sh
index 276fff647b..614ce4c3a4 100755
--- a/devtools/build-tags.sh
+++ b/devtools/build-tags.sh
@@ -19,8 +19,8 @@ arm_64=true
 print_usage()
 {
echo "Usage: $(basename $0) [-h] [-v] tags|cscope|gtags|etags [config]"
-   echo "Valid configs are:"
-   make showconfigs | sed 's,^,\t,'
+   echo "Examples of valid configs are: "
+   echo "x86_64-native-linux-gcc, arm64-armv8a-linux-gcc, 
ppc_64-power8-linux-gcc"
 }
 
 # Move to the root of the git tree
@@ -125,17 +125,7 @@ ppc_64_sources()
find_sources "$source_dirs" '*altivec*.[chS]'
 }
 
-check_valid_target()
-{
-   if [ ! -f "config/defconfig_$1" ] ; then
-   echo "Invalid config: $1"
-   print_usage
-   exit 0
-   fi
-}
-
 if [ -n "$2" ]; then
-   check_valid_target $2
 
echo $2 | grep -q "linux" || linux=false
echo $2 | grep -q "bsd" || bsd=false
diff --git a/devtools/check-includes.sh b/devtools/check-includes.sh
index 749b9b26d2..15594f08a3 100755
--- a/devtools/check-includes.sh
+++ b/devtools/check-includes.sh
@@ -17,8 +17,7 @@
 #
 # SUMMARY=1 is the same as -s.
 #
-# CC, CPPFLAGS, CFLAGS, EXTRA_CPPFLAGS, EXTRA_CFLAGS, CXX, CXXFLAGS and
-# EXTRA_CXXFLAGS are taken into account.
+# CC, CPPFLAGS, CFLAGS, CXX, CXXFLAGS are taken into account.
 #
 # PEDANTIC_CFLAGS, PEDANTIC_CXXFLAGS and PEDANTIC_CPPFLAGS provide strict
 # C/C++ compilation flags.
diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh
index 6d468d6731..210c8dcf25 100755
--- a/devtools/git-log-fixes.sh
+++ b/devtools/git-log-fixes.sh
@@ -50,7 +50,7 @@ commit_version () # 
head -n1)
if [ -z "$tag" ] ; then
# before -rc1 tag of release in progress
-   make showversion | cut -d'.' -f-2
+   cat VERSION | cut -d'.' -f-2
else
echo $tag | sed 's,^v,,' | sed 's,-rc.*,,'
fi
diff --git a/devtools/test-build.sh b/devtools/test-build.sh
deleted file mode 100755
index f013656024..00
--- a/devtools/test-build.sh
+++ /dev/null
@@ -1,315 +0,0 @@
-#! /bin/sh -e
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2015 6WIND S.A.
-
-default_path=$PATH
-
-# Load config options:
-# - ARMV8_CRYPTO_LIB_PATH
-# - DPDK_ABI_REF_DIR
-# - DPDK_ABI_REF_VERSION
-# - DPDK_BUILD_TEST_CONFIGS (defconfig1+option1+option2 defconfig2)
-# - DPDK_BUILD_TEST_DIR
-# - DPDK_DEP_ARCHIVE
-# - DPDK_DEP_BPF (y/[n])
-# - DPDK_DEP_CFLAGS
-# - DPDK_DEP_ELF (y/[n])
-# - DPDK_DEP_FDT (y/[n])
-# - DPDK_DEP_ISAL (y/[n])
-# - DPDK_DEP_JSON (y/[n])
-# - DPDK_DEP_LDFLAGS
-# - DPDK_DEP_MLX (y/[n])
-# - DPDK_DEP_NFB (y/[n])
-# - DPDK_DEP_NUMA ([y]/n)
-# - DPDK_DEP_PCAP (y/[n])
-# - DPDK_DEP_SSL (y/[n])
-# - DPDK_DEP_IPSEC_MB (y/[n])
-# - DPDK_DEP_SZE (y/[n])
-# - DPDK_DEP_ZLIB (y/[n])
-# - DPDK_MAKE_JOBS (int)
-# - DPDK_NOTIFY (notify-send)
-# - FLEXRAN_SDK
-# - LIBMUSDK_PATH
-devtools_dir=$(dirname $(readlink -f $0))
-. $devtools_dir/load-devel-config
-
-print_usage () {
-   echo "usage: $(basename $0) [-h] [-jX] [-s] [config1 [config2] ...]]"
-}
-
-print_help () {
-   echo 'Test building several targets with different options'
-   echo
-   print_usage
-   cat <<- END_OF_HELP
-
-   options:
-   -hthis help
-   -jX   use X parallel jobs in "make"
-   -sshort test only first config without tests|examples|doc
-   -vverbose build
-
-   config: defconfig[[~][+]option1[[~][+]option2...]]
-   Example: x86_64-native-linux-gcc+debug~RXTX_CALLBACKS
-   The lowercase options are defined inside $(basename $0).
-   The uppercase options can be the end of a defconfig option
-   to enable if prefixed with '+' or to disable if prefixed with 
'~'.
-   Default is to automatically enable most of the options.
-   The external dependencies are setup with DPDK_DEP_* variables.
-   If no config on command line, DPDK_BUILD_TEST_CONFIGS is used.
-   END_OF_HELP
-}
-
-[ -z $MAKE ] && command -v gmake > /dev/null &&

[dpdk-dev] [PATCH v2 15/37] app/test: remove references to make

[Ciara Power]

Make is no longer supported, RTE_SDK, RTE_TARGET and CONFIG options
are no longer in use.

Signed-off-by: Ciara Power 

---

Ask for maintainer to review changes and suggest alternatives to the
values added in replacement of environment variables.
---
 app/test-bbdev/test-bbdev.py   | 11 +
 app/test/test_cryptodev.c  | 89 +-
 app/test/test_cryptodev_asym.c | 18 ++-
 3 files changed, 28 insertions(+), 90 deletions(-)

diff --git a/app/test-bbdev/test-bbdev.py b/app/test-bbdev/test-bbdev.py
index 5ae2dc6c49..bfd8a4dcc8 100755
--- a/app/test-bbdev/test-bbdev.py
+++ b/app/test-bbdev/test-bbdev.py
@@ -20,15 +20,8 @@ def kill(process):
 print("WARNING: Python 2 is deprecated for use in DPDK, and will not work 
in future releases.", file=sys.stderr)
 print("Please use Python 3 instead", file=sys.stderr)
 
-if "RTE_SDK" in os.environ:
-dpdk_path = os.environ["RTE_SDK"]
-else:
-dpdk_path = "../.."
-
-if "RTE_TARGET" in os.environ:
-dpdk_target = os.environ["RTE_TARGET"]
-else:
-dpdk_target = "x86_64-native-linux-gcc"
+dpdk_path = "../.."
+dpdk_target = "build"
 
 parser = argparse.ArgumentParser(
 description='BBdev Unit Test Application',
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 70bf6fe2c1..153d001194 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -12688,9 +12688,7 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc 
__rte_unused*/)
RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD));
 
if (gbl_driver_id == -1) {
-   RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check that both "
-   "CONFIG_RTE_LIBRTE_PMD_QAT and CONFIG_RTE_LIBRTE_PMD_QAT_SYM "
-   "are enabled in config file to run this testsuite.\n");
+   RTE_LOG(ERR, USER1, "QAT PMD must be loaded.\n");
return TEST_SKIPPED;
}
 
@@ -12704,9 +12702,7 @@ test_cryptodev_virtio(void /*argv __rte_unused, int 
argc __rte_unused*/)
RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));
 
if (gbl_driver_id == -1) {
-   RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded. Check if "
-   "CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO is enabled 
"
-   "in config file to run this testsuite.\n");
+   RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded.\n");
return TEST_FAILED;
}
 
@@ -12720,9 +12716,7 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int 
argc __rte_unused*/)
RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
 
if (gbl_driver_id == -1) {
-   RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check if "
-   "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled "
-   "in config file to run this testsuite.\n");
+   RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n");
return TEST_SKIPPED;
}
 
@@ -12739,9 +12733,7 @@ test_cryptodev_cpu_aesni_mb(void)
RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
 
if (gbl_driver_id == -1) {
-   RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check if "
-   "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled "
-   "in config file to run this testsuite.\n");
+   RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n");
return TEST_SKIPPED;
}
 
@@ -12759,9 +12751,7 @@ test_cryptodev_openssl(void)
RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD));
 
if (gbl_driver_id == -1) {
-   RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check if "
-   "CONFIG_RTE_LIBRTE_PMD_OPENSSL is enabled "
-   "in config file to run this testsuite.\n");
+   RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded.\n");
return TEST_SKIPPED;
}
 
@@ -12775,9 +12765,7 @@ test_cryptodev_aesni_gcm(void)
RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD));
 
if (gbl_driver_id == -1) {
-   RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. Check if "
-   "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is enabled "
-   "in config file to run this testsuite.\n");
+   RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded.\n");
return TEST_SKIPPED;
}
 
@@ -12794,9 +12782,7 @@ test_cryptodev_cpu_aesni_gcm(void)
RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD));
 
if (gbl_driver_id == -1) {
-   RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. Check if "
-   "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is enabled "
-   "in config file to run this testsuite.\n");
+   RTE_LOG(ERR, USER1, "AESNI GCM PMD 

[dpdk-dev] [PATCH v2 17/37] lib: remove references to make config options

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in code comments.

Signed-off-by: Ciara Power 
---
 lib/librte_mempool/rte_mempool.h | 2 +-
 lib/librte_ring/rte_ring_elem.h  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h
index 9e0ee052b3..6ad7e31170 100644
--- a/lib/librte_mempool/rte_mempool.h
+++ b/lib/librte_mempool/rte_mempool.h
@@ -970,7 +970,7 @@ typedef void (rte_mempool_ctor_t)(struct rte_mempool *, 
void *);
  *   If cache_size is non-zero, the rte_mempool library will try to
  *   limit the accesses to the common lockless pool, by maintaining a
  *   per-lcore object cache. This argument must be lower or equal to
- *   CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE and n / 1.5. It is advised to choose
+ *   RTE_MEMPOOL_CACHE_MAX_SIZE and n / 1.5. It is advised to choose
  *   cache_size to have "n modulo cache_size == 0": if this is
  *   not the case, some elements will always stay in the pool and will
  *   never be used. The access to the per-lcore table is of course
diff --git a/lib/librte_ring/rte_ring_elem.h b/lib/librte_ring/rte_ring_elem.h
index 69dc51746c..938b398fc0 100644
--- a/lib/librte_ring/rte_ring_elem.h
+++ b/lib/librte_ring/rte_ring_elem.h
@@ -373,8 +373,7 @@ __rte_ring_dequeue_elems(struct rte_ring *r, uint32_t 
cons_head,
  * (powerpc/arm).
  * There are 2 choices for the users
  * 1.use rmb() memory barrier
- * 2.use one-direction load_acquire/store_release barrier,defined by
- * CONFIG_RTE_USE_C11_MEM_MODEL=y
+ * 2.use one-direction load_acquire/store_release barrier
  * It depends on performance test results.
  * By default, move common functions to rte_ring_generic.h
  */
-- 
2.17.1

[dpdk-dev] [PATCH v2 18/37] doc/guides: remove use of DPDK make build system

[Ciara Power]

From: Bruce Richardson 

When building the DPDK guide documents, the DPDK version information was
pulled using "make showversion", which meant there was a dependency on
the DPDK make-based build system. Change this to have the version info
passed in from meson itself.

Signed-off-by: Bruce Richardson 
---
 buildtools/call-sphinx-build.py | 5 -
 doc/guides/conf.py  | 7 +--
 doc/guides/meson.build  | 3 ++-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py
index 85c9e01563..fa6f26b376 100755
--- a/buildtools/call-sphinx-build.py
+++ b/buildtools/call-sphinx-build.py
@@ -9,7 +9,10 @@
 from subprocess import run, PIPE, STDOUT
 from distutils.version import StrictVersion
 
-(sphinx, src, dst) = sys.argv[1:]  # assign parameters to variables
+(sphinx, version, src, dst) = sys.argv[1:]  # assign parameters to variables
+
+# set the version in environment for sphinx to pick up
+os.environ['DPDK_VERSION'] = version
 
 # for sphinx version >= 1.7 add parallelism using "-j auto"
 ver = run([sphinx, '--version'], stdout=PIPE,
diff --git a/doc/guides/conf.py b/doc/guides/conf.py
index d8fe5cccd7..9ebc26ed3f 100644
--- a/doc/guides/conf.py
+++ b/doc/guides/conf.py
@@ -2,7 +2,6 @@
 # Copyright(c) 2010-2015 Intel Corporation
 
 from __future__ import print_function
-import subprocess
 from docutils import nodes
 from distutils.version import LooseVersion
 from sphinx import __version__ as sphinx_version
@@ -38,11 +37,7 @@
 html_show_copyright = False
 highlight_language = 'none'
 
-# If MAKEFLAGS is exported by the user, garbage text might end up in version
-version = subprocess.check_output(['make', '-sRrC', '../../', 'showversion'],
-  env=dict(environ, MAKEFLAGS=""))
-version = version.decode('utf-8').rstrip()
-release = version
+release = environ['DPDK_VERSION']
 
 master_doc = 'index'
 
diff --git a/doc/guides/meson.build b/doc/guides/meson.build
index 732e7ad3a9..daab139c4e 100644
--- a/doc/guides/meson.build
+++ b/doc/guides/meson.build
@@ -11,7 +11,8 @@ htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk')
 html_guides = custom_target('html_guides',
input: files('index.rst'),
output: 'html',
-   command: [sphinx_wrapper, sphinx, meson.current_source_dir(), 
meson.current_build_dir()],
+   command: [sphinx_wrapper, sphinx, meson.project_version(),
+   meson.current_source_dir(), meson.current_build_dir()],
depfile: '.html.d',
build_by_default: get_option('enable_docs'),
install: get_option('enable_docs'),
-- 
2.17.1

[dpdk-dev] [PATCH v2 16/37] drivers: remove references to make config options

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in code comments.

Signed-off-by: Ciara Power 
---
 drivers/bus/pci/linux/pci_vfio.c | 1 -
 drivers/net/i40e/i40e_rxtx.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index 07e072e13f..c15ed3bade 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -34,7 +34,6 @@
  * This code tries to determine if the PCI device is bound to VFIO driver,
  * and initialize it (map BARs, set up interrupts) if that's the case.
  *
- * This file is only compiled if CONFIG_RTE_EAL_VFIO is set to "y".
  */
 
 #ifdef VFIO_PRESENT
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index fe7f9200c1..60b33d20a1 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -3438,7 +3438,6 @@ i40e_set_default_pctype_table(struct rte_eth_dev *dev)
 }
 
 #ifndef RTE_LIBRTE_I40E_INC_VECTOR
-/* Stubs needed for linkage when CONFIG_RTE_LIBRTE_I40E_INC_VECTOR is set to 
'n' */
 int
 i40e_rx_vec_dev_conf_condition_check(struct rte_eth_dev __rte_unused *dev)
 {
-- 
2.17.1

[dpdk-dev] [PATCH v2 21/37] doc: remove references to make in compressdev guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Reviewed-by: Kevin Laatz 
Signed-off-by: Ciara Power 
---
 doc/guides/compressdevs/isal.rst |  4 
 doc/guides/compressdevs/octeontx.rst | 24 ++--
 doc/guides/compressdevs/zlib.rst |  4 
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/doc/guides/compressdevs/isal.rst b/doc/guides/compressdevs/isal.rst
index af1f41f240..1d146fb4a6 100644
--- a/doc/guides/compressdevs/isal.rst
+++ b/doc/guides/compressdevs/isal.rst
@@ -133,10 +133,6 @@ Installation
 Initialization
 --
 
-In order to enable this virtual compression PMD, user must:
-
-* Set ``CONFIG_RTE_LIBRTE_PMD_ISAL=y`` in config/common_base.
-
 To use the PMD in an application, user must:
 
 * Call ``rte_vdev_init("compress_isal")`` within the application.
diff --git a/doc/guides/compressdevs/octeontx.rst 
b/doc/guides/compressdevs/octeontx.rst
index 5924ad1fa3..8c658721b9 100644
--- a/doc/guides/compressdevs/octeontx.rst
+++ b/doc/guides/compressdevs/octeontx.rst
@@ -56,21 +56,6 @@ Steps To Setup Platform
 
SDK and related information can be obtained from: `Cavium support site 
`_.
 
-Installation
-
-
-Driver Compilation
-~~
-
-To compile the OCTEON TX ZIP PMD for Linux arm64 gcc target, run the
-following ``make`` command:
-
-   .. code-block:: console
-
-  cd 
-  make config T=arm64-thunderx-linux-gcc install
-
-
 Initialization
 --
 
@@ -96,10 +81,5 @@ probed. To use the PMD in an application, user must:
.. code-block:: console
 
   reserve enough huge pages
-  cd to the top-level DPDK directory
-  export RTE_TARGET=arm64-thunderx-linux-gcc
-  export RTE_SDK=`pwd`
-  cd to app/test
-  type the command "make" to compile
-  run the tests with "./test"
-  type the command "compressdev_autotest" to test
+  cd to 
+  meson test compressdev_autotest
diff --git a/doc/guides/compressdevs/zlib.rst b/doc/guides/compressdevs/zlib.rst
index 986c59d43b..6e397ecd7e 100644
--- a/doc/guides/compressdevs/zlib.rst
+++ b/doc/guides/compressdevs/zlib.rst
@@ -53,10 +53,6 @@ Installation
 Initialization
 --
 
-In order to enable this virtual compression PMD, user must:
-
-* Set ``CONFIG_RTE_LIBRTE_PMD_ZLIB=y`` in config/common_base.
-
 To use the PMD in an application, user must:
 
 * Call ``rte_vdev_init("compress_zlib")`` within the application.
-- 
2.17.1

[dpdk-dev] [PATCH v2 19/37] doc: remove deprecation notice for make

[Ciara Power]

The deprecation notice for make can now be removed as this patchset
removes the make build system.

Signed-off-by: Ciara Power 
---
 doc/guides/rel_notes/deprecation.rst | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/doc/guides/rel_notes/deprecation.rst 
b/doc/guides/rel_notes/deprecation.rst
index 345c38d5b6..279eccb04a 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -11,13 +11,6 @@ here.
 Deprecation Notices
 ---
 
-* make: Support for building DPDK with "make" has been deprecated and
-  support will be removed in the 20.11 release. From 20.11 onwards, DPDK
-  should be built using meson and ninja. For basic instructions see the
-  `Quick-start Guide `_ on the
-  website or the `Getting Started Guide
-  `_ document.
-
 * meson: The minimum supported version of meson for configuring and building
   DPDK will be increased to v0.47.1 (from 0.41) from DPDK 19.05 onwards. For
   those users with a version earlier than 0.47.1, an updated copy of meson
-- 
2.17.1

[dpdk-dev] [PATCH v2 20/37] doc: remove references to make in bbdev guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Reviewed-by: Kevin Laatz 
Signed-off-by: Ciara Power 
---
 doc/guides/bbdevs/fpga_5gnr_fec.rst |  7 ++-
 doc/guides/bbdevs/fpga_lte_fec.rst  |  7 ++-
 doc/guides/bbdevs/turbo_sw.rst  | 15 ---
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/doc/guides/bbdevs/fpga_5gnr_fec.rst 
b/doc/guides/bbdevs/fpga_5gnr_fec.rst
index 6760391e8c..8e00c4ef22 100644
--- a/doc/guides/bbdevs/fpga_5gnr_fec.rst
+++ b/doc/guides/bbdevs/fpga_5gnr_fec.rst
@@ -51,10 +51,7 @@ FPGA 5GNR FEC does not support the following:
 Installation
 
 
-Section 3 of the DPDK manual provides instructions on installing and compiling 
DPDK. The
-default set of bbdev compile flags may be found in config/common_base, where 
for example
-the flag to build the FPGA 5GNR FEC device, 
``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC``,
-is already set.
+Section 3 of the DPDK manual provides instructions on installing and compiling 
DPDK.
 
 DPDK requires hugepages to be configured as detailed in section 2 of the DPDK 
manual.
 The bbdev test application has been tested with a configuration 40 x 1GB 
hugepages. The
@@ -94,7 +91,7 @@ the UIO driver by repeating this command for every function.
 .. code-block:: console
 
   cd 
-  insmod ./build/kmod/igb_uio.ko
+  insmod .//kernel/linux/igb_uio/igb_uio.ko
   echo "8086 0d8f" > /sys/bus/pci/drivers/igb_uio/new_id
   lspci -vd8086:0d8f
 
diff --git a/doc/guides/bbdevs/fpga_lte_fec.rst 
b/doc/guides/bbdevs/fpga_lte_fec.rst
index fdc8a76981..14ffa0ee14 100644
--- a/doc/guides/bbdevs/fpga_lte_fec.rst
+++ b/doc/guides/bbdevs/fpga_lte_fec.rst
@@ -50,10 +50,7 @@ FPGA LTE FEC does not support the following:
 Installation
 --
 
-Section 3 of the DPDK manual provides instructions on installing and compiling 
DPDK. The
-default set of bbdev compile flags may be found in config/common_base, where 
for example
-the flag to build the FPGA LTE FEC device, 
``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC``, is already
-set.
+Section 3 of the DPDK manual provides instructions on installing and compiling 
DPDK.
 
 DPDK requires hugepages to be configured as detailed in section 2 of the DPDK 
manual.
 The bbdev test application has been tested with a configuration 40 x 1GB 
hugepages. The
@@ -93,7 +90,7 @@ the UIO driver by repeating this command for every function.
 .. code-block:: console
 
   cd 
-  insmod ./build/kmod/igb_uio.ko
+  insmod .//kernel/linux/igb_uio/igb_uio.ko
   echo "1172 5052" > /sys/bus/pci/drivers/igb_uio/new_id
   lspci -vd1172:
 
diff --git a/doc/guides/bbdevs/turbo_sw.rst b/doc/guides/bbdevs/turbo_sw.rst
index 20620c2e20..3b93157890 100644
--- a/doc/guides/bbdevs/turbo_sw.rst
+++ b/doc/guides/bbdevs/turbo_sw.rst
@@ -12,14 +12,6 @@ Note that the driver can also be built without any 
dependency with reduced
 functionality for maintenance purpose.
 
 To enable linking to the SDK libraries see detailed installation section below.
-Two flags can be enabled depending on whether the target machine can support
-AVX2 and AVX512 instructions sets and the related SDK libraries for vectorized
-signal processing functions are installed :
-- CONFIG_RTE_BBDEV_SDK_AVX2
-- CONFIG_RTE_BBDEV_SDK_AVX512
-By default these 2 flags are disabled by default. For AVX2 machine and SDK
-library installed then the first flag can be enabled. For AVX512 machine and
-SDK library installed then both flags can be enabled for full real time 
capability.
 
 This PMD supports the functions: FEC, Rate Matching and CRC functions detailed
 in the Features section.
@@ -151,13 +143,6 @@ Example:
 export 
FLEXRAN_SDK=/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/install
 export 
DIR_WIRELESS_SDK=/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/
 
-* Set ``CONFIG_RTE_BBDEV_SDK_AVX2=y`` and ``CONFIG_RTE_BBDEV_SDK_AVX512=y``
-  in DPDK common configuration file ``config/common_base`` to be able to use
-  the SDK libraries as mentioned above.
-  For AVX2 machine it is possible to only enable CONFIG_RTE_BBDEV_SDK_AVX2
-  for limited 4G functionality.
-  If no flag are set the PMD driver will still build but its capabilities
-  will be limited accordingly.
 
 To use the PMD in an application, user must:
 
-- 
2.17.1

[dpdk-dev] [PATCH v2 22/37] doc: remove references to make in contributing guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Signed-off-by: Ciara Power 
Signed-off-by: Louise Kilheeney 
---
 doc/guides/contributing/coding_style.rst  |  46 +---
 doc/guides/contributing/design.rst| 127 ++
 doc/guides/contributing/documentation.rst |  31 +-
 doc/guides/contributing/patches.rst   |  45 
 4 files changed, 18 insertions(+), 231 deletions(-)

diff --git a/doc/guides/contributing/coding_style.rst 
b/doc/guides/contributing/coding_style.rst
index b55075eaa2..dc352d03ca 100644
--- a/doc/guides/contributing/coding_style.rst
+++ b/doc/guides/contributing/coding_style.rst
@@ -773,52 +773,16 @@ The ``pep8`` tool can be used for testing compliance with 
the guidelines.
 Integrating with the Build System
 -
 
-DPDK supports being built in two different ways:
-
-* using ``make`` - or more specifically "GNU make", i.e. ``gmake`` on FreeBSD
-* using the tools ``meson`` and ``ninja``
+DPDK supports being built by using the tools ``meson`` and ``ninja``
 
 Any new library or driver to be integrated into DPDK should support being
-built with both systems. While building using ``make`` is a legacy approach, 
and
-most build-system enhancements are being done using ``meson`` and ``ninja``
-there are no plans at this time to deprecate the legacy ``make`` build system.
+built with this system.
 
-Therefore all new component additions should include both a ``Makefile`` and a
-``meson.build`` file, and should be added to the component lists in both the
-``Makefile`` and ``meson.build`` files in the relevant top-level directory:
+Therefore all new component additions should include a ``meson.build`` file,
+and should be added to the component lists in the ``meson.build`` files in the
+relevant top-level directory:
 either ``lib`` directory or a ``driver`` subdirectory.
 
-Makefile Contents
-~
-
-The ``Makefile`` for the component should be of the following format, where
- corresponds to the name of the library in question, e.g. hash,
-lpm, etc. For drivers, the same format of Makefile is used.
-
-.. code-block:: none
-
-   # pull in basic DPDK definitions, including whether library is to be
-   # built or not
-   include $(RTE_SDK)/mk/rte.vars.mk
-
-   # library name
-   LIB = librte_.a
-
-   # any library cflags needed. Generally add "-O3 $(WERROR_FLAGS)"
-   CFLAGS += -O3
-   CFLAGS += $(WERROR_FLAGS)
-
-   # the symbol version information for the library
-   EXPORT_MAP := rte__version.map
-
-   # all source filenames are stored in SRCS-y
-   SRCS-$(CONFIG_RTE_LIBRTE_) += rte_.c
-
-   # install includes
-   SYMLINK-$(CONFIG_RTE_LIBRTE_)-include += rte_.h
-
-   # pull in rules to build the library
-   include $(RTE_SDK)/mk/rte.lib.mk
 
 Meson Build File Contents - Libraries
 ~
diff --git a/doc/guides/contributing/design.rst 
b/doc/guides/contributing/design.rst
index 5fe7f63942..6ce0de97ac 100644
--- a/doc/guides/contributing/design.rst
+++ b/doc/guides/contributing/design.rst
@@ -21,7 +21,7 @@ A file located in a subdir of "linux" is specific to this 
execution environment.
 
 When absolutely necessary, there are several ways to handle specific code:
 
-* Use a ``#ifdef`` with the CONFIG option in the C code.
+* Use a ``#ifdef`` with a build definition macro in the C code.
   This can be done when the differences are small and they can be embedded in 
the same C file:
 
   .. code-block:: c
@@ -32,30 +32,22 @@ When absolutely necessary, there are several ways to handle 
specific code:
  titi();
  #endif
 
-* Use the CONFIG option in the Makefile. This is done when the differences are 
more significant.
-  In this case, the code is split into two separate files that are 
architecture or environment specific.
-  This should only apply inside the EAL library.
-
-.. note::
-
-   As in the linux kernel, the ``CONFIG_`` prefix is not used in C code.
-   This is only needed in Makefiles or shell scripts.
 
 Per Architecture Sources
 
 
-The following config options can be used:
+The following macro options can be used:
 
-* ``CONFIG_RTE_ARCH`` is a string that contains the name of the architecture.
-* ``CONFIG_RTE_ARCH_I686``, ``CONFIG_RTE_ARCH_X86_64``, 
``CONFIG_RTE_ARCH_X86_64_32`` or ``CONFIG_RTE_ARCH_PPC_64`` are defined only if 
we are building for those architectures.
+* ``RTE_ARCH`` is a string that contains the name of the architecture.
+* ``RTE_ARCH_I686``, ``RTE_ARCH_X86_64``, ``RTE_ARCH_X86_64_32`` or 
``RTE_ARCH_PPC_64`` are defined only if we are building for those architectures.
 
 Per Execution Environment Sources
 ~
 
-The following config options can be used:
+The following macro options can be used:
 
-* ``CONFIG_RTE_EXEC_ENV`` is a string that contains the name of the executive 
environm

[dpdk-dev] [PATCH v2 23/37] doc: remove references to make in cryptodev guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Signed-off-by: Ciara Power 
---
 doc/guides/cryptodevs/aesni_gcm.rst |  4 +-
 doc/guides/cryptodevs/aesni_mb.rst  |  4 +-
 doc/guides/cryptodevs/armv8.rst |  3 --
 doc/guides/cryptodevs/caam_jr.rst   | 30 -
 doc/guides/cryptodevs/ccp.rst   | 14 +++---
 doc/guides/cryptodevs/dpaa2_sec.rst | 25 ---
 doc/guides/cryptodevs/dpaa_sec.rst  | 25 ---
 doc/guides/cryptodevs/kasumi.rst| 11 +
 doc/guides/cryptodevs/mvsam.rst | 10 +
 doc/guides/cryptodevs/nitrox.rst|  7 ---
 doc/guides/cryptodevs/null.rst  |  2 +-
 doc/guides/cryptodevs/octeontx.rst  | 12 +-
 doc/guides/cryptodevs/octeontx2.rst |  8 +---
 doc/guides/cryptodevs/openssl.rst   |  6 +--
 doc/guides/cryptodevs/qat.rst   | 67 +++--
 doc/guides/cryptodevs/scheduler.rst |  8 
 doc/guides/cryptodevs/snow3g.rst| 10 +
 doc/guides/cryptodevs/virtio.rst| 20 +++--
 doc/guides/cryptodevs/zuc.rst   | 10 +
 19 files changed, 40 insertions(+), 236 deletions(-)

diff --git a/doc/guides/cryptodevs/aesni_gcm.rst 
b/doc/guides/cryptodevs/aesni_gcm.rst
index 74e0de63ad..013615e2d0 100644
--- a/doc/guides/cryptodevs/aesni_gcm.rst
+++ b/doc/guides/cryptodevs/aesni_gcm.rst
@@ -96,8 +96,6 @@ In order to enable this virtual crypto PMD, user must:
 
 * Build the multi buffer library (explained in Installation section).
 
-* Set CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=y in config/common_base.
-
 To use the PMD in an application, user must:
 
 * Call rte_vdev_init("crypto_aesni_gcm") within the application.
@@ -117,5 +115,5 @@ Example:
 
 .. code-block:: console
 
-./l2fwd-crypto -l 1 -n 4 
--vdev="crypto_aesni_gcm,socket_id=0,max_nb_sessions=128" \
+./dpdk-l2fwd-crypto -l 1 -n 4 
--vdev="crypto_aesni_gcm,socket_id=0,max_nb_sessions=128" \
 -- -p 1 --cdev SW --chain AEAD --aead_algo "aes-gcm"
diff --git a/doc/guides/cryptodevs/aesni_mb.rst 
b/doc/guides/cryptodevs/aesni_mb.rst
index 15388d20ab..fd533ca65b 100644
--- a/doc/guides/cryptodevs/aesni_mb.rst
+++ b/doc/guides/cryptodevs/aesni_mb.rst
@@ -131,8 +131,6 @@ In order to enable this virtual crypto PMD, user must:
 
 * Build the multi buffer library (explained in Installation section).
 
-* Set CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y in config/common_base.
-
 To use the PMD in an application, user must:
 
 * Call rte_vdev_init("crypto_aesni_mb") within the application.
@@ -152,7 +150,7 @@ Example:
 
 .. code-block:: console
 
-./l2fwd-crypto -l 1 -n 4 
--vdev="crypto_aesni_mb,socket_id=0,max_nb_sessions=128" \
+./dpdk-l2fwd-crypto -l 1 -n 4 
--vdev="crypto_aesni_mb,socket_id=0,max_nb_sessions=128" \
 -- -p 1 --cdev SW --chain CIPHER_HASH --cipher_algo "aes-cbc" --auth_algo 
"sha1-hmac"
 
 Extra notes
diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst
index fee85354ba..d30ef6168e 100644
--- a/doc/guides/cryptodevs/armv8.rst
+++ b/doc/guides/cryptodevs/armv8.rst
@@ -40,9 +40,6 @@ In order to enable this virtual crypto PMD, user must:
 
make -C $ARMV8_CRYPTO_LIB_PATH/
 
-* Set CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=y in
-  config/defconfig_arm64-armv8a-linux-gcc
-
 The corresponding device can be created only if the following features
 are supported by the CPU:
 
diff --git a/doc/guides/cryptodevs/caam_jr.rst 
b/doc/guides/cryptodevs/caam_jr.rst
index 6d9daf7364..5ef33ae78e 100644
--- a/doc/guides/cryptodevs/caam_jr.rst
+++ b/doc/guides/cryptodevs/caam_jr.rst
@@ -109,36 +109,6 @@ Currently supported by DPDK:
 
 * Follow the DPDK :ref:`Getting Started Guide for Linux ` to setup 
the basic DPDK environment.
 
-Pre-Installation Configuration
---
-
-Config File Options
-~~~
-
-The following options can be modified in the ``config`` file
-to enable caam_jr PMD.
-
-Please note that enabling debugging options may affect system performance.
-
-* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR`` (default ``n``)
-  By default it is only enabled in common_linux config.
-  Toggle compilation of the ``librte_pmd_caam_jr`` driver.
-
-* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR_BE`` (default ``n``)
-  By default it is disabled.
-  It can be used when the underlying hardware supports the CAAM in BE mode.
-  LS1043A, LS1046A and LS1012A support CAAM in BE mode.
-  LS1028A supports CAAM in LE mode.
-
-Installations
--
-To compile the caam_jr PMD for Linux arm64 gcc target, run the
-following ``make`` command:
-
-.. code-block:: console
-
-   cd 
-   make config T=arm64-armv8a-linux-gcc install
 
 Enabling logs
 -
diff --git a/doc/guides/cryptodevs/ccp.rst b/doc/guides/cryptodevs/ccp.rst
index a43fe92de9..9ca1979994 100644
--- a/doc/guides/cryptodevs/ccp.rst
+++ b/doc/guides/cryptodevs/ccp.rst
@@ -56,10 +56,8 @@ AEAD algorithms:
 Installation
 
 
-To compile ccp PMD, it has to be enabled in the config/common_base file and 
openssl
-packages have

[dpdk-dev] [PATCH v2 24/37] doc: remove references to make in eventdev guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Reviewed-by: Kevin Laatz 
Signed-off-by: Ciara Power 
---
 doc/guides/eventdevs/dpaa.rst  | 20 
 doc/guides/eventdevs/dpaa2.rst | 20 
 doc/guides/eventdevs/octeontx.rst  | 24 
 doc/guides/eventdevs/octeontx2.rst |  8 
 4 files changed, 72 deletions(-)

diff --git a/doc/guides/eventdevs/dpaa.rst b/doc/guides/eventdevs/dpaa.rst
index be68c6da6f..6fbee91d9e 100644
--- a/doc/guides/eventdevs/dpaa.rst
+++ b/doc/guides/eventdevs/dpaa.rst
@@ -43,26 +43,6 @@ Currently supported by DPDK:
 Pre-Installation Configuration
 --
 
-Config File Options
-~~~
-
-The following options can be modified in the ``config`` file.
-Please note that enabling debugging options may affect system performance.
-
-- ``CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV`` (default ``y``)
-
-  Toggle compilation of the ``librte_pmd_dpaa_event`` driver.
-
-Driver Compilation
-~~
-
-To compile the DPAA EVENTDEV PMD for Linux arm64 gcc target, run the
-following ``make`` command:
-
-.. code-block:: console
-
-   cd 
-   make config T=arm64-dpaa-linux-gcc install
 
 Initialization
 --
diff --git a/doc/guides/eventdevs/dpaa2.rst b/doc/guides/eventdevs/dpaa2.rst
index 835767f98d..b992ae649e 100644
--- a/doc/guides/eventdevs/dpaa2.rst
+++ b/doc/guides/eventdevs/dpaa2.rst
@@ -52,26 +52,6 @@ Currently supported by DPDK:
 Pre-Installation Configuration
 --
 
-Config File Options
-~~~
-
-The following options can be modified in the ``config`` file.
-Please note that enabling debugging options may affect system performance.
-
-- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV`` (default ``y``)
-
-  Toggle compilation of the ``lrte_pmd_dpaa2_event`` driver.
-
-Driver Compilation
-~~
-
-To compile the DPAA2 EVENTDEV PMD for Linux arm64 gcc target, run the
-following ``make`` command:
-
-.. code-block:: console
-
-   cd 
-   make config T=arm64-dpaa-linux-gcc install
 
 Initialization
 --
diff --git a/doc/guides/eventdevs/octeontx.rst 
b/doc/guides/eventdevs/octeontx.rst
index 9a3646db0d..f7a4cdd586 100644
--- a/doc/guides/eventdevs/octeontx.rst
+++ b/doc/guides/eventdevs/octeontx.rst
@@ -41,30 +41,6 @@ Prerequisites
 
 See :doc:`../platform/octeontx` for setup information.
 
-Pre-Installation Configuration
---
-
-Config File Options
-~~~
-
-The following options can be modified in the ``config`` file.
-Please note that enabling debugging options may affect system performance.
-
-- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF`` (default ``y``)
-
-  Toggle compilation of the ``librte_pmd_octeontx_ssovf`` driver.
-
-Driver Compilation
-~~
-
-To compile the OCTEON TX SSOVF PMD for Linux arm64 gcc target, run the
-following ``make`` command:
-
-.. code-block:: console
-
-   cd 
-   make config T=arm64-thunderx-linux-gcc install
-
 
 Initialization
 --
diff --git a/doc/guides/eventdevs/octeontx2.rst 
b/doc/guides/eventdevs/octeontx2.rst
index 6502f6415f..7f9eceb01f 100644
--- a/doc/guides/eventdevs/octeontx2.rst
+++ b/doc/guides/eventdevs/octeontx2.rst
@@ -47,14 +47,6 @@ Prerequisites and Compilation procedure
 Pre-Installation Configuration
 --
 
-Compile time Config Options
-~~~
-
-The following option can be modified in the ``config`` file.
-
-- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV`` (default ``y``)
-
-  Toggle compilation of the ``librte_pmd_octeontx2_event`` driver.
 
 Runtime Config Options
 ~~
-- 
2.17.1

[dpdk-dev] [PATCH v2 25/37] doc: remove references to make in FreeBSD gsg guide

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Acked-by: Bruce Richardson 
Signed-off-by: Ciara Power 
---
 doc/guides/freebsd_gsg/build_dpdk.rst | 2 +-
 doc/guides/freebsd_gsg/intro.rst  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/guides/freebsd_gsg/build_dpdk.rst 
b/doc/guides/freebsd_gsg/build_dpdk.rst
index e31c966b98..1e5a8cfe9e 100644
--- a/doc/guides/freebsd_gsg/build_dpdk.rst
+++ b/doc/guides/freebsd_gsg/build_dpdk.rst
@@ -122,7 +122,7 @@ up time.  This can be achieved by placing lines similar to 
the following into
 
 An error such as::
 
-kldload: can't load ./x86_64-native-freebsd-gcc/kmod/contigmem.ko:
+kldload: can't load .//kernel/freebsd/contigmem.ko:
  Exec format error
 
 is generally attributed to not having enough contiguous memory
diff --git a/doc/guides/freebsd_gsg/intro.rst b/doc/guides/freebsd_gsg/intro.rst
index 63160ce64f..b2e57909ee 100644
--- a/doc/guides/freebsd_gsg/intro.rst
+++ b/doc/guides/freebsd_gsg/intro.rst
@@ -39,8 +39,8 @@ The following is a list of DPDK documents in the suggested 
reading order:
 specifically in a Linux* application (linux) environment
 
 *   The content of the DPDK, the build system (including the commands
-that can be used in the root DPDK Makefile to build the development
-kit and an application) and guidelines for porting an application
+that can be used to build the development kit and an application)
+and guidelines for porting an application
 
 *   Optimizations used in the software and those that should be considered
 for new development
-- 
2.17.1

[dpdk-dev] [PATCH v2 27/37] doc: remove references to make in Linux gsg guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Signed-off-by: Ciara Power 
---
 doc/guides/linux_gsg/build_dpdk.rst   | 84 +++
 doc/guides/linux_gsg/build_sample_apps.rst| 69 +--
 .../linux_gsg/cross_build_dpdk_for_arm64.rst  | 48 +--
 doc/guides/linux_gsg/enable_func.rst  | 13 ++-
 doc/guides/linux_gsg/intro.rst|  2 +-
 doc/guides/linux_gsg/linux_drivers.rst| 18 ++--
 doc/guides/linux_gsg/sys_reqs.rst | 16 +---
 7 files changed, 40 insertions(+), 210 deletions(-)

diff --git a/doc/guides/linux_gsg/build_dpdk.rst 
b/doc/guides/linux_gsg/build_dpdk.rst
index c536e354ef..85d04520bf 100644
--- a/doc/guides/linux_gsg/build_dpdk.rst
+++ b/doc/guides/linux_gsg/build_dpdk.rst
@@ -31,7 +31,7 @@ The DPDK is composed of several directories:
 
 *   examples: Source code of DPDK application examples
 
-*   config, buildtools, mk: Framework-related makefiles, scripts and 
configuration
+*   config, buildtools: Framework-related scripts and configuration
 
 Compiling and Installing DPDK System-wide
 -
@@ -39,11 +39,6 @@ Compiling and Installing DPDK System-wide
 DPDK can be configured, built and installed on your system using the tools
 ``meson`` and ``ninja``.
 
-.. note::
-
-  The older makefile-based build system used in older DPDK releases is
-  still present and its use is described in section
-  `Installation of DPDK Target Environment using Make`_.
 
 DPDK Configuration
 ~~
@@ -81,6 +76,8 @@ and the last step causing the dynamic loader `ld.so` to 
update its cache to take
distributions, `/usr/local/lib` and `/usr/local/lib64` should be added
to a file in `/etc/ld.so.conf.d/` before running `ldconfig`.
 
+.. _adjusting_build_options:
+
 
 Adjusting Build Options
 ~~~
@@ -117,6 +114,9 @@ dependencies are met on the current system are built.
 When `-Dexamples=all` is set as a meson option, meson will check each example 
application to see if it can be built,
 and add all which can be built to the list of tasks in the ninja build 
configuration file.
 
+.. _building_app_using_installed_dpdk:
+
+
 Building Applications Using Installed DPDK
 ~~
 
@@ -140,11 +140,12 @@ and the sources for that build are stored in 
``$(SRCS-y)``.
 
 .. note::
 
-   Unlike with the older make build system, the meson system is not
-   designed to be used directly from a build directory. Instead it is
-   recommended that it be installed either system-wide or to a known
-   location in the user's home directory. The install location can be set
-   using the `--prefix` meson option (default: `/usr/local`).
+   Unlike with the make build system present used in older DPDK releases,
+   the meson system is not designed to be used directly from a build
+   directory. Instead it is recommended that it be installed either
+   system-wide or to a known location in the user's home directory.
+   The install location can be set using the `--prefix` meson option
+   (default: `/usr/local`).
 
 an equivalent build recipe for a simple DPDK application using meson as a
 build system is shown below:
@@ -156,64 +157,3 @@ build system is shown below:
dpdk = dependency('libdpdk')
sources = files('main.c')
executable('dpdk-app', sources, dependencies: dpdk)
-
-
-Installation of DPDK Target Environment using Make
---
-
-.. note::
-
-   The building of DPDK using make will be deprecated in a future release. It
-   is therefore recommended that DPDK installation is done using meson and
-   ninja as described above.
-
-Get a native target environment automatically::
-
-   make defconfig O=mybuild
-
-.. note::
-
-Within the configuration files, the ``RTE_MACHINE`` configuration value is 
set to native,
-which means that the compiled software is tuned for the platform on which 
it is built.
-
-Or get a specific target environment::
-
-   make config T=x86_64-native-linux-gcc O=mybuild
-
-The format of a DPDK target is "ARCH-MACHINE-EXECENV-TOOLCHAIN".
-Available targets can be found with::
-
-   make help
-
-Customize the target configuration in the generated ``.config`` file.
-Example for enabling the pcap PMD::
-
-   sed -ri 's,(PMD_PCAP=).*,\1y,' mybuild/.config
-
-Compile the target::
-
-   make -j4 O=mybuild
-
-.. warning::
-
-Any kernel modules to be used, e.g. ``igb_uio``, ``kni``, must be compiled 
with the
-same kernel as the one running on the target.
-If the DPDK is not being built on the target machine,
-the ``RTE_KERNELDIR`` environment variable should be used to point the 
compilation at a copy of the kernel version to be used on the target machine.
-
-Install the target in a separate directory::
-
-   make install O=mybuild DESTDIR=myinstall prefix=
-
-The environment is ready to build a DPDK application::

[dpdk-dev] [PATCH v2 26/37] doc: remove references to make in howto guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Signed-off-by: Ciara Power 
---
 doc/guides/howto/lm_bond_virtio_sriov.rst |  4 +--
 doc/guides/howto/lm_virtio_vhost_user.rst |  4 +--
 doc/guides/howto/packet_capture_framework.rst | 21 +++
 doc/guides/howto/pvp_reference_benchmark.rst  | 27 +--
 doc/guides/howto/vfd.rst  |  4 +--
 .../virtio_user_for_container_networking.rst  |  2 +-
 6 files changed, 16 insertions(+), 46 deletions(-)

diff --git a/doc/guides/howto/lm_bond_virtio_sriov.rst 
b/doc/guides/howto/lm_bond_virtio_sriov.rst
index 07563b3e24..02ba1cdf5d 100644
--- a/doc/guides/howto/lm_bond_virtio_sriov.rst
+++ b/doc/guides/howto/lm_bond_virtio_sriov.rst
@@ -591,7 +591,7 @@ Set up DPDK in the Virtual Machine
rmmod virtio-pci ixgbevf
 
modprobe uio
-   insmod /root/dpdk/x86_64-default-linux-gcc/kmod/igb_uio.ko
+   insmod /root/dpdk//kernel/linux/igb_uio/igb_uio.ko
 
/root/dpdk/usertools/dpdk-devbind.py -b igb_uio :00:03.0
/root/dpdk/usertools/dpdk-devbind.py -b igb_uio :00:04.0
@@ -613,7 +613,7 @@ Run testpmd in the Virtual Machine.
 
# use for bonding of virtio and vf tests in VM
 
-   /root/dpdk/x86_64-default-linux-gcc/app/testpmd \
+   /root/dpdk//app/dpdk-testpmd \
-l 0-3 -n 4 --socket-mem 350 --  --i --port-topology=chained
 
 .. _lm_bond_virtio_sriov_switch_conf:
diff --git a/doc/guides/howto/lm_virtio_vhost_user.rst 
b/doc/guides/howto/lm_virtio_vhost_user.rst
index ecb7832906..330ff5a9c8 100644
--- a/doc/guides/howto/lm_virtio_vhost_user.rst
+++ b/doc/guides/howto/lm_virtio_vhost_user.rst
@@ -421,7 +421,7 @@ setup_dpdk_virtio_in_vm.sh
rmmod virtio-pci
 
modprobe uio
-   insmod /root/dpdk/x86_64-default-linux-gcc/kmod/igb_uio.ko
+   insmod /root/dpdk//kernel/linux/igb_uio/igb_uio.ko
 
/root/dpdk/usertools/dpdk-devbind.py -b igb_uio :00:03.0
/root/dpdk/usertools/dpdk-devbind.py -b igb_uio :00:04.0
@@ -437,5 +437,5 @@ run_testpmd_in_vm.sh
# Run testpmd for use with vhost_user sample app.
# test system has 8 cpus (0-7), use cpus 2-7 for VM
 
-   /root/dpdk/x86_64-default-linux-gcc/app/testpmd \
+   /root/dpdk//app/dpdk-testpmd \
-l 0-5 -n 4 --socket-mem 350 -- --burst=64 --i
diff --git a/doc/guides/howto/packet_capture_framework.rst 
b/doc/guides/howto/packet_capture_framework.rst
index 946a21c8ed..d457989607 100644
--- a/doc/guides/howto/packet_capture_framework.rst
+++ b/doc/guides/howto/packet_capture_framework.rst
@@ -52,11 +52,7 @@ Some things to note:
   initialization code. Refer to the ``app/test-pmd/testpmd.c`` code and look
   for ``pdump`` keyword to see how this is done.
 
-* The ``dpdk-pdump`` tool depends on the libpcap based PMD which is disabled
-  by default in the build configuration files, owing to an external dependency
-  on the libpcap development files. Once the libpcap development files are
-  installed, the libpcap based PMD can be enabled by setting
-  ``CONFIG_RTE_LIBRTE_PMD_PCAP=y`` and recompiling the DPDK.
+* The ``dpdk-pdump`` tool depends on the libpcap based PMD.
 
 
 Test Environment
@@ -73,17 +69,6 @@ for packet capturing on the DPDK port in
Packet capturing on a DPDK port using the dpdk-pdump tool.
 
 
-Configuration
--
-
-Modify the DPDK primary application to initialize the packet capture framework
-as mentioned in the above notes and enable the following config options and
-build DPDK::
-
- CONFIG_RTE_LIBRTE_PMD_PCAP=y
- CONFIG_RTE_LIBRTE_PDUMP=y
-
-
 Running the Application
 ---
 
@@ -93,11 +78,11 @@ inspect them using ``tcpdump``.
 
 #. Launch testpmd as the primary application::
 
- sudo ./app/testpmd -c 0xf0 -n 4 -- -i --port-topology=chained
+ sudo .//app/dpdk-testpmd -c 0xf0 -n 4 -- -i 
--port-topology=chained
 
 #. Launch the pdump tool as follows::
 
- sudo ./build/app/dpdk-pdump -- \
+ sudo .//app/dpdk-pdump -- \
   --pdump 'port=0,queue=*,rx-dev=/tmp/capture.pcap'
 
 #. Send traffic to dpdk_port0 from traffic generator.
diff --git a/doc/guides/howto/pvp_reference_benchmark.rst 
b/doc/guides/howto/pvp_reference_benchmark.rst
index 64b1f4d8ec..1d4a4b0232 100644
--- a/doc/guides/howto/pvp_reference_benchmark.rst
+++ b/doc/guides/howto/pvp_reference_benchmark.rst
@@ -99,14 +99,7 @@ Build Qemu:
 DPDK build
 ~~
 
-Build DPDK:
-
-   .. code-block:: console
-
-  git clone git://dpdk.org/dpdk
-  cd dpdk
-  export RTE_SDK=$PWD
-  make install T=x86_64-native-linux-gcc DESTDIR=install
+See :doc:`../linux_gsg/build_dpdk` for details.
 
 
 Testpmd launch
@@ -117,7 +110,7 @@ Testpmd launch
.. code-block:: console
 
   modprobe vfio-pci
-  $RTE_SDK/install/sbin/dpdk-devbind -b vfio-pci :11:00.0 :11:00.1
+  ./dpdk/usertools/dpdk-devbind -b vfio-pci :11:00.0 :11:00.1
 
.. Note::
 
@@ -129,7 +122,7 @@ Testpmd launch
 
.. code-block:: console
 
-  $RTE_SDK/ins

[dpdk-dev] [PATCH v2 29/37] doc: remove references to make in NIC guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Signed-off-by: Ciara Power 
---
 doc/guides/nics/ark.rst| 26 -
 doc/guides/nics/atlantic.rst   |  4 --
 doc/guides/nics/axgbe.rst  | 15 
 doc/guides/nics/bnx2x.rst  | 27 -
 doc/guides/nics/bnxt.rst   |  5 +--
 doc/guides/nics/build_and_test.rst |  8 +++-
 doc/guides/nics/cxgbe.rst  | 36 +
 doc/guides/nics/dpaa.rst   | 27 +
 doc/guides/nics/dpaa2.rst  | 26 +
 doc/guides/nics/ena.rst| 16 
 doc/guides/nics/enetc.rst  |  2 -
 doc/guides/nics/enic.rst   |  9 -
 doc/guides/nics/fail_safe.rst  | 20 ++
 doc/guides/nics/features.rst   |  9 -
 doc/guides/nics/fm10k.rst  |  4 --
 doc/guides/nics/hinic.rst  |  9 -
 doc/guides/nics/hns3.rst   | 10 -
 doc/guides/nics/i40e.rst   | 44 ++---
 doc/guides/nics/ice.rst| 25 ++--
 doc/guides/nics/igc.rst| 18 +
 doc/guides/nics/intel_vf.rst   | 13 +--
 doc/guides/nics/ionic.rst  |  8 
 doc/guides/nics/ipn3ke.rst | 12 +-
 doc/guides/nics/kni.rst|  4 +-
 doc/guides/nics/liquidio.rst   | 27 -
 doc/guides/nics/memif.rst  | 10 ++---
 doc/guides/nics/mlx4.rst   | 55 ++
 doc/guides/nics/mlx5.rst   | 62 ++
 doc/guides/nics/mvneta.rst | 36 -
 doc/guides/nics/mvpp2.rst  | 43 -
 doc/guides/nics/nfb.rst| 19 +
 doc/guides/nics/nfp.rst|  4 --
 doc/guides/nics/null.rst   |  6 +--
 doc/guides/nics/octeontx.rst   | 19 +
 doc/guides/nics/octeontx2.rst  | 13 +--
 doc/guides/nics/pcap_ring.rst  | 24 ++--
 doc/guides/nics/qede.rst   | 17 +---
 doc/guides/nics/sfc_efx.rst| 15 
 doc/guides/nics/softnic.rst| 13 +--
 doc/guides/nics/szedata2.rst   | 18 +
 doc/guides/nics/thunderx.rst   | 25 +---
 doc/guides/nics/vdev_netvsc.rst|  6 ---
 doc/guides/nics/vhost.rst  |  2 +-
 doc/guides/nics/virtio.rst |  4 +-
 44 files changed, 102 insertions(+), 693 deletions(-)

diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst
index 06e8c33746..d7d679b452 100644
--- a/doc/guides/nics/ark.rst
+++ b/doc/guides/nics/ark.rst
@@ -119,32 +119,6 @@ Data Path Interface
 Ingress RX and Egress TX operation is by the nominal DPDK API .
 The driver supports single-port, multi-queue for both RX and TX.
 
-Configuration Information
--
-
-**DPDK Configuration Parameters**
-
-  The following configuration options are available for the ARK PMD:
-
-   * **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables inclusion
- of the ARK PMD driver in the DPDK compilation.
-
-   * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y):  When enabled TX
- packets are padded to 60 bytes to support downstream MACS.
-
-   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_RX** (default n): Enables or disables debug
- logging and internal checking of RX ingress logic within the ARK PMD 
driver.
-
-   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TX** (default n): Enables or disables debug
- logging and internal checking of TX egress logic within the ARK PMD 
driver.
-
-   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS** (default n): Enables or disables 
debug
- logging of detailed packet and performance statistics gathered in
- the PMD and FPGA.
-
-   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE** (default n): Enables or disables 
debug
- logging of detailed PMD events and status.
-
 
 Building DPDK
 -
diff --git a/doc/guides/nics/atlantic.rst b/doc/guides/nics/atlantic.rst
index 3f3f2949f3..605f6dc3ab 100644
--- a/doc/guides/nics/atlantic.rst
+++ b/doc/guides/nics/atlantic.rst
@@ -26,10 +26,6 @@ Experimental API features
 
 - MACSEC PMD API is considered as experimental and is subject to 
change/removal in next DPDK releases.
 
-Configuration Information
-^
-
-- ``CONFIG_RTE_LIBRTE_ATLANTIC_PMD`` (default ``y``)
 
 Application Programming Interface
 -
diff --git a/doc/guides/nics/axgbe.rst b/doc/guides/nics/axgbe.rst
index 9b270a4226..10bf86fa54 100644
--- a/doc/guides/nics/axgbe.rst
+++ b/doc/guides/nics/axgbe.rst
@@ -27,21 +27,6 @@ AXGBE PMD has support for:
 - Jumbo Frame up to 9K
 
 
-Configuration Information
--
-
-The following options can be modified in the ``.config`` file. Please note that
-enabling debugging options may affect system performance.
-
-- ``CONFIG_RTE_LIBRTE_AXGBE_PMD`` (default **y**)
-
-  Toggle compilation of axgbe PMD.
-
-- ``CONFIG_RTE_LIBRTE_AXGBE_PMD_DEBUG`` (default **n**)
-
-  Toggle display fo

[dpdk-dev] [PATCH v2 30/37] doc: remove references to make in platform guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Signed-off-by: Ciara Power 
---
 doc/guides/platform/bluefield.rst | 22 -
 doc/guides/platform/octeontx.rst  | 33 +--
 doc/guides/platform/octeontx2.rst | 32 --
 3 files changed, 1 insertion(+), 86 deletions(-)

diff --git a/doc/guides/platform/bluefield.rst 
b/doc/guides/platform/bluefield.rst
index deda675b75..366f2b23a7 100644
--- a/doc/guides/platform/bluefield.rst
+++ b/doc/guides/platform/bluefield.rst
@@ -60,17 +60,6 @@ Native Compilation
 Refer to :doc:`../nics/mlx5` for prerequisites. Either Mellanox OFED/EN or
 rdma-core library with corresponding kernel drivers is required.
 
-make build
-^^
-
-.. code-block:: console
-
-make config T=arm64-bluefield-linux-gcc
-make -j
-
-meson build
-^^^
-
 .. code-block:: console
 
 meson build
@@ -126,17 +115,6 @@ Then, untar the tarball at the cross toolchain directory 
on the x86 host.
 cd $(dirname $(which aarch64-linux-gnu-gcc))/..
 tar xf aarch64-linux-gnu-mlx.tar
 
-make build
-^^
-
-.. code-block:: console
-
-make config T=arm64-bluefield-linux-gcc
-make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n 
CONFIG_RTE_EAL_IGB_UIO=n
-
-meson build
-^^^
-
 .. code-block:: console
 
 meson build --cross-file config/arm/arm64_bluefield_linux_gcc
diff --git a/doc/guides/platform/octeontx.rst b/doc/guides/platform/octeontx.rst
index 7d1cb647d3..9c20ce437d 100644
--- a/doc/guides/platform/octeontx.rst
+++ b/doc/guides/platform/octeontx.rst
@@ -90,23 +90,8 @@ native architecture, the linux sources need to be compiled 
once natively.
 
 The above steps would rebuild the modules and the required intermediate 
binaries.
 Once the target is ready for native compilation, the OCTEON TX platform
-drivers can be compiled with the following steps,
+drivers can be compiled, see :doc:`../linux_gsg/build_dpdk` for details.
 
-.. code-block:: console
-
-cd 
-make config T=arm64-thunderx-linux-gcc
-make
-
-The example applications can be compiled using the following:
-
-.. code-block:: console
-
-cd 
-export RTE_SDK=$PWD
-export RTE_TARGET=build
-cd examples/
-make
 
 Cross Compilation
 ~
@@ -139,23 +124,7 @@ SDK 6.2.0 patch 3:
 The above steps will prepare build system with numa additions. Now this build 
system can be used
 to build applications for **OCTEON TX** :sup:`®` platforms.
 
-.. code-block:: console
-
-cd 
-export RTE_SDK=$PWD
-export RTE_KERNELDIR=$THUNDER_ROOT/linux/kernel/linux
-make config T=arm64-thunderx-linux-gcc
-make -j CROSS=aarch64-thunderx-linux-gnu- CONFIG_RTE_KNI_KMOD=n 
CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem /include" 
EXTRA_LDFLAGS="-L/lib -lnuma"
-
 If NUMA support is not required, it can be disabled as explained in
 :doc:`../linux_gsg/cross_build_dpdk_for_arm64`.
 
-Following steps could be used in that case.
-
-.. code-block:: console
-
-make config T=arm64-thunderx-linux-gcc
-make CROSS=aarch64-thunderx-linux-gnu-
-
-
 SDK and related information can be obtained from: `Cavium support site 
`_.
diff --git a/doc/guides/platform/octeontx2.rst 
b/doc/guides/platform/octeontx2.rst
index 13255eec5c..232f628366 100644
--- a/doc/guides/platform/octeontx2.rst
+++ b/doc/guides/platform/octeontx2.rst
@@ -498,27 +498,6 @@ an x86 based platform.
 Native Compilation
 ~~
 
-make build
-^^
-
-.. code-block:: console
-
-make config T=arm64-octeontx2-linux-gcc
-make -j
-
-The example applications can be compiled using the following:
-
-.. code-block:: console
-
-cd 
-export RTE_SDK=$PWD
-export RTE_TARGET=build
-cd examples/
-make -j
-
-meson build
-^^^
-
 .. code-block:: console
 
 meson build
@@ -529,17 +508,6 @@ Cross Compilation
 
 Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 
details.
 
-make build
-^^
-
-.. code-block:: console
-
-make config T=arm64-octeontx2-linux-gcc
-make -j CROSS=aarch64-marvell-linux-gnu- CONFIG_RTE_KNI_KMOD=n
-
-meson build
-^^^
-
 .. code-block:: console
 
 meson build --cross-file config/arm/arm64_octeontx2_linux_gcc
-- 
2.17.1

[dpdk-dev] [PATCH v2 28/37] doc: remove references to make in mempool guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Signed-off-by: Ciara Power 
---
 doc/guides/mempool/octeontx.rst  | 28 +++-
 doc/guides/mempool/octeontx2.rst | 10 +-
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/doc/guides/mempool/octeontx.rst b/doc/guides/mempool/octeontx.rst
index dfa1993e19..33c40d5b17 100644
--- a/doc/guides/mempool/octeontx.rst
+++ b/doc/guides/mempool/octeontx.rst
@@ -30,33 +30,11 @@ Prerequisites
 
 See :doc: `../platform/octeontx.rst` for setup information.
 
-Pre-Installation Configuration
---
-
-Config File Options
-~~~
-
-The following options can be modified in the ``config`` file.
-Please note that enabling debugging options may affect system performance.
-
-- ``CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS`` ( set to ``octeontx_fpavf``)
-
-  Set default mempool ops to octeontx_fpavf.
-
-- ``CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL`` (default ``y``)
-
-  Toggle compilation of the ``librte_mempool_octeontx`` driver.
 
 Driver Compilation
-~~
-
-To compile the OCTEON TX FPAVF MEMPOOL PMD for Linux arm64 gcc target, run the
-following ``make`` command:
-
-.. code-block:: console
+--
 
-   cd 
-   make config T=arm64-thunderx-linux-gcc
+See :doc:`../linux_gsg/build_dpdk` for more information on compiling DPDK.
 
 
 Initialization
@@ -70,5 +48,5 @@ Example:
 
 .. code-block:: console
 
-./build/app/test -c 0xf --base-virtaddr=0x1000 \
+.//app/test/dpdk-test -c 0xf --base-virtaddr=0x1000 \
 --mbuf-pool-ops-name="octeontx_fpavf"
diff --git a/doc/guides/mempool/octeontx2.rst b/doc/guides/mempool/octeontx2.rst
index 49b45a04e8..53f09a52db 100644
--- a/doc/guides/mempool/octeontx2.rst
+++ b/doc/guides/mempool/octeontx2.rst
@@ -29,14 +29,6 @@ Prerequisites and Compilation procedure
 Pre-Installation Configuration
 --
 
-Compile time Config Options
-~~~
-
-The following option can be modified in the ``config`` file.
-
-- ``CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL`` (default ``y``)
-
-  Toggle compilation of the ``librte_mempool_octeontx2`` driver.
 
 Runtime Config Options
 ~~
@@ -97,4 +89,4 @@ Standalone mempool device
 
Example command to run ``mempool_autotest`` test with standalone OCTEONTX2 
NPA device::
 
- echo "mempool_autotest" | build/app/test -c 0xf0 
--mbuf-pool-ops-name="octeontx2_npa"
+ echo "mempool_autotest" | /app/test/dpdk-test -c 0xf0 
--mbuf-pool-ops-name="octeontx2_npa"
-- 
2.17.1

[dpdk-dev] [PATCH v2 32/37] doc: remove references to make in rawdev guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Reviewed-by: Kevin Laatz 
Signed-off-by: Ciara Power 
---
 doc/guides/rawdevs/dpaa2_cmdif.rst   | 21 -
 doc/guides/rawdevs/dpaa2_qdma.rst| 21 -
 doc/guides/rawdevs/ifpga.rst | 10 --
 doc/guides/rawdevs/ioat.rst  |  8 +---
 doc/guides/rawdevs/ntb.rst   |  6 --
 doc/guides/rawdevs/octeontx2_dma.rst | 12 
 doc/guides/rawdevs/octeontx2_ep.rst  |  8 
 7 files changed, 1 insertion(+), 85 deletions(-)

diff --git a/doc/guides/rawdevs/dpaa2_cmdif.rst 
b/doc/guides/rawdevs/dpaa2_cmdif.rst
index be9805874b..7ac3963938 100644
--- a/doc/guides/rawdevs/dpaa2_cmdif.rst
+++ b/doc/guides/rawdevs/dpaa2_cmdif.rst
@@ -44,17 +44,6 @@ Currently supported by DPDK:
Some part of fslmc bus code (mc flib - object library) routines are
dual licensed (BSD & GPLv2).
 
-Pre-Installation Configuration
---
-
-Config File Options
-~~~
-
-The following options can be modified in the ``config`` file.
-
-- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV`` (default ``y``)
-
-  Toggle compilation of the ``lrte_pmd_dpaa2_cmdif`` driver.
 
 Enabling logs
 -
@@ -68,16 +57,6 @@ For enabling logs, use the following EAL parameter:
 Using ``pmd.raw.dpaa2.cmdif`` as log matching criteria, all Event PMD logs can 
be
 enabled which are lower than logging ``level``.
 
-Driver Compilation
-~~
-
-To compile the DPAA2 CMDIF PMD for Linux arm64 gcc target, run the
-following ``make`` command:
-
-.. code-block:: console
-
-   cd 
-   make config T=arm64-dpaa-linux-gcc install
 
 Initialization
 --
diff --git a/doc/guides/rawdevs/dpaa2_qdma.rst 
b/doc/guides/rawdevs/dpaa2_qdma.rst
index 129e83d5ef..92921fafdd 100644
--- a/doc/guides/rawdevs/dpaa2_qdma.rst
+++ b/doc/guides/rawdevs/dpaa2_qdma.rst
@@ -48,17 +48,6 @@ Currently supported by DPDK:
Some part of fslmc bus code (mc flib - object library) routines are
dual licensed (BSD & GPLv2).
 
-Pre-Installation Configuration
---
-
-Config File Options
-~~~
-
-The following options can be modified in the ``config`` file.
-
-- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV`` (default ``y``)
-
-  Toggle compilation of the ``lrte_pmd_dpaa2_qdma`` driver.
 
 Enabling logs
 -
@@ -72,16 +61,6 @@ For enabling logs, use the following EAL parameter:
 Using ``pmd.raw.dpaa2.qdma`` as log matching criteria, all Event PMD logs can 
be
 enabled which are lower than logging ``level``.
 
-Driver Compilation
-~~
-
-To compile the DPAA2 QDMA PMD for Linux arm64 gcc target, run the
-following ``make`` command:
-
-.. code-block:: console
-
-   cd 
-   make config T=arm64-dpaa-linux-gcc install
 
 Initialization
 --
diff --git a/doc/guides/rawdevs/ifpga.rst b/doc/guides/rawdevs/ifpga.rst
index a3d92a62ea..dbd0d6e37d 100644
--- a/doc/guides/rawdevs/ifpga.rst
+++ b/doc/guides/rawdevs/ifpga.rst
@@ -76,16 +76,6 @@ summarized by the following block diagram::
  |vdev_ifpga_cfg driver   ||  Intel FpgaDev  |
  +++-+
 
-Build options
--
-
-- ``CONFIG_RTE_LIBRTE_IFPGA_BUS`` (default ``y``)
-
-   Toggle compilation of IFPGA Bus library.
-
-- ``CONFIG_RTE_LIBRTE_IFPGA_RAWDEV`` (default ``y``)
-
-   Toggle compilation of the ``ifpga_rawdev`` driver.
 
 Run-time parameters
 ---
diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst
index d0eee5e237..c0a08ff852 100644
--- a/doc/guides/rawdevs/ioat.rst
+++ b/doc/guides/rawdevs/ioat.rst
@@ -54,13 +54,7 @@ shows:
 Compilation
 
 
-For builds done with ``make``, the driver compilation is enabled by the
-``CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV`` build configuration option. This is
-enabled by default in builds for x86 platforms, and disabled in other
-configurations.
-
-For builds using ``meson`` and ``ninja``, the driver will be built when the
-target platform is x86-based.
+The driver will be built when the target platform is x86-based.
 
 Device Setup
 -
diff --git a/doc/guides/rawdevs/ntb.rst b/doc/guides/rawdevs/ntb.rst
index aa7d809649..0589b70087 100644
--- a/doc/guides/rawdevs/ntb.rst
+++ b/doc/guides/rawdevs/ntb.rst
@@ -30,12 +30,6 @@ is 
https://www.intel.com/content/dam/support/us/en/documents/server-products/Int
 - Disable PCIe PII SSC (Spread Spectrum Clocking) for both hosts. This
   is a hardware requirement.
 
-Build Options
--
-
-- ``CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV`` (default ``y``)
-
-   Toggle compilation of the ``ntb`` driver.
 
 Device Setup
 
diff --git a/doc/guides/rawdevs/octeontx2_dma.rst 
b/doc/guides/rawdevs/octeontx2_dma.rst
index 1e1dfbe931..f93ec1ffd7 100644
--- a/doc/guides/rawdevs/octeontx2_dma.rst
+++ b/doc/guides/rawdevs/octeontx2

[dpdk-dev] [PATCH v2 31/37] doc: remove references to make in prog guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Signed-off-by: Ciara Power 
---
 MAINTAINERS   |   3 +-
 doc/guides/prog_guide/build_app.rst   |  48 +--
 .../prog_guide/dev_kit_build_system.rst   | 331 --
 .../prog_guide/dev_kit_root_make_help.rst | 188 --
 .../prog_guide/env_abstraction_layer.rst  |  17 +-
 ...ib_make_help.rst => ext_app_make_help.rst} |  25 +-
 doc/guides/prog_guide/graph_lib.rst   |   6 +-
 doc/guides/prog_guide/index.rst   |   4 +-
 doc/guides/prog_guide/intro.rst   |   2 +-
 .../prog_guide/ip_fragment_reassembly_lib.rst |   5 -
 .../prog_guide/kernel_nic_interface.rst   |  14 +-
 .../link_bonding_poll_mode_drv_lib.rst|  15 +-
 doc/guides/prog_guide/lto.rst |  12 +-
 doc/guides/prog_guide/mbuf_lib.rst|   4 +-
 doc/guides/prog_guide/mempool_lib.rst |   7 +-
 doc/guides/prog_guide/overview.rst|  12 +-
 doc/guides/prog_guide/profile_app.rst |  17 +-
 doc/guides/prog_guide/qos_framework.rst   |  10 +-
 doc/guides/prog_guide/rcu_lib.rst |   7 +-
 doc/guides/prog_guide/source_org.rst  |  23 +-
 doc/guides/prog_guide/trace_lib.rst   |   3 +-
 .../prog_guide/writing_efficient_code.rst |   3 +-
 22 files changed, 52 insertions(+), 704 deletions(-)
 delete mode 100644 doc/guides/prog_guide/dev_kit_build_system.rst
 delete mode 100644 doc/guides/prog_guide/dev_kit_root_make_help.rst
 rename doc/guides/prog_guide/{ext_app_lib_make_help.rst => 
ext_app_make_help.rst} (69%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 0fec96558e..095824ab0d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -103,8 +103,7 @@ F: Makefile
 F: config/
 F: doc/build-sdk-quick.txt
 F: doc/guides/prog_guide/build_app.rst
-F: doc/guides/prog_guide/dev_kit_*
-F: doc/guides/prog_guide/ext_app_lib_make_help.rst
+F: doc/guides/prog_guide/ext_app_make_help.rst
 
 Meson build
 M: Bruce Richardson 
diff --git a/doc/guides/prog_guide/build_app.rst 
b/doc/guides/prog_guide/build_app.rst
index bffa55bbef..550341cb93 100644
--- a/doc/guides/prog_guide/build_app.rst
+++ b/doc/guides/prog_guide/build_app.rst
@@ -9,14 +9,11 @@ Building Your Own Application
 Compiling a Sample Application in the Development Kit Directory
 ---
 
-When compiling a sample application (for example, hello world), the following 
variables must be exported:
-RTE_SDK and RTE_TARGET.
+To compile a sample application with make (for example, hello world):
 
 .. code-block:: console
 
 ~/DPDK$ cd examples/helloworld/
-~/DPDK/examples/helloworld$ export RTE_SDK=/home/user/DPDK
-~/DPDK/examples/helloworld$ export RTE_TARGET=x86_64-native-linux-gcc
 ~/DPDK/examples/helloworld$ make
 CC main.o
 LD helloworld
@@ -30,6 +27,8 @@ The binary is generated in the build directory by default:
 ~/DPDK/examples/helloworld$ ls build/app
 helloworld helloworld.map
 
+Please refer to :doc:`../linux_gsg/build_dpdk` for details on compiling with 
meson.
+
 Build Your Own Application Outside the Development Kit
 --
 
@@ -39,8 +38,6 @@ The sample application (Hello World) can be duplicated in a 
new directory as a s
 
 ~$ cp -r DPDK/examples/helloworld my_rte_app
 ~$ cd my_rte_app/
-~/my_rte_app$ export RTE_SDK=/home/user/DPDK
-~/my_rte_app$ export RTE_TARGET=x86_64-native-linux-gcc
 ~/my_rte_app$ make
 CC main.o
 LD helloworld
@@ -53,47 +50,10 @@ Customizing Makefiles
 Application Makefile
 
 
-The default makefile provided with the Hello World sample application is a 
good starting point. It includes:
-
-*   $(RTE_SDK)/mk/rte.vars.mk at the beginning
-
-*   $(RTE_SDK)/mk/rte.extapp.mk at the end
+The default makefile provided with the Hello World sample application is a 
good starting point.
 
 The user must define several variables:
 
 *   APP: Contains the name of the application.
 
 *   SRCS-y: List of source files (\*.c, \*.S).
-
-Library Makefile
-
-
-It is also possible to build a library in the same way:
-
-*   Include $(RTE_SDK)/mk/rte.vars.mk at the beginning.
-
-*   Include $(RTE_SDK)/mk/rte.extlib.mk  at the end.
-
-The only difference is that APP should be replaced by LIB, which contains the 
name of the library. For example, libfoo.a.
-
-Customize Makefile Actions
-~~
-
-Some variables can be defined to customize Makefile actions. The most common 
are listed below. Refer to
-:ref:`Makefile Description ` section in
-:ref:`Development Kit Build System `
-
-chapter for details.
-
-*   VPATH: The path list where the build system will search for sources. By 
default,
-RTE_SRCDIR will be included in VPATH.
-
-*   CFLAGS_my_file.o: The specific flags to add for C compilation of my

[dpdk-dev] [PATCH v2 34/37] doc: remove references to make in vdpadevs guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Signed-off-by: Ciara Power 
---
 doc/guides/vdpadevs/ifc.rst  | 13 
 doc/guides/vdpadevs/mlx5.rst | 40 +++-
 2 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/doc/guides/vdpadevs/ifc.rst b/doc/guides/vdpadevs/ifc.rst
index 12a2a342e6..f968489a75 100644
--- a/doc/guides/vdpadevs/ifc.rst
+++ b/doc/guides/vdpadevs/ifc.rst
@@ -11,19 +11,6 @@ directly by DMA. Besides, it supports dirty page logging and 
device state
 report/restore, this driver enables its vDPA functionality.
 
 
-Pre-Installation Configuration
---
-
-Config File Options
-~~~
-
-The following option can be modified in the ``config`` file.
-
-- ``CONFIG_RTE_LIBRTE_IFC_PMD`` (default ``y`` for linux)
-
-  Toggle compilation of the ``librte_pmd_ifc`` driver.
-
-
 IFCVF vDPA Implementation
 -
 
diff --git a/doc/guides/vdpadevs/mlx5.rst b/doc/guides/vdpadevs/mlx5.rst
index 2c7a550afc..2717459b6f 100644
--- a/doc/guides/vdpadevs/mlx5.rst
+++ b/doc/guides/vdpadevs/mlx5.rst
@@ -14,9 +14,7 @@ SR-IOV context.
 
 .. note::
 
-   Due to external dependencies, this driver is disabled in default
-   configuration of the "make" build. It can be enabled with
-   ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD=y`` or by using "meson" build system which
+   This driver is enabled automatically when using "meson" build system which
will detect dependencies.
 
 
@@ -65,42 +63,10 @@ Prerequisites
 Compilation options
 ~~~
 
-These options can be modified in the ``.config`` file.
-
-- ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` (default **n**)
-
-  Toggle compilation of librte_pmd_mlx5 itself.
-
-- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**)
-
-  Build PMD with additional code to make it loadable without hard
-  dependencies on **libibverbs** nor **libmlx5**, which may not be installed
-  on the target system.
-
-  In this mode, their presence is still required for it to run properly,
-  however their absence won't prevent a DPDK application from starting (with
-  ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as
-  missing with ``ldd(1)``.
-
-  It works by moving these dependencies to a purpose-built rdma-core "glue"
-  plug-in which must either be installed in a directory whose name is based
-  on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a
-  standard location for the dynamic linker (e.g. ``/lib``) if left to the
-  default empty string (``""``).
-
-  This option has no performance impact.
-
-- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**)
-
-  Embed static flavor of the dependencies **libibverbs** and **libmlx5**
-  in the PMD shared library or the executable static binary.
-
 .. note::
 
-   For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This
-   will enable ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` and set
-   ``RTE_CACHE_LINE_SIZE`` to 64. Default armv8a configuration of make build 
and
-   meson build set it to 128 then brings performance degradation.
+   Default armv8a configuration of meson build sets ``RTE_CACHE_LINE_SIZE``
+   to 128 then brings performance degradation.
 
 Run-time configuration
 ~~
-- 
2.17.1

[dpdk-dev] [PATCH v2 33/37] doc: remove references to make in sample app guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Signed-off-by: Ciara Power 
---
 doc/guides/sample_app_ug/bbdev_app.rst| 34 ++--
 doc/guides/sample_app_ug/cmd_line.rst |  2 +-
 doc/guides/sample_app_ug/compiling.rst| 83 +++
 doc/guides/sample_app_ug/dist_app.rst |  4 +-
 doc/guides/sample_app_ug/ethtool.rst  |  2 +-
 .../sample_app_ug/eventdev_pipeline.rst   |  3 +-
 doc/guides/sample_app_ug/fips_validation.rst  | 10 +--
 doc/guides/sample_app_ug/flow_classify.rst|  4 +-
 doc/guides/sample_app_ug/flow_filtering.rst   | 25 +-
 doc/guides/sample_app_ug/hello_world.rst  |  2 +-
 doc/guides/sample_app_ug/ioat.rst |  6 +-
 doc/guides/sample_app_ug/ip_frag.rst  |  6 +-
 doc/guides/sample_app_ug/ip_pipeline.rst  |  4 +-
 doc/guides/sample_app_ug/ip_reassembly.rst|  9 +-
 doc/guides/sample_app_ug/ipsec_secgw.rst  | 14 +---
 doc/guides/sample_app_ug/ipv4_multicast.rst   |  4 +-
 doc/guides/sample_app_ug/keep_alive.rst   |  4 +-
 .../sample_app_ug/kernel_nic_interface.rst| 14 ++--
 doc/guides/sample_app_ug/l2_forward_cat.rst   |  4 +-
 .../sample_app_ug/l2_forward_crypto.rst   |  4 +-
 doc/guides/sample_app_ug/l2_forward_event.rst | 10 +--
 .../sample_app_ug/l2_forward_job_stats.rst|  4 +-
 .../sample_app_ug/l2_forward_real_virtual.rst |  6 +-
 doc/guides/sample_app_ug/l3_forward.rst   | 10 +--
 .../sample_app_ug/l3_forward_access_ctrl.rst  |  6 +-
 doc/guides/sample_app_ug/l3_forward_graph.rst |  4 +-
 .../sample_app_ug/l3_forward_power_man.rst| 14 ++--
 doc/guides/sample_app_ug/link_status_intr.rst |  4 +-
 doc/guides/sample_app_ug/multi_process.rst| 20 ++---
 doc/guides/sample_app_ug/ntb.rst  |  2 +-
 doc/guides/sample_app_ug/packet_ordering.rst  |  3 +-
 .../sample_app_ug/performance_thread.rst  | 44 +++---
 doc/guides/sample_app_ug/ptpclient.rst|  9 +-
 doc/guides/sample_app_ug/qos_metering.rst |  2 +-
 doc/guides/sample_app_ug/qos_scheduler.rst| 10 +--
 doc/guides/sample_app_ug/rxtx_callbacks.rst   |  9 +-
 doc/guides/sample_app_ug/server_node_efd.rst  |  2 +-
 doc/guides/sample_app_ug/service_cores.rst| 23 +
 doc/guides/sample_app_ug/skeleton.rst |  2 +-
 doc/guides/sample_app_ug/tep_termination.rst  | 43 +++---
 doc/guides/sample_app_ug/test_pipeline.rst|  4 +-
 doc/guides/sample_app_ug/timer.rst|  2 +-
 doc/guides/sample_app_ug/vdpa.rst |  4 +-
 doc/guides/sample_app_ug/vhost.rst| 11 +--
 doc/guides/sample_app_ug/vhost_blk.rst|  2 +-
 doc/guides/sample_app_ug/vhost_crypto.rst |  2 +-
 .../sample_app_ug/vm_power_management.rst | 34 
 .../sample_app_ug/vmdq_dcb_forwarding.rst |  8 +-
 doc/guides/sample_app_ug/vmdq_forwarding.rst  |  8 +-
 49 files changed, 194 insertions(+), 346 deletions(-)

diff --git a/doc/guides/sample_app_ug/bbdev_app.rst 
b/doc/guides/sample_app_ug/bbdev_app.rst
index 405e706a46..764155f983 100644
--- a/doc/guides/sample_app_ug/bbdev_app.rst
+++ b/doc/guides/sample_app_ug/bbdev_app.rst
@@ -31,30 +31,12 @@ Limitations
 Compiling the Application
 -
 
-#. DPDK needs to be built with ``baseband_turbo_sw`` PMD driver enabled along
-   with ``FLEXRAN SDK`` Libraries. Refer to *SW Turbo Poll Mode Driver*
-   documentation for more details on this.
+DPDK needs to be built with ``baseband_turbo_sw`` PMD driver enabled along
+with ``FLEXRAN SDK`` Libraries. Refer to *SW Turbo Poll Mode Driver*
+documentation for more details on this.
 
-#. Go to the example directory:
+To compile the sample application see :doc:`compiling`.
 
-.. code-block:: console
-
-export RTE_SDK=/path/to/rte_sdk
-cd ${RTE_SDK}/examples/bbdev_app
-
-#. Set the target (a default target is used if not specified). For example:
-
-.. code-block:: console
-
-export RTE_TARGET=x86_64-native-linux-gcc
-
-See the *DPDK Getting Started Guide* for possible RTE_TARGET values.
-
-#. Build the application:
-
-.. code-block:: console
-
-make
 
 Running the Application
 ---
@@ -63,8 +45,8 @@ The application accepts a number of command line options:
 
 .. code-block:: console
 
-$ ./build/bbdev [EAL options] -- [-e ENCODING_CORES] [-d DECODING_CORES] /
-[-p ETH_PORT_ID] [-b BBDEV_ID]
+$ .//examples/dpdk-bbdev [EAL options] -- [-e ENCODING_CORES] /
+[-d DECODING_CORES] [-p ETH_PORT_ID] [-b BBDEV_ID]
 
 where:
 
@@ -84,8 +66,8 @@ issue the command:
 
 .. code-block:: console
 
-$ ./build/bbdev --vdev='baseband_turbo_sw' -w  -c 0x38 
--socket-mem=2,2 \
---file-prefix=bbdev -- -e 0x10 -d 0x20
+$ .//examples/dpdk-bbdev --vdev='baseband_turbo_sw' -w 
 \
+-c 0x38 --socket-mem=2,2 --file-prefix=bbdev -- -e 0x10 -d 0x20
 
 where, NIC0PCIADDR is the PCI address of the Rx port
 
diff --git a/doc/guides/sample_app_ug/cmd_line.

[dpdk-dev] [PATCH v2 35/37] doc: remove reference to make in tools guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Signed-off-by: Ciara Power 
---
 doc/guides/tools/comp_perf.rst| 10 ++---
 doc/guides/tools/cryptoperf.rst   | 20 +++--
 doc/guides/tools/pdump.rst| 15 ++---
 doc/guides/tools/proc_info.rst|  2 +-
 doc/guides/tools/testbbdev.rst| 36 +--
 doc/guides/tools/testeventdev.rst | 21 --
 6 files changed, 31 insertions(+), 73 deletions(-)

diff --git a/doc/guides/tools/comp_perf.rst b/doc/guides/tools/comp_perf.rst
index ee585d1024..1b33dc4e91 100644
--- a/doc/guides/tools/comp_perf.rst
+++ b/doc/guides/tools/comp_perf.rst
@@ -100,13 +100,7 @@ Application Options
 Compiling the Tool
 --
 
-**Step 1: PMD setting**
-
-The ``dpdk-test-compress-perf`` tool depends on compression device drivers PMD 
which
-can be disabled by default in the build configuration file ``common_base``.
-The compression device drivers PMD which should be tested can be enabled by 
setting e.g.::
-
-   CONFIG_RTE_LIBRTE_PMD_ISAL=y
+See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps.
 
 
 Running the Tool
@@ -116,5 +110,5 @@ The tool has a number of command line options. Here is the 
sample command line:
 
 .. code-block:: console
 
-   ./build/app/dpdk-test-compress-perf  -l 4 -- --driver-name compress_qat 
--input-file test.txt --seg-sz 8192
+   .//app/dpdk-test-compress-perf  -l 4 -- --driver-name 
compress_qat --input-file test.txt --seg-sz 8192
 --compress-level 1:1:9 --num-iter 10 --extended-input-sz 1048576  
--max-num-sgl-segs 16 --huffman-enc fixed
diff --git a/doc/guides/tools/cryptoperf.rst b/doc/guides/tools/cryptoperf.rst
index 28b729dbda..e7ea2ba1a5 100644
--- a/doc/guides/tools/cryptoperf.rst
+++ b/doc/guides/tools/cryptoperf.rst
@@ -33,19 +33,8 @@ the hardware accelerator fully loaded and so measure maximum 
throughput.
 Compiling the Application
 -
 
-**Step 1: PMD setting**
 
-The ``dpdk-test-crypto-perf`` tool depends on crypto device drivers PMD which
-are disabled by default in the build configuration file ``common_base``.
-The crypto device drivers PMD which should be tested can be enabled by 
setting::
-
-   CONFIG_RTE_LIBRTE_PMD_=y
-
-Setting example for open ssl PMD::
-
-   CONFIG_RTE_LIBRTE_PMD_OPENSSL=y
-
-**Step 2: Linearization setting**
+**Step 1: Linearization setting**
 
 It is possible linearized input segmented packets just before crypto operation
 for devices which doesn't support scatter-gather, and allows to measure
@@ -56,13 +45,10 @@ To set on the linearization options add below definition to 
the
 
#define CPERF_LINEARIZATION_ENABLE
 
-**Step 3: Build the application**
+**Step 2: Build the application**
 
-Execute the ``dpdk-setup.sh`` script to build the DPDK library together with 
the
-``dpdk-test-crypto-perf`` application.
+See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps.
 
-Initially, the user must select a DPDK target to choose the correct target type
-and compiler options to use when building the libraries.
 The user must have all libraries, modules, updates and compilers installed
 in the system prior to this,
 as described in the earlier chapters in this Getting Started Guide.
diff --git a/doc/guides/tools/pdump.rst b/doc/guides/tools/pdump.rst
index 8a499c6c5b..70f03db9cc 100644
--- a/doc/guides/tools/pdump.rst
+++ b/doc/guides/tools/pdump.rst
@@ -19,12 +19,9 @@ a DPDK secondary process and is capable of enabling packet 
capture on dpdk ports
 framework initialization code. Refer ``app/test-pmd/testpmd.c``
 code to see how this is done.
 
-  * The ``dpdk-pdump`` tool depends on libpcap based PMD which is disabled
-by default in the build configuration files,
-owing to an external dependency on the libpcap development files
-which must be installed on the board.
-Once the libpcap development files are installed, the libpcap based PMD
-can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling 
the DPDK.
+  * The ``dpdk-pdump`` tool depends on libpcap based PMD which must be
+installed on the board.
+Once the libpcap development files are installed, recompile the DPDK.
 
   * The ``dpdk-pdump`` tool runs as a DPDK secondary process. It exits when
 the primary application exits.
@@ -37,7 +34,7 @@ The tool has a number of command line options:
 
 .. code-block:: console
 
-   ./build/app/dpdk-pdump --
+   .//app/dpdk-pdump --
   [--multi]
   --pdump '(port= | device_id=),
(queue=),
@@ -120,5 +117,5 @@ Example
 
 .. code-block:: console
 
-   $ sudo ./build/app/dpdk-pdump -l 3 -- --pdump 
'port=0,queue=*,rx-dev=/tmp/rx.pcap'
-   $ sudo ./build/app/dpdk-pdump -l 3,4,5 -- --multi --pdump 
'port=0,queue=*,rx-dev=/tmp/rx-1.pcap' --pdump 
'port=1,queue=*,rx-dev=/tmp/rx-2

[dpdk-dev] [PATCH v2 36/37] doc: remove references to make in testpmd guides

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Signed-off-by: Ciara Power 
---
 doc/guides/testpmd_app_ug/run_app.rst   | 6 +++---
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 +
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/doc/guides/testpmd_app_ug/run_app.rst 
b/doc/guides/testpmd_app_ug/run_app.rst
index d1e4ee3e7a..ac4f0d9212 100644
--- a/doc/guides/testpmd_app_ug/run_app.rst
+++ b/doc/guides/testpmd_app_ug/run_app.rst
@@ -20,7 +20,7 @@ They must be separated from the EAL options, shown in the 
previous section, with
 
 .. code-block:: console
 
-sudo ./testpmd -l 0-3 -n 4 -- -i --portmask=0x1 --nb-cores=2
+sudo ./dpdk-testpmd -l 0-3 -n 4 -- -i --portmask=0x1 --nb-cores=2
 
 The command line options are:
 
@@ -59,13 +59,13 @@ The command line options are:
 *   ``--nb-cores=N``
 
 Set the number of forwarding cores,
-where 1 <= N <= "number of cores" or ``CONFIG_RTE_MAX_LCORE`` from the 
configuration file.
+where 1 <= N <= "number of cores" or ``RTE_MAX_LCORE`` from the 
configuration file.
 The default value is 1.
 
 *   ``--nb-ports=N``
 
 Set the number of forwarding ports,
-where 1 <= N <= "number of ports" on the board or 
``CONFIG_RTE_MAX_ETHPORTS`` from the configuration file.
+where 1 <= N <= "number of ports" on the board or ``RTE_MAX_ETHPORTS`` 
from the configuration file.
 The default value is the number of ports on the board.
 
 *   ``--coremask=0xXX``
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst 
b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 90cf252df5..f0d838321c 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -71,7 +71,7 @@ practical or possible testpmd supports alternative methods 
for executing command
 
 .. code-block:: console
 
-   ./testpmd -n4 -r2 ... -- -i 
--cmdline-file=/home/ubuntu/flow-create-commands.txt
+   ./dpdk-testpmd -n4 -r2 ... -- -i 
--cmdline-file=/home/ubuntu/flow-create-commands.txt
Interactive-mode selected
CLI commands to be read from /home/ubuntu/flow-create-commands.txt
Configuring Port 0 (socket 0)
@@ -329,8 +329,6 @@ The available information categories are:
 
 * ``icmpecho``: Receives a burst of packets, lookup for ICMP echo requests 
and, if any, send back ICMP echo replies.
 
-* ``ieee1588``: Demonstrate L2 IEEE1588 V2 PTP timestamping for RX and TX. 
Requires ``CONFIG_RTE_LIBRTE_IEEE1588=y``.
-
 * ``noisy``: Noisy neighbor simulation.
   Simulate more realistic behavior of a guest machine engaged in receiving
   and sending packets performing Virtual Network Function (VNF).
@@ -379,11 +377,6 @@ Example for the io forwarding engine, with some packet 
drops on the tx side::
  TX-packets: 548595568  TX-dropped: 128   TX-total: 548595696
  

 
-.. note::
-
-   Enabling CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES appends "CPU cycles/packet" 
stats, like:
-
-   CPU cycles/packet=xx.dd (total cycles= / total RX packets=) at xxx 
MHz clock
 
 clear fwd
 ~
-- 
2.17.1

[dpdk-dev] [PATCH v2 37/37] doc: update quick build doc to remove make references

[Ciara Power]

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Signed-off-by: Ciara Power 
---
 doc/build-sdk-quick.txt | 55 -
 1 file changed, 21 insertions(+), 34 deletions(-)

diff --git a/doc/build-sdk-quick.txt b/doc/build-sdk-quick.txt
index bcfa7d6fe1..423104094e 100644
--- a/doc/build-sdk-quick.txt
+++ b/doc/build-sdk-quick.txt
@@ -1,34 +1,21 @@
-Basic build
-   make defconfig && make
-   or
-   make config T=x86_64-native-linux-gcc && make
-Build commands
-   config   get configuration from target template (T=)
-   defconfigauto-select target template based on arch, OS, etc.
-   all  same as build (default rule)
-   buildbuild in a configured directory
-   cleanremove files but keep configuration
-   install T=   configure, build and install a target in DESTDIR
-   install  install optionally staged in DESTDIR
-   examples build examples for given targets (T=)
-   examples_clean   clean examples for given targets (T=)
-   test compile tests and run basic unit tests
-   test-*   run specific subset of unit tests
-   tags|etags|gtags generate tags database for given targets (T=)
-   cscope   generate cscope database for given targets (T=)
-Build variables
-   EXTRA_CPPFLAGS   preprocessor options
-   EXTRA_CFLAGS compiler options
-   EXTRA_LDFLAGSlinker options
-   EXTRA_LDLIBS linker library options
-   RTE_KERNELDIRlinux headers path
-   RTE_DEVEL_BUILD  stricter options (default: y in git tree)
-   CROSS toolchain prefix
-   V verbose
-   D debug dependencies
-   O build directory (default: build/ - install T= default: ./)
-   DESTDIR   staging install directory (default: empty)
-   prefixroot install directory (default: /usr/local)
-   T target template - used with config or install
-   format: 
-   templates in config/defconfig_*
+For many platforms, compiling and installing DPDK should work using the
+following set of commands::
+
+   meson build
+   cd build
+   ninja
+   ninja install
+
+This will compile DPDK in the ``build`` subdirectory, and then install the
+resulting libraries, drivers and header files onto the system - generally
+in /usr/local. A package-config file, ``libdpdk.pc``,  for DPDK will also
+be installed to allow ease of compiling and linking with applications.
+
+After installation, to use DPDK, the necessary CFLAG and LDFLAG variables
+can be got from pkg-config::
+
+   pkg-config --cflags libdpdk
+   pkg-config --libs libdpdk
+
+More detail on each of these steps can be got from the
+"Installing DPDK Using the meson build system" section of the programming 
guides.
-- 
2.17.1

Re: [dpdk-dev] [PATCH v2] sched: fix port time rounding error

[Kevin Traynor]

Hi,

On 25/06/2020 10:59, alangordonde...@gmail.com wrote:
> From: Alan Dewar 
> 
> The QoS scheduler works off port time that is computed from the number
> of CPU cycles that have elapsed since the last time the port was
> polled.   It divides the number of elapsed cycles to calculate how
> many bytes can be sent, however this division can generate rounding
> errors, where some fraction of a byte sent may be lost.
> 
> Lose enough of these fractional bytes and the QoS scheduler
> underperforms.  The problem is worse with low bandwidths.
> 
> To compensate for this rounding error this fix doesn't advance the
> port's time_cpu_cycles by the number of cycles that have elapsed,
> but by multiplying the computed number of bytes that can be sent
> (which has been rounded down) by number of cycles per byte.
> This will mean that port's time_cpu_cycles will lag behind the CPU
> cycles momentarily.  At the next poll, the lag will be taken into
> account.
> 
> v2:
> If the cycles value wraps (100 year+) reset the port's cpu cycle back
> to zero.
> 
> Fixes: de3cfa2c98 ("sched: initial import")
> 
> Signed-off-by: Alan Dewar 
> ---
>  lib/librte_sched/rte_sched.c | 11 +--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c
> index c0983ddda..7c022cd61 100644
> --- a/lib/librte_sched/rte_sched.c
> +++ b/lib/librte_sched/rte_sched.c
> @@ -222,6 +222,7 @@ struct rte_sched_port {
>   uint64_t time_cpu_bytes;  /* Current CPU time measured in bytes */
>   uint64_t time;/* Current NIC TX time measured in bytes 
> */
>   struct rte_reciprocal inv_cycles_per_byte; /* CPU cycles per byte */
> + uint64_t cycles_per_byte;
>  

I was backporting this patch to 18.11. The older ABI checker complains
about this structure change.

"cycles_per_byte has been added at the middle position of this
structural type."

Isn't this an ABI break? Dropping from 18.11 for time being.

>   /* Grinders */
>   struct rte_mbuf **pkts_out;
> @@ -852,6 +853,7 @@ rte_sched_port_config(struct rte_sched_port_params 
> *params)
>   cycles_per_byte = (rte_get_tsc_hz() << RTE_SCHED_TIME_SHIFT)
>   / params->rate;
>   port->inv_cycles_per_byte = rte_reciprocal_value(cycles_per_byte);
> + port->cycles_per_byte = cycles_per_byte;
>  
>   /* Grinders */
>   port->pkts_out = NULL;
> @@ -2673,16 +2675,21 @@ static inline void
>  rte_sched_port_time_resync(struct rte_sched_port *port)
>  {
>   uint64_t cycles = rte_get_tsc_cycles();
> - uint64_t cycles_diff = cycles - port->time_cpu_cycles;
> + uint64_t cycles_diff;
>   uint64_t bytes_diff;
>   uint32_t i;
>  
> + if (cycles < port->time_cpu_cycles)
> + port->time_cpu_cycles = 0;
> +
> + cycles_diff = cycles - port->time_cpu_cycles;
>   /* Compute elapsed time in bytes */
>   bytes_diff = rte_reciprocal_divide(cycles_diff << RTE_SCHED_TIME_SHIFT,
>  port->inv_cycles_per_byte);
>  
>   /* Advance port time */
> - port->time_cpu_cycles = cycles;
> + port->time_cpu_cycles +=
> + (bytes_diff * port->cycles_per_byte) >> RTE_SCHED_TIME_SHIFT;
>   port->time_cpu_bytes += bytes_diff;
>   if (port->time < port->time_cpu_bytes)
>   port->time = port->time_cpu_bytes;
> 

[dpdk-dev] [PATCH] vdpa/mlx5: fix event channel setup

[Xueming Li]

From: Xueming Li 

During vdap device setup, if some error happens, event channel release
stuck at polling event channel.

Event channel fd is set to nonblocking in cqe setup, so if any error
happens before this function and after event channel created, the
pooling before releasing resources will stuck.

This patch moves event channel to non-blocking mode right after
creation.

Fixes: 8395927cdf ("vdpa/mlx5: prepare HW queues")
Cc: ma...@nvidia.com

Signed-off-by: Xueming Li 
---
 drivers/vdpa/mlx5/mlx5_vdpa_event.c | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_event.c 
b/drivers/vdpa/mlx5/mlx5_vdpa_event.c
index 5a2d4fb1ec..bda547ffe0 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa_event.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa_event.c
@@ -51,6 +51,8 @@ mlx5_vdpa_event_qp_global_release(struct mlx5_vdpa_priv *priv)
 static int
 mlx5_vdpa_event_qp_global_prepare(struct mlx5_vdpa_priv *priv)
 {
+   int flags, ret;
+
if (priv->eventc)
return 0;
if (mlx5_glue->devx_query_eqn(priv->ctx, 0, &priv->eqn)) {
@@ -66,6 +68,12 @@ mlx5_vdpa_event_qp_global_prepare(struct mlx5_vdpa_priv 
*priv)
rte_errno);
goto error;
}
+   flags = fcntl(priv->eventc->fd, F_GETFL);
+   ret = fcntl(priv->eventc->fd, F_SETFL, flags | O_NONBLOCK);
+   if (ret) {
+   DRV_LOG(ERR, "Failed to change event channel FD.");
+   goto error;
+   }
priv->uar = mlx5_glue->devx_alloc_uar(priv->ctx, 0);
if (!priv->uar) {
rte_errno = errno;
@@ -376,7 +384,6 @@ mlx5_vdpa_interrupt_handler(void *cb_arg)
 int
 mlx5_vdpa_cqe_event_setup(struct mlx5_vdpa_priv *priv)
 {
-   int flags;
int ret;
 
if (!priv->eventc)
@@ -393,12 +400,6 @@ mlx5_vdpa_cqe_event_setup(struct mlx5_vdpa_priv *priv)
return -1;
}
}
-   flags = fcntl(priv->eventc->fd, F_GETFL);
-   ret = fcntl(priv->eventc->fd, F_SETFL, flags | O_NONBLOCK);
-   if (ret) {
-   DRV_LOG(ERR, "Failed to change event channel FD.");
-   goto error;
-   }
priv->intr_handle.fd = priv->eventc->fd;
priv->intr_handle.type = RTE_INTR_HANDLE_EXT;
if (rte_intr_callback_register(&priv->intr_handle,
-- 
2.17.1

Re: [dpdk-dev] [PATCH v3 05/11] baseband/acc100: add LDPC processing functions

[Dave Burley]

Hi Nic,

As you've now specified the use of RTE_BBDEV_LDPC_LLR_COMPRESSION for this PMB, 
please could you confirm what the packed format of the LLRs in memory looks 
like? 

Best Regards

Dave Burley


From: dev  on behalf of Nicolas Chautru 

Sent: 19 August 2020 01:25
To: dev@dpdk.org ; akhil.go...@nxp.com 
Cc: bruce.richard...@intel.com ; Nicolas Chautru 

Subject: [dpdk-dev] [PATCH v3 05/11] baseband/acc100: add LDPC processing 
functions 
 
Adding LDPC decode and encode processing operations

Signed-off-by: Nicolas Chautru 
---
 drivers/baseband/acc100/rte_acc100_pmd.c | 1625 +-
 drivers/baseband/acc100/rte_acc100_pmd.h |    3 +
 2 files changed, 1626 insertions(+), 2 deletions(-)

diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c 
b/drivers/baseband/acc100/rte_acc100_pmd.c
index 7a21c57..5f32813 100644
--- a/drivers/baseband/acc100/rte_acc100_pmd.c
+++ b/drivers/baseband/acc100/rte_acc100_pmd.c
@@ -15,6 +15,9 @@
 #include 
 #include 
 #include 
+#ifdef RTE_BBDEV_OFFLOAD_COST
+#include 
+#endif
 
 #include 
 #include 
@@ -449,7 +452,6 @@
 return 0;
 }
 
-
 /**
  * Report a ACC100 queue index which is free
  * Return 0 to 16k for a valid queue_idx or -1 when no queue is available
@@ -634,6 +636,46 @@
 struct acc100_device *d = dev->data->dev_private;
 
 static const struct rte_bbdev_op_cap bbdev_capabilities[] = {
+   {
+   .type   = RTE_BBDEV_OP_LDPC_ENC,
+   .cap.ldpc_enc = {
+   .capability_flags =
+   RTE_BBDEV_LDPC_RATE_MATCH |
+   RTE_BBDEV_LDPC_CRC_24B_ATTACH |
+   RTE_BBDEV_LDPC_INTERLEAVER_BYPASS,
+   .num_buffers_src =
+   RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
+   .num_buffers_dst =
+   RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
+   }
+   },
+   {
+   .type   = RTE_BBDEV_OP_LDPC_DEC,
+   .cap.ldpc_dec = {
+   .capability_flags =
+   RTE_BBDEV_LDPC_CRC_TYPE_24B_CHECK |
+   RTE_BBDEV_LDPC_CRC_TYPE_24B_DROP |
+   RTE_BBDEV_LDPC_HQ_COMBINE_IN_ENABLE |
+   RTE_BBDEV_LDPC_HQ_COMBINE_OUT_ENABLE |
+#ifdef ACC100_EXT_MEM
+   RTE_BBDEV_LDPC_INTERNAL_HARQ_MEMORY_IN_ENABLE |
+   RTE_BBDEV_LDPC_INTERNAL_HARQ_MEMORY_OUT_ENABLE |
+#endif
+   RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE |
+   RTE_BBDEV_LDPC_DEINTERLEAVER_BYPASS |
+   RTE_BBDEV_LDPC_DECODE_BYPASS |
+   RTE_BBDEV_LDPC_DEC_SCATTER_GATHER |
+   RTE_BBDEV_LDPC_HARQ_6BIT_COMPRESSION |
+   RTE_BBDEV_LDPC_LLR_COMPRESSION,
+   .llr_size = 8,
+   .llr_decimals = 1,
+   .num_buffers_src =
+   RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
+   .num_buffers_hard_out =
+   RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
+   .num_buffers_soft_out = 0,
+   }
+   },
 RTE_BBDEV_END_OF_CAPABILITIES_LIST()
 };
 
@@ -669,9 +711,14 @@
 dev_info->cpu_flag_reqs = NULL;
 dev_info->min_alignment = 64;
 dev_info->capabilities = bbdev_capabilities;
+#ifdef ACC100_EXT_MEM
 dev_info->harq_buffer_size = d->ddr_size;
+#else
+   dev_info->harq_buffer_size = 0;
+#endif
 }
 
+
 static const struct rte_bbdev_ops acc100_bbdev_ops = {
 .setup_queues = acc100_setup_queues,
 .close = acc100_dev_close,
@@ -696,6 +743,1577 @@
 {.device_id = 0},
 };
 
+/* Read flag value 0/1 from bitmap */
+static inline bool
+check_bit(uint32_t bitmap, uint32_t bitmask)
+{
+   return bitmap & bitmask;
+}
+
+static inline char *
+mbuf_append(struct rte_mbuf *m_head, struct rte_mbuf *m, uint16_t len)
+{
+   if (unlikely(len > rte_pktmbuf_tailroom(m)))
+   return NULL;
+
+   char *tail = (char *)m->buf_addr + m->data_off + m->data_len;
+   m->data_len = (uint16_t)(m->data_len + len);
+   m_head->pkt_len  = (m_head->pkt_len + len);
+   return tail;
+}
+
+/* Compute value of k0.
+ * Based on 3GPP 38.212 Table 5.4.2.1-2
+ * Starting position of different redundancy versions, k0
+ */
+static inline uint16_t
+get_k0(uint16_t n_cb, uint16_t z_c, uint8_t bg, uint8_t rv_index)
+{
+   if (rv_index == 0)
+   return 0;
+   uint16_t n = (bg == 1 ? N_ZC_1 : N_ZC_2) * z_c;
+   if (n_cb == n) {
+   if (rv_

Re: [dpdk-dev] [PATCH] usertools/dpdk-devbind: add support for PCI wildcards

[Ferruh Yigit]

On 8/20/2020 1:23 PM, Bruce Richardson wrote:
> When binding or unbinding a range of devices, it can be useful to use
> wildcards to specify the devices rather than repeating the same prefix
> multiple times. We can use the python "glob" module to give us this
> functionality - at least for PCI devices - by checking /sys for matching
> files.
> 
> Examples of use from my system:
> 
> ./dpdk-devbind.py -b vfio-pci 80:04.*
> ./dpdk-devbind.py -u 80:04.[2-7]
> 
> The first example binds eight devices, 80:04.0..80:04.7, to vfio-pci. The
> second then unbinds six of those devices, 80:04.2..80:04.7, from any
> driver.
> 
> Signed-off-by: Bruce Richardson 

This is useful, thanks.
Tested-by: Ferruh Yigit 

It can be good to document this new capability in the 'help' output
(./usertools/dpdk-devbind.py --usage).

[dpdk-dev] [PATCH v1 01/13] common/mlx5: replace strsep with strtok_r

[Ophir Munk]

From: Ophir Munk 

strsep() is a non-standardized API (by C or POSIX) and thus it is
non-portable between different operating systems. Replace it with
strtok_r() which is standardized by the C standard, and hence also by
POSIX.
The replacement occurs in the code that extracts individual PCI class
names (e.g. class=net:vdpa:foo:bar).

Signed-off-by: Ophir Munk 
Acked-by: Matan Azrad 
---
 drivers/common/mlx5/mlx5_common_pci.c | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_common_pci.c 
b/drivers/common/mlx5/mlx5_common_pci.c
index d4ff039..02417c6 100644
--- a/drivers/common/mlx5/mlx5_common_pci.c
+++ b/drivers/common/mlx5/mlx5_common_pci.c
@@ -72,6 +72,7 @@ bus_cmdline_options_handler(__rte_unused const char *key,
int class_val;
char *found;
char *nstr;
+   char *refstr = NULL;
 
*ret = 0;
nstr = strdup(class_names);
@@ -80,21 +81,22 @@ bus_cmdline_options_handler(__rte_unused const char *key,
return *ret;
}
nstr_org = nstr;
-   while (nstr) {
+   found = strtok_r(nstr, ":", &refstr);
+   if (!found)
+   goto err;
+   do {
/* Extract each individual class name. Multiple
 * class key,value is supplied as class=net:vdpa:foo:bar.
 */
-   found = strsep(&nstr, ":");
-   if (!found)
-   continue;
-   /* Check if its a valid class. */
class_val = class_name_to_value(found);
+   /* Check if its a valid class. */
if (class_val < 0) {
*ret = -EINVAL;
goto err;
}
*ret |= class_val;
-   }
+   found = strtok_r(NULL, ":", &refstr);
+   } while (found);
 err:
free(nstr_org);
if (*ret < 0)
-- 
2.8.4

[dpdk-dev] [PATCH v1 04/13] net/mlx5: move mlx5_get_ifname prototype under Linux

[Ophir Munk]

From: Ophir Munk 

mlx5_get_ifname() prototype includes 'IF_NAMESIZE' definition from Linux
file net/if.h. Since this API is only used under Linux and to enable
compilation under non-Linux OS - move this prototype from shared file
mlx5.h to file linux/mlx5_os.h.

Signed-off-by: Ophir Munk 
Acked-by: Matan Azrad 
---
 drivers/net/mlx5/linux/mlx5_os.h | 6 ++
 drivers/net/mlx5/mlx5.c  | 1 -
 drivers/net/mlx5/mlx5.h  | 2 --
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mlx5/linux/mlx5_os.h b/drivers/net/mlx5/linux/mlx5_os.h
index 31add39..759def2 100644
--- a/drivers/net/mlx5/linux/mlx5_os.h
+++ b/drivers/net/mlx5/linux/mlx5_os.h
@@ -6,6 +6,8 @@
 #ifndef RTE_PMD_MLX5_OS_H_
 #define RTE_PMD_MLX5_OS_H_
 
+#include 
+
 /* verb enumerations translations to local enums. */
 enum {
DEV_SYSFS_NAME_MAX = IBV_SYSFS_NAME_MAX + 1,
@@ -15,4 +17,8 @@ enum {
 #define PCI_DRV_FLAGS  (RTE_PCI_DRV_INTR_LSC | \
RTE_PCI_DRV_INTR_RMV | \
RTE_PCI_DRV_PROBE_AGAIN)
+
+/* mlx5_ethdev_os.c */
+
+int mlx5_get_ifname(const struct rte_eth_dev *dev, char 
(*ifname)[IF_NAMESIZE]);
 #endif /* RTE_PMD_MLX5_OS_H_ */
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 1e4c695..b099b23 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -9,7 +9,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 1880a82..3aea3b5 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -10,7 +10,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -813,7 +812,6 @@ int mlx5_dev_configure_rss_reta(struct rte_eth_dev *dev);
 
 /* mlx5_ethdev_os.c */
 
-int mlx5_get_ifname(const struct rte_eth_dev *dev, char 
(*ifname)[IF_NAMESIZE]);
 unsigned int mlx5_ifindex(const struct rte_eth_dev *dev);
 int mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[RTE_ETHER_ADDR_LEN]);
 int mlx5_get_mtu(struct rte_eth_dev *dev, uint16_t *mtu);
-- 
2.8.4

[dpdk-dev] [PATCH v1 02/13] common/mlx5: replace linux __bexx types with rte

[Ophir Munk]

From: Ophir Munk 

Replace Linux specific int types with their corresponding rte typedefs.
__be16 ==> rte_be16_t
__be32 ==> rte_be32_t
__be64 ==> rte_be64_t

Signed-off-by: Ophir Munk 
Acked-by: Matan Azrad 
---
 drivers/common/mlx5/mlx5_prm.h | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index e0ebe12..69511bc 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -608,7 +608,7 @@ typedef uint8_t u8;
 #define MLX5_SET(typ, p, fld, v) \
do { \
u32 _v = v; \
-   *((__be32 *)(p) + __mlx5_dw_off(typ, fld)) = \
+   *((rte_be32_t *)(p) + __mlx5_dw_off(typ, fld)) = \
rte_cpu_to_be_32((rte_be_to_cpu_32(*((u32 *)(p) + \
  __mlx5_dw_off(typ, fld))) & \
  (~__mlx5_dw_mask(typ, fld))) | \
@@ -619,15 +619,15 @@ typedef uint8_t u8;
 #define MLX5_SET64(typ, p, fld, v) \
do { \
MLX5_ASSERT(__mlx5_bit_sz(typ, fld) == 64); \
-   *((__be64 *)(p) + __mlx5_64_off(typ, fld)) = \
+   *((rte_be64_t *)(p) + __mlx5_64_off(typ, fld)) = \
rte_cpu_to_be_64(v); \
} while (0)
 
 #define MLX5_SET16(typ, p, fld, v) \
do { \
u16 _v = v; \
-   *((__be16 *)(p) + __mlx5_16_off(typ, fld)) = \
-   rte_cpu_to_be_16((rte_be_to_cpu_16(*((__be16 *)(p) + \
+   *((rte_be16_t *)(p) + __mlx5_16_off(typ, fld)) = \
+   rte_cpu_to_be_16((rte_be_to_cpu_16(*((rte_be16_t *)(p) + \
  __mlx5_16_off(typ, fld))) & \
  (~__mlx5_16_mask(typ, fld))) | \
 (((_v) & __mlx5_mask16(typ, fld)) << \
@@ -639,14 +639,14 @@ typedef uint8_t u8;
__mlx5_dw_off(typ, fld))) >> __mlx5_dw_bit_off(typ, fld)) & \
__mlx5_mask(typ, fld))
 #define MLX5_GET(typ, p, fld) \
-   ((rte_be_to_cpu_32(*((__be32 *)(p) +\
+   ((rte_be_to_cpu_32(*((rte_be32_t *)(p) +\
__mlx5_dw_off(typ, fld))) >> __mlx5_dw_bit_off(typ, fld)) & \
__mlx5_mask(typ, fld))
 #define MLX5_GET16(typ, p, fld) \
-   ((rte_be_to_cpu_16(*((__be16 *)(p) + \
+   ((rte_be_to_cpu_16(*((rte_be16_t *)(p) + \
  __mlx5_16_off(typ, fld))) >> __mlx5_16_bit_off(typ, fld)) & \
 __mlx5_mask16(typ, fld))
-#define MLX5_GET64(typ, p, fld) rte_be_to_cpu_64(*((__be64 *)(p) + \
+#define MLX5_GET64(typ, p, fld) rte_be_to_cpu_64(*((rte_be64_t *)(p) + \
   __mlx5_64_off(typ, fld)))
 #define MLX5_FLD_SZ_BYTES(typ, fld) (__mlx5_bit_sz(typ, fld) / 8)
 
-- 
2.8.4

[dpdk-dev] [PATCH v1 05/13] net/mlx5: fix removal of unused inclusion files

[Ophir Munk]

From: Ophir Munk 

Remove unused Linux included files:

,  from file net/mlx5/mlx5_mac.c
 from file net/mlx5/mlx5.c

Fixes: 771fa900b73a ("mlx5: introduce new driver for Mellanox ConnectX-4 
adapters")
Cc: sta...@dpdk.org

Signed-off-by: Ophir Munk 
Acked-by: Matan Azrad 
---
 drivers/net/mlx5/mlx5.c | 1 -
 drivers/net/mlx5/mlx5_mac.c | 2 --
 2 files changed, 3 deletions(-)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index b099b23..ca60926 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -9,7 +9,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c
index 88c52b2..bd786fd 100644
--- a/drivers/net/mlx5/mlx5_mac.c
+++ b/drivers/net/mlx5/mlx5_mac.c
@@ -9,8 +9,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 
 #include 
 #include 
-- 
2.8.4

[dpdk-dev] [PATCH v1 06/13] net/mlx5: remove Netlink dependency in shared code

[Ophir Munk]

From: Ophir Munk 

This commit adds Linux implementation of routine mlx5_os_mac_addr_flush
as wrapper to Netlink API to avoid direct calls under non-Linux
operating systems.

Signed-off-by: Ophir Munk 
Acked-by: Matan Azrad 
---
 drivers/net/mlx5/linux/mlx5_os.c | 18 ++
 drivers/net/mlx5/mlx5.c  |  7 ++-
 drivers/net/mlx5/mlx5.h  |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index db955ae..bf1f82b 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -45,6 +45,7 @@
 #include "mlx5_flow.h"
 #include "rte_pmd_mlx5.h"
 #include "mlx5_verbs.h"
+#include "mlx5_nl.h"
 
 #define MLX5_TAGS_HLIST_ARRAY_SIZE 8192
 
@@ -2332,6 +2333,23 @@ mlx5_os_set_allmulti(struct rte_eth_dev *dev, int enable)
mlx5_ifindex(dev), !!enable);
 }
 
+/**
+ * Flush device MAC addresses
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ *
+ */
+void
+mlx5_os_mac_addr_flush(struct rte_eth_dev *dev)
+{
+   struct mlx5_priv *priv = dev->data->dev_private;
+
+   mlx5_nl_mac_addr_flush(priv->nl_socket_route, mlx5_ifindex(dev),
+  dev->data->mac_addrs,
+  MLX5_MAX_MAC_ADDRESSES, priv->mac_own);
+}
+
 const struct eth_dev_ops mlx5_os_dev_ops = {
.dev_configure = mlx5_dev_configure,
.dev_start = mlx5_dev_start,
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index ca60926..fdda6ff 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -9,7 +9,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -1406,9 +1405,7 @@ mlx5_dev_close(struct rte_eth_dev *dev)
if (priv->reta_idx != NULL)
mlx5_free(priv->reta_idx);
if (priv->config.vf)
-   mlx5_nl_mac_addr_flush(priv->nl_socket_route, mlx5_ifindex(dev),
-  dev->data->mac_addrs,
-  MLX5_MAX_MAC_ADDRESSES, priv->mac_own);
+   mlx5_os_mac_addr_flush(dev);
if (priv->nl_socket_route >= 0)
close(priv->nl_socket_route);
if (priv->nl_socket_rdma >= 0)
@@ -1446,7 +1443,7 @@ mlx5_dev_close(struct rte_eth_dev *dev)
/*
 * Free the shared context in last turn, because the cleanup
 * routines above may use some shared fields, like
-* mlx5_nl_mac_addr_flush() uses ibdev_path for retrieveing
+* mlx5_os_mac_addr_flush() uses ibdev_path for retrieveing
 * ifindex if Netlink fails.
 */
mlx5_free_shared_dev_ctx(priv->sh);
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 3aea3b5..a45bd0b 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -24,7 +24,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -1018,6 +1017,7 @@ int mlx5_os_vf_mac_addr_modify(struct mlx5_priv *priv, 
unsigned int iface_idx,
 int mlx5_os_set_promisc(struct rte_eth_dev *dev, int enable);
 int mlx5_os_set_allmulti(struct rte_eth_dev *dev, int enable);
 int mlx5_os_set_nonblock_channel_fd(int fd);
+void mlx5_os_mac_addr_flush(struct rte_eth_dev *dev);
 
 /* mlx5_txpp.c */
 
-- 
2.8.4

[dpdk-dev] [PATCH v1 03/13] net/mlx5: rename mlx5 enumeration REG_NONE

[Ophir Munk]

From: Ophir Munk 

Enumerated variable REG_NONE (defined in mlx5_prm.h) is in conflict with
Windows definition (winnt.h): #define REG_NONE ( 0ul ) // No value type
To enable mlx5 PMD Windows compilation - rename REG_NONE as REG_NON.

Signed-off-by: Ophir Munk 
Acked-by: Matan Azrad 
---
 drivers/common/mlx5/mlx5_prm.h  |  2 +-
 drivers/net/mlx5/mlx5_flow.c| 22 +++---
 drivers/net/mlx5/mlx5_flow_dv.c |  8 
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index 69511bc..563e7c8 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -539,7 +539,7 @@ enum mlx5_modification_field {
 #define MLX5_MREG_C_NUM (MLX5_MODI_META_REG_C_7 - MLX5_MODI_META_REG_C_0 + 1)
 
 enum modify_reg {
-   REG_NONE = 0,
+   REG_NON = 0,
REG_A,
REG_B,
REG_C_0,
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 7150173..9aad24e 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -353,7 +353,7 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev,
case MLX5_METADATA_FDB:
switch (config->dv_xmeta_en) {
case MLX5_XMETA_MODE_LEGACY:
-   return REG_NONE;
+   return REG_NON;
case MLX5_XMETA_MODE_META16:
return REG_C_0;
case MLX5_XMETA_MODE_META32:
@@ -363,7 +363,7 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev,
case MLX5_FLOW_MARK:
switch (config->dv_xmeta_en) {
case MLX5_XMETA_MODE_LEGACY:
-   return REG_NONE;
+   return REG_NON;
case MLX5_XMETA_MODE_META16:
return REG_C_1;
case MLX5_XMETA_MODE_META32:
@@ -381,7 +381,7 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev,
return priv->mtr_color_reg != REG_C_2 ? REG_C_2 :
   REG_C_3;
case MLX5_MTR_COLOR:
-   MLX5_ASSERT(priv->mtr_color_reg != REG_NONE);
+   MLX5_ASSERT(priv->mtr_color_reg != REG_NON);
return priv->mtr_color_reg;
case MLX5_COPY_MARK:
/*
@@ -404,7 +404,7 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev,
return rte_flow_error_set(error, EINVAL,
  RTE_FLOW_ERROR_TYPE_ITEM,
  NULL, "invalid tag id");
-   if (config->flow_mreg_c[id + start_reg - REG_C_0] == REG_NONE)
+   if (config->flow_mreg_c[id + start_reg - REG_C_0] == REG_NON)
return rte_flow_error_set(error, ENOTSUP,
  RTE_FLOW_ERROR_TYPE_ITEM,
  NULL, "unsupported tag id");
@@ -421,7 +421,7 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev,
   RTE_FLOW_ERROR_TYPE_ITEM,
NULL, "invalid tag id");
if (config->flow_mreg_c
-   [id + 1 + start_reg - REG_C_0] != REG_NONE)
+   [id + 1 + start_reg - REG_C_0] != REG_NON)
return config->flow_mreg_c
   [id + 1 + start_reg - REG_C_0];
return rte_flow_error_set(error, ENOTSUP,
@@ -459,7 +459,7 @@ mlx5_flow_ext_mreg_supported(struct rte_eth_dev *dev)
 * - reg_c's are preserved across different domain (FDB and NIC) on
 *   packet loopback by flow lookup miss.
 */
-   return config->flow_mreg_c[2] != REG_NONE;
+   return config->flow_mreg_c[2] != REG_NON;
 }
 
 /**
@@ -3011,7 +3011,7 @@ flow_mreg_add_copy_action(struct rte_eth_dev *dev, 
uint32_t mark_id,
};
struct mlx5_flow_action_copy_mreg cp_mreg = {
.dst = REG_B,
-   .src = REG_NONE,
+   .src = REG_NON,
};
struct rte_flow_action_jump jump = {
.group = MLX5_FLOW_MREG_ACT_TABLE_GROUP,
@@ -3499,7 +3499,7 @@ flow_hairpin_split(struct rte_eth_dev *dev,
actions_rx++;
set_tag = (void *)actions_rx;
set_tag->id = mlx5_flow_get_reg_id(dev, MLX5_HAIRPIN_RX, 0, NULL);
-   MLX5_ASSERT(set_tag->id > REG_NONE);
+   MLX5_ASSERT(set_tag->id > REG_NON);
set_tag->data = *flow_id;
tag_action->conf = set_tag;
/* Create Tx item list. */
@@ -3511,7 +3511,7 @@ flow_hairpin_split(struct rte_eth_dev *dev,
tag_item = (void *)addr;
tag_item->data = *flow_id;
tag_item->id = mlx5_flow_get_reg_id(dev, MLX5_HAIRPIN_TX, 0, NULL);
-   MLX5_ASSERT(set_tag->id > REG_NONE);
+   MLX5_ASSERT(set_tag->id > REG_NON);
item->spec = tag_i

[dpdk-dev] [PATCH v1 11/13] net/mlx5: remove ibv_* dependency in rx/tx objects

[Ophir Munk]

From: Ophir Munk 

Replace pointers to ibv structs with pointers to void (file
mlx5_rxtx.h).  Specifically the following pointers were replaced:
'struct ibv_cq *', 'struct ibv_wq *', 'struct ibv_comp_channel *',
'struct ibv_rwq_ind_table *a', 'struct ibv_qp *'.

Signed-off-by: Ophir Munk 
Acked-by: Matan Azrad 
---
 drivers/net/mlx5/mlx5_rxq.c | 14 +++---
 drivers/net/mlx5/mlx5_rxtx.h| 14 +++---
 drivers/net/mlx5/mlx5_trigger.c |  2 +-
 drivers/net/mlx5/mlx5_txq.c |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 79eb8f8..534f1b7 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -1444,7 +1444,7 @@ mlx5_devx_wq_attr_fill(struct mlx5_priv *priv, struct 
mlx5_rxq_ctrl *rxq_ctrl,
wq_attr->dbr_addr = rxq_ctrl->rq_dbr_offset;
wq_attr->dbr_umem_id = rxq_ctrl->rq_dbr_umem_id;
wq_attr->dbr_umem_valid = 1;
-   wq_attr->wq_umem_id = rxq_ctrl->wq_umem->umem_id;
+   wq_attr->wq_umem_id = mlx5_os_get_umem_id(rxq_ctrl->wq_umem);
wq_attr->wq_umem_valid = 1;
 }
 
@@ -1620,8 +1620,8 @@ mlx5_devx_cq_new(struct rte_eth_dev *dev, unsigned int 
cqe_n, uint16_t idx,
DRV_LOG(ERR, "Failed to register umem for CQ.");
goto error;
}
-   cq_attr.uar_page_id = priv->sh->devx_rx_uar->page_id;
-   cq_attr.q_umem_id = rxq_ctrl->cq_umem->umem_id;
+   cq_attr.uar_page_id = 
mlx5_os_get_devx_uar_page_id(priv->sh->devx_rx_uar);
+   cq_attr.q_umem_id = mlx5_os_get_umem_id(rxq_ctrl->cq_umem);
cq_attr.q_umem_valid = 1;
cq_attr.log_cq_size = log_cqe_n;
cq_attr.log_page_size = rte_log2_u32(page_size);
@@ -1789,7 +1789,7 @@ mlx5_rxq_obj_new(struct rte_eth_dev *dev, uint16_t idx,
rte_errno = ENOMEM;
goto error;
}
-   tmpl->fd = tmpl->ibv_channel->fd;
+   tmpl->fd = ((struct ibv_comp_channel 
*)(tmpl->ibv_channel))->fd;
} else if (tmpl->type == MLX5_RXQ_OBJ_TYPE_DEVX_RQ) {
int devx_ev_flag =
  MLX5DV_DEVX_CREATE_EVENT_CHANNEL_FLAGS_OMIT_EV_DATA;
@@ -1805,7 +1805,7 @@ mlx5_rxq_obj_new(struct rte_eth_dev *dev, uint16_t idx,
rte_errno);
goto error;
}
-   tmpl->fd = tmpl->devx_channel->fd;
+   tmpl->fd = 
mlx5_os_get_devx_channel_fd(tmpl->devx_channel);
}
}
if (mlx5_rxq_mprq_enabled(rxq_data))
@@ -1897,7 +1897,7 @@ mlx5_rxq_obj_new(struct rte_eth_dev *dev, uint16_t idx,
rxq_data->cq_db =
(uint32_t *)((uintptr_t)dbr_page->dbrs +
 (uintptr_t)rxq_ctrl->cq_dbr_offset);
-   rxq_data->cq_uar = priv->sh->devx_rx_uar->base_addr;
+   rxq_data->cq_uar = 
mlx5_os_get_devx_uar_base_addr(priv->sh->devx_rx_uar);
/* Create CQ using DevX API. */
tmpl->devx_cq = mlx5_devx_cq_new(dev, cqe_n, idx, tmpl);
if (!tmpl->devx_cq) {
@@ -3296,7 +3296,7 @@ mlx5_ind_table_obj_drop_new(struct rte_eth_dev *dev)
(priv->sh->ctx,
 &(struct ibv_rwq_ind_table_init_attr){
.log_ind_tbl_size = 0,
-   .ind_tbl = &rxq->wq,
+   .ind_tbl = (struct ibv_wq **)&rxq->wq,
.comp_mask = 0,
 });
if (!tmpl.ind_table) {
diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
index 0fc7754..f3fe2e1 100644
--- a/drivers/net/mlx5/mlx5_rxtx.h
+++ b/drivers/net/mlx5/mlx5_rxtx.h
@@ -178,9 +178,9 @@ struct mlx5_rxq_obj {
RTE_STD_C11
union {
struct {
-   struct ibv_wq *wq; /* Work Queue. */
-   struct ibv_cq *ibv_cq; /* Completion Queue. */
-   struct ibv_comp_channel *ibv_channel;
+   void *wq; /* Work Queue. */
+   void *ibv_cq; /* Completion Queue. */
+   void *ibv_channel;
};
struct {
struct mlx5_devx_obj *rq; /* DevX Rx Queue object. */
@@ -229,7 +229,7 @@ struct mlx5_ind_table_obj {
enum mlx5_ind_tbl_type type;
RTE_STD_C11
union {
-   struct ibv_rwq_ind_table *ind_table; /**< Indirection table. */
+   void *ind_table; /**< Indirection table. */
struct mlx5_devx_obj *rqt; /* DevX RQT object. */
};
uint32_t queues_n; /**< Number of queues in the list. */
@@ -243,7 +243,7 @@ struct mlx5_hrxq {
struct mlx5_ind_table_obj *ind_table; /* Indirection table. */
RTE_STD_C11
union {
-  

[dpdk-dev] [PATCH v1 07/13] net/mlx5: fix unused utility macros

[Ophir Munk]

From: Ophir Munk 

Remove utility macros INFO, WARN, ERROR. They are not in use and
conflict with identical definitions when compiled under Windows.

Fixes: 80f2d0ed7ff9 ("net/mlx5: add hardware flow debug dump")
Cc: sta...@dpdk.org

Signed-off-by: Ophir Munk 
Acked-by: Matan Azrad 
---
 drivers/net/mlx5/mlx5_utils.h | 4 
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h
index 97d931f..f078bdc 100644
--- a/drivers/net/mlx5/mlx5_utils.h
+++ b/drivers/net/mlx5/mlx5_utils.h
@@ -35,10 +35,6 @@ extern int mlx5_logtype;
__VA_ARGS__ PMD_DRV_LOG_STRIP PMD_DRV_LOG_OPAREN, \
PMD_DRV_LOG_CPAREN)
 
-#define INFO(...) DRV_LOG(INFO, __VA_ARGS__)
-#define WARN(...) DRV_LOG(WARNING, __VA_ARGS__)
-#define ERROR(...) DRV_LOG(ERR, __VA_ARGS__)
-
 /* Convenience macros for accessing mbuf fields. */
 #define NEXT(m) ((m)->next)
 #define DATA_LEN(m) ((m)->data_len)
-- 
2.8.4

[dpdk-dev] [PATCH v1 13/13] linux/mlx5: refactor VLAN

[Ophir Munk]

From: Ophir Munk 

File mlx5_vlan.c contains Netlink APIs (Linux dependent) as part of VM
workaround implementation. Move this implementation to file
linux/mlx5_vlan_os.c.  To remove Netlink dependency in header files
change pointer of type 'struct mlx5_nl_vlan_vmwa_context *' to 'void *'.

Signed-off-by: Ophir Munk 
Acked-by: Matan Azrad 
---
 drivers/net/mlx5/Makefile |   1 +
 drivers/net/mlx5/linux/meson.build|   1 +
 drivers/net/mlx5/linux/mlx5_vlan_os.c | 168 ++
 drivers/net/mlx5/mlx5.h   |   8 +-
 drivers/net/mlx5/mlx5_vlan.c  | 134 ---
 5 files changed, 175 insertions(+), 137 deletions(-)
 create mode 100644 drivers/net/mlx5/linux/mlx5_vlan_os.c

diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index 568c772..6097688 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -36,6 +36,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_os.c
 SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_ethdev_os.c
 SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_verbs.c
 SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_mp_os.c
+SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_vlan_os.c
 
 # Basic CFLAGS.
 CFLAGS += -O3
diff --git a/drivers/net/mlx5/linux/meson.build 
b/drivers/net/mlx5/linux/meson.build
index 2def8e3..6c44021 100644
--- a/drivers/net/mlx5/linux/meson.build
+++ b/drivers/net/mlx5/linux/meson.build
@@ -8,5 +8,6 @@ sources += files(
'mlx5_ethdev_os.c',
'mlx5_verbs.c',
'mlx5_mp_os.c',
+   'mlx5_vlan_os.c',
 )
 
diff --git a/drivers/net/mlx5/linux/mlx5_vlan_os.c 
b/drivers/net/mlx5/linux/mlx5_vlan_os.c
new file mode 100644
index 000..92fc17d
--- /dev/null
+++ b/drivers/net/mlx5/linux/mlx5_vlan_os.c
@@ -0,0 +1,168 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2015 6WIND S.A.
+ * Copyright 2015 Mellanox Technologies, Ltd
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+/*
+ * Not needed by this file; included to work around the lack of off_t
+ * definition for mlx5dv.h with unpatched rdma-core versions.
+ */
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+/*
+ * Release VLAN network device, created for VM workaround.
+ *
+ * @param[in] dev
+ *   Ethernet device object, Netlink context provider.
+ * @param[in] vlan
+ *   Object representing the network device to release.
+ */
+void
+mlx5_vlan_vmwa_release(struct rte_eth_dev *dev,
+   struct mlx5_vf_vlan *vlan)
+{
+   struct mlx5_priv *priv = dev->data->dev_private;
+   struct mlx5_nl_vlan_vmwa_context *vmwa = priv->vmwa_context;
+   struct mlx5_nl_vlan_dev *vlan_dev = &vmwa->vlan_dev[0];
+
+   MLX5_ASSERT(vlan->created);
+   MLX5_ASSERT(priv->vmwa_context);
+   if (!vlan->created || !vmwa)
+   return;
+   vlan->created = 0;
+   MLX5_ASSERT(vlan_dev[vlan->tag].refcnt);
+   if (--vlan_dev[vlan->tag].refcnt == 0 &&
+   vlan_dev[vlan->tag].ifindex) {
+   mlx5_nl_vlan_vmwa_delete(vmwa, vlan_dev[vlan->tag].ifindex);
+   vlan_dev[vlan->tag].ifindex = 0;
+   }
+}
+
+/**
+ * Acquire VLAN interface with specified tag for VM workaround.
+ *
+ * @param[in] dev
+ *   Ethernet device object, Netlink context provider.
+ * @param[in] vlan
+ *   Object representing the network device to acquire.
+ */
+void
+mlx5_vlan_vmwa_acquire(struct rte_eth_dev *dev,
+   struct mlx5_vf_vlan *vlan)
+{
+   struct mlx5_priv *priv = dev->data->dev_private;
+   struct mlx5_nl_vlan_vmwa_context *vmwa = priv->vmwa_context;
+   struct mlx5_nl_vlan_dev *vlan_dev = &vmwa->vlan_dev[0];
+
+   MLX5_ASSERT(!vlan->created);
+   MLX5_ASSERT(priv->vmwa_context);
+   if (vlan->created || !vmwa)
+   return;
+   if (vlan_dev[vlan->tag].refcnt == 0) {
+   MLX5_ASSERT(!vlan_dev[vlan->tag].ifindex);
+   vlan_dev[vlan->tag].ifindex =
+   mlx5_nl_vlan_vmwa_create(vmwa, vmwa->vf_ifindex,
+vlan->tag);
+   }
+   if (vlan_dev[vlan->tag].ifindex) {
+   vlan_dev[vlan->tag].refcnt++;
+   vlan->created = 1;
+   }
+}
+
+/*
+ * Create per ethernet device VLAN VM workaround context
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ * @param ifindex
+ *   Interface index.
+ *
+ * @Return
+ *   Pointer to mlx5_nl_vlan_vmwa_context
+ */
+void *
+mlx5_vlan_vmwa_init(struct rte_eth_dev *dev, uint32_t ifindex)
+{
+   struct mlx5_priv *priv = dev->data->dev_private;
+   struct mlx5_dev_config *config = &priv->config;
+   struct mlx5_nl_vlan_vmwa_context *vmwa;
+   enum rte_hypervisor hv_type;
+
+   /* Do not engage workaround over PF. */
+   if (!config->vf)
+   return NULL;
+   /* Check whether there is desired virtual environment */
+   hv_type = rte_

[dpdk-dev] [PATCH v1 09/13] net/mlx5: add ICMP protocol number definition

[Ophir Munk]

From: Ophir Munk 

Some Windows distributions do not include ICMP protocol definitions
IPPROTO_ICMP and IPPROTO_ICMPV6. This commit defines them if needed.

Signed-off-by: Ophir Munk 
Acked-by: Matan Azrad 
---
 drivers/net/mlx5/mlx5_flow.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 9aad24e..4c29898 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1244,6 +1244,10 @@ mlx5_flow_validate_attributes(struct rte_eth_dev *dev,
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
+
+#ifndef IPPROTO_ICMPV6
+#define IPPROTO_ICMPV6  58
+#endif
 int
 mlx5_flow_validate_item_icmp6(const struct rte_flow_item *item,
   uint64_t item_flags,
@@ -1296,6 +1300,9 @@ mlx5_flow_validate_item_icmp6(const struct rte_flow_item 
*item,
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
+#ifndef IPPROTO_ICMP
+#define IPPROTO_ICMP  1
+#endif
 int
 mlx5_flow_validate_item_icmp(const struct rte_flow_item *item,
 uint64_t item_flags,
-- 
2.8.4

[dpdk-dev] [PATCH v1 08/13] net/mlx5: call meter detach only if DR is supported

[Ophir Munk]

From: Ophir Munk 

Flow metering is supported only in direct rules (DR). Currently the APIs
of meter actions create and modify are under #ifdef
HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER, while detaching the meter action
is executed unconditionally. This commit adds the same ifdef to API
mlx5_flow_meter_detach().
This commit avoids compilation failure of non-Linux operating systems
which do not support DR.

Signed-off-by: Ophir Munk 
Acked-by: Matan Azrad 
---
 drivers/net/mlx5/mlx5_flow_meter.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow_meter.c 
b/drivers/net/mlx5/mlx5_flow_meter.c
index bf34687..b36bc7b 100644
--- a/drivers/net/mlx5/mlx5_flow_meter.c
+++ b/drivers/net/mlx5/mlx5_flow_meter.c
@@ -1221,6 +1221,7 @@ mlx5_flow_meter_attach(struct mlx5_priv *priv, uint32_t 
meter_id,
 void
 mlx5_flow_meter_detach(struct mlx5_flow_meter *fm)
 {
+#ifdef HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER
MLX5_ASSERT(fm->ref_cnt);
if (--fm->ref_cnt)
return;
@@ -1230,6 +1231,9 @@ mlx5_flow_meter_detach(struct mlx5_flow_meter *fm)
fm->ingress = 0;
fm->egress = 0;
fm->transfer = 0;
+#else
+   (void)fm;
+#endif
 }
 
 /**
-- 
2.8.4

[dpdk-dev] [PATCH v1 10/13] net/mlx5: remove more DV dependencies

[Ophir Munk]

From: Ophir Munk 

Several DV-based structs of type 'struct mlx5dv_devx_XXX' are replaced
with 'void *' to enable compilation under non-Linux operating systems.
New getter functions were added to retrieve the specific fields that
were previously accessed directly.

Replaced structs:
'struct mlx5dv_pp *'
'struct mlx5dv_devx_event_channel *'
'struct mlx5dv_devx_umem *'
'struct mlx5dv_devx_uar *'

Signed-off-by: Ophir Munk 
Acked-by: Matan Azrad 
---
 drivers/common/mlx5/linux/mlx5_common_os.h | 91 ++
 drivers/net/mlx5/mlx5.c| 14 +++--
 drivers/net/mlx5/mlx5.h| 12 ++--
 drivers/net/mlx5/mlx5_rxtx.h   | 10 ++--
 drivers/net/mlx5/mlx5_txpp.c   | 38 +++--
 drivers/net/mlx5/mlx5_txq.c| 17 +++---
 6 files changed, 144 insertions(+), 38 deletions(-)

diff --git a/drivers/common/mlx5/linux/mlx5_common_os.h 
b/drivers/common/mlx5/linux/mlx5_common_os.h
index 55c0902..8301d90 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.h
+++ b/drivers/common/mlx5/linux/mlx5_common_os.h
@@ -90,4 +90,95 @@ mlx5_os_get_umem_id(void *umem)
return 0;
return ((struct mlx5dv_devx_umem *)umem)->umem_id;
 }
+
+/**
+ * Get fd. Given a pointer to DevX channel object of type
+ * 'struct mlx5dv_devx_event_channel*' - return its fd.
+ *
+ * @param[in] channel
+ *Pointer to channel object.
+ *
+ * @return
+ *The fd if channel is valid, 0 otherwise.
+ */
+static inline int
+mlx5_os_get_devx_channel_fd(void *channel)
+{
+   if (!channel)
+   return 0;
+   return ((struct mlx5dv_devx_event_channel *)channel)->fd;
+}
+
+/**
+ * Get mmap offset. Given a pointer to an DevX UAR object of type
+ * 'struct mlx5dv_devx_uar *' - return its mmap offset.
+ *
+ * @param[in] uar
+ *Pointer to UAR object.
+ *
+ * @return
+ *The mmap offset if uar is valid, 0 otherwise.
+ */
+static inline off_t
+mlx5_os_get_devx_uar_mmap_offset(void *uar)
+{
+   if (!uar)
+   return 0;
+   return ((struct mlx5dv_devx_uar *)uar)->mmap_off;
+}
+
+/**
+ * Get base addr pointer. Given a pointer to an UAR object of type
+ * 'struct mlx5dv_devx_uar *' - return its base address.
+ *
+ * @param[in] uar
+ *Pointer to an UAR object.
+ *
+ * @return
+ *The base address if UAR is valid, 0 otherwise.
+ */
+static inline void *
+mlx5_os_get_devx_uar_base_addr(void *uar)
+{
+   if (!uar)
+   return 0;
+   return ((struct mlx5dv_devx_uar *)uar)->base_addr;
+}
+
+/**
+ * Get reg addr pointer. Given a pointer to an UAR object of type
+ * 'struct mlx5dv_devx_uar *' - return its reg address.
+ *
+ * @param[in] uar
+ *Pointer to an UAR object.
+ *
+ * @return
+ *The reg address if UAR is valid, 0 otherwise.
+ */
+static inline void *
+mlx5_os_get_devx_uar_reg_addr(void *uar)
+{
+   if (!uar)
+   return 0;
+   return ((struct mlx5dv_devx_uar *)uar)->reg_addr;
+}
+
+/**
+ * Get page id. Given a pointer to an UAR object of type
+ * 'struct mlx5dv_devx_uar *' - return its page id.
+ *
+ * @param[in] uar
+ *Pointer to an UAR object.
+ *
+ * @return
+ *The page id if UAR is valid, 0 otherwise.
+ */
+static inline uint32_t
+mlx5_os_get_devx_uar_page_id(void *uar)
+{
+   if (!uar)
+   return 0;
+   return ((struct mlx5dv_devx_uar *)uar)->page_id;
+}
+
 #endif /* RTE_PMD_MLX5_COMMON_OS_H_ */
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index fdda6ff..4a807fb 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -723,6 +723,7 @@ mlx5_alloc_rxtx_uars(struct mlx5_dev_ctx_shared *sh,
 {
uint32_t uar_mapping, retry;
int err = 0;
+   void *base_addr;
 
for (retry = 0; retry < MLX5_ALLOC_UAR_RETRY; ++retry) {
 #ifdef MLX5DV_UAR_ALLOC_TYPE_NC
@@ -781,7 +782,8 @@ mlx5_alloc_rxtx_uars(struct mlx5_dev_ctx_shared *sh,
err = ENOMEM;
goto exit;
}
-   if (sh->tx_uar->base_addr)
+   base_addr = mlx5_os_get_devx_uar_base_addr(sh->tx_uar);
+   if (base_addr)
break;
/*
 * The UARs are allocated by rdma_core within the
@@ -820,7 +822,8 @@ mlx5_alloc_rxtx_uars(struct mlx5_dev_ctx_shared *sh,
err = ENOMEM;
goto exit;
}
-   if (sh->devx_rx_uar->base_addr)
+   base_addr = mlx5_os_get_devx_uar_base_addr(sh->devx_rx_uar);
+   if (base_addr)
break;
/*
 * The UARs are allocated by rdma_core within the
@@ -943,8 +946,11 @@ mlx5_alloc_shared_dev_ctx(const struct mlx5_dev_spawn_data 
*spawn,
err = mlx5_alloc_rxtx_uars(sh, config);
if (err)
goto error;
-   MLX5_ASSERT(sh->tx_uar && sh->tx_uar->base_addr);
-   MLX

[dpdk-dev] [PATCH v1 12/13] net/mlx5: separate vlan strip modification

[Ophir Munk]

From: Ophir Munk 

When updating a queue vlan stripping offload - either the WQ is modified
in Verbs or the RQ is modified in DevX.  Add a vlan stripping modify
callback to 'struct mlx5_obj_ops' and assign it with the specic Verbs
and DevX implementations: 'rxq_obj_modify_wq_vlan_strip' and
'rxq_obj_modify_rq_vlan_strip' respectively.

Signed-off-by: Ophir Munk 
Acked-by: Matan Azrad 
---
 drivers/net/mlx5/linux/mlx5_verbs.c | 28 ++
 drivers/net/mlx5/mlx5.h |  6 +
 drivers/net/mlx5/mlx5_devx.c| 48 +
 drivers/net/mlx5/mlx5_devx.h| 12 ++
 drivers/net/mlx5/mlx5_vlan.c| 27 -
 5 files changed, 98 insertions(+), 23 deletions(-)
 create mode 100644 drivers/net/mlx5/mlx5_devx.c
 create mode 100644 drivers/net/mlx5/mlx5_devx.h

diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c 
b/drivers/net/mlx5/linux/mlx5_verbs.c
index d41b0fe..6271f0f 100644
--- a/drivers/net/mlx5/linux/mlx5_verbs.c
+++ b/drivers/net/mlx5/linux/mlx5_verbs.c
@@ -19,6 +19,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 /**
  * Register mr. Given protection domain pointer, pointer to addr and length
@@ -61,3 +62,30 @@ const struct mlx5_verbs_ops mlx5_verbs_ops = {
.reg_mr = mlx5_reg_mr,
.dereg_mr = mlx5_dereg_mr,
 };
+
+/**
+ * Modify Rx WQ vlan stripping offload
+ *
+ * @param rxq_obj
+ *   Rx queue object.
+ *
+ * @return 0 on success, non-0 otherwise
+ */
+static int
+mlx5_rxq_obj_modify_wq_vlan_strip(struct mlx5_rxq_obj *rxq_obj, int on)
+{
+   uint16_t vlan_offloads =
+   (on ? IBV_WQ_FLAGS_CVLAN_STRIPPING : 0) |
+   0;
+   struct ibv_wq_attr mod;
+   mod = (struct ibv_wq_attr){
+   .attr_mask = IBV_WQ_ATTR_FLAGS,
+   .flags_mask = IBV_WQ_FLAGS_CVLAN_STRIPPING,
+   .flags = vlan_offloads,
+   };
+   return mlx5_glue->modify_wq(rxq_obj->wq, &mod);
+}
+
+struct mlx5_obj_ops ibv_obj_ops = {
+   .rxq_obj_modify_vlan_strip = mlx5_rxq_obj_modify_wq_vlan_strip,
+};
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 34d7a15..431f861 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -676,6 +676,11 @@ TAILQ_HEAD(mlx5_flow_meters, mlx5_flow_meter);
 #define MLX5_PROC_PRIV(port_id) \
((struct mlx5_proc_priv *)rte_eth_devices[port_id].process_private)
 
+/* HW objects operations structure. */
+struct mlx5_obj_ops {
+   int (*rxq_obj_modify_vlan_strip)(struct mlx5_rxq_obj *rxq_obj, int on);
+};
+
 struct mlx5_priv {
struct rte_eth_dev_data *dev_data;  /* Pointer to device data. */
struct mlx5_dev_ctx_shared *sh; /* Shared device context. */
@@ -719,6 +724,7 @@ struct mlx5_priv {
void *rss_desc; /* Intermediate rss description resources. */
int flow_idx; /* Intermediate device flow index. */
int flow_nested_idx; /* Intermediate device flow index, nested. */
+   struct mlx5_obj_ops *obj_ops; /* HW objects operations. */
LIST_HEAD(rxq, mlx5_rxq_ctrl) rxqsctrl; /* DPDK Rx queues. */
LIST_HEAD(rxqobj, mlx5_rxq_obj) rxqsobj; /* Verbs/DevX Rx queues. */
uint32_t hrxqs; /* Verbs Hash Rx queues. */
diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
new file mode 100644
index 000..7340412
--- /dev/null
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -0,0 +1,48 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2020 Mellanox Technologies, Ltd
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#include "mlx5.h"
+#include "mlx5_common_os.h"
+#include "mlx5_rxtx.h"
+#include "mlx5_utils.h"
+#include "mlx5_devx.h"
+
+/**
+ * Modify RQ vlan stripping offload
+ *
+ * @param rxq_obj
+ *   Rx queue object.
+ *
+ * @return 0 on success, non-0 otherwise
+ */
+static int
+mlx5_rxq_obj_modify_rq_vlan_strip(struct mlx5_rxq_obj *rxq_obj, int on)
+{
+   struct mlx5_devx_modify_rq_attr rq_attr;
+
+   memset(&rq_attr, 0, sizeof(rq_attr));
+   rq_attr.rq_state = MLX5_RQC_STATE_RDY;
+   rq_attr.state = MLX5_RQC_STATE_RDY;
+   rq_attr.vsd = (on ? 0 : 1);
+   rq_attr.modify_bitmask = MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_VSD;
+   return mlx5_devx_cmd_modify_rq(rxq_obj->rq, &rq_attr);
+}
+
+struct mlx5_obj_ops devx_obj_ops = {
+   .rxq_obj_modify_vlan_strip = mlx5_rxq_obj_modify_rq_vlan_strip,
+};
diff --git a/drivers/net/mlx5/mlx5_devx.h b/drivers/net/mlx5/mlx5_devx.h
new file mode 100644
index 000..844985c
--- /dev/null
+++ b/drivers/net/mlx5/mlx5_devx.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2020 Mellanox Technologies, Ltd
+ */
+
+#ifndef RTE_PMD_MLX5_DEVX_H_
+#define RTE_PMD_MLX5_DEVX_H_
+
+#include "mlx5.h"
+
+extern struct mlx5_obj_ops devx_obj_ops;
+
+#endif /* RTE_PMD_MLX5_DEVX_H_ */
diff --git a/drivers/net/mlx5/mlx5_vlan.c b/drivers/net/mlx5/mlx5_vlan.c
index 899

Re: [dpdk-dev] [PATCH v3 05/11] baseband/acc100: add LDPC processing functions

[Chautru, Nicolas]

Hi Dave, 
This is assuming 6 bits LLR compression packing (ie. first 2 MSB dropped). 
Similar to HARQ compression.
Let me know if unclear, I can clarify further in documentation if not explicit 
enough.
Thanks
Nic

> -Original Message-
> From: Dave Burley 
> Sent: Thursday, August 20, 2020 7:39 AM
> To: Chautru, Nicolas ; dev@dpdk.org
> Cc: Richardson, Bruce 
> Subject: Re: [dpdk-dev] [PATCH v3 05/11] baseband/acc100: add LDPC
> processing functions
> 
> Hi Nic,
> 
> As you've now specified the use of RTE_BBDEV_LDPC_LLR_COMPRESSION for
> this PMB, please could you confirm what the packed format of the LLRs in
> memory looks like?
> 
> Best Regards
> 
> Dave Burley
> 
> 
> From: dev  on behalf of Nicolas Chautru
> 
> Sent: 19 August 2020 01:25
> To: dev@dpdk.org ; akhil.go...@nxp.com
> 
> Cc: bruce.richard...@intel.com ; Nicolas
> Chautru 
> Subject: [dpdk-dev] [PATCH v3 05/11] baseband/acc100: add LDPC processing
> functions
> 
> Adding LDPC decode and encode processing operations
> 
> Signed-off-by: Nicolas Chautru 
> ---
>  drivers/baseband/acc100/rte_acc100_pmd.c | 1625
> +-
>  drivers/baseband/acc100/rte_acc100_pmd.h |    3 +
>  2 files changed, 1626 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c
> b/drivers/baseband/acc100/rte_acc100_pmd.c
> index 7a21c57..5f32813 100644
> --- a/drivers/baseband/acc100/rte_acc100_pmd.c
> +++ b/drivers/baseband/acc100/rte_acc100_pmd.c
> @@ -15,6 +15,9 @@
>  #include 
>  #include 
>  #include 
> +#ifdef RTE_BBDEV_OFFLOAD_COST
> +#include 
> +#endif
> 
>  #include 
>  #include 
> @@ -449,7 +452,6 @@
>  return 0;
>  }
> 
> -
>  /**
>   * Report a ACC100 queue index which is free
>   * Return 0 to 16k for a valid queue_idx or -1 when no queue is available
> @@ -634,6 +636,46 @@
>  struct acc100_device *d = dev->data->dev_private;
> 
>  static const struct rte_bbdev_op_cap bbdev_capabilities[] = {
> +   {
> +   .type   = RTE_BBDEV_OP_LDPC_ENC,
> +   .cap.ldpc_enc = {
> +   .capability_flags =
> +   RTE_BBDEV_LDPC_RATE_MATCH |
> +   RTE_BBDEV_LDPC_CRC_24B_ATTACH |
> +   RTE_BBDEV_LDPC_INTERLEAVER_BYPASS,
> +   .num_buffers_src =
> +   
> RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
> +   .num_buffers_dst =
> +   
> RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
> +   }
> +   },
> +   {
> +   .type   = RTE_BBDEV_OP_LDPC_DEC,
> +   .cap.ldpc_dec = {
> +   .capability_flags =
> +   RTE_BBDEV_LDPC_CRC_TYPE_24B_CHECK |
> +   RTE_BBDEV_LDPC_CRC_TYPE_24B_DROP |
> +   RTE_BBDEV_LDPC_HQ_COMBINE_IN_ENABLE |
> +   RTE_BBDEV_LDPC_HQ_COMBINE_OUT_ENABLE |
> +#ifdef ACC100_EXT_MEM
> +   RTE_BBDEV_LDPC_INTERNAL_HARQ_MEMORY_IN_ENABL
> E |
> +   RTE_BBDEV_LDPC_INTERNAL_HARQ_MEMORY_OUT_ENA
> BLE |
> +#endif
> +   RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE |
> +   RTE_BBDEV_LDPC_DEINTERLEAVER_BYPASS |
> +   RTE_BBDEV_LDPC_DECODE_BYPASS |
> +   RTE_BBDEV_LDPC_DEC_SCATTER_GATHER |
> +   RTE_BBDEV_LDPC_HARQ_6BIT_COMPRESSION |
> +   RTE_BBDEV_LDPC_LLR_COMPRESSION,
> +   .llr_size = 8,
> +   .llr_decimals = 1,
> +   .num_buffers_src =
> +   RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
> +   .num_buffers_hard_out =
> +   RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
> +   .num_buffers_soft_out = 0,
> +   }
> +   },
>  RTE_BBDEV_END_OF_CAPABILITIES_LIST()
>  };
> 
> @@ -669,9 +711,14 @@
>  dev_info->cpu_flag_reqs = NULL;
>  dev_info->min_alignment = 64;
>  dev_info->capabilities = bbdev_capabilities;
> +#ifdef ACC100_EXT_MEM
>  dev_info->harq_buffer_size = d->ddr_size;
> +#else
> +   dev_info->harq_buffer_size = 0;
> +#endif
>  }
> 
> +
>  static const struct rte_bbdev_ops acc100_bbdev_ops = {
>  .setup_queues = acc100_setup_queues,
>  .close = acc100_dev_close,
> @@ -696,6 +743,1577 @@
>  {.device_id = 0},
>  };
> 
> +/* Read flag value 0/1 from bitmap */
> +static inline bool
> +check_bit(uint32_t bitmap, uint32_t bitmask)
> +{
> +   return bitmap & bitmask;
> +}
> +
> +static inline char *
> +mbuf_append(struct rte

Re: [dpdk-dev] [PATCH v3 05/11] baseband/acc100: add LDPC processing functions

[Dave Burley]

Hi Nic

Thank you - it would be useful to have further documentation for clarification 
as the data format isn't explicitly documented in BBDEV.
Best Regards

Dave


From: Chautru, Nicolas 
Sent: 20 August 2020 15:52
To: Dave Burley ; dev@dpdk.org 
Cc: Richardson, Bruce 
Subject: RE: [dpdk-dev] [PATCH v3 05/11] baseband/acc100: add LDPC processing 
functions 
 
Hi Dave, 
This is assuming 6 bits LLR compression packing (ie. first 2 MSB dropped). 
Similar to HARQ compression.
Let me know if unclear, I can clarify further in documentation if not explicit 
enough.
Thanks
Nic

> -Original Message-
> From: Dave Burley 
> Sent: Thursday, August 20, 2020 7:39 AM
> To: Chautru, Nicolas ; dev@dpdk.org
> Cc: Richardson, Bruce 
> Subject: Re: [dpdk-dev] [PATCH v3 05/11] baseband/acc100: add LDPC
> processing functions
> 
> Hi Nic,
> 
> As you've now specified the use of RTE_BBDEV_LDPC_LLR_COMPRESSION for
> this PMB, please could you confirm what the packed format of the LLRs in
> memory looks like?
> 
> Best Regards
> 
> Dave Burley
> 
> 
> From: dev  on behalf of Nicolas Chautru
> 
> Sent: 19 August 2020 01:25
> To: dev@dpdk.org ; akhil.go...@nxp.com
> 
> Cc: bruce.richard...@intel.com ; Nicolas
> Chautru 
> Subject: [dpdk-dev] [PATCH v3 05/11] baseband/acc100: add LDPC processing
> functions
> 
> Adding LDPC decode and encode processing operations
> 
> Signed-off-by: Nicolas Chautru 
> ---
>  drivers/baseband/acc100/rte_acc100_pmd.c | 1625
> +-
>  drivers/baseband/acc100/rte_acc100_pmd.h |    3 +
>  2 files changed, 1626 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c
> b/drivers/baseband/acc100/rte_acc100_pmd.c
> index 7a21c57..5f32813 100644
> --- a/drivers/baseband/acc100/rte_acc100_pmd.c
> +++ b/drivers/baseband/acc100/rte_acc100_pmd.c
> @@ -15,6 +15,9 @@
>  #include 
>  #include 
>  #include 
> +#ifdef RTE_BBDEV_OFFLOAD_COST
> +#include 
> +#endif
> 
>  #include 
>  #include 
> @@ -449,7 +452,6 @@
>  return 0;
>  }
> 
> -
>  /**
>   * Report a ACC100 queue index which is free
>   * Return 0 to 16k for a valid queue_idx or -1 when no queue is available
> @@ -634,6 +636,46 @@
>  struct acc100_device *d = dev->data->dev_private;
> 
>  static const struct rte_bbdev_op_cap bbdev_capabilities[] = {
> +   {
> +   .type   = RTE_BBDEV_OP_LDPC_ENC,
> +   .cap.ldpc_enc = {
> +   .capability_flags =
> +   RTE_BBDEV_LDPC_RATE_MATCH |
> +   RTE_BBDEV_LDPC_CRC_24B_ATTACH |
> +   RTE_BBDEV_LDPC_INTERLEAVER_BYPASS,
> +   .num_buffers_src =
> +   
> RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
> +   .num_buffers_dst =
> +   
> RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
> +   }
> +   },
> +   {
> +   .type   = RTE_BBDEV_OP_LDPC_DEC,
> +   .cap.ldpc_dec = {
> +   .capability_flags =
> +   RTE_BBDEV_LDPC_CRC_TYPE_24B_CHECK |
> +   RTE_BBDEV_LDPC_CRC_TYPE_24B_DROP |
> +   RTE_BBDEV_LDPC_HQ_COMBINE_IN_ENABLE |
> +   RTE_BBDEV_LDPC_HQ_COMBINE_OUT_ENABLE |
> +#ifdef ACC100_EXT_MEM
> +   RTE_BBDEV_LDPC_INTERNAL_HARQ_MEMORY_IN_ENABL
> E |
> +   RTE_BBDEV_LDPC_INTERNAL_HARQ_MEMORY_OUT_ENA
> BLE |
> +#endif
> +   RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE |
> +   RTE_BBDEV_LDPC_DEINTERLEAVER_BYPASS |
> +   RTE_BBDEV_LDPC_DECODE_BYPASS |
> +   RTE_BBDEV_LDPC_DEC_SCATTER_GATHER |
> +   RTE_BBDEV_LDPC_HARQ_6BIT_COMPRESSION |
> +   RTE_BBDEV_LDPC_LLR_COMPRESSION,
> +   .llr_size = 8,
> +   .llr_decimals = 1,
> +   .num_buffers_src =
> +   RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
> +   .num_buffers_hard_out =
> +   RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
> +   .num_buffers_soft_out = 0,
> +   }
> +   },
>  RTE_BBDEV_END_OF_CAPABILITIES_LIST()
>  };
> 
> @@ -669,9 +711,14 @@
>  dev_info->cpu_flag_reqs = NULL;
>  dev_info->min_alignment = 64;
>  dev_info->capabilities = bbdev_capabilities;
> +#ifdef ACC100_EXT_MEM
>  dev_info->harq_buffer_size = d->ddr_size;
> +#else
> +   dev_info->harq_buffer_size = 0;
> +#endif
>  }
> 
> +
>  static const struct rte_bbdev_ops acc100_bbdev_op

Re: [dpdk-dev] [PATCH v2 23/37] doc: remove references to make in cryptodev guides

[Laatz, Kevin]

On 20/08/2020 13:41, Ciara Power wrote:

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Signed-off-by: Ciara Power 
---
  doc/guides/cryptodevs/aesni_gcm.rst |  4 +-
  doc/guides/cryptodevs/aesni_mb.rst  |  4 +-
  doc/guides/cryptodevs/armv8.rst |  3 --
  doc/guides/cryptodevs/caam_jr.rst   | 30 -
  doc/guides/cryptodevs/ccp.rst   | 14 +++---
  doc/guides/cryptodevs/dpaa2_sec.rst | 25 ---
  doc/guides/cryptodevs/dpaa_sec.rst  | 25 ---
  doc/guides/cryptodevs/kasumi.rst| 11 +
  doc/guides/cryptodevs/mvsam.rst | 10 +
  doc/guides/cryptodevs/nitrox.rst|  7 ---
  doc/guides/cryptodevs/null.rst  |  2 +-
  doc/guides/cryptodevs/octeontx.rst  | 12 +-
  doc/guides/cryptodevs/octeontx2.rst |  8 +---
  doc/guides/cryptodevs/openssl.rst   |  6 +--
  doc/guides/cryptodevs/qat.rst   | 67 +++--
  doc/guides/cryptodevs/scheduler.rst |  8 
  doc/guides/cryptodevs/snow3g.rst| 10 +
  doc/guides/cryptodevs/virtio.rst| 20 +++--
  doc/guides/cryptodevs/zuc.rst   | 10 +
  19 files changed, 40 insertions(+), 236 deletions(-)


Reviewed-by: Kevin Laatz 

Re: [dpdk-dev] [PATCH v2 31/37] doc: remove references to make in prog guides

[Laatz, Kevin]

On 20/08/2020 13:41, Ciara Power wrote:

Make is no longer supported for compiling DPDK, references are now
removed in the documentation.

Signed-off-by: Ciara Power 
---
  MAINTAINERS   |   3 +-
  doc/guides/prog_guide/build_app.rst   |  48 +--
  .../prog_guide/dev_kit_build_system.rst   | 331 --
  .../prog_guide/dev_kit_root_make_help.rst | 188 --
  .../prog_guide/env_abstraction_layer.rst  |  17 +-
  ...ib_make_help.rst => ext_app_make_help.rst} |  25 +-
  doc/guides/prog_guide/graph_lib.rst   |   6 +-
  doc/guides/prog_guide/index.rst   |   4 +-
  doc/guides/prog_guide/intro.rst   |   2 +-
  .../prog_guide/ip_fragment_reassembly_lib.rst |   5 -
  .../prog_guide/kernel_nic_interface.rst   |  14 +-
  .../link_bonding_poll_mode_drv_lib.rst|  15 +-
  doc/guides/prog_guide/lto.rst |  12 +-
  doc/guides/prog_guide/mbuf_lib.rst|   4 +-
  doc/guides/prog_guide/mempool_lib.rst |   7 +-
  doc/guides/prog_guide/overview.rst|  12 +-
  doc/guides/prog_guide/profile_app.rst |  17 +-
  doc/guides/prog_guide/qos_framework.rst   |  10 +-
  doc/guides/prog_guide/rcu_lib.rst |   7 +-
  doc/guides/prog_guide/source_org.rst  |  23 +-
  doc/guides/prog_guide/trace_lib.rst   |   3 +-
  .../prog_guide/writing_efficient_code.rst |   3 +-
  22 files changed, 52 insertions(+), 704 deletions(-)
  delete mode 100644 doc/guides/prog_guide/dev_kit_build_system.rst
  delete mode 100644 doc/guides/prog_guide/dev_kit_root_make_help.rst
  rename doc/guides/prog_guide/{ext_app_lib_make_help.rst => 
ext_app_make_help.rst} (69%)


Reviewed-by: Kevin Laatz 

Re: [dpdk-dev] [PATCH] net/ark: fix meson build

[Ed Czeck]

On Thu, Aug 20, 2020 at 7:16 AM Ferruh Yigit  wrote:
>
...
>
> Logging can be controlled in runtime, that is what we should use.
> In data path, we use compile time flags because of the performance issues. So 
> OK
> to have 'CONFIG_RTE_LIBRTE_ARK_DEBUG_RX' & 'CONFIG_RTE_LIBRTE_ARK_DEBUG_TX' as
> compile time flag, but why having compile time flag for rest?

Agreed.  We'll remove most of these macro in the next commit pushing
the behavior
into run-time log control.

> >
> > +Note that enabling debugging options may affect system performance.
> > +These options may be set by specifying them in CFLAG
> > +environment before the meson build set.   E.g.::
> > +
> > +export CFLAGS="-DARK_DEBUG_TRACE"
> > +meson build
> > +
>
> When you passed the flag as above, it is still global to all components in the
> DPDK, this is not just for ark. What is the motivation to remove the
> "RET_LIBRTE_" prefix?

There are 2 issues here.
1) With the makefile flow, users could add other configurations with
the documented
and recommended sed commands.  I.e.,
sed -ri 's/(CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE)=n/\1=y/' build/.config
The makefiles took care of everything from there.  This no longer works with the
meson build flow.  The solution is to set that macro passing it in the
CFLAG environment.
We're open to other recommendations.
2) Is there an advantage of promoting a PMD macro to a global macro?
It seems to add to the noise of dpdk configuration and there are many
PMD specific macros throughout the code base.

>
> >
> >  Building DPDK
> >  -
> > diff --git a/drivers/net/ark/ark_logs.h b/drivers/net/ark/ark_logs.h
> > index 44aac6102..125583475 100644
> > --- a/drivers/net/ark/ark_logs.h
> > +++ b/drivers/net/ark/ark_logs.h
> > @@ -6,14 +6,12 @@
> >  #define _ARK_DEBUG_H_
> >
> >  #include 
> > -#include 
> > -
> >
> >  /* Configuration option to pad TX packets to 60 bytes */
> > -#ifdef RTE_LIBRTE_ARK_PAD_TX
> > -#define ARK_TX_PAD_TO_60   1
> > -#else
> > +#ifdef ARK_NOPAD_TX
> >  #define ARK_TX_PAD_TO_60   0
> > +#else
> > +#define ARK_TX_PAD_TO_60   1
> >  #endif
>
> So you don't want to convert this to runtime configuration.
>
> The point we are reducing compile time flags:
> 1) It forks the code paths and by time it leave not tested, even not compiled
> code paths which may cause rotten code by time.
>
> 2) Multiple code paths will lead deployment problems. When you deploy an
> application, you won't able to change the compile time configuration in 
> customer
> environment and need to re-compile (most probably re-test) and re-deploy it.
> Also there is not easy way to figure out from binary in customer environment
> that with which compile time flags it has been built.
>
> Switching to CFLAGS="..." doesn't make above concerns go away and indeed it
> makes (1) worst since hides the config options within the driver. Previously 
> it
> was possible to trigger each config option and do testing using scripts, now
> since config options are hidden in driver we can't do even that.
>
> Can you please detail why "ARK_TX_PAD_TO_60" is needed exactly?
> And can you please justify why it has to be compile time config option?
>
The need to pad packets is dependent on the underlying FPGA hardware
implementation which lies outside the control of our deliverables.  Thus we
leave control up to our customer and how they deliver and deploy DPDK.  This
needs to be a compile-time macro since the code executes within the
per-packet processing under rte_eth_tx_burst().

We can change the macro to ARK_MIN_TX_PKTLEN, which should have zero
overhead when set to 0.  (I'm assuming that compiles will remove if
(unsigned < 0) blocks.)  Should this be an RTE_LIBRTE macro?  How does
a user change this during compile?

> <...>
>
> > @@ -11,3 +11,5 @@ sources = files('ark_ddm.c',
> >   'ark_pktgen.c',
> >   'ark_rqp.c',
> >   'ark_udm.c')
> > +
> > +install_headers('ark_ext.h')
> >
>
> Installing PMD header file is not required but this has an unique usage.
>
> Ark PMD is wrapper to the external shared library which should implement the
> functions that has prototypes in the 'ark_ext.h'.
>
> Since this header is not needed by users of the dpdk library, but needed by
> extension developers for the ark PMD, I think the header should not be 
> installed.

So is your recommendation that anyone developing an ark pmd extension
must have access to DPDK source, in addition to the installed code?
It seems like one include location is better than two.

Many thanks,
Ed.

[dpdk-dev] [PATCH v2] usertools/dpdk-devbind: add support for PCI wildcards

[Bruce Richardson]

When binding or unbinding a range of devices, it can be useful to use
wildcards to specify the devices rather than repeating the same prefix
multiple times. We can use the python "glob" module to give us this
functionality - at least for PCI devices - by checking /sys for matching
files.

Examples of use from my system:

./dpdk-devbind.py -b vfio-pci 80:04.*
./dpdk-devbind.py -u 80:04.[2-7]

The first example binds eight devices, 80:04.0..80:04.7, to vfio-pci. The
second then unbinds six of those devices, 80:04.2..80:04.7, from any
driver.

Signed-off-by: Bruce Richardson 
Tested-by: Ferruh Yigit 
---
V2: added help text additions
---
 usertools/dpdk-devbind.py | 16 
 1 file changed, 16 insertions(+)

diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py
index 86b6b53c40..d13defbe1a 100755
--- a/usertools/dpdk-devbind.py
+++ b/usertools/dpdk-devbind.py
@@ -8,6 +8,7 @@
 import os
 import getopt
 import subprocess
+from glob import glob
 from os.path import exists, abspath, dirname, basename
 
 if sys.version_info.major < 3:
@@ -89,6 +90,8 @@ def usage():
 where DEVICE1, DEVICE2 etc, are specified via PCI "domain:bus:slot.func" syntax
 or "bus:slot.func" syntax. For devices bound to Linux kernel drivers, they may
 also be referred to by Linux interface name e.g. eth0, eth1, em0, em1, etc.
+If devices are specified using PCI bus:device:func format, then
+shell wildcards and ranges may be used, e.g. 80:04.*, 80:04.[0-3]
 
 Options:
 --help, --usage:
@@ -145,6 +148,9 @@ def usage():
 To bind :02:00.0 and :02:00.1 to the ixgbe kernel driver
 %(argv0)s -b ixgbe 02:00.0 02:00.1
 
+To bind all funcions on device :02:00 to ixgbe kernel driver
+%(argv0)s -b ixgbe 02:00.*
+
 """ % locals())  # replace items from local variables
 
 
@@ -689,6 +695,16 @@ def parse_args():
 else:
 b_flag = arg
 
+# resolve any PCI globs in the args
+new_args = []
+sysfs_path = "/sys/bus/pci/devices/"
+for arg in args:
+globbed_arg = glob(sysfs_path + arg) + glob(sysfs_path + ":" + arg)
+if globbed_arg:
+new_args.extend([a[len(sysfs_path):] for a in globbed_arg])
+else:
+new_args.append(arg)
+args = new_args
 
 def do_arg_actions():
 '''do the actual action requested by the user'''
-- 
2.25.1

Re: [dpdk-dev] [PATCH] usertools/dpdk-devbind: add support for PCI wildcards

[Bruce Richardson]

On Thu, Aug 20, 2020 at 03:44:54PM +0100, Ferruh Yigit wrote:
> On 8/20/2020 1:23 PM, Bruce Richardson wrote:
> > When binding or unbinding a range of devices, it can be useful to use
> > wildcards to specify the devices rather than repeating the same prefix
> > multiple times. We can use the python "glob" module to give us this
> > functionality - at least for PCI devices - by checking /sys for matching
> > files.
> > 
> > Examples of use from my system:
> > 
> > ./dpdk-devbind.py -b vfio-pci 80:04.*
> > ./dpdk-devbind.py -u 80:04.[2-7]
> > 
> > The first example binds eight devices, 80:04.0..80:04.7, to vfio-pci. The
> > second then unbinds six of those devices, 80:04.2..80:04.7, from any
> > driver.
> > 
> > Signed-off-by: Bruce Richardson 
> 
> This is useful, thanks.
> Tested-by: Ferruh Yigit 
> 
> It can be good to document this new capability in the 'help' output
> (./usertools/dpdk-devbind.py --usage).

Yep, good point, added in V2.

[dpdk-dev] [PATCH v3] usertools/dpdk-devbind: add support for PCI wildcards

[Bruce Richardson]

When binding or unbinding a range of devices, it can be useful to use
wildcards to specify the devices rather than repeating the same prefix
multiple times. We can use the python "glob" module to give us this
functionality - at least for PCI devices - by checking /sys for matching
files.

Examples of use from my system:

./dpdk-devbind.py -b vfio-pci 80:04.*
./dpdk-devbind.py -u 80:04.[2-7]

The first example binds eight devices, 80:04.0..80:04.7, to vfio-pci. The
second then unbinds six of those devices, 80:04.2..80:04.7, from any
driver.

Signed-off-by: Bruce Richardson 
Tested-by: Ferruh Yigit 

---
V3: fix typo in help text additions
V2: added help text additions
---
 usertools/dpdk-devbind.py | 16 
 1 file changed, 16 insertions(+)

diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py
index 86b6b53c40..5dee63e675 100755
--- a/usertools/dpdk-devbind.py
+++ b/usertools/dpdk-devbind.py
@@ -8,6 +8,7 @@
 import os
 import getopt
 import subprocess
+from glob import glob
 from os.path import exists, abspath, dirname, basename
 
 if sys.version_info.major < 3:
@@ -89,6 +90,8 @@ def usage():
 where DEVICE1, DEVICE2 etc, are specified via PCI "domain:bus:slot.func" syntax
 or "bus:slot.func" syntax. For devices bound to Linux kernel drivers, they may
 also be referred to by Linux interface name e.g. eth0, eth1, em0, em1, etc.
+If devices are specified using PCI bus:device:func format, then
+shell wildcards and ranges may be used, e.g. 80:04.*, 80:04.[0-3]
 
 Options:
 --help, --usage:
@@ -145,6 +148,9 @@ def usage():
 To bind :02:00.0 and :02:00.1 to the ixgbe kernel driver
 %(argv0)s -b ixgbe 02:00.0 02:00.1
 
+To bind all functions on device :02:00 to ixgbe kernel driver
+%(argv0)s -b ixgbe 02:00.*
+
 """ % locals())  # replace items from local variables
 
 
@@ -689,6 +695,16 @@ def parse_args():
 else:
 b_flag = arg
 
+# resolve any PCI globs in the args
+new_args = []
+sysfs_path = "/sys/bus/pci/devices/"
+for arg in args:
+globbed_arg = glob(sysfs_path + arg) + glob(sysfs_path + ":" + arg)
+if globbed_arg:
+new_args.extend([a[len(sysfs_path):] for a in globbed_arg])
+else:
+new_args.append(arg)
+args = new_args
 
 def do_arg_actions():
 '''do the actual action requested by the user'''
-- 
2.25.1

Re: [dpdk-dev] [PATCH] doc/guides: remove dependency on make build system

[Bruce Richardson]

On Wed, Jul 22, 2020 at 01:59:49PM +0100, Bruce Richardson wrote:
> On Wed, Jul 22, 2020 at 02:45:54PM +0200, Thomas Monjalon wrote:
> > 21/07/2020 17:39, Bruce Richardson:
> > > When building the DPDK guide documents, the DPDK version information was
> > > pulled using "make showversion", which meant there was a dependency on
> > > the DPDK make-based build system. Change this to just read the data from
> > > the VERSION file in the root directory.
> > > 
> > > Signed-off-by: Bruce Richardson 
> > > ---
> > > NOTE: When make build system is completed removed, we can change the
> > > relative path to the VERSION file i.e. "../../", to instead pull the
> > > path from "MESON_SOURCE_ROOT" in the environment, which should be more
> > > robust.
> > 
> > Yes it would be a bit better.
> > If we merge this patch in 20.08, we'll forget about this improvement :)
> > I suggest waiting 20.11 to merge the definitive improvement.
> > 
> I'd prefer now, but I can be patient, I suppose. :-)

Updated and improved version of this patch is now part of the "make
removal" patch series. Marking this standalone patch as superceded.

/Bruce

[dpdk-dev] [PATCH v1] doc: update bbdev guide

[Nicolas Chautru]

Clarify the capability assumptions for LLR and HARQ
compression format.
Correct one historical typo.

Signed-off-by: Nicolas Chautru 
---
 doc/guides/prog_guide/bbdev.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/guides/prog_guide/bbdev.rst b/doc/guides/prog_guide/bbdev.rst
index d39167a..6b2bd54 100644
--- a/doc/guides/prog_guide/bbdev.rst
+++ b/doc/guides/prog_guide/bbdev.rst
@@ -13,7 +13,7 @@ optimized libraries to appear as virtual bbdev devices.
 The functional scope of the BBDEV library are those functions in relation to
 the 3GPP Layer 1 signal processing (channel coding, modulation, ...).
 
-The framework currently only supports Turbo Code FEC function.
+The framework currently only supports FEC function.
 
 
 Design Principles
@@ -927,9 +927,11 @@ given below.
 ++
 |RTE_BBDEV_LDPC_HARQ_6BIT_COMPRESSION|
 | Set if a device supports input/output HARQ compression |
+| Data is packed as 6 bits by dropping and saturating the MSBs   |
 ++
 |RTE_BBDEV_LDPC_LLR_COMPRESSION  |
 | Set if a device supports input LLR compression |
+| Data is packed as 6 bits by dropping and saturating the MSBs   |
 ++
 |RTE_BBDEV_LDPC_INTERNAL_HARQ_MEMORY_IN_ENABLE   |
 | Set if a device supports HARQ input to device's internal memory|
-- 
1.8.3.1

Re: [dpdk-dev] [PATCH v3 05/11] baseband/acc100: add LDPC processing functions

[Chautru, Nicolas]

> From: Dave Burley > 
> Hi Nic
> 
> Thank you - it would be useful to have further documentation for clarification
> as the data format isn't explicitly documented in BBDEV.

Thanks Dave. Just updated on this other patch -> 
https://patches.dpdk.org/patch/75793/
Feel free to ack or let me know if you need more details. 

> Best Regards
> 
> Dave
> 
> 
> From: Chautru, Nicolas 
> Sent: 20 August 2020 15:52
> To: Dave Burley ; dev@dpdk.org
> 
> Cc: Richardson, Bruce 
> Subject: RE: [dpdk-dev] [PATCH v3 05/11] baseband/acc100: add LDPC
> processing functions
> 
> Hi Dave,
> This is assuming 6 bits LLR compression packing (ie. first 2 MSB dropped).
> Similar to HARQ compression.
> Let me know if unclear, I can clarify further in documentation if not explicit
> enough.
> Thanks
> Nic
> 
> > -Original Message-
> > From: Dave Burley 
> > Sent: Thursday, August 20, 2020 7:39 AM
> > To: Chautru, Nicolas ; dev@dpdk.org
> > Cc: Richardson, Bruce 
> > Subject: Re: [dpdk-dev] [PATCH v3 05/11] baseband/acc100: add LDPC
> > processing functions
> >
> > Hi Nic,
> >
> > As you've now specified the use of RTE_BBDEV_LDPC_LLR_COMPRESSION for
> > this PMB, please could you confirm what the packed format of the LLRs in
> > memory looks like?
> >
> > Best Regards
> >
> > Dave Burley
> >
> >
> > From: dev  on behalf of Nicolas Chautru
> > 
> > Sent: 19 August 2020 01:25
> > To: dev@dpdk.org ; akhil.go...@nxp.com
> > 
> > Cc: bruce.richard...@intel.com ; Nicolas
> > Chautru 
> > Subject: [dpdk-dev] [PATCH v3 05/11] baseband/acc100: add LDPC processing
> > functions
> >
> > Adding LDPC decode and encode processing operations
> >
> > Signed-off-by: Nicolas Chautru 
> > ---
> >  drivers/baseband/acc100/rte_acc100_pmd.c | 1625
> > +-
> >  drivers/baseband/acc100/rte_acc100_pmd.h |    3 +
> >  2 files changed, 1626 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c
> > b/drivers/baseband/acc100/rte_acc100_pmd.c
> > index 7a21c57..5f32813 100644
> > --- a/drivers/baseband/acc100/rte_acc100_pmd.c
> > +++ b/drivers/baseband/acc100/rte_acc100_pmd.c
> > @@ -15,6 +15,9 @@
> >  #include 
> >  #include 
> >  #include 
> > +#ifdef RTE_BBDEV_OFFLOAD_COST
> > +#include 
> > +#endif
> >
> >  #include 
> >  #include 
> > @@ -449,7 +452,6 @@
> >  return 0;
> >  }
> >
> > -
> >  /**
> >   * Report a ACC100 queue index which is free
> >   * Return 0 to 16k for a valid queue_idx or -1 when no queue is available
> > @@ -634,6 +636,46 @@
> >  struct acc100_device *d = dev->data->dev_private;
> >
> >  static const struct rte_bbdev_op_cap bbdev_capabilities[] = {
> > +   {
> > +   .type   = RTE_BBDEV_OP_LDPC_ENC,
> > +   .cap.ldpc_enc = {
> > +   .capability_flags =
> > +   RTE_BBDEV_LDPC_RATE_MATCH |
> > +   RTE_BBDEV_LDPC_CRC_24B_ATTACH |
> > +   RTE_BBDEV_LDPC_INTERLEAVER_BYPASS,
> > +   .num_buffers_src =
> > +   
> > RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
> > +   .num_buffers_dst =
> > +   
> > RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
> > +   }
> > +   },
> > +   {
> > +   .type   = RTE_BBDEV_OP_LDPC_DEC,
> > +   .cap.ldpc_dec = {
> > +   .capability_flags =
> > +   RTE_BBDEV_LDPC_CRC_TYPE_24B_CHECK |
> > +   RTE_BBDEV_LDPC_CRC_TYPE_24B_DROP |
> > +   RTE_BBDEV_LDPC_HQ_COMBINE_IN_ENABLE |
> > +   RTE_BBDEV_LDPC_HQ_COMBINE_OUT_ENABLE |
> > +#ifdef ACC100_EXT_MEM
> >
> +   RTE_BBDEV_LDPC_INTERNAL_HARQ_MEMORY_IN_ENABL
> > E |
> >
> +   RTE_BBDEV_LDPC_INTERNAL_HARQ_MEMORY_OUT_ENA
> > BLE |
> > +#endif
> > +   RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE |
> > +   RTE_BBDEV_LDPC_DEINTERLEAVER_BYPASS |
> > +   RTE_BBDEV_LDPC_DECODE_BYPASS |
> > +   RTE_BBDEV_LDPC_DEC_SCATTER_GATHER |
> > +   RTE_BBDEV_LDPC_HARQ_6BIT_COMPRESSION |
> > +   RTE_BBDEV_LDPC_LLR_COMPRESSION,
> > +   .llr_size = 8,
> > +   .llr_decimals = 1,
> > +   .num_buffers_src =
> > +   RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
> > +   .num_buffers_hard_out =
> > +   RTE_BBDEV_LDPC_MAX_CODE_BLOCKS,
> > +   .num_buffers_soft_out = 0,
> > +   }
> > +   },
> > 

Re: [dpdk-dev] [PATCH v5 0/5] compiling ethdev lib under windows

[Ranjit Menon]

On 8/10/2020 11:24 PM, Fady Bader wrote:

Added needed changes in order to get ethdev compiling under windows.

Depends-on: series-10382 ("compile librte_net for windows")

v5: fixed style issues.

v4: added comments to #else and fixed code issue.

v3: rebased on current master, added more exports to export list

v2: fixed logging issue in telemetry lib.

Fady Bader (5):
   eal: added interrupts empty stubs
   eal: updated export list for Windows
   ethdev: remove structs from export list
   telemetry: implement empty stubs for Windows
   ethdev: compiling ethdev under Windows

  lib/librte_eal/rte_eal_exports.def   | 11 +++
  lib/librte_eal/windows/eal_interrupts.c  | 18 
  lib/librte_eal/windows/meson.build   |  1 +
  lib/librte_ethdev/rte_ethdev_version.map |  2 --
  lib/librte_telemetry/rte_telemetry.h |  4 +++
  lib/librte_telemetry/telemetry.c | 50 
  lib/librte_telemetry/telemetry_legacy.c  | 25 
  lib/meson.build  |  3 +-
  8 files changed, 111 insertions(+), 3 deletions(-)
  create mode 100644 lib/librte_eal/windows/eal_interrupts.c



Acked-by: Ranjit Menon 

[dpdk-dev] [PATCH 2/2] net/ark remove ARK_TX_PAD_TO_60 configuration macro

[Ed Czeck]

Update documenation as needed.

Signed-off-by: Ed Czeck 
---
 doc/guides/nics/ark.rst |  3 ---
 drivers/net/ark/ark_ethdev_tx.c | 42 ++---
 drivers/net/ark/ark_logs.h  |  8 ---
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst
index c3ffcbbc2..0f96ebd2c 100644
--- a/doc/guides/nics/ark.rst
+++ b/doc/guides/nics/ark.rst
@@ -129,9 +129,6 @@ Configuration Information
* **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables inclusion
  of the ARK PMD driver in the DPDK compilation.
 
-   * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y):  When enabled TX
- packets are padded to 60 bytes to support downstream MACS.
-
 
 Building DPDK
 -
diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c
index 72624deb3..c303ac58c 100644
--- a/drivers/net/ark/ark_ethdev_tx.c
+++ b/drivers/net/ark/ark_ethdev_tx.c
@@ -15,6 +15,11 @@
 #define ARK_TX_MAX_NOCHAIN (RTE_MBUF_DEFAULT_DATAROOM)
 
 
+#ifndef ARK_MIN_TX_PKTLEN
+#define ARK_MIN_TX_PKTLEN 0
+#endif
+
+
 /* * */
 struct ark_tx_queue {
struct ark_tx_meta *meta_q;
@@ -91,6 +96,7 @@ eth_ark_xmit_pkts(void *vtxq, struct rte_mbuf **tx_pkts, 
uint16_t nb_pkts)
uint32_t prod_index_limit;
int stat;
uint16_t nb;
+   const uint32_t min_pkt_len = ARK_MIN_TX_PKTLEN;
 
queue = (struct ark_tx_queue *)vtxq;
 
@@ -104,27 +110,25 @@ eth_ark_xmit_pkts(void *vtxq, struct rte_mbuf **tx_pkts, 
uint16_t nb_pkts)
 ++nb) {
mbuf = tx_pkts[nb];
 
-   if (ARK_TX_PAD_TO_60) {
-   if (unlikely(rte_pktmbuf_pkt_len(mbuf) < 60)) {
-   /* this packet even if it is small can be split,
-* be sure to add to the end mbuf
+   if (unlikely(rte_pktmbuf_pkt_len(mbuf) < min_pkt_len)) {
+   /* this packet even if it is small can be split,
+* be sure to add to the end mbuf
+*/
+   uint16_t to_add = min_pkt_len -
+   rte_pktmbuf_pkt_len(mbuf);
+   char *appended =
+   rte_pktmbuf_append(mbuf, to_add);
+
+   if (appended == 0) {
+   /* This packet is in error,
+* we cannot send it so just
+* count it and delete it.
 */
-   uint16_t to_add =
-   60 - rte_pktmbuf_pkt_len(mbuf);
-   char *appended =
-   rte_pktmbuf_append(mbuf, to_add);
-
-   if (appended == 0) {
-   /* This packet is in error,
-* we cannot send it so just
-* count it and delete it.
-*/
-   queue->tx_errors += 1;
-   rte_pktmbuf_free(mbuf);
-   continue;
-   }
-   memset(appended, 0, to_add);
+   queue->tx_errors += 1;
+   rte_pktmbuf_free(mbuf);
+   continue;
}
+   memset(appended, 0, to_add);
}
 
if (unlikely(mbuf->nb_segs != 1)) {
diff --git a/drivers/net/ark/ark_logs.h b/drivers/net/ark/ark_logs.h
index c3d7e7d39..ca46d86c9 100644
--- a/drivers/net/ark/ark_logs.h
+++ b/drivers/net/ark/ark_logs.h
@@ -8,14 +8,6 @@
 #include 
 #include 
 
-
-/* Configuration option to pad TX packets to 60 bytes */
-#ifdef RTE_LIBRTE_ARK_PAD_TX
-#define ARK_TX_PAD_TO_60   1
-#else
-#define ARK_TX_PAD_TO_60   0
-#endif
-
 /* system camel case definition changed to upper case */
 #define PRIU32 PRIu32
 #define PRIU64 PRIu64
-- 
2.17.1

[dpdk-dev] [PATCH 1/2] net/ark: remove compile time log macros in favor of run time log control

[Ed Czeck]

Use ARK_PMD_LOG in place of PMD_DRV_LOG, PMD_DEBUG_LOG, PMD_FUNC_LOG,
PMD_STATS_LOG, PMD_RX_LOG, and PMD_TX_LOG.
Review and adjust log levels and messages as needed.

Signed-off-by: Ed Czeck 
---
 doc/guides/nics/ark.rst | 13 --
 drivers/net/ark/ark_ddm.c   | 12 ++---
 drivers/net/ark/ark_ethdev.c| 77 +++--
 drivers/net/ark/ark_ethdev_rx.c | 46 ++--
 drivers/net/ark/ark_ethdev_tx.c | 10 ++---
 drivers/net/ark/ark_logs.h  | 63 +++
 drivers/net/ark/ark_mpu.c   | 32 --
 drivers/net/ark/ark_pktchkr.c   | 36 +++
 drivers/net/ark/ark_pktdir.c|  2 +-
 drivers/net/ark/ark_pktgen.c| 22 +-
 drivers/net/ark/ark_rqp.c   |  4 +-
 drivers/net/ark/ark_udm.c   | 18 
 12 files changed, 125 insertions(+), 210 deletions(-)

diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst
index 06e8c3374..c3ffcbbc2 100644
--- a/doc/guides/nics/ark.rst
+++ b/doc/guides/nics/ark.rst
@@ -132,19 +132,6 @@ Configuration Information
* **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y):  When enabled TX
  packets are padded to 60 bytes to support downstream MACS.
 
-   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_RX** (default n): Enables or disables debug
- logging and internal checking of RX ingress logic within the ARK PMD 
driver.
-
-   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TX** (default n): Enables or disables debug
- logging and internal checking of TX egress logic within the ARK PMD 
driver.
-
-   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS** (default n): Enables or disables 
debug
- logging of detailed packet and performance statistics gathered in
- the PMD and FPGA.
-
-   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE** (default n): Enables or disables 
debug
- logging of detailed PMD events and status.
-
 
 Building DPDK
 -
diff --git a/drivers/net/ark/ark_ddm.c b/drivers/net/ark/ark_ddm.c
index 57026f8d1..91d1179d8 100644
--- a/drivers/net/ark/ark_ddm.c
+++ b/drivers/net/ark/ark_ddm.c
@@ -13,19 +13,19 @@ ark_ddm_verify(struct ark_ddm_t *ddm)
 {
uint32_t hw_const;
if (sizeof(struct ark_ddm_t) != ARK_DDM_EXPECTED_SIZE) {
-   PMD_DRV_LOG(ERR, "ARK: DDM structure looks incorrect %d vs 
%zd\n",
+   ARK_PMD_LOG(ERR, "DDM structure looks incorrect %d vs %zd\n",
ARK_DDM_EXPECTED_SIZE, sizeof(struct ark_ddm_t));
return -1;
}
 
hw_const = ddm->cfg.const0;
if (hw_const == ARK_DDM_CONST1) {
-   PMD_DRV_LOG(ERR,
+   ARK_PMD_LOG(ERR,
"ARK: DDM module is version 1, "
"PMD expects version 2\n");
return -1;
} else if (hw_const != ARK_DDM_CONST2) {
-   PMD_DRV_LOG(ERR,
+   ARK_PMD_LOG(ERR,
"ARK: DDM module not found as expected 0x%08x\n",
ddm->cfg.const0);
return -1;
@@ -63,7 +63,7 @@ ark_ddm_reset(struct ark_ddm_t *ddm)
status = ark_ddm_stop(ddm, 1);
 
if (status != 0) {
-   PMD_DEBUG_LOG(INFO, "%s  stop failed  doing forced reset\n",
+   ARK_PMD_LOG(NOTICE, "%s  stop failed  doing forced reset\n",
  __func__);
ddm->cfg.command = 4;
usleep(10);
@@ -87,7 +87,7 @@ ark_ddm_stats_reset(struct ark_ddm_t *ddm)
 void
 ark_ddm_dump(struct ark_ddm_t *ddm, const char *msg)
 {
-   PMD_FUNC_LOG(DEBUG, "%s Stopped: %d\n", msg,
+   ARK_PMD_LOG(DEBUG, "%s Stopped: %d\n", msg,
 ark_ddm_is_stopped(ddm)
 );
 }
@@ -97,7 +97,7 @@ ark_ddm_dump_stats(struct ark_ddm_t *ddm, const char *msg)
 {
struct ark_ddm_stats_t *stats = &ddm->stats;
 
-   PMD_STATS_LOG(INFO, "DDM Stats: %s"
+   ARK_PMD_LOG(INFO, "DDM Stats: %s"
  ARK_SU64 ARK_SU64 ARK_SU64
  "\n", msg,
  "Bytes:", stats->tx_byte_count,
diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
index b32ccd867..646427d0c 100644
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -164,26 +164,26 @@ check_for_ext(struct ark_adapter *ark)
const char *dllpath = getenv("ARK_EXT_PATH");
 
if (dllpath == NULL) {
-   PMD_DEBUG_LOG(DEBUG, "ARK EXT NO dll path specified\n");
+   ARK_PMD_LOG(DEBUG, "EXT NO dll path specified\n");
return 0;
}
-   PMD_DRV_LOG(INFO, "ARK EXT found dll path at %s\n", dllpath);
+   ARK_PMD_LOG(NOTICE, "EXT found dll path at %s\n", dllpath);
 
/* Open and load the .so */
ark->d_handle = dlopen(dllpath, RTLD_LOCAL | RTLD_LAZY);
if (ark->d_handle == NULL) {
-   PMD_DRV_LOG(ERR, "Could not load user extension %s\n",
+   ARK_PMD_LOG(ERR, "Could not load user extension %s\n"

[dpdk-dev] [PATCH v2] windows/netuio: add Windows NetUIO kernel driver

[Narcisa Ana Maria Vasile]

From: Narcisa Vasile 

The Windows NetUIO kernel driver allows the DPDK userspace
application to directly access the hardware.

Cc: Harini Ramakrishnan 
Cc: Omar Cardona 
Signed-off-by: Narcisa Vasile 
---

v2:
  Fix license message in each file
  Minor fixes in README
  Remove RC file as it is autogenerated
  Remove HW Ids from Inf
  Resubmit as single patch

 .gitattributes|   4 +
 .gitignore|   2 +
 windows/netuio/kernel/README_NetUIO.rst   |  64 +++
 .../netuio/kernel/windows/netuio/netuio.inf   |  78 
 .../netuio/kernel/windows/netuio/netuio_dev.c | 388 +
 .../netuio/kernel/windows/netuio/netuio_dev.h |  61 +++
 .../netuio/kernel/windows/netuio/netuio_drv.c | 146 +++
 .../netuio/kernel/windows/netuio/netuio_drv.h |  32 ++
 .../kernel/windows/netuio/netuio_interface.h  |  73 
 .../kernel/windows/netuio/netuio_queue.c  | 397 ++
 .../kernel/windows/netuio/netuio_queue.h  |  31 ++
 .../netuio/kernel/windows/netuio/resource.h   |  14 +
 .../mk/exec-env/windows/netuio/netuio.sln |  24 ++
 .../mk/exec-env/windows/netuio/netuio.vcxproj | 113 +
 .../windows/netuio/netuio.vcxproj.filters |  54 +++
 .../windows/netuio/netuio.vcxproj.user|  11 +
 16 files changed, 1492 insertions(+)
 create mode 100644 .gitattributes
 create mode 100644 .gitignore
 create mode 100644 windows/netuio/kernel/README_NetUIO.rst
 create mode 100644 windows/netuio/kernel/windows/netuio/netuio.inf
 create mode 100644 windows/netuio/kernel/windows/netuio/netuio_dev.c
 create mode 100644 windows/netuio/kernel/windows/netuio/netuio_dev.h
 create mode 100644 windows/netuio/kernel/windows/netuio/netuio_drv.c
 create mode 100644 windows/netuio/kernel/windows/netuio/netuio_drv.h
 create mode 100644 windows/netuio/kernel/windows/netuio/netuio_interface.h
 create mode 100644 windows/netuio/kernel/windows/netuio/netuio_queue.c
 create mode 100644 windows/netuio/kernel/windows/netuio/netuio_queue.h
 create mode 100644 windows/netuio/kernel/windows/netuio/resource.h
 create mode 100644 windows/netuio/mk/exec-env/windows/netuio/netuio.sln
 create mode 100644 windows/netuio/mk/exec-env/windows/netuio/netuio.vcxproj
 create mode 100644 
windows/netuio/mk/exec-env/windows/netuio/netuio.vcxproj.filters
 create mode 100644 
windows/netuio/mk/exec-env/windows/netuio/netuio.vcxproj.user

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0..13482db3d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+* text=auto
+
+*.sln text eol=crlf
+*.vcxproj text eol=crlf
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0..543281e8f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+x64/
+.vs/
diff --git a/windows/netuio/kernel/README_NetUIO.rst 
b/windows/netuio/kernel/README_NetUIO.rst
new file mode 100644
index 0..a290fcf20
--- /dev/null
+++ b/windows/netuio/kernel/README_NetUIO.rst
@@ -0,0 +1,64 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2020 Microsoft Corporation.
+
+Compiling the NetUIO Driver from Source
+===
+
+Operating System
+
+
+The NetUIO source has been validated against the following operating systems:
+
+* Windows Server 2016
+* Windows Server 2019
+
+Hardware Requirements
+~
+The NetUIO driver has been validated using the following network adapters on 
the Windows platform:
+
+*
+*
+
+Software Requirements
+~
+
+* Install Microsoft Visual Studio 2017 or Visual Stuido Studio 2019 Enterprise 
from https://visualstudio.microsoft.com/downloads/ 
+* During installation ensure following components are selected:
+Windows 10 SDK (10.0.15063.0)
+Windows 10 SDK (10.0.17763.0)
+Windows Drivers Kit
+
+* Install WDK for Windows 10 (10.0.17763.1) from 
https://docs.microsoft.com/en-us/windows-hardware/drivers/download-the-wdk 
+
+Building the NetUIO Driver
+--
+Follow the steps below to build the NetUIO driver and install the driver for 
the network adapter. 
+
+* Clone the dpdk-kmods repository: git clone git://dpdk.org/dpdk-kmods
+* Navigate to \dpdk-kmods\windows\netuio\mk\exec-env\windows\netuio
+* Load netuio.sln in Microsoft Visual Studio 2017 or 2019
+* Choose Release as the configuration mode and Build the solution
+* The resultant output files can be found in 
\dpdk-kmods\windows\netuio\x64\Release\netuio
+ 
+Installing netuio.sys Driver for development
+
+.. note::
+
+In a development environment, NetUIO driver can be loaded by enabling 
test-signing.
+Please implement adequate precautionary measures before installing a 
test-signed driver, replacing a signed-driver.
+
+To ensure test-signed kernel-mode drivers can load on Windows, enable 
test-signing, using the following BCDEdit command.
+
+C:\windows\system32>Bcdedit.exe -set TESTSIGNING ON
+
+Windows

Re: [dpdk-dev] [PATCH v2] windows/netuio: add Windows NetUIO kernel driver

[Ranjit Menon]

Hi, Naty

On 8/20/2020 3:23 PM, Narcisa Ana Maria Vasile wrote:

From: Narcisa Vasile 

The Windows NetUIO kernel driver allows the DPDK userspace
application to directly access the hardware.

Cc: Harini Ramakrishnan 
Cc: Omar Cardona 
Signed-off-by: Narcisa Vasile 
---

v2:
   Fix license message in each file
   Minor fixes in README
   Remove RC file as it is autogenerated
   Remove HW Ids from Inf
   Resubmit as single patch

  .gitattributes|   4 +
  .gitignore|   2 +
  windows/netuio/kernel/README_NetUIO.rst   |  64 +++
  .../netuio/kernel/windows/netuio/netuio.inf   |  78 
  .../netuio/kernel/windows/netuio/netuio_dev.c | 388 +
  .../netuio/kernel/windows/netuio/netuio_dev.h |  61 +++
  .../netuio/kernel/windows/netuio/netuio_drv.c | 146 +++
  .../netuio/kernel/windows/netuio/netuio_drv.h |  32 ++
  .../kernel/windows/netuio/netuio_interface.h  |  73 
  .../kernel/windows/netuio/netuio_queue.c  | 397 ++
  .../kernel/windows/netuio/netuio_queue.h  |  31 ++
  .../netuio/kernel/windows/netuio/resource.h   |  14 +
  .../mk/exec-env/windows/netuio/netuio.sln |  24 ++
  .../mk/exec-env/windows/netuio/netuio.vcxproj | 113 +
  .../windows/netuio/netuio.vcxproj.filters |  54 +++
  .../windows/netuio/netuio.vcxproj.user|  11 +
  16 files changed, 1492 insertions(+)
  create mode 100644 .gitattributes
  create mode 100644 .gitignore
  create mode 100644 windows/netuio/kernel/README_NetUIO.rst
  create mode 100644 windows/netuio/kernel/windows/netuio/netuio.inf
  create mode 100644 windows/netuio/kernel/windows/netuio/netuio_dev.c
  create mode 100644 windows/netuio/kernel/windows/netuio/netuio_dev.h
  create mode 100644 windows/netuio/kernel/windows/netuio/netuio_drv.c
  create mode 100644 windows/netuio/kernel/windows/netuio/netuio_drv.h
  create mode 100644 windows/netuio/kernel/windows/netuio/netuio_interface.h
  create mode 100644 windows/netuio/kernel/windows/netuio/netuio_queue.c
  create mode 100644 windows/netuio/kernel/windows/netuio/netuio_queue.h
  create mode 100644 windows/netuio/kernel/windows/netuio/resource.h
  create mode 100644 windows/netuio/mk/exec-env/windows/netuio/netuio.sln
  create mode 100644 windows/netuio/mk/exec-env/windows/netuio/netuio.vcxproj
  create mode 100644 
windows/netuio/mk/exec-env/windows/netuio/netuio.vcxproj.filters
  create mode 100644 
windows/netuio/mk/exec-env/windows/netuio/netuio.vcxproj.user


I haven't reviewed the code yet, but a few general suggestions and 
observations:


1. This code is going into the dpdk-kmods repo, so we don't need the 
four-level deep directory path for the source.


2. The code can simply be in the windows/netuio directory (don't need 
'kernel')


3. The 'virt2phys' module that is already in the repo puts the 
build-related files (project files, solution files etc) in the same 
folder as the source files. We should do the same here. We don't need 
the mk/exec-env subfolder for these files. They can be in the same 
directory as the source.


4. Remove the .vcxproj.user file from the patch. It is not required.

5. The README should be renamed to simply README.rst and it can also be 
in this windows/netuio folder


6. The existing README.rst in the windows folder contains information on 
how to build and load kernel modules in Windows. This new README can 
reference the root-level README, if required. (Also some of the 
information in this new README is out-of-date. I'll review that separately)



ranjit m.

Re: [dpdk-dev] [PATCH v2 20/37] doc: remove references to make in bbdev guides

[Chautru, Nicolas]

> From: Power, Ciara 
> Make is no longer supported for compiling DPDK, references are now removed
> in the documentation.
> 
> Reviewed-by: Kevin Laatz 
> Signed-off-by: Ciara Power 
> ---
>  doc/guides/bbdevs/fpga_5gnr_fec.rst |  7 ++-
> doc/guides/bbdevs/fpga_lte_fec.rst  |  7 ++-
>  doc/guides/bbdevs/turbo_sw.rst  | 15 ---
>  3 files changed, 4 insertions(+), 25 deletions(-)
> 
> diff --git a/doc/guides/bbdevs/fpga_5gnr_fec.rst
> b/doc/guides/bbdevs/fpga_5gnr_fec.rst
> index 6760391e8c..8e00c4ef22 100644
> --- a/doc/guides/bbdevs/fpga_5gnr_fec.rst
> +++ b/doc/guides/bbdevs/fpga_5gnr_fec.rst
> @@ -51,10 +51,7 @@ FPGA 5GNR FEC does not support the following:
>  Installation
>  
> 
> -Section 3 of the DPDK manual provides instructions on installing and 
> compiling
> DPDK. The -default set of bbdev compile flags may be found in
> config/common_base, where for example -the flag to build the FPGA 5GNR FEC
> device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC``,
> -is already set.
> +Section 3 of the DPDK manual provides instructions on installing and 
> compiling
> DPDK.
> 
>  DPDK requires hugepages to be configured as detailed in section 2 of the DPDK
> manual.
>  The bbdev test application has been tested with a configuration 40 x 1GB
> hugepages. The @@ -94,7 +91,7 @@ the UIO driver by repeating this
> command for every function.
>  .. code-block:: console
> 
>cd 
> -  insmod ./build/kmod/igb_uio.ko
> +  insmod .//kernel/linux/igb_uio/igb_uio.ko

Hi, 
Should this more specific? What do you mean by  here? Is this 
defined somewhere else explicitly in doc? 
In other commit (with the python script) the assumption is that meson will 
install under /build directory with hard coded path, 
ie. not forcing to other location. 
Can you clarify so that we are comprehensive and avoid confusion? 
Thanks
Nic

Re: [dpdk-dev] [PATCH v2 20/37] doc: remove references to make in bbdev guides

[Chautru, Nicolas]

From: Power, Ciara 
> Make is no longer supported for compiling DPDK, references are now removed
> in the documentation.
> 
> Reviewed-by: Kevin Laatz 
> Signed-off-by: Ciara Power 
> ---
>  doc/guides/bbdevs/fpga_5gnr_fec.rst |  7 ++-
> doc/guides/bbdevs/fpga_lte_fec.rst  |  7 ++-
>  doc/guides/bbdevs/turbo_sw.rst  | 15 ---
>  3 files changed, 4 insertions(+), 25 deletions(-)
> 
> diff --git a/doc/guides/bbdevs/fpga_5gnr_fec.rst
> b/doc/guides/bbdevs/fpga_5gnr_fec.rst
> index 6760391e8c..8e00c4ef22 100644
> --- a/doc/guides/bbdevs/fpga_5gnr_fec.rst
> +++ b/doc/guides/bbdevs/fpga_5gnr_fec.rst
> @@ -51,10 +51,7 @@ FPGA 5GNR FEC does not support the following:
>  Installation
>  
> 
> -Section 3 of the DPDK manual provides instructions on installing and 
> compiling
> DPDK. The -default set of bbdev compile flags may be found in
> config/common_base, where for example -the flag to build the FPGA 5GNR FEC
> device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC``,
> -is already set.
> +Section 3 of the DPDK manual provides instructions on installing and 
> compiling
> DPDK.
> 
>  DPDK requires hugepages to be configured as detailed in section 2 of the DPDK
> manual.
>  The bbdev test application has been tested with a configuration 40 x 1GB
> hugepages. The @@ -94,7 +91,7 @@ the UIO driver by repeating this
> command for every function.
>  .. code-block:: console
> 
>cd 
> -  insmod ./build/kmod/igb_uio.ko
> +  insmod .//kernel/linux/igb_uio/igb_uio.ko
>echo "8086 0d8f" > /sys/bus/pci/drivers/igb_uio/new_id
>lspci -vd8086:0d8f
> 
> diff --git a/doc/guides/bbdevs/fpga_lte_fec.rst
> b/doc/guides/bbdevs/fpga_lte_fec.rst
> index fdc8a76981..14ffa0ee14 100644
> --- a/doc/guides/bbdevs/fpga_lte_fec.rst
> +++ b/doc/guides/bbdevs/fpga_lte_fec.rst
> @@ -50,10 +50,7 @@ FPGA LTE FEC does not support the following:
>  Installation
>  --
> 
> -Section 3 of the DPDK manual provides instructions on installing and 
> compiling
> DPDK. The -default set of bbdev compile flags may be found in
> config/common_base, where for example -the flag to build the FPGA LTE FEC
> device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC``, is already -set.
> +Section 3 of the DPDK manual provides instructions on installing and 
> compiling
> DPDK.
> 
>  DPDK requires hugepages to be configured as detailed in section 2 of the DPDK
> manual.
>  The bbdev test application has been tested with a configuration 40 x 1GB
> hugepages. The @@ -93,7 +90,7 @@ the UIO driver by repeating this
> command for every function.
>  .. code-block:: console
> 
>cd 
> -  insmod ./build/kmod/igb_uio.ko
> +  insmod .//kernel/linux/igb_uio/igb_uio.ko
>echo "1172 5052" > /sys/bus/pci/drivers/igb_uio/new_id
>lspci -vd1172:
> 
> diff --git a/doc/guides/bbdevs/turbo_sw.rst b/doc/guides/bbdevs/turbo_sw.rst
> index 20620c2e20..3b93157890 100644
> --- a/doc/guides/bbdevs/turbo_sw.rst
> +++ b/doc/guides/bbdevs/turbo_sw.rst
> @@ -12,14 +12,6 @@ Note that the driver can also be built without any
> dependency with reduced  functionality for maintenance purpose.
> 
>  To enable linking to the SDK libraries see detailed installation section 
> below.
> -Two flags can be enabled depending on whether the target machine can
> support
> -AVX2 and AVX512 instructions sets and the related SDK libraries for 
> vectorized
> -signal processing functions are installed :
> -- CONFIG_RTE_BBDEV_SDK_AVX2
> -- CONFIG_RTE_BBDEV_SDK_AVX512
> -By default these 2 flags are disabled by default. For AVX2 machine and SDK -
> library installed then the first flag can be enabled. For AVX512 machine and -
> SDK library installed then both flags can be enabled for full real time 
> capability.

Hi, 
We are losing information here. Even if the configuration options should not be 
documented based on an explicit reference make and config_base assumptions 
(agreed that they are no longer there), the steps should still capture the conf 
to be passed to meson so that the PMD can still be built with the avx2/avx512 
intel libraries (ie. not the case by default due to additional dependency to 
retrieve the related libraries). 
Thanks
Nic

Re: [dpdk-dev] [PATCH v2 10/37] build: remove makefiles and mk directory

[Ruifeng Wang]

> -Original Message-
> From: Ciara Power 
> Sent: Thursday, August 20, 2020 8:41 PM
> To: dev@dpdk.org
> Cc: Ciara Power ; tho...@monjalon.net; Reshma
> Pattan ; Maryam Tahhan
> ; Konstantin Ananyev
> ; Nicolas Chautru
> ; Olivier Matz ;
> Declan Doherty ; jer...@marvell.com; Vladimir
> Medvedkin ; Wisam Jaddo
> ; Cristian Dumitrescu
> ; Wenzhuo Lu ;
> Beilei Xing ; Bernard Iremonger
> ; Ori Kam ; Neil
> Horman ; hemant.agra...@nxp.com;
> sachin.sax...@nxp.com; Rosen Xu ; Stephen
> Hemminger ; Long Li ;
> Anoob Joseph ; Jingjing Wu ;
> Matan Azrad ; Shahaf Shuler
> ; Viacheslav Ovsiienko
> ; Liron Himi ; Harman
> Kalra ; Nithin Dabilpuram
> ; Fiona Trahe ; John
> Griffin ; Deepak Kumar Jain
> ; Ashish Gupta ; Lee
> Daly ; Sunila Sahu ; Pablo de Lara
> ; Ruifeng Wang
> ; Gagandeep Singh ;
> Somalapuram Amaranath ; akhil.go...@nxp.com;
> Michael Shamis ; Nagadheeraj Rottela
> ; Srikanth Jampala ;
> Ankur Dwivedi ; Fan Zhang
> ; Jay Zhou ;
> nipun.gu...@nxp.com; Mattias Rönnblom
> ; Pavan Nikhilesh
> ; Liang Ma ; Peter
> Mccarthy ; Harry van Haaren
> ; Artem V. Andreev
> ; Andrew Rybchenko
> ; Gage Eads ; John W.
> Linville ; Ciara Loftus ; Qi
> Zhang ; Shepard Siegel
> ; Ed Czeck ;
> John Miller ; Igor Russkikh
> ; Pavel Belous ;
> Steven Webster ; Matt Peters
> ; Rasesh Mody ;
> Shahed Shaikh ; Ajit Khaparde
> (ajit.khapa...@broadcom.com) ; Somnath
> Kotur ; Chas Williams ;
> Wei Hu (Xavier) ; Rahul Lakkireddy
> ; Wei Zhao ; Jeff
> Guo ; Marcin Wojtas ; Michal
> Krawczyk ; Guy Tzalik ; Evgeny
> Schemeilin ; Igor Chauskin ;
> John Daley ; Hyong Youb Kim ;
> Gaetan Rivet ; Xiao Wang ;
> Ziyang Xuan ; Xiaoyun Wang
> ; Guoyang Zhou
> ; Min Hu (Connor) ;
> Yisen Zhuang ; Qiming Yang
> ; Alfredo Cardigliano ;
> Ferruh Yigit ; Shijith Thotton
> ; Srisivasubramanian Srinivasan
> ; Jakub Grajciar ; Zyta Szpak
> ; K. Y. Srinivasan ; Haiyang Zhang
> ; Martin Spinler ; Heinrich
> Kuhn ; Tetsuya Mukawa
> ; Kiran Kumar K ;
> Bruce Richardson ; Jasvinder Singh
> ; Keith Wiles ; Maciej
> Czekaj ; Maxime Coquelin
> ; Chenbo Xia ;
> Zhihong Wang ; Yong Wang
> ; Tianfei zhang ;
> Xiaoyun Li ; Satha Rao ;
> Mahipal Challa ; David Hunt ;
> Byron Marohn ; Yipeng Wang
> ; Jiayu Hu ; Sameh Gobriel
> ; Honnappa Nagarahalli
> ; Kevin Laatz ;
> Robert Sanford ; Erik Gabriel Carrillo
> ; Anatoly Burakov 
> Subject: [PATCH v2 10/37] build: remove makefiles and mk directory
> 
> A decision was made [1] to no longer support Make in DPDK, this patch
> removes all Makefiles that do not make use of pkg-config, along with
> the mk directory previously used by make.
> 
> [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html
> 
> Signed-off-by: Ciara Power 
> ---
Reviewed-by: Ruifeng Wang 

[dpdk-dev] [PATCH] net/octeontx2: set max vtag insertion size

[kirankumark]

From: Kiran Kumar K 

When TX side VTAG insertion is enabled, As we are not setting the max
vtag insertion size an interrupt has been received. This patch will fix
the issue by configuring the max vtag insertion size to 8B.

Signed-off-by: Kiran Kumar K 
---
 drivers/net/octeontx2/otx2_tm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/octeontx2/otx2_tm.c b/drivers/net/octeontx2/otx2_tm.c
index 8ed059549..b76242a60 100644
--- a/drivers/net/octeontx2/otx2_tm.c
+++ b/drivers/net/octeontx2/otx2_tm.c
@@ -560,8 +560,9 @@ populate_tm_reg(struct otx2_eth_dev *dev,
 * smaller
 */
reg[k] = NIX_AF_SMQX_CFG(schq);
-   regval[k] = BIT_ULL(50) | NIX_MIN_HW_FRS;
-   regval_mask[k] = ~(BIT_ULL(50) | 0x7f);
+   regval[k] = BIT_ULL(50) | ((uint64_t)NIX_MAX_VTAG_INS << 36) |
+   NIX_MIN_HW_FRS;
+   regval_mask[k] = ~(BIT_ULL(50) | (0x7ULL << 36) | 0x7f);
k++;
 
/* Parent and schedule conf */
-- 
2.25.1