[dpdk-dev] [PATCH v3] drivers/common: enable Windows common mlx5 compilation
From: Ophir Munk
Prior to this commit meson did not progress beyond directory
drivers/common for Windows compilations. This commit enables drivers
compilation under this directory.
Signed-off-by: Ophir Munk
Signed-off-by: Tal Shnaiderman
Acked-by: Matan Azrad
---
v3: change commit place with dependencies.
Depends-on: patch-82392 ("net/mlx5: fix flow sample definitions")
Depends-on: patch-85737 ("mlx5: split multi-threaded flows per OS")
Depends-on: patch-85621 ("build: i40e PMD on Windows")
---
drivers/common/meson.build | 8 +++-
drivers/common/mlx5/meson.build | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/common/meson.build b/drivers/common/meson.build
index d78882f05e..be97424548 100644
--- a/drivers/common/meson.build
+++ b/drivers/common/meson.build
@@ -1,10 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Cavium, Inc
-if is_windows
- subdir_done()
+if not is_windows
+ std_deps = ['eal']
+ drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2',
'sfc_efx']
endif
-
-std_deps = ['eal']
-drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2', 'sfc_efx']
config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'
diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build
index 3dacc6f683..3047b455cf 100644
--- a/drivers/common/mlx5/meson.build
+++ b/drivers/common/mlx5/meson.build
@@ -1,9 +1,9 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2019 Mellanox Technologies, Ltd
-if not is_linux
+if not (is_linux or (is_windows and is_ms_linker))
build = false
- reason = 'only supported on Linux'
+ reason = 'only supported on Linux and Windows build with clang'
subdir_done()
endif
--
2.16.1.windows.4
[dpdk-dev] [PATCH] doc: update Windows support in mlx5 guide
Windows will be supported by mlx5 PMD.
The mlx5 guide is updated with the needed
information.
Signed-off-by: Tal Shnaiderman
---
Depends-on: patch-85939 ("drivers/common: enable Windows common mlx5
compilation")
---
doc/guides/nics/mlx5.rst | 54
1 file changed, 50 insertions(+), 4 deletions(-)
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 3bda0f8417..fc33c00449 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -102,6 +102,16 @@ Features
Limitations
---
+- Windows support:
+
+ On Windows, the features are limited:
+
+ - Promiscuous mode is not supported
+ - The following rules are supported:
+
+- IPv4/UDP with CVLAN filtering
+- Unicast MAC filtering
+
- For secondary process:
- Forked secondary process not supported.
@@ -1031,8 +1041,8 @@ Below are some firmware configurations listed.
FLEX_PARSER_PROFILE_ENABLE=4
PROG_PARSE_GRAPH=1
-Prerequisites
--
+Linux Prerequisites
+---
This driver relies on external libraries and kernel drivers for resources
allocations and initialization. The following dependencies are not part of
@@ -1145,7 +1155,43 @@ required from that distribution.
Several versions of Mellanox OFED/EN are available. Installing the version
this DPDK release was developed and tested against is strongly
- recommended. Please check the `prerequisites`_.
+ recommended. Please check the `linux prerequisites`_.
+
+Windows Prerequisites
+-
+
+This driver relies on external libraries and kernel drivers for resources
+allocations and initialization. The dependencies in the following sub-sections
+are not part of DPDK, and must be installed separately.
+
+Compilation Prerequisites
+~
+
+DevX SDK installation
+^
+
+The DevX SDK must be installed on the machine building the Windows PMD.
+Additional information can be found at the `How to Integrate Windows DevX in
Your Development Environment
+`__
section.
+
+Runtime Prerequisites
+~
+
+WinOF2 version 2.60 or higher must be installed on the machine.
+
+WinOF2 installation
+^^^
+
+The driver can be downloaded from the following site:
+`WINOF2
+`__
+
+DevX Enablement
+^^^
+
+DevX for Windows must be enabled in the Windows registry.
+the keys DevxEnabled and DevxFsRules must be set.
+Additional information can be found in the WinOF2 user manual.
Supported NICs
--
@@ -1194,7 +1240,7 @@ Below are detailed device names:
Quick Start Guide on OFED/EN
-1. Download latest Mellanox OFED/EN. For more info check the `prerequisites`_.
+1. Download latest Mellanox OFED/EN. For more info check the `linux
prerequisites`_.
2. Install the required libraries and kernel modules either by installing
--
2.16.1.windows.4
[dpdk-dev] [PATCH v1] regex/octeontx2: fix global variable overflow
From: Guy Kaneti
Sentinel was missing from pci_id_ree_table[] array initialization
which caused it to overflow.
Bugzilla ID: 603
Fixes: 4cd1c5fd9 ("regex/octeontx2: introduce REE driver")
Cc: sta...@dpdk.org
Signed-off-by: Guy Kaneti
---
drivers/regex/octeontx2/otx2_regexdev.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/regex/octeontx2/otx2_regexdev.c
b/drivers/regex/octeontx2/otx2_regexdev.c
index 39eed7a20..b6e55853e 100644
--- a/drivers/regex/octeontx2/otx2_regexdev.c
+++ b/drivers/regex/octeontx2/otx2_regexdev.c
@@ -988,6 +988,9 @@ static struct rte_pci_id pci_id_ree_table[] = {
RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
PCI_DEVID_OCTEONTX2_RVU_REE_PF)
},
+ {
+ .vendor_id = 0,
+ }
};
static struct rte_pci_driver otx2_regexdev_pmd = {
--
2.28.0
[dpdk-dev] [PATCH v1 1/2] net/mlx5/linux: wrap sampling actions with OS calls
Wrap glue calls dr_create_flow_action_sampler() and
dr_create_flow_action_dest_array() with OS APIs. This commit is a follow
up on [1].
[1]
commit b293fbf9672b ("net/mlx5: add OS specific flow actions operations")
Signed-off-by: Ophir Munk
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_flow_os.h | 47 +++
drivers/net/mlx5/mlx5_flow_dv.c | 15 +--
2 files changed, 55 insertions(+), 7 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_flow_os.h
b/drivers/net/mlx5/linux/mlx5_flow_os.h
index 45b7b9f..cee6850 100644
--- a/drivers/net/mlx5/linux/mlx5_flow_os.h
+++ b/drivers/net/mlx5/linux/mlx5_flow_os.h
@@ -393,6 +393,53 @@ mlx5_flow_os_create_flow_action_dest_devx_tir(struct
mlx5_devx_obj *tir,
}
/**
+ * Create flow action: sampler
+ *
+ * @param[in] attr
+ * Pointer to sampler attribute
+ * @param[out] action
+ * Pointer to a valid action on success, NULL otherwise.
+ *
+ * @return
+ * 0 on success, or -1 on failure and errno is set.
+ */
+static inline int
+mlx5_os_flow_dr_create_flow_action_sampler
+ (struct mlx5dv_dr_flow_sampler_attr *attr,
+ void **action)
+{
+ *action = mlx5_glue->dr_create_flow_action_sampler(attr);
+ return (*action) ? 0 : -1;
+}
+
+/**
+ * Create flow action: dest_array
+ *
+ * @param[in] domain
+ * Pointer to relevant domain.
+ * @param[in] num_dest
+ * Number of destinations array.
+ * @param[in] dests
+ * Array of destination attributes.
+ * @param[out] action
+ * Pointer to a valid action on success, NULL otherwise.
+ *
+ * @return
+ * 0 on success, or -1 on failure and errno is set.
+ */
+static inline int
+mlx5_os_flow_dr_create_flow_action_dest_array
+ (void *domain,
+size_t num_dest,
+struct mlx5dv_dr_action_dest_attr *dests[],
+void **action)
+{
+ *action = mlx5_glue->dr_create_flow_action_dest_array(
+ domain, num_dest, dests);
+ return (*action) ? 0 : -1;
+}
+
+/**
* Destroy flow action.
*
* @param[in] action
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index ce229db..398a68b 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -8786,9 +8786,8 @@ flow_dv_sample_create_cb(struct mlx5_cache_list *list
__rte_unused,
sampler_attr.sample_actions = (struct mlx5dv_dr_action **)
&sample_dv_actions[0];
sampler_attr.action = cache_resource->set_action;
- cache_resource->verbs_action =
- mlx5_glue->dr_create_flow_action_sampler(&sampler_attr);
- if (!cache_resource->verbs_action) {
+ if (mlx5_os_flow_dr_create_flow_action_sampler
+ (&sampler_attr, &cache_resource->verbs_action)) {
rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL, "cannot create sample action");
@@ -8800,7 +8799,7 @@ flow_dv_sample_create_cb(struct mlx5_cache_list *list
__rte_unused,
error:
if (cache_resource->ft_type == MLX5DV_FLOW_TABLE_TYPE_FDB &&
cache_resource->default_miss)
- claim_zero(mlx5_glue->destroy_flow_action
+ claim_zero(mlx5_flow_os_destroy_flow_action
(cache_resource->default_miss));
else
flow_dv_sample_sub_actions_release(dev,
@@ -8898,6 +8897,7 @@ flow_dv_dest_array_create_cb(struct mlx5_cache_list *list
__rte_unused,
struct mlx5dv_dr_domain *domain;
uint32_t idx = 0, res_idx = 0;
struct rte_flow_error *error = ctx->error;
+ int ret;
/* Register new destination array resource. */
cache_resource = mlx5_ipool_zmalloc(sh->ipool[MLX5_IPOOL_DEST_ARRAY],
@@ -8946,11 +8946,12 @@ flow_dv_dest_array_create_cb(struct mlx5_cache_list
*list __rte_unused,
}
}
/* create a dest array actioin */
- cache_resource->action = mlx5_glue->dr_create_flow_action_dest_array
+ ret = mlx5_os_flow_dr_create_flow_action_dest_array
(domain,
cache_resource->num_of_dest,
-dest_attr);
- if (!cache_resource->action) {
+dest_attr,
+&cache_resource->action);
+ if (ret) {
rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL,
--
2.8.4
[dpdk-dev] [PATCH v1 2/2] net/mlx5/windows: implement sampling actions wrappers
This commit adds the Windows sampling actions wrappers (currently return
ENOTSUP): mlx5_os_flow_dr_create_flow_action_sampler() and
mlx5_os_flow_dr_create_flow_action_dest_array(). Using configuration
definitions HAVE_MLX5_DR_CREATE_ACTION_FLOW_SAMPLE and
HAVE_MLX5_DR_CREATE_ACTION_DEST_ARRAY the missing sampling DV structs
are added as stubs to windows/mlx5_glue.h file.
Signed-off-by: Ophir Munk
Acked-by: Matan Azrad
---
drivers/common/mlx5/windows/mlx5_glue.h | 34 +
drivers/net/mlx5/windows/mlx5_flow_os.h | 52 +
2 files changed, 86 insertions(+)
diff --git a/drivers/common/mlx5/windows/mlx5_glue.h
b/drivers/common/mlx5/windows/mlx5_glue.h
index 420bfb2..db8f2e8 100644
--- a/drivers/common/mlx5/windows/mlx5_glue.h
+++ b/drivers/common/mlx5/windows/mlx5_glue.h
@@ -15,6 +15,40 @@
#define MLX5_GLUE_VERSION ""
#endif
+#ifndef HAVE_MLX5DV_DR
+enum mlx5dv_dr_domain_type { unused, };
+struct mlx5dv_dr_domain;
+struct mlx5dv_dr_action;
+#endif
+
+#ifndef HAVE_MLX5_DR_CREATE_ACTION_FLOW_SAMPLE
+struct mlx5dv_dr_flow_sampler_attr {
+ uint32_t sample_ratio;
+ void *default_next_table;
+ size_t num_sample_actions;
+ struct mlx5dv_dr_action **sample_actions;
+ uint64_t action;
+};
+#endif
+
+#ifndef HAVE_MLX5_DR_CREATE_ACTION_DEST_ARRAY
+enum mlx5dv_dr_action_dest_type {
+ MLX5DV_DR_ACTION_DEST,
+ MLX5DV_DR_ACTION_DEST_REFORMAT,
+};
+struct mlx5dv_dr_action_dest_reformat {
+ struct mlx5dv_dr_action *reformat;
+ struct mlx5dv_dr_action *dest;
+};
+struct mlx5dv_dr_action_dest_attr {
+ enum mlx5dv_dr_action_dest_type type;
+ union {
+ struct mlx5dv_dr_action *dest;
+ struct mlx5dv_dr_action_dest_reformat *dest_reformat;
+ };
+};
+#endif
+
/* LIB_GLUE_VERSION must be updated every time this structure is modified. */
struct mlx5_glue {
const char *version;
diff --git a/drivers/net/mlx5/windows/mlx5_flow_os.h
b/drivers/net/mlx5/windows/mlx5_flow_os.h
index 630b214..26c3e59 100644
--- a/drivers/net/mlx5/windows/mlx5_flow_os.h
+++ b/drivers/net/mlx5/windows/mlx5_flow_os.h
@@ -322,6 +322,58 @@ mlx5_flow_os_create_flow_action_default_miss(void **action)
}
/**
+ * Create flow action: sampler
+ *
+ * @param[in] attr
+ * Pointer to sampler attribute
+ * @param[out] action
+ * Pointer to a valid action on success, NULL otherwise.
+ *
+ * @return
+ * 0 on success, or -1 on failure and errno is set.
+ */
+static inline int
+mlx5_os_flow_dr_create_flow_action_sampler
+ (struct mlx5dv_dr_flow_sampler_attr *attr,
+ void **action)
+{
+ RTE_SET_USED(attr);
+ *action = NULL;
+ rte_errno = ENOTSUP;
+ return -rte_errno;
+}
+
+/**
+ * Create flow action: dest_array
+ *
+ * @param[in] domain
+ * Pointer to relevant domain.
+ * @param[in] num_dest
+ * Number of destinations array.
+ * @param[in] dests
+ * Array of destination attributes.
+ * @param[out] action
+ * Pointer to a valid action on success, NULL otherwise.
+ *
+ * @return
+ * 0 on success, or -1 on failure and errno is set.
+ */
+static inline int
+mlx5_os_flow_dr_create_flow_action_dest_array
+ (void *domain,
+size_t num_dest,
+struct mlx5dv_dr_action_dest_attr *dests[],
+void **action)
+{
+ RTE_SET_USED(domain);
+ RTE_SET_USED(num_dest);
+ RTE_SET_USED(dests);
+ *action = NULL;
+ rte_errno = ENOTSUP;
+ return -rte_errno;
+}
+
+/**
* OS stub for mlx5_flow_adjust_priority() API.
* Windows only supports flow priority 0 that cannot be adjusted.
*
--
2.8.4
[dpdk-dev] [PATCH v1 0/2] Windows sampling actions
v1: First release Ophir Munk (2): net/mlx5/linux: wrap sampling actions with OS calls net/mlx5/windows: implement sampling actions wrappers drivers/common/mlx5/windows/mlx5_glue.h | 34 + drivers/net/mlx5/linux/mlx5_flow_os.h | 47 + drivers/net/mlx5/mlx5_flow_dv.c | 15 +- drivers/net/mlx5/windows/mlx5_flow_os.h | 52 + 4 files changed, 141 insertions(+), 7 deletions(-) -- 2.8.4
[dpdk-dev] [PATCH] net/mlx5: fix flow check hairpin split
Previously, the identification of hairpin queue was done using
mlx5_rxq_get_type() function.
Recent patch replaced it with use of mlx5_rxq_get_hairpin_conf(),
and check of the return value conf != NULL.
The case of return value is NULL (queue is not hairpin) was not handled.
As result, non-hairpin flows were wrongly handled.
This patch adds the required check for return value is NULL.
Fixes: 509f8470de55 ("net/mlx5: do not split hairpin flow in explicit mode")
Cc: sta...@dpdk.org
Signed-off-by: Dekel Peled
Acked-by: Matan Azrad
---
drivers/net/mlx5/mlx5_flow.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index f110c6b714..0ba1dc8c70 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -3524,7 +3524,7 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
if (queue == NULL)
return 0;
conf = mlx5_rxq_get_hairpin_conf(dev, queue->index);
- if (conf != NULL && !!conf->tx_explicit)
+ if (!conf || !!conf->tx_explicit)
return 0;
queue_action = 1;
action_n++;
@@ -3534,7 +3534,7 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
if (rss == NULL || rss->queue_num == 0)
return 0;
conf = mlx5_rxq_get_hairpin_conf(dev, rss->queue[0]);
- if (conf != NULL && !!conf->tx_explicit)
+ if (!conf || !!conf->tx_explicit)
return 0;
queue_action = 1;
action_n++;
--
2.25.1
Re: [dpdk-dev] [PATCH] net/iavf: fix vector id assignment
> -Original Message-
> From: dev On Behalf Of dapengx...@intel.com
> Sent: Wednesday, December 30, 2020 2:54 PM
> To: Wu, Jingjing ; Xing, Beilei
> Cc: dev@dpdk.org; Yu, DapengX ; sta...@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/iavf: fix vector id assignment
>
> From: YU DAPENG
>
> When the interrupt handle instance allows none packet I/O interrupts, the max
> value of vector_id is set to be less than the number of msix interrupts, but
> not
> equal to it. Which may cause same vector_id is sent to PF with opcode
> VIRTCHNL_OP_CONFIG_IRQ_MAP to setup the cause of interrupt mapping in
> iavf_config_irq_map(), these are invalid parameters, cause error:
> VIRTCHNL_STATUS_ERR_PARAM(-5). So add code to set the max value of
> vector_id to be equal to the number of msix interrupts.
>
> Fixes: d6bde6b5eae9 ("net/avf: enable Rx interrupt")
> Cc: sta...@dpdk.org
>
> Signed-off-by: YU DAPENG
> ---
> drivers/net/iavf/iavf_ethdev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
> index
> 7e3c26a94..54ea3a36c 100644
> --- a/drivers/net/iavf/iavf_ethdev.c
> +++ b/drivers/net/iavf/iavf_ethdev.c
> @@ -578,7 +578,7 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev
> *dev,
> qv_map[i].queue_id = i;
> qv_map[i].vector_id = vec;
> intr_handle->intr_vec[i] = vec++;
> - if (vec >= vf->nb_msix)
> + if (vec > vf->nb_msix)
This is not correct, the nb_msix should already include the vector 0, we should
not set a vector_id to a value that >= nb_msix,
> vec = IAVF_RX_VEC_START;
> }
> vf->qv_map = qv_map;
> --
> 2.27.0
Re: [dpdk-dev] [PATCH v4 3/4] raw/ifpga: add opae API for Cyborg
Hi Rosen,
I cannot change "master" to "primary", how to fix it ?
Wei
-Original Message-
From: Xu, Rosen
Sent: Friday, January 1, 2021 22:39
To: Huang, Wei ; dev@dpdk.org; Zhang, Qi Z
Cc: sta...@dpdk.org; Zhang, Tianfei
Subject: RE: [PATCH v4 3/4] raw/ifpga: add opae API for Cyborg
Hi Wei,
Could you pls fix coding style issues? Thanks a lot.
Thanks,
Rosen
> -Original Message-
> From: Huang, Wei
> Sent: Wednesday, December 30, 2020 15:46
> To: dev@dpdk.org; Xu, Rosen ; Zhang, Qi Z
>
> Cc: sta...@dpdk.org; Zhang, Tianfei ; Huang, Wei
>
> Subject: [PATCH v4 3/4] raw/ifpga: add opae API for Cyborg
>
> Cyborg is part of OpenStack, it needs some OPAE type APIs to manage
> PACs (Programmable Acceleration Card) with Intel FPGA. Below major
> functions are added to meets Cyborg requirements.
> 1. opae_init_eal() set up EAL environment.
> 2. opae_cleanup_eal() clean up EAL environment.
> 3. opae_enumerate() searches PAC with specific FPGA.
> 4. opae_get_property() gets properties of FPGA.
> 5. opae_partial_reconfigure() perform partial configuration on FPGA.
> 6. opae_get_image_info() gets information of image file.
> 7. opae_update_flash() updates FPGA flash with specific image file.
> 8. opae_cancel_flash_update() cancel process of FPGA flash update.
> 9. opae_probe_device() manually probe specific FPGA with ifpga driver.
> 10. opae_remove_device() manually remove specific FPGA from ifpga driver.
> 11. opae_bind_driver() binds specific FPGA with specified kernel driver.
> 12. opae_unbind_driver() unbinds specific FPGA from kernel driver.
> 13. opae_reboot_device() reboots specific FPGA (do reconfiguration).
>
> Signed-off-by: Wei Huang
> ---
> v2: fix typo in commit log and ifpga_opae_api.h
> ---
> v3: fix coding style issue in ifpga_opae_api.c
> ---
> v4: enclose macro PCI_EXT_CAP_ID in parentheses
> ---
> drivers/raw/ifpga/ifpga_opae_api.c | 1801
>
> drivers/raw/ifpga/ifpga_opae_api.h | 245
> drivers/raw/ifpga/ifpga_rawdev.c | 152 ++-
> drivers/raw/ifpga/ifpga_rawdev.h | 15 +
> drivers/raw/ifpga/meson.build |4 +-
> 5 files changed, 2210 insertions(+), 7 deletions(-)
> create mode 100644 drivers/raw/ifpga/ifpga_opae_api.c
> create mode 100644 drivers/raw/ifpga/ifpga_opae_api.h
>
> diff --git a/drivers/raw/ifpga/ifpga_opae_api.c
> b/drivers/raw/ifpga/ifpga_opae_api.c
> new file mode 100644
> index 0..9210092ab
> --- /dev/null
> +++ b/drivers/raw/ifpga/ifpga_opae_api.c
> @@ -0,0 +1,1801 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2020 Intel Corporation
> + */
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include "base/opae_hw_api.h"
> +#include "base/ifpga_sec_mgr.h"
> +#include "ifpga_rawdev.h"
> +#include "ifpga_opae_api.h"
> +
> +
> +int opae_log_level;
> +FILE *opae_log_file;
> +
> +static opae_api_version api_ver = {21, 2, 0};
> +static int eal_inited;
> +static uint32_t dev_aer[2] = {0};
> +
> +static const char * const log_level_name[] = {"CRITICAL", "ERROR",
> + "WARNING", "INFORMATION", "DEBUG"};
> +static const char * const proc_type_name[] = {"NON-DPDK", "PRIMARY",
> + "SECONDARY"};
> +static const char * const platform_name[] = {"Vista Creek", "Rush Creek",
> + "Darby Creek", "Lightning Creek"};
> +static const char * const release_name[] = {"Pre-Alpha", "Alpha", "Beta",
> "PV"};
> +static const char * const interface_type[] = {"8x10G", "4x25G", "2x1x25G",
> + "4x25G+2x25G", "2x2x25G", "2x1x25Gx2FVL", "1x2x25G"};
> +static const char * const kdrv[] = {OPAE_KDRV_UNKNOWN,
> OPAE_KDRV_IGB_UIO,
> + OPAE_KDRV_VFIO_PCI, OPAE_KDRV_UIO_PCI};
> +
> +RTE_INIT(init_api_env)
> +{
> + eal_inited = 0;
> + opae_log_level = OPAE_LOG_ERR;
> + opae_log_file = NULL;
> + ifpga_rawdev_logtype = 0;
> +
> + opae_log_info("API environment is initialized\n");
> +}
> +
> +RTE_FINI(clean_api_env)
> +{
> + if (opae_log_file) {
> + fclose(opae_log_file);
> + opae_log_file = NULL;
> + }
> + opae_log_info("API environment is cleaned\n");
> +}
> +
> +void opae_get_api_version(opae_api_version *version)
> +{
> + if (version)
> + memcpy(version, &api_ver, sizeof(opae_api_version));
> + opae_log_info("API version is %u.%u.%u\n",
> + api_ver.major, api_ver.minor, api_ver.micro);
> +}
> +
> +int opae_set_log_level(int level)
> +{
> + if ((level >= OPAE_LOG_API) && (level <= OPAE_LOG_DEBUG))
> + opae_log_level = level;
> + opae_log_api("Current log level is %s\n",
> + log_level_name[opae_log_level]);
> + return opae_log_level;
> +}
> +
> +int opae_set_log_file(char *path, int clean)
> +{
> + FILE *f = NULL;
> + time_t start;
> + struct tm *lt = NULL;
> +
> + if (path) {
> + if (clean)
> + f = fopen(path, "w+");
> + else
> +
Re: [dpdk-dev] [PATCH] net/iavf: fix vector id assignment
Hi Qi,
By checking the running i40e vf PMD(function:i40evf_config_irq_map()), found
that the vector_id actually can be a value that is equal to nb_msix as the
following.
map_info->num_vectors is just equal to nb_msix(which is 2), the max vector_id
is also 2. The map_info which contains vecmap[0], and vectmap[1] is sent to PF
with opcode VIRTCHNL_OP_CONFIG_IRQ_MAP to setup the cause of interrupt mapping
in iavf_config_irq_map(), these are valid parameters and effective at last. The
interrupt can run as expected.
So I deduce that vector_id can be equal to nb_msix in iavf PMD too.
(gdb) p *map_info
$6 = {num_vectors = 2, vecmap = {{vsi_id = 10, vector_id = 1, rxq_map = 1,
txq_map = 0, rxitr_idx = 0,
txitr_idx = 0}}}
(gdb) p map_info->vecmap[1]
$7 = {vsi_id = 10, vector_id = 2, rxq_map = 2, txq_map = 0, rxitr_idx = 0,
txitr_idx = 0}
(gdb) p map_info->vecmap[0]
$8 = {vsi_id = 10, vector_id = 1, rxq_map = 1, txq_map = 0, rxitr_idx = 0,
txitr_idx = 0}
-Original Message-
From: Zhang, Qi Z
Sent: Monday, January 4, 2021 8:26 AM
To: Yu, DapengX ; Wu, Jingjing ;
Xing, Beilei
Cc: dev@dpdk.org; Yu, DapengX ; sta...@dpdk.org
Subject: RE: [dpdk-dev] [PATCH] net/iavf: fix vector id assignment
> -Original Message-
> From: dev On Behalf Of dapengx...@intel.com
> Sent: Wednesday, December 30, 2020 2:54 PM
> To: Wu, Jingjing ; Xing, Beilei
>
> Cc: dev@dpdk.org; Yu, DapengX ; sta...@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/iavf: fix vector id assignment
>
> From: YU DAPENG
>
> When the interrupt handle instance allows none packet I/O interrupts,
> the max value of vector_id is set to be less than the number of msix
> interrupts, but not equal to it. Which may cause same vector_id is
> sent to PF with opcode VIRTCHNL_OP_CONFIG_IRQ_MAP to setup the cause
> of interrupt mapping in iavf_config_irq_map(), these are invalid parameters,
> cause error:
> VIRTCHNL_STATUS_ERR_PARAM(-5). So add code to set the max value of
> vector_id to be equal to the number of msix interrupts.
>
> Fixes: d6bde6b5eae9 ("net/avf: enable Rx interrupt")
> Cc: sta...@dpdk.org
>
> Signed-off-by: YU DAPENG
> ---
> drivers/net/iavf/iavf_ethdev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/iavf/iavf_ethdev.c
> b/drivers/net/iavf/iavf_ethdev.c index 7e3c26a94..54ea3a36c 100644
> --- a/drivers/net/iavf/iavf_ethdev.c
> +++ b/drivers/net/iavf/iavf_ethdev.c
> @@ -578,7 +578,7 @@ static int iavf_config_rx_queues_irqs(struct
> rte_eth_dev *dev,
> qv_map[i].queue_id = i;
> qv_map[i].vector_id = vec;
> intr_handle->intr_vec[i] = vec++;
> - if (vec >= vf->nb_msix)
> + if (vec > vf->nb_msix)
This is not correct, the nb_msix should already include the vector 0, we should
not set a vector_id to a value that >= nb_msix,
> vec = IAVF_RX_VEC_START;
> }
> vf->qv_map = qv_map;
> --
> 2.27.0
Re: [dpdk-dev] [PATCH] net/iavf: fix GTPU UL and DL support for FDIR
> -Original Message-
> From: Guo, Junfeng
> Sent: Thursday, December 31, 2020 1:13 PM
> To: Zhang, Qi Z ; Wu, Jingjing ;
> Xing, Beilei
> Cc: dev@dpdk.org; sta...@dpdk.org; Yigit, Ferruh ;
> Guo,
> Junfeng
> Subject: [PATCH] net/iavf: fix GTPU UL and DL support for FDIR
>
> For AVF FDIR, GTPU uplink and downlink are not supported in previous code.
> This
> patch distinguishes GTPU with IP/EH/DL/UL for AVF FDIR.
>
> Fixes: 4c7a41ae6b23 ("net/iavf: support flow director GTPU outer IPv4/IPv6")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Junfeng Guo
Acked-by: Qi Zhang
Applied to dpdk-next-net-intel.
Thanks
Qi
Re: [dpdk-dev] [PATCH v4 3/4] raw/ifpga: add opae API for Cyborg
Hi Wei,
Let's align and review it offline.
Thanks,
Rosen
> -Original Message-
> From: Huang, Wei
> Sent: Monday, January 04, 2021 9:18
> To: Xu, Rosen ; dev@dpdk.org; Zhang, Qi Z
>
> Cc: sta...@dpdk.org; Zhang, Tianfei
> Subject: RE: [PATCH v4 3/4] raw/ifpga: add opae API for Cyborg
>
> Hi Rosen,
>
> I cannot change "master" to "primary", how to fix it ?
>
> Wei
>
> -Original Message-
> From: Xu, Rosen
> Sent: Friday, January 1, 2021 22:39
> To: Huang, Wei ; dev@dpdk.org; Zhang, Qi Z
>
> Cc: sta...@dpdk.org; Zhang, Tianfei
> Subject: RE: [PATCH v4 3/4] raw/ifpga: add opae API for Cyborg
>
> Hi Wei,
>
> Could you pls fix coding style issues? Thanks a lot.
>
> Thanks,
> Rosen
>
> > -Original Message-
> > From: Huang, Wei
> > Sent: Wednesday, December 30, 2020 15:46
> > To: dev@dpdk.org; Xu, Rosen ; Zhang, Qi Z
> >
> > Cc: sta...@dpdk.org; Zhang, Tianfei ; Huang,
> Wei
> >
> > Subject: [PATCH v4 3/4] raw/ifpga: add opae API for Cyborg
> >
> > Cyborg is part of OpenStack, it needs some OPAE type APIs to manage
> > PACs (Programmable Acceleration Card) with Intel FPGA. Below major
> > functions are added to meets Cyborg requirements.
> > 1. opae_init_eal() set up EAL environment.
> > 2. opae_cleanup_eal() clean up EAL environment.
> > 3. opae_enumerate() searches PAC with specific FPGA.
> > 4. opae_get_property() gets properties of FPGA.
> > 5. opae_partial_reconfigure() perform partial configuration on FPGA.
> > 6. opae_get_image_info() gets information of image file.
> > 7. opae_update_flash() updates FPGA flash with specific image file.
> > 8. opae_cancel_flash_update() cancel process of FPGA flash update.
> > 9. opae_probe_device() manually probe specific FPGA with ifpga driver.
> > 10. opae_remove_device() manually remove specific FPGA from ifpga
> driver.
> > 11. opae_bind_driver() binds specific FPGA with specified kernel driver.
> > 12. opae_unbind_driver() unbinds specific FPGA from kernel driver.
> > 13. opae_reboot_device() reboots specific FPGA (do reconfiguration).
> >
> > Signed-off-by: Wei Huang
> > ---
> > v2: fix typo in commit log and ifpga_opae_api.h
> > ---
> > v3: fix coding style issue in ifpga_opae_api.c
> > ---
> > v4: enclose macro PCI_EXT_CAP_ID in parentheses
> > ---
> > drivers/raw/ifpga/ifpga_opae_api.c | 1801
> >
> > drivers/raw/ifpga/ifpga_opae_api.h | 245
> > drivers/raw/ifpga/ifpga_rawdev.c | 152 ++-
> > drivers/raw/ifpga/ifpga_rawdev.h | 15 +
> > drivers/raw/ifpga/meson.build |4 +-
> > 5 files changed, 2210 insertions(+), 7 deletions(-)
> > create mode 100644 drivers/raw/ifpga/ifpga_opae_api.c
> > create mode 100644 drivers/raw/ifpga/ifpga_opae_api.h
> >
> > diff --git a/drivers/raw/ifpga/ifpga_opae_api.c
> > b/drivers/raw/ifpga/ifpga_opae_api.c
> > new file mode 100644
> > index 0..9210092ab
> > --- /dev/null
> > +++ b/drivers/raw/ifpga/ifpga_opae_api.c
> > @@ -0,0 +1,1801 @@
> > +/* SPDX-License-Identifier: BSD-3-Clause
> > + * Copyright(c) 2020 Intel Corporation
> > + */
> > +
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include "base/opae_hw_api.h"
> > +#include "base/ifpga_sec_mgr.h"
> > +#include "ifpga_rawdev.h"
> > +#include "ifpga_opae_api.h"
> > +
> > +
> > +int opae_log_level;
> > +FILE *opae_log_file;
> > +
> > +static opae_api_version api_ver = {21, 2, 0};
> > +static int eal_inited;
> > +static uint32_t dev_aer[2] = {0};
> > +
> > +static const char * const log_level_name[] = {"CRITICAL", "ERROR",
> > + "WARNING", "INFORMATION", "DEBUG"};
> > +static const char * const proc_type_name[] = {"NON-DPDK", "PRIMARY",
> > + "SECONDARY"};
> > +static const char * const platform_name[] = {"Vista Creek", "Rush Creek",
> > + "Darby Creek", "Lightning Creek"};
> > +static const char * const release_name[] = {"Pre-Alpha", "Alpha", "Beta",
> > "PV"};
> > +static const char * const interface_type[] = {"8x10G", "4x25G", "2x1x25G",
> > + "4x25G+2x25G", "2x2x25G", "2x1x25Gx2FVL", "1x2x25G"};
> > +static const char * const kdrv[] = {OPAE_KDRV_UNKNOWN,
> > OPAE_KDRV_IGB_UIO,
> > + OPAE_KDRV_VFIO_PCI, OPAE_KDRV_UIO_PCI};
> > +
> > +RTE_INIT(init_api_env)
> > +{
> > + eal_inited = 0;
> > + opae_log_level = OPAE_LOG_ERR;
> > + opae_log_file = NULL;
> > + ifpga_rawdev_logtype = 0;
> > +
> > + opae_log_info("API environment is initialized\n");
> > +}
> > +
> > +RTE_FINI(clean_api_env)
> > +{
> > + if (opae_log_file) {
> > + fclose(opae_log_file);
> > + opae_log_file = NULL;
> > + }
> > + opae_log_info("API environment is cleaned\n");
> > +}
> > +
> > +void opae_get_api_version(opae_api_version *version)
> > +{
> > + if (version)
> > + memcpy(version, &api_ver, sizeof(opae_api_version));
> > + opae_log_info("API version is %u.%u.%u\n",
> > + api_ver.major, api_ver.minor, api_ver.micro);
> > +}
> > +
>
[dpdk-dev] [Bug 449] Fortville X710 FDIR with flow APIs broken
https://bugs.dpdk.org/show_bug.cgi?id=449 Vipin Varghese (vipin.vargh...@intel.com) changed: What|Removed |Added Resolution|INVALID |--- Status|RESOLVED|CONFIRMED --- Comment #14 from Vipin Varghese (vipin.vargh...@intel.com) --- Marking this as fixed `confirmed` rather than `resolved-invalid` due to the following reasons 1. ticket is opened on DPDK 20.02 on 13 Apr 2020 2. The documentation available for FDIR on X710 was not correct 3. missing of `transfer` verb in the documentation of testpmd and tests. 4. Patches and fixes applied on top of X710 before testing on 30 Dec 2020. 5. Not mentioned in the comment whether it works for `DPDK 20.02` 6. Have not confirmed if the VF can be used with any other application other than testpmd. @Ajith will test and try on DPDK 20.02 but with much lower priority to confirm with the steps shared from `Steve Yang` and update the ticket. -- You are receiving this mail because: You are the assignee for the bug.
[dpdk-dev] [PATCH v6 0/2] examples/vhost: sample code refactor
Refactor the vhost sample code. Add ioat ring space count and check in ioat callback, optimize vhost data path for batch enqueue, replace rte_atomicNN_xxx to atomic_XXX and refactor vhost async data path. --- v6: * adjusted the value of MAX_ENQUEUED_SIZE in ioat.h v5: * added vhost enqueue buffer free when destroy a vhost device * added rte_ioat_completed_ops() fail handler * changed the behavior of drain_vhost_table() function * changed some variable names * changed some variable definition * added rte_zmalloc() fail handler * added some comments * fixed some typos v4: * improved code structure * improved vhost enqueue buffer memory allocation * cleaned some codes v3: * added some variable initiation * cleaned some codes v2: * optimized patch structure * optimized git log * replaced rte_atomicNN_xxx to atomic_XXX Cheng Jiang (2): examples/vhost: add ioat ring space count and check examples/vhost: refactor vhost data path examples/vhost/ioat.c | 22 +++-- examples/vhost/ioat.h | 2 +- examples/vhost/main.c | 214 -- examples/vhost/main.h | 7 +- 4 files changed, 179 insertions(+), 66 deletions(-) -- 2.29.2
[dpdk-dev] [PATCH v6 1/2] examples/vhost: add ioat ring space count and check
Add ioat ring space count and check, if ioat ring space is not enough
for the next async vhost packet enqueue, then just return to prevent
enqueue failure. Add rte_ioat_completed_ops() fail handler.
Signed-off-by: Cheng Jiang
---
examples/vhost/ioat.c | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/examples/vhost/ioat.c b/examples/vhost/ioat.c
index 71d8a1f1f5..679d1e2f58 100644
--- a/examples/vhost/ioat.c
+++ b/examples/vhost/ioat.c
@@ -17,6 +17,7 @@ struct packet_tracker {
unsigned short next_read;
unsigned short next_write;
unsigned short last_remain;
+ unsigned short ioat_space;
};
struct packet_tracker cb_tracker[MAX_VHOST_DEVICE];
@@ -113,7 +114,7 @@ open_ioat(const char *value)
goto out;
}
rte_rawdev_start(dev_id);
-
+ cb_tracker[dev_id].ioat_space = IOAT_RING_SIZE;
dma_info->nr++;
i++;
}
@@ -140,13 +141,9 @@ ioat_transfer_data_cb(int vid, uint16_t queue_id,
src = descs[i_desc].src;
dst = descs[i_desc].dst;
i_seg = 0;
+ if (cb_tracker[dev_id].ioat_space < src->nr_segs)
+ break;
while (i_seg < src->nr_segs) {
- /*
-* TODO: Assuming that the ring space of the
-* IOAT device is large enough, so there is no
-* error here, and the actual error handling
-* will be added later.
-*/
rte_ioat_enqueue_copy(dev_id,
(uintptr_t)(src->iov[i_seg].iov_base)
+ src->offset,
@@ -158,7 +155,8 @@ ioat_transfer_data_cb(int vid, uint16_t queue_id,
i_seg++;
}
write &= mask;
- cb_tracker[dev_id].size_track[write] = i_seg;
+ cb_tracker[dev_id].size_track[write] = src->nr_segs;
+ cb_tracker[dev_id].ioat_space -= src->nr_segs;
write++;
}
} else {
@@ -178,17 +176,21 @@ ioat_check_completed_copies_cb(int vid, uint16_t queue_id,
{
if (!opaque_data) {
uintptr_t dump[255];
- unsigned short n_seg;
+ int n_seg;
unsigned short read, write;
unsigned short nb_packet = 0;
unsigned short mask = MAX_ENQUEUED_SIZE - 1;
unsigned short i;
+
int dev_id = dma_bind[vid].dmas[queue_id * 2
+ VIRTIO_RXQ].dev_id;
n_seg = rte_ioat_completed_ops(dev_id, 255, dump, dump);
- n_seg += cb_tracker[dev_id].last_remain;
if (!n_seg)
return 0;
+
+ cb_tracker[dev_id].ioat_space += n_seg;
+ n_seg += cb_tracker[dev_id].last_remain;
+
read = cb_tracker[dev_id].next_read;
write = cb_tracker[dev_id].next_write;
for (i = 0; i < max_packets; i++) {
--
2.29.2
[dpdk-dev] [PATCH v6 2/2] examples/vhost: refactor vhost data path
Change the vm2vm data path to batch enqueue for better performance.
Support latest async vhost API, refactor vhost async data path,
replace rte_atomicNN_xxx to atomic_XXX and clean some codes.
Signed-off-by: Cheng Jiang
---
examples/vhost/ioat.h | 2 +-
examples/vhost/main.c | 214 --
examples/vhost/main.h | 7 +-
3 files changed, 167 insertions(+), 56 deletions(-)
diff --git a/examples/vhost/ioat.h b/examples/vhost/ioat.h
index d6e1e2e079..0a1dbb8117 100644
--- a/examples/vhost/ioat.h
+++ b/examples/vhost/ioat.h
@@ -11,7 +11,7 @@
#define MAX_VHOST_DEVICE 1024
#define IOAT_RING_SIZE 4096
-#define MAX_ENQUEUED_SIZE 256
+#define MAX_ENQUEUED_SIZE 512
struct dma_info {
struct rte_pci_addr addr;
diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index 8d8c3038bf..45976c93c7 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -179,9 +179,22 @@ struct mbuf_table {
struct rte_mbuf *m_table[MAX_PKT_BURST];
};
+struct vhost_bufftable {
+ uint32_t len;
+ uint64_t pre_tsc;
+ struct rte_mbuf *m_table[MAX_PKT_BURST];
+};
+
/* TX queue for each data core. */
struct mbuf_table lcore_tx_queue[RTE_MAX_LCORE];
+/*
+ * Vhost TX buffer for each data core.
+ * Every data core maintains a TX buffer for every vhost device,
+ * which is used for batch pkts enqueue for higher performance.
+ */
+struct vhost_bufftable *vhost_txbuff[RTE_MAX_LCORE * MAX_VHOST_DEVICE];
+
#define MBUF_TABLE_DRAIN_TSC ((rte_get_tsc_hz() + US_PER_S - 1) \
/ US_PER_S * BURST_TX_DRAIN_US)
#define VLAN_HLEN 4
@@ -804,39 +817,112 @@ unlink_vmdq(struct vhost_dev *vdev)
}
}
+static inline void
+free_pkts(struct rte_mbuf **pkts, uint16_t n)
+{
+ while (n--)
+ rte_pktmbuf_free(pkts[n]);
+}
+
static __rte_always_inline void
-virtio_xmit(struct vhost_dev *dst_vdev, struct vhost_dev *src_vdev,
+complete_async_pkts(struct vhost_dev *vdev)
+{
+ struct rte_mbuf *p_cpl[MAX_PKT_BURST];
+ uint16_t complete_count;
+
+ complete_count = rte_vhost_poll_enqueue_completed(vdev->vid,
+ VIRTIO_RXQ, p_cpl, MAX_PKT_BURST);
+ if (complete_count) {
+ atomic_fetch_sub(&vdev->nr_async_pkts, complete_count);
+ free_pkts(p_cpl, complete_count);
+ }
+}
+
+static __rte_always_inline void
+sync_virtio_xmit(struct vhost_dev *dst_vdev, struct vhost_dev *src_vdev,
struct rte_mbuf *m)
{
uint16_t ret;
- struct rte_mbuf *m_cpl[1];
if (builtin_net_driver) {
ret = vs_enqueue_pkts(dst_vdev, VIRTIO_RXQ, &m, 1);
- } else if (async_vhost_driver) {
- ret = rte_vhost_submit_enqueue_burst(dst_vdev->vid, VIRTIO_RXQ,
- &m, 1);
-
- if (likely(ret))
- dst_vdev->nr_async_pkts++;
-
- while (likely(dst_vdev->nr_async_pkts)) {
- if (rte_vhost_poll_enqueue_completed(dst_vdev->vid,
- VIRTIO_RXQ, m_cpl, 1))
- dst_vdev->nr_async_pkts--;
- }
} else {
ret = rte_vhost_enqueue_burst(dst_vdev->vid, VIRTIO_RXQ, &m, 1);
}
if (enable_stats) {
- rte_atomic64_inc(&dst_vdev->stats.rx_total_atomic);
- rte_atomic64_add(&dst_vdev->stats.rx_atomic, ret);
+ atomic_fetch_add(&dst_vdev->stats.rx_total_atomic, 1);
+ atomic_fetch_add(&dst_vdev->stats.rx_atomic, ret);
src_vdev->stats.tx_total++;
src_vdev->stats.tx += ret;
}
}
+static __rte_always_inline void
+drain_vhost(struct vhost_dev *vdev)
+{
+ uint16_t ret;
+ uint64_t buff_idx = rte_lcore_id() * MAX_VHOST_DEVICE + vdev->vid;
+ uint16_t nr_xmit = vhost_txbuff[buff_idx]->len;
+ struct rte_mbuf **m = vhost_txbuff[buff_idx]->m_table;
+
+ if (builtin_net_driver) {
+ ret = vs_enqueue_pkts(vdev, VIRTIO_RXQ, m, nr_xmit);
+ } else if (async_vhost_driver) {
+ uint32_t cpu_cpl_nr = 0;
+ uint16_t enqueue_fail = 0;
+ struct rte_mbuf *m_cpu_cpl[nr_xmit];
+
+ complete_async_pkts(vdev);
+ ret = rte_vhost_submit_enqueue_burst(vdev->vid, VIRTIO_RXQ,
+ m, nr_xmit, m_cpu_cpl, &cpu_cpl_nr);
+ atomic_fetch_add(&vdev->nr_async_pkts, ret - cpu_cpl_nr);
+
+ if (cpu_cpl_nr)
+ free_pkts(m_cpu_cpl, cpu_cpl_nr);
+
+ enqueue_fail = nr_xmit - ret;
+ if (enqueue_fail)
+ free_pkts(&m[ret], nr_xmit - ret);
+ } else {
+ ret = rte_vhost_enqueue_burst(vdev->vid, VIRTIO_RXQ,
+ m, nr_xmit);
+ }
+
+ i
Re: [dpdk-dev] [PATCH v2 4/8] emu/iavf: add vfio-user device register and unregister
> +static inline struct iavf_emu_sock_list * iavf_emu_find_sock_list(char
> +*sock_addr) {
> + struct iavf_emu_sock_list *list;
> + struct iavf_emudev *dev;
> + int list_exist;
Initialize list_exist to 0?
> +
> + if (!sock_addr)
> + return NULL;
> +
> + pthread_mutex_lock(&sock_list_lock);
> +
> + TAILQ_FOREACH(list, &sock_list, next) {
> + dev = (struct iavf_emudev *)list->emu_dev->priv_data;
> +
> + if (!strcmp(dev->sock_addr, sock_addr)) {
> + list_exist = 1;
> + break;
> + }
> + break;
This "break" need to be removed.
> + }
> +
> + pthread_mutex_unlock(&sock_list_lock);
> +
> + if (!list_exist)
> + return NULL;
> +
> + return list;
> +}
> +
Re: [dpdk-dev] [PATCH v7 1/2] cryptodev: support enqueue and dequeue callback functions
Hi Akhil, Could you please review the patches? Regards Abhinandan > -Original Message- > From: Gujjar, Abhinandan S > Sent: Tuesday, December 22, 2020 8:13 PM > To: dev@dpdk.org; akhil.go...@nxp.com; Ananyev, Konstantin > > Cc: Gujjar, Abhinandan S > Subject: [PATCH v7 1/2] cryptodev: support enqueue and dequeue callback > functions > > This patch adds APIs to add/remove callback functions on crypto > enqueue/dequeue burst. The callback function will be called for each burst of > crypto ops received/sent on a given crypto device queue pair. > > Signed-off-by: Abhinandan Gujjar > Acked-by: Konstantin Ananyev > --- > config/rte_config.h | 1 + > doc/guides/prog_guide/cryptodev_lib.rst | 44 +++ > doc/guides/rel_notes/release_21_02.rst | 9 + > lib/librte_cryptodev/meson.build| 2 +- > lib/librte_cryptodev/rte_cryptodev.c| 398 +++- > lib/librte_cryptodev/rte_cryptodev.h| 246 ++- > lib/librte_cryptodev/version.map| 7 + > 7 files changed, 702 insertions(+), 5 deletions(-) > > diff --git a/config/rte_config.h b/config/rte_config.h index > a0b5160ff..87f9786d7 100644 > --- a/config/rte_config.h > +++ b/config/rte_config.h > @@ -62,6 +62,7 @@ > /* cryptodev defines */ > #define RTE_CRYPTO_MAX_DEVS 64 > #define RTE_CRYPTODEV_NAME_LEN 64 > +#define RTE_CRYPTO_CALLBACKS 1 > > /* compressdev defines */ > #define RTE_COMPRESS_MAX_DEVS 64 > diff --git a/doc/guides/prog_guide/cryptodev_lib.rst > b/doc/guides/prog_guide/cryptodev_lib.rst > index 473b014a1..9b1cf8d49 100644 > --- a/doc/guides/prog_guide/cryptodev_lib.rst > +++ b/doc/guides/prog_guide/cryptodev_lib.rst > @@ -338,6 +338,50 @@ start of private data information. The offset is counted > from the start of the rte_crypto_op including other crypto information such > as > the IVs (since there can be an IV also for authentication). > > +User callback APIs > +~~ > +The add APIs configures a user callback function to be called for each > +burst of crypto ops received/sent on a given crypto device queue pair. > +The return value is a pointer that can be used later to remove the > +callback using remove API. Application is expected to register a > +callback function of type ``rte_cryptodev_callback_fn``. Multiple > +callback functions can be added for a given queue pair. API does not restrict > on maximum number of callbacks. > + > +Callbacks registered by application would not survive > +``rte_cryptodev_configure`` as it reinitializes the callback list. It > +is user responsibility to remove all installed callbacks before calling > ``rte_cryptodev_configure`` to avoid possible memory leakage. > + > +So, the application is expected to add user callback after > ``rte_cryptodev_configure``. > +The callbacks can also be added at the runtime. These callbacks get > +executed when > ``rte_cryptodev_enqueue_burst``/``rte_cryptodev_dequeue_burst`` is called. > + > +.. code-block:: c > + > + struct rte_cryptodev_cb * > + rte_cryptodev_add_enq_callback(uint8_t dev_id, uint16_t > qp_id, > +rte_cryptodev_callback_fn cb_fn, > +void *cb_arg); > + > + struct rte_cryptodev_cb * > + rte_cryptodev_add_deq_callback(uint8_t dev_id, uint16_t > qp_id, > +rte_cryptodev_callback_fn cb_fn, > +void *cb_arg); > + > + uint16_t (* rte_cryptodev_callback_fn)(uint16_t dev_id, uint16_t qp_id, > +struct rte_crypto_op **ops, > +uint16_t nb_ops, void > *user_param); > + > +The remove API removes a callback function added by > +``rte_cryptodev_add_enq_callback``/``rte_cryptodev_add_deq_callback``. > + > +.. code-block:: c > + > + int rte_cryptodev_remove_enq_callback(uint8_t dev_id, uint16_t > qp_id, > + struct rte_cryptodev_cb *cb); > + > + int rte_cryptodev_remove_deq_callback(uint8_t dev_id, uint16_t > qp_id, > + struct rte_cryptodev_cb *cb); > + > > Enqueue / Dequeue Burst APIs > > diff --git a/doc/guides/rel_notes/release_21_02.rst > b/doc/guides/rel_notes/release_21_02.rst > index 638f98168..8c7866401 100644 > --- a/doc/guides/rel_notes/release_21_02.rst > +++ b/doc/guides/rel_notes/release_21_02.rst > @@ -55,6 +55,13 @@ New Features > Also, make sure to start the actual text at the margin. > === > > +* **Added enqueue & dequeue callback APIs for cryptodev library.** > + > + Cryptodev library is added with enqueue & dequeue callback APIs to > + enable applications to add/remove user callbacks which gets called > + for every enqueue/dequeue operation. > + > + > > Removed Items > -
[dpdk-dev] Minutes of Technical Board Meeting, 2020-12-16
Minutes of Technical Board Meeting, 2020-12-16 Members Attending - - Bruce - Ferruh - Hemant - Honnappa - Jerin - Kevin - Konstantin - Maxime - Olivier (chair) - Stephen - Thomas NOTE: The technical board meetings every second Wednesday on Jitsi [0] at 3pm UTC. Meetings are public and DPDK community members are welcome to attend. NOTE: Next meeting will be on Wednesday 2021-01-13 @3pm UTC, and will be chaired by Stephen. 1/ Lab investments == Did current 101k /year investment reach the goal we set up earlier? --- - The lab is currently used for performance tests, CI - It helped to find some functional bugs - It is needed for baremetal tests or performance tests (which cannot be done by a cloud test infrastructure) - The infrastructure is there, we can use it better Governing board asks about the proposal to add 30k /year to increase coverage - The proposal is to increase from 20 to 40 hours per week coverage, adding 2 more student employees. One issue now is there is one person every 2 days. Is it possible to have the same coverage hours, but having an every-day presence? Governing board asks Techboard to come with a single name as lab owner -- A lab owner is a project manager that tracks what was agreed to do, and find some help if needed. Ideally, it is a technical person used to develop in DPDK. No good solution was found. The following ideas have been mentioned: a/ Round-robin from techboard? A quarterly basis is too short compared to ramp-up time, and longer periods are too long for one person. b/ Can it be managed by Linux Foundation? (maybe ask Trishan?) c/ Nobody Question to ask to Govboard: - What is the detail of the costs (infrastructure, electricity, people)? Distributed CI should be high priority, therefore sharing test scripts is important. It might be easier for a company to pay someone working in its own lab. 2/ Offline documentation (.pdf) support === We can provide an offline-html (archive) format. Indeed, pdf is hard to maintain, and html is a better format (can be interactive with CSS, links between different guides, ...). 3/ DPDK build configuration - future enhancements = AR to Bruce to create initial version of the DD. No progress yet. 4/ Asia DPDK Event status = - CFP should be ready (waiting for translation in mandarin) - Moderators - AR: Techboard members to contact chineese colleagues and see who could be interrested in moderating - ~4 people are needed. Ruifeng (arm) and Song (arm) kindly volunteered 5/ List of supported OS === Which distributions should be tested? In user guide, there is no such list. It looks easier to just advertise what we test. 6/ List of OS to test in the community lab (compilation and functional) === - For compilation test: a long distribution list is possible - For functional / performance test: test some distributions, for instance: ubuntu-20.04, ubuntu-18.04, RHEL8, FreeBSD latest stable, Windows 7/ Plan for KNI (deprecate? move?) == Postponed to next meeting 8/ Position regarding TRex using a DPDK fork Postponed to next meeting 9/ Update on DTS usability == Postponed to next meeting
Re: [dpdk-dev] eal: DPDK: 18.11.6 version rte_eal_init() function cleans the runtime directory in 5.4.35 kernel
Hi Anatoly - Happy New Year ! I have updated the bug https://bugs.dpdk.org/show_bug.cgi?id=561with my latest comments. Request you to please have a look and let me know if anything more is required. Thanks! Regards Amiya From: Burakov, Anatoly Sent: 30 October 2020 15:30 To: Mohakud, Amiya Ranjan ; dpdk-dev Subject: Re: [dpdk-dev] eal: DPDK: 18.11.6 version rte_eal_init() function cleans the runtime directory in 5.4.35 kernel NOTICE: This email was received from an EXTERNAL sender On 29-Oct-20 5:40 PM, Mohakud, Amiya Ranjan wrote: > Hi Anatoly > > Thanks for the reply. > > Do you have a sample code for primary and secondary processes which I > can try in my setup? And once reproduced, can let you know. > > We have DPDK applications in our product with which I always see this issue. > > Regards > > Amiya > Hi, I was running a test app with a debugger, putting a break point before and after eal_cleanup_runtime_dir(), and checking if things were deleted that shouldn't have been deleted. Any old DPDK app will do for this purpose, as all of them will call EAL init. -- Thanks, Anatoly
[dpdk-dev] [PATCH v5 2/4] raw/ifpga: add fpga property get function
There are three types of property can be got from FPGA, they are
implemented in below functions:
1. ifpga_rawdev_get_fme_property() get property of FME (FPGA
Management Engine).
2. ifpga_rawdev_get_port_property() get property of FPGA port.
3. ifpga_rawdev_get_bmc_property() get property of BMC (Board
Management Controller).
Signed-off-by: Wei Huang
---
drivers/raw/ifpga/base/ifpga_api.c | 8 ++
drivers/raw/ifpga/base/ifpga_defines.h | 1 +
drivers/raw/ifpga/base/ifpga_feature_dev.c | 21 +++
drivers/raw/ifpga/base/ifpga_feature_dev.h | 1 +
drivers/raw/ifpga/base/ifpga_fme.c | 28 +++-
drivers/raw/ifpga/base/opae_hw_api.c | 18 +++
drivers/raw/ifpga/base/opae_hw_api.h | 2 +
drivers/raw/ifpga/base/opae_ifpga_hw_api.h | 1 +
drivers/raw/ifpga/ifpga_rawdev.c | 157 +
drivers/raw/ifpga/ifpga_rawdev.h | 28
10 files changed, 263 insertions(+), 2 deletions(-)
diff --git a/drivers/raw/ifpga/base/ifpga_api.c
b/drivers/raw/ifpga/base/ifpga_api.c
index 1aedf150b..4610ef101 100644
--- a/drivers/raw/ifpga/base/ifpga_api.c
+++ b/drivers/raw/ifpga/base/ifpga_api.c
@@ -229,6 +229,13 @@ static int ifpga_mgr_get_board_info(struct opae_manager
*mgr,
return 0;
}
+static int ifpga_mgr_get_uuid(struct opae_manager *mgr, struct uuid *uuid)
+{
+ struct ifpga_fme_hw *fme = mgr->data;
+
+ return fpga_get_pr_uuid(fme, uuid);
+}
+
static int ifpga_mgr_update_flash(struct opae_manager *mgr, const char *image,
u64 *status)
{
@@ -256,6 +263,7 @@ struct opae_manager_ops ifpga_mgr_ops = {
.get_eth_group_region_info = ifpga_mgr_get_eth_group_region_info,
.get_sensor_value = ifpga_mgr_get_sensor_value,
.get_board_info = ifpga_mgr_get_board_info,
+ .get_uuid = ifpga_mgr_get_uuid,
.update_flash = ifpga_mgr_update_flash,
.stop_flash_update = ifpga_mgr_stop_flash_update,
.reload = ifpga_mgr_reload,
diff --git a/drivers/raw/ifpga/base/ifpga_defines.h
b/drivers/raw/ifpga/base/ifpga_defines.h
index 9f0147d1e..dca1518a8 100644
--- a/drivers/raw/ifpga/base/ifpga_defines.h
+++ b/drivers/raw/ifpga/base/ifpga_defines.h
@@ -1727,6 +1727,7 @@ struct opae_board_info {
u8 seu;
u8 ptp;
+ u32 boot_page;
u32 max10_version;
u32 nios_fw_version;
u32 nums_of_retimer;
diff --git a/drivers/raw/ifpga/base/ifpga_feature_dev.c
b/drivers/raw/ifpga/base/ifpga_feature_dev.c
index 0f852a75a..08135137a 100644
--- a/drivers/raw/ifpga/base/ifpga_feature_dev.c
+++ b/drivers/raw/ifpga/base/ifpga_feature_dev.c
@@ -87,6 +87,27 @@ int fpga_get_afu_uuid(struct ifpga_port_hw *port, struct
uuid *uuid)
return 0;
}
+int fpga_get_pr_uuid(struct ifpga_fme_hw *fme, struct uuid *uuid)
+{
+ struct feature_fme_pr *fme_pr;
+ u64 guidl, guidh;
+
+ if (!fme || !uuid)
+ return -EINVAL;
+
+ fme_pr = get_fme_feature_ioaddr_by_index(fme, FME_FEATURE_ID_PR_MGMT);
+
+ spinlock_lock(&fme->lock);
+ guidl = readq(&fme_pr->fme_pr_intfc_id_l);
+ guidh = readq(&fme_pr->fme_pr_intfc_id_h);
+ spinlock_unlock(&fme->lock);
+
+ opae_memcpy(uuid->b, &guidl, sizeof(u64));
+ opae_memcpy(uuid->b + 8, &guidh, sizeof(u64));
+
+ return 0;
+}
+
/* Mask / Unmask Port Errors by the Error Mask register. */
void port_err_mask(struct ifpga_port_hw *port, bool mask)
{
diff --git a/drivers/raw/ifpga/base/ifpga_feature_dev.h
b/drivers/raw/ifpga/base/ifpga_feature_dev.h
index 2b1309b44..b355d22b0 100644
--- a/drivers/raw/ifpga/base/ifpga_feature_dev.h
+++ b/drivers/raw/ifpga/base/ifpga_feature_dev.h
@@ -103,6 +103,7 @@ is_port_feature_present(struct ifpga_port_hw *port, int
index)
}
int fpga_get_afu_uuid(struct ifpga_port_hw *port, struct uuid *uuid);
+int fpga_get_pr_uuid(struct ifpga_fme_hw *fme, struct uuid *uuid);
int __fpga_port_disable(struct ifpga_port_hw *port);
void __fpga_port_enable(struct ifpga_port_hw *port);
diff --git a/drivers/raw/ifpga/base/ifpga_fme.c
b/drivers/raw/ifpga/base/ifpga_fme.c
index 34fd9a818..43c7b9c3d 100644
--- a/drivers/raw/ifpga/base/ifpga_fme.c
+++ b/drivers/raw/ifpga/base/ifpga_fme.c
@@ -101,6 +101,24 @@ static int fme_hdr_get_ports_num(struct ifpga_fme_hw *fme,
u64 *ports_num)
return 0;
}
+static int fme_hdr_get_port_type(struct ifpga_fme_hw *fme, u64 *port_type)
+{
+ struct feature_fme_header *fme_hdr
+ = get_fme_feature_ioaddr_by_index(fme, FME_FEATURE_ID_HEADER);
+ struct feature_fme_port pt;
+ u32 port = (u32)((*port_type >> 32) & 0x);
+
+ pt.csr = readq(&fme_hdr->port[port]);
+ if (!pt.port_implemented)
+ return -ENODEV;
+ if (pt.afu_access_control)
+ *port_type |= 0x1;
+ else
+ *port_type &= ~0x1;
+
+ return 0;
+}
+
static int fme_hdr_get_cache_size(struct ifpga_fme_hw *fme, u64 *cache_size)
{
struct feature_f
[dpdk-dev] [PATCH v5 0/4] raw/ifpga: add extra OPAE APIs
Cyborg is part of OpenStack, it needs some OPAE APIs to manage devices with Intel FPGA. The first three patches implement extra APIs to meet Cyborg requirement. The last patch add an example to show how to use these APIs. Main changes from v4: - Fix ICC compiler build error Wei Huang (4): raw/ifpga: add fpga rsu function raw/ifpga: add fpga property get function raw/ifpga: add opae API for Cyborg examples/ifpga: add example for opae ifpga API drivers/raw/ifpga/base/ifpga_api.c | 34 + drivers/raw/ifpga/base/ifpga_defines.h |1 + drivers/raw/ifpga/base/ifpga_feature_dev.c | 21 + drivers/raw/ifpga/base/ifpga_feature_dev.h |1 + drivers/raw/ifpga/base/ifpga_fme.c | 36 +- drivers/raw/ifpga/base/ifpga_fme_rsu.c | 436 + drivers/raw/ifpga/base/ifpga_hw.h |1 + drivers/raw/ifpga/base/ifpga_sec_mgr.c | 639 +++ drivers/raw/ifpga/base/ifpga_sec_mgr.h | 89 + drivers/raw/ifpga/base/meson.build |2 + drivers/raw/ifpga/base/opae_hw_api.c | 77 + drivers/raw/ifpga/base/opae_hw_api.h | 13 + drivers/raw/ifpga/base/opae_ifpga_hw_api.h |1 + drivers/raw/ifpga/base/opae_intel_max10.c | 51 + drivers/raw/ifpga/base/opae_intel_max10.h | 44 + drivers/raw/ifpga/ifpga_opae_api.c | 1801 drivers/raw/ifpga/ifpga_opae_api.h | 245 +++ drivers/raw/ifpga/ifpga_rawdev.c | 352 drivers/raw/ifpga/ifpga_rawdev.h | 50 +- drivers/raw/ifpga/meson.build |4 +- examples/ifpga/Makefile| 45 + examples/ifpga/commands.c | 1321 ++ examples/ifpga/commands.h | 16 + examples/ifpga/main.c | 38 + examples/ifpga/meson.build | 19 + examples/meson.build |2 +- 26 files changed, 5334 insertions(+), 5 deletions(-) create mode 100644 drivers/raw/ifpga/base/ifpga_fme_rsu.c create mode 100644 drivers/raw/ifpga/base/ifpga_sec_mgr.c create mode 100644 drivers/raw/ifpga/base/ifpga_sec_mgr.h create mode 100644 drivers/raw/ifpga/ifpga_opae_api.c create mode 100644 drivers/raw/ifpga/ifpga_opae_api.h create mode 100644 examples/ifpga/Makefile create mode 100644 examples/ifpga/commands.c create mode 100644 examples/ifpga/commands.h create mode 100644 examples/ifpga/main.c create mode 100644 examples/ifpga/meson.build -- 2.29.2
[dpdk-dev] [PATCH v5 1/4] raw/ifpga: add fpga rsu function
RSU (Remote System Update) depends on secure manager which may be
different on various implementations, so a new secure manager device
is implemented for adapting such difference.
There are three major functions added:
1. ifpga_rawdev_update_flash() updates flash with specific image file.
2. ifpga_rawdev_stop_flash_update() aborts flash update process.
3. ifpga_rawdev_reload() reloads FPGA from updated flash.
Signed-off-by: Wei Huang
---
v2: fix coding style issue in ifpga_fme_rsu.c and ifpga_sec_mgr.c
---
drivers/raw/ifpga/base/ifpga_api.c| 26 +
drivers/raw/ifpga/base/ifpga_fme.c| 8 +
drivers/raw/ifpga/base/ifpga_fme_rsu.c| 436 +++
drivers/raw/ifpga/base/ifpga_hw.h | 1 +
drivers/raw/ifpga/base/ifpga_sec_mgr.c| 639 ++
drivers/raw/ifpga/base/ifpga_sec_mgr.h| 89 +++
drivers/raw/ifpga/base/meson.build| 2 +
drivers/raw/ifpga/base/opae_hw_api.c | 59 ++
drivers/raw/ifpga/base/opae_hw_api.h | 11 +
drivers/raw/ifpga/base/opae_intel_max10.c | 51 ++
drivers/raw/ifpga/base/opae_intel_max10.h | 44 ++
drivers/raw/ifpga/ifpga_rawdev.c | 55 ++
drivers/raw/ifpga/ifpga_rawdev.h | 7 +-
13 files changed, 1427 insertions(+), 1 deletion(-)
create mode 100644 drivers/raw/ifpga/base/ifpga_fme_rsu.c
create mode 100644 drivers/raw/ifpga/base/ifpga_sec_mgr.c
create mode 100644 drivers/raw/ifpga/base/ifpga_sec_mgr.h
diff --git a/drivers/raw/ifpga/base/ifpga_api.c
b/drivers/raw/ifpga/base/ifpga_api.c
index 1ff57fa18..1aedf150b 100644
--- a/drivers/raw/ifpga/base/ifpga_api.c
+++ b/drivers/raw/ifpga/base/ifpga_api.c
@@ -5,6 +5,7 @@
#include "ifpga_api.h"
#include "ifpga_enumerate.h"
#include "ifpga_feature_dev.h"
+#include "ifpga_sec_mgr.h"
#include "opae_hw_api.h"
@@ -228,11 +229,36 @@ static int ifpga_mgr_get_board_info(struct opae_manager
*mgr,
return 0;
}
+static int ifpga_mgr_update_flash(struct opae_manager *mgr, const char *image,
+ u64 *status)
+{
+ struct ifpga_fme_hw *fme = mgr->data;
+
+ return fpga_update_flash(fme, image, status);
+}
+
+static int ifpga_mgr_stop_flash_update(struct opae_manager *mgr, int force)
+{
+ struct ifpga_fme_hw *fme = mgr->data;
+
+ return fpga_stop_flash_update(fme, force);
+}
+
+static int ifpga_mgr_reload(struct opae_manager *mgr, int type, int page)
+{
+ struct ifpga_fme_hw *fme = mgr->data;
+
+ return fpga_reload(fme, type, page);
+}
+
struct opae_manager_ops ifpga_mgr_ops = {
.flash = ifpga_mgr_flash,
.get_eth_group_region_info = ifpga_mgr_get_eth_group_region_info,
.get_sensor_value = ifpga_mgr_get_sensor_value,
.get_board_info = ifpga_mgr_get_board_info,
+ .update_flash = ifpga_mgr_update_flash,
+ .stop_flash_update = ifpga_mgr_stop_flash_update,
+ .reload = ifpga_mgr_reload,
};
static int ifpga_mgr_read_mac_rom(struct opae_manager *mgr, int offset,
diff --git a/drivers/raw/ifpga/base/ifpga_fme.c
b/drivers/raw/ifpga/base/ifpga_fme.c
index f29ff3159..34fd9a818 100644
--- a/drivers/raw/ifpga/base/ifpga_fme.c
+++ b/drivers/raw/ifpga/base/ifpga_fme.c
@@ -7,6 +7,7 @@
#include "opae_intel_max10.h"
#include "opae_i2c.h"
#include "opae_at24_eeprom.h"
+#include "ifpga_sec_mgr.h"
#define PWR_THRESHOLD_MAX 0x7F
@@ -1152,6 +1153,12 @@ static int fme_nios_spi_init(struct ifpga_feature
*feature)
if (spi_self_checking(max10))
goto spi_fail;
+ ret = init_sec_mgr(fme);
+ if (ret) {
+ dev_err(fme, "security manager init fail\n");
+ goto spi_fail;
+ }
+
return ret;
spi_fail:
@@ -1165,6 +1172,7 @@ static void fme_nios_spi_uinit(struct ifpga_feature
*feature)
{
struct ifpga_fme_hw *fme = (struct ifpga_fme_hw *)feature->parent;
+ release_sec_mgr(fme);
if (fme->max10_dev)
intel_max10_device_remove(fme->max10_dev);
}
diff --git a/drivers/raw/ifpga/base/ifpga_fme_rsu.c
b/drivers/raw/ifpga/base/ifpga_fme_rsu.c
new file mode 100644
index 0..df220ae79
--- /dev/null
+++ b/drivers/raw/ifpga/base/ifpga_fme_rsu.c
@@ -0,0 +1,436 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Intel Corporation
+ */
+
+#include
+#include
+#include
+#include "ifpga_sec_mgr.h"
+
+static struct ifpga_sec_mgr *sec_mgr;
+
+static void set_rsu_control(struct ifpga_sec_mgr *smgr, uint32_t ctrl)
+{
+ if (smgr && smgr->rsu_control)
+ *smgr->rsu_control = ctrl;
+}
+
+static uint32_t get_rsu_control(struct ifpga_sec_mgr *smgr)
+{
+ if (smgr && smgr->rsu_control)
+ return *smgr->rsu_control;
+ return 0;
+}
+
+static void set_rsu_status(struct ifpga_sec_mgr *smgr, uint32_t status,
+ uint32_t progress)
+{
+ if (smgr && smgr->rsu_status)
+ *smgr->rsu_status = ((status << 16) & 0x) |
+ (progress & 0x);
+}
+
+static void get_rsu_st
[dpdk-dev] [PATCH v5 3/4] raw/ifpga: add opae API for Cyborg
Cyborg is part of OpenStack, it needs some OPAE type APIs to manage
PACs (Programmable Acceleration Card) with Intel FPGA. Below major
functions are added to meets Cyborg requirements.
1. opae_init_eal() set up EAL environment.
2. opae_cleanup_eal() clean up EAL environment.
3. opae_enumerate() searches PAC with specific FPGA.
4. opae_get_property() gets properties of FPGA.
5. opae_partial_reconfigure() perform partial configuration on FPGA.
6. opae_get_image_info() gets information of image file.
7. opae_update_flash() updates FPGA flash with specific image file.
8. opae_cancel_flash_update() cancel process of FPGA flash update.
9. opae_probe_device() manually probe specific FPGA with ifpga driver.
10. opae_remove_device() manually remove specific FPGA from ifpga driver.
11. opae_bind_driver() binds specific FPGA with specified kernel driver.
12. opae_unbind_driver() unbinds specific FPGA from kernel driver.
13. opae_reboot_device() reboots specific FPGA (do reconfiguration).
Signed-off-by: Wei Huang
---
v2: fix typo in commit log and ifpga_opae_api.h
---
v3: fix coding style issue in ifpga_opae_api.c
---
v4: enclose macro PCI_EXT_CAP_ID in parentheses
---
v5: fix icc compiler build error
---
drivers/raw/ifpga/ifpga_opae_api.c | 1801
drivers/raw/ifpga/ifpga_opae_api.h | 245
drivers/raw/ifpga/ifpga_rawdev.c | 152 ++-
drivers/raw/ifpga/ifpga_rawdev.h | 15 +
drivers/raw/ifpga/meson.build |4 +-
5 files changed, 2210 insertions(+), 7 deletions(-)
create mode 100644 drivers/raw/ifpga/ifpga_opae_api.c
create mode 100644 drivers/raw/ifpga/ifpga_opae_api.h
diff --git a/drivers/raw/ifpga/ifpga_opae_api.c
b/drivers/raw/ifpga/ifpga_opae_api.c
new file mode 100644
index 0..dea129d07
--- /dev/null
+++ b/drivers/raw/ifpga/ifpga_opae_api.c
@@ -0,0 +1,1801 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Intel Corporation
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "base/opae_hw_api.h"
+#include "base/ifpga_sec_mgr.h"
+#include "ifpga_rawdev.h"
+#include "ifpga_opae_api.h"
+
+
+int opae_log_level;
+FILE *opae_log_file;
+
+static opae_api_version api_ver = {21, 2, 0};
+static int eal_inited;
+static uint32_t dev_aer[2] = {0};
+
+static const char * const log_level_name[] = {"CRITICAL", "ERROR",
+ "WARNING", "INFORMATION", "DEBUG"};
+static const char * const proc_type_name[] = {"NON-DPDK", "PRIMARY",
+ "SECONDARY"};
+static const char * const platform_name[] = {"Vista Creek", "Rush Creek",
+ "Darby Creek", "Lightning Creek"};
+static const char * const release_name[] = {"Pre-Alpha", "Alpha", "Beta",
"PV"};
+static const char * const interface_type[] = {"8x10G", "4x25G", "2x1x25G",
+ "4x25G+2x25G", "2x2x25G", "2x1x25Gx2FVL", "1x2x25G"};
+static const char * const kdrv[] = {OPAE_KDRV_UNKNOWN, OPAE_KDRV_IGB_UIO,
+ OPAE_KDRV_VFIO_PCI, OPAE_KDRV_UIO_PCI};
+
+RTE_INIT(init_api_env)
+{
+ eal_inited = 0;
+ opae_log_level = OPAE_LOG_ERR;
+ opae_log_file = NULL;
+ ifpga_rawdev_logtype = 0;
+
+ opae_log_info("API environment is initialized\n");
+}
+
+RTE_FINI(clean_api_env)
+{
+ if (opae_log_file) {
+ fclose(opae_log_file);
+ opae_log_file = NULL;
+ }
+ opae_log_info("API environment is cleaned\n");
+}
+
+void opae_get_api_version(opae_api_version *version)
+{
+ if (version)
+ memcpy(version, &api_ver, sizeof(opae_api_version));
+ opae_log_info("API version is %u.%u.%u\n",
+ api_ver.major, api_ver.minor, api_ver.micro);
+}
+
+int opae_set_log_level(int level)
+{
+ if ((level >= OPAE_LOG_API) && (level <= OPAE_LOG_DEBUG))
+ opae_log_level = level;
+ opae_log_api("Current log level is %s\n",
+ log_level_name[opae_log_level]);
+ return opae_log_level;
+}
+
+int opae_set_log_file(char *path, int clean)
+{
+ FILE *f = NULL;
+ time_t start;
+ struct tm *lt = NULL;
+
+ if (path) {
+ if (clean)
+ f = fopen(path, "w+");
+ else
+ f = fopen(path, "a+");
+
+ if (f) {
+ if (opae_log_file) {
+ fclose(opae_log_file);
+ opae_log_file = NULL;
+ }
+ time(&start);
+ lt = localtime(&start);
+ if (lt)
+ fprintf(f, "%d-%02d-%02d "
+ "%02d:%02d:%02d\n",
+ 1900 + lt->tm_year, 1 + lt->tm_mon,
+ lt->tm_mday,
+ lt->tm_hour, lt->tm_min, lt->tm_sec);
+ fflush(f);
+ opae_log_fi
[dpdk-dev] [PATCH v5 4/4] examples/ifpga: add example for opae ifpga API
An example application shows how to use opae ifpga APIs.
You can test each API by running corresponding command.
Signed-off-by: Wei Huang
---
v2: fix coding style issue in commands.c
---
examples/ifpga/Makefile| 45 ++
examples/ifpga/commands.c | 1321
examples/ifpga/commands.h | 16 +
examples/ifpga/main.c | 38 ++
examples/ifpga/meson.build | 19 +
examples/meson.build |2 +-
6 files changed, 1440 insertions(+), 1 deletion(-)
create mode 100644 examples/ifpga/Makefile
create mode 100644 examples/ifpga/commands.c
create mode 100644 examples/ifpga/commands.h
create mode 100644 examples/ifpga/main.c
create mode 100644 examples/ifpga/meson.build
diff --git a/examples/ifpga/Makefile b/examples/ifpga/Makefile
new file mode 100644
index 0..6bfd5c8b4
--- /dev/null
+++ b/examples/ifpga/Makefile
@@ -0,0 +1,45 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2020-2021 Intel Corporation
+
+# binary name
+APP = ifpga
+
+# all source are stored in SRCS-y
+SRCS-y := main.c commands.c
+
+# Build using pkg-config variables if possible
+ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
+$(error "no installation of DPDK found")
+endif
+
+all: static
+.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) -I../../drivers/raw/ifpga
+LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) -lrte_bus_pci \
+ -lrte_bus_ifpga -lrte_bus_vdev -lrte_raw_ifpga \
+ -lrte_net_i40e -lrte_net_ipn3ke
+LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
+
+CFLAGS += -DALLOW_EXPERIMENTAL_API
+
+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/ifpga/commands.c b/examples/ifpga/commands.c
new file mode 100644
index 0..eb2fe1ca6
--- /dev/null
+++ b/examples/ifpga/commands.c
@@ -0,0 +1,1321 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020-2021 Intel Corporation.
+ * All rights reserved.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include "commands.h"
+
+static int parse_pciaddr(const char *bdf, opae_pci_device *id)
+{
+ size_t len = 0;
+ unsigned int domain = 0;
+ unsigned int bus = 0;
+ unsigned int devid = 0;
+ unsigned int function = 0;
+
+ if (!bdf || !id)
+ return -EINVAL;
+
+ len = strlen(bdf);
+ if ((len < 5) || (len > 12))
+ return -EINVAL;
+
+ len = sscanf(bdf, "%x:%x:%x.%d", &domain, &bus, &devid, &function);
+ if (len == 4) {
+ snprintf(id->bdf, sizeof(id->bdf), "%04x:%02x:%02x.%d",
+ domain, bus, devid, function);
+ } else {
+ len = sscanf(bdf, "%x:%x.%d", &bus, &devid, &function);
+ if (len == 3) {
+ snprintf(id->bdf, sizeof(id->bdf), "%04x:%02x:%02x.%d",
+ 0, bus, devid, function);
+ } else {
+ return -EINVAL;
+ }
+ }
+ return 0;
+}
+
+static void uuid_to_str(opae_uuid *id, uuid_str *str)
+{
+ uint8_t *b = NULL;
+ char *p = NULL;
+ int i, j;
+
+ if (!id || !str)
+ return;
+
+ b = &id->b[15];
+ p = str->s;
+ for (i = 0; i < 4; i++, b--, p += 2)
+ sprintf(p, "%02x", *b);
+ sprintf(p++, "-");
+ for (i = 0; i < 3; i++) {
+ for (j = 0; j < 2; j++, b--, p += 2)
+ sprintf(p, "%02x", *b);
+ sprintf(p++, "-");
+ }
+ for (i = 0; i < 6; i++, b--, p += 2)
+ sprintf(p, "%02x", *b);
+}
+
+/* *** GET API VERSION *** */
+struct cmd_version_result {
+ cmdline_fixed_string_t cmd;
+};
+
+static void cmd_version_parsed(__rte_unused void *parsed_result,
+ struct cmdline *cl, __rte_unused void *data)
+{
+ opae_api_version ver;
+ opae_get_api_version(&ver);
+ cmdline_printf(cl, "%d.%d.%d\n", ver.major, ver.minor, ver.micro);
+}
+
+cmdline_parse_token_string_t cmd_version_cmd =
+ TOKEN_STRING_INITIALIZER(struct cmd_version_result, cmd,
"get_api_version");
+
+cmdline_parse_inst_t cmd_get_api_version = {
+ .f = cmd_version_parsed,
+ .data = NULL,
+ .help_str = "get OPAE API version",
+ .t
