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/vhost: fix potential memory leak on close
[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
a009596
..
dc40b4d
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,8
+91,8
@@
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) +
- offsetof(struct ipv4_hdr, next_proto_id),
+ .offset = sizeof(struct
rte_
ether_hdr) +
+ offsetof(struct
rte_
ipv4_hdr, next_proto_id),
},
/* next input field (IPv4 source address) - 4 consecutive bytes. */
{
},
/* next input field (IPv4 source address) - 4 consecutive bytes. */
{
@@
-101,8
+101,8
@@
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) +
- offsetof(struct ipv4_hdr, src_addr),
+ .offset = sizeof(struct
rte_
ether_hdr) +
+ offsetof(struct
rte_
ipv4_hdr, src_addr),
},
/* next input field (IPv4 destination address) - 4 consecutive bytes. */
{
},
/* next input field (IPv4 destination address) - 4 consecutive bytes. */
{
@@
-111,8
+111,8
@@
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) +
- offsetof(struct ipv4_hdr, dst_addr),
+ .offset = sizeof(struct
rte_
ether_hdr) +
+ offsetof(struct
rte_
ipv4_hdr, dst_addr),
},
/*
* Next 2 fields (src & dst ports) form 4 consecutive bytes.
},
/*
* Next 2 fields (src & dst ports) form 4 consecutive bytes.
@@
-124,9
+124,9
@@
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) +
- sizeof(struct ipv4_hdr) +
- offsetof(struct tcp_hdr, src_port),
+ .offset = sizeof(struct
rte_
ether_hdr) +
+ sizeof(struct
rte_
ipv4_hdr) +
+ offsetof(struct
rte_
tcp_hdr, src_port),
},
{
/* rte_flow uses a bit mask for protocol ports */
},
{
/* rte_flow uses a bit mask for protocol ports */
@@
-134,9
+134,9
@@
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) +
- sizeof(struct ipv4_hdr) +
- offsetof(struct tcp_hdr, dst_port),
+ .offset = sizeof(struct
rte_
ether_hdr) +
+ sizeof(struct
rte_
ipv4_hdr) +
+ offsetof(struct
rte_
tcp_hdr, dst_port),
},
};
},
};
@@
-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)
@@
-309,7
+306,9
@@
Forwarding application is shown below:
return retval;
/* Display the port MAC address. */
return retval;
/* Display the port MAC address. */
- rte_eth_macaddr_get(port, &addr);
+ retval = rte_eth_macaddr_get(port, &addr);
+ if (retval < 0)
+ return retval;
printf("Port %u MAC: %02" PRIx8 " %02" PRIx8 " %02" PRIx8
" %02" PRIx8 " %02" PRIx8 " %02" PRIx8 "\n",
port,
printf("Port %u MAC: %02" PRIx8 " %02" PRIx8 " %02" PRIx8
" %02" PRIx8 " %02" PRIx8 " %02" PRIx8 "\n",
port,
@@
-318,7
+317,9
@@
Forwarding application is shown below:
addr.addr_bytes[4], addr.addr_bytes[5]);
/* Enable RX in promiscuous mode for the Ethernet device. */
addr.addr_bytes[4], addr.addr_bytes[5]);
/* Enable RX in promiscuous mode for the Ethernet device. */
- rte_eth_promiscuous_enable(port);
+ retval = rte_eth_promiscuous_enable(port);
+ if (retval != 0)
+ return retval;
return 0;
}
return 0;
}
@@
-329,7
+330,7
@@
The Ethernet ports are configured with default settings using the
.. code-block:: c
static const struct rte_eth_conf port_conf_default = {
.. code-block:: c
static const struct rte_eth_conf port_conf_default = {
- .rxmode = { .max_rx_pkt_len = ETHER_MAX_LEN }
+ .rxmode = { .max_rx_pkt_len =
RTE_
ETHER_MAX_LEN }
};
For this example the ports are set up with 1 RX and 1 TX queue using the
};
For this example the ports are set up with 1 RX and 1 TX queue using the
@@
-346,7
+347,7
@@
Finally the RX port is set in promiscuous mode:
.. code-block:: c
.. code-block:: c
- rte_eth_promiscuous_enable(port);
+ r
etval = r
te_eth_promiscuous_enable(port);
The Add Rules function
~~~~~~~~~~~~~~~~~~~~~~
The Add Rules function
~~~~~~~~~~~~~~~~~~~~~~
@@
-421,7
+422,7
@@
following:
.stats = (void *)&ntuple_stats
};
.stats = (void *)&ntuple_stats
};
- static __
attribute__((noreturn))
void
+ static __
rte_noreturn
void
lcore_main(cls_app)
{
uint16_t port;
lcore_main(cls_app)
{
uint16_t port;