Re: [dpdk-dev] [PATCH v3 1/3] app/testpmd: move dumping packets to a separate function
You are right about that, I'm sending a V4 now with the fixes.
Kindest regards,
Raslan Darawsheh
> -Original Message-
> From: Iremonger, Bernard
> Sent: Thursday, October 4, 2018 5:44 PM
> To: Raslan Darawsheh ; Wu, Jingjing
>
> Cc: Thomas Monjalon ; dev@dpdk.org; Shahaf
> Shuler ; Xueming(Steven) Li
> ; Ori Kam ;
> jerin.ja...@caviumnetworks.com; david.march...@6wind.com
> Subject: RE: [PATCH v3 1/3] app/testpmd: move dumping packets to a
> separate function
>
> Hi Raslan,
>
> > -Original Message-
> > From: Raslan Darawsheh [mailto:rasl...@mellanox.com]
> > Sent: Wednesday, October 3, 2018 4:16 PM
> > To: Wu, Jingjing
> > Cc: Thomas Monjalon ; dev@dpdk.org; Shahaf
> Shuler
> > ; Raslan Darawsheh ;
> > Xueming(Steven) Li ; Ori Kam
> > ; jerin.ja...@caviumnetworks.com;
> > david.march...@6wind.com; Iremonger, Bernard
> >
> > Subject: [PATCH v3 1/3] app/testpmd: move dumping packets to a
> > separate function
> >
> > verbosity for the received/sent packets is needed in all of the
> > forwarding engines so moving it to be in a separate function
> >
> > Signed-off-by: Raslan Darawsheh
> >
> > ---
> > changes in v3:
> > - add util.c in the mason.build file
> > - restore missing check for ol_flags & PKT_RX_RSS_HASH.
> > - add local variables for rte_be_to_cpu to avoid long
> > lines.
> > ---
>
> > diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c new file mode
> > 100644 index 000..12bbe91
> > --- /dev/null
> > +++ b/app/test-pmd/util.c
> > @@ -0,0 +1,146 @@
> > +/* SPDX-License-Identifier: BSD-3-Clause
> > + * Copyright(c) 2010-2018 Mellanox technology.
> > + */
> > +
> > +#include
> > +
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +
> > +#include "testpmd.h"
> > +
> > +static inline void
> > +print_ether_addr(const char *what, struct ether_addr *eth_addr) {
> > + char buf[ETHER_ADDR_FMT_SIZE];
> > + ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
> > + printf("%s%s", what, buf);
> > +}
> > +
> > +static inline void
> > +dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf
> > *pkts[],
> > + uint16_t nb_pkts, int is_rx)
> > +{
> > + struct rte_mbuf *mb;
> > + struct ether_hdr *eth_hdr;
> > + uint16_t eth_type;
> > + uint64_t ol_flags;
> > + uint16_t i, packet_type;
> > + uint16_t is_encapsulation;
> > + char buf[256];
> > + struct rte_net_hdr_lens hdr_lens;
> > + uint32_t sw_packet_type;
> > + uint16_t udp_port;
> > + uint32_t vx_vni;
> > +
> > + if (!nb_pkts)
> > + return;
> > + printf("port %u/queue %u: %s %u packets\n",
> > + port_id, queue,
> > + is_rx ? "received" : "sent",
> > + (unsigned int) nb_pkts);
> > + for (i = 0; i < nb_pkts; i++) {
> > + mb = pkts[i];
> > + eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);
> > + eth_type = RTE_BE_TO_CPU_16(eth_hdr->ether_type);
> > + ol_flags = mb->ol_flags;
> > + packet_type = mb->packet_type;
> > + is_encapsulation = RTE_ETH_IS_TUNNEL_PKT(packet_type);
> > +
> > + print_ether_addr(" src=", ð_hdr->s_addr);
> > + print_ether_addr(" - dst=", ð_hdr->d_addr);
> > + printf(" - type=0x%04x - length=%u - nb_segs=%d",
> > + eth_type, (unsigned int) mb->pkt_len,
> > + (int)mb->nb_segs);
> > + if (ol_flags & PKT_RX_RSS_HASH) {
> > + printf(" - RSS hash=0x%x", (unsigned int) mb-
> > >hash.rss);
> > + printf(" - RSS queue=0x%x", (unsigned int) queue);
> > + }
> > + if (ol_flags & PKT_RX_FDIR) {
> > + printf(" - FDIR matched ");
> > + if (ol_flags & PKT_RX_FDIR_ID)
> > + printf("ID=0x%x",
> > + mb->hash.fdir.hi);
> > + else if (ol_flags & PKT_RX_FDIR_FLX)
> > + printf("flex bytes=0x%08x %08x",
> > + mb->hash.fdir.hi, mb->hash.fdir.lo);
> > + else
> > + printf("hash=0x%x ID=0x%x ",
> > + mb->hash.fdir.hash, mb->hash.fdir.id);
> > + }
> > + if (ol_flags & PKT_RX_TIMESTAMP)
> > + printf(" - timestamp %"PRIu64" ", mb->timestamp);
> > + if (ol_flags & PKT_RX_VLAN_STRIPPED)
> > + printf(" - VLAN tci=0x%x", mb->vlan_tci);
> > + if (ol_flags & PKT_RX_QINQ_STRIPPED)
> > + printf(" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x",
> > + mb->vlan_tci, mb->vlan_tci_outer);
> > + if (mb->packet_type) {
> > + rte_get_ptype_name(mb->packet_type, buf,
> > sizeof(buf));
> > + printf(" - hw ptype: %s", buf);
> > + }
> > + sw_packet_type = rte_net_get_ptype(mb, &hdr_lens,
> > +
[dpdk-dev] [PATCH v4 1/3] app/testpmd: move dumping packets to a separate function
verbosity for the received/sent packets is needed in all of the
forwarding engines so moving it to be in a separate function
---
changes in v3:
- add util.c in the mason.build file
- restore missing check for ol_flags & PKT_RX_RSS_HASH.
- add local variables for rte_be_to_cpu to avoid long
lines.
changes in v4:
- add missing l3 and l4 checks
---
Signed-off-by: Raslan Darawsheh
---
app/test-pmd/Makefile| 1 +
app/test-pmd/meson.build | 3 +-
app/test-pmd/rxonly.c| 134 +-
app/test-pmd/util.c | 150 +++
4 files changed, 156 insertions(+), 132 deletions(-)
create mode 100644 app/test-pmd/util.c
diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile
index 2b4d604..e2c7845 100644
--- a/app/test-pmd/Makefile
+++ b/app/test-pmd/Makefile
@@ -35,6 +35,7 @@ SRCS-y += csumonly.c
SRCS-y += icmpecho.c
SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ieee1588fwd.c
SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_cmd.c
+SRCS-y += util.c
ifeq ($(CONFIG_RTE_LIBRTE_PMD_SOFTNIC), y)
SRCS-y += softnicfwd.c
diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index a0b3be0..b96ab97 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -20,7 +20,8 @@ sources = files('cmdline.c',
'parameters.c',
'rxonly.c',
'testpmd.c',
- 'txonly.c')
+ 'txonly.c',
+ 'util.c')
deps = ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
if dpdk_conf.has('RTE_LIBRTE_PDUMP')
diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c
index a93d806..3eca89c 100644
--- a/app/test-pmd/rxonly.c
+++ b/app/test-pmd/rxonly.c
@@ -40,14 +40,6 @@
#include "testpmd.h"
-static inline void
-print_ether_addr(const char *what, struct ether_addr *eth_addr)
-{
- char buf[ETHER_ADDR_FMT_SIZE];
- ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
- printf("%s%s", what, buf);
-}
-
/*
* Received a burst of packets.
*/
@@ -55,16 +47,8 @@ static void
pkt_burst_receive(struct fwd_stream *fs)
{
struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
- struct rte_mbuf *mb;
- struct ether_hdr *eth_hdr;
- uint16_t eth_type;
- uint64_t ol_flags;
uint16_t nb_rx;
- uint16_t i, packet_type;
- uint16_t is_encapsulation;
- char buf[256];
- struct rte_net_hdr_lens hdr_lens;
- uint32_t sw_packet_type;
+ uint16_t i;
#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
uint64_t start_tsc;
@@ -90,120 +74,8 @@ pkt_burst_receive(struct fwd_stream *fs)
/*
* Dump each received packet if verbose_level > 0.
*/
- if (verbose_level > 0)
- printf("port %u/queue %u: received %u packets\n",
- fs->rx_port,
- (unsigned) fs->rx_queue,
- (unsigned) nb_rx);
- for (i = 0; i < nb_rx; i++) {
- mb = pkts_burst[i];
- if (verbose_level == 0) {
- rte_pktmbuf_free(mb);
- continue;
- }
- eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);
- eth_type = RTE_BE_TO_CPU_16(eth_hdr->ether_type);
- ol_flags = mb->ol_flags;
- packet_type = mb->packet_type;
- is_encapsulation = RTE_ETH_IS_TUNNEL_PKT(packet_type);
-
- print_ether_addr(" src=", ð_hdr->s_addr);
- print_ether_addr(" - dst=", ð_hdr->d_addr);
- printf(" - type=0x%04x - length=%u - nb_segs=%d",
- eth_type, (unsigned) mb->pkt_len,
- (int)mb->nb_segs);
- if (ol_flags & PKT_RX_RSS_HASH) {
- printf(" - RSS hash=0x%x", (unsigned) mb->hash.rss);
- printf(" - RSS queue=0x%x",(unsigned) fs->rx_queue);
- }
- if (ol_flags & PKT_RX_FDIR) {
- printf(" - FDIR matched ");
- if (ol_flags & PKT_RX_FDIR_ID)
- printf("ID=0x%x",
- mb->hash.fdir.hi);
- else if (ol_flags & PKT_RX_FDIR_FLX)
- printf("flex bytes=0x%08x %08x",
- mb->hash.fdir.hi, mb->hash.fdir.lo);
- else
- printf("hash=0x%x ID=0x%x ",
- mb->hash.fdir.hash, mb->hash.fdir.id);
- }
- if (ol_flags & PKT_RX_TIMESTAMP)
- printf(" - timestamp %"PRIu64" ", mb->timestamp);
- if (ol_flags & PKT_RX_VLAN_STRIPPED)
- printf(" - VLAN tci=0x%x", mb->vlan_tci);
- if (ol_flags & PKT_RX_QINQ_STRIPPED)
- printf(" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x",
-
[dpdk-dev] [PATCH v4 3/3] app/testpmd: set packet dump based on verbosity level
when changing verbosity level it will configure rx/tx callbacks to dump
packets based on the verbosity value as following:
1- dump only received packets:
testpmd> set verbose 1
2- dump only sent packets:
testpmd> set verbose 2
3- dump sent and received packets:
testpmd> set verbose (any number > 2)
4- disable dump
testpmd> set verbose 0
Signed-off-by: Raslan Darawsheh
---
app/test-pmd/config.c | 25 +
app/test-pmd/testpmd.c | 4 ++--
app/test-pmd/testpmd.h | 1 +
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index fb45fea..f402e04 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -50,6 +50,7 @@
#endif
#include
#include
+#include
#include "testpmd.h"
@@ -2963,11 +2964,35 @@ remove_tx_dump_callbacks(portid_t portid)
}
void
+configure_rxtx_dump_callbacks(uint16_t verbose)
+{
+ portid_t portid;
+
+#ifndef RTE_ETHDEV_RXTX_CALLBACKS
+ TESTPMD_LOG(ERR, "setting rxtx callbacks is not enabled\n");
+ return;
+#endif
+
+ RTE_ETH_FOREACH_DEV(portid)
+ {
+ if (verbose == 1 || verbose > 2)
+ add_rx_dump_callbacks(portid);
+ else
+ remove_rx_dump_callbacks(portid);
+ if (verbose >= 2)
+ add_tx_dump_callbacks(portid);
+ else
+ remove_tx_dump_callbacks(portid);
+ }
+}
+
+void
set_verbose_level(uint16_t vb_level)
{
printf("Change verbose level from %u to %u\n",
(unsigned int) verbose_level, (unsigned int) vb_level);
verbose_level = vb_level;
+ configure_rxtx_dump_callbacks(verbose_level);
}
void
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 571ecb4..538723c 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1665,7 +1665,7 @@ start_port(portid_t pid)
return -1;
}
}
-
+ configure_rxtx_dump_callbacks(0);
printf("Configuring Port %d (socket %u)\n", pi,
port->socket_id);
/* configure port */
@@ -1764,7 +1764,7 @@ start_port(portid_t pid)
return -1;
}
}
-
+ configure_rxtx_dump_callbacks(verbose_level);
/* start port */
if (rte_eth_dev_start(pi) < 0) {
printf("Fail to start port %d\n", pi);
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index c0d7656..e68710d 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -757,6 +757,7 @@ void add_rx_dump_callbacks(portid_t portid);
void remove_rx_dump_callbacks(portid_t portid);
void add_tx_dump_callbacks(portid_t portid);
void remove_tx_dump_callbacks(portid_t portid);
+void configure_rxtx_dump_callbacks(uint16_t verbose);
/*
* Work-around of a compilation error with ICC on invocations of the
--
2.7.4
[dpdk-dev] [PATCH v4 2/3] app/testpmd: add packet dump callback functions
add new rx/tx callback functions to be used for dumping the packets.
Signed-off-by: Raslan Darawsheh
---
app/test-pmd/config.c | 67 ++
app/test-pmd/testpmd.h | 15 +++
app/test-pmd/util.c| 17 +
3 files changed, 99 insertions(+)
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index a0f9349..fb45fea 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -2896,6 +2896,73 @@ set_pkt_forwarding_mode(const char *fwd_mode_name)
}
void
+add_rx_dump_callbacks(portid_t portid)
+{
+ struct rte_eth_dev_info dev_info;
+ uint16_t queue;
+
+ if (port_id_is_invalid(portid, ENABLED_WARN))
+ return;
+
+ rte_eth_dev_info_get(portid, &dev_info);
+ for (queue = 0; queue < dev_info.nb_rx_queues; queue++)
+ if (!ports[portid].rx_dump_cb[queue])
+ ports[portid].rx_dump_cb[queue] =
+ rte_eth_add_rx_callback(portid, queue,
+ dump_rx_pkts, NULL);
+}
+
+void
+add_tx_dump_callbacks(portid_t portid)
+{
+ struct rte_eth_dev_info dev_info;
+ uint16_t queue;
+
+ if (port_id_is_invalid(portid, ENABLED_WARN))
+ return;
+ rte_eth_dev_info_get(portid, &dev_info);
+ for (queue = 0; queue < dev_info.nb_tx_queues; queue++)
+ if (!ports[portid].tx_dump_cb[queue])
+ ports[portid].tx_dump_cb[queue] =
+ rte_eth_add_tx_callback(portid, queue,
+ dump_tx_pkts, NULL);
+}
+
+void
+remove_rx_dump_callbacks(portid_t portid)
+{
+ struct rte_eth_dev_info dev_info;
+ uint16_t queue;
+
+ if (port_id_is_invalid(portid, ENABLED_WARN))
+ return;
+ rte_eth_dev_info_get(portid, &dev_info);
+ for (queue = 0; queue < dev_info.nb_rx_queues; queue++)
+ if (ports[portid].rx_dump_cb[queue]) {
+ rte_eth_remove_rx_callback(portid, queue,
+ ports[portid].rx_dump_cb[queue]);
+ ports[portid].rx_dump_cb[queue] = NULL;
+ }
+}
+
+void
+remove_tx_dump_callbacks(portid_t portid)
+{
+ struct rte_eth_dev_info dev_info;
+ uint16_t queue;
+
+ if (port_id_is_invalid(portid, ENABLED_WARN))
+ return;
+ rte_eth_dev_info_get(portid, &dev_info);
+ for (queue = 0; queue < dev_info.nb_tx_queues; queue++)
+ if (ports[portid].tx_dump_cb[queue]) {
+ rte_eth_remove_tx_callback(portid, queue,
+ ports[portid].tx_dump_cb[queue]);
+ ports[portid].tx_dump_cb[queue] = NULL;
+ }
+}
+
+void
set_verbose_level(uint16_t vb_level)
{
printf("Change verbose level from %u to %u\n",
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index a1f6614..c0d7656 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -180,6 +180,8 @@ struct rte_port {
uint32_tmc_addr_nb; /**< nb. of addr. in mc_addr_pool */
uint8_t slave_flag; /**< bonding slave port */
struct port_flow*flow_list; /**< Associated flows. */
+ const struct rte_eth_rxtx_callback *rx_dump_cb[MAX_QUEUE_ID+1];
+ const struct rte_eth_rxtx_callback *tx_dump_cb[MAX_QUEUE_ID+1];
#ifdef SOFTNIC
struct softnic_port softport; /**< softnic params */
#endif
@@ -743,6 +745,19 @@ int check_nb_rxq(queueid_t rxq);
queueid_t get_allowed_max_nb_txq(portid_t *pid);
int check_nb_txq(queueid_t txq);
+
+uint16_t dump_rx_pkts(uint16_t port_id, uint16_t queue, struct rte_mbuf
*pkts[],
+ uint16_t nb_pkts, __rte_unused uint16_t max_pkts,
+ __rte_unused void *user_param);
+
+uint16_t dump_tx_pkts(uint16_t port_id, uint16_t queue, struct rte_mbuf
*pkts[],
+ uint16_t nb_pkts, __rte_unused void *user_param);
+
+void add_rx_dump_callbacks(portid_t portid);
+void remove_rx_dump_callbacks(portid_t portid);
+void add_tx_dump_callbacks(portid_t portid);
+void remove_tx_dump_callbacks(portid_t portid);
+
/*
* Work-around of a compilation error with ICC on invocations of the
* rte_be_to_cpu_16() function.
diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c
index e56b712..6fa2284 100644
--- a/app/test-pmd/util.c
+++ b/app/test-pmd/util.c
@@ -148,3 +148,20 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct
rte_mbuf *pkts[],
printf(" ol_flags: %s\n", buf);
}
}
+
+uint16_t
+dump_rx_pkts(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],
+uint16_t nb_pkts, __rte_unused uint16_t max_pkts,
+__rte_unused void *user_param)
+{
+ dump_pkt_burst(port_id, queue, pkts, nb_pkts, 1);
+ return nb_pkts;
+}
+
+uint16_t
+dump_tx_pkts(uint16_t po
Re: [dpdk-dev] [PATCH 1/3] security: support pdcp protocol
Hi Akhil,
Please see inline.
Thanks,
Anoob
On 05-10-2018 17:35, Akhil Goyal wrote:
External Email
On 9/6/2018 9:45 AM, Joseph, Anoob wrote:
Hi Akhil,
Hi Anoob,
Thanks for the comments.
Please see inline.
Thanks,
Anoob
On 28-08-2018 18:31, akhil.go...@nxp.com wrote:
External Email
From: Akhil Goyal
Signed-off-by: Hemant Agrawal
Signed-off-by: Akhil Goyal
---
doc/guides/prog_guide/rte_security.rst | 90
--
lib/librte_security/rte_security.c | 4 ++
lib/librte_security/rte_security.h | 62 ++
3 files changed, 149 insertions(+), 7 deletions(-)
diff --git a/doc/guides/prog_guide/rte_security.rst
b/doc/guides/prog_guide/rte_security.rst
index 0812abe77..412fff016 100644
--- a/doc/guides/prog_guide/rte_security.rst
+++ b/doc/guides/prog_guide/rte_security.rst
@@ -10,8 +10,8 @@ The security library provides a framework for
management and provisioning
of security protocol operations offloaded to hardware based
devices. The
library defines generic APIs to create and free security sessions
which can
support full protocol offload as well as inline crypto operation
with
-NIC or crypto devices. The framework currently only supports the
IPSec protocol
-and associated operations, other protocols will be added in future.
+NIC or crypto devices. The framework currently only supports the
IPSec and PDCP
+protocol and associated operations, other protocols will be added
in future.
Design Principles
-
@@ -253,6 +253,46 @@ for any protocol header addition.
+|+
V
+PDCP Flow Diagram
+~
+
+.. code-block:: c
+
+ Transmitting PDCP Entity Receiving PDCP Entity
+ | ^
+ | +---|---+
+ V | In order delivery and |
+ +-|--+ | Duplicate detection |
+ | Sequence Numbering | | (Data Plane only) |
+ +-|--+ +---|---+
+ | |
+ +-|--+ +---|--+
+ | Header Compression*| | Header Decompression*|
+ | (Data-Plane only) | | (Data Plane only) |
+ +-|--+ +---|--+
+ | |
+ +-|---+ +---|--+
+ | Integrity Protection| |Integrity Verification|
+ | (Control Plane only)| | (Control Plane only) |
+ +-|---+ +---|--+
+ +-|---+ +--|--+
+ | Ciphering | | Deciphering |
+ +-|---+ +--|--+
+ +-|---+ +--|--+
+ | Add PDCP header | | Remove PDCP Header |
+ +-|---+ +--|--+
+ | |
+ +->>+
+
[Anoob] Which PDCP specification revision is this based on? In the 5G
specification, even data-plane may undergo integrity protection.
This patchset is based on LTE-PDCP - 3GPP TS 36.323 v15.1.0 (2018-09).
5G changes are not added in this patchset. It will be added in future.
+.. note::
+
+ * Header Compression and decompression are not supported
currently.
+
+Just like IPSec, in case of PDCP also header addition/deletion,
cipher/
+de-cipher, integrity protection/verification is done based on the
action
+type chosen.
+
Device Features and Capabilities
-
@@ -271,7 +311,7 @@ structure in the *DPDK API Reference*.
Each driver (crypto or ethernet) defines its own private array of
capabilities
for the operations it supports. Below is an example of the
capabilities for a
-PMD which supports the IPSec protocol.
+PMD which supports the IPSec and PDCP protocol.
.. code-block:: c
@@ -298,6 +338,22 @@ PMD which supports the IPSec protocol.
},
.crypto_capabilities = pmd_capabilities
},
+ { /* PDCP Lookaside Protocol offload Data Plane */
+ .action = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
+ .protocol = RTE_SECURITY_PROTOCOL_PDCP,
+ .pdcp = {
+ .domain = RTE_SECURITY_PDCP_MODE_DATA,
+ },
+ .crypto_capabilities = pmd_capabilities
+ },
+ { /* PDCP Lookaside Protocol offload Control */
+ .action = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
+ .protocol = RTE_SECURITY_PROTOCOL_PDCP,
+ .pdcp = {
+ .domain = RTE_SECURITY_PDCP_MODE_CONTROL,
+ },
+
[dpdk-dev] [PATCH v6 0/5] eal: simplify devargs and hotplug functions
This is a follow-up of an idea presented at Dublin during the "hotplug talk". Instead of changing the existing hotplug functions, as in the RFC, some new experimental functions are added. The old functions lose their experimental status in order to provide a non-experimental replacement for deprecated attach/detach functions. It has been discussed briefly in the latest technical board meeting. Changes in v6 - after Gaetan's review: - bump ABI version of all buses (because of rte_device change) - unroll snprintf loop in rte_eal_hotplug_add Changes in v5: - rte_devargs_remove is fixed in case of null devargs (patch 2) - a pointer to the bus is added in rte_device (patch 3) - rte_dev_remove is fixed in case of no devargs (patch 5) Changes in v4 - after Andrew's review: - add API changes in release notes (patches 1 & 2) - fix memory leak in rte_eal_hotplug_add (patch 4) Change in v3: - fix null dereferencing in error path (patch 2) Thomas Monjalon (5): devargs: remove deprecated functions devargs: simplify parameters of removal function eal: add bus pointer in device structure eal: remove experimental flag of hotplug functions eal: simplify parameters of hotplug functions doc/guides/rel_notes/release_18_11.rst | 23 -- drivers/bus/dpaa/Makefile | 2 +- drivers/bus/dpaa/dpaa_bus.c | 2 + drivers/bus/dpaa/meson.build| 2 + drivers/bus/fslmc/Makefile | 2 +- drivers/bus/fslmc/fslmc_bus.c | 2 + drivers/bus/fslmc/meson.build | 2 + drivers/bus/ifpga/Makefile | 2 +- drivers/bus/ifpga/ifpga_bus.c | 6 +- drivers/bus/ifpga/meson.build | 2 + drivers/bus/pci/Makefile| 2 +- drivers/bus/pci/bsd/pci.c | 2 + drivers/bus/pci/linux/pci.c | 1 + drivers/bus/pci/meson.build | 2 + drivers/bus/pci/private.h | 2 + drivers/bus/vdev/Makefile | 2 +- drivers/bus/vdev/meson.build| 2 + drivers/bus/vdev/vdev.c | 9 +-- drivers/bus/vmbus/Makefile | 2 +- drivers/bus/vmbus/linux/vmbus_bus.c | 1 + drivers/bus/vmbus/meson.build | 2 + drivers/bus/vmbus/private.h | 3 + drivers/net/failsafe/failsafe_eal.c | 3 +- drivers/net/failsafe/failsafe_ether.c | 3 +- lib/librte_eal/common/eal_common_dev.c | 90 + lib/librte_eal/common/eal_common_devargs.c | 41 ++ lib/librte_eal/common/include/rte_dev.h | 36 +++-- lib/librte_eal/common/include/rte_devargs.h | 81 +-- lib/librte_eal/rte_eal_version.map | 10 +-- 29 files changed, 155 insertions(+), 184 deletions(-) -- 2.19.0
[dpdk-dev] [PATCH v6 1/5] devargs: remove deprecated functions
rte_eal_parse_devargs_str() does not support parsing the bus name
at the start of devargs. So it was renamed and deprecated.
rte_eal_devargs_add(), rte_eal_devargs_type_count() and
rte_eal_devargs_dump() were declared deprecated and had their
implementation body renamed.
All these functions were deprecated in release 18.05.
Signed-off-by: Thomas Monjalon
Reviewed-by: Andrew Rybchenko
Acked-by: Gaetan Rivet
---
The library version is not updated because it should be done
in earlier patch https://patches.dpdk.org/patch/43903/
---
doc/guides/rel_notes/release_18_11.rst | 5 ++
lib/librte_eal/common/eal_common_devargs.c | 30 -
lib/librte_eal/common/include/rte_devargs.h | 71 -
lib/librte_eal/rte_eal_version.map | 4 --
4 files changed, 5 insertions(+), 105 deletions(-)
diff --git a/doc/guides/rel_notes/release_18_11.rst
b/doc/guides/rel_notes/release_18_11.rst
index 2133a5b9b..4f4420ad3 100644
--- a/doc/guides/rel_notes/release_18_11.rst
+++ b/doc/guides/rel_notes/release_18_11.rst
@@ -118,6 +118,11 @@ API Changes
Also, make sure to start the actual text at the margin.
=
+* eal: The following devargs functions, which were deprecated in 18.05,
+ were removed in 18.11:
+ ``rte_eal_parse_devargs_str()``, ``rte_eal_devargs_add()``,
+ ``rte_eal_devargs_type_count()``, and ``rte_eal_devargs_dump()``.
+
* mbuf: The ``__rte_mbuf_raw_free()`` and ``__rte_pktmbuf_prefree_seg()``
functions were deprecated since 17.05 and are replaced by
``rte_mbuf_raw_free()`` and ``rte_pktmbuf_prefree_seg()``.
diff --git a/lib/librte_eal/common/eal_common_devargs.c
b/lib/librte_eal/common/eal_common_devargs.c
index 88afece10..5cb5c624d 100644
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -28,36 +28,6 @@ TAILQ_HEAD(rte_devargs_list, rte_devargs);
struct rte_devargs_list devargs_list =
TAILQ_HEAD_INITIALIZER(devargs_list);
-int
-rte_eal_parse_devargs_str(const char *devargs_str,
- char **drvname, char **drvargs)
-{
- char *sep;
-
- if ((devargs_str) == NULL || (drvname) == NULL || (drvargs == NULL))
- return -1;
-
- *drvname = strdup(devargs_str);
- if (*drvname == NULL)
- return -1;
-
- /* set the first ',' to '\0' to split name and arguments */
- sep = strchr(*drvname, ',');
- if (sep != NULL) {
- sep[0] = '\0';
- *drvargs = strdup(sep + 1);
- } else {
- *drvargs = strdup("");
- }
-
- if (*drvargs == NULL) {
- free(*drvname);
- *drvname = NULL;
- return -1;
- }
- return 0;
-}
-
static size_t
devargs_layer_count(const char *s)
{
diff --git a/lib/librte_eal/common/include/rte_devargs.h
b/lib/librte_eal/common/include/rte_devargs.h
index 097a4ce7b..0eef6e9c4 100644
--- a/lib/librte_eal/common/include/rte_devargs.h
+++ b/lib/librte_eal/common/include/rte_devargs.h
@@ -66,36 +66,6 @@ struct rte_devargs {
const char *data; /**< Device string storage. */
};
-/**
- * @deprecated
- * Parse a devargs string.
- *
- * For PCI devices, the format of arguments string is "PCI_ADDR" or
- * "PCI_ADDR,key=val,key2=val2,...". Examples: "08:00.1", ":5:00.0",
- * "04:00.0,arg=val".
- *
- * For virtual devices, the format of arguments string is "DRIVER_NAME*"
- * or "DRIVER_NAME*,key=val,key2=val2,...". Examples: "net_ring",
- * "net_ring0", "net_pmdAnything,arg=0:arg2=1".
- *
- * The function parses the arguments string to get driver name and driver
- * arguments.
- *
- * @param devargs_str
- * The arguments as given by the user.
- * @param drvname
- * The pointer to the string to store parsed driver name.
- * @param drvargs
- * The pointer to the string to store parsed driver arguments.
- *
- * @return
- * - 0 on success
- * - A negative value on error
- */
-__rte_deprecated
-int rte_eal_parse_devargs_str(const char *devargs_str,
- char **drvname, char **drvargs);
-
/**
* Parse a device string.
*
@@ -201,23 +171,6 @@ rte_devargs_insert(struct rte_devargs *da);
__rte_experimental
int rte_devargs_add(enum rte_devtype devtype, const char *devargs_str);
-/**
- * @deprecated
- * Add a device to the user device list
- * See rte_devargs_parse() for details.
- *
- * @param devtype
- * The type of the device.
- * @param devargs_str
- * The arguments as given by the user.
- *
- * @return
- * - 0 on success
- * - A negative value on error
- */
-__rte_deprecated
-int rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str);
-
/**
* Remove a device from the user device list.
* Its resources are freed.
@@ -251,20 +204,6 @@ __rte_experimental
unsigned int
rte_devargs_type_count(enum rte_devtype devtype);
-/**
- * @deprecated
- * Count the number of user devices of a specified
[dpdk-dev] [PATCH v6 3/5] eal: add bus pointer in device structure
When a device is added with a devargs (hotplug or whitelist),
the bus pointer can be retrieved via its devargs.
But there is no such devargs.bus in case of standard scan.
A pointer to the rte_bus handle is added to rte_device.
When a device is allocated (during a scan),
the pointer to its bus is assigned.
It will make possible to remove a rte_device,
using the function pointer from its bus.
The function rte_bus_find_by_device() becomes useless,
and may be removed later.
Signed-off-by: Thomas Monjalon
Acked-by: Gaetan Rivet
---
doc/guides/rel_notes/release_18_11.rst | 15 ++-
drivers/bus/dpaa/Makefile | 2 +-
drivers/bus/dpaa/dpaa_bus.c | 2 ++
drivers/bus/dpaa/meson.build| 2 ++
drivers/bus/fslmc/Makefile | 2 +-
drivers/bus/fslmc/fslmc_bus.c | 2 ++
drivers/bus/fslmc/meson.build | 2 ++
drivers/bus/ifpga/Makefile | 2 +-
drivers/bus/ifpga/ifpga_bus.c | 1 +
drivers/bus/ifpga/meson.build | 2 ++
drivers/bus/pci/Makefile| 2 +-
drivers/bus/pci/bsd/pci.c | 2 ++
drivers/bus/pci/linux/pci.c | 1 +
drivers/bus/pci/meson.build | 2 ++
drivers/bus/pci/private.h | 2 ++
drivers/bus/vdev/Makefile | 2 +-
drivers/bus/vdev/meson.build| 2 ++
drivers/bus/vdev/vdev.c | 1 +
drivers/bus/vmbus/Makefile | 2 +-
drivers/bus/vmbus/linux/vmbus_bus.c | 1 +
drivers/bus/vmbus/meson.build | 2 ++
drivers/bus/vmbus/private.h | 3 +++
lib/librte_eal/common/include/rte_dev.h | 1 +
23 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/doc/guides/rel_notes/release_18_11.rst
b/doc/guides/rel_notes/release_18_11.rst
index d534bb71c..c87522f27 100644
--- a/doc/guides/rel_notes/release_18_11.rst
+++ b/doc/guides/rel_notes/release_18_11.rst
@@ -164,6 +164,10 @@ ABI Changes
``rte_config`` structure on account of improving DPDK usability when
using either ``--legacy-mem`` or ``--single-file-segments`` flags.
+* eal: The structure ``rte_device`` got a new field to reference a ``rte_bus``.
+ It is changing the size of the ``struct rte_device`` and the inherited
+ device structures of all buses.
+
Removed Items
-
@@ -199,11 +203,12 @@ The libraries prepended with a plus sign were incremented
in this version.
librte_bbdev.so.1
librte_bitratestats.so.2
librte_bpf.so.1
- librte_bus_dpaa.so.1
- librte_bus_fslmc.so.1
- librte_bus_pci.so.1
- librte_bus_vdev.so.1
- + librte_bus_vmbus.so.1
+ + librte_bus_dpaa.so.2
+ + librte_bus_fslmc.so.2
+ + librte_bus_ifpga.so.2
+ + librte_bus_pci.so.2
+ + librte_bus_vdev.so.2
+ + librte_bus_vmbus.so.2
librte_cfgfile.so.2
librte_cmdline.so.2
librte_common_octeontx.so.1
diff --git a/drivers/bus/dpaa/Makefile b/drivers/bus/dpaa/Makefile
index bffaa9d92..9337b5f92 100644
--- a/drivers/bus/dpaa/Makefile
+++ b/drivers/bus/dpaa/Makefile
@@ -24,7 +24,7 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include
# versioning export map
EXPORT_MAP := rte_bus_dpaa_version.map
-LIBABIVER := 1
+LIBABIVER := 2
# all source are stored in SRCS-y
#
diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index 49cd04dbb..138e0f98d 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -165,6 +165,8 @@ dpaa_create_device_list(void)
goto cleanup;
}
+ dev->device.bus = &rte_dpaa_bus.bus;
+
cfg = &dpaa_netcfg->port_cfg[i];
fman_intf = cfg->fman_if;
diff --git a/drivers/bus/dpaa/meson.build b/drivers/bus/dpaa/meson.build
index d10b62c03..5e7705571 100644
--- a/drivers/bus/dpaa/meson.build
+++ b/drivers/bus/dpaa/meson.build
@@ -1,6 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2018 NXP
+version = 2
+
if host_machine.system() != 'linux'
build = false
endif
diff --git a/drivers/bus/fslmc/Makefile b/drivers/bus/fslmc/Makefile
index 515d0f534..e95551980 100644
--- a/drivers/bus/fslmc/Makefile
+++ b/drivers/bus/fslmc/Makefile
@@ -24,7 +24,7 @@ LDLIBS += -lrte_ethdev
EXPORT_MAP := rte_bus_fslmc_version.map
# library version
-LIBABIVER := 1
+LIBABIVER := 2
SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \
qbman/qbman_portal.c \
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index bfe81e236..960f55071 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -161,6 +161,8 @@ scan_one_fslmc_device(char *dev_name)
return -ENOMEM;
}
+ dev->device.bus = &rte_fslmc_bus.bus;
+
/* Parse the device name and ID */
t_ptr = strtok(dup_dev_name, ".");
if (!t_ptr) {
diff --git a/drivers/bus/fslmc/meson.build b/drivers/bus/fslmc/meson.build
index 22a56a6fc..54ca92d0c 100644
--- a/dr
[dpdk-dev] [PATCH v6 2/5] devargs: simplify parameters of removal function
The function rte_devargs_remove(), which is intended to be internal,
can take a devargs structure as argument.
The matching is still using string comparison of bus name and
device name.
It is simpler and may allow a different devargs matching in future.
Signed-off-by: Thomas Monjalon
Reviewed-by: Andrew Rybchenko
Acked-by: Gaetan Rivet
---
doc/guides/rel_notes/release_18_11.rst | 3 +++
drivers/bus/ifpga/ifpga_bus.c | 5 +
drivers/bus/vdev/vdev.c | 8 ++--
lib/librte_eal/common/eal_common_dev.c | 4 ++--
lib/librte_eal/common/eal_common_devargs.c | 11 +++
lib/librte_eal/common/include/rte_devargs.h | 10 +++---
6 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/doc/guides/rel_notes/release_18_11.rst
b/doc/guides/rel_notes/release_18_11.rst
index 4f4420ad3..d534bb71c 100644
--- a/doc/guides/rel_notes/release_18_11.rst
+++ b/doc/guides/rel_notes/release_18_11.rst
@@ -123,6 +123,9 @@ API Changes
``rte_eal_parse_devargs_str()``, ``rte_eal_devargs_add()``,
``rte_eal_devargs_type_count()``, and ``rte_eal_devargs_dump()``.
+* eal: The parameters of the function ``rte_devargs_remove()`` have changed
+ from bus and device names to ``struct rte_devargs``.
+
* mbuf: The ``__rte_mbuf_raw_free()`` and ``__rte_pktmbuf_prefree_seg()``
functions were deprecated since 17.05 and are replaced by
``rte_mbuf_raw_free()`` and ``rte_pktmbuf_prefree_seg()``.
diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index c54b59db2..3ef035b7e 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -361,7 +361,6 @@ static int
ifpga_unplug(struct rte_device *dev)
{
struct rte_afu_device *afu_dev = NULL;
- struct rte_devargs *devargs = NULL;
int ret;
if (dev == NULL)
@@ -371,15 +370,13 @@ ifpga_unplug(struct rte_device *dev)
if (!afu_dev)
return -ENOENT;
- devargs = dev->devargs;
-
ret = ifpga_remove_driver(afu_dev);
if (ret)
return ret;
TAILQ_REMOVE(&ifpga_afu_dev_list, afu_dev, next);
- rte_devargs_remove(devargs->bus->name, devargs->name);
+ rte_devargs_remove(dev->devargs);
free(afu_dev);
return 0;
diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index ef3ad6d99..efca962f7 100644
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -249,7 +249,6 @@ int
rte_vdev_init(const char *name, const char *args)
{
struct rte_vdev_device *dev;
- struct rte_devargs *devargs;
int ret;
rte_spinlock_recursive_lock(&vdev_device_list_lock);
@@ -260,9 +259,8 @@ rte_vdev_init(const char *name, const char *args)
if (ret > 0)
VDEV_LOG(ERR, "no driver found for %s", name);
/* If fails, remove it from vdev list */
- devargs = dev->device.devargs;
TAILQ_REMOVE(&vdev_device_list, dev, next);
- rte_devargs_remove(devargs->bus->name, devargs->name);
+ rte_devargs_remove(dev->device.devargs);
free(dev);
}
}
@@ -290,7 +288,6 @@ int
rte_vdev_uninit(const char *name)
{
struct rte_vdev_device *dev;
- struct rte_devargs *devargs;
int ret;
if (name == NULL)
@@ -309,8 +306,7 @@ rte_vdev_uninit(const char *name)
goto unlock;
TAILQ_REMOVE(&vdev_device_list, dev, next);
- devargs = dev->device.devargs;
- rte_devargs_remove(devargs->bus->name, devargs->name);
+ rte_devargs_remove(dev->device.devargs);
free(dev);
unlock:
diff --git a/lib/librte_eal/common/eal_common_dev.c
b/lib/librte_eal/common/eal_common_dev.c
index 678dbcac7..e1d9e8ec7 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -186,7 +186,7 @@ int __rte_experimental rte_eal_hotplug_add(const char
*busname, const char *devn
return 0;
err_devarg:
- if (rte_devargs_remove(busname, devname)) {
+ if (rte_devargs_remove(da) != 0) {
free(da->args);
free(da);
}
@@ -227,7 +227,7 @@ rte_eal_hotplug_remove(const char *busname, const char
*devname)
if (ret)
RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n",
dev->name);
- rte_devargs_remove(busname, devname);
+ rte_devargs_remove(dev->devargs);
return ret;
}
diff --git a/lib/librte_eal/common/eal_common_devargs.c
b/lib/librte_eal/common/eal_common_devargs.c
index 5cb5c624d..69e9e32e9 100644
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -263,7 +263,7 @@ rte_devargs_insert(struct rte_devargs *da)
{
int ret;
- ret = rte_devargs_remove(da->bus->name, da->name);
+ r
[dpdk-dev] [PATCH v6 5/5] eal: simplify parameters of hotplug functions
All information about a device to probe can be grouped
in a common string, which is what we usually call devargs.
An application should not have to parse this string before
calling the EAL probe function.
And the syntax could evolve to be more complex and support
matching multiple devices in one string.
That's why the bus name and device name should be removed from
rte_eal_hotplug_add().
Instead of changing this function, a simpler one is added
and used in the old one, which may be deprecated later.
When removing a device, we already know its rte_device handle
which can be directly passed as parameter of rte_eal_hotplug_remove().
If the rte_device is not known, it can be retrieved with the devargs,
by iterating in the device list (future RTE_DEV_FOREACH()).
Similarly to the probing case, a new function is added
and used in the old one, which may be deprecated later.
The new function is used in failsafe, because the replacement is easy.
Signed-off-by: Thomas Monjalon
Reviewed-by: Andrew Rybchenko
Acked-by: Gaetan Rivet
---
drivers/net/failsafe/failsafe_eal.c | 3 +-
drivers/net/failsafe/failsafe_ether.c | 3 +-
lib/librte_eal/common/eal_common_dev.c | 81 -
lib/librte_eal/common/include/rte_dev.h | 30 -
lib/librte_eal/rte_eal_version.map | 2 +
5 files changed, 84 insertions(+), 35 deletions(-)
diff --git a/drivers/net/failsafe/failsafe_eal.c
b/drivers/net/failsafe/failsafe_eal.c
index ce1633f13..8a888b1ff 100644
--- a/drivers/net/failsafe/failsafe_eal.c
+++ b/drivers/net/failsafe/failsafe_eal.c
@@ -144,8 +144,7 @@ fs_bus_uninit(struct rte_eth_dev *dev)
int ret = 0;
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {
- sdev_ret = rte_eal_hotplug_remove(sdev->bus->name,
- sdev->dev->name);
+ sdev_ret = rte_dev_remove(sdev->dev);
if (sdev_ret) {
ERROR("Failed to remove requested device %s (err: %d)",
sdev->dev->name, sdev_ret);
diff --git a/drivers/net/failsafe/failsafe_ether.c
b/drivers/net/failsafe/failsafe_ether.c
index 51c96f78b..f2512c430 100644
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -282,8 +282,7 @@ fs_dev_remove(struct sub_device *sdev)
sdev->state = DEV_PROBED;
/* fallthrough */
case DEV_PROBED:
- ret = rte_eal_hotplug_remove(sdev->bus->name,
-sdev->dev->name);
+ ret = rte_dev_remove(sdev->dev);
if (ret) {
ERROR("Bus detach failed for sub_device %u",
SUB_ID(sdev));
diff --git a/lib/librte_eal/common/eal_common_dev.c
b/lib/librte_eal/common/eal_common_dev.c
index ce6d145fb..7663eaa3f 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -129,46 +129,62 @@ int rte_eal_dev_detach(struct rte_device *dev)
int
rte_eal_hotplug_add(const char *busname, const char *devname,
- const char *devargs)
+ const char *drvargs)
{
- struct rte_bus *bus;
- struct rte_device *dev;
- struct rte_devargs *da;
int ret;
+ char *devargs = NULL;
+ int length;
- bus = rte_bus_find_by_name(busname);
- if (bus == NULL) {
- RTE_LOG(ERR, EAL, "Cannot find bus (%s)\n", busname);
- return -ENOENT;
- }
+ length = snprintf(NULL, 0, "%s:%s,%s", busname, devname, drvargs);
+ if (length < 0)
+ return -EINVAL;
+ devargs = malloc(length + 1);
+ if (devargs == NULL)
+ return -ENOMEM;
+ ret = snprintf(devargs, length + 1, "%s:%s,%s", busname, devname,
drvargs);
+ if (ret < 0)
+ return -EINVAL;
- if (bus->plug == NULL) {
- RTE_LOG(ERR, EAL, "Function plug not supported by bus (%s)\n",
- bus->name);
- return -ENOTSUP;
- }
+ ret = rte_dev_probe(devargs);
+
+ free(devargs);
+ return ret;
+}
+
+int __rte_experimental
+rte_dev_probe(const char *devargs)
+{
+ struct rte_device *dev;
+ struct rte_devargs *da;
+ int ret;
da = calloc(1, sizeof(*da));
if (da == NULL)
return -ENOMEM;
- ret = rte_devargs_parsef(da, "%s:%s,%s",
-busname, devname, devargs);
+ ret = rte_devargs_parse(da, devargs);
if (ret)
goto err_devarg;
+ if (da->bus->plug == NULL) {
+ RTE_LOG(ERR, EAL, "Function plug not supported by bus (%s)\n",
+ da->bus->name);
+ ret = -ENOTSUP;
+ goto err_devarg;
+ }
+
ret = rte_devargs_insert(da);
if (ret)
goto err_devarg;
- ret = bus->sc
[dpdk-dev] [PATCH v6 4/5] eal: remove experimental flag of hotplug functions
These functions are quite old and are the only available replacement
for the deprecated attach/detach functions.
Note: some new functions may (again) replace these hotplug functions,
in future, with better parameters.
Signed-off-by: Thomas Monjalon
Reviewed-by: Andrew Rybchenko
Acked-by: Gaetan Rivet
---
lib/librte_eal/common/eal_common_dev.c | 7 ---
lib/librte_eal/common/include/rte_dev.h | 11 ++-
lib/librte_eal/rte_eal_version.map | 4 ++--
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_dev.c
b/lib/librte_eal/common/eal_common_dev.c
index e1d9e8ec7..ce6d145fb 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -127,8 +127,9 @@ int rte_eal_dev_detach(struct rte_device *dev)
return ret;
}
-int __rte_experimental rte_eal_hotplug_add(const char *busname, const char
*devname,
- const char *devargs)
+int
+rte_eal_hotplug_add(const char *busname, const char *devname,
+ const char *devargs)
{
struct rte_bus *bus;
struct rte_device *dev;
@@ -193,7 +194,7 @@ int __rte_experimental rte_eal_hotplug_add(const char
*busname, const char *devn
return ret;
}
-int __rte_experimental
+int
rte_eal_hotplug_remove(const char *busname, const char *devname)
{
struct rte_bus *bus;
diff --git a/lib/librte_eal/common/include/rte_dev.h
b/lib/librte_eal/common/include/rte_dev.h
index d82cba847..d6c5d48a9 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -190,9 +190,6 @@ __rte_deprecated
int rte_eal_dev_detach(struct rte_device *dev);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Hotplug add a given device to a specific bus.
*
* @param busname
@@ -205,13 +202,10 @@ int rte_eal_dev_detach(struct rte_device *dev);
* @return
* 0 on success, negative on error.
*/
-int __rte_experimental rte_eal_hotplug_add(const char *busname, const char
*devname,
+int rte_eal_hotplug_add(const char *busname, const char *devname,
const char *devargs);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Hotplug remove a given device from a specific bus.
*
* @param busname
@@ -221,8 +215,7 @@ int __rte_experimental rte_eal_hotplug_add(const char
*busname, const char *devn
* @return
* 0 on success, negative on error.
*/
-int __rte_experimental rte_eal_hotplug_remove(const char *busname,
- const char *devname);
+int rte_eal_hotplug_remove(const char *busname, const char *devname);
/**
* Device comparison function.
diff --git a/lib/librte_eal/rte_eal_version.map
b/lib/librte_eal/rte_eal_version.map
index 3df7f9831..6bff37f4b 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -261,6 +261,8 @@ DPDK_18.08 {
DPDK_18.11 {
global:
+ rte_eal_hotplug_add;
+ rte_eal_hotplug_remove;
rte_strscpy;
} DPDK_18.08;
@@ -288,8 +290,6 @@ EXPERIMENTAL {
rte_devargs_remove;
rte_devargs_type_count;
rte_eal_cleanup;
- rte_eal_hotplug_add;
- rte_eal_hotplug_remove;
rte_fbarray_attach;
rte_fbarray_destroy;
rte_fbarray_detach;
--
2.19.0
Re: [dpdk-dev] [PATCH 1/2] net/mlx4: support externally allocated static memory
Monday, September 24, 2018 9:37 PM, Yongseok Koh:
> Subject: [PATCH 1/2] net/mlx4: support externally allocated static memory
>
> When MLX PMD registers memory for DMA, it accesses the global memseg
> list of DPDK to maximize the range of registration so that LKey search can be
> more efficient. Granularity of MR registration is per page.
>
> Externally allocated memory shouldn't be used for DMA because it can't be
> searched in the memseg list and free event can't be tracked by DPDK. If it is
> used, the following error will occur:
>
> net_mlx5: port 0 unable to find virtually contiguous chunk for
> address (0x5600017587c0). rte_memseg_contig_walk() failed.
>
> There's a pending patchset [1] which enables externally allocated memory.
> Once it is merged, users can register their own memory out of EAL then that
> will resolve this issue.
>
> Meanwhile, if the external memory is static (allocated on startup and never
> freed), such memory can also be registered by little tweak in the code.
>
> [1] http://patches.dpdk.org/project/dpdk/list/?series=1415
>
> This patch is not a bug fix but needs to be included in stable versions.
>
> Fixes: 9797bfcce1c9 ("net/mlx4: add new memory region support")
> Cc: sta...@dpdk.org
> Cc: "Damjan Marion (damarion)"
> Cc: Ed Warnicke
>
> Signed-off-by: Yongseok Koh
> ---
Series applied to next-net-mlx, thanks.
Re: [dpdk-dev] [PATCH] net/mlx5: set RSS key len 0 to indicate default RSS
Hi Ophir,
To add on top of Koh's comment
Wednesday, October 3, 2018 9:56 PM, Yongseok Koh:
> Subject: Re: [PATCH] net/mlx5: set RSS key len 0 to indicate default RSS
> > On Oct 3, 2018, at 10:37 AM, Ophir Munk
> wrote:
> >
> > Applications which add an RSS flow must supply an RSS key table and an
> > RSS key length. If an application needs to add the default RSS flow it
> > should not care about the exact RSS default key table and its length.
> > By setting key length to 0 - the PMD will know that it should use the
> > default RSS key table and length.
Can you refer where in the rte_flow API this is documented? I couldn't find it
under struct rte_flow_action_rss definition.
I agree it is better for the PMD to behave this way, but this should be
explained in the API, so for this patch to be accepted we need also doc update
in rte_flow.h.
In my opinion, it is better for the key to be NULL to request from the PMD to
use the default key, similar to struct rte_eth_rss_conf.
> >
> > Signed-off-by: Ophir Munk
> > ---
> > drivers/net/mlx5/mlx5_flow.c | 7 ---
>
> Please rebase the code on top of the latest dpdk-next-net-mlx.
> Actually, it is better to rebase on top of PR#878.
>
> Thanks,
> Yongseok
>
> > 1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/net/mlx5/mlx5_flow.c
> > b/drivers/net/mlx5/mlx5_flow.c index 3f548a9..18eacf5 100644
> > --- a/drivers/net/mlx5/mlx5_flow.c
> > +++ b/drivers/net/mlx5/mlx5_flow.c
> > @@ -2062,7 +2062,8 @@ struct mlx5_flow_tunnel_info {
> >
> RTE_FLOW_ERROR_TYPE_ACTION_CONF,
> > &rss->level,
> > "tunnel RSS is not supported");
> > - if (rss->key_len < MLX5_RSS_HASH_KEY_LEN)
> > + /* key_len 0 means using default RSS key */
> > + if (rss->key_len > 0 && rss->key_len < MLX5_RSS_HASH_KEY_LEN)
> > return rte_flow_error_set(error, ENOTSUP,
> >
> RTE_FLOW_ERROR_TYPE_ACTION_CONF,
> > &rss->key_len,
> > @@ -2106,7 +2107,7 @@ struct mlx5_flow_tunnel_info {
> > memcpy((*flow->queue), rss->queue,
> >rss->queue_num * sizeof(uint16_t));
> > flow->rss.queue_num = rss->queue_num;
> > - memcpy(flow->key, rss->key, MLX5_RSS_HASH_KEY_LEN);
> > + memcpy(flow->key, rss->key, rss->key_len);
In Mellanox devices 40B of a key is a must. If you intended to copy 0 bytes, it
is better to do it in other ways.
> > flow->rss.types = rss->types;
> > flow->rss.level = rss->level;
> > flow->fate |= MLX5_FLOW_FATE_RSS;
> > @@ -2948,7 +2949,7 @@ struct mlx5_flow_tunnel_info {
> > flow->rss.queue_num);
> > if (!hrxq)
> > hrxq = mlx5_hrxq_new(dev, flow->key,
> > -
> MLX5_RSS_HASH_KEY_LEN,
> > +flow->rss.key_len,
> > verbs->hash_fields,
> > (*flow->queue),
> > flow->rss.queue_num,
> > --
> > 1.8.3.1
> >
Re: [dpdk-dev] [PATCH v2 1/4] add missing static keyword to globals
-Original Message- > Date: Fri, 5 Oct 2018 17:26:08 +0100 > From: Ferruh Yigit > To: Reshma Pattan , Hemant Agrawal > , Shreyansh Jain , Ashish > Gupta , Fiona Trahe , > Pablo de Lara , Akhil Goyal > , Declan Doherty , Fan > Zhang , Rahul Lakkireddy > , Gaetan Rivet , Qi > Zhang , Xiao Wang , Beilei > Xing , Wenzhuo Lu , > Konstantin Ananyev , Rasesh Mody > , Harish Patil , Shahed > Shaikh , Andrew Rybchenko > , Jasvinder Singh , > Cristian Dumitrescu , Keith Wiles > , Nipun Gupta , Anatoly > Burakov , Thomas Monjalon > , Jerin Jacob , > Olivier Matz > CC: dev@dpdk.org, Ferruh Yigit > Subject: [PATCH v2 1/4] add missing static keyword to globals > X-Mailer: git-send-email 2.17.1 > > External Email > > Some global variables can indeed be static, add static keyword to them. > > Signed-off-by: Ferruh Yigit > --- > Series is based on next-net tree > --- ./devtools/check-git-log.sh has following warning. Wrong headline format: add missing static keyword to globals Other than that: Acked-by: Jerin Jacob
Re: [dpdk-dev] [PATCH v2 3/4] fix global variable issues
-Original Message-
> Date: Fri, 5 Oct 2018 17:26:10 +0100
> From: Ferruh Yigit
> To: Reshma Pattan , Hemant Agrawal
> , Shreyansh Jain , Ashish
> Gupta , Fiona Trahe ,
> Pablo de Lara , Akhil Goyal
> , Declan Doherty , Fan
> Zhang , Rahul Lakkireddy
> , Gaetan Rivet , Qi
> Zhang , Xiao Wang , Beilei
> Xing , Wenzhuo Lu ,
> Konstantin Ananyev , Rasesh Mody
> , Harish Patil , Shahed
> Shaikh , Andrew Rybchenko
> , Jasvinder Singh ,
> Cristian Dumitrescu , Keith Wiles
> , Nipun Gupta , Anatoly
> Burakov , Thomas Monjalon
> , Jerin Jacob ,
> Olivier Matz , John Daley ,
> Hyong Youb Kim , Nikhil Rao
> CC: dev@dpdk.org, Ferruh Yigit , sta...@dpdk.org
> Subject: [PATCH v2 3/4] fix global variable issues
> X-Mailer: git-send-email 2.17.1
>
>
> Various fixes related to the global variable usage.
>
> Fixes: 43e610bb8565 ("compress/octeontx: introduce octeontx zip PMD")
> Fixes: c378f084d6e3 ("compress/octeontx: add device setup ops")
> Fixes: b43ebc65aada ("compress/octeontx: create private xform")
> Fixes: b1ce8ebd97ba ("eventdev: add PMD callbacks for eth Rx adapter")
> Fixes: 3810ae435783 ("eventdev: add interrupt driven queues to Rx adapter")
> Fixes: fefed3d1e62c ("enic: new driver")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Ferruh Yigit
> Reviewed-by: Nikhil Rao
./devtools/check-git-log.sh has following warning.
Wrong headline format:
fix global variable issues
Other than that:
Acked-by: Jerin Jacob
Re: [dpdk-dev] [PATCH v2 4/4] lib: reduce global variable usage
-Original Message- > Date: Fri, 5 Oct 2018 17:26:11 +0100 > From: Ferruh Yigit > To: Reshma Pattan , Hemant Agrawal > , Shreyansh Jain , Ashish > Gupta , Fiona Trahe , > Pablo de Lara , Akhil Goyal > , Declan Doherty , Fan > Zhang , Rahul Lakkireddy > , Gaetan Rivet , Qi > Zhang , Xiao Wang , Beilei > Xing , Wenzhuo Lu , > Konstantin Ananyev , Rasesh Mody > , Harish Patil , Shahed > Shaikh , Andrew Rybchenko > , Jasvinder Singh , > Cristian Dumitrescu , Keith Wiles > , Nipun Gupta , Anatoly > Burakov , Thomas Monjalon > , Jerin Jacob , > Olivier Matz , Ashish Gupta > > CC: dev@dpdk.org, Ferruh Yigit > Subject: [PATCH v2 4/4] lib: reduce global variable usage > X-Mailer: git-send-email 2.17.1 > > > Some global variables can be eliminated, since they are not part of > public interface, it is free to remove them. > > Signed-off-by: Ferruh Yigit > --- Acked-by: Jerin Jacob
[dpdk-dev] [PATCH v3 0/3] ethdev: add generic L2/L3 tunnel encapsulation actions
This series implement the generic L2/L3 tunnel encapsulation actions and is based on rfc [1] "add generic L2/L3 tunnel encapsulation actions" Currenlty the encap/decap actions only support encapsulation of VXLAN and NVGRE L2 packets (L2 encapsulation is where the inner packet has a valid Ethernet header, while L3 encapsulation is where the inner packet doesn't have the Ethernet header). In addtion the parameter to to the encap action is a list of rte items, this results in 2 extra translation, between the application to the action and from the action to the NIC. This results in negetive impact on the insertion performance. Looking forward there are going to be a need to support many more tunnel encapsulations. For example MPLSoGRE, MPLSoUDP. Adding the new encapsulation will result in duplication of code. For example the code for handling NVGRE and VXLAN are exactly the same, and each new tunnel will have the same exact structure. This series introduce a generic encapsulation for L2 tunnel types, and generic encapsulation for L3 tunnel types. In addtion the new encapsulations commands are using raw buffer inorder to save the converstion time, both for the application and the PMD. [1]https://mails.dpdk.org/archives/dev/2018-August/109944.html v3: * rebase on tip. v2: * add missing decap_l3 structure. * fix typo. Ori Kam (3): ethdev: add generic L2/L3 tunnel encapsulation actions app/testpmd: convert testpmd encap commands to new API ethdev: remove vxlan and nvgre encapsulation commands app/test-pmd/cmdline_flow.c| 292 + app/test-pmd/config.c | 2 - doc/guides/prog_guide/rte_flow.rst | 115 ++- lib/librte_ethdev/rte_flow.c | 44 +- lib/librte_ethdev/rte_flow.h | 108 ++ 5 files changed, 231 insertions(+), 330 deletions(-) -- 1.8.3.1
[dpdk-dev] [PATCH v3 1/3] ethdev: add generic L2/L3 tunnel encapsulation actions
Currenlty the encap/decap actions only support encapsulation of VXLAN and NVGRE L2 packets (L2 encapsulation is where the inner packet has a valid Ethernet header, while L3 encapsulation is where the inner packet doesn't have the Ethernet header). In addtion the parameter to to the encap action is a list of rte items, this results in 2 extra translation, between the application to the action and from the action to the NIC. This results in negetive impact on the insertion performance. Looking forward there are going to be a need to support many more tunnel encapsulations. For example MPLSoGRE, MPLSoUDP. Adding the new encapsulation will result in duplication of code. For example the code for handling NVGRE and VXLAN are exactly the same, and each new tunnel will have the same exact structure. This patch introduce a generic encapsulation for L2 tunnel types, and generic encapsulation for L3 tunnel types. In addtion the new encapsulations commands are using raw buffer inorder to save the converstion time, both for the application and the PMD. Signed-off-by: Ori Kam --- doc/guides/prog_guide/rte_flow.rst | 82 ++ lib/librte_ethdev/rte_flow.c | 7 lib/librte_ethdev/rte_flow.h | 79 3 files changed, 168 insertions(+) diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 1b17f6e..497afc2 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -2076,6 +2076,88 @@ RTE_FLOW_ERROR_TYPE_ACTION error should be returned. This action modifies the payload of matched flows. +Action: ``TUNNEL_ENCAP`` + + +Performs a tunnel encapsulation action by encapsulating the matched flow with +a tunnel header as defined in the``rte_flow_action_tunnel_encap``. + +This action modifies the payload of matched flows. The flow definition specified +in the ``rte_flow_action_tunnel_encap`` action structure must define a valid +tunnel packet overlay. + +.. _table_rte_flow_action_tunnel_encap: + +.. table:: TUNNEL_ENCAP + + ++-+ + | Field | Value | + ++=+ + | ``buf``| Tunnel end-point overlay definition | + ++-+ + | ``size`` | The size of the buffer in bytes | + ++-+ + +Action: ``TUNNEL_DECAP`` + + +Performs a decapsulation action by stripping all headers of the tunnel +network overlay from the matched flow. + +The flow items pattern defined for the flow rule with which a ``TUNNEL_DECAP`` +action is specified, must define a valid tunnel. If the +flow pattern does not specify a valid tunnel then a +RTE_FLOW_ERROR_TYPE_ACTION error should be returned. + +This action modifies the payload of matched flows. + +Action: ``TUNNEL_ENCAP_L3`` +^^^ + +Replace the packet layer 2 header with the encapsulation tunnel header +as defined in the ``rte_flow_action_tunnel_encap_l3``. + +This action modifies the payload of matched flows. The flow definition specified +in the ``rte_flow_action_tunnel_encap_l3`` action structure must define a valid +tunnel packet overlay. + +.. _table_rte_flow_action_tunnel_encap_l3: + +.. table:: TUNNEL_ENCAP_L3 + + ++-+ + | Field | Value | + ++=+ + | ``buf``| Tunnel end-point overlay definition | + ++-+ + | ``size`` | The size of the buffer in bytes | + ++-+ + +Action: ``TUNNEL_DECAP_L3`` +^^^ + +Replace the packet tunnel network overlay from the matched flow with +layer 2 header as defined by ``rte_flow_action_tunnel_decap_l3``. + +The flow items pattern defined for the flow rule with which a ``TUNNEL_DECAP_L3`` +action is specified, must define a valid tunnel. If the +flow pattern does not specify a valid tunnel then a +RTE_FLOW_ERROR_TYPE_ACTION error should be returned. + +This action modifies the payload of matched flows. + +.. _table_rte_flow_action_tunnel_decap_l3: + +.. table:: TUNNEL_DECAP_L3 + + ++-+ + | Field | Value | + ++=+ + | ``buf``| Layer 2 definition | + ++-+ + | ``size`` | The size of the buffer in bytes | + ++-+ + Negative types ~~ diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_et
[dpdk-dev] [PATCH v3 2/3] app/testpmd: convert testpmd encap commands to new API
Currently there are 2 encapsulation commands in testpmd one for VXLAN
and one for NVGRE, both of those commands are using the old rte encap
command.
This commit update the commands to work with the new tunnel encap
actions.
The reason that we have different encapsulation commands, one for VXLAN
and one for NVGRE is the ease of use in testpmd, both commands are using
the same rte flow action for tunnel encap.
Signed-off-by: Ori Kam
---
app/test-pmd/cmdline_flow.c | 292 +---
app/test-pmd/config.c | 2 -
2 files changed, 137 insertions(+), 157 deletions(-)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index f926060..c9dba79 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -262,37 +262,13 @@ struct action_rss_data {
uint16_t queue[ACTION_RSS_QUEUE_NUM];
};
-/** Maximum number of items in struct rte_flow_action_vxlan_encap. */
-#define ACTION_VXLAN_ENCAP_ITEMS_NUM 6
-
-/** Storage for struct rte_flow_action_vxlan_encap including external data. */
-struct action_vxlan_encap_data {
- struct rte_flow_action_vxlan_encap conf;
- struct rte_flow_item items[ACTION_VXLAN_ENCAP_ITEMS_NUM];
- struct rte_flow_item_eth item_eth;
- struct rte_flow_item_vlan item_vlan;
- union {
- struct rte_flow_item_ipv4 item_ipv4;
- struct rte_flow_item_ipv6 item_ipv6;
- };
- struct rte_flow_item_udp item_udp;
- struct rte_flow_item_vxlan item_vxlan;
-};
+/** Maximum buffer size for the encap data. */
+#define ACTION_TUNNEL_ENCAP_MAX_BUFFER_SIZE 64
-/** Maximum number of items in struct rte_flow_action_nvgre_encap. */
-#define ACTION_NVGRE_ENCAP_ITEMS_NUM 5
-
-/** Storage for struct rte_flow_action_nvgre_encap including external data. */
-struct action_nvgre_encap_data {
- struct rte_flow_action_nvgre_encap conf;
- struct rte_flow_item items[ACTION_NVGRE_ENCAP_ITEMS_NUM];
- struct rte_flow_item_eth item_eth;
- struct rte_flow_item_vlan item_vlan;
- union {
- struct rte_flow_item_ipv4 item_ipv4;
- struct rte_flow_item_ipv6 item_ipv6;
- };
- struct rte_flow_item_nvgre item_nvgre;
+/** Storage for struct rte_flow_action_tunnel_encap including external data. */
+struct action_tunnel_encap_data {
+ struct rte_flow_action_tunnel_encap conf;
+ uint8_t buf[ACTION_TUNNEL_ENCAP_MAX_BUFFER_SIZE];
};
/** Maximum number of subsequent tokens and arguments on the stack. */
@@ -2438,8 +2414,8 @@ static int comp_vc_action_rss_queue(struct context *,
const struct token *,
.name = "vxlan_encap",
.help = "VXLAN encapsulation, uses configuration set by \"set"
" vxlan\"",
- .priv = PRIV_ACTION(VXLAN_ENCAP,
- sizeof(struct action_vxlan_encap_data)),
+ .priv = PRIV_ACTION(TUNNEL_ENCAP,
+ sizeof(struct action_tunnel_encap_data)),
.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
.call = parse_vc_action_vxlan_encap,
},
@@ -2448,7 +2424,7 @@ static int comp_vc_action_rss_queue(struct context *,
const struct token *,
.help = "Performs a decapsulation action by stripping all"
" headers of the VXLAN tunnel network overlay from the"
" matched flow.",
- .priv = PRIV_ACTION(VXLAN_DECAP, 0),
+ .priv = PRIV_ACTION(TUNNEL_DECAP, 0),
.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
.call = parse_vc,
},
@@ -2456,8 +2432,8 @@ static int comp_vc_action_rss_queue(struct context *,
const struct token *,
.name = "nvgre_encap",
.help = "NVGRE encapsulation, uses configuration set by \"set"
" nvgre\"",
- .priv = PRIV_ACTION(NVGRE_ENCAP,
- sizeof(struct action_nvgre_encap_data)),
+ .priv = PRIV_ACTION(TUNNEL_ENCAP,
+ sizeof(struct action_tunnel_encap_data)),
.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
.call = parse_vc_action_nvgre_encap,
},
@@ -2466,7 +2442,7 @@ static int comp_vc_action_rss_queue(struct context *,
const struct token *,
.help = "Performs a decapsulation action by stripping all"
" headers of the NVGRE tunnel network overlay from the"
" matched flow.",
- .priv = PRIV_ACTION(NVGRE_DECAP, 0),
+ .priv = PRIV_ACTION(TUNNEL_DECAP, 0),
.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
.call = parse_vc,
},
@@ -3034,6 +3010,9 @@ static int comp_vc_action_rss_queue(struct context *,
const struct token *,
return len;
}
+/** IP next protocol UDP. */
+#define IP_PROTO_UDP 0x11
+
/** Par
[dpdk-dev] [PATCH v3 3/3] ethdev: remove vxlan and nvgre encapsulation commands
This patch removes the VXLAN and NVGRE encapsulation commands.
Those commands are subset of the TUNNEL_ENCAP command so there is no
need to keep both versions.
Signed-off-by: Ori Kam
Acked-by: Mohammad Abdul Awal
---
doc/guides/prog_guide/rte_flow.rst | 107 -
lib/librte_ethdev/rte_flow.c | 37 -
lib/librte_ethdev/rte_flow.h | 103 ---
3 files changed, 247 deletions(-)
diff --git a/doc/guides/prog_guide/rte_flow.rst
b/doc/guides/prog_guide/rte_flow.rst
index 497afc2..126e5d3 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1969,113 +1969,6 @@ Implements ``OFPAT_PUSH_MPLS`` ("push a new MPLS tag")
as defined by the
| ``ethertype`` | EtherType |
+---+---+
-Action: ``VXLAN_ENCAP``
-^^^
-
-Performs a VXLAN encapsulation action by encapsulating the matched flow in the
-VXLAN tunnel as defined in the``rte_flow_action_vxlan_encap`` flow items
-definition.
-
-This action modifies the payload of matched flows. The flow definition
specified
-in the ``rte_flow_action_tunnel_encap`` action structure must define a valid
-VLXAN network overlay which conforms with RFC 7348 (Virtual eXtensible Local
-Area Network (VXLAN): A Framework for Overlaying Virtualized Layer 2 Networks
-over Layer 3 Networks). The pattern must be terminated with the
-RTE_FLOW_ITEM_TYPE_END item type.
-
-.. _table_rte_flow_action_vxlan_encap:
-
-.. table:: VXLAN_ENCAP
-
- ++-+
- | Field | Value |
- ++=+
- | ``definition`` | Tunnel end-point overlay definition |
- ++-+
-
-.. _table_rte_flow_action_vxlan_encap_example:
-
-.. table:: IPv4 VxLAN flow pattern example.
-
- +---+--+
- | Index | Item |
- +===+==+
- | 0 | Ethernet |
- +---+--+
- | 1 | IPv4 |
- +---+--+
- | 2 | UDP |
- +---+--+
- | 3 | VXLAN|
- +---+--+
- | 4 | END |
- +---+--+
-
-Action: ``VXLAN_DECAP``
-^^^
-
-Performs a decapsulation action by stripping all headers of the VXLAN tunnel
-network overlay from the matched flow.
-
-The flow items pattern defined for the flow rule with which a ``VXLAN_DECAP``
-action is specified, must define a valid VXLAN tunnel as per RFC7348. If the
-flow pattern does not specify a valid VXLAN tunnel then a
-RTE_FLOW_ERROR_TYPE_ACTION error should be returned.
-
-This action modifies the payload of matched flows.
-
-Action: ``NVGRE_ENCAP``
-^^^
-
-Performs a NVGRE encapsulation action by encapsulating the matched flow in the
-NVGRE tunnel as defined in the``rte_flow_action_tunnel_encap`` flow item
-definition.
-
-This action modifies the payload of matched flows. The flow definition
specified
-in the ``rte_flow_action_tunnel_encap`` action structure must defined a valid
-NVGRE network overlay which conforms with RFC 7637 (NVGRE: Network
-Virtualization Using Generic Routing Encapsulation). The pattern must be
-terminated with the RTE_FLOW_ITEM_TYPE_END item type.
-
-.. _table_rte_flow_action_nvgre_encap:
-
-.. table:: NVGRE_ENCAP
-
- ++-+
- | Field | Value |
- ++=+
- | ``definition`` | NVGRE end-point overlay definition |
- ++-+
-
-.. _table_rte_flow_action_nvgre_encap_example:
-
-.. table:: IPv4 NVGRE flow pattern example.
-
- +---+--+
- | Index | Item |
- +===+==+
- | 0 | Ethernet |
- +---+--+
- | 1 | IPv4 |
- +---+--+
- | 2 | NVGRE|
- +---+--+
- | 3 | END |
- +---+--+
-
-Action: ``NVGRE_DECAP``
-^^^
-
-Performs a decapsulation action by stripping all headers of the NVGRE tunnel
-network overlay from the matched flow.
-
-The flow items pattern defined for the flow rule with which a ``NVGRE_DECAP``
-action is specified, must define a valid NVGRE tunnel as per RFC7637. If the
-flow pattern does not specify a valid NVGRE tunnel then a
-RTE_FLOW_ERROR_TYPE_ACTION error should be returned.
-
-This action modifies the payload of matched flows.
-
Action: ``TUNNEL_ENCAP``
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
index 4b548b8..8a2e074 100644
--- a/lib/librte_ethdev/rte_flow.c
+++ b/lib/librte_ethdev/rte_flow.c
@@ -119,10 +119,6 @@ struct rte_flow_desc_data {
sizeof(struct rte_flow_action_of_pop_mpls)),
MK_FLOW_ACTION(OF_PUSH_MPLS,
[dpdk-dev] [PATCH v2] net/mlx5: allow flow rule with attribute egress
This patch complements [1], adding to MLX5 PMD the option to set
flow rule for egress traffic.
[1] "net/mlx5: support metadata as flow rule criteria"
http://mails.dpdk.org/archives/dev/2018-September/113275.html
Signed-off-by: Dekel Peled
---
V2:
* Rebase on tip.
* Apply code review comments.
---
drivers/net/mlx5/mlx5_flow.c | 48 ++
drivers/net/mlx5/mlx5_flow.h | 6 +
drivers/net/mlx5/mlx5_flow_dv.c| 36 ++--
drivers/net/mlx5/mlx5_flow_verbs.c | 7 +-
4 files changed, 78 insertions(+), 19 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 6e4a651..1087f67 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -645,6 +645,8 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev,
int32_t priority,
*
* @param[in] action_flags
* Bit-fields that holds the actions detected until now.
+ * @param[in] attr
+ * Attributes of flow that includes this action.
* @param[out] error
* Pointer to error structure.
*
@@ -653,6 +655,7 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev,
int32_t priority,
*/
int
mlx5_flow_validate_action_flag(uint64_t action_flags,
+ const struct rte_flow_attr *attr,
struct rte_flow_error *error)
{
@@ -669,6 +672,11 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
"can't have 2 flag"
" actions in same flow");
+ if (attr->egress)
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, NULL,
+ "flag action not supported for "
+ "egress");
return 0;
}
@@ -679,6 +687,8 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev,
int32_t priority,
* Pointer to the queue action.
* @param[in] action_flags
* Bit-fields that holds the actions detected until now.
+ * @param[in] attr
+ * Attributes of flow that includes this action.
* @param[out] error
* Pointer to error structure.
*
@@ -688,6 +698,7 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev,
int32_t priority,
int
mlx5_flow_validate_action_mark(const struct rte_flow_action *action,
uint64_t action_flags,
+ const struct rte_flow_attr *attr,
struct rte_flow_error *error)
{
const struct rte_flow_action_mark *mark = action->conf;
@@ -716,6 +727,11 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
"can't have 2 mark actions in same"
" flow");
+ if (attr->egress)
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, NULL,
+ "mark action not supported for "
+ "egress");
return 0;
}
@@ -724,6 +740,8 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev,
int32_t priority,
*
* @param[in] action_flags
* Bit-fields that holds the actions detected until now.
+ * @param[in] attr
+ * Attributes of flow that includes this action.
* @param[out] error
* Pointer to error structure.
*
@@ -732,6 +750,7 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev,
int32_t priority,
*/
int
mlx5_flow_validate_action_drop(uint64_t action_flags,
+ const struct rte_flow_attr *attr,
struct rte_flow_error *error)
{
if (action_flags & MLX5_FLOW_ACTION_FLAG)
@@ -747,6 +766,11 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
"can't have 2 fate actions in"
" same flow");
+ if (attr->egress)
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, NULL,
+ "drop action not supported for "
+ "egress");
return 0;
}
@@ -759,6 +783,8 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev,
int32_t priority,
* 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.
[dpdk-dev] [PATCH v2 1/4] net/mlx5: add flow action functions to glue
This patch adds glue functions for operations:
- Create packet reformat (encap/decap) flow action.
- Destroy flow action.
Signed-off-by: Dekel Peled
---
drivers/net/mlx5/mlx5_glue.c | 33 +
drivers/net/mlx5/mlx5_glue.h | 9 +
2 files changed, 42 insertions(+)
diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c
index 48590df..caa4c34 100644
--- a/drivers/net/mlx5/mlx5_glue.c
+++ b/drivers/net/mlx5/mlx5_glue.c
@@ -174,6 +174,12 @@
return ibv_destroy_flow(flow_id);
}
+static int
+mlx5_glue_destroy_flow_action(struct ibv_flow_action *action)
+{
+ return ibv_destroy_flow_action(action);
+}
+
static struct ibv_qp *
mlx5_glue_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr)
{
@@ -388,6 +394,30 @@
#endif
}
+static struct ibv_flow_action *
+mlx5_glue_dv_create_flow_action_packet_reformat
+ (struct ibv_context *ctx,
+size_t data_sz,
+void *data,
+enum mlx5dv_flow_action_packet_reformat_type reformat_type,
+enum mlx5dv_flow_table_type ft_type)
+{
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+ return mlx5dv_create_flow_action_packet_reformat(ctx,
+data_sz,
+data,
+reformat_type,
+ft_type);
+#else
+ (void)ctx;
+ (void)data_sz;
+ (void)data;
+ (void)reformat_type;
+ (void)ft_type;
+ return NULL;
+#endif
+}
+
alignas(RTE_CACHE_LINE_SIZE)
const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue){
.version = MLX5_GLUE_VERSION,
@@ -414,6 +444,7 @@
.modify_wq = mlx5_glue_modify_wq,
.create_flow = mlx5_glue_create_flow,
.destroy_flow = mlx5_glue_destroy_flow,
+ .destroy_flow_action = mlx5_glue_destroy_flow_action,
.create_qp = mlx5_glue_create_qp,
.create_qp_ex = mlx5_glue_create_qp_ex,
.destroy_qp = mlx5_glue_destroy_qp,
@@ -437,4 +468,6 @@
.dv_create_flow_matcher = mlx5_glue_dv_create_flow_matcher,
.dv_destroy_flow_matcher = mlx5_glue_dv_destroy_flow_matcher,
.dv_create_flow = mlx5_glue_dv_create_flow,
+ .dv_create_flow_action_packet_reformat =
+ mlx5_glue_dv_create_flow_action_packet_reformat,
};
diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h
index f6e4e38..8ef4fcc 100644
--- a/drivers/net/mlx5/mlx5_glue.h
+++ b/drivers/net/mlx5/mlx5_glue.h
@@ -44,6 +44,8 @@
struct mlx5dv_flow_matcher_attr;
struct mlx5dv_flow_action_attr;
struct mlx5dv_flow_match_parameters;
+enum mlx5dv_flow_action_packet_reformat_type;
+enum mlx5dv_flow_table_type;
#endif
/* LIB_GLUE_VERSION must be updated every time this structure is modified. */
@@ -85,6 +87,7 @@ struct mlx5_glue {
struct ibv_flow *(*create_flow)(struct ibv_qp *qp,
struct ibv_flow_attr *flow);
int (*destroy_flow)(struct ibv_flow *flow_id);
+ int (*destroy_flow_action)(struct ibv_flow_action *action);
struct ibv_qp *(*create_qp)(struct ibv_pd *pd,
struct ibv_qp_init_attr *qp_init_attr);
struct ibv_qp *(*create_qp_ex)
@@ -137,6 +140,12 @@ struct mlx5_glue {
struct mlx5dv_flow_match_parameters *match_value,
size_t num_actions,
struct mlx5dv_flow_action_attr *actions_attr);
+ struct ibv_flow_action *(*dv_create_flow_action_packet_reformat)
+ (struct ibv_context *ctx,
+size_t data_sz,
+void *data,
+enum mlx5dv_flow_action_packet_reformat_type reformat_type,
+enum mlx5dv_flow_table_type ft_type);
};
const struct mlx5_glue *mlx5_glue;
--
1.8.3.1
[dpdk-dev] [PATCH v2 2/4] net/mlx5: add Direct Verbs encap and decap defs
This patch adds the required definitions for DV encap/decap actions.
It also adds usage of the new actions definition in validation
function of existing drop operation.
Signed-off-by: Dekel Peled
---
drivers/net/mlx5/mlx5_flow.c | 8
drivers/net/mlx5/mlx5_flow.h | 6 ++
2 files changed, 14 insertions(+)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 1087f67..b452e11 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -766,6 +766,14 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
"can't have 2 fate actions in"
" same flow");
+ if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_DECAP |
+ MLX5_FLOW_ACTION_TUNNEL_DECAP_L3 |
+ MLX5_FLOW_ACTION_TUNNEL_ENCAP |
+ MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+ "can't encap or decap and drop in"
+ " same flow");
if (attr->egress)
return rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, NULL,
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 690c597..01c73a2 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -82,6 +82,10 @@
#define MLX5_FLOW_ACTION_OF_SET_VLAN_VID (1u << 9)
#define MLX5_FLOW_ACTION_OF_SET_VLAN_PCP (1u << 10)
#define MLX5_FLOW_ACTION_JUMP (1u << 11)
+#define MLX5_FLOW_ACTION_TUNNEL_ENCAP (1u << 12)
+#define MLX5_FLOW_ACTION_TUNNEL_DECAP (1u << 13)
+#define MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3 (1u << 14)
+#define MLX5_FLOW_ACTION_TUNNEL_DECAP_L3 (1u << 15)
#define MLX5_FLOW_FATE_ACTIONS \
(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | MLX5_FLOW_ACTION_RSS)
@@ -172,6 +176,8 @@ struct mlx5_flow_dv {
#ifdef HAVE_IBV_FLOW_DV_SUPPORT
struct mlx5dv_flow_action_attr actions[MLX5_DV_MAX_NUMBER_OF_ACTIONS];
/**< Action list. */
+ struct ibv_flow_action *encap_verb; /**< Verbs object of encap. */
+ struct ibv_flow_action *decap_verb; /**< Verbs object of decap. */
#endif
int actions_n; /**< number of actions. */
};
--
1.8.3.1
[dpdk-dev] [PATCH v2 4/4] net/mlx5: add L2 and L3 decap to Direct Verbs flow
This patch adds support for Direct Verbs decap operations, L2 and L3.
Signed-off-by: Dekel Peled
Conflicts:
drivers/net/mlx5/mlx5_flow_dv.c
---
drivers/net/mlx5/mlx5_flow_dv.c | 224 +++-
1 file changed, 219 insertions(+), 5 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 221c76a..5b44f5b 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -120,11 +120,18 @@
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
"can't have 2 encap actions in same"
" flow");
+ if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_DECAP |
+ MLX5_FLOW_ACTION_TUNNEL_DECAP_L3))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+ "can't encap and decap in same"
+ " flow");
if (attr->ingress)
return rte_flow_error_set(error, ENOTSUP,
- RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, NULL,
- "encap action not supported for "
- "ingress");
+ RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
+ NULL,
+ "encap action not supported for "
+ "ingress");
return 0;
}
@@ -166,6 +173,12 @@
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
"can't have 2 encap actions in same"
" flow");
+ if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_DECAP |
+ MLX5_FLOW_ACTION_TUNNEL_DECAP_L3))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+ "can't encap and decap in same"
+ " flow");
if (attr->ingress)
return rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
@@ -176,6 +189,100 @@
}
/**
+ * Validate the tunnel decap action
+ *
+ * @param[in] action_flags
+ * holds the actions detected until now.
+ * @param[in] attr
+ * Pointer to flow attributes
+ * @param[out] error
+ * Pointer to error structure.
+ *
+ * @return
+ * 0 on success, a negative errno value otherwise and rte_ernno is set.
+ */
+static int
+flow_dv_validate_action_tunnel_decap(uint64_t action_flags,
+const struct rte_flow_attr *attr,
+struct rte_flow_error *error)
+{
+ if (action_flags & MLX5_FLOW_ACTION_DROP)
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+ "can't drop and decap in same flow");
+ if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_DECAP |
+ MLX5_FLOW_ACTION_TUNNEL_DECAP_L3))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+ "can't have 2 decap actions in same"
+ " flow");
+ if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_ENCAP |
+ MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+ "can't encap and decap in same"
+ " flow");
+ if (attr->egress)
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, NULL,
+ "decap action not supported for "
+ "egress");
+ return 0;
+}
+
+/**
+ * Validate the tunnel decap L3 action
+ *
+ * @param[in] action_flags
+ * holds the actions detected until now.
+ * @param[in] action
+ * Pointer to the decap action.
+ * @param[in] attr
+ * Pointer to flow attributes
+ * @param[out] error
+ * Pointer to error structure.
+ *
+ * @return
+ * 0 on success, a negative errno value otherwise and rte_ernno is set.
+ */
+static int
+flow_dv_validate_action_tunnel_decap_l3(uint64_t action_flags,
+ const struct rte_flow_action *action,
+ const struct rte_flow_attr *attr,
+ struct rte_fl
[dpdk-dev] [PATCH v2 3/4] net/mlx5: add L2 and L3 encap to Direct Verbs flow
This patch adds support for Direct Verbs encap operations, L2 and L3.
Signed-off-by: Dekel Peled
---
drivers/net/mlx5/mlx5_flow_dv.c | 226 +++-
1 file changed, 222 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 80e7b24..221c76a 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -84,6 +84,167 @@
}
/**
+ * Validate the tunnel encap action.
+ *
+ * @param[in] action_flags
+ * holds the actions detected until now.
+ * @param[in] action
+ * Pointer to the encap action.
+ * @param[in] attr
+ * Pointer to flow attributes
+ * @param[out] error
+ * Pointer to error structure.
+ *
+ * @return
+ * 0 on success, a negative errno value otherwise and rte_ernno is set.
+ */
+static int
+flow_dv_validate_action_tunnel_encap(uint64_t action_flags,
+const struct rte_flow_action *action,
+const struct rte_flow_attr *attr,
+struct rte_flow_error *error)
+{
+ const struct rte_flow_action_tunnel_encap *tunnel_encap = action->conf;
+
+ if (!tunnel_encap || !(tunnel_encap->buf))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
+ "configuration cannot be null");
+ if (action_flags & MLX5_FLOW_ACTION_DROP)
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+ "can't drop and encap in same flow");
+ if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_ENCAP |
+ MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+ "can't have 2 encap actions in same"
+ " flow");
+ if (attr->ingress)
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, NULL,
+ "encap action not supported for "
+ "ingress");
+ return 0;
+}
+
+/**
+ * Validate the tunnel encap L3 action
+ *
+ * @param[in] action_flags
+ * holds the actions detected until now.
+ * @param[in] action
+ * Pointer to the encap action.
+ * @param[in] attr
+ * Pointer to flow attributes
+ * @param[out] error
+ * Pointer to error structure.
+ *
+ * @return
+ * 0 on success, a negative errno value otherwise and rte_ernno is set.
+ */
+static int
+flow_dv_validate_action_tunnel_encap_l3(uint64_t action_flags,
+ const struct rte_flow_action *action,
+ const struct rte_flow_attr *attr,
+ struct rte_flow_error *error)
+{
+ const struct rte_flow_action_tunnel_encap_l3 *tunnel_encap_l3 =
+ action->conf;
+
+ if (!tunnel_encap_l3 || !(tunnel_encap_l3->buf))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
+ "configuration cannot be null");
+ if (action_flags & MLX5_FLOW_ACTION_DROP)
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+ "can't drop and encap in same flow");
+ if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_ENCAP |
+ MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+ "can't have 2 encap actions in same"
+ " flow");
+ if (attr->ingress)
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
+ NULL,
+ "encap action not supported for "
+ "ingress");
+ return 0;
+}
+
+/**
+ * Convert encap action to DV specification.
+ *
+ * @param[in] action
+ * Pointer to action structure.
+ * @param[in] dev
+ * Pointer to rte_eth_dev structure.
+ * @param[out] error
+ * Pointer to the error structure.
+ *
+ * @return
+ * Pointer to action on success, NULL otherwise and rte_errno is set.
+ */
+static struct ibv_flow_action *
+flow_dv_create_encap(const struct rte_flow_action *action,
+struct rte_eth_dev *dev,
+struct rte_flow_e
[dpdk-dev] [PATCH v2 0/4] add support of Direct Verbs encap and decap actions
This series adds support of encap and decap actions in DV format. It is using the generic encapsulation framework from [1]. Note that encap action is relevant for egress only. Hence this series should be merged on top of [2]. [1] "ethdev: add generic L2/L3 tunnel encapsulation actions" http://mails.dpdk.org/archives/dev/2018-October/114654.html [2] "net/mlx5: allow flow rule with attribute egress" http://mails.dpdk.org/archives/dev/2018-October/114658.html --- V2: * Rebase on tip. * Apply code review comments. --- Dekel Peled (4): net/mlx5: add flow action functions to glue net/mlx5: add Direct Verbs encap and decap defs net/mlx5: add L2 and L3 encap to Direct Verbs flow net/mlx5: add L2 and L3 decap to Direct Verbs flow drivers/net/mlx5/mlx5_flow.c| 8 + drivers/net/mlx5/mlx5_flow.h| 6 + drivers/net/mlx5/mlx5_flow_dv.c | 440 +++- drivers/net/mlx5/mlx5_glue.c| 33 +++ drivers/net/mlx5/mlx5_glue.h| 9 + 5 files changed, 492 insertions(+), 4 deletions(-) -- 1.8.3.1
[dpdk-dev] [PATCH v2 0/3] app/testpmd: add l3 encap/decap cmd
Currently testpmd have support only for encapsulation and decapsulation for L2 tunnels. This series adds commands for L3 tunnels types, L3 tunnel is a tunnel that the inner packet is missing the L2 part. The encapsulation uses the encap_l3 command in-order to remove the inner l2. For decapsulation since the inner packet is missing the L2 there is a need to supply it to the NIC using the decap_l3. The tunnels are are implemented are: MPLSoGRE and MPLSoUDP while the decap can be used for all L3 tunnels. This series is based on add generic L2/L3 tunnel encapsulation actions [1] [1] https://mails.dpdk.org/archives/dev/2018-September/111781.html v2: * rebase on tip. Ori Kam (3): app/testpmd: add MPLSoUDP encapsulation app/testpmd: add MPLSoGRE encapsulation app/testpmd: add decap l3 command app/test-pmd/cmdline.c | 434 app/test-pmd/cmdline_flow.c | 316 app/test-pmd/testpmd.h | 42 +++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 131 + 4 files changed, 923 insertions(+) -- 1.8.3.1
[dpdk-dev] [PATCH v2 1/3] app/testpmd: add MPLSoUDP encapsulation
MPLSoUDP is an example for L3 tunnel encapsulation.
Due to the complex encapsulation of MPLSoUDP flow action and based on the
fact testpmd does not allocate memory, this patch adds a new command in
testpmd to initialise a global structure containing the necessary
information to make the outer layer of the packet. This same global
structure will then be used by the flow command line in testpmd when the
action mplsoudp_encap will be parsed, at this point, the conversion into
such action becomes trivial.
This global structure is only used for the encap action.
Signed-off-by: Ori Kam
---
app/test-pmd/cmdline.c | 175
app/test-pmd/cmdline_flow.c | 122 +++
app/test-pmd/testpmd.h | 17 +++
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 50
4 files changed, 364 insertions(+)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 3376a66..492dc5d 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -15274,6 +15274,179 @@ static void cmd_set_nvgre_parsed(void *parsed_result,
},
};
+/** Set MPLSoUDP encapsulation details */
+struct cmd_set_mplsoudp_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t mplsoudp;
+ cmdline_fixed_string_t pos_token;
+ cmdline_fixed_string_t ip_version;
+ uint32_t vlan_present:1;
+ uint32_t label;
+ uint16_t udp_src;
+ uint16_t udp_dst;
+ cmdline_ipaddr_t ip_src;
+ cmdline_ipaddr_t ip_dst;
+ uint16_t tci;
+ struct ether_addr eth_src;
+ struct ether_addr eth_dst;
+};
+
+cmdline_parse_token_string_t cmd_set_mplsoudp_set =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, set, "set");
+cmdline_parse_token_string_t cmd_set_mplsoudp_mplsoudp =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, mplsoudp,
"mplsoudp");
+cmdline_parse_token_string_t cmd_set_mplsoudp_mplsoudp_with_vlan =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, mplsoudp,
+"mplsoudp-with-vlan");
+cmdline_parse_token_string_t cmd_set_mplsoudp_ip_version =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+"ip-version");
+cmdline_parse_token_string_t cmd_set_mplsoudp_ip_version_value =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, ip_version,
+"ipv4#ipv6");
+cmdline_parse_token_string_t cmd_set_mplsoudp_label =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+"label");
+cmdline_parse_token_num_t cmd_set_mplsoudp_label_value =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_result, label, UINT32);
+cmdline_parse_token_string_t cmd_set_mplsoudp_udp_src =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+"udp-src");
+cmdline_parse_token_num_t cmd_set_mplsoudp_udp_src_value =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_result, udp_src, UINT16);
+cmdline_parse_token_string_t cmd_set_mplsoudp_udp_dst =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+"udp-dst");
+cmdline_parse_token_num_t cmd_set_mplsoudp_udp_dst_value =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_result, udp_dst, UINT16);
+cmdline_parse_token_string_t cmd_set_mplsoudp_ip_src =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+"ip-src");
+cmdline_parse_token_ipaddr_t cmd_set_mplsoudp_ip_src_value =
+ TOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsoudp_result, ip_src);
+cmdline_parse_token_string_t cmd_set_mplsoudp_ip_dst =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+"ip-dst");
+cmdline_parse_token_ipaddr_t cmd_set_mplsoudp_ip_dst_value =
+ TOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsoudp_result, ip_dst);
+cmdline_parse_token_string_t cmd_set_mplsoudp_vlan =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+"vlan-tci");
+cmdline_parse_token_num_t cmd_set_mplsoudp_vlan_value =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_result, tci, UINT16);
+cmdline_parse_token_string_t cmd_set_mplsoudp_eth_src =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+"eth-src");
+cmdline_parse_token_etheraddr_t cmd_set_mplsoudp_eth_src_value =
+ TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_mplsoudp_result, eth_src);
+cmdline_parse_token_string_t cmd_set_mplsoudp_eth_dst =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+"eth-dst");
+cmdline_parse_token_etheraddr_t cmd_set_mplsoudp_eth_dst_value =
+ TOKEN_ETHERADDR_INITIALIZER(struct cmd
[dpdk-dev] [PATCH v2 3/3] app/testpmd: add decap l3 command
This commit introduce the decapsulation of L3 tunnels.
L3 tunnels are tunnels that the inner packet is missing the L3 layer.
This command uses the generic L3 decap command and decapsulate any
tunnel by replacing the outer layers with the supplied L2.
Signed-off-by: Ori Kam
---
app/test-pmd/cmdline.c | 106
app/test-pmd/cmdline_flow.c | 81 +
app/test-pmd/testpmd.h | 10 +++
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 35 +
4 files changed, 232 insertions(+)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 357660b..563a4e1 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -15598,6 +15598,110 @@ static void cmd_set_mplsogre_parsed(void
*parsed_result,
},
};
+/** Set decapsulation L3 details */
+struct cmd_set_decap_l3_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t decap_l3;
+ cmdline_fixed_string_t pos_token;
+ cmdline_fixed_string_t ip_version;
+ uint32_t vlan_present:1;
+ uint16_t tci;
+ struct ether_addr eth_src;
+ struct ether_addr eth_dst;
+};
+
+cmdline_parse_token_string_t cmd_set_decap_l3_set =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, set, "set");
+cmdline_parse_token_string_t cmd_set_decap_l3_decap_l3 =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, decap_l3,
+"decap_l3");
+cmdline_parse_token_string_t cmd_set_decap_l3_decap_l3_with_vlan =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, decap_l3,
+"decap_l3-with-vlan");
+cmdline_parse_token_string_t cmd_set_decap_l3_ip_version =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, pos_token,
+"ip-version");
+cmdline_parse_token_string_t cmd_set_decap_l3_ip_version_value =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, ip_version,
+"ipv4#ipv6");
+cmdline_parse_token_string_t cmd_set_decap_l3_vlan =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, pos_token,
+"vlan-tci");
+cmdline_parse_token_num_t cmd_set_decap_l3_vlan_value =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_decap_l3_result, tci, UINT16);
+cmdline_parse_token_string_t cmd_set_decap_l3_eth_src =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, pos_token,
+"eth-src");
+cmdline_parse_token_etheraddr_t cmd_set_decap_l3_eth_src_value =
+ TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_decap_l3_result, eth_src);
+cmdline_parse_token_string_t cmd_set_decap_l3_eth_dst =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, pos_token,
+"eth-dst");
+cmdline_parse_token_etheraddr_t cmd_set_decap_l3_eth_dst_value =
+ TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_decap_l3_result, eth_dst);
+
+static void cmd_set_decap_l3_parsed(void *parsed_result,
+ __attribute__((unused)) struct cmdline *cl,
+ __attribute__((unused)) void *data)
+{
+ struct cmd_set_decap_l3_result *res = parsed_result;
+
+ if (strcmp(res->decap_l3, "decap_l3") == 0)
+ decap_l3_conf.select_vlan = 0;
+ else if (strcmp(res->decap_l3, "decap_l3-with-vlan") == 0)
+ decap_l3_conf.select_vlan = 1;
+ if (strcmp(res->ip_version, "ipv4") == 0)
+ decap_l3_conf.select_ipv4 = 1;
+ else if (strcmp(res->ip_version, "ipv6") == 0)
+ decap_l3_conf.select_ipv4 = 0;
+ else
+ return;
+ if (decap_l3_conf.select_vlan)
+ decap_l3_conf.vlan_tci = rte_cpu_to_be_16(res->tci);
+ rte_memcpy(decap_l3_conf.eth_src, res->eth_src.addr_bytes,
+ ETHER_ADDR_LEN);
+ rte_memcpy(decap_l3_conf.eth_dst, res->eth_dst.addr_bytes,
+ ETHER_ADDR_LEN);
+}
+
+cmdline_parse_inst_t cmd_set_decap_l3 = {
+ .f = cmd_set_decap_l3_parsed,
+ .data = NULL,
+ .help_str = "set decap_l3 ip-version ipv4|ipv6 eth-src "
+ " eth-dst ",
+ .tokens = {
+ (void *)&cmd_set_decap_l3_set,
+ (void *)&cmd_set_decap_l3_decap_l3,
+ (void *)&cmd_set_decap_l3_ip_version,
+ (void *)&cmd_set_decap_l3_ip_version_value,
+ (void *)&cmd_set_decap_l3_eth_src,
+ (void *)&cmd_set_decap_l3_eth_src_value,
+ (void *)&cmd_set_decap_l3_eth_dst,
+ (void *)&cmd_set_decap_l3_eth_dst_value,
+ NULL,
+ },
+};
+
+cmdline_parse_inst_t cmd_set_decap_l3_with_vlan = {
+ .f = cmd_set_decap_l3_parsed,
+ .data = NULL,
+ .help_str = "set decap_l3-with-vlan ip-version ipv4|ipv6"
+ " vlan-tci eth-src eth-dst ",
+ .tokens = {
+ (void *)&cmd_set_decap_l3
[dpdk-dev] [PATCH v2 2/3] app/testpmd: add MPLSoGRE encapsulation
Due to the complex encapsulation of MPLSoGRE flow action and based on
the fact testpmd does not allocate memory, this patch adds a new command
in testpmd to initialise a global structure containing the necessary
information to make the outer layer of the packet. This same global
structure will then be used by the flow command line in testpmd when
the action mplsoudp_encap will be parsed, at this point, the conversion
into such action becomes trivial.
Signed-off-by: Ori Kam
---
app/test-pmd/cmdline.c | 153
app/test-pmd/cmdline_flow.c | 113
app/test-pmd/testpmd.h | 15 +++
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 46 +
4 files changed, 327 insertions(+)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 492dc5d..357660b 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -15447,6 +15447,157 @@ static void cmd_set_mplsoudp_parsed(void
*parsed_result,
},
};
+/** Set MPLSoGRE encapsulation details */
+struct cmd_set_mplsogre_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t mplsogre;
+ cmdline_fixed_string_t pos_token;
+ cmdline_fixed_string_t ip_version;
+ uint32_t vlan_present:1;
+ uint32_t label;
+ cmdline_ipaddr_t ip_src;
+ cmdline_ipaddr_t ip_dst;
+ uint16_t tci;
+ struct ether_addr eth_src;
+ struct ether_addr eth_dst;
+};
+
+cmdline_parse_token_string_t cmd_set_mplsogre_set =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, set, "set");
+cmdline_parse_token_string_t cmd_set_mplsogre_mplsogre =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, mplsogre,
+"mplsogre");
+cmdline_parse_token_string_t cmd_set_mplsogre_mplsogre_with_vlan =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, mplsogre,
+"mplsogre-with-vlan");
+cmdline_parse_token_string_t cmd_set_mplsogre_ip_version =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,
+"ip-version");
+cmdline_parse_token_string_t cmd_set_mplsogre_ip_version_value =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, ip_version,
+"ipv4#ipv6");
+cmdline_parse_token_string_t cmd_set_mplsogre_label =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,
+"label");
+cmdline_parse_token_num_t cmd_set_mplsogre_label_value =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_result, label, UINT32);
+cmdline_parse_token_string_t cmd_set_mplsogre_ip_src =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,
+"ip-src");
+cmdline_parse_token_ipaddr_t cmd_set_mplsogre_ip_src_value =
+ TOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsogre_result, ip_src);
+cmdline_parse_token_string_t cmd_set_mplsogre_ip_dst =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,
+"ip-dst");
+cmdline_parse_token_ipaddr_t cmd_set_mplsogre_ip_dst_value =
+ TOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsogre_result, ip_dst);
+cmdline_parse_token_string_t cmd_set_mplsogre_vlan =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,
+"vlan-tci");
+cmdline_parse_token_num_t cmd_set_mplsogre_vlan_value =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_result, tci, UINT16);
+cmdline_parse_token_string_t cmd_set_mplsogre_eth_src =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,
+"eth-src");
+cmdline_parse_token_etheraddr_t cmd_set_mplsogre_eth_src_value =
+ TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_mplsogre_result, eth_src);
+cmdline_parse_token_string_t cmd_set_mplsogre_eth_dst =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,
+"eth-dst");
+cmdline_parse_token_etheraddr_t cmd_set_mplsogre_eth_dst_value =
+ TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_mplsogre_result, eth_dst);
+
+static void cmd_set_mplsogre_parsed(void *parsed_result,
+ __attribute__((unused)) struct cmdline *cl,
+ __attribute__((unused)) void *data)
+{
+ struct cmd_set_mplsogre_result *res = parsed_result;
+ union {
+ uint32_t mplsogre_label;
+ uint8_t label[3];
+ } id = {
+ .mplsogre_label =
+ rte_cpu_to_be_32(res->label) & RTE_BE32(0x00ff),
+ };
+
+ if (strcmp(res->mplsogre, "mplsogre") == 0)
+ mplsogre_encap_conf.select_vlan = 0;
+ else if (strcmp(res->mplsogre, "mplsogre-with-vlan") == 0)
+ mplsogre_encap_conf.select_vlan = 1;
+ if (strcmp(res->ip_version, "ipv4") == 0)
+
[dpdk-dev] [PATCH] ethdev: fix flow API item/action name conversion
This patch fixes a typecast bug found in rte_flow_conv_name routine
used in rte_flow item/action name conversion.
Fixes: ae6b2cf49505 ("ethdev: add flow API item/action name conversion")
Signed-off-by: Moti Haimovsky
---
lib/librte_ethdev/rte_flow.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
index 9c56a97..21a4286 100644
--- a/lib/librte_ethdev/rte_flow.c
+++ b/lib/librte_ethdev/rte_flow.c
@@ -767,7 +767,7 @@ enum rte_flow_conv_item_spec_type {
{ rte_flow_desc_action, RTE_DIM(rte_flow_desc_action), },
};
const struct desc_info *const info = &info_rep[!!is_action];
- unsigned int type = (uintptr_t)src;
+ unsigned int type = *(const unsigned int *)src;
if (type >= info->num)
return rte_flow_error_set
--
1.8.3.1
[dpdk-dev] [PATCH v1] ethdev: fix flow API item/action name conversion
This patch fixes a typecast bug found in rte_flow_conv_name routine
used in rte_flow item/action name conversion.
Fixes: 0c2640cbfa7a ("ethdev: add flow API item/action name conversion")
Signed-off-by: Moti Haimovsky
---
v1:
Fixed wrong hash number in "Fixes" message.
---
lib/librte_ethdev/rte_flow.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
index 9c56a97..21a4286 100644
--- a/lib/librte_ethdev/rte_flow.c
+++ b/lib/librte_ethdev/rte_flow.c
@@ -767,7 +767,7 @@ enum rte_flow_conv_item_spec_type {
{ rte_flow_desc_action, RTE_DIM(rte_flow_desc_action), },
};
const struct desc_info *const info = &info_rep[!!is_action];
- unsigned int type = (uintptr_t)src;
+ unsigned int type = *(const unsigned int *)src;
if (type >= info->num)
return rte_flow_error_set
--
1.8.3.1
Re: [dpdk-dev] [PATCH v1] ethdev: fix flow API item/action name conversion
> -Original Message-
> From: dev On Behalf Of Mordechay Haimovsky
> Sent: Sunday, October 7, 2018 7:22 PM
> To: Adrien Mazarguil ; Shahaf Shuler
> ; or...@contextream.com
> Cc: dev@dpdk.org; Mordechay Haimovsky
> Subject: [dpdk-dev] [PATCH v1] ethdev: fix flow API item/action name
> conversion
>
> This patch fixes a typecast bug found in rte_flow_conv_name routine
> used in rte_flow item/action name conversion.
>
> Fixes: 0c2640cbfa7a ("ethdev: add flow API item/action name conversion")
>
> Signed-off-by: Moti Haimovsky
> ---
> v1:
> Fixed wrong hash number in "Fixes" message.
> ---
> lib/librte_ethdev/rte_flow.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
> index 9c56a97..21a4286 100644
> --- a/lib/librte_ethdev/rte_flow.c
> +++ b/lib/librte_ethdev/rte_flow.c
> @@ -767,7 +767,7 @@ enum rte_flow_conv_item_spec_type {
> { rte_flow_desc_action, RTE_DIM(rte_flow_desc_action), },
> };
> const struct desc_info *const info = &info_rep[!!is_action];
> - unsigned int type = (uintptr_t)src;
> + unsigned int type = *(const unsigned int *)src;
>
> if (type >= info->num)
> return rte_flow_error_set
> --
> 1.8.3.1
Acked-by: Ori Kam
Thanks,
Ori
[dpdk-dev] [PATCH] malloc: respect SIZE_HINT_ONLY when looking for the biggest free elem
RTE_MEMZONE_SIZE_HINT_ONLY wasn't checked in any way,
causing size hints to be parsed as hard requirements.
This resulted in some allocations being failed prematurely.
Fixes: 68b6092bd3c7 ("malloc: allow reserving biggest element")
Cc: anatoly.bura...@intel.com
Cc: sta...@dpdk.org
Signed-off-by: Darek Stojaczyk
---
lib/librte_eal/common/malloc_heap.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/common/malloc_heap.c
b/lib/librte_eal/common/malloc_heap.c
index ac7bbb3ba..d2a8bd8dc 100644
--- a/lib/librte_eal/common/malloc_heap.c
+++ b/lib/librte_eal/common/malloc_heap.c
@@ -165,7 +165,9 @@ find_biggest_element(struct malloc_heap *heap, size_t *size,
for (elem = LIST_FIRST(&heap->free_head[idx]);
!!elem; elem = LIST_NEXT(elem, free_list)) {
size_t cur_size;
- if (!check_hugepage_sz(flags, elem->msl->page_sz))
+ if ((flags & RTE_MEMZONE_SIZE_HINT_ONLY) == 0 &&
+ !check_hugepage_sz(flags,
+ elem->msl->page_sz))
continue;
if (contig) {
cur_size =
--
2.17.1
Re: [dpdk-dev] [PATCH v3 1/3] ring: read tail using atomic load
On 07/10/2018, 06:03, "Jerin Jacob" wrote:
How about fixing rte_pause() then?
Meaning issuing power saving instructions on missing archs.
Rte_pause() implemented as NOP or YIELD on ARM will likely not save any power.
You should use WFE for that.
I use this portable pattern:
//Wait for our turn to signal consumers (producers)
if (UNLIKELY(__atomic_load_n(loc, __ATOMIC_RELAXED) != idx))
{
SEVL();
while (WFE() && LDXR32(loc, __ATOMIC_RELAXED) != idx)
{
DOZE();
}
}
For AArch64 with WFE usage enabled:
#define SEVL() sevl()
#define WFE() wfe()
#define LDXR32(a, b) ldx32((a), (b))
#define DOZE() (void)0
static inline void sevl(void)
{
__asm__ volatile("sevl" : : : );
}
static inline int wfe(void)
{
__asm__ volatile("wfe" : : : "memory");
return 1;
}
For architectures without WFE support:
#define SEVL() (void)0
#define WFE() 1
#define LDXR32(a, b) __atomic_load_n((a), (b))
#define DOZE() doze()
static inline void doze(void)
{
__asm__ volatile("rep; nop" : : : );
}
-- Ola
Re: [dpdk-dev] [PATCH v3 1/3] ring: read tail using atomic load
On 07/10/2018, 06:03, "Jerin Jacob" wrote:
In arm64 case, it will have ATOMIC_RELAXED followed by asm volatile
("":::"memory") of rte_pause().
I would n't have any issue, if the generated code code is same or better
than the exiting case. but it not the case, Right?
The existing case is actually not interesting (IMO) as it exposes undefined
behaviour which allows the compiler to do anything. But you seem to be
satisfied with "works for me, right here right now". I think the cost of
avoiding undefined behaviour is acceptable (actually I don't think it even will
be noticeable).
Skipping the compiler memory barrier in rte_pause() potentially allows for
optimisations that provide much more benefit, e.g. hiding some cache miss
latency for later loads. The DPDK ring buffer implementation is defined so to
enable inlining of enqueue/dequeue functions into the caller, any code could
immediately follow these calls.
From INTERNATIONAL STANDARD ©ISO/IEC ISO/IEC 9899:201x
Programming languages — C
5.1.2.4
4 Two expression evaluations conflict if one of them modifies a memory location
and the other one reads or modifies the same memory location.
25 The execution of a program contains a data race if it contains two
conflicting actions in different threads, at least one of which is not atomic,
and neither happens before the other. Any such data race results in undefined
behavior.
-- Ola
Re: [dpdk-dev] [PATCH] eal/armv7: add support for rte pause
On 07/10/2018, 08:32, "Jerin Jacob" wrote:
Add support for rte_pause() implementation for armv7.
Signed-off-by: Jerin Jacob
---
The reference implementation for Linux's cpu_relax() for armv7 is at
https://elixir.bootlin.com/linux/latest/source/arch/arm/include/asm/processor.h#L100
---
lib/librte_eal/common/include/arch/arm/rte_pause_32.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/common/include/arch/arm/rte_pause_32.h
b/lib/librte_eal/common/include/arch/arm/rte_pause_32.h
index d4768c7a9..9b856e0cf 100644
--- a/lib/librte_eal/common/include/arch/arm/rte_pause_32.h
+++ b/lib/librte_eal/common/include/arch/arm/rte_pause_32.h
@@ -9,11 +9,13 @@
extern "C" {
#endif
-#include
+#include
+
#include "generic/rte_pause.h"
static inline void rte_pause(void)
{
+rte_compiler_barrier();
The compiler barrier is not mandated by the DPDK documentation for rte_pause():
http://doc.dpdk.org/api/rte__pause_8h.html
You have to go all the way to the source and GCC documentation to discover that
for GCC, rte_pause calls _mm_pause() which in turn is implemented using
__builtin_ia32_pause().
https://gcc.gnu.org/onlinedocs/gcc-4.9.2/gcc/X86-Built-in-Functions.html
void __builtin_ia32_pause (void)
Generates the pause machine instruction with a compiler memory barrier.
If you are using C11 atomic operations e.g. for polling a location, the atomic
operations will be able to provide the required semantics (e.g. don't merge
atomic loads from different iterations of a loop, optionally provide acquire
and/or release (or stronger) ordering. A compiler barrier here interferes with
the (possibly weaker) barriers from the atomic operations. We could use a
C11-version of rte_pause() that doesn't have the compiler barrier. But
actually, we want support for WFE, x86 also has something similar now,
MONITOR/MWAIT?.
-- Ola
}
#ifdef __cplusplus
--
2.19.0
IMPORTANT NOTICE: The contents of this email and any attachments are
confidential and may also be privileged. If you are not the intended recipient,
please notify the sender immediately and do not disclose the contents to any
other person, use it for any purpose, or store or copy the information in any
medium. Thank you.
[dpdk-dev] [PATCH v3 0/3] eal: allow hotplug to skip an already probed device
This is a follow-up of an idea presented at Dublin during the "hotplug talk". The idea is to ease probing of range of ports attached to the same rte_device. I becomes possible to allow probing again the same device but with a bigger range of ports in the devargs. Instead of adding a parameter to the hotplug functions, as in the RFC, the check of an already probed device is moved to the bus and enabled PMDs. It gives flexibility to drivers for managing range of ports. This series is based on top of https://patches.dpdk.org/project/dpdk/list/?series=1734 Depends on: project/dpdk/list/?series=1734 (proposed syntax for dependencies) Changes in v3 - after Declan's review: - return error in all buses but PCI - add a PCI driver flag to enable feature per driver - return -EEXIST if probing again is not supported Thomas Monjalon (3): drivers/bus: move driver assignment to end of probing eal: add function to query device status eal: allow probing a device again drivers/bus/dpaa/dpaa_bus.c | 3 ++ drivers/bus/fslmc/fslmc_bus.c | 3 ++ drivers/bus/ifpga/ifpga_bus.c | 21 +++--- drivers/bus/pci/pci_common.c| 38 - drivers/bus/pci/rte_bus_pci.h | 6 ++-- drivers/bus/vdev/vdev.c | 12 +--- drivers/bus/vmbus/vmbus_common.c| 5 ++-- drivers/net/i40e/i40e_vf_representor.c | 3 -- drivers/net/mlx4/mlx4.c | 1 - drivers/net/mlx5/mlx5.c | 1 - lib/librte_eal/common/eal_common_dev.c | 14 + lib/librte_eal/common/include/rte_dev.h | 18 ++-- lib/librte_eal/rte_eal_version.map | 1 + 13 files changed, 82 insertions(+), 44 deletions(-) -- 2.19.0
[dpdk-dev] [PATCH v3 1/3] drivers/bus: move driver assignment to end of probing
The PCI mapping requires to know the PCI driver to use,
even before the probing is done. That's why the PCI driver is
referenced early inside the PCI device structure. See
1d20a073fa5e ("bus/pci: reference driver structure before mapping")
However the rte_driver does not need to be referenced in rte_device
before the device probing is done.
By moving back this assignment at the end of the device probing,
it becomes possible to make clear the status of a rte_device.
Signed-off-by: Thomas Monjalon
---
drivers/bus/ifpga/ifpga_bus.c | 9 -
drivers/bus/pci/pci_common.c| 7 +++
drivers/bus/pci/rte_bus_pci.h | 2 +-
drivers/bus/vdev/vdev.c | 5 ++---
drivers/bus/vmbus/vmbus_common.c| 5 +++--
drivers/net/i40e/i40e_vf_representor.c | 3 ---
drivers/net/mlx4/mlx4.c | 1 -
drivers/net/mlx5/mlx5.c | 1 -
lib/librte_eal/common/include/rte_dev.h | 2 +-
9 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index 80663328a..fca2dbace 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -280,14 +280,13 @@ ifpga_probe_one_driver(struct rte_afu_driver *drv,
/* reference driver structure */
afu_dev->driver = drv;
- afu_dev->device.driver = &drv->driver;
/* call the driver probe() function */
ret = drv->probe(afu_dev);
- if (ret) {
+ if (ret)
afu_dev->driver = NULL;
- afu_dev->device.driver = NULL;
- }
+ else
+ afu_dev->device.driver = &drv->driver;
return ret;
}
@@ -302,7 +301,7 @@ ifpga_probe_all_drivers(struct rte_afu_device *afu_dev)
return -1;
/* Check if a driver is already loaded */
- if (afu_dev->driver != NULL)
+ if (afu_dev->device.driver != NULL)
return 0;
TAILQ_FOREACH(drv, &ifpga_afu_drv_list, next) {
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index c7695d108..d63e68045 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -160,14 +160,12 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
* driver flags for adjusting configuration.
*/
dev->driver = dr;
- dev->device.driver = &dr->driver;
if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) {
/* map resources for devices that use igb_uio */
ret = rte_pci_map_device(dev);
if (ret != 0) {
dev->driver = NULL;
- dev->device.driver = NULL;
return ret;
}
}
@@ -176,7 +174,6 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
ret = dr->probe(dr, dev);
if (ret) {
dev->driver = NULL;
- dev->device.driver = NULL;
if ((dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) &&
/* Don't unmap if device is unsupported and
* driver needs mapped resources.
@@ -184,6 +181,8 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
!(ret > 0 &&
(dr->drv_flags & RTE_PCI_DRV_KEEP_MAPPED_RES)))
rte_pci_unmap_device(dev);
+ } else {
+ dev->device.driver = &dr->driver;
}
return ret;
@@ -244,7 +243,7 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
return -1;
/* Check if a driver is already loaded */
- if (dev->driver != NULL)
+ if (dev->device.driver != NULL)
return 0;
FOREACH_DRIVER_ON_PCIBUS(dr) {
diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h
index 0d1955ffe..984df2b37 100644
--- a/drivers/bus/pci/rte_bus_pci.h
+++ b/drivers/bus/pci/rte_bus_pci.h
@@ -62,7 +62,7 @@ struct rte_pci_device {
struct rte_mem_resource mem_resource[PCI_MAX_RESOURCE];
/**< PCI Memory Resource */
struct rte_intr_handle intr_handle; /**< Interrupt handle */
- struct rte_pci_driver *driver; /**< Associated driver */
+ struct rte_pci_driver *driver; /**< PCI driver used in probing */
uint16_t max_vfs; /**< sriov enable if not zero */
enum rte_kernel_driver kdrv;/**< Kernel driver passthrough */
char name[PCI_PRI_STR_SIZE+1]; /**< PCI location (ASCII) */
diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index 0142fb2c8..3f27f3510 100644
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -150,10 +150,9 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev)
if (vdev_parse(name, &driver))
return -1;
- dev->device.driver = &driver->driver;
ret = driver->probe(dev);
- if (ret)
-
[dpdk-dev] [PATCH v3 3/3] eal: allow probing a device again
In the devargs syntax for device representors, it is possible to add
several devices at once: -w dbdf,representor=[0-3]
It will become a more frequent case when introducing wildcards
and ranges in the new devargs syntax.
If a devargs string is provided for probing, and updated with a bigger
range for a new probing, then we do not want it to fail because
part of this range was already probed previously.
There can be new ports to create from an existing rte_device.
That's why the check for an already probed device
is moved as bus responsibility.
In the case of vdev, a global check is kept in insert_vdev(),
assuming that a vdev will always have only one port.
In the case of ifpga and vmbus, already probed devices are checked.
In the case of NXP buses, the probing is done only once (no hotplug),
though a check is added at bus level for consistency.
In the case of PCI, a driver flag is added to allow PMD probing again.
Only the PMD knows the ports attached to one rte_device.
As another consequence of being able to probe in several steps,
the field rte_device.devargs must not be considered as a full
representation of the rte_device, but only the latest probing args.
Anyway, the field rte_device.devargs is used only for probing.
Signed-off-by: Thomas Monjalon
---
drivers/bus/dpaa/dpaa_bus.c | 3 +++
drivers/bus/fslmc/fslmc_bus.c | 3 +++
drivers/bus/ifpga/ifpga_bus.c | 14 ++-
drivers/bus/pci/pci_common.c| 33 -
drivers/bus/pci/rte_bus_pci.h | 4 ++-
drivers/bus/vdev/vdev.c | 5
lib/librte_eal/common/eal_common_dev.c | 7 ++
lib/librte_eal/common/include/rte_dev.h | 2 +-
8 files changed, 47 insertions(+), 24 deletions(-)
diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index 138e0f98d..89d1e415d 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -555,6 +555,9 @@ rte_dpaa_bus_probe(void)
if (ret)
continue;
+ if (rte_dev_is_probed(&dev->device))
+ continue;
+
if (!drv->probe ||
(dev->device.devargs &&
dev->device.devargs->policy == RTE_DEV_BLACKLISTED))
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index 960f55071..7ebd980aa 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -386,6 +386,9 @@ rte_fslmc_probe(void)
if (!drv->probe)
continue;
+ if (rte_dev_is_probed(&dev->device))
+ continue;
+
if (dev->device.devargs &&
dev->device.devargs->policy == RTE_DEV_BLACKLISTED) {
DPAA2_BUS_LOG(DEBUG, "%s Blacklisted, skipping",
diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index 2ca1efa72..5f23ed8b4 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -301,8 +301,11 @@ ifpga_probe_all_drivers(struct rte_afu_device *afu_dev)
return -1;
/* Check if a driver is already loaded */
- if (rte_dev_is_probed(&afu_dev->device))
- return 0;
+ if (rte_dev_is_probed(&afu_dev->device)) {
+ IFPGA_BUS_DEBUG("Device %s is already probed\n",
+ rte_ifpga_device_name(afu_dev));
+ return -EEXIST;
+ }
TAILQ_FOREACH(drv, &ifpga_afu_drv_list, next) {
if (ifpga_probe_one_driver(drv, afu_dev)) {
@@ -325,14 +328,13 @@ ifpga_probe(void)
int ret = 0;
TAILQ_FOREACH(afu_dev, &ifpga_afu_dev_list, next) {
- if (rte_dev_is_probed(&afu_dev->device))
- continue;
-
ret = ifpga_probe_all_drivers(afu_dev);
+ if (ret == -EEXIST)
+ continue;
if (ret < 0)
IFPGA_BUS_ERR("failed to initialize %s device\n",
rte_ifpga_device_name(afu_dev));
- }
+ }
return ret;
}
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 62b17fba9..11c5da587 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -6,6 +6,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -121,6 +122,7 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
struct rte_pci_device *dev)
{
int ret;
+ bool already_probed;
struct rte_pci_addr *loc;
if ((dr == NULL) || (dev == NULL))
@@ -151,6 +153,13 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
dev->device.numa_node = 0;
}
+ already_probed = rte_dev_is_probed(&dev->device);
+
[dpdk-dev] [PATCH v3 2/3] eal: add function to query device status
The function rte_dev_is_probed() is added in order to improve semantic
and enforce proper check of the probing status of a device.
It will answer this rte_device query:
Is it already successfully probed or not?
Signed-off-by: Thomas Monjalon
---
drivers/bus/ifpga/ifpga_bus.c | 4 ++--
drivers/bus/pci/pci_common.c| 2 +-
drivers/bus/vdev/vdev.c | 2 +-
drivers/bus/vmbus/vmbus_common.c| 2 +-
lib/librte_eal/common/eal_common_dev.c | 9 -
lib/librte_eal/common/include/rte_dev.h | 14 ++
lib/librte_eal/rte_eal_version.map | 1 +
7 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index fca2dbace..2ca1efa72 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -301,7 +301,7 @@ ifpga_probe_all_drivers(struct rte_afu_device *afu_dev)
return -1;
/* Check if a driver is already loaded */
- if (afu_dev->device.driver != NULL)
+ if (rte_dev_is_probed(&afu_dev->device))
return 0;
TAILQ_FOREACH(drv, &ifpga_afu_drv_list, next) {
@@ -325,7 +325,7 @@ ifpga_probe(void)
int ret = 0;
TAILQ_FOREACH(afu_dev, &ifpga_afu_dev_list, next) {
- if (afu_dev->device.driver)
+ if (rte_dev_is_probed(&afu_dev->device))
continue;
ret = ifpga_probe_all_drivers(afu_dev);
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index d63e68045..62b17fba9 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -243,7 +243,7 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
return -1;
/* Check if a driver is already loaded */
- if (dev->device.driver != NULL)
+ if (rte_dev_is_probed(&dev->device))
return 0;
FOREACH_DRIVER_ON_PCIBUS(dr) {
diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index 3f27f3510..f666099e6 100644
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -481,7 +481,7 @@ vdev_probe(void)
* we call each driver probe.
*/
- if (dev->device.driver)
+ if (rte_dev_is_probed(&dev->device))
continue;
if (vdev_probe_all_drivers(dev)) {
diff --git a/drivers/bus/vmbus/vmbus_common.c b/drivers/bus/vmbus/vmbus_common.c
index de5548aa4..48a219f73 100644
--- a/drivers/bus/vmbus/vmbus_common.c
+++ b/drivers/bus/vmbus/vmbus_common.c
@@ -143,7 +143,7 @@ vmbus_probe_all_drivers(struct rte_vmbus_device *dev)
int rc;
/* Check if a driver is already loaded */
- if (dev->device.driver != NULL) {
+ if (rte_dev_is_probed(&dev->device)) {
VMBUS_LOG(DEBUG, "VMBUS driver already loaded");
return 0;
}
diff --git a/lib/librte_eal/common/eal_common_dev.c
b/lib/librte_eal/common/eal_common_dev.c
index 7663eaa3f..7e8a9b260 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -74,6 +74,13 @@ static int cmp_dev_name(const struct rte_device *dev, const
void *_name)
return strcmp(dev->name, name);
}
+int __rte_experimental
+rte_dev_is_probed(const struct rte_device *dev)
+{
+ /* The field driver should be set only when the probe is successful. */
+ return dev->driver != NULL;
+}
+
int rte_eal_dev_attach(const char *name, const char *devargs)
{
struct rte_bus *bus;
@@ -189,7 +196,7 @@ rte_dev_probe(const char *devargs)
goto err_devarg;
}
- if (dev->driver != NULL) {
+ if (rte_dev_is_probed(dev)) {
RTE_LOG(ERR, EAL, "Device is already plugged\n");
return -EEXIST;
}
diff --git a/lib/librte_eal/common/include/rte_dev.h
b/lib/librte_eal/common/include/rte_dev.h
index 5084c645b..9f169e3b3 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -162,6 +162,20 @@ struct rte_device {
struct rte_devargs *devargs; /**< Device user arguments */
};
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice
+ *
+ * Query status of a device.
+ *
+ * @param dev
+ * Generic device pointer.
+ * @return
+ * (int)true if already probed successfully, 0 otherwise.
+ */
+__rte_experimental
+int rte_dev_is_probed(const struct rte_device *dev);
+
/**
* Attach a device to a registered driver.
*
diff --git a/lib/librte_eal/rte_eal_version.map
b/lib/librte_eal/rte_eal_version.map
index 2ea7a870a..dddcb81ea 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -279,6 +279,7 @@ EXPERIMENTAL {
rte_dev_event_callback_unregister;
rte_dev_event_monitor_start;
rte_dev_event_monitor_stop;
+ rte_dev_is_probed;
rte_dev_iterator_init;
rte_dev_
[dpdk-dev] [PATCH 5/5] eal: remove deprecated attach/detach functions
These hotplug functions were deprecated and have some new replacements.
As announced earlier, the oldest ones are now removed.
Signed-off-by: Thomas Monjalon
---
doc/guides/rel_notes/deprecation.rst| 5 ---
doc/guides/rel_notes/release_18_11.rst | 6 +++
lib/librte_eal/common/eal_common_dev.c | 53 -
lib/librte_eal/common/include/rte_dev.h | 27 -
lib/librte_eal/rte_eal_version.map | 2 -
5 files changed, 6 insertions(+), 87 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index c24506dc1..c6bcb5e6e 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -64,11 +64,6 @@ Deprecation Notices
Target release for removal of the legacy API will be defined once most
PMDs have switched to rte_flow.
-* eal: In v18.11 ``rte_eal_dev_attach()`` and ``rte_eal_dev_detach()``
- will be removed.
- Hotplug functions ``rte_eal_hotplug_add()`` and ``rte_eal_hotplug_remove()``
- should be used directly.
-
* pdump: As we changed to use generic IPC, some changes in APIs and structure
are expected in subsequent release.
diff --git a/doc/guides/rel_notes/release_18_11.rst
b/doc/guides/rel_notes/release_18_11.rst
index 1f6ddcb6e..6fee3d9b1 100644
--- a/doc/guides/rel_notes/release_18_11.rst
+++ b/doc/guides/rel_notes/release_18_11.rst
@@ -126,6 +126,12 @@ API Changes
* eal: The parameters of the function ``rte_devargs_remove()`` have changed
from bus and device names to ``struct rte_devargs``.
+* eal: The deprecated functions attach/detach were removed in 18.11.
+ ``rte_eal_dev_attach`` can be replaced by
+ ``rte_dev_probe`` or ``rte_eal_hotplug_add``.
+ ``rte_eal_dev_detach`` can be replaced by
+ ``rte_dev_remove`` or ``rte_eal_hotplug_remove``.
+
* mbuf: The ``__rte_mbuf_raw_free()`` and ``__rte_pktmbuf_prefree_seg()``
functions were deprecated since 17.05 and are replaced by
``rte_mbuf_raw_free()`` and ``rte_pktmbuf_prefree_seg()``.
diff --git a/lib/librte_eal/common/eal_common_dev.c
b/lib/librte_eal/common/eal_common_dev.c
index e733eb779..85003f6c8 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -81,59 +81,6 @@ rte_dev_is_probed(const struct rte_device *dev)
return dev->driver != NULL;
}
-int rte_eal_dev_attach(const char *name, const char *devargs)
-{
- struct rte_bus *bus;
-
- if (name == NULL || devargs == NULL) {
- RTE_LOG(ERR, EAL, "Invalid device or arguments provided\n");
- return -EINVAL;
- }
-
- bus = rte_bus_find_by_device_name(name);
- if (bus == NULL) {
- RTE_LOG(ERR, EAL, "Unable to find a bus for the device '%s'\n",
- name);
- return -EINVAL;
- }
- if (strcmp(bus->name, "pci") == 0 || strcmp(bus->name, "vdev") == 0)
- return rte_eal_hotplug_add(bus->name, name, devargs);
-
- RTE_LOG(ERR, EAL,
- "Device attach is only supported for PCI and vdev devices.\n");
-
- return -ENOTSUP;
-}
-
-int rte_eal_dev_detach(struct rte_device *dev)
-{
- struct rte_bus *bus;
- int ret;
-
- if (dev == NULL) {
- RTE_LOG(ERR, EAL, "Invalid device provided.\n");
- return -EINVAL;
- }
-
- bus = rte_bus_find_by_device(dev);
- if (bus == NULL) {
- RTE_LOG(ERR, EAL, "Cannot find bus for device (%s)\n",
- dev->name);
- return -EINVAL;
- }
-
- if (bus->unplug == NULL) {
- RTE_LOG(ERR, EAL, "Bus function not supported\n");
- return -ENOTSUP;
- }
-
- ret = bus->unplug(dev);
- if (ret)
- RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n",
- dev->name);
- return ret;
-}
-
int
rte_eal_hotplug_add(const char *busname, const char *devname,
const char *drvargs)
diff --git a/lib/librte_eal/common/include/rte_dev.h
b/lib/librte_eal/common/include/rte_dev.h
index a7ec8ec25..20791691a 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -176,33 +176,6 @@ struct rte_device {
__rte_experimental
int rte_dev_is_probed(const struct rte_device *dev);
-/**
- * Attach a device to a registered driver.
- *
- * @param name
- * The device name, that refers to a pci device (or some private
- * way of designating a vdev device). Based on this device name, eal
- * will identify a driver capable of handling it and pass it to the
- * driver probing function.
- * @param devargs
- * Device arguments to be passed to the driver.
- * @return
- * 0 on success, negative on error.
- */
-__rte_deprecated
-int rte_eal_dev_attach(const char *name, const char *devargs);
-
-/**
- * Detach a device from its driver.
- *
- * @param dev
- * A pointer to a rte_device structure.
- *
[dpdk-dev] [PATCH 4/5] ethdev: remove deprecated attach/detach functions
The hotplug attach/detach features are implemented in EAL layer.
There is a new ethdev iterator to retrieve ports from ethdev layer.
As announced earlier, the (buggy) ethdev functions are now removed.
Signed-off-by: Thomas Monjalon
---
app/test-pmd/testpmd.c| 17 ++-
doc/guides/contributing/documentation.rst | 15 +--
.../prog_guide/port_hotplug_framework.rst | 106 --
doc/guides/rel_notes/deprecation.rst | 7 --
doc/guides/rel_notes/release_18_11.rst| 8 +-
drivers/net/virtio/virtio_user_ethdev.c | 1 -
lib/librte_ethdev/Makefile| 2 +-
lib/librte_ethdev/meson.build | 2 +-
lib/librte_ethdev/rte_ethdev.c| 81 -
lib/librte_ethdev/rte_ethdev.h| 33 +-
lib/librte_ethdev/rte_ethdev_version.map | 2 -
11 files changed, 28 insertions(+), 246 deletions(-)
delete mode 100644 doc/guides/prog_guide/port_hotplug_framework.rst
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 001f0e552..faedece0a 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -425,6 +425,7 @@ struct nvgre_encap_conf nvgre_encap_conf = {
};
/* Forward function declarations */
+static void setup_attached_port(portid_t pi);
static void map_port_queue_stats_mapping_registers(portid_t pi,
struct rte_port *port);
static void check_all_ports_link_status(uint32_t port_mask);
@@ -1991,7 +1992,7 @@ void
attach_port(char *identifier)
{
portid_t pi = 0;
- unsigned int socket_id;
+ struct rte_dev_iterator iterator;
printf("Attaching a new port...\n");
@@ -2000,9 +2001,18 @@ attach_port(char *identifier)
return;
}
- if (rte_eth_dev_attach(identifier, &pi))
+ if (rte_dev_probe(identifier) != 0)
return;
+ RTE_ETH_FOREACH_MATCHING_DEV(pi, identifier, &iterator)
+ setup_attached_port(pi);
+}
+
+static void
+setup_attached_port(portid_t pi)
+{
+ unsigned int socket_id;
+
socket_id = (unsigned)rte_eth_dev_socket_id(pi);
/* if socket_id is invalid, set to 0 */
if (check_socket_id(socket_id) < 0)
@@ -2024,7 +2034,6 @@ attach_port(char *identifier)
void
detach_port(portid_t port_id)
{
- char name[RTE_ETH_NAME_MAX_LEN];
uint16_t i;
printf("Detaching a port...\n");
@@ -2037,7 +2046,7 @@ detach_port(portid_t port_id)
if (ports[port_id].flow_list)
port_flow_flush(port_id);
- if (rte_eth_dev_detach(port_id, name)) {
+ if (rte_dev_remove(rte_eth_devices[port_id].device)) {
TESTPMD_LOG(ERR, "Failed to detach port %u\n", port_id);
return;
}
diff --git a/doc/guides/contributing/documentation.rst
b/doc/guides/contributing/documentation.rst
index 097575ad7..063c8b6c4 100644
--- a/doc/guides/contributing/documentation.rst
+++ b/doc/guides/contributing/documentation.rst
@@ -615,19 +615,14 @@ The following are some guidelines for use of Doxygen in
the DPDK API documentati
.. code-block:: c
/**
- * Attach a new Ethernet device specified by arguments.
- *
- * @param devargs
- * A pointer to a strings array describing the new device
- * to be attached. The strings should be a pci address like
- * `:01:00.0` or **virtual** device name like `net_pcap0`.
- * @param port_id
- * A pointer to a port identifier actually attached.
+ * Try to take the lock.
*
+ * @param sl
+ * A pointer to the spinlock.
* @return
- * 0 on success and port_id is filled, negative on error.
+ * 1 if the lock is successfully taken; 0 otherwise.
*/
- int rte_eth_dev_attach(const char *devargs, uint8_t *port_id);
+ int rte_spinlock_trylock (rte_spinlock_t *sl);
* Doxygen supports Markdown style syntax such as bold, italics, fixed width
text and lists.
For example the second line in the ``devargs`` parameter in the previous
example will be rendered as:
diff --git a/doc/guides/prog_guide/port_hotplug_framework.rst
b/doc/guides/prog_guide/port_hotplug_framework.rst
deleted file mode 100644
index fb0efc18f..0
--- a/doc/guides/prog_guide/port_hotplug_framework.rst
+++ /dev/null
@@ -1,106 +0,0 @@
-.. BSD LICENSE
-Copyright(c) 2015 IGEL Co.,Ltd. All rights reserved.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provide
[dpdk-dev] [PATCH 3/5] ethdev: allow iterating with only class filter
If no rte_device is given in the iterator,
eth_dev_match() is looking at all ports without any restriction,
except the ethdev kvargs filter.
It allows to iterate with a devargs filter referencing only
some ethdev parameters. The format (from the new devargs syntax) is:
class=eth,paramY=Y
Fixes: e815a7f69371 ("ethdev: register as a class")
Signed-off-by: Thomas Monjalon
---
lib/librte_ethdev/rte_class_eth.c | 2 +-
lib/librte_ethdev/rte_ethdev.c| 13 +++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/lib/librte_ethdev/rte_class_eth.c
b/lib/librte_ethdev/rte_class_eth.c
index 84b646291..f0af51c36 100644
--- a/lib/librte_ethdev/rte_class_eth.c
+++ b/lib/librte_ethdev/rte_class_eth.c
@@ -42,7 +42,7 @@ eth_dev_match(const struct rte_eth_dev *edev,
if (edev->state == RTE_ETH_DEV_UNUSED)
return -1;
- if (edev->device != arg->device)
+ if (arg->device != NULL && arg->device != edev->device)
return -1;
if (kvlist == NULL)
/* Empty string matches everything. */
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 83ab28c23..a43e0ab3a 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -199,10 +199,18 @@ rte_eth_iterator_init(struct rte_dev_iterator *iter,
const char *devargs_str)
* The devargs string may use various syntaxes:
* - :08:00.0,representor=[1-3]
* - pci::06:00.0,representor=[0,5]
+* - class=eth,mac=00:11:22:33:44:55
* A new syntax is in development (not yet supported):
* - bus=X,paramX=x/class=Y,paramY=y/driver=Z,paramZ=z
*/
+ /* Handle a case from future syntax, without any bus-level argument. */
+ if (strncmp(devargs_str, iter_anybus_str,
+ strlen(iter_anybus_str)) == 0) {
+ iter->cls_str = devargs_str + strlen(iter_anybus_str);
+ goto end;
+ }
+
/* Split bus, device and parameters. */
ret = rte_devargs_parse(&devargs, devargs_str);
if (ret != 0)
@@ -239,6 +247,7 @@ rte_eth_iterator_init(struct rte_dev_iterator *iter, const
char *devargs_str)
}
iter->bus_str = bus_str;
+end:
iter->cls = rte_class_find_by_name("eth");
return 0;
}
@@ -250,7 +259,7 @@ rte_eth_iterator_next(struct rte_dev_iterator *iter)
return RTE_MAX_ETHPORTS;
do { /* loop for matching rte_device */
- if (iter->class_device == NULL) {
+ if (iter->bus != NULL && iter->class_device == NULL) {
iter->device = iter->bus->dev_iterate(
iter->device, iter->bus_str, iter);
if (iter->device == NULL)
@@ -260,7 +269,7 @@ rte_eth_iterator_next(struct rte_dev_iterator *iter)
iter->class_device, iter->cls_str, iter);
if (iter->class_device != NULL)
return eth_dev_to_id(iter->class_device);
- } while (iter->class_device == NULL);
+ } while (iter->bus != NULL && iter->class_device == NULL);
/* No more ethdev port to iterate. */
free(RTE_CAST_FIELD(iter, bus_str, char *)); /* workaround const */
--
2.19.0
[dpdk-dev] [PATCH 0/5] replace attach/detach functions
The functions for EAL attach/detach had already some replacements,
so they are removed.
The functions for ethdev attach/detach are removed and replaced
thanks to a new ethdev iterator working with devargs.
rte_eth_dev_attach(devargs, &port_id)
is replaced by:
rte_dev_probe(devargs);
RTE_ETH_FOREACH_MATCHING_DEV(port_id, devargs, &iterator) {
do what you want with the new port_id
}
The biggest benefit is to be able to manage devargs string
matching several ports to probe.
Depends on: https://patches.dpdk.org/project/dpdk/list/?series=1676
Thomas Monjalon (5):
bus/vdev: add iteration filter on name
ethdev: add an iterator to match some devargs input
ethdev: allow iterating with only class filter
ethdev: remove deprecated attach/detach functions
eal: remove deprecated attach/detach functions
app/test-pmd/testpmd.c| 17 +-
doc/guides/contributing/documentation.rst | 15 +-
.../prog_guide/port_hotplug_framework.rst | 106 ---
doc/guides/rel_notes/deprecation.rst | 12 --
doc/guides/rel_notes/release_18_11.rst| 14 +-
drivers/bus/vdev/vdev_params.c| 21 ++-
drivers/net/virtio/virtio_user_ethdev.c | 1 -
lib/librte_eal/common/eal_common_dev.c| 53 --
lib/librte_eal/common/include/rte_common.h| 6 +
lib/librte_eal/common/include/rte_dev.h | 27 ---
lib/librte_eal/rte_eal_version.map| 2 -
lib/librte_ethdev/Makefile| 2 +-
lib/librte_ethdev/ethdev_private.c| 10 +-
lib/librte_ethdev/ethdev_private.h| 6 +
lib/librte_ethdev/meson.build | 2 +-
lib/librte_ethdev/rte_class_eth.c | 2 +-
lib/librte_ethdev/rte_ethdev.c| 177 ++
lib/librte_ethdev/rte_ethdev.h| 89 +
lib/librte_ethdev/rte_ethdev_version.map | 4 +-
19 files changed, 228 insertions(+), 338 deletions(-)
delete mode 100644 doc/guides/prog_guide/port_hotplug_framework.rst
--
2.19.0
[dpdk-dev] [PATCH 1/5] bus/vdev: add iteration filter on name
A virtual device can be matched with following syntax:
bus=vdev,name=X
Signed-off-by: Thomas Monjalon
---
drivers/bus/vdev/vdev_params.c | 21 ++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/drivers/bus/vdev/vdev_params.c b/drivers/bus/vdev/vdev_params.c
index da270f2ec..133998c3e 100644
--- a/drivers/bus/vdev/vdev_params.c
+++ b/drivers/bus/vdev/vdev_params.c
@@ -2,6 +2,8 @@
* Copyright 2018 Gaëtan Rivet
*/
+#include
+
#include
#include
#include
@@ -11,10 +13,12 @@
#include "vdev_private.h"
enum vdev_params {
+ RTE_VDEV_PARAM_NAME,
RTE_VDEV_PARAM_MAX,
};
static const char * const vdev_params_keys[] = {
+ [RTE_VDEV_PARAM_NAME] = "name",
[RTE_VDEV_PARAM_MAX] = NULL,
};
@@ -22,11 +26,22 @@ static int
vdev_dev_match(const struct rte_device *dev,
const void *_kvlist)
{
+ int ret;
const struct rte_kvargs *kvlist = _kvlist;
+ char *name;
+
+ /* cannot pass const dev->name to rte_kvargs_process() */
+ name = strdup(dev->name);
+ if (name == NULL)
+ return -ENOMEM; /* interpreted as no match */
+ ret = rte_kvargs_process(kvlist,
+ vdev_params_keys[RTE_VDEV_PARAM_NAME],
+ rte_kvargs_strcmp, name);
+ free(name);
+ if (ret != 0)
+ return -1;
- (void) kvlist;
- (void) dev;
- return 0;
+ return ret;
}
void *
--
2.19.0
[dpdk-dev] [PATCH 2/5] ethdev: add an iterator to match some devargs input
Signed-off-by: Thomas Monjalon
---
lib/librte_eal/common/include/rte_common.h | 6 ++
lib/librte_ethdev/ethdev_private.c | 10 ++-
lib/librte_ethdev/ethdev_private.h | 6 ++
lib/librte_ethdev/rte_ethdev.c | 87 ++
lib/librte_ethdev/rte_ethdev.h | 56 ++
lib/librte_ethdev/rte_ethdev_version.map | 2 +
6 files changed, 166 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/common/include/rte_common.h
b/lib/librte_eal/common/include/rte_common.h
index 069c13ec7..2269e5456 100644
--- a/lib/librte_eal/common/include/rte_common.h
+++ b/lib/librte_eal/common/include/rte_common.h
@@ -164,6 +164,12 @@ static void __attribute__((destructor(RTE_PRIO(prio)),
used)) func(void)
*/
#define RTE_PTR_DIFF(ptr1, ptr2) ((uintptr_t)(ptr1) - (uintptr_t)(ptr2))
+/**
+ * Workaround to cast a const field of a structure to non-const type.
+ */
+#define RTE_CAST_FIELD(var,field,type) \
+ (*(type*)((uintptr_t)(var) + offsetof(typeof(*(var)), field)))
+
/*** Macros/static functions for doing alignment /
diff --git a/lib/librte_ethdev/ethdev_private.c
b/lib/librte_ethdev/ethdev_private.c
index 768c8b2ed..acc787dba 100644
--- a/lib/librte_ethdev/ethdev_private.c
+++ b/lib/librte_ethdev/ethdev_private.c
@@ -5,6 +5,14 @@
#include "rte_ethdev.h"
#include "ethdev_private.h"
+uint16_t
+eth_dev_to_id(const struct rte_eth_dev *dev)
+{
+ if (dev == NULL)
+ return RTE_MAX_ETHPORTS;
+ return dev - rte_eth_devices;
+}
+
struct rte_eth_dev *
eth_find_device(const struct rte_eth_dev *start, rte_eth_cmp_t cmp,
const void *data)
@@ -18,7 +26,7 @@ eth_find_device(const struct rte_eth_dev *start,
rte_eth_cmp_t cmp,
start > &rte_eth_devices[RTE_MAX_ETHPORTS]))
return NULL;
if (start != NULL)
- idx = start - &rte_eth_devices[0] + 1;
+ idx = eth_dev_to_id(start) + 1;
else
idx = 0;
for (; idx < RTE_MAX_ETHPORTS; idx++) {
diff --git a/lib/librte_ethdev/ethdev_private.h
b/lib/librte_ethdev/ethdev_private.h
index 0f5c6d5c4..e67cf6831 100644
--- a/lib/librte_ethdev/ethdev_private.h
+++ b/lib/librte_ethdev/ethdev_private.h
@@ -11,6 +11,12 @@
extern "C" {
#endif
+/*
+ * Convert rte_eth_dev pointer to port id.
+ * NULL will be translated to RTE_MAX_ETHPORTS.
+ */
+uint16_t eth_dev_to_id(const struct rte_eth_dev *dev);
+
/* Generic rte_eth_dev comparison function. */
typedef int (*rte_eth_cmp_t)(const struct rte_eth_dev *, const void *);
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index ef99f7068..83ab28c23 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -36,11 +36,13 @@
#include
#include
#include
+#include
#include "rte_ether.h"
#include "rte_ethdev.h"
#include "rte_ethdev_driver.h"
#include "ethdev_profile.h"
+#include "ethdev_private.h"
int rte_eth_dev_logtype;
@@ -181,6 +183,91 @@ enum {
STAT_QMAP_RX
};
+int __rte_experimental
+rte_eth_iterator_init(struct rte_dev_iterator *iter, const char *devargs_str)
+{
+#define iter_anybus_str "class=eth,"
+ int ret;
+ struct rte_devargs devargs;
+ const char *bus_param_key;
+ char *bus_str;
+ size_t bus_str_size;
+
+ memset(iter, 0, sizeof(*iter));
+
+ /*
+* The devargs string may use various syntaxes:
+* - :08:00.0,representor=[1-3]
+* - pci::06:00.0,representor=[0,5]
+* A new syntax is in development (not yet supported):
+* - bus=X,paramX=x/class=Y,paramY=y/driver=Z,paramZ=z
+*/
+
+ /* Split bus, device and parameters. */
+ ret = rte_devargs_parse(&devargs, devargs_str);
+ if (ret != 0)
+ return ret;
+
+ /* Assume parameters of old syntax can match only at ethdev level. */
+ iter->cls_str = devargs.args;
+
+ iter->bus = devargs.bus;
+ if (iter->bus->dev_iterate == NULL)
+ ret = -ENOTSUP; /* share error log with below */
+
+ /* Convert bus args to new syntax for use with new API dev_iterate. */
+ if (strcmp(iter->bus->name, "vdev") == 0)
+ bus_param_key = "name";
+ else if (strcmp(iter->bus->name, "pci") == 0)
+ bus_param_key = "addr";
+ else
+ ret = -ENOTSUP;
+ if (ret < 0) {
+ RTE_LOG(ERR, EAL, "Bus %s does not support iterating.\n",
+ iter->bus->name);
+ return -ENOTSUP;
+ }
+ bus_str_size = strlen(bus_param_key) + strlen(devargs.name) + 2;
+ bus_str = malloc(bus_str_size);
+ if (bus_str == NULL)
+ return -ENOMEM;
+ ret = snprintf(bus_str, bus_str_size, "%s=%s",
+ bus_param_key, devargs.name);
+ if (ret < 0) {
+ free(bus_str);
+ return -EINVAL;
+ }
Re: [dpdk-dev] [PATCH v2 0/3] ethdev: add generic TTL rewrite actions
On 18-10-05 13:52:03, Ferruh Yigit wrote: > On 9/25/2018 3:37 PM, Xiaoyu Min wrote: > > This patch series is for RFC[1] > > > > Patch 1 adds generic TTL rewrite actions to flow API > > Patch 2 adds corresponding testpmd commands > > Patch 3 implements the offloading logic of E-Switch rules on Mellanox MLX5 > > > > [1]: > > https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatches.dpdk.org%2Fpatch%2F43617%2F&data=02%7C01%7Cjackmin%40mellanox.com%7Cf0b174a17cc549c8c6a108d62ac15e73%7Ca652971c7d2e4d9ba6a4d149256f461b%7C0%7C0%7C636743407334308856&sdata=WQy0UYGPK2uZOJ7hhDsMHjNhj05vx9BVpvzCwKlYjWE%3D&reserved=0 > > > > V2: > > * fix misspelled issues reported by checkpatch > > > > Xiaoyu Min (3): > > ethdev: add generic TTL rewrite actions > > app/testpmd: add commands of modify TTL > > net/mlx5: eswitch-modify TTL actions > > Can you please rebase on top of latest next-net? I guess Adrien's "flow API > object converter" causing conflict with existing rte_flow patches. Sure, I'll rebase on latest next-net and address change requests in next version -Jack
Re: [dpdk-dev] [PATCH 0/3] ethdev: add generic MAC address rewrite actions
On 18-10-05 13:54:38, Ferruh Yigit wrote: > On 9/25/2018 4:03 PM, Xiaoyu Min wrote: > > This series is for RFC[1] > > > > Patch 1 adds generic MAC address rewrite actions to flow API > > Patch 2 adds testpmd commands for that > > Patch 3 offloads these actions on Mellanox MLX5 by using E-Switch rule > > > > [1]: > > https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatches.dpdk.org%2Fpatch%2F44005%2F&data=02%7C01%7Cjackmin%40mellanox.com%7C47ee836f61fc48f0d5fa08d62ac1b9b4%7Ca652971c7d2e4d9ba6a4d149256f461b%7C0%7C0%7C636743408874175728&sdata=8KZfEwLk4zC0%2BBIWhRtFVcSKQ%2Fmqe6StiU79eseNARs%3D&reserved=0 > > > > Xiaoyu Min (3): > > ethdev: add generic MAC address rewrite actions > > app/testpmd: add commands of modify MAC address > > net/mlx5: eswitch-modify MAC address actions > > Same here, can you please rebase and send new version? > And it looks like there are change requests to mlx5 patch. Sure, I will do that -Jack
Re: [dpdk-dev] [PATCH] eal: remove experimental from hotplug add/remove
> -Original Message-
> From: Yigit, Ferruh
> Sent: Tuesday, October 02, 2018 18:24
> To: Andrew Rybchenko ; Xu, Rosen
> ; Zhang, Tianfei
> Cc: dev@dpdk.org; Thomas Monjalon ; Stokes, Ian
>
> Subject: Re: [dpdk-dev] [PATCH] eal: remove experimental from hotplug
> add/remove
>
> On 10/2/2018 11:08 AM, Andrew Rybchenko wrote:
> > On 10/2/18 2:04 PM, Ferruh Yigit wrote:
> >> rte_eal_hotplug_add() & rte_eal_hotplug_remove() APIs first added on
> >> v17.08 as experimental
> >> Commit a3ee360f4440 ("eal: add hotplug add/remove device")
> >>
> >> When __rte_experimental tag created, APIs tagged with it on v18.02
> >> Commit 77b7b81e32e9 ("add experimental tag to appropriate functions")
> >>
> >> After rte_eth_dev_attach() & rte_eth_dev_detach() APIs has been
> >> deprecated in v18.08 eal APIs are only ones for hotplug operations
> >> Commit 9f2be5b3db8b ("ethdev: deprecate attach and detach functions")
> >>
> >> These APIs are around for a few releases now and without an
> >> alternative, removing the experimental tag from them.
> >>
> >> Signed-off-by: Ferruh Yigit
> >
> > Dup of http://patches.dpdk.org/patch/45791/ ?
>
> Ahh, yes it is, I will mark this as Rejected, thanks.
Just back from holiday, a long story of this patch and 45791 :)
Re: [dpdk-dev] [PATCH] net/ifc: add live migration support
Hi Ferruh,
> -Original Message-
> From: Yigit, Ferruh
> Sent: Tuesday, October 2, 2018 10:46 PM
> To: Wang, Xiao W ; Bie, Tiwei
> Cc: dev@dpdk.org; Ye, Xiaolong ; Wang, Zhihong
> ; Chao Zhu ;
> Thomas Monjalon ; Xu, Qian Q
> Subject: Re: [dpdk-dev] [PATCH] net/ifc: add live migration support
>
> On 9/21/2018 12:55 AM, Ferruh Yigit wrote:
> > On 9/10/2018 12:01 PM, Xiao Wang wrote:
> >> IFCVF can help to log dirty page in live migration stage,
> >> each queue's index can be read and configured to support
> >> VHOST_USER_GET_VRING_BASE and VHOST_USER_SET_VRING_BASE.
> >>
> >> Signed-off-by: Xiao Wang
> >
> > <...>
> >
> >> +static void
> >> +ifcvf_used_ring_log(struct ifcvf_hw *hw, uint32_t queue, uint8_t *log_buf)
> >> +{
> >> + uint32_t i, size;
> >> + uint64_t pfn;
> >> +
> >> + pfn = hw->vring[queue].used / PAGE_SIZE;
> >> + size = hw->vring[queue].size * sizeof(struct vring_used_elem) +
> >> + sizeof(__virtio16) * 3;
> >
> > Getting a build error for PowerPC [1], can someone from PPC side confirm it
> please?
> >
> > [1]
> > .../drivers/net/ifc/ifcvf_vdpa.c: In function ‘ifcvf_used_ring_log’:
> > .../drivers/net/ifc/ifcvf_vdpa.c:288:11: error: ‘__virtio16’ undeclared
> > (first
> > use in this function)
> > sizeof(__virtio16) * 3;
> >^~
>
> Also "__virtio16" seems added into Linux kernel on v3.19. Systems with kernel
> version less than this causing build error.
>
> Can we replace "__virtio16" usage with basic types to prevent build error?
> If so can you please send this as a fix patch?
Yes, will do that.
BRs,
Xiao
>
> Thanks,
> ferruh
[dpdk-dev] [PATCH] net/ifc: fix build with type virtio16
The typedef of "__virtio16" is introduced into Linux kernel in v3.19.
To prevent build error on old kernel, this patch replaces the
"__virtio" usage with "uint16_t".
Fixes: d7fe5a2861e7 ("net/ifc: support live migration")
Signed-off-by: Xiao Wang
---
drivers/net/ifc/ifcvf_vdpa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifc/ifcvf_vdpa.c
index 7d3085d8d..9d5594678 100644
--- a/drivers/net/ifc/ifcvf_vdpa.c
+++ b/drivers/net/ifc/ifcvf_vdpa.c
@@ -285,7 +285,7 @@ ifcvf_used_ring_log(struct ifcvf_hw *hw, uint32_t queue,
uint8_t *log_buf)
pfn = hw->vring[queue].used / PAGE_SIZE;
size = hw->vring[queue].size * sizeof(struct vring_used_elem) +
- sizeof(__virtio16) * 3;
+ sizeof(uint16_t) * 3;
for (i = 0; i <= size / PAGE_SIZE; i++)
__sync_fetch_and_or_8(&log_buf[(pfn + i) / 8],
--
2.15.1
Re: [dpdk-dev] [PATCH v3 1/3] ring: read tail using atomic load
> > > > I doubt it is possible to benchmark with such a precision so to see the > > potential difference of one ADD instruction. > > Just changes in function alignment can affect performance by percents. > And > > the natural variation when not using a 100% deterministic system is > going > to > > be a lot larger than one cycle per ring buffer operation. > > > > Some of the other patches are also for correctness (e.g. load-acquire of > tail) > The discussion is about this patch alone. Other patches are already Acked. > So the benchmarking then makes zero sense. The whole point is to prove the effect of 1 instruction either way. IMO, it is simple enough, follow the memory model to the full extent. We have to keep in mind about other architectures as well. May be that additional instruction is not required on other architectures. > >
Re: [dpdk-dev] [PATCH v3 1/3] ring: read tail using atomic load
-Original Message-
> Date: Sun, 7 Oct 2018 20:44:54 +
> From: Ola Liljedahl
> To: Jerin Jacob
> CC: "dev@dpdk.org" , Honnappa Nagarahalli
> , "Ananyev, Konstantin"
> , "Gavin Hu (Arm Technology China)"
> , Steve Capper , nd ,
> "sta...@dpdk.org"
> Subject: Re: [PATCH v3 1/3] ring: read tail using atomic load
> user-agent: Microsoft-MacOutlook/10.11.0.180909
>
Could you please fix the email client for inline reply.
https://www.kernel.org/doc/html/v4.19-rc7/process/email-clients.html
>
> On 07/10/2018, 06:03, "Jerin Jacob" wrote:
>
> In arm64 case, it will have ATOMIC_RELAXED followed by asm volatile
> ("":::"memory") of rte_pause().
> I would n't have any issue, if the generated code code is same or better
> than the exiting case. but it not the case, Right?
> The existing case is actually not interesting (IMO) as it exposes undefined
> behaviour which allows the compiler to do anything. But you seem to be
> satisfied with "works for me, right here right now". I think the cost of
> avoiding undefined behaviour is acceptable (actually I don't think it even
> will be noticeable).
I am not convinced because of use of volatile in head and tail indexes.
For me that brings the defined behavior.That the reason why I shared
the generated assembly code. If you think other way, Pick any compiler
and see generated output.
And
Freebsd implementation of ring buffer(Which DPDK derived from), Don't have
such logic, See
https://github.com/freebsd/freebsd/blob/master/sys/sys/buf_ring.h#L108
See below too.
>
> Skipping the compiler memory barrier in rte_pause() potentially allows for
> optimisations that provide much more benefit, e.g. hiding some cache miss
> latency for later loads. The DPDK ring buffer implementation is defined so to
> enable inlining of enqueue/dequeue functions into the caller, any code could
> immediately follow these calls.
>
> From INTERNATIONAL STANDARD ©ISO/IEC ISO/IEC 9899:201x
> Programming languages — C
>
> 5.1.2.4
> 4 Two expression evaluations conflict if one of them modifies a memory
> location and the other one reads or modifies the same memory location.
>
> 25 The execution of a program contains a data race if it contains two
> conflicting actions in different threads, at least one of which is not
> atomic, and neither happens before the other. Any such data race results in
> undefined behavior.
IMO, Both condition will satisfy if the variable is volatile and 32bit read
will atomic
for 32b and 64b machines. If not, the problem persist for generic case
as well(lib/librte_ring/rte_ring_generic.h)
I agree with you on C11 memory model semantics usage. The reason why I
propose name for the file as rte_ring_c11_mem.h as DPDK it self did not
had definitions for load acquire and store release semantics.
I was looking for taking load acquire and store release semantics
from C11 instead of creating new API like Linux kernel for FreeBSD(APIs
like atomic_load_acq_32(), atomic_store_rel_32()). If the file name is your
concern then we could create new abstractions as well. That would help
exiting KNI problem as well.
I think, currently it mixed usage because, the same variable declaration
used for C11 vs non C11 usage.Ideally we wont need "volatile" for C11
case. Either we need to change only to C11 mode OR have APIs for
atomic_load_acq_() and atomic_store_rel_() to allow both models like
Linux kernel and FreeBSD.
>
> -- Ola
>
>
>
Re: [dpdk-dev] [PATCH] eal/armv7: add support for rte pause
-Original Message-
> Date: Sun, 7 Oct 2018 21:09:25 +
> From: Ola Liljedahl
> To: Jerin Jacob , Jan Viktorin
> , "Gavin Hu (Arm Technology China)"
>
> CC: "dev@dpdk.org" , "tho...@monjalon.net"
>
> Subject: Re: [dpdk-dev] [PATCH] eal/armv7: add support for rte pause
> user-agent: Microsoft-MacOutlook/10.11.0.180909
>
> External Email
>
> On 07/10/2018, 08:32, "Jerin Jacob" wrote:
>
> Add support for rte_pause() implementation for armv7.
>
> Signed-off-by: Jerin Jacob
> ---
>
> The reference implementation for Linux's cpu_relax() for armv7 is at
>
> https://elixir.bootlin.com/linux/latest/source/arch/arm/include/asm/processor.h#L100
>
> ---
> lib/librte_eal/common/include/arch/arm/rte_pause_32.h | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/lib/librte_eal/common/include/arch/arm/rte_pause_32.h
> b/lib/librte_eal/common/include/arch/arm/rte_pause_32.h
> index d4768c7a9..9b856e0cf 100644
> --- a/lib/librte_eal/common/include/arch/arm/rte_pause_32.h
> +++ b/lib/librte_eal/common/include/arch/arm/rte_pause_32.h
> @@ -9,11 +9,13 @@
> extern "C" {
> #endif
>
> -#include
> +#include
> +
> #include "generic/rte_pause.h"
>
> static inline void rte_pause(void)
> {
> +rte_compiler_barrier();
> The compiler barrier is not mandated by the DPDK documentation for
> rte_pause():
> http://doc.dpdk.org/api/rte__pause_8h.html
We can add that explicitly if required to inline with other arch. Just like
Linux kernel's cpu_relax()
>
> You have to go all the way to the source and GCC documentation to discover
> that for GCC, rte_pause calls _mm_pause() which in turn is implemented using
> __builtin_ia32_pause().
> https://gcc.gnu.org/onlinedocs/gcc-4.9.2/gcc/X86-Built-in-Functions.html
> void __builtin_ia32_pause (void)
> Generates the pause machine instruction with a compiler memory barrier.
Yes. IMO, it makes sense to have compiler memory barrier to make sure it
waits semantically at least WRT current rte_pause() usage.
>
> If you are using C11 atomic operations e.g. for polling a location, the
> atomic operations will be able to provide the required semantics (e.g. don't
> merge atomic loads from different iterations of a loop, optionally provide
> acquire and/or release (or stronger) ordering. A compiler barrier here
> interferes with the (possibly weaker) barriers from the atomic operations. We
> could use a C11-version of rte_pause() that doesn't have the compiler
> barrier. But actually, we want support for WFE, x86 also has something
> similar now, MONITOR/MWAIT
If it is WFE then who will wake up from the power saving state. SEV from the
other thread?
What would be a C11 version of rte_pause()?
>
> -- Ola
>
>
> }
>
> #ifdef __cplusplus
> --
> 2.19.0
>
>
>
> IMPORTANT NOTICE: The contents of this email and any attachments are
> confidential and may also be privileged. If you are not the intended
> recipient, please notify the sender immediately and do not disclose the
> contents to any other person, use it for any purpose, or store or copy the
> information in any medium. Thank you.
Re: [dpdk-dev] [PATCH 1/5] bus/vdev: add iteration filter on name
On 10/8/18 1:25 AM, Thomas Monjalon wrote:
A virtual device can be matched with following syntax:
bus=vdev,name=X
Signed-off-by: Thomas Monjalon
---
drivers/bus/vdev/vdev_params.c | 21 ++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/drivers/bus/vdev/vdev_params.c b/drivers/bus/vdev/vdev_params.c
index da270f2ec..133998c3e 100644
--- a/drivers/bus/vdev/vdev_params.c
+++ b/drivers/bus/vdev/vdev_params.c
@@ -2,6 +2,8 @@
* Copyright 2018 Gaëtan Rivet
*/
+#include
+
#include
#include
#include
@@ -11,10 +13,12 @@
#include "vdev_private.h"
enum vdev_params {
+ RTE_VDEV_PARAM_NAME,
RTE_VDEV_PARAM_MAX,
};
static const char * const vdev_params_keys[] = {
+ [RTE_VDEV_PARAM_NAME] = "name",
[RTE_VDEV_PARAM_MAX] = NULL,
};
@@ -22,11 +26,22 @@ static int
vdev_dev_match(const struct rte_device *dev,
const void *_kvlist)
{
+ int ret;
const struct rte_kvargs *kvlist = _kvlist;
+ char *name;
+
+ /* cannot pass const dev->name to rte_kvargs_process() */
+ name = strdup(dev->name);
+ if (name == NULL)
+ return -ENOMEM; /* interpreted as no match */
It is strange to see -ENOMEM and -1 returned from the same function.
rte_dev_cmp_t does not return negative errno. It just says match /
no match (greater / smaller than 0 if ordering is possible).
So, -ENOMEM is really confusing here. I think just -1 should be used.
+ ret = rte_kvargs_process(kvlist,
+ vdev_params_keys[RTE_VDEV_PARAM_NAME],
+ rte_kvargs_strcmp, name);
+ free(name);
+ if (ret != 0)
+ return -1;
- (void) kvlist;
- (void) dev;
- return 0;
+ return ret;
I'm not sure that I understand why 'ret' is returned here
instead of 0. Above check guarantees that ret==0.
If you change it, it should be a good reason.
}
void *
Re: [dpdk-dev] [PATCH 3/3] net/mlx5: eswitch-modify TTL actions
On 18-10-04 04:07:02, Yongseok Koh wrote:
> On Tue, Sep 25, 2018 at 09:47:18PM +0800, Xiaoyu Min wrote:
> > Offload following modify TTL actions to E-Swtich via
> > TC-Flower driver
> >
> > - RTE_FLOW_ACTION_TYPE_SET_TTL
> > - RTE_FLOW_ACTION_TYPE_DEC_TTL
> >
> > The corresponding IP protocol rte_flow_item_ipv[4|6]
> > must be present in rte_flow pattern otherwith PMD
> > return error
> >
> > Signed-off-by: Xiaoyu Min
> > ---
>
> As it is quite similar to the other patch of IP addr and UDP/TCP port, I have
> the same comments on this patch too.
>
> Two more things.
>
> 1) commit title.
> 'eswitch' isn't allowed. Like you mentioned in the commit message, it is
> officially E-Switch. And I'm curious why '-' is needed for the title.
>
Yes you are right I should use officially one.
'-' is wrongly used, I will remove it.
> 2) MLX5_ACTION_*
> As there are a few more pending patches which add new actions - encap/decap
> and
> multi-table, we may have to have final rebasing in order at the last moment.
>
Definitely we need.
>
> Thanks,
> Yongseok
>
> > drivers/net/mlx5/mlx5_flow.h | 2 +
> > drivers/net/mlx5/mlx5_flow_tcf.c | 74 +++-
> > 2 files changed, 74 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
> > index be182a643..5237e31dd 100644
> > --- a/drivers/net/mlx5/mlx5_flow.h
> > +++ b/drivers/net/mlx5/mlx5_flow.h
> > @@ -93,6 +93,8 @@
> > #define MLX5_ACTION_SET_IPV6_DST (1u << 14)
> > #define MLX5_ACTION_SET_TP_SRC (1u << 15)
> > #define MLX5_ACTION_SET_TP_DST (1u << 16)
> > +#define MLX5_ACTION_SET_TTL (1u << 17)
> > +#define MLX5_ACTION_DEC_TTL (1u << 18)
> >
> > /* possible L3 layers protocols filtering. */
> > #define MLX5_IP_PROTOCOL_TCP 6
> > diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c
> > b/drivers/net/mlx5/mlx5_flow_tcf.c
> > index 85c92f369..af88c4a0d 100644
> > --- a/drivers/net/mlx5/mlx5_flow_tcf.c
> > +++ b/drivers/net/mlx5/mlx5_flow_tcf.c
> > @@ -217,6 +217,10 @@ struct tc_pedit_sel {
> > #define TP_PORT_LEN 2 /* Transport Port (UDP/TCP) Length */
> > #endif
> >
> > +#ifndef TTL_LEN
> > +#define TTL_LEN 1
> > +#endif
> > +
> > /** Empty masks for known item types. */
> > static const union {
> > struct rte_flow_item_port_id port_id;
> > @@ -297,7 +301,9 @@ struct flow_tcf_ptoi {
> > (act) == RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC || \
> > (act) == RTE_FLOW_ACTION_TYPE_SET_IPV6_DST || \
> > (act) == RTE_FLOW_ACTION_TYPE_SET_TP_SRC|| \
> > - (act) == RTE_FLOW_ACTION_TYPE_SET_TP_DST) ?\
> > + (act) == RTE_FLOW_ACTION_TYPE_SET_TP_DST|| \
> > + (act) == RTE_FLOW_ACTION_TYPE_SET_TTL || \
> > + (act) == RTE_FLOW_ACTION_TYPE_DEC_TTL) ? \
> > 1 : 0; })
> > #define MAX_PEDIT_KEYS (128)
> > #define SZ_PEDIT_KEY_VAL (4)
> > @@ -321,6 +327,34 @@ flow_tcf_calc_pedit_keys(const uint64_t size)
> > return keys;
> > }
> >
> > +static void
> > +flow_tcf_pedit_key_set_dec_ttl(const struct rte_flow_action *actions,
> > + struct pedit_parser *p_parser,
> > + uint64_t item_flags)
> > +{
> > + int idx = p_parser->sel.nkeys;
> > +
> > + p_parser->keys[idx].mask = 0xFF00;
> > + if (item_flags & MLX5_FLOW_LAYER_OUTER_L3_IPV4) {
> > + p_parser->keys_ex[idx].htype = TCA_PEDIT_KEY_EX_HDR_TYPE_IP4;
> > + p_parser->keys[idx].off = 8; /* IPv4 TTL Offset */
> > + }
> > + if (item_flags & MLX5_FLOW_LAYER_OUTER_L3_IPV6) {
> > + p_parser->keys_ex[idx].htype = TCA_PEDIT_KEY_EX_HDR_TYPE_IP6;
> > + p_parser->keys[idx].off = 7; /* IPv6 HopLimit Offset */
> > + }
> > + if (actions->type == RTE_FLOW_ACTION_TYPE_DEC_TTL) {
> > + p_parser->keys_ex[idx].cmd = TCA_PEDIT_KEY_EX_CMD_ADD;
> > + p_parser->keys[idx].val = 0xFF;
> > + } else {
> > + p_parser->keys_ex[idx].cmd = TCA_PEDIT_KEY_EX_CMD_SET;
> > + p_parser->keys[idx].val =
> > + ((const struct rte_flow_action_set_ttl *)
> > +actions->conf)->ttl_value;
> > + }
> > + p_parser->sel.nkeys = (++idx);
> > +}
> > +
> > static void
> > flow_tcf_pedit_key_set_tp_port(const struct rte_flow_action *actions,
> > struct pedit_parser *p_parser,
> > @@ -408,6 +442,11 @@ flow_tcf_create_pedit_mnl_msg(struct nlmsghdr *nl,
> > flow_tcf_pedit_key_set_tp_port(*actions,
> > &p_parser, item_flags);
> > break;
> > + case RTE_FLOW_ACTION_TYPE_SET_TTL:
> > + case RTE_FLOW_ACTION_TYPE_DEC_TTL:
> > + flow_tcf_pedit_key_set_dec_ttl(*actions,
> > + &p_parser, item_flags);
> > + break;
> > default:
> > goto pedit_mnl_msg_done
