[dpdk-dev] [dpdk v1] net/mlx5: fix possible building error
From: Tonghao Zhang
When setting the CONFIG_RTE_BUILD_SHARED_LIB to y,
and build the mlx5 pmd, there is a building error.
To fix it, add RTE_IBVERBS_LINK_DLOPEN to include
relative codes.
> mlx5_common.o: In function `mlx5_glue_init':
> drivers/common/mlx5/mlx5_common.c:324: undefined reference to `dlclose'
Fixes: 7b4f1e6bd367 ("common/mlx5: introduce common library")
Cc: sta...@dpdk.org
Signed-off-by: Tonghao Zhang
---
drivers/common/mlx5/mlx5_common.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.c
b/drivers/common/mlx5/mlx5_common.c
index 610fb48..570a3f4 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -209,8 +209,6 @@ enum mlx5_class
*/
RTE_INIT_PRIO(mlx5_glue_init, CLASS)
{
- void *handle = NULL;
-
/* Initialize common log type. */
mlx5_common_logtype = rte_log_register("pmd.common.mlx5");
if (mlx5_common_logtype >= 0)
@@ -249,6 +247,7 @@ enum mlx5_class
mlx5_glue_path(glue_path, sizeof(glue_path)) : ""),
};
unsigned int i = 0;
+ void *handle = NULL;
void **sym;
const char *dlmsg;
@@ -320,8 +319,10 @@ enum mlx5_class
mlx5_glue->fork_init();
return;
glue_error:
+#ifdef RTE_IBVERBS_LINK_DLOPEN
if (handle)
dlclose(handle);
+#endif
DRV_LOG(WARNING, "Cannot initialize MLX5 common due to missing"
" run-time dependency on rdma-core libraries (libibverbs,"
" libmlx5)");
--
1.8.3.1
[dpdk-dev] [PATCH] Fix various typos found by Lintian
From: Luca Boccassi
Cc: sta...@dpdk.org
Signed-off-by: Luca Boccassi
---
Debian's linter is getting more and more annoy^^smart and now parses binaries
for typos too - CC stable to get it off my back in the next release
app/test-pmd/cmdline.c | 4 ++--
app/test/test_mbuf.c| 2 +-
doc/guides/nics/mlx5.rst| 2 +-
doc/guides/vdpadevs/mlx5.rst| 2 +-
drivers/common/octeontx2/hw/otx2_npc.h | 4 ++--
drivers/compress/octeontx/otx_zip_pmd.c | 2 +-
drivers/event/dpaa2/dpaa2_eventdev.c| 2 +-
drivers/net/bnxt/bnxt_ethdev.c | 2 +-
drivers/net/bonding/rte_eth_bond_pmd.c | 4 ++--
drivers/net/cxgbe/cxgbe_flow.c | 2 +-
drivers/net/dpaa2/dpaa2_flow.c | 4 ++--
drivers/net/dpaa2/dpaa2_mux.c | 2 +-
drivers/net/hinic/base/hinic_pmd_mbox.c | 2 +-
drivers/net/i40e/base/i40e_nvm.c| 2 +-
drivers/net/i40e/i40e_ethdev.c | 2 +-
drivers/net/mlx5/mlx5_rxtx.c| 2 +-
drivers/net/pfe/pfe_ethdev.c| 2 +-
drivers/net/qede/base/ecore_iov_api.h | 2 +-
drivers/net/qede/qede_ethdev.c | 2 +-
drivers/net/sfc/sfc_ef10_tx.c | 2 +-
examples/vmdq/main.c| 2 +-
examples/vmdq_dcb/main.c| 2 +-
lib/librte_eal/common/include/arch/x86/rte_atomic.h | 2 +-
lib/librte_eal/linux/eal/eal.c | 2 +-
lib/librte_ipsec/sa.h | 2 +-
lib/librte_mbuf/rte_mbuf_core.h | 2 +-
26 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index a037a55c6a..7c50337953 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -95,7 +95,7 @@ static void cmd_help_brief_parsed(__attribute__((unused))
void *parsed_result,
"help ports : Configuring ports.\n"
"help registers : Reading and setting port
registers.\n"
"help filters: Filters configuration
help.\n"
- "help traffic_management : Traffic Management
commmands.\n"
+ "help traffic_management : Traffic Management
commands.\n"
"help devices: Device related cmds.\n"
"help all: All of the above
sections.\n\n"
);
@@ -5131,7 +5131,7 @@ cmd_gso_size_parsed(void *parsed_result,
if (test_done == 0) {
printf("Before setting GSO segsz, please first"
- " stop fowarding\n");
+ " stop forwarding\n");
return;
}
diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index 8200b4f71e..71bdab6917 100644
--- a/app/test/test_mbuf.c
+++ b/app/test/test_mbuf.c
@@ -1157,7 +1157,7 @@ test_refcnt_mbuf(void)
tref += refcnt_lcore[slave];
if (tref != refcnt_lcore[master])
- rte_panic("refernced mbufs: %u, freed mbufs: %u\n",
+ rte_panic("referenced mbufs: %u, freed mbufs: %u\n",
tref, refcnt_lcore[master]);
rte_mempool_dump(stdout, refcnt_pool);
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index afd11cd830..1a90e42a9c 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -35,7 +35,7 @@ operations such as querying/updating the MTU and flow control
parameters.
For security reasons and robustness, this driver only deals with virtual
memory addresses. The way resources allocations are handled by the kernel,
-combined with hardware specifications that allow to handle virtual memory
+combined with hardware specifications that allow one to handle virtual memory
addresses directly, ensure that DPDK applications cannot access random
physical memory (or memory that does not belong to the current process).
diff --git a/doc/guides/vdpadevs/mlx5.rst b/doc/guides/vdpadevs/mlx5.rst
index dd377afda5..41c9731e90 100644
--- a/doc/guides/vdpadevs/mlx5.rst
+++ b/doc/guides/vdpadevs/mlx5.rst
@@ -25,7 +25,7 @@ Design
For security reasons and robustness, this driver only deals with virtual
memory addresses. The way resources allocations are handled by the kernel,
-combined with hardware specifications that allow to handle virtual memory
+combined with hardware specifications that allow one to handle virtual memory
addresses directly, ensure that DPDK applications cannot access random
physical memory (or memory that does not belong to the current process).
diff --git a/drivers/common/octeontx2/hw/otx2_npc.h
b/drivers/common/octeontx2/hw/otx2_npc.
Re: [dpdk-dev] [EXT] [RFC v5] regexdev: introduce regexdev subsystem
Hi Ori,
Minor comments below.
>+/**
>+ * The generic *rte_regex_ops* structure to hold the RegEx attributes
>+ * for enqueue and dequeue operation.
>+ */
>+struct rte_regex_ops {
>+ /* W0 */
>+ uint16_t req_flags;
>+ /**< Request flags for the RegEx ops.
>+ * @see RTE_REGEX_OPS_REQ_*
>+ */
>+ uint16_t rsp_flags;
>+ /**< Response flags for the RegEx ops.
>+ * @see RTE_REGEX_OPS_RSP_*
>+ */
>+ uint16_t nb_actual_matches;
>+ /**< The total number of actual matches detected by the
>Regex device.*/
>+ uint16_t nb_matches;
>+ /**< The total number of matches returned by the RegEx
>device for this
>+ * scan. The size of *rte_regex_ops::matches* zero length array
>will be
>+ * this value.
>+ *
>+ * @see struct rte_regex_ops::matches, struct
>rte_regex_match
>+ */
>+
>+ /* W1 */
>+ struct rte_mbuf mbuf; /**< source mbuf, to search in. */
This should be *mbuf.
>+
>+ /* W2 */
>+ uint16_t group_id0;
This should be group_id1.
>+ /**< First group_id to match the rule against. Minimum one
>group id
>+ * must be provided by application.
>+ * When RTE_REGEX_OPS_REQ_GROUP_ID1_VALID_F set then
>group_id1
>+ * is valid, respectively similar flags for group_id2 and group_id3.
>+ * Upon the match, struct rte_regex_match::group_id shall be
>updated
>+ * with matching group ID by the device. Group ID scheme
>provides
>+ * rule isolation and effective pattern matching.
>+ */
>+ uint16_t group_id1;
>+ /**< Second group_id to match the rule against.
>+ *
>+ * @see RTE_REGEX_OPS_REQ_GROUP_ID1_VALID_F
>+ */
The above `group_id1` should be removed as its duplicate.
>+ uint16_t group_id2;
>+ /**< Third group_id to match the rule against.
>+ *
>+ * @see RTE_REGEX_OPS_REQ_GROUP_ID2_VALID_F
>+ */
>+ uint16_t group_id3;
>+ /**< Forth group_id to match the rule against.
>+ *
>+ * @see RTE_REGEX_OPS_REQ_GROUP_ID3_VALID_F
>+ */
>+
>+ /* W3 */
>+ RTE_STD_C11
>+ union {
>+ uint64_t user_id;
>+ /**< Application specific opaque value. An application
>may use
>+ * this field to hold application specific value to share
>+ * between dequeue and enqueue operation.
>+ * Implementation should not modify this field.
>+ */
>+ void *user_ptr;
>+ /**< Pointer representation of *user_id* */
>+ };
>+
>+ /* W4 */
>+ struct rte_regex_match matches[];
>+ /**< Zero length array to hold the match tuples.
>+ * The struct rte_regex_ops::nb_matches value holds the
>number of
>+ * elements in this array.
>+ *
>+ * @see struct rte_regex_ops::nb_matches
>+ */
>+};
Re: [dpdk-dev] [EXT] [RFC v5] regexdev: introduce regexdev subsystem
Hi Pavan,
Thanks for the comments please see below.
> -Original Message-
> From: dev On Behalf Of Pavan Nikhilesh Bhagavatula
> Sent: Sunday, March 1, 2020 8:13 AM
> To: Ori Kam ; Jerin Jacob Kollanukkaran
> ; xiang.w.w...@intel.com
> Cc: dev@dpdk.org; Shahaf Shuler ;
> hemant.agra...@nxp.com; Opher Reviv ; Alex
> Rosenbaum ; Dovrat Zifroni ;
> Prasun Kapoor ; nipun.gu...@nxp.com;
> bruce.richard...@intel.com; yang.a.h...@intel.com; harry.ch...@intel.com;
> gu.ji...@zte.com.cn; shanjia...@chinatelecom.cn;
> zhangy@chinatelecom.cn; lixin...@huachentel.com; wush...@inspur.com;
> yuying...@yxlink.com; fanchengg...@sunyainfo.com;
> davidf...@tencent.com; liuzho...@chinaunicom.cn;
> zhaoyon...@huawei.com; o...@yunify.com; j...@netgate.com;
> hongjun...@intel.com; j.bromh...@titan-ic.com; d...@ntop.org;
> f...@napatech.com; arthur...@lionic.com; Thomas Monjalon
>
> Subject: Re: [dpdk-dev] [EXT] [RFC v5] regexdev: introduce regexdev subsystem
>
> Hi Ori,
>
> Minor comments below.
>
>
>
> >+/**
> >+ * The generic *rte_regex_ops* structure to hold the RegEx attributes
> >+ * for enqueue and dequeue operation.
> >+ */
> >+struct rte_regex_ops {
> >+/* W0 */
> >+uint16_t req_flags;
> >+/**< Request flags for the RegEx ops.
> >+ * @see RTE_REGEX_OPS_REQ_*
> >+ */
> >+uint16_t rsp_flags;
> >+/**< Response flags for the RegEx ops.
> >+ * @see RTE_REGEX_OPS_RSP_*
> >+ */
> >+uint16_t nb_actual_matches;
> >+/**< The total number of actual matches detected by the
> >Regex device.*/
> >+uint16_t nb_matches;
> >+/**< The total number of matches returned by the RegEx
> >device for this
> >+ * scan. The size of *rte_regex_ops::matches* zero length array
> >will be
> >+ * this value.
> >+ *
> >+ * @see struct rte_regex_ops::matches, struct
> >rte_regex_match
> >+ */
> >+
> >+/* W1 */
> >+struct rte_mbuf mbuf; /**< source mbuf, to search in. */
>
> This should be *mbuf.
Yes you are correct will fix.
>
> >+
> >+/* W2 */
> >+uint16_t group_id0;
>
> This should be group_id1.
>
No this is correct is should be id0. We are starting from group 0.
The comment below states that the first group, meaning group 0 must be
valid group while group 1 doesn’t have to be vaild.
> >+/**< First group_id to match the rule against. Minimum one
> >group id
> >+ * must be provided by application.
> >+ * When RTE_REGEX_OPS_REQ_GROUP_ID1_VALID_F set then
> >group_id1
> >+ * is valid, respectively similar flags for group_id2 and group_id3.
> >+ * Upon the match, struct rte_regex_match::group_id shall be
> >updated
> >+ * with matching group ID by the device. Group ID scheme
> >provides
> >+ * rule isolation and effective pattern matching.
> >+ */
> >+uint16_t group_id1;
> >+/**< Second group_id to match the rule against.
> >+ *
> >+ * @see RTE_REGEX_OPS_REQ_GROUP_ID1_VALID_F
> >+ */
>
> The above `group_id1` should be removed as its duplicate.
>
This is not duplicate, see above comment.
> >+uint16_t group_id2;
> >+/**< Third group_id to match the rule against.
> >+ *
> >+ * @see RTE_REGEX_OPS_REQ_GROUP_ID2_VALID_F
> >+ */
> >+uint16_t group_id3;
> >+/**< Forth group_id to match the rule against.
> >+ *
> >+ * @see RTE_REGEX_OPS_REQ_GROUP_ID3_VALID_F
> >+ */
> >+
> >+/* W3 */
> >+RTE_STD_C11
> >+union {
> >+uint64_t user_id;
> >+/**< Application specific opaque value. An application
> >may use
> >+ * this field to hold application specific value to share
> >+ * between dequeue and enqueue operation.
> >+ * Implementation should not modify this field.
> >+ */
> >+void *user_ptr;
> >+/**< Pointer representation of *user_id* */
> >+};
> >+
> >+/* W4 */
> >+struct rte_regex_match matches[];
> >+/**< Zero length array to hold the match tuples.
> >+ * The struct rte_regex_ops::nb_matches value holds the
> >number of
> >+ * elements in this array.
> >+ *
> >+ * @see struct rte_regex_ops::nb_matches
> >+ */
> >+};
Re: [dpdk-dev] [v2] app/testpmd: parse flow command line for AH
> -Original Message-
> From: Xiao Zhang
> Subject: [v2] app/testpmd: parse flow command line for AH
>
> Add AH and AH SPI to testpmd rte flow command line.
> Add note and sample AH rules in testpmd guide.
>
> Signed-off-by: Xiao Zhang
> ---
> v2 Add sample rules in testpmd guide.
> ---
> app/test-pmd/cmdline_flow.c | 29
> +
> doc/guides/testpmd_app_ug/testpmd_funcs.rst | 18 ++
> 2 files changed, 47 insertions(+)
>
> diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> index c2cc4c5..680cb1c 100644
> --- a/app/test-pmd/cmdline_flow.c
> +++ b/app/test-pmd/cmdline_flow.c
> @@ -220,6 +220,8 @@ enum index {
> ITEM_L2TPV3OIP_SESSION_ID,
> ITEM_ESP,
> ITEM_ESP_SPI,
> + ITEM_AH,
> + ITEM_AH_SPI,
>
> /* Validate/create actions. */
> ACTIONS,
> @@ -768,6 +770,7 @@ static const enum index next_item[] = {
> ITEM_TAG,
> ITEM_L2TPV3OIP,
> ITEM_ESP,
> + ITEM_AH,
> END_SET,
> ZERO,
> };
> @@ -1046,6 +1049,12 @@ static const enum index item_esp[] = {
> ZERO,
> };
>
> +static const enum index item_ah[] = {
> + ITEM_AH_SPI,
> + ITEM_NEXT,
> + ZERO,
> +};
> +
> static const enum index next_set_raw[] = {
> SET_RAW_INDEX,
> ITEM_ETH,
> @@ -2699,6 +2708,19 @@ static const struct token token_list[] = {
> .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_esp,
> hdr.spi)),
> },
> + [ITEM_AH] = {
> + .name = "ah",
> + .help = "match AH header",
> + .priv = PRIV_ITEM(AH, sizeof(struct rte_flow_item_ah)),
> + .next = NEXT(item_ah),
> + .call = parse_vc,
> + },
> + [ITEM_AH_SPI] = {
> + .name = "spi",
> + .help = "security parameters index",
> + .next = NEXT(item_ah, NEXT_ENTRY(UNSIGNED), item_param),
> + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ah,
> spi)),
> + },
> /* Validate/create actions. */
> [ACTIONS] = {
> .name = "actions",
> @@ -6444,6 +6466,9 @@ flow_item_default_mask(const struct rte_flow_item
> *item)
> case RTE_FLOW_ITEM_TYPE_ESP:
> mask = &rte_flow_item_esp_mask;
> break;
> + case RTE_FLOW_ITEM_TYPE_AH:
> + mask = &rte_flow_item_ah_mask;
> + break;
> default:
> break;
> }
> @@ -6541,6 +6566,10 @@ cmd_set_raw_parsed(const struct buffer *in)
> size = sizeof(struct rte_flow_item_esp);
> proto = 0x32;
> break;
> + case RTE_FLOW_ITEM_TYPE_AH:
> + size = sizeof(struct rte_flow_item_ah);
> + proto = 0x33;
> + break;
> default:
> printf("Error - Not supported item\n");
> *total_size = 0;
> diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> index 5103ff9..95f4f06 100644
> --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> @@ -3987,6 +3987,10 @@ This section lists supported pattern items and their
> attributes, if any.
>
>- ``session_id {unsigned}``: L2TPv3 over IP session identifier.
>
> +- ``ah``: match AH header.
> +
> + - ``spi {unsigned}``: security parameters index.
> +
> Actions list
>
>
> @@ -4822,6 +4826,20 @@ ESP rules can be created by the following
> commands::
> testpmd> flow create 0 ingress pattern eth / ipv6 / udp / esp spi is 1 / end
> actions queue index 3 / end
>
> +Sample AH rules
> +
> +
> +AH rules can be created by the following commands::
> +
> + testpmd> flow create 0 ingress pattern eth / ipv4 / ah spi is 1 / end
> actions
> +queue index 3 / end
> + testpmd> flow create 0 ingress pattern eth / ipv4 / udp / ah spi is 1 / end
> +actions queue index 3 / end
> + testpmd> flow create 0 ingress pattern eth / ipv6 / ah spi is 1 / end
> actions
> +queue index 3 / end
> + testpmd> flow create 0 ingress pattern eth / ipv6 / udp / ah spi is 1 / end
> +actions queue index 3 / end
> +
> BPF Functions
> --
>
> --
> 2.7.4
Acked-by: Ori Kam
Best,
Ori Kam
