git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: add rte prefix to ether structures
[dpdk.git]
/
doc
/
guides
/
sample_app_ug
/
flow_classify.rst
diff --git
a/doc/guides/sample_app_ug/flow_classify.rst
b/doc/guides/sample_app_ug/flow_classify.rst
index
5247477
..
9582b93
100644
(file)
--- a/
doc/guides/sample_app_ug/flow_classify.rst
+++ b/
doc/guides/sample_app_ug/flow_classify.rst
@@
-24,7
+24,7
@@
The application is located in the ``flow_classify`` sub-directory.
Running the Application
-----------------------
Running the Application
-----------------------
-To run the example in a ``linux
app
`` environment:
+To run the example in a ``linux`` environment:
.. code-block:: console
.. code-block:: console
@@
-91,7
+91,7
@@
initialisation of the ``Flow Classify`` application..
.size = sizeof(uint8_t),
.field_index = PROTO_FIELD_IPV4,
.input_index = PROTO_INPUT_IPV4,
.size = sizeof(uint8_t),
.field_index = PROTO_FIELD_IPV4,
.input_index = PROTO_INPUT_IPV4,
- .offset = sizeof(struct ether_hdr) +
+ .offset = sizeof(struct
rte_
ether_hdr) +
offsetof(struct ipv4_hdr, next_proto_id),
},
/* next input field (IPv4 source address) - 4 consecutive bytes. */
offsetof(struct ipv4_hdr, next_proto_id),
},
/* next input field (IPv4 source address) - 4 consecutive bytes. */
@@
-101,7
+101,7
@@
initialisation of the ``Flow Classify`` application..
.size = sizeof(uint32_t),
.field_index = SRC_FIELD_IPV4,
.input_index = SRC_INPUT_IPV4,
.size = sizeof(uint32_t),
.field_index = SRC_FIELD_IPV4,
.input_index = SRC_INPUT_IPV4,
- .offset = sizeof(struct ether_hdr) +
+ .offset = sizeof(struct
rte_
ether_hdr) +
offsetof(struct ipv4_hdr, src_addr),
},
/* next input field (IPv4 destination address) - 4 consecutive bytes. */
offsetof(struct ipv4_hdr, src_addr),
},
/* next input field (IPv4 destination address) - 4 consecutive bytes. */
@@
-111,7
+111,7
@@
initialisation of the ``Flow Classify`` application..
.size = sizeof(uint32_t),
.field_index = DST_FIELD_IPV4,
.input_index = DST_INPUT_IPV4,
.size = sizeof(uint32_t),
.field_index = DST_FIELD_IPV4,
.input_index = DST_INPUT_IPV4,
- .offset = sizeof(struct ether_hdr) +
+ .offset = sizeof(struct
rte_
ether_hdr) +
offsetof(struct ipv4_hdr, dst_addr),
},
/*
offsetof(struct ipv4_hdr, dst_addr),
},
/*
@@
-124,7
+124,7
@@
initialisation of the ``Flow Classify`` application..
.size = sizeof(uint16_t),
.field_index = SRCP_FIELD_IPV4,
.input_index = SRCP_DESTP_INPUT_IPV4,
.size = sizeof(uint16_t),
.field_index = SRCP_FIELD_IPV4,
.input_index = SRCP_DESTP_INPUT_IPV4,
- .offset = sizeof(struct ether_hdr) +
+ .offset = sizeof(struct
rte_
ether_hdr) +
sizeof(struct ipv4_hdr) +
offsetof(struct tcp_hdr, src_port),
},
sizeof(struct ipv4_hdr) +
offsetof(struct tcp_hdr, src_port),
},
@@
-134,7
+134,7
@@
initialisation of the ``Flow Classify`` application..
.size = sizeof(uint16_t),
.field_index = DSTP_FIELD_IPV4,
.input_index = SRCP_DESTP_INPUT_IPV4,
.size = sizeof(uint16_t),
.field_index = DSTP_FIELD_IPV4,
.input_index = SRCP_DESTP_INPUT_IPV4,
- .offset = sizeof(struct ether_hdr) +
+ .offset = sizeof(struct
rte_
ether_hdr) +
sizeof(struct ipv4_hdr) +
offsetof(struct tcp_hdr, dst_port),
},
sizeof(struct ipv4_hdr) +
offsetof(struct tcp_hdr, dst_port),
},
@@
-187,7
+187,7
@@
The ``main()`` function also initializes all the ports using the user defined
.. code-block:: c
.. code-block:: c
-
for (portid = 0; portid < nb_ports; portid++
) {
+
RTE_ETH_FOREACH_DEV(portid
) {
if (port_init(portid, mbuf_pool) != 0) {
rte_exit(EXIT_FAILURE,
"Cannot init port %" PRIu8 "\n", portid);
if (port_init(portid, mbuf_pool) != 0) {
rte_exit(EXIT_FAILURE,
"Cannot init port %" PRIu8 "\n", portid);
@@
-275,13
+275,10
@@
Forwarding application is shown below:
{
struct rte_eth_conf port_conf = port_conf_default;
const uint16_t rx_rings = 1, tx_rings = 1;
{
struct rte_eth_conf port_conf = port_conf_default;
const uint16_t rx_rings = 1, tx_rings = 1;
- struct ether_addr addr;
+ struct
rte_
ether_addr addr;
int retval;
uint16_t q;
int retval;
uint16_t q;
- if (port >= rte_eth_dev_count())
- return -1;
-
/* Configure the Ethernet device. */
retval = rte_eth_dev_configure(port, rx_rings, tx_rings, &port_conf);
if (retval != 0)
/* Configure the Ethernet device. */
retval = rte_eth_dev_configure(port, rx_rings, tx_rings, &port_conf);
if (retval != 0)
@@
-424,14
+421,13
@@
following:
static __attribute__((noreturn)) void
lcore_main(cls_app)
{
static __attribute__((noreturn)) void
lcore_main(cls_app)
{
- const uint8_t nb_ports = rte_eth_dev_count();
- uint8_t port;
+ uint16_t port;
/*
* Check that the port is on the same NUMA node as the polling thread
* for best performance.
*/
/*
* Check that the port is on the same NUMA node as the polling thread
* for best performance.
*/
-
for (port = 0; port < nb_ports; port++
)
+
RTE_ETH_FOREACH_DEV(port
)
if (rte_eth_dev_socket_id(port) > 0 &&
rte_eth_dev_socket_id(port) != (int)rte_socket_id()) {
printf("\n\n");
if (rte_eth_dev_socket_id(port) > 0 &&
rte_eth_dev_socket_id(port) != (int)rte_socket_id()) {
printf("\n\n");
@@
-451,7
+447,7
@@
following:
* Receive packets on a port and forward them on the paired
* port. The mapping is 0 -> 1, 1 -> 0, 2 -> 3, 3 -> 2, etc.
*/
* Receive packets on a port and forward them on the paired
* port. The mapping is 0 -> 1, 1 -> 0, 2 -> 3, 3 -> 2, etc.
*/
-
for (port = 0; port < nb_ports; port++
) {
+
RTE_ETH_FOREACH_DEV(port
) {
/* Get burst of RX packets, from first port of pair. */
struct rte_mbuf *bufs[BURST_SIZE];
/* Get burst of RX packets, from first port of pair. */
struct rte_mbuf *bufs[BURST_SIZE];
@@
-501,7
+497,7
@@
The main work of the application is done within the loop:
.. code-block:: c
for (;;) {
.. code-block:: c
for (;;) {
-
for (port = 0; port < nb_ports; port++
) {
+
RTE_ETH_FOREACH_DEV(port
) {
/* Get burst of RX packets, from first port of pair. */
struct rte_mbuf *bufs[BURST_SIZE];
/* Get burst of RX packets, from first port of pair. */
struct rte_mbuf *bufs[BURST_SIZE];