[dpdk-dev] [PATCH 1/2] app/test: uninit vdevs in event eth Rx adapter autotest
From: "Jay Jayatheerthan"
adapter_multi_eth_add_del() does vdev init but doesn't uninit them.
This causes issues when running event_eth_rx_adapter_autotest multiple
times.
The fix does vdev uninit before exiting the test.
Signed-off-by: Jay Jayatheerthan
---
app/test/test_event_eth_rx_adapter.c | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/app/test/test_event_eth_rx_adapter.c
b/app/test/test_event_eth_rx_adapter.c
index dd3bce71b..71c946164 100644
--- a/app/test/test_event_eth_rx_adapter.c
+++ b/app/test/test_event_eth_rx_adapter.c
@@ -464,7 +464,7 @@ adapter_multi_eth_add_del(void)
int err;
struct rte_event ev;
- uint16_t port_index, drv_id = 0;
+ uint16_t port_index, port_index_base, drv_id = 0;
char driver_name[50];
struct rte_event_eth_rx_adapter_queue_conf queue_config;
@@ -484,6 +484,7 @@ adapter_multi_eth_add_del(void)
/* add the max port for rx_adapter */
port_index = rte_eth_dev_count_total();
+ port_index_base = port_index;
for (; port_index < RTE_MAX_ETHPORTS; port_index += 1) {
snprintf(driver_name, sizeof(driver_name), "%s%u", "net_null",
drv_id);
@@ -513,6 +514,17 @@ adapter_multi_eth_add_del(void)
TEST_ASSERT(err == 0, "Expected 0 got %d", err);
}
+ /* delete vdev ports */
+ for (drv_id = 0, port_index = port_index_base;
+port_index < RTE_MAX_ETHPORTS;
+drv_id += 1, port_index += 1) {
+ snprintf(driver_name, sizeof(driver_name), "%s%u", "net_null",
+ drv_id);
+ err = rte_vdev_uninit(driver_name);
+ TEST_ASSERT(err == 0, "Failed driver %s got %d",
+ driver_name, err);
+ }
+
return TEST_SUCCESS;
}
--
2.17.1
[dpdk-dev] [PATCH 2/2] app/test: add net null dev creation in Rx adapter autotest
From: "Jay Jayatheerthan"
Allows creation of net_null if vdev EAL option is not specified and
uninit vdev created in the test. The change also adds error checks
for vdev init and uninit.
Signed-off-by: Jay Jayatheerthan
---
app/test/test_event_eth_rx_adapter.c | 61 +++-
1 file changed, 59 insertions(+), 2 deletions(-)
diff --git a/app/test/test_event_eth_rx_adapter.c
b/app/test/test_event_eth_rx_adapter.c
index 71c946164..dbf85be35 100644
--- a/app/test/test_event_eth_rx_adapter.c
+++ b/app/test/test_event_eth_rx_adapter.c
@@ -30,6 +30,8 @@ struct event_eth_rx_adapter_test_params {
};
static struct event_eth_rx_adapter_test_params default_params;
+static bool event_dev_created;
+static bool eth_dev_created;
static inline int
port_init_common(uint16_t port, const struct rte_eth_conf *port_conf,
@@ -202,7 +204,10 @@ testsuite_setup(void)
if (!count) {
printf("Failed to find a valid event device,"
" testing with event_skeleton device\n");
- rte_vdev_init("event_skeleton", NULL);
+ err = rte_vdev_init("event_skeleton", NULL);
+ TEST_ASSERT(err == 0, "Failed to create event_skeleton. err=%d",
+ err);
+ event_dev_created = true;
}
struct rte_event_dev_config config = {
@@ -222,6 +227,15 @@ testsuite_setup(void)
TEST_ASSERT(err == 0, "Event device initialization failed err %d\n",
err);
+ count = rte_eth_dev_count_total();
+ if (!count) {
+ printf("Testing with net_null device\n");
+ err = rte_vdev_init("net_null", NULL);
+ TEST_ASSERT(err == 0, "Failed to create net_null. err=%d",
+ err);
+ eth_dev_created = true;
+ }
+
/*
* eth devices like octeontx use event device to receive packets
* so rte_eth_dev_start invokes rte_event_dev_start internally, so
@@ -249,7 +263,10 @@ testsuite_setup_rx_intr(void)
if (!count) {
printf("Failed to find a valid event device,"
" testing with event_skeleton device\n");
- rte_vdev_init("event_skeleton", NULL);
+ err = rte_vdev_init("event_skeleton", NULL);
+ TEST_ASSERT(err == 0, "Failed to create event_skeleton. err=%d",
+ err);
+ event_dev_created = true;
}
struct rte_event_dev_config config = {
@@ -270,6 +287,15 @@ testsuite_setup_rx_intr(void)
TEST_ASSERT(err == 0, "Event device initialization failed err %d\n",
err);
+ count = rte_eth_dev_count_total();
+ if (!count) {
+ printf("Testing with net_null device\n");
+ err = rte_vdev_init("net_null", NULL);
+ TEST_ASSERT(err == 0, "Failed to create net_null. err=%d",
+ err);
+ eth_dev_created = true;
+ }
+
/*
* eth devices like octeontx use event device to receive packets
* so rte_eth_dev_start invokes rte_event_dev_start internally, so
@@ -292,21 +318,52 @@ testsuite_setup_rx_intr(void)
static void
testsuite_teardown(void)
{
+ int err;
uint32_t i;
RTE_ETH_FOREACH_DEV(i)
rte_eth_dev_stop(i);
+ if (eth_dev_created) {
+ err = rte_vdev_uninit("net_null");
+ if (err)
+ printf("Failed to delete net_null. err=%d", err);
+ eth_dev_created = false;
+ }
+
rte_mempool_free(default_params.mp);
+ if (event_dev_created) {
+ err = rte_vdev_uninit("event_skeleton");
+ if (err)
+ printf("Failed to delete event_skeleton. err=%d", err);
+ event_dev_created = false;
+ }
+
+ memset(&default_params, 0, sizeof(default_params));
}
static void
testsuite_teardown_rx_intr(void)
{
+ int err;
if (!default_params.rx_intr_port_inited)
return;
rte_eth_dev_stop(default_params.rx_intr_port);
+ if (eth_dev_created) {
+ err = rte_vdev_uninit("net_null");
+ if (err)
+ printf("Failed to delete net_null. err=%d", err);
+ eth_dev_created = false;
+ }
rte_mempool_free(default_params.mp);
+ if (event_dev_created) {
+ err = rte_vdev_uninit("event_skeleton");
+ if (err)
+ printf("Failed to delete event_skeleton. err=%d", err);
+ event_dev_created = false;
+ }
+
+ memset(&default_params, 0, sizeof(default_params));
}
static int
--
2.17.1
Re: [dpdk-dev] [PATCH 1/2] baseband/fpga_5gnr_fec: fix API naming
On 10/2/20 1:59 AM, Maxime Coquelin wrote:
> DPDK APIs have to be prefixed with "rte_" in order to avoid
> namespace pollution.
>
> Let's fix it while fpga_5gnr_fec API is still experimental.
>
> Signed-off-by: Maxime Coquelin
> ---
> app/test-bbdev/test_bbdev_perf.c | 6 +++---
> doc/guides/bbdevs/fpga_5gnr_fec.rst| 14 +++---
> drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 10 +-
> .../rte_pmd_bbdev_fpga_5gnr_fec_version.map| 2 +-
> .../baseband/fpga_5gnr_fec/rte_pmd_fpga_5gnr_fec.h | 6 +++---
> 5 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/app/test-bbdev/test_bbdev_perf.c
> b/app/test-bbdev/test_bbdev_perf.c
> index 45c0d62aca..14f150704e 100644
> --- a/app/test-bbdev/test_bbdev_perf.c
> +++ b/app/test-bbdev/test_bbdev_perf.c
> @@ -612,14 +612,14 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info
> *info,
> #ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC
> if ((get_init_device() == true) &&
> (!strcmp(info->drv.driver_name, FPGA_5GNR_PF_DRIVER_NAME))) {
> - struct fpga_5gnr_fec_conf conf;
> + struct rte_fpga_5gnr_fec_conf conf;
> unsigned int i;
>
> printf("Configure FPGA 5GNR FEC Driver %s with default
> values\n",
> info->drv.driver_name);
>
> /* clear default configuration before initialization */
> - memset(&conf, 0, sizeof(struct fpga_5gnr_fec_conf));
> + memset(&conf, 0, sizeof(struct rte_fpga_5gnr_fec_conf));
>
> /* Set PF mode :
>* true if PF is used for data plane
> @@ -647,7 +647,7 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
> conf.flr_time_out = FLR_5G_TIMEOUT;
>
> /* setup FPGA PF with configuration information */
> - ret = fpga_5gnr_fec_configure(info->dev_name, &conf);
> + ret = rte_fpga_5gnr_fec_configure(info->dev_name, &conf);
> TEST_ASSERT_SUCCESS(ret,
> "Failed to configure 5G FPGA PF for bbdev %s",
> info->dev_name);
> diff --git a/doc/guides/bbdevs/fpga_5gnr_fec.rst
> b/doc/guides/bbdevs/fpga_5gnr_fec.rst
> index 6760391e8c..5849b31857 100644
> --- a/doc/guides/bbdevs/fpga_5gnr_fec.rst
> +++ b/doc/guides/bbdevs/fpga_5gnr_fec.rst
> @@ -170,12 +170,12 @@ queues, priorities, load balance, bandwidth and other
> settings necessary for the
> device to perform FEC functions.
>
> This configuration needs to be executed at least once after reboot or PCI
> FLR and can
> -be achieved by using the function ``fpga_5gnr_fec_configure()``, which sets
> up the
> -parameters defined in ``fpga_5gnr_fec_conf`` structure:
> +be achieved by using the function ``rte_fpga_5gnr_fec_configure()``, which
> sets up the
> +parameters defined in ``rte_fpga_5gnr_fec_conf`` structure:
>
> .. code-block:: c
>
> - struct fpga_5gnr_fec_conf {
> + struct rte_fpga_5gnr_fec_conf {
>bool pf_mode_en;
>uint8_t vf_ul_queues_number[FPGA_5GNR_FEC_NUM_VFS];
>uint8_t vf_dl_queues_number[FPGA_5GNR_FEC_NUM_VFS];
> @@ -214,15 +214,15 @@ parameters defined in ``fpga_5gnr_fec_conf`` structure:
>the FLR time out then set this setting to 0x262=610.
>
>
> -An example configuration code calling the function
> ``fpga_5gnr_fec_configure()`` is shown
> +An example configuration code calling the function
> ``rte_fpga_5gnr_fec_configure()`` is shown
> below:
>
> .. code-block:: c
>
> - struct fpga_5gnr_fec_conf conf;
> + struct rte_fpga_5gnr_fec_conf conf;
>unsigned int i;
>
> - memset(&conf, 0, sizeof(struct fpga_5gnr_fec_conf));
> + memset(&conf, 0, sizeof(struct rte_fpga_5gnr_fec_conf));
>conf.pf_mode_en = 1;
>
>for (i = 0; i < FPGA_5GNR_FEC_NUM_VFS; ++i) {
> @@ -235,7 +235,7 @@ below:
>conf.ul_load_balance = 64;
>
>/* setup FPGA PF */
> - ret = fpga_5gnr_fec_configure(info->dev_name, &conf);
> + ret = rte_fpga_5gnr_fec_configure(info->dev_name, &conf);
>TEST_ASSERT_SUCCESS(ret,
>"Failed to configure 4G FPGA PF for bbdev %s",
4G ?
Consider a future patch to clean this up.
>info->dev_name);
> diff --git a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
> b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
> index 61f9c04ba2..1d73f9540e 100644
> --- a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
> +++ b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
> @@ -1944,10 +1944,10 @@ fpga_5gnr_fec_remove(struct rte_pci_device *pci_dev)
> }
>
> static inline void
> -set_default_fpga_conf(struct fpga_5gnr_fec_conf *def_conf)
> +set_default_fpga_conf(struct rte_fpga_5gnr_fec_conf *def_conf)
> {
> /* clear default configuration before initialization */
> - memset(def_conf, 0, sizeof(struct fpga_5gnr_fec_conf));
> + memset(def_conf, 0, sizeof(struct rte_fpga_5gnr_fec_conf));
> /* Set pf mode t
Re: [dpdk-dev] [PATCH 2/2] baseband/fpga_lte_fec: fix API naming
On 10/2/20 1:59 AM, Maxime Coquelin wrote:
> DPDK APIs have to be prefixed with "rte_" in order to avoid
> namespace pollution.
>
> Let's fix it while fpga_lte_fec API is still experimental.
>
> Signed-off-by: Maxime Coquelin
> ---
> app/test-bbdev/test_bbdev_perf.c | 6 +++---
> doc/guides/bbdevs/fpga_lte_fec.rst | 14 +++---
> drivers/baseband/fpga_lte_fec/fpga_lte_fec.c | 10 +-
> drivers/baseband/fpga_lte_fec/fpga_lte_fec.h | 6 +++---
> .../rte_pmd_bbdev_fpga_lte_fec_version.map | 2 +-
> 5 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/app/test-bbdev/test_bbdev_perf.c
> b/app/test-bbdev/test_bbdev_perf.c
> index 14f150704e..d4a3681344 100644
> --- a/app/test-bbdev/test_bbdev_perf.c
> +++ b/app/test-bbdev/test_bbdev_perf.c
> @@ -568,14 +568,14 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info
> *info,
> #ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC
> if ((get_init_device() == true) &&
> (!strcmp(info->drv.driver_name, FPGA_LTE_PF_DRIVER_NAME))) {
> - struct fpga_lte_fec_conf conf;
> + struct rte_fpga_lte_fec_conf conf;
> unsigned int i;
>
> printf("Configure FPGA LTE FEC Driver %s with default values\n",
> info->drv.driver_name);
>
> /* clear default configuration before initialization */
> - memset(&conf, 0, sizeof(struct fpga_lte_fec_conf));
> + memset(&conf, 0, sizeof(struct rte_fpga_lte_fec_conf));
>
> /* Set PF mode :
>* true if PF is used for data plane
> @@ -603,7 +603,7 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
> conf.flr_time_out = FLR_4G_TIMEOUT;
>
> /* setup FPGA PF with configuration information */
> - ret = fpga_lte_fec_configure(info->dev_name, &conf);
> + ret = rte_fpga_lte_fec_configure(info->dev_name, &conf);
> TEST_ASSERT_SUCCESS(ret,
> "Failed to configure 4G FPGA PF for bbdev %s",
> info->dev_name);
> diff --git a/doc/guides/bbdevs/fpga_lte_fec.rst
> b/doc/guides/bbdevs/fpga_lte_fec.rst
> index fdc8a76981..a8cc3c58a8 100644
> --- a/doc/guides/bbdevs/fpga_lte_fec.rst
> +++ b/doc/guides/bbdevs/fpga_lte_fec.rst
> @@ -169,12 +169,12 @@ queues, priorities, load balance, bandwidth and other
> settings necessary for the
> device to perform FEC functions.
>
> This configuration needs to be executed at least once after reboot or PCI
> FLR and can
> -be achieved by using the function ``fpga_lte_fec_configure()``, which sets
> up the
> -parameters defined in ``fpga_lte_fec_conf`` structure:
> +be achieved by using the function ``rte_fpga_lte_fec_configure()``, which
> sets up the
> +parameters defined in ``rte_fpga_lte_fec_conf`` structure:
>
> .. code-block:: c
>
> - struct fpga_lte_fec_conf {
> + struct rte_fpga_lte_fec_conf {
>bool pf_mode_en;
>uint8_t vf_ul_queues_number[FPGA_LTE_FEC_NUM_VFS];
>uint8_t vf_dl_queues_number[FPGA_LTE_FEC_NUM_VFS];
> @@ -213,15 +213,15 @@ parameters defined in ``fpga_lte_fec_conf`` structure:
>the FLR time out then set this setting to 0x262=610.
>
>
> -An example configuration code calling the function
> ``fpga_lte_fec_configure()`` is shown
> +An example configuration code calling the function
> ``rte_fpga_lte_fec_configure()`` is shown
> below:
>
> .. code-block:: c
>
> - struct fpga_lte_fec_conf conf;
> + struct rte_fpga_lte_fec_conf conf;
>unsigned int i;
>
> - memset(&conf, 0, sizeof(struct fpga_lte_fec_conf));
> + memset(&conf, 0, sizeof(struct rte_fpga_lte_fec_conf));
>conf.pf_mode_en = 1;
>
>for (i = 0; i < FPGA_LTE_FEC_NUM_VFS; ++i) {
> @@ -234,7 +234,7 @@ below:
>conf.ul_load_balance = 64;
>
>/* setup FPGA PF */
> - ret = fpga_lte_fec_configure(info->dev_name, &conf);
> + ret = rte_fpga_lte_fec_configure(info->dev_name, &conf);
>TEST_ASSERT_SUCCESS(ret,
>"Failed to configure 4G FPGA PF for bbdev %s",
>info->dev_name);
> diff --git a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
> b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
> index 37018b9c7f..71de399eef 100644
> --- a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
> +++ b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
> @@ -2432,10 +2432,10 @@ fpga_lte_fec_remove(struct rte_pci_device *pci_dev)
> }
>
> static inline void
> -set_default_fpga_conf(struct fpga_lte_fec_conf *def_conf)
> +set_default_fpga_conf(struct rte_fpga_lte_fec_conf *def_conf)
> {
> /* clear default configuration before initialization */
> - memset(def_conf, 0, sizeof(struct fpga_lte_fec_conf));
> + memset(def_conf, 0, sizeof(struct rte_fpga_lte_fec_conf));
> /* Set pf mode to true */
> def_conf->pf_mode_en = true;
>
> @@ -2450,15 +2450,15 @@ set_default_fpga_conf(struct fpga_lte
[dpdk-dev] [PATCH v3 00/10] RTE flow shared action
This patchset introduces shared action for RTE flow. V3 changes: - implement testpmd for shared action - fix flow_filtering example application - add conf arg to shared action create API Notes: PMD implementation should be considered as draft Andrey Vesnovaty (10): ethdev: add flow shared action API ethdev: add conf arg to shared action icreate API common/mlx5: modify advanced Rx object via DevX net/mlx5: modify hash Rx queue objects net/mlx5: shared action PMD net/mlx5: shared action PMD create conf arg net/mlx5: driver support for shared action net/mlx5: shared action create conf drv support examples/flow_filtering: utilize shared RSS action app/testpmd: support shared action app/test-pmd/cmdline_flow.c | 262 ++- app/test-pmd/config.c | 217 ++ app/test-pmd/testpmd.h| 19 + doc/guides/sample_app_ug/flow_filtering.rst | 62 +- drivers/common/mlx5/mlx5_devx_cmds.c | 84 +++ drivers/common/mlx5/mlx5_devx_cmds.h | 10 + drivers/common/mlx5/mlx5_prm.h| 29 + .../common/mlx5/rte_common_mlx5_version.map | 1 + drivers/net/mlx5/mlx5.c | 1 + drivers/net/mlx5/mlx5.h | 6 + drivers/net/mlx5/mlx5_defs.h | 3 + drivers/net/mlx5/mlx5_devx.c | 178 - drivers/net/mlx5/mlx5_flow.c | 497 - drivers/net/mlx5/mlx5_flow.h | 86 +++ drivers/net/mlx5/mlx5_flow_dv.c | 684 +- drivers/net/mlx5/mlx5_rxq.c | 103 +++ drivers/net/mlx5/mlx5_rxtx.h | 5 +- examples/flow_filtering/flow_blocks.c | 81 ++- examples/flow_filtering/main.c| 13 +- lib/librte_ethdev/rte_ethdev_version.map | 4 + lib/librte_ethdev/rte_flow.c | 84 +++ lib/librte_ethdev/rte_flow.h | 161 - lib/librte_ethdev/rte_flow_driver.h | 23 + 23 files changed, 2489 insertions(+), 124 deletions(-) -- 2.26.2
[dpdk-dev] [PATCH v3 01/10] ethdev: add flow shared action API
This commit introduces extension of DPDK flow action API enabling
sharing of single rte_flow_action in multiple flows. The API intended for
PMDs where multiple HW offloaded flows can reuse the same HW
essence/object representing flow action and modification of such an
essence/object effects all the rules using it.
Motivation and example
===
Adding or removing one or more queues to RSS used by multiple flow rules
imposes per rule toll for current DPDK flow API; the scenario requires
for each flow sharing cloned RSS action:
- call `rte_flow_destroy()`
- call `rte_flow_create()` with modified RSS action
API for sharing action and its in-place update benefits:
- reduce the overhead of multiple RSS flow rules reconfiguration
- optimize resource utilization by sharing action across of multiple
flows
Change description
===
Shared action
===
In order to represent flow action shared by multiple flows new action
type RTE_FLOW_ACTION_TYPE_SHARED is introduced (see `enum
rte_flow_action_type`).
Actually the introduced API decouples action from any specific flow and
enables sharing of single action by its handle across multiple flows.
Shared action create/use/destroy
===
Shared action may be reused by some or none flow rules at any given
moment, i.e. shared action reside outside of the context of any flow.
Shared action represent HW resources/objects used for action offloading
implementation.
API for shared action create (see `rte_flow_shared_action_create()`):
- should allocate HW resources and make related initializations required
for shared action implementation.
- make necessary preparations to maintain shared access to
the action resources, configuration and state.
API for shared action destroy (see `rte_flow_shared_action_destroy()`)
should release HW resources and make related cleanups required for shared
action implementation.
In order to share some flow action reuse the handle of type
`struct rte_flow_shared_action` returned by
rte_flow_shared_action_create() as a `conf` field of
`struct rte_flow_action` (see "example" section).
If some shared action not used by any flow rule all resources allocated
by the shared action can be released by rte_flow_shared_action_destroy()
(see "example" section). The shared action handle passed as argument to
destroy API should not be used any further i.e. result of the usage is
undefined.
Shared action re-configuration
===
Shared action behavior defined by its configuration can be updated via
rte_flow_shared_action_update() (see "example" section). The shared
action update operation modifies HW related resources/objects allocated
on the action creation. The number of operations performed by the update
operation should not be dependent on number of flows sharing the related
action. On return of shared action update API action behavior should be
according to updated configuration for all flows sharing the action.
Shared action query
===
Provide separate API to query shared action sate (see
rte_flow_shared_action_update()). Taking a counter as an example: query
returns value aggregating all counter increments across all flow rules
sharing the counter.
PMD support
===
The support of introduced API is pure PMD specific design and
responsibility for each action type (see struct rte_flow_ops).
testpmd
===
In order to utilize introduced API testpmd cli may implement following
extension
create/update/destroy/query shared action accordingly
flow shared_action (port) create {action_id (id)} (action) / end
flow shared_action (port) update (id) (action) / end
flow shared_action (port) destroy action_id (id) {action_id (id) [...]}
flow shared_action (port) query (id)
testpmd example
===
configure rss to queues 1 & 2
> flow shared_action 0 create action_id 100 rss queues 1 2 end / end
create flow rule utilizing shared action
> flow create 0 ingress \
pattern eth dst is 0c:42:a1:15:fd:ac / ipv6 / tcp / end \
actions shared 100 / end
add 2 more queues
> flow shared_action 0 modify 100 rss queues 1 2 3 4 end / end
example
===
struct rte_flow_action actions[2];
struct rte_flow_action action;
/* skipped: initialize action */
struct rte_flow_shared_action *handle = rte_flow_shared_action_create(
port_id, &action, &error);
actions[0].type = RTE_FLOW_ACTION_TYPE_SHARED;
actions[0].conf = handle;
actions[1].type = RTE_FLOW_ACTION_TYPE_END;
/* skipped: init attr0 & pattern0 args */
struct rte_flow *flow0 = rte_flow_create(port_id, &attr0, pattern0,
actions, error);
/* create more rules reusing shared action */
struct rte_flow *flow1 = rte_flow_create(port_id, &attr1, pattern1,
actions, error);
/* skipped: for flows 2 till N */
struct rte_flow *flowN = rte_flow_create(port_id, &attrN, patternN,
actions, error);
/* update shared action */
struct rte_flow_action updated_action;
/*
* skipped: initialize updated_act
[dpdk-dev] [PATCH v3 02/10] ethdev: add conf arg to shared action icreate API
Add configuration argument to shared action create interface.
Currently there is only ingress & egress fields but more fields can be
added later. Shared action configuration & implementation are PMD
specific.
Signed-off-by: Andrey Vesnovaty
---
lib/librte_ethdev/rte_flow.c| 4 +++-
lib/librte_ethdev/rte_flow.h| 17 +++--
lib/librte_ethdev/rte_flow_driver.h | 5 +++--
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
index ba3f01f7c7..9afa8905df 100644
--- a/lib/librte_ethdev/rte_flow.c
+++ b/lib/librte_ethdev/rte_flow.c
@@ -1255,6 +1255,7 @@ rte_flow_get_aged_flows(uint16_t port_id, void **contexts,
struct rte_flow_shared_action *
rte_flow_shared_action_create(uint16_t port_id,
+ const struct rte_flow_shared_action_conf *conf,
const struct rte_flow_action *action,
struct rte_flow_error *error)
{
@@ -1265,7 +1266,8 @@ rte_flow_shared_action_create(uint16_t port_id,
if (unlikely(!ops))
return NULL;
if (likely(!!ops->shared_action_create)) {
- shared_action = ops->shared_action_create(dev, action, error);
+ shared_action = ops->shared_action_create(dev, conf, action,
+ error);
if (shared_action == NULL)
flow_err(port_id, -rte_errno, error);
return shared_action;
diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
index 02391316cb..8a2db4f6da 100644
--- a/lib/librte_ethdev/rte_flow.h
+++ b/lib/librte_ethdev/rte_flow.h
@@ -3380,6 +3380,16 @@ int
rte_flow_get_aged_flows(uint16_t port_id, void **contexts,
uint32_t nb_contexts, struct rte_flow_error *error);
+/**
+ * Specify shared action configuration
+ */
+struct rte_flow_shared_action_conf {
+ uint32_t ingress:1;
+ /**< Action valid for rules applied to ingress traffic. */
+ uint32_t egress:1;
+ /**< Action valid for rules applied to egress traffic. */
+};
+
/**
* @warning
* @b EXPERIMENTAL: this API may change without prior notice.
@@ -3388,6 +3398,8 @@ rte_flow_get_aged_flows(uint16_t port_id, void **contexts,
*
* @param[in] port_id
*The port identifier of the Ethernet device.
+ * @param[in] conf
+ * Shared action configuration.
* @param[in] action
* Action configuration for shared action creation.
* @param[out] error
@@ -3404,6 +3416,7 @@ rte_flow_get_aged_flows(uint16_t port_id, void **contexts,
__rte_experimental
struct rte_flow_shared_action *
rte_flow_shared_action_create(uint16_t port_id,
+ const struct rte_flow_shared_action_conf *conf,
const struct rte_flow_action *action,
struct rte_flow_error *error);
@@ -3432,8 +3445,8 @@ rte_flow_shared_action_create(uint16_t port_id,
__rte_experimental
int
rte_flow_shared_action_destroy(uint16_t port_id,
- struct rte_flow_shared_action *action,
- struct rte_flow_error *error);
+ struct rte_flow_shared_action *action,
+ struct rte_flow_error *error);
/**
* @warning
diff --git a/lib/librte_ethdev/rte_flow_driver.h
b/lib/librte_ethdev/rte_flow_driver.h
index 72bfc3b7a7..adaace47ea 100644
--- a/lib/librte_ethdev/rte_flow_driver.h
+++ b/lib/librte_ethdev/rte_flow_driver.h
@@ -111,8 +111,9 @@ struct rte_flow_ops {
/** See rte_flow_shared_action_create() */
struct rte_flow_shared_action *(*shared_action_create)
(struct rte_eth_dev *dev,
- const struct rte_flow_action *action,
- struct rte_flow_error *error);
+const struct rte_flow_shared_action_conf *conf,
+const struct rte_flow_action *action,
+struct rte_flow_error *error);
/** See rte_flow_shared_action_destroy() */
int (*shared_action_destroy)
(struct rte_eth_dev *dev,
--
2.26.2
[dpdk-dev] [PATCH v3 03/10] common/mlx5: modify advanced Rx object via DevX
From: Andrey Vesnovaty
Implement mlx5_devx_cmd_modify_tir() to modify TIR object using DevX
API.
Add related structs in mlx5_prm.h.
Signed-off-by: Andrey Vesnovaty
---
drivers/common/mlx5/mlx5_devx_cmds.c | 84 +++
drivers/common/mlx5/mlx5_devx_cmds.h | 10 +++
drivers/common/mlx5/mlx5_prm.h| 29 +++
.../common/mlx5/rte_common_mlx5_version.map | 1 +
4 files changed, 124 insertions(+)
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c
b/drivers/common/mlx5/mlx5_devx_cmds.c
index 7c81ae15a9..2b109c4f65 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -1080,6 +1080,90 @@ mlx5_devx_cmd_create_tir(void *ctx,
return tir;
}
+/**
+ * Modify TIR using DevX API.
+ *
+ * @param[in] tir
+ * Pointer to TIR DevX object structure.
+ * @param [in] modify_tir_attr
+ * Pointer to TIR modification attributes structure.
+ *
+ * @return
+ * 0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+int
+mlx5_devx_cmd_modify_tir(struct mlx5_devx_obj *tir,
+struct mlx5_devx_modify_tir_attr *modify_tir_attr)
+{
+ struct mlx5_devx_tir_attr *tir_attr = &modify_tir_attr->tir;
+ uint32_t in[MLX5_ST_SZ_DW(modify_tir_in)] = {0};
+ uint32_t out[MLX5_ST_SZ_DW(modify_tir_out)] = {0};
+ void *tir_ctx;
+ int ret;
+
+ MLX5_SET(modify_tir_in, in, opcode, MLX5_CMD_OP_MODIFY_TIR);
+ MLX5_SET(modify_tir_in, in, tirn, modify_tir_attr->tirn);
+ MLX5_SET64(modify_tir_in, in, modify_bitmask,
+ modify_tir_attr->modify_bitmask);
+
+ tir_ctx = MLX5_ADDR_OF(modify_rq_in, in, ctx);
+ if (modify_tir_attr->modify_bitmask &
+ MLX5_MODIFY_TIR_IN_MODIFY_BITMASK_LRO) {
+ MLX5_SET(tirc, tir_ctx, lro_timeout_period_usecs,
+tir_attr->lro_timeout_period_usecs);
+ MLX5_SET(tirc, tir_ctx, lro_enable_mask,
+tir_attr->lro_enable_mask);
+ MLX5_SET(tirc, tir_ctx, lro_max_msg_sz,
+tir_attr->lro_max_msg_sz);
+ }
+ if (modify_tir_attr->modify_bitmask &
+ MLX5_MODIFY_TIR_IN_MODIFY_BITMASK_INDIRECT_TABLE)
+ MLX5_SET(tirc, tir_ctx, indirect_table,
+tir_attr->indirect_table);
+ if (modify_tir_attr->modify_bitmask &
+ MLX5_MODIFY_TIR_IN_MODIFY_BITMASK_HASH) {
+ int i;
+ void *outer, *inner;
+ MLX5_SET(tirc, tir_ctx, rx_hash_symmetric,
+ tir_attr->rx_hash_symmetric);
+ MLX5_SET(tirc, tir_ctx, rx_hash_fn, tir_attr->rx_hash_fn);
+ for (i = 0; i < 10; i++) {
+ MLX5_SET(tirc, tir_ctx, rx_hash_toeplitz_key[i],
+tir_attr->rx_hash_toeplitz_key[i]);
+ }
+ outer = MLX5_ADDR_OF(tirc, tir_ctx,
+rx_hash_field_selector_outer);
+ MLX5_SET(rx_hash_field_select, outer, l3_prot_type,
+tir_attr->rx_hash_field_selector_outer.l3_prot_type);
+ MLX5_SET(rx_hash_field_select, outer, l4_prot_type,
+tir_attr->rx_hash_field_selector_outer.l4_prot_type);
+ MLX5_SET
+ (rx_hash_field_select, outer, selected_fields,
+tir_attr->rx_hash_field_selector_outer.selected_fields);
+ inner = MLX5_ADDR_OF(tirc, tir_ctx,
+rx_hash_field_selector_inner);
+ MLX5_SET(rx_hash_field_select, inner, l3_prot_type,
+tir_attr->rx_hash_field_selector_inner.l3_prot_type);
+ MLX5_SET(rx_hash_field_select, inner, l4_prot_type,
+tir_attr->rx_hash_field_selector_inner.l4_prot_type);
+ MLX5_SET
+ (rx_hash_field_select, inner, selected_fields,
+tir_attr->rx_hash_field_selector_inner.selected_fields);
+ }
+ if (modify_tir_attr->modify_bitmask &
+ MLX5_MODIFY_TIR_IN_MODIFY_BITMASK_SELF_LB_EN) {
+ MLX5_SET(tirc, tir_ctx, self_lb_block, tir_attr->self_lb_block);
+ }
+ ret = mlx5_glue->devx_obj_modify(tir->obj, in, sizeof(in),
+out, sizeof(out));
+ if (ret) {
+ DRV_LOG(ERR, "Failed to modify TIR using DevX");
+ rte_errno = errno;
+ return -errno;
+ }
+ return ret;
+}
+
/**
* Create RQT using DevX API.
*
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h
b/drivers/common/mlx5/mlx5_devx_cmds.h
index 1c84cea851..ba6cb6ed51 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -190,6 +190,13 @@ struct mlx5_devx_tir_attr {
struct mlx5_rx_hash_field_select rx_hash_field_selector_inner;
};
[dpdk-dev] [PATCH v3 06/10] net/mlx5: shared action PMD create conf arg
Add support for configuration argument in shared action create API.
Configuration structure forwarded to verbs/devx layer.
Signed-off-by: Andrey Vesnovaty
---
drivers/net/mlx5/mlx5_flow.c | 23 ++-
drivers/net/mlx5/mlx5_flow.h | 9 ++---
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 5757f146b4..5d1d504b21 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -222,6 +222,7 @@ static const struct rte_flow_expand_node
mlx5_support_expansion[] = {
static struct rte_flow_shared_action *
mlx5_shared_action_create(struct rte_eth_dev *dev,
+ const struct rte_flow_shared_action_conf *conf,
const struct rte_flow_action *action,
struct rte_flow_error *error);
static int mlx5_shared_action_destroy
@@ -6544,23 +6545,26 @@ flow_drv_dv_ops_get(struct rte_eth_dev *dev,
/* Wrapper for driver action_validate op callback */
static int
flow_drv_action_validate(struct rte_eth_dev *dev,
+const struct rte_flow_shared_action_conf *conf,
const struct rte_flow_action *action,
struct rte_flow_error *error)
{
const struct mlx5_flow_driver_ops *fops = flow_drv_dv_ops_get(dev,
"action registration unsupported", error);
- return (fops) ? fops->action_validate(dev, action, error) : -rte_errno;
+ return (fops) ? fops->action_validate(dev, conf, action, error)
+ : -rte_errno;
}
/* Wrapper for driver action_create op callback */
static struct rte_flow_shared_action *
flow_drv_action_create(struct rte_eth_dev *dev,
- const struct rte_flow_action *action,
- struct rte_flow_error *error)
+ const struct rte_flow_shared_action_conf *conf,
+ const struct rte_flow_action *action,
+ struct rte_flow_error *error)
{
const struct mlx5_flow_driver_ops *fops = flow_drv_dv_ops_get(dev,
"action registration unsupported", error);
- return (fops) ? fops->action_create(dev, action, error) : NULL;
+ return (fops) ? fops->action_create(dev, conf, action, error) : NULL;
}
/**
@@ -6618,12 +6622,13 @@ flow_drv_action_update(struct rte_eth_dev *dev,
*/
static struct rte_flow_shared_action *
mlx5_shared_action_create(struct rte_eth_dev *dev,
- const struct rte_flow_action *action,
- struct rte_flow_error *error)
+ const struct rte_flow_shared_action_conf *conf,
+ const struct rte_flow_action *action,
+ struct rte_flow_error *error)
{
- if (flow_drv_action_validate(dev, action, error))
+ if (flow_drv_action_validate(dev, conf, action, error))
return NULL;
- return flow_drv_action_create(dev, action, error);
+ return flow_drv_action_create(dev, conf, action, error);
}
/**
@@ -6663,7 +6668,7 @@ mlx5_shared_action_update(struct rte_eth_dev *dev,
NULL,
"update action type invalid");
}
- ret = flow_drv_action_validate(dev, action, error);
+ ret = flow_drv_action_validate(dev, NULL, action, error);
if (ret)
return ret;
return flow_drv_action_update(dev, shared_action, action->conf,
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index e6ada24943..c7be77b961 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -955,11 +955,14 @@ typedef int (*mlx5_flow_get_aged_flows_t)
void **context,
uint32_t nb_contexts,
struct rte_flow_error *error);
-typedef int (*mlx5_flow_action_validate_t)(struct rte_eth_dev *dev,
- const struct rte_flow_action *action,
- struct rte_flow_error *error);
+typedef int (*mlx5_flow_action_validate_t)
+ (struct rte_eth_dev *dev,
+const struct rte_flow_shared_action_conf *conf,
+const struct rte_flow_action *action,
+struct rte_flow_error *error);
typedef struct rte_flow_shared_action *(*mlx5_flow_action_create_t)
(struct rte_eth_dev *dev,
+const struct rte_flow_shared_action_conf *conf,
const struct rte_flow_action *action,
struct rte_flow_error *error);
typedef int (*mlx5_flow_action_destroy_t)
[dpdk-dev] [PATCH v3 05/10] net/mlx5: shared action PMD
From: Andrey Vesnovaty
Implement rte_flow shared action API for mlx5 PMD.
Handle shared action on flow create/destroy.
Signed-off-by: Andrey Vesnovaty
---
drivers/net/mlx5/mlx5.c | 1 +
drivers/net/mlx5/mlx5.h | 2 +
drivers/net/mlx5/mlx5_defs.h | 3 +
drivers/net/mlx5/mlx5_flow.c | 492 ---
drivers/net/mlx5/mlx5_flow.h | 83 ++
5 files changed, 549 insertions(+), 32 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 4a807fb4fd..ec0e6b9bfc 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1374,6 +1374,7 @@ mlx5_dev_close(struct rte_eth_dev *dev)
* then this will return directly without any action.
*/
mlx5_flow_list_flush(dev, &priv->flows, true);
+ mlx5_shared_action_flush(dev);
mlx5_flow_meter_flush(dev, NULL);
/* Free the intermediate buffers for flow creation. */
mlx5_flow_free_intermediate(dev);
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 210004bc81..bbe16d4bd4 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -834,6 +834,8 @@ struct mlx5_priv {
uint8_t fdb_def_rule; /* Whether fdb jump to table 1 is configured. */
struct mlx5_mp_id mp_id; /* ID of a multi-process process */
LIST_HEAD(fdir, mlx5_fdir_flow) fdir_flows; /* fdir flows. */
+ LIST_HEAD(shared_action, rte_flow_shared_action) shared_actions;
+ /* shared actions */
};
#define PORT_ID(priv) ((priv)->dev_data->port_id)
diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h
index 90f1839054..a20d6d1e34 100644
--- a/drivers/net/mlx5/mlx5_defs.h
+++ b/drivers/net/mlx5/mlx5_defs.h
@@ -194,6 +194,9 @@
#define MLX5_HAIRPIN_QUEUE_STRIDE 6
#define MLX5_HAIRPIN_JUMBO_LOG_SIZE (14 + 2)
+/* Maximum number of shared actions supported by rte_flow */
+#define MLX5_MAX_SHARED_ACTIONS 1
+
/* Definition of static_assert found in /usr/include/assert.h */
#ifndef HAVE_STATIC_ASSERT
#define static_assert _Static_assert
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 55cdc37f00..5757f146b4 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -220,6 +220,25 @@ static const struct rte_flow_expand_node
mlx5_support_expansion[] = {
},
};
+static struct rte_flow_shared_action *
+mlx5_shared_action_create(struct rte_eth_dev *dev,
+ const struct rte_flow_action *action,
+ struct rte_flow_error *error);
+static int mlx5_shared_action_destroy
+ (struct rte_eth_dev *dev,
+struct rte_flow_shared_action *shared_action,
+struct rte_flow_error *error);
+static int mlx5_shared_action_update
+ (struct rte_eth_dev *dev,
+struct rte_flow_shared_action *shared_action,
+const struct rte_flow_action *action,
+struct rte_flow_error *error);
+static int mlx5_shared_action_query
+ (struct rte_eth_dev *dev,
+const struct rte_flow_shared_action *action,
+void *data,
+struct rte_flow_error *error);
+
static const struct rte_flow_ops mlx5_flow_ops = {
.validate = mlx5_flow_validate,
.create = mlx5_flow_create,
@@ -229,6 +248,10 @@ static const struct rte_flow_ops mlx5_flow_ops = {
.query = mlx5_flow_query,
.dev_dump = mlx5_flow_dev_dump,
.get_aged_flows = mlx5_flow_get_aged_flows,
+ .shared_action_create = mlx5_shared_action_create,
+ .shared_action_destroy = mlx5_shared_action_destroy,
+ .shared_action_update = mlx5_shared_action_update,
+ .shared_action_query = mlx5_shared_action_query,
};
/* Convert FDIR request to Generic flow. */
@@ -995,16 +1018,10 @@ mlx5_flow_validate_action_queue(const struct
rte_flow_action *action,
/*
* Validate the rss action.
*
- * @param[in] action
- * Pointer to the queue action.
- * @param[in] action_flags
- * Bit-fields that holds the actions detected until now.
* @param[in] dev
* Pointer to the Ethernet device structure.
- * @param[in] attr
- * Attributes of flow that includes this action.
- * @param[in] item_flags
- * Items that were detected.
+ * @param[in] action
+ * Pointer to the queue action.
* @param[out] error
* Pointer to error structure.
*
@@ -1012,23 +1029,14 @@ mlx5_flow_validate_action_queue(const struct
rte_flow_action *action,
* 0 on success, a negative errno value otherwise and rte_errno is set.
*/
int
-mlx5_flow_validate_action_rss(const struct rte_flow_action *action,
- uint64_t action_flags,
- struct rte_eth_dev *dev,
- const
[dpdk-dev] [PATCH v3 04/10] net/mlx5: modify hash Rx queue objects
From: Andrey Vesnovaty
Implement mlx5_hrxq_modify() to modify hash RX queue object.
This commit relays on capability to modify TIR object via DevX.
Signed-off-by: Andrey Vesnovaty
---
drivers/net/mlx5/mlx5.h | 4 +
drivers/net/mlx5/mlx5_devx.c | 178 +++
drivers/net/mlx5/mlx5_rxq.c | 103
drivers/net/mlx5/mlx5_rxtx.h | 5 +-
4 files changed, 251 insertions(+), 39 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 865e72d318..210004bc81 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -747,6 +747,10 @@ struct mlx5_obj_ops {
void (*ind_table_destroy)(struct mlx5_ind_table_obj *ind_tbl);
int (*hrxq_new)(struct rte_eth_dev *dev, struct mlx5_hrxq *hrxq,
int tunnel __rte_unused);
+ int (*hrxq_modify)(struct rte_eth_dev *dev, struct mlx5_hrxq *hrxq,
+ const uint8_t *rss_key,
+ uint64_t hash_fields,
+ const struct mlx5_ind_table_obj *ind_tbl);
void (*hrxq_destroy)(struct mlx5_hrxq *hrxq);
int (*drop_action_create)(struct rte_eth_dev *dev);
void (*drop_action_destroy)(struct rte_eth_dev *dev);
diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index 3e81fcc252..676f7c6fb3 100644
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -675,33 +675,39 @@ mlx5_devx_ind_table_destroy(struct mlx5_ind_table_obj
*ind_tbl)
}
/**
- * Create an Rx Hash queue.
+ * Set TIR attribute struct with relevant input values.
*
- * @param dev
+ * @param[in] dev
* Pointer to Ethernet device.
- * @param hrxq
- * Pointer to Rx Hash queue.
- * @param tunnel
+ * @param[in] rss_key
+ * RSS key for the Rx hash queue.
+ * @param[in] hash_fields
+ * Verbs protocol hash field to make the RSS on.
+ * @param[in] ind_tbl
+ * Indirection table for TIR.
+ * @param[in] queues
+ * Queues entering in hash queue. In case of empty hash_fields only the
+ * first queue index will be taken for the indirection table.
+ * @param[in] queues_n
+ * Number of queues.
+ * @param[in] tunnel
* Tunnel type.
+ * @param[out] tir_attr
+ * Parameters structure for TIR creation/modification.
*
* @return
- * 0 on success, a negative errno value otherwise and rte_errno is set.
+ * The Verbs/DevX object initialised index, 0 otherwise and rte_errno is set.
*/
-static int
-mlx5_devx_hrxq_new(struct rte_eth_dev *dev, struct mlx5_hrxq *hrxq,
- int tunnel __rte_unused)
+static void
+mlx5_devx_tir_attr_set(struct rte_eth_dev *dev, const uint8_t *rss_key,
+ uint64_t hash_fields,
+ const struct mlx5_ind_table_obj *ind_tbl,
+ int tunnel, enum mlx5_rxq_obj_type rxq_obj_type,
+ struct mlx5_devx_tir_attr *tir_attr)
{
struct mlx5_priv *priv = dev->data->dev_private;
- struct mlx5_ind_table_obj *ind_tbl = hrxq->ind_table;
- struct mlx5_rxq_data *rxq_data = (*priv->rxqs)[ind_tbl->queues[0]];
- struct mlx5_rxq_ctrl *rxq_ctrl =
- container_of(rxq_data, struct mlx5_rxq_ctrl, rxq);
- struct mlx5_devx_tir_attr tir_attr;
- const uint8_t *rss_key = hrxq->rss_key;
- uint64_t hash_fields = hrxq->hash_fields;
bool lro = true;
uint32_t i;
- int err;
/* Enable TIR LRO only if all the queues were configured for. */
for (i = 0; i < ind_tbl->queues_n; ++i) {
@@ -710,26 +716,24 @@ mlx5_devx_hrxq_new(struct rte_eth_dev *dev, struct
mlx5_hrxq *hrxq,
break;
}
}
- memset(&tir_attr, 0, sizeof(tir_attr));
- tir_attr.disp_type = MLX5_TIRC_DISP_TYPE_INDIRECT;
- tir_attr.rx_hash_fn = MLX5_RX_HASH_FN_TOEPLITZ;
- tir_attr.tunneled_offload_en = !!tunnel;
+ memset(tir_attr, 0, sizeof(*tir_attr));
+ tir_attr->disp_type = MLX5_TIRC_DISP_TYPE_INDIRECT;
+ tir_attr->rx_hash_fn = MLX5_RX_HASH_FN_TOEPLITZ;
+ tir_attr->tunneled_offload_en = !!tunnel;
/* If needed, translate hash_fields bitmap to PRM format. */
if (hash_fields) {
- struct mlx5_rx_hash_field_select *rx_hash_field_select = NULL;
+ struct mlx5_rx_hash_field_select *rx_hash_field_select =
#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
- rx_hash_field_select = hash_fields & IBV_RX_HASH_INNER ?
- &tir_attr.rx_hash_field_selector_inner :
- &tir_attr.rx_hash_field_selector_outer;
-#else
- rx_hash_field_select = &tir_attr.rx_hash_field_selector_outer;
+ hash_fields & IBV_RX_HASH_INNER ?
+ &tir_attr->rx_hash_field_selector_inner :
#endif
+ &tir_attr->rx_hash_field_selector_outer;
/* 1 bit: 0: IPv4, 1: IPv6.
[dpdk-dev] [PATCH v3 07/10] net/mlx5: driver support for shared action
From: Andrey Vesnovaty
Implement shared action create/destroy/update/query.
Implement RSS shared action and handle shared RSS on
flow apply and release.
Note: currently implemented for sharede RSS action only
Signed-off-by: Andrey Vesnovaty
---
drivers/net/mlx5/mlx5_flow_dv.c | 671 ++--
1 file changed, 648 insertions(+), 23 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 56529c854b..13effc0af0 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -8878,6 +8878,157 @@ __flow_dv_translate(struct rte_eth_dev *dev,
return 0;
}
+/**
+ * Set hash RX queue by hash fields (see enum ibv_rx_hash_fields)
+ * and tunnel.
+ *
+ * @param[in, out] action
+ * Shred RSS action holding hash RX queue objects.
+ * @param[in] hash_fields
+ * Defines combination of packet fields to participate in RX hash.
+ * @param[in] tunnel
+ * Tunnel type
+ * @param[in] hrxq_idx
+ * Hash RX queue index to set.
+ *
+ * @return
+ * 0 on success, otherwise negative errno value.
+ */
+static int
+__flow_dv_action_rss_hrxq_set(struct mlx5_shared_action_rss *action,
+ const uint64_t hash_fields,
+ const int tunnel,
+ uint32_t hrxq_idx)
+{
+ uint32_t *hrxqs = (tunnel) ? action->hrxq : action->hrxq_tunnel;
+
+ switch (hash_fields & ~IBV_RX_HASH_INNER) {
+ case MLX5_RSS_HASH_IPV4:
+ hrxqs[0] = hrxq_idx;
+ return 0;
+ case MLX5_RSS_HASH_IPV4_TCP:
+ hrxqs[1] = hrxq_idx;
+ return 0;
+ case MLX5_RSS_HASH_IPV4_UDP:
+ hrxqs[2] = hrxq_idx;
+ return 0;
+ case MLX5_RSS_HASH_IPV6:
+ hrxqs[3] = hrxq_idx;
+ return 0;
+ case MLX5_RSS_HASH_IPV6_TCP:
+ hrxqs[4] = hrxq_idx;
+ return 0;
+ case MLX5_RSS_HASH_IPV6_UDP:
+ hrxqs[5] = hrxq_idx;
+ return 0;
+ case MLX5_RSS_HASH_NONE:
+ hrxqs[6] = hrxq_idx;
+ return 0;
+ default:
+ return -1;
+ }
+}
+
+/**
+ * Look up for hash RX queue by hash fields (see enum ibv_rx_hash_fields)
+ * and tunnel.
+ *
+ * @param[in] action
+ * Shred RSS action holding hash RX queue objects.
+ * @param[in] hash_fields
+ * Defines combination of packet fields to participate in RX hash.
+ * @param[in] tunnel
+ * Tunnel type
+ *
+ * @return
+ * Valid hash RX queue index, otherwise 0.
+ */
+static uint32_t
+__flow_dv_action_rss_hrxq_lookup(const struct mlx5_shared_action_rss *action,
+const uint64_t hash_fields,
+const int tunnel)
+{
+ const uint32_t *hrxqs = (tunnel) ? action->hrxq : action->hrxq_tunnel;
+
+ switch (hash_fields & ~IBV_RX_HASH_INNER) {
+ case MLX5_RSS_HASH_IPV4:
+ return hrxqs[0];
+ case MLX5_RSS_HASH_IPV4_TCP:
+ return hrxqs[1];
+ case MLX5_RSS_HASH_IPV4_UDP:
+ return hrxqs[2];
+ case MLX5_RSS_HASH_IPV6:
+ return hrxqs[3];
+ case MLX5_RSS_HASH_IPV6_TCP:
+ return hrxqs[4];
+ case MLX5_RSS_HASH_IPV6_UDP:
+ return hrxqs[5];
+ case MLX5_RSS_HASH_NONE:
+ return hrxqs[6];
+ default:
+ return 0;
+ }
+}
+
+/**
+ * Retrieves hash RX queue suitable for the *flow*.
+ * If shared action configured for *flow* suitable hash RX queue will be
+ * retrieved from attached shared action.
+ *
+ * @param[in] flow
+ * Shred RSS action holding hash RX queue objects.
+ * @param[in] dev_flow
+ * Pointer to the sub flow.
+ * @param[out] hrxq
+ * Pointer to retrieved hash RX queue object.
+ *
+ * @return
+ * Valid hash RX queue index, otherwise 0 and rte_errno is set.
+ */
+static uint32_t
+__flow_dv_rss_get_hrxq(struct rte_eth_dev *dev, struct rte_flow *flow,
+ struct mlx5_flow *dev_flow,
+ struct mlx5_hrxq **hrxq)
+{
+ struct mlx5_priv *priv = dev->data->dev_private;
+ uint32_t hrxq_idx;
+
+ if (flow->shared_rss) {
+ hrxq_idx = __flow_dv_action_rss_hrxq_lookup
+ (flow->shared_rss, dev_flow->hash_fields,
+!!(dev_flow->handle->layers &
+ MLX5_FLOW_LAYER_TUNNEL));
+ if (hrxq_idx) {
+ *hrxq = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_HRXQ],
+ hrxq_idx);
+ rte_atomic32_inc(&(*hrxq)->refcnt);
+ }
+ } else {
+ struct mlx5_flow_rss_desc *rss_desc =
+ &((struct mlx5_flow_rss_desc *)priv->rss_desc)
+ [!!priv->flow_nested_idx];
+
+ MLX5_ASS
[dpdk-dev] [PATCH v3 09/10] examples/flow_filtering: utilize shared RSS action
From: Andrey Vesnovaty
This commit give very first shared RSS action usage example.
Queue action used by the flow replaced by shared RSS action
having single queue. On each RX burst queue switched 0 <-> 1
utilizing rte_flow_shared_action_update() API. User supposed
to observe consistent queue switches on each packet burst.
Signed-off-by: Andrey Vesnovaty
Signed-off-by: Andrey Vesnovaty
---
doc/guides/sample_app_ug/flow_filtering.rst | 62 +---
examples/flow_filtering/flow_blocks.c | 81 +
examples/flow_filtering/main.c | 13 +++-
3 files changed, 128 insertions(+), 28 deletions(-)
diff --git a/doc/guides/sample_app_ug/flow_filtering.rst
b/doc/guides/sample_app_ug/flow_filtering.rst
index 5e5a6cd8a0..cfe9334717 100644
--- a/doc/guides/sample_app_ug/flow_filtering.rst
+++ b/doc/guides/sample_app_ug/flow_filtering.rst
@@ -106,7 +106,7 @@ following code:
.. code-block:: c
/* create flow for send packet with */
- flow = generate_ipv4_flow(port_id, selected_queue,
+ flow = generate_ipv4_flow(port_id, shared_action,
SRC_IP, EMPTY_MASK,
DEST_IP, FULL_MASK, &error);
if (!flow) {
@@ -242,7 +242,7 @@ The Ethernet port is configured with default settings using
the
rxq_conf = dev_info.default_rxconf;
rxq_conf.offloads = port_conf.rxmode.offloads;
-For this example we are configuring number of rx and tx queues that are
connected
+For this example we are configuring 2 rx and 2 tx queues that are connected
to a single port.
.. code-block:: c
@@ -270,13 +270,22 @@ to a single port.
}
}
+Before we create the flow we create shared action in order to send it as
+actions argument when creating a flow. The action is single queue RSS action
+similar to action queue with the only difference that shared RSS action
+provides update capability after action creation.
+
+.. code-block:: c
+
+ shared_action = rte_flow_shared_action_create(port_id, &action, &error);
+
In the next step we create and apply the flow rule. which is to send packets
with destination ip equals to 192.168.1.1 to queue number 1. The detail
explanation of the ``generate_ipv4_flow()`` appears later in this document:
.. code-block:: c
- flow = generate_ipv4_flow(port_id, selected_queue,
+ flow = generate_ipv4_flow(port_id, shared_action,
SRC_IP, EMPTY_MASK,
DEST_IP, FULL_MASK, &error);
@@ -339,6 +348,21 @@ looks like the following:
printf("\n");
rte_pktmbuf_free(m);
}
+ if (rss_queue[0] == 0) {
+ printf(">>> switching queue 0 ->
1\n");
+ rss_queue[0] = 1;
+ } else {
+ printf(">>> switching queue 1 ->
0\n");
+ rss_queue[0] = 0;
+ }
+ ret = rte_flow_shared_action_update
+ (port_id, shared_action, &action,
+&error);
+ if (ret)
+ rte_exit(EXIT_FAILURE,
+":: error: RSS action
update "
+"failed: %s\n",
+rte_strerror(-ret));
}
}
}
@@ -348,6 +372,8 @@ looks like the following:
rte_eth_dev_close(port_id);
}
+On each loop eteration Rx queue switched using
+``rte_flow_shared_action_update()`` API.
The main work of the application is reading the packets from all
queues and printing for each packet the destination queue:
@@ -365,6 +391,21 @@ queues and printing for each packet the destination queue:
printf(" - queue=0x%x", (unsigned int)i);
printf("\n");
rte_pktmbuf_free(m);
+ if (rss_queue[0] == 0) {
+ printf(">>> switching queue 0 -> 1\n");
+ rss_queue[0] = 1;
+ } else {
+ printf(">>> switching queue 1 -> 0\n");
+ rss_queue[0] = 0;
+ }
+ ret = rte_flow_shared_action_update
+ (port_id, shared_action, &action,
+ &error);
+ if (ret)
+ rte_exit(EX
[dpdk-dev] [PATCH v3 08/10] net/mlx5: shared action create conf drv support
Add support for configuration argument in shared action validate/create
API. Currently the inly shared action implemented is RSS.
For shared RSS action configuration argument ignpred but it can be
utilized by other types of shared actions.
Signed-off-by: Andrey Vesnovaty
---
drivers/net/mlx5/mlx5_flow_dv.c | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 13effc0af0..2c39b061bb 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -9669,6 +9669,8 @@ __flow_dv_action_rss_setup(struct rte_eth_dev *dev,
*
* @param[in] dev
* Pointer to the Ethernet device structure.
+ * @param[in] conf
+ * Shared action configuration.
* @param[in] rss
* RSS action specification used to create shared action.
* @param[out] error
@@ -9681,8 +9683,9 @@ __flow_dv_action_rss_setup(struct rte_eth_dev *dev,
*/
static struct rte_flow_shared_action *
__flow_dv_action_rss_create(struct rte_eth_dev *dev,
- const struct rte_flow_action_rss *rss,
- struct rte_flow_error *error)
+ const struct rte_flow_shared_action_conf *conf,
+ const struct rte_flow_action_rss *rss,
+ struct rte_flow_error *error)
{
struct rte_flow_shared_action *shared_action = NULL;
void *queue = NULL;
@@ -9691,6 +9694,7 @@ __flow_dv_action_rss_create(struct rte_eth_dev *dev,
struct rte_flow_action_rss *origin;
const uint8_t *rss_key;
+ (void)conf;
queue_size = RTE_ALIGN_CEIL(rss->queue_num * sizeof(uint16_t),
sizeof(void *));
queue = rte_calloc(__func__, 1, queue_size, 0);
@@ -9774,6 +9778,8 @@ __flow_dv_action_rss_release(struct rte_eth_dev *dev,
*
* @param[in] dev
* Pointer to the Ethernet device structure.
+ * @param[in] conf
+ * Shared action configuration.
* @param[in] action
* Action specification used to create shared action.
* @param[out] error
@@ -9786,6 +9792,7 @@ __flow_dv_action_rss_release(struct rte_eth_dev *dev,
*/
static struct rte_flow_shared_action *
__flow_dv_action_create(struct rte_eth_dev *dev,
+ const struct rte_flow_shared_action_conf *conf,
const struct rte_flow_action *action,
struct rte_flow_error *error)
{
@@ -9794,7 +9801,8 @@ __flow_dv_action_create(struct rte_eth_dev *dev,
switch (action->type) {
case RTE_FLOW_ACTION_TYPE_RSS:
- shared_action = __flow_dv_action_rss_create(dev, action->conf,
+ shared_action = __flow_dv_action_rss_create(dev, conf,
+ action->conf,
error);
break;
default:
@@ -10647,6 +10655,8 @@ flow_dv_counter_free(struct rte_eth_dev *dev, uint32_t
cnt)
*
* @param[in] dev
* Pointer to the Ethernet device structure.
+ * @param[in] conf
+ * Shared action configuration.
* @param[in] action
* The shared action object to validate.
* @param[out] error
@@ -10658,9 +10668,11 @@ flow_dv_counter_free(struct rte_eth_dev *dev, uint32_t
cnt)
*/
static int
flow_dv_action_validate(struct rte_eth_dev *dev,
+ const struct rte_flow_shared_action_conf *conf,
const struct rte_flow_action *action,
struct rte_flow_error *error)
{
+ (void)conf;
switch (action->type) {
case RTE_FLOW_ACTION_TYPE_RSS:
return mlx5_validate_action_rss(dev, action, error);
@@ -10677,13 +10689,14 @@ flow_dv_action_validate(struct rte_eth_dev *dev,
*/
static struct rte_flow_shared_action *
flow_dv_action_create(struct rte_eth_dev *dev,
+ const struct rte_flow_shared_action_conf *conf,
const struct rte_flow_action *action,
struct rte_flow_error *error)
{
struct rte_flow_shared_action *shared_action = NULL;
flow_dv_shared_lock(dev);
- shared_action = __flow_dv_action_create(dev, action, error);
+ shared_action = __flow_dv_action_create(dev, conf, action, error);
flow_dv_shared_unlock(dev);
return shared_action;
}
--
2.26.2
[dpdk-dev] [PATCH v3 10/10] app/testpmd: support shared action
This patch adds shared action support to testpmd CLI.
All shared actions created via testpmd CLI assigned ID for further
reference in other CLI commands. Shared action ID supplied as CLI
argument or assigned by testpmd is similar to flow ID & limited to
scope of testpdm CLI.
Create shared action syntax:
flow shared_action (port) create {action_id (shared_action_id)} \
(action) / end
Create shared action examples:
flow shared_action 0 create action_id 100 \
rss queues 1 2 end / end
This creates shared rss action with id 100 on port 0.
flow shared_action 0 create action_id \
rss queues 0 1 end / end
This creates shared rss action with id assigned by tetspmd
on port 0.
Update shared action syntax:
flow shared_action (port) update (shared_action_id) (action) / end
Update shared action example:
flow shared_action 0 update 100 rss queues 0 3 end / end
This updates shared rss action having id 100 on port 0
with rss to queues 0 3 (in create example rss queues were
1 & 2).
Destroy shared action syntax:
flow shared_action (port) destroy action_id (shared_action_id) \
{ action_id (shared_action_id) [...]}
Update shared action example:
flow shared_action 0 destroy action_id 100 action_id 101
This destroys shared actions having id 100 & 101
Query shared action syntax:
flow shared_action (port) query (shared_action_id)
Query shared action example:
flow shared_action 0 query 100
This queries shared actions having id 100
Use shared action as flow action syntax:
flow create (port) ... / end actions {action / [...]} \
shared (action_id) / {action / [...]} end
Use shared action as flow action example:
flow create 0 ingress pattern ... / end \
actions shared 100 / end
This creates flow rule where rss action is shared rss action
having id 100.
All shared action CLIs report status of the command.
Shared action query CLI output depends on action type.
Signed-off-by: Andrey Vesnovaty
---
app/test-pmd/cmdline_flow.c | 262 +++-
app/test-pmd/config.c | 217 +
app/test-pmd/testpmd.h | 19 +++
3 files changed, 497 insertions(+), 1 deletion(-)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 6263d307ed..ce338d370d 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -49,6 +49,7 @@ enum index {
PORT_ID,
GROUP_ID,
PRIORITY_LEVEL,
+ SHARED_ACTION_ID,
/* Top-level command. */
SET,
@@ -60,6 +61,7 @@ enum index {
/* Top-level command. */
FLOW,
/* Sub-level commands. */
+ SHARED_ACTION,
VALIDATE,
CREATE,
DESTROY,
@@ -89,6 +91,18 @@ enum index {
EGRESS,
TRANSFER,
+ /* Shared action arguments */
+ SHARED_ACTION_CREATE,
+ SHARED_ACTION_UPDATE,
+ SHARED_ACTION_DESTROY,
+ SHARED_ACTION_QUERY,
+
+ /* Shared action create arguments */
+ SHARED_ACTION_CREATE_ID,
+
+ /* Shared action destroy arguments */
+ SHARED_ACTION_DESTROY_ID,
+
/* Validate/create pattern. */
PATTERN,
ITEM_PARAM_IS,
@@ -358,6 +372,8 @@ enum index {
ACTION_SET_IPV6_DSCP_VALUE,
ACTION_AGE,
ACTION_AGE_TIMEOUT,
+ ACTION_SHARED,
+ SHARED_ACTION_ID2PTR,
};
/** Maximum size for pattern in struct rte_flow_item_raw. */
@@ -651,6 +667,13 @@ struct buffer {
enum index command; /**< Flow command. */
portid_t port; /**< Affected port ID. */
union {
+ struct {
+ uint32_t *action_id;
+ uint32_t action_id_n;
+ } sa_destroy; /**< Shared action destroy arguments. */
+ struct {
+ uint32_t action_id;
+ } sa; /* Shared action query arguments */
struct {
struct rte_flow_attr attr;
struct rte_flow_item *pattern;
@@ -707,6 +730,19 @@ struct parse_action_priv {
.size = s, \
})
+static const enum index next_sa_create_attr[] = {
+ SHARED_ACTION_CREATE_ID,
+ ACTION_RSS,
+ ZERO,
+};
+
+static const enum index next_sa_subcmd[] = {
+ SHARED_ACTION_CREATE,
+ SHARED_ACTION_UPDATE,
+ SHARED_ACTION_DESTROY,
+ SHARED_ACTION_QUERY,
+};
+
static const enum index next_vc_attr[] = {
GROUP,
PRIORITY,
@@ -741,6 +777,12 @@ static const enum index next_aged_attr[] = {
ZERO,
};
+static const enum index next_sa_destroy_attr[] = {
+ SHARED_ACTION_DESTROY_ID,
+ END,
+ ZERO,
+};
+
static const enum index item_param[] = {
ITEM_PARAM_IS,
ITEM_PARAM_SPEC,
@@ -1189,6 +1231,7 @@ static const enum index next_action[] = {
[dpdk-dev] [PATCH v6 0/3] pmdinfogen: rewrite in Python
This patchset implements existing pmdinfogen logic in Python, replaces and removes the old code. The goals of rewriting are: * easier maintenance by using a more high-level language, * simpler build process without host application and libelf, * foundation for adding Windows support. Travis CI script is adjusted to install python3-pyelftools, but other CI systems may need similar tweaking. Particularly, testing on FreeBSD and big-endian targets is desired. Acked-by: Neil Horman --- Changes in v6: 1. Address yapf and pylint warnings (Stephen Hemminger). 2. Add myself as new implementation maintainer (Thomas Monjalon). Dmitry Kozlyuk (3): pmdinfogen: add Python implementation build: use Python pmdinfogen pmdinfogen: remove C implementation .travis.yml| 2 +- MAINTAINERS| 3 +- buildtools/gen-pmdinfo-cfile.sh| 6 +- buildtools/meson.build | 1 + buildtools/pmdinfogen.py | 189 buildtools/pmdinfogen/meson.build | 14 - buildtools/pmdinfogen/pmdinfogen.c | 456 - buildtools/pmdinfogen/pmdinfogen.h | 119 doc/guides/linux_gsg/sys_reqs.rst | 6 + drivers/meson.build| 2 +- meson.build| 1 - 11 files changed, 203 insertions(+), 596 deletions(-) create mode 100755 buildtools/pmdinfogen.py delete mode 100644 buildtools/pmdinfogen/meson.build delete mode 100644 buildtools/pmdinfogen/pmdinfogen.c delete mode 100644 buildtools/pmdinfogen/pmdinfogen.h -- 2.28.0
[dpdk-dev] [PATCH v6 1/3] pmdinfogen: add Python implementation
Using a high-level, interpreted language simplifies maintenance and
build process. Furthermore, ELF handling is delegated to pyelftools
package. Original logic is kept, the copyright recognizes that.
Signed-off-by: Dmitry Kozlyuk
---
buildtools/pmdinfogen.py | 189 +++
1 file changed, 189 insertions(+)
create mode 100755 buildtools/pmdinfogen.py
diff --git a/buildtools/pmdinfogen.py b/buildtools/pmdinfogen.py
new file mode 100755
index 0..0cca47ff1
--- /dev/null
+++ b/buildtools/pmdinfogen.py
@@ -0,0 +1,189 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2016 Neil Horman
+# Copyright (c) 2020 Dmitry Kozlyuk
+
+import argparse
+import ctypes
+import json
+import sys
+import tempfile
+
+from elftools.elf.elffile import ELFFile
+from elftools.elf.sections import SymbolTableSection
+
+
+class ELFSymbol:
+def __init__(self, image, symbol):
+self._image = image
+self._symbol = symbol
+
+@property
+def size(self):
+return self._symbol["st_size"]
+
+@property
+def value(self):
+data = self._image.get_section_data(self._symbol["st_shndx"])
+base = self._symbol["st_value"]
+return data[base:base + self.size]
+
+@property
+def string_value(self):
+value = self.value
+return value[:-1].decode() if value else ""
+
+
+class ELFImage:
+def __init__(self, data):
+self._image = ELFFile(data)
+self._symtab = self._image.get_section_by_name(".symtab")
+if not isinstance(self._symtab, SymbolTableSection):
+raise Exception(".symtab section is not a symbol table")
+
+@property
+def is_big_endian(self):
+return not self._image.little_endian
+
+def get_section_data(self, name):
+return self._image.get_section(name).data()
+
+def find_by_name(self, name):
+symbol = self._symtab.get_symbol_by_name(name)
+return ELFSymbol(self, symbol[0]) if symbol else None
+
+def find_by_prefix(self, prefix):
+for i in range(self._symtab.num_symbols()):
+symbol = self._symtab.get_symbol(i)
+if symbol.name.startswith(prefix):
+yield ELFSymbol(self, symbol)
+
+
+def define_rte_pci_id(is_big_endian):
+base_type = ctypes.LittleEndianStructure
+if is_big_endian:
+base_type = ctypes.BigEndianStructure
+
+class rte_pci_id(base_type):
+_pack_ = True
+_fields_ = [
+("class_id", ctypes.c_uint32),
+("vendor_id", ctypes.c_uint16),
+("device_id", ctypes.c_uint16),
+("subsystem_vendor_id", ctypes.c_uint16),
+("subsystem_device_id", ctypes.c_uint16),
+]
+
+return rte_pci_id
+
+
+class Driver:
+OPTIONS = [
+("params", "_param_string_export"),
+("kmod", "_kmod_dep_export"),
+]
+
+def __init__(self, name, options):
+self.name = name
+for key, value in options.items():
+setattr(self, key, value)
+self.pci_ids = []
+
+@classmethod
+def load(cls, image, symbol):
+name = symbol.string_value
+
+options = {}
+for key, suffix in cls.OPTIONS:
+option_symbol = image.find_by_name("__%s%s" % (name, suffix))
+if option_symbol:
+value = option_symbol.string_value
+options[key] = value
+
+driver = cls(name, options)
+
+pci_table_name_symbol = image.find_by_name("__%s_pci_tbl_export" %
name)
+if pci_table_name_symbol:
+driver.pci_ids = cls._load_pci_ids(image, pci_table_name_symbol)
+
+return driver
+
+@staticmethod
+def _load_pci_ids(image, table_name_symbol):
+table_name = table_name_symbol.string_value
+table_symbol = image.find_by_name(table_name)
+if not table_symbol:
+raise Exception("PCI table declared but not defined: %d" %
table_name)
+
+rte_pci_id = define_rte_pci_id(image.is_big_endian)
+
+pci_id_size = ctypes.sizeof(rte_pci_id)
+pci_ids_desc = rte_pci_id * (table_symbol.size // pci_id_size)
+pci_ids = pci_ids_desc.from_buffer_copy(table_symbol.value)
+result = []
+for pci_id in pci_ids:
+if not pci_id.device_id:
+break
+result.append([
+pci_id.vendor_id,
+pci_id.device_id,
+pci_id.subsystem_vendor_id,
+pci_id.subsystem_device_id,
+])
+return result
+
+def dump(self, file):
+dumped = json.dumps(self.__dict__)
+escaped = dumped.replace('"', '\\"')
+print(
+'const char %s_pmd_info[] __attribute__((used)) =
"PMD_INFO_STRING= %s";'
+% (self.name, escaped),
+file=file,
+)
+
+
+def load_drivers(image):
+drivers = []
+for symbol in image.find_by_prefix("this_pmd_name
[dpdk-dev] [PATCH v6 2/3] build: use Python pmdinfogen
Like for other build scripts, use Python interpreter to run pmdinfogen.
Adjust wrapper script accordingly and also don't suppress stderr from ar
and pmdinfogen.
Add python3-pyelftools to CI configuration. The package is available on
all major distributions. FreeBSD has no system requirements section in
its GSG. Currently neither Windows uses pmdinfogen, nor is COFF (PE)
supported.
Signed-off-by: Dmitry Kozlyuk
---
.travis.yml | 2 +-
buildtools/gen-pmdinfo-cfile.sh | 6 +++---
buildtools/meson.build| 1 +
doc/guides/linux_gsg/sys_reqs.rst | 6 ++
drivers/meson.build | 2 +-
meson.build | 1 -
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 5e12db23b..6744f6fc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ addons:
apt:
update: true
packages: &required_packages
- - [libnuma-dev, python3-setuptools, python3-wheel, python3-pip,
ninja-build]
+ - [libnuma-dev, python3-setuptools, python3-wheel, python3-pip,
python3-pyelftools, ninja-build]
- [libbsd-dev, libpcap-dev, libibverbs-dev, libcrypto++-dev, libfdt-dev,
libjansson-dev]
_aarch64_packages: &aarch64_packages
diff --git a/buildtools/gen-pmdinfo-cfile.sh b/buildtools/gen-pmdinfo-cfile.sh
index 43059cf36..109ee461e 100755
--- a/buildtools/gen-pmdinfo-cfile.sh
+++ b/buildtools/gen-pmdinfo-cfile.sh
@@ -4,11 +4,11 @@
arfile=$1
output=$2
-pmdinfogen=$3
+shift 2
+pmdinfogen=$*
# The generated file must not be empty if compiled in pedantic mode
echo 'static __attribute__((unused)) const char *generator = "'$0'";' > $output
for ofile in `ar t $arfile` ; do
- ar p $arfile $ofile | $pmdinfogen - - >> $output 2> /dev/null
+ ar p $arfile $ofile | $pmdinfogen - - >> $output
done
-exit 0
diff --git a/buildtools/meson.build b/buildtools/meson.build
index 04808dabc..3a64b28b7 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -17,3 +17,4 @@ else
endif
map_to_win_cmd = py3 + files('map_to_win.py')
sphinx_wrapper = py3 + files('call-sphinx-build.py')
+pmdinfogen = py3 + files('pmdinfogen.py')
diff --git a/doc/guides/linux_gsg/sys_reqs.rst
b/doc/guides/linux_gsg/sys_reqs.rst
index 6ecdc04aa..89c9f2570 100644
--- a/doc/guides/linux_gsg/sys_reqs.rst
+++ b/doc/guides/linux_gsg/sys_reqs.rst
@@ -52,6 +52,12 @@ Compilation of the DPDK
* If the packaged version is below the minimum version, the latest versions
can be installed from Python's "pip" repository: ``pip3 install meson
ninja``
+* ``pyelftools`` (version 0.22+)
+
+* For RHEL/Fedora systems it can be installed using ``dnf install
python-pyelftools``
+
+* For Ubuntu/Debian it can be installed using ``apt install
python3-pyelftools``
+
* Library for handling NUMA (Non Uniform Memory Access).
* ``numactl-devel`` in RHEL/Fedora;
diff --git a/drivers/meson.build b/drivers/meson.build
index 5f9526557..88364259d 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -137,7 +137,7 @@ foreach subpath:subdirs
command: [pmdinfo,
tmp_lib.full_path(),
'@OUTPUT@', pmdinfogen],
output: out_filename,
- depends: [pmdinfogen, tmp_lib])
+ depends: [tmp_lib])
endif
# now build the static driver
diff --git a/meson.build b/meson.build
index 61d9a4f5f..a6e8c09c2 100644
--- a/meson.build
+++ b/meson.build
@@ -45,7 +45,6 @@ subdir('buildtools')
subdir('config')
# build libs and drivers
-subdir('buildtools/pmdinfogen')
subdir('lib')
subdir('drivers')
--
2.28.0
[dpdk-dev] [PATCH v6 3/3] pmdinfogen: remove C implementation
Delete the files no longer used in build process.
Add myself as maintainer of new implementation.
Signed-off-by: Dmitry Kozlyuk
---
MAINTAINERS| 3 +-
buildtools/pmdinfogen/meson.build | 14 -
buildtools/pmdinfogen/pmdinfogen.c | 456 -
buildtools/pmdinfogen/pmdinfogen.h | 119
4 files changed, 2 insertions(+), 590 deletions(-)
delete mode 100644 buildtools/pmdinfogen/meson.build
delete mode 100644 buildtools/pmdinfogen/pmdinfogen.c
delete mode 100644 buildtools/pmdinfogen/pmdinfogen.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 681093d94..24a8a160c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -133,7 +133,8 @@ F: lib/*/*.map
Driver information
M: Neil Horman
-F: buildtools/pmdinfogen/
+M: Dmitry Kozlyuk
+F: buildtools/pmdinfogen.py
F: usertools/dpdk-pmdinfo.py
F: doc/guides/tools/pmdinfo.rst
diff --git a/buildtools/pmdinfogen/meson.build
b/buildtools/pmdinfogen/meson.build
deleted file mode 100644
index 670528fac..0
--- a/buildtools/pmdinfogen/meson.build
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-if is_windows
- subdir_done()
-endif
-
-pmdinfogen_inc = [global_inc]
-pmdinfogen_inc += include_directories('../../lib/librte_eal/include')
-pmdinfogen_inc += include_directories('../../lib/librte_pci')
-pmdinfogen = executable('pmdinfogen',
- 'pmdinfogen.c',
- include_directories: pmdinfogen_inc,
- native: true)
diff --git a/buildtools/pmdinfogen/pmdinfogen.c
b/buildtools/pmdinfogen/pmdinfogen.c
deleted file mode 100644
index a68d1ea99..0
--- a/buildtools/pmdinfogen/pmdinfogen.c
+++ /dev/null
@@ -1,456 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0
- * Postprocess pmd object files to export hw support
- *
- * Copyright 2016 Neil Horman
- * Based in part on modpost.c from the linux kernel
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include "pmdinfogen.h"
-
-#ifdef RTE_ARCH_64
-#define ADDR_SIZE 64
-#else
-#define ADDR_SIZE 32
-#endif
-
-static int use_stdin, use_stdout;
-
-static const char *sym_name(struct elf_info *elf, Elf_Sym *sym)
-{
- if (sym)
- return elf->strtab + sym->st_name;
- else
- return "(unknown)";
-}
-
-static void *grab_file(const char *filename, unsigned long *size)
-{
- struct stat st;
- void *map = MAP_FAILED;
- int fd = -1;
-
- if (!use_stdin) {
- fd = open(filename, O_RDONLY);
- if (fd < 0)
- return NULL;
- } else {
- /* from stdin, use a temporary file to mmap */
- FILE *infile;
- char buffer[1024];
- int n;
-
- infile = tmpfile();
- if (infile == NULL) {
- perror("tmpfile");
- return NULL;
- }
- fd = dup(fileno(infile));
- fclose(infile);
- if (fd < 0)
- return NULL;
-
- n = read(STDIN_FILENO, buffer, sizeof(buffer));
- while (n > 0) {
- if (write(fd, buffer, n) != n)
- goto failed;
- n = read(STDIN_FILENO, buffer, sizeof(buffer));
- }
- }
-
- if (fstat(fd, &st))
- goto failed;
-
- *size = st.st_size;
- map = mmap(NULL, *size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
-
-failed:
- close(fd);
- if (map == MAP_FAILED)
- return NULL;
- return map;
-}
-
-/**
- * Return a copy of the next line in a mmap'ed file.
- * spaces in the beginning of the line is trimmed away.
- * Return a pointer to a static buffer.
- **/
-static void release_file(void *file, unsigned long size)
-{
- munmap(file, size);
-}
-
-
-static void *get_sym_value(struct elf_info *info, const Elf_Sym *sym)
-{
- return RTE_PTR_ADD(info->hdr,
- info->sechdrs[sym->st_shndx].sh_offset + sym->st_value);
-}
-
-static Elf_Sym *find_sym_in_symtab(struct elf_info *info,
- const char *name, Elf_Sym *last)
-{
- Elf_Sym *idx;
- if (last)
- idx = last+1;
- else
- idx = info->symtab_start;
-
- for (; idx < info->symtab_stop; idx++) {
- const char *n = sym_name(info, idx);
- if (!strncmp(n, name, strlen(name)))
- return idx;
- }
- return NULL;
-}
-
-static int parse_elf(struct elf_info *info, const char *filename)
-{
- unsigned int i;
- Elf_Ehdr *hdr;
- Elf_Shdr *sechdrs;
- Elf_Sym *sym;
- int endian;
- unsigned int symtab_idx = ~0U, symtab_shndx_idx = ~0U;
-
- hdr = grab_file(filename, &info->size);
- if (!hdr) {
- perror(filename);
- exit(1)
