[dpdk-dev] [PATCHv2] librte_acl make it build/work for 'default' target
Hi all, 2014-08-08 10:30, Neil Horman: > On Fri, Aug 08, 2014 at 01:09:34PM +, Ananyev, Konstantin wrote: > > > > Also I think user should have an ability to change default classify > > > > code path without modifying/rebuilding acl library. > > > I agree, but both the methods we are advocating for allow that. Its > > > really just > > > a question of exposing the mechanism as data or text in the binary. > > > Exposing it > > > as data comes with implicit ABI constraints that are less prevalanet when > > > done > > > as code entry points. > > > > > > For example: a bug in an optimised code path is discovered, or user may > > > > want to implement and use his own version of classify(). > > > Of course, he probably will report about it and we probably fix it sooner > > or later. > > But with such ability he can switch to the safe implementation immediately > > without touching the library and then wait for the fix. > > Thats not how users of a binary pacakge from a distribution operate. If their > using a binary package they either: > > 1) Don't want to rebuild anything themselves, in which case they file the bug, > and wait for the developers to fix the issue. > > or > > 2) Have a staff to help them work around the issue, which will be done by > rebuilding/fixing the library, not the application. > > With (2), what I am saying is that, if a 3rd party finds a bug in the > classifier > code within dpdk which is built as a shared library within a distribution, and > they need it fixed immediately, they have a choice of what to do, they can > either (a), write a custom classifier function and point the dpdk library to > it, > or (b), just fix the bug in the library directly. Given that, if they can > accomplish (a), they by all rights can also accompilsh (b), the only decision > they need to make is one which makes the most sense for them. The answer is > (b), because thats where the functionality lives. i.e. when the fix occurs > upstream and a new release gets issued, you can go back to using the library > maintained version, and you don't have to clean up what has become vestigial > unused code. I think it's even simpler: thinking API to allow behaviour changes without rebuilding is not sane. So we should expose all functions? Please try to reduce API as much as possible. Thanks -- Thomas
[dpdk-dev] [PATCH] pcap: Fixed bug in eth_pcap_rx function
Tested-by: Jiajia SunX
This patch fixed a bug by changing eth_pcap_rx function, and is ready to
integrate into DPDK.org.
> -Original Message-
> From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Pablo de Lara
> Sent: Tuesday, August 05, 2014 6:18 PM
> To: dev at dpdk.org
> Subject: [dpdk-dev] [PATCH] pcap: Fixed bug in eth_pcap_rx function
>
> Normally, bufs[i] stores the mbuf pointer, the index of buf[i]
> is the loop count i, but if header.len > buf_size, DPDK will
> free the mbuf, but the loop count i still increases, so some
> of the items in bufs[] might be NULL ponter, causing a potential
> DPDK core. Using num_rx as the index for bufs[] solves the problem.
>
> Signed-off-by: Pablo de Lara
> ---
> lib/librte_pmd_pcap/rte_eth_pcap.c |2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c
> b/lib/librte_pmd_pcap/rte_eth_pcap.c
> index c77ee25..eebe768 100644
> --- a/lib/librte_pmd_pcap/rte_eth_pcap.c
> +++ b/lib/librte_pmd_pcap/rte_eth_pcap.c
> @@ -154,7 +154,7 @@ eth_pcap_rx(void *queue,
> rte_memcpy(mbuf->pkt.data, packet, header.len);
> mbuf->pkt.data_len = (uint16_t)header.len;
> mbuf->pkt.pkt_len = mbuf->pkt.data_len;
> - bufs[i] = mbuf;
> + bufs[num_rx] = mbuf;
> num_rx++;
> } else {
> /* pcap packet will not fit in the mbuf, so drop
> packet */
> --
> 1.7.0.7
[dpdk-dev] [PATCH 0/6]Support VxLAN on fortville
The patch set supports VxLAN on fortville,and based on current mbuf structure, when the new mbuf structure done, there will be minor changes later. It includes: - Support VxLAN packet filter by configuring UDP port, and add tunneling UDP APIs. - Support VxLAN cloud filters: It is used to use MAC, VLAN to point to a queue. The filter types supported include below: 1. Inner MAC and Inner VLAN ID 2. Inner MAC address and inner VLAN ID, tenned ID. 3. Inner MAC and tenant ID 4. Inner MAC address 5. Outer MAC address, tenant ID and inner MAC - Support VxLAN TX check offload, which include outer and inner L3(IP), inner L4(UDP,TCP and SCTP) jijiangl (6): Add VxLAN packet identification Test vxlan packet identification in testpmd Add Cloud filter API Test cloud filter API in testpmd Add VxLAN TX checksum offload Test VxLAN Tx checksum offload app/test-pmd/cmdline.c| 220 +- app/test-pmd/config.c |6 +- app/test-pmd/csumonly.c | 194 ++-- app/test-pmd/parameters.c | 13 ++ app/test-pmd/rxonly.c | 49 ++ app/test-pmd/testpmd.c|8 + app/test-pmd/testpmd.h|9 + lib/librte_ether/rte_ethdev.c | 113 ++ lib/librte_ether/rte_ethdev.h | 148 ++ lib/librte_ether/rte_ether.h | 10 ++ lib/librte_mbuf/rte_mbuf.h|4 + lib/librte_pmd_i40e/i40e_ethdev.c | 311 - lib/librte_pmd_i40e/i40e_ethdev.h |5 + lib/librte_pmd_i40e/i40e_rxtx.c | 58 +++- 14 files changed, 1126 insertions(+), 22 deletions(-) -- 1.7.7.6
[dpdk-dev] [PATCH 1/6]i40e:vxlan packet identification
VxLAN UDP port configuration on i40e, it includes
- VxLAN UDP port initialization
- Add VxLAN UDP port API
Signed-off-by: jijiangl
Acked-by: Helin Zhang
Acked-by: Jingjing Wu
Acked-by: Jing Chen
---
lib/librte_ether/rte_ethdev.c | 63
lib/librte_ether/rte_ethdev.h | 76 ++
lib/librte_ether/rte_ether.h | 10 ++
lib/librte_pmd_i40e/i40e_ethdev.c | 199 -
lib/librte_pmd_i40e/i40e_ethdev.h |5 +
5 files changed, 352 insertions(+), 1 deletions(-)
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index fd1010a..325edb1 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1892,6 +1892,69 @@ rte_eth_dev_rss_hash_conf_get(uint8_t port_id,
}
int
+rte_eth_dev_udp_tunnel_add(uint8_t port_id,
+ struct rte_eth_udp_tunnel *udp_tunnel,
+ uint8_t count)
+{
+ uint8_t i;
+ struct rte_eth_dev *dev;
+ struct rte_eth_udp_tunnel *tunnel;
+
+ if (port_id >= nb_ports) {
+ PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+ return -ENODEV;
+ }
+
+ if (udp_tunnel == NULL) {
+ PMD_DEBUG_TRACE("Invalid udp_tunnel parameter\n");
+ return -EINVAL;
+ }
+ tunnel = udp_tunnel;
+
+ for (i = 0; i < count; i++, tunnel++) {
+ if (tunnel->prot_type >= RTE_TUNNEL_TYPE_MAX) {
+ PMD_DEBUG_TRACE("Invalid tunnel type\n");
+ return -EINVAL;
+ }
+ }
+
+ dev = &rte_eth_devices[port_id];
+ FUNC_PTR_OR_ERR_RET(*dev->dev_ops->udp_tunnel_add, -ENOTSUP);
+ return (*dev->dev_ops->udp_tunnel_add)(dev, udp_tunnel, count);
+}
+
+int
+rte_eth_dev_udp_tunnel_delete(uint8_t port_id,
+ struct rte_eth_udp_tunnel *udp_tunnel,
+ uint8_t count)
+{
+ uint8_t i;
+ struct rte_eth_dev *dev;
+ struct rte_eth_udp_tunnel *tunnel;
+
+ if (port_id >= nb_ports) {
+ PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+ return -ENODEV;
+ }
+ dev = &rte_eth_devices[port_id];
+
+ if (udp_tunnel == NULL) {
+ PMD_DEBUG_TRACE("Invalid udp_tunnel parametr\n");
+ return -EINVAL;
+ }
+ tunnel = udp_tunnel;
+ for (i = 0; i < count; i++, tunnel++) {
+ if (tunnel->prot_type >= RTE_TUNNEL_TYPE_MAX) {
+ PMD_DEBUG_TRACE("Invalid tunnel type\n");
+ return -EINVAL;
+ }
+ }
+
+ FUNC_PTR_OR_ERR_RET(*dev->dev_ops->udp_tunnel_del, -ENOTSUP);
+ return (*dev->dev_ops->udp_tunnel_del)(dev, udp_tunnel, count);
+}
+
+int
rte_eth_led_on(uint8_t port_id)
{
struct rte_eth_dev *dev;
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 50df654..d24907f 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -708,6 +708,26 @@ struct rte_fdir_conf {
};
/**
+ * Tunneled type.
+ */
+enum rte_eth_tunnel_type {
+ RTE_TUNNEL_TYPE_NONE = 0,
+ RTE_TUNNEL_TYPE_VXLAN,
+ RTE_TUNNEL_TYPE_GENEVE,
+ RTE_TUNNEL_TYPE_TEREDO,
+ RTE_TUNNEL_TYPE_NVGRE,
+ RTE_TUNNEL_TYPE_MAX,
+};
+
+/**
+ * UDP tunneling configuration.
+ */
+struct rte_eth_udp_tunnel {
+ uint16_t udp_port;
+ uint8_t prot_type;
+};
+
+/**
* Possible l4type of FDIR filters.
*/
enum rte_l4type {
@@ -829,6 +849,7 @@ struct rte_intr_conf {
* configuration settings may be needed.
*/
struct rte_eth_conf {
+ enum rte_eth_tunnel_type tunnel_type;
uint16_t link_speed;
/**< ETH_LINK_SPEED_10[0|00|000], or 0 for autonegotation */
uint16_t link_duplex;
@@ -1240,6 +1261,17 @@ typedef int (*eth_mirror_rule_reset_t)(struct
rte_eth_dev *dev,
uint8_t rule_id);
/**< @internal Remove a traffic mirroring rule on an Ethernet device */
+typedef int (*eth_udp_tunnel_add_t)(struct rte_eth_dev *dev,
+ struct rte_eth_udp_tunnel *tunnel_udp,
+ uint8_t count);
+/**< @internal Add tunneling UDP info */
+
+typedef int (*eth_udp_tunnel_del_t)(struct rte_eth_dev *dev,
+ struct rte_eth_udp_tunnel *tunnel_udp,
+ uint8_t count);
+/**< @internal Delete tunneling UDP info */
+
+
#ifdef RTE_NIC_BYPASS
enum {
@@ -1412,6 +1444,8 @@ struct eth_dev_ops {
eth_set_vf_rx_tset_vf_rx; /**< enable/disable a VF receive
*/
eth_set_vf_tx_tset_vf_tx; /**< enable/disable a VF
transmit */
eth_set_vf_vlan_filter_t set_vf_vlan_filter; /**< Set VF VLAN filter
*/
+ eth_udp_tunnel_add_t udp_tunnel_add;
+ eth_udp_tunnel_del_t udp_tunnel_del;
eth_set_queu
[dpdk-dev] [PATCH 2/6]app/test-pmd:test vxlan packet identification
Add commands to test receive vxlan packet identification, which include
- use command to add/delete VxLAN UDP port.
- use rxonly mode to receive VxLAN packet.
Signed-off-by: jijiangl
Acked-by: Helin Zhang
Acked-by: Jingjing Wu
Acked-by: Jing Chen
---
app/test-pmd/cmdline.c| 78 ++--
app/test-pmd/parameters.c | 13 +++
app/test-pmd/rxonly.c | 49
app/test-pmd/testpmd.c|8 +
app/test-pmd/testpmd.h|9 +
5 files changed, 153 insertions(+), 4 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 345be11..67cf63e 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -285,6 +285,12 @@ static void cmd_help_long_parsed(void *parsed_result,
"Set the outer VLAN TPID for Packet Filtering on"
" a port\n\n"
+ "rx_vxlan_port add (udp_port) (port_id)\n"
+ "Add an UDP port for VxLAN packet filter on a
port\n\n"
+
+ "rx_vxlan_port rm (udp_port) (port_id)\n"
+ "Remove an UDP port for VxLAN packet filter on a
port\n\n"
+
"tx_vlan set vlan_id (port_id)\n"
"Set hardware insertion of VLAN ID in packets sent"
" on a port.\n\n"
@@ -296,13 +302,17 @@ static void cmd_help_long_parsed(void *parsed_result,
"Disable hardware insertion of a VLAN header in"
" packets sent on a port.\n\n"
- "tx_checksum set mask (port_id)\n"
+ "tx_checksum set (mask) (port_id)\n"
"Enable hardware insertion of checksum offload with"
- " the 4-bit mask, 0~0xf, in packets sent on a port.\n"
+ " the 8-bit mask, 0~0xff, in packets sent on a port.\n"
"bit 0 - insert ip checksum offload if set\n"
"bit 1 - insert udp checksum offload if set\n"
"bit 2 - insert tcp checksum offload if set\n"
"bit 3 - insert sctp checksum offload if set\n"
+ "bit 4 - insert inner ip checksum offload if
set\n"
+ "bit 5 - insert inner udp checksum offload if
set\n"
+ "bit 6 - insert inner tcp checksum offload if
set\n"
+ "bit 7 - insert inner sctp checksum offload if
set\n"
"Please check the NIC datasheet for HW limits.\n\n"
"set fwd (%s)\n"
@@ -2646,8 +2656,9 @@ cmdline_parse_inst_t cmd_tx_cksum_set = {
.f = cmd_tx_cksum_set_parsed,
.data = NULL,
.help_str = "enable hardware insertion of L3/L4checksum with a given "
- "mask in packets sent on a port, the bit mapping is given as, Bit 0 for
ip"
- "Bit 1 for UDP, Bit 2 for TCP, Bit 3 for SCTP",
+ "mask in packets sent on a port, the bit mapping is given as, Bit 0 for
ip "
+ "Bit 1 for UDP, Bit 2 for TCP, Bit 3 for SCTP, Bit 4 for inner ip "
+ "Bit 5 for inner UDP, Bit 6 for inner TCP, Bit 7 for inner SCTP",
.tokens = {
(void *)&cmd_tx_cksum_set_tx_cksum,
(void *)&cmd_tx_cksum_set_set,
@@ -6112,6 +6123,64 @@ cmdline_parse_inst_t cmd_vf_rate_limit = {
},
};
+/* *** CONFIGURE TUNNEL UDP PORT *** */
+struct cmd_tunnel_udp_config {
+ cmdline_fixed_string_t cmd;
+ cmdline_fixed_string_t what;
+ uint16_t udp_port;
+ uint8_t port_id;
+};
+
+static void
+cmd_tunnel_udp_config_parsed(void *parsed_result,
+ __attribute__((unused)) struct cmdline *cl,
+ __attribute__((unused)) void *data)
+{
+ struct cmd_tunnel_udp_config *res = parsed_result;
+ struct rte_eth_udp_tunnel tunnel_udp;
+ int ret;
+
+ tunnel_udp.udp_port = res->udp_port;
+
+ if (!strcmp(res->cmd, "rx_vxlan_port"))
+ tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
+
+ if (!strcmp(res->what, "add"))
+ ret = rte_eth_dev_udp_tunnel_add(res->port_id, &tunnel_udp, 1);
+ else
+ ret = rte_eth_dev_udp_tunnel_delete(res->port_id, &tunnel_udp,
1);
+
+ if (ret < 0)
+ printf("udp tunneling add error: (%s)\n", strerror(-ret));
+}
+
+cmdline_parse_token_string_t cmd_tunnel_udp_config_cmd =
+ TOKEN_STRING_INITIALIZER(struct cmd_tunnel_udp_config,
+ cmd, "rx_vxlan_port");
+cmdline_parse_token_string_t cmd_tunnel_udp_config_what =
+ TOKEN_STRING_INITIALIZER(struct cmd_tunnel_udp_config,
+ what, "add#rm");
+cmdline_parse_token_num_t cmd_tunnel_udp_config_udp_port =
+ TOKEN_NUM_INITIALIZER(struct cmd_tun
[dpdk-dev] [PATCH 4/6]app/testpmd:test VxLAN cloud filter API
Add commands to test VxLAN cloud filter API.
Signed-off-by: jijiangl
Acked-by: Helin Zhang
Acked-by: Jingjing Wu
Acked-by: Jing Chen
---
app/test-pmd/cmdline.c | 142
1 files changed, 142 insertions(+), 0 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 67cf63e..a5adac0 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -285,6 +285,14 @@ static void cmd_help_long_parsed(void *parsed_result,
"Set the outer VLAN TPID for Packet Filtering on"
" a port\n\n"
+ "cloud_filter add (port_id) (outer_mac) (inner_mac)
(ip_addr) "
+ "(inner_vlan) (tunnel_type) (filter_type) (tenant_id)
(queue_id)\n"
+ " add a cloud fiter of a port.\n\n"
+
+ "cloud_filter rm (port_id) (outer_mac) (inner_mac)
(ip_addr) "
+ "(inner_vlan) (tunnel_type) (filter_type) (tenant_id)
(queue_id)\n"
+ " remove a cloud fiter of a port.\n\n"
+
"rx_vxlan_port add (udp_port) (port_id)\n"
"Add an UDP port for VxLAN packet filter on a
port\n\n"
@@ -6123,6 +6131,139 @@ cmdline_parse_inst_t cmd_vf_rate_limit = {
},
};
+/* *** ADD CLOUD FILTER OF A PORT *** */
+struct cmd_cloud_filter_result {
+ cmdline_fixed_string_t cmd;
+ cmdline_fixed_string_t what;
+ uint8_t port_id;
+ struct ether_addr outer_mac;
+ struct ether_addr inner_mac;
+ cmdline_ipaddr_t ip_value;
+ uint16_t inner_vlan;
+ cmdline_fixed_string_t tunnel_type;
+ cmdline_fixed_string_t filter_type;
+ uint32_t tenant_id;
+ uint16_t queue_num;
+};
+
+static void
+cmd_cloud_filter_parsed(void *parsed_result,
+ __attribute__((unused)) struct cmdline *cl,
+ __attribute__((unused)) void *data)
+{
+ struct cmd_cloud_filter_result *res = parsed_result;
+ struct rte_eth_cloud_filter_conf cloud_filter_conf;
+
+ cloud_filter_conf.outer_mac = &res->outer_mac;
+ cloud_filter_conf.inner_mac = &res->inner_mac;
+ cloud_filter_conf.inner_vlan = res->inner_vlan;
+
+ if (res->ip_value.family == AF_INET) {
+ cloud_filter_conf.ip_addr.ipv4_addr =
+ res->ip_value.addr.ipv4.s_addr;
+ cloud_filter_conf.ip_type = RTE_CLOUD_IPTYPE_IPV4;
+ } else {
+ memcpy(&(cloud_filter_conf.ip_addr.ipv6_addr),
+ &(res->ip_value.addr.ipv6),
+ sizeof(struct in6_addr));
+ cloud_filter_conf.ip_type = RTE_CLOUD_IPTYPE_IPV6;
+ }
+
+ if (!strcmp(res->filter_type, "imac-ivlan"))
+ cloud_filter_conf.filter_type = RTE_CLOUD_FILTER_IMAC_IVLAN;
+ else if (!strcmp(res->filter_type, "imac-ivlan-tenid"))
+ cloud_filter_conf.filter_type =
+ RTE_CLOUD_FILTER_IMAC_IVLAN_TENID;
+ else if (!strcmp(res->filter_type, "imac-tenid"))
+ cloud_filter_conf.filter_type = RTE_CLOUD_FILTER_IMAC_TENID;
+ else if (!strcmp(res->filter_type, "imac"))
+ cloud_filter_conf.filter_type = RTE_CLOUD_FILTER_IMAC;
+ else if (!strcmp(res->filter_type, "omac-imac-tenid"))
+ cloud_filter_conf.filter_type =
+ RTE_CLOUD_FILTER_OMAC_TENID_IMAC;
+ else {
+ printf("The filter type is not supported");
+ return;
+ }
+
+ cloud_filter_conf.to_queue = RTE_CLOUD_FLAGS_TO_QUEUE;
+
+ if (!strcmp(res->tunnel_type, "vxlan"))
+ cloud_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN;
+ else {
+ printf("Only VxLAN is supported now.\n");
+ return;
+ }
+
+ cloud_filter_conf.tenant_id = res->tenant_id;
+ cloud_filter_conf.queue_id = res->queue_num;
+ if (!strcmp(res->what, "add"))
+ rte_eth_dev_cloud_filter_set(res->port_id,
+ &cloud_filter_conf, 1, 1);
+ else
+ rte_eth_dev_cloud_filter_set(res->port_id,
+ &cloud_filter_conf, 1, 0);
+}
+cmdline_parse_token_string_t cmd_cloud_filter_cmd =
+ TOKEN_STRING_INITIALIZER(struct cmd_cloud_filter_result,
+ cmd, "cloud_filter");
+cmdline_parse_token_string_t cmd_cloud_filter_what =
+ TOKEN_STRING_INITIALIZER(struct cmd_cloud_filter_result,
+ what, "add#rm");
+cmdline_parse_token_num_t cmd_cloud_filter_port_id =
+ TOKEN_NUM_INITIALIZER(struct cmd_cloud_filter_result,
+ port_id, UINT8);
+cmdline_parse_token_etheraddr_t cmd_cloud_filter_outer_mac =
+ TOKEN_ETHERADDR_INITIALIZER(struct cmd_cloud_filter_result,
+ outer_mac);
+cmdline_parse_token_etheraddr_t cmd_cloud_filter_inner_mac =
+ TOKEN_ETHERADDR_INITIA
[dpdk-dev] [PATCH 5/6]i40e:VxLAN Tx checksum offload
Support VxLAN TX check offload, which include outer and inner L3(IP),
inner L4(UDP,TCP and SCTP).
Signed-off-by: jijiangl
Acked-by: Helin Zhang
Acked-by: Jingjing Wu
Acked-by: Jing Chen
---
lib/librte_mbuf/rte_mbuf.h |4 +++
lib/librte_pmd_i40e/i40e_rxtx.c | 58 +--
2 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 2735f37..212ac3a 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -97,6 +97,8 @@ struct rte_ctrlmbuf {
#define PKT_RX_IEEE1588_PTP 0x0200 /**< RX IEEE1588 L2 Ethernet PT Packet. */
#define PKT_RX_IEEE1588_TMST 0x0400 /**< RX IEEE1588 L2/L4 timestamped
packet.*/
+#define PKT_TX_VXLAN_CKSUM 0x0001 /**< Checksum of TX VxLAN pkt. computed by
NIC.. */
+#define PKT_TX_IVLAN_PKT 0x0002 /**< TX packet is VxLAN packet with an
inner VLAN. */
#define PKT_TX_VLAN_PKT 0x0800 /**< TX packet is a 802.1q VLAN packet. */
#define PKT_TX_IP_CKSUM 0x1000 /**< IP cksum of TX pkt. computed by NIC.
*/
#define PKT_TX_IPV4_CSUM 0x1000 /**< Alias of PKT_TX_IP_CKSUM. */
@@ -594,6 +596,7 @@ static inline void rte_pktmbuf_reset(struct rte_mbuf *m)
m->pkt.in_port = 0xff;
m->ol_flags = 0;
+ m->reserved = 0;
buf_ofs = (RTE_PKTMBUF_HEADROOM <= m->buf_len) ?
RTE_PKTMBUF_HEADROOM : m->buf_len;
m->pkt.data = (char*) m->buf_addr + buf_ofs;
@@ -658,6 +661,7 @@ static inline void rte_pktmbuf_attach(struct rte_mbuf *mi,
struct rte_mbuf *md)
mi->pkt.pkt_len = mi->pkt.data_len;
mi->pkt.nb_segs = 1;
mi->ol_flags = md->ol_flags;
+ mi->reserved = md->reserved;
__rte_mbuf_sanity_check(mi, RTE_MBUF_PKT, 1);
__rte_mbuf_sanity_check(md, RTE_MBUF_PKT, 0);
diff --git a/lib/librte_pmd_i40e/i40e_rxtx.c b/lib/librte_pmd_i40e/i40e_rxtx.c
index 83b9462..17633e9 100644
--- a/lib/librte_pmd_i40e/i40e_rxtx.c
+++ b/lib/librte_pmd_i40e/i40e_rxtx.c
@@ -415,12 +415,16 @@ i40e_rxd_ptype_to_pkt_flags(uint64_t qword)
return ip_ptype_map[ptype];
}
+#define L4TUN_LEN (sizeof(struct udp_hdr) + sizeof(struct vxlan_hdr)\
++ sizeof(struct ether_hdr))
static inline void
i40e_txd_enable_checksum(uint32_t ol_flags,
uint32_t *td_cmd,
uint32_t *td_offset,
uint8_t l2_len,
- uint8_t l3_len)
+ uint8_t l3_len,
+ uint8_t inner_l3_len,
+ uint32_t *cd_tunneling)
{
if (!l2_len) {
PMD_DRV_LOG(DEBUG, "L2 length set to 0\n");
@@ -433,6 +437,31 @@ i40e_txd_enable_checksum(uint32_t ol_flags,
return;
}
+ /* VxLAN packet TX checksum offload */
+ if (unlikely(ol_flags & PKT_TX_VXLAN_CKSUM)) {
+ uint8_t l4tun_len;
+
+ /* packet with inner VLAN */
+ if (ol_flags & PKT_TX_IVLAN_PKT)
+ l4tun_len = L4TUN_LEN + sizeof(struct vlan_hdr);
+ else
+ l4tun_len = L4TUN_LEN;
+
+ if (ol_flags & PKT_TX_IPV4_CSUM)
+ *cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV4;
+ else if (ol_flags & PKT_TX_IPV6)
+ *cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV6;
+
+ /* Now set the ctx descriptor fields */
+ *cd_tunneling |= (l3_len >> 2) <<
+ I40E_TXD_CTX_QW0_EXT_IPLEN_SHIFT |
+ I40E_TXD_CTX_UDP_TUNNELING |
+ (l4tun_len >> 1) <<
+ I40E_TXD_CTX_QW0_NATLEN_SHIFT;
+
+ l3_len = inner_l3_len;
+ }
+
/* Enable L3 checksum offloads */
if (ol_flags & PKT_TX_IPV4_CSUM) {
*td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV4_CSUM;
@@ -614,6 +643,12 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq)
I40E_RXD_QW1_STATUS_SHIFT;
pkt_len = ((qword1 & I40E_RXD_QW1_LENGTH_PBUF_MASK) >>
I40E_RXD_QW1_LENGTH_PBUF_SHIFT) - rxq->crc_len;
+
+ /* reserved is used to store packet type for RX side */
+ mb->reserved = (uint8_t)((qword1 &
+ I40E_RXD_QW1_PTYPE_MASK) >>
+ I40E_RXD_QW1_PTYPE_SHIFT);
+
mb->pkt.data_len = pkt_len;
mb->pkt.pkt_len = pkt_len;
mb->pkt.vlan_macip.f.vlan_tci = rx_status &
@@ -860,6 +895,8 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts)
pkt_flags = i40e_rxd_status_to_pkt_flags(qword1);
pkt_flags |= i40e_rxd_error_to_pkt_flags(qword1);
pkt_flags |= i40e_rxd_ptype_to_pkt_fl
[dpdk-dev] [PATCH 6/6]app/testpmd:test VxLAN Tx checksum offload
Add test cases in testpmd to test VxLAN Tx Checksum offlad, which include IP4
and IPV6 case,
and also include inner L3 and L4 test cases.
Signed-off-by: jijiangl
Acked-by: Helin Zhang
Acked-by: Jingjing Wu
Acked-by: Jing Chen
---
app/test-pmd/config.c |6 +-
app/test-pmd/csumonly.c | 194 --
lib/librte_pmd_i40e/i40e_rxtx.c |4 +-
3 files changed, 188 insertions(+), 16 deletions(-)
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index c72f6ee..c397640 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1719,9 +1719,9 @@ tx_cksum_set(portid_t port_id, uint8_t cksum_mask)
uint16_t tx_ol_flags;
if (port_id_is_invalid(port_id))
return;
- /* Clear last 4 bits and then set L3/4 checksum mask again */
- tx_ol_flags = (uint16_t) (ports[port_id].tx_ol_flags & 0xFFF0);
- ports[port_id].tx_ol_flags = (uint16_t) ((cksum_mask & 0xf) |
tx_ol_flags);
+ /* Clear last 8 bits and then set L3/4 checksum mask again */
+ tx_ol_flags = (uint16_t) (ports[port_id].tx_ol_flags & 0xFF00);
+ ports[port_id].tx_ol_flags = (uint16_t) ((cksum_mask & 0xff) |
tx_ol_flags);
}
void
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index e5a1f52..401f6dc 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -196,7 +196,6 @@ get_ipv6_udptcp_checksum(struct ipv6_hdr *ipv6_hdr,
uint16_t *l4_hdr)
return (uint16_t)cksum;
}
-
/*
* Forwarding of packets. Change the checksum field with HW or SW methods
* The HW/SW method selection depends on the ol_flags on every packet
@@ -209,10 +208,16 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
struct rte_mbuf *mb;
struct ether_hdr *eth_hdr;
struct ipv4_hdr *ipv4_hdr;
+ struct ether_hdr *inner_eth_hdr;
+ struct ipv4_hdr *inner_ipv4_hdr = NULL;
struct ipv6_hdr *ipv6_hdr;
+ struct ipv6_hdr *inner_ipv6_hdr = NULL;
struct udp_hdr *udp_hdr;
+ struct udp_hdr *inner_udp_hdr;
struct tcp_hdr *tcp_hdr;
+ struct tcp_hdr *inner_tcp_hdr;
struct sctp_hdr *sctp_hdr;
+ struct sctp_hdr *inner_sctp_hdr;
uint16_t nb_rx;
uint16_t nb_tx;
@@ -221,12 +226,18 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
uint16_t pkt_ol_flags;
uint16_t tx_ol_flags;
uint16_t l4_proto;
+ uint16_t inner_l4_proto = 0;
uint16_t eth_type;
uint8_t l2_len;
uint8_t l3_len;
+ uint8_t inner_l2_len;
+ uint8_t inner_l3_len = 0;
uint32_t rx_bad_ip_csum;
uint32_t rx_bad_l4_csum;
+ uint8_t ipv4_tunnel;
+ uint8_t ipv6_tunnel;
+ uint16_t ptype;
#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
uint64_t start_tsc;
@@ -261,8 +272,12 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
mb = pkts_burst[i];
l2_len = sizeof(struct ether_hdr);
pkt_ol_flags = mb->ol_flags;
+ ptype = mb->reserved;
ol_flags = (uint16_t) (pkt_ol_flags & (~PKT_TX_L4_MASK));
+ ipv4_tunnel = IS_ETH_IPV4_TUNNEL(ptype);
+ ipv6_tunnel = IS_ETH_IPV6_TUNNEL(ptype);
+
eth_hdr = (struct ether_hdr *) mb->pkt.data;
eth_type = rte_be_to_cpu_16(eth_hdr->ether_type);
if (eth_type == ETHER_TYPE_VLAN) {
@@ -295,7 +310,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
* + ipv4 or ipv6
* + udp or tcp or sctp or others
*/
- if (pkt_ol_flags & PKT_RX_IPV4_HDR) {
+ if (pkt_ol_flags & (PKT_RX_IPV4_HDR | PKT_RX_IPV4_HDR_EXT)) {
/* Do not support ipv4 option field */
l3_len = sizeof(struct ipv4_hdr) ;
@@ -325,15 +340,96 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
if (tx_ol_flags & 0x2) {
/* HW Offload */
ol_flags |= PKT_TX_UDP_CKSUM;
- /* Pseudo header sum need be set
properly */
- udp_hdr->dgram_cksum =
get_ipv4_psd_sum(ipv4_hdr);
+ if (ipv4_tunnel)
+ udp_hdr->dgram_cksum = 0;
+ else
+ /* Pseudo header sum need be
set properly */
+ udp_hdr->dgram_cksum =
+
get_ipv4_psd_sum(ipv4_hdr);
}
else {
/* SW Implementation, clear checksum
field first */
udp_hdr->dgram_cksum = 0;
[dpdk-dev] [PATCH 3/6]i40e:Add VxLAN Cloud filter API
Support VxLAN cloud filters,which is used to use MAC, VLAN to point
to a queue. The filter types supported include below:
1. Inner MAC and Inner VLAN ID
2. Inner MAC address and inner VLAN ID, tenned ID.
3. Inner MAC and tenant ID
4. Inner MAC address
5. Outer MAC address, tenant ID and inner MAC
Signed-off-by: jijiangl
Acked-by: Helin Zhang
Acked-by: Jingjing Wu
Acked-by: Jing Chen
---
lib/librte_ether/rte_ethdev.c | 50
lib/librte_ether/rte_ethdev.h | 72
lib/librte_pmd_i40e/i40e_ethdev.c | 112 +
3 files changed, 234 insertions(+), 0 deletions(-)
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 325edb1..0e5b16d 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1955,6 +1955,56 @@ rte_eth_dev_udp_tunnel_delete(uint8_t port_id,
}
int
+rte_eth_dev_cloud_filter_set(uint8_t port_id,
+struct rte_eth_cloud_filter_conf *cloud_filter,
+uint8_t filter_count, uint8_t add)
+{
+ uint8_t i;
+ struct rte_eth_dev *dev;
+ struct rte_eth_cloud_filter_conf *pfilter;
+
+ if (port_id >= nb_ports) {
+ PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+ return -ENODEV;
+ }
+
+ if (cloud_filter == NULL) {
+ PMD_DEBUG_TRACE("Invalid oud_filter parameter\n");
+ return -EINVAL;
+ }
+ pfilter = cloud_filter;
+
+ dev = &rte_eth_devices[port_id];
+ for (i = 0; i < filter_count; i++, pfilter++) {
+ if (pfilter->queue_id >= dev->data->nb_rx_queues) {
+ PMD_DEBUG_TRACE("Invalid queue number\n");
+ return -EINVAL;
+ }
+
+ if (pfilter->inner_vlan > ETHER_MAX_VLAN_ID) {
+ PMD_DEBUG_TRACE("Invalid inner VLAN ID\n");
+ return -EINVAL;
+ }
+
+ if (is_zero_ether_addr(pfilter->outer_mac)) {
+ PMD_DEBUG_TRACE("port %d: Cannot add NULL outer MAC
address\n",
+ port_id);
+ return -EINVAL;
+ }
+
+ if (is_zero_ether_addr(pfilter->inner_mac)) {
+ PMD_DEBUG_TRACE("port %d: Cannot add NULL inner MAC
address\n",
+ port_id);
+ return -EINVAL;
+ }
+ }
+
+ FUNC_PTR_OR_ERR_RET(*dev->dev_ops->cloud_filter_set, -ENOTSUP);
+ return (*dev->dev_ops->cloud_filter_set)(dev, cloud_filter,
+ filter_count, add);
+}
+
+int
rte_eth_led_on(uint8_t port_id)
{
struct rte_eth_dev *dev;
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index d24907f..c95bab5 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -707,6 +707,28 @@ struct rte_fdir_conf {
uint8_t drop_queue;
};
+enum rte_cloud_filter_type {
+ RTE_CLOUD_FILTER_TYPE_NONE = 0,
+ RTE_CLOUD_FILTER_IMAC_IVLAN, /**< Filter by inner MAC and VLAN ID. */
+ RTE_CLOUD_FILTER_IMAC_IVLAN_TENID,
+ /**< Filter by inner MAC address and VLAN ID, tenned ID. */
+ RTE_CLOUD_FILTER_IMAC_TENID, /**< Filter by inner MAC and tenant ID. */
+ RTE_CLOUD_FILTER_IMAC, /**< Filter by inner MAC address */
+ RTE_CLOUD_FILTER_OMAC_TENID_IMAC,
+ /**< Filter by outer MAC address, tenant ID and Inner MAC */
+ RTE_CLOUD_FILTER_TYPE_MAX,
+};
+
+#define RTE_CLOUD_FLAGS_TO_QUEUE 1
+
+/**
+ * Select IPv4 or IPv6 Cloud filters.
+ */
+enum rte_cloud_iptype {
+ RTE_CLOUD_IPTYPE_IPV4 = 0, /**< IPv4. */
+ RTE_CLOUD_IPTYPE_IPV6, /**< IPv6. */
+};
+
/**
* Tunneled type.
*/
@@ -720,6 +742,26 @@ enum rte_eth_tunnel_type {
};
/**
+ * Cloud filter configuration.
+ */
+struct rte_eth_cloud_filter_conf {
+ struct ether_addr *outer_mac; /**< Outer MAC address fiter. */
+ struct ether_addr *inner_mac; /**< Inner MAC address fiter. */
+ uint16_t inner_vlan; /**< Inner VLAN fiter. */
+ enum rte_cloud_iptype ip_type; /**< IP address type. */
+ union {
+ uint32_t ipv4_addr;/**< IPv4 source address to match. */
+ uint32_t ipv6_addr[4]; /**< IPv6 source address to match. */
+ } ip_addr; /**< IPv4/IPv6 source address to match (union of above). */
+
+ uint8_t filter_type; /**< Filter type. */
+ uint8_t to_queue; /**< Use MAC and VLAN to point to a
queue. */
+ enum rte_eth_tunnel_type tunnel_type; /**< Tunnel Type. */
+ uint32_t tenant_id;/** < Tenant number. */
+ uint16_t queue_id; /** < queue number. */
+};
+
+/**
* UDP tunneling configuration.
*/
struct rte_eth_udp_tunnel {
@@ -1251,6 +1293,11 @@ typedef
[dpdk-dev] [RFC PATCH 01/14] mbuf: rename RTE_MBUF_SCATTER_GATHER into RTE_MBUF_REFCNT
Hi Bruce, On 08/11/2014 11:45 PM, Stephen Hemminger wrote: > On Mon, 11 Aug 2014 21:44:37 +0100 > Bruce Richardson wrote: > >> From: Olivier Matz >> >> It seems that RTE_MBUF_SCATTER_GATHER is not the proper name for the >> feature it provides. "Scatter gather" means that data is stored using >> several buffers. RTE_MBUF_REFCNT seems to be a better name for that >> feature as it provides a reference counter for mbufs. >> >> The macro RTE_MBUF_SCATTER_GATHER is poisoned to ensure this >> modification is seen by drivers or applications using it. >> >> Signed-off-by: Olivier Matz >> Signed-off-by: Bruce Richardson After applying this first patch, I still get references to "scatter gather": $ git grep RTE_MBUF_SCATTER_GATHER examples/Makefile:DIRS-$(CONFIG_RTE_MBUF_SCATTER_GATHER) += ip_fragmentation examples/Makefile:DIRS-$(CONFIG_RTE_MBUF_SCATTER_GATHER) += ipv4_multicast examples/ip_fragmentation/Makefile:ifneq ($(CONFIG_RTE_MBUF_SCATTER_GATHER),y) examples/ip_fragmentation/Makefile:$(error This application requires RTE_MBUF_SCATTER_GATHER to be enabled) examples/ip_pipeline/Makefile:ifeq ($(CONFIG_RTE_MBUF_SCATTER_GATHER),y) lib/librte_mbuf/rte_mbuf.h:#pragma GCC poison RTE_MBUF_SCATTER_GATHER lib/librte_port/Makefile:ifeq ($(CONFIG_RTE_MBUF_SCATTER_GATHER),y) lib/librte_port/Makefile:ifeq ($(CONFIG_RTE_MBUF_SCATTER_GATHER),y) Olivier
[dpdk-dev] [RFC PATCH 02/14] mbuf: remove rte_ctrlmbuf
Hi Bruce,
On 08/11/2014 10:44 PM, Bruce Richardson wrote:
> From: Olivier Matz
>
> The initial role of rte_ctrlmbuf is to carry generic messages (data
> pointer + data length) but it's not used by the DPDK or it applications.
> Keeping it implies:
>- loosing 1 byte in the rte_mbuf structure
>- having some dead code rte_mbuf.[ch]
>
> This patch removes this feature. Thanks to it, it is now possible to
> simplify the rte_mbuf structure by merging the rte_pktmbuf structure
> in it. This is done in next commit.
>
> Signed-off-by: Olivier Matz
>
> Conflicts:
> lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
>
> Signed-off-by: Bruce Richardson
Same here, "git grep ctrlmbuf" finds results in
examples/ip_pipeline/cmdline.c and examples/ip_pipeline/init.c
You can also see it by doing
"make examples T=x86_64-native-linuxapp-gcc" from dpdk root.
> @@ -204,14 +182,10 @@ struct rte_mbuf {
> #else
> uint16_t refcnt_reserved; /**< Do not use this field */
> #endif
> - uint8_t type; /**< Type of mbuf. */
> - uint8_t reserved; /**< Unused field. Required for padding.
> */
> + uint16_t reserved; /**< Unused field. Required for padding.
> */
This line breaks the alignment of comments (this typo was already
present in my initial patch). By the way, there was also a patch
called "mbuf: cosmetic changes in rte_mbuf structure" to restore
the comments alignment for all the fields of the structure. Maybe
it should be integrated in your series.
Regards,
Olivier
[dpdk-dev] [RFC PATCH 03/14] mbuf: remove the rte_pktmbuf structure
Hi Bruce, On 08/11/2014 10:44 PM, Bruce Richardson wrote: > From: Olivier Matz > > The rte_pktmbuf structure was initially included in the rte_mbuf > structure. This was needed when there was 2 types of mbuf (ctrl and > packet). As the control mbuf has been removed, we can merge the > rte_pktmbuf into the rte_mbuf structure. > > Advantages of doing this: >- the access to mbuf fields is easier (ex: m->data instead of m->pkt.data) >- make the structure more consistent: for instance, there was no reason > to have the ol_flags field in rte_mbuf >- it will allow a deeper reorganization of the rte_mbuf structure in the > next commits, allowing to gain several bytes in it > > Signed-off-by: Olivier Matz > > Conflicts: > lib/librte_pmd_virtio/virtio_rxtx.c > lib/librte_pmd_virtio/virtqueue.h > lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c > > Signed-off-by: Bruce Richardson Some files are missing. We can find some with: git grep "pkt\." in app/test/packet_burst_generator.c examples/ip_fragmentation/main.c examples/ip_pipeline/pipeline_rx.c examples/ip_pipeline/pipeline_tx.c lib/librte_port/rte_port_frag.c I'm not sure it gives all remaining occurences. The best way to find them is probably to check the compilation of examples for all targets. Olivier
[dpdk-dev] [RFC PATCH 04/14] mbuf: replace data pointer by an offset
Hi Bruce,
On 08/11/2014 10:44 PM, Bruce Richardson wrote:
> From: Olivier Matz
>
> Original patch:
> The mbuf structure already contains a pointer to the beginning of the
> buffer (m->buf_addr). It is not needed to use 8 bytes again to store
> another pointer to the beginning of the data.
>
> Using a 16 bits unsigned integer is enough as we know that a mbuf is
> never longer than 64KB. We gain 6 bytes in the structure thanks to
> this modification.
>
> Signed-off-by: Olivier Matz
>
> This version:
> * Updated original patch to apply to latest on mainline.
> * Disabled vector PMD in config as it relies heavily on the mbuf layout
>
> Signed-off-by: Bruce Richardson
Remaining references shown by:
git grep
"\(pkt->data[^_]\)\|\(mb->data[^_]\)\|\(m->data[^_]\)\|\(mbuf->data[^_]\)"
In:
app/test-pmd/ieee1588fwd.c
examples/vhost_xen/main.c
lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c
lib/librte_pmd_pcap/rte_eth_pcap.c
lib/librte_pmd_xenvirt/rte_eth_xenvirt.c
> --- a/lib/librte_mbuf/rte_mbuf.h
> +++ b/lib/librte_mbuf/rte_mbuf.h
> @@ -140,6 +140,13 @@ struct rte_mbuf {
> void *buf_addr; /**< Virtual address of segment buffer. */
> phys_addr_t buf_physaddr; /**< Physical address of segment buffer. */
> uint16_t buf_len; /**< Length of segment buffer. */
> +
> + /* valid for any segment */
> + struct rte_mbuf *next;/**< Next segment of scattered packet. */
> + uint16_t data_off;
> + uint16_t data_len;/**< Amount of data in segment buffer. */
> + uint32_t pkt_len; /**< Total pkt len: sum of all segments. */
> +
> #ifdef RTE_MBUF_REFCNT
> /**
>* 16-bit Reference counter.
> @@ -156,18 +163,12 @@ struct rte_mbuf {
> #else
> uint16_t refcnt_reserved; /**< Do not use this field */
> #endif
> - uint16_t reserved; /**< Unused field. Required for padding.
> */
> - uint16_t ol_flags;/**< Offload features. */
> -
> - /* valid for any segment */
> - struct rte_mbuf *next; /**< Next segment of scattered packet. */
> - void* data; /**< Start address of data in segment buffer. */
> - uint16_t data_len; /**< Amount of data in segment buffer. */
>
> /* these fields are valid for first segment only */
> uint8_t nb_segs;/**< Number of segments. */
> uint8_t in_port;/**< Input port. */
> - uint32_t pkt_len; /**< Total pkt len: sum of all segment
> data_len. */
> + uint16_t ol_flags;/**< Offload features. */
> + uint16_t reserved; /**< Unused field. Required for padding.
> */
I think we should try to keep comments aligned if possible.
>
> /* offload features, valid for first segment only */
> union rte_vlan_macip vlan_macip;
> @@ -185,7 +186,7 @@ struct rte_mbuf {
> uint16_t metadata16[0];
> uint32_t metadata32[0];
> uint64_t metadata64[0];
> - };
> + } __rte_cache_aligned;
> } __rte_cache_aligned;
>
In my initial patch, there was a "reserved2" field at the end of the
rte_mbuf structure to keep its size to 64 bytes. This is not really
required because of the __rte_cache_aligned, but I wonder if it's a
problem to have metadata not starting on a cache line. There can be
some conflicts if some part of the code use *(uint32 *)(m + 1)
and other part of code m->metadata32[0].
By the way (that's completely off-topic), but I don't really see why
having this metadata at the end of mbuf structure is useful.
> @@ -1523,7 +1523,8 @@ ixgbe_recv_scattered_pkts(void *rx_queue, struct
> rte_mbuf **rx_pkts,
> }
>
> /* Prefetch data of first segment, if configured to do so. */
> - rte_packet_prefetch(first_seg->data);
> + rte_packet_prefetch((char *)first_seg->buf_addr +
> + first_seg->data_off);
>
It seems there is a trailing whitespace here after the "+" (seen by
"git am").
Regards,
Olivier
[dpdk-dev] [RFC PATCH 05/14] mbuf: rename in_port to just port
On 08/11/2014 10:44 PM, Bruce Richardson wrote: > In some cases we may want to tag a packet for a particular destination > or output port, so rename the "in_port" field in the mbuf to just "port" > so that it can be re-used for this purpose if an application needs it. > > Signed-off-by: Bruce Richardson Acked-by: Olivier Matz
[dpdk-dev] [RFC PATCH 06/14] mbuf: reorder fields by time-of-use
Hi Bruce,
On 08/11/2014 10:44 PM, Bruce Richardson wrote:
> * Reorder the fields in the mbuf so that we have fields that are used
> together side-by-side in the structure. This means that we have a
> contiguous block of 8-bytes in the mbuf which are used to reset an mbuf
> of descriptor rearm.
> * Where needed add in a dummy fields to overwrite values 8 or 16 bytes
> at a time, when doing RX or RX descriptor rearm. This avoids compiler
> warnings when using uint64_t values to overwrite a set of smaller
> values.
> * At the end, place fields that are only used for TX or for the slower
> RX path, and mark them as down to be moved to a second cache line.
>
> Signed-off-by: Bruce Richardson
> ---
> lib/librte_mbuf/rte_mbuf.c | 2 +-
> lib/librte_mbuf/rte_mbuf.h | 37 +
> 2 files changed, 22 insertions(+), 17 deletions(-)
>
> diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
> index 64f1587..594b910 100644
> --- a/lib/librte_mbuf/rte_mbuf.c
> +++ b/lib/librte_mbuf/rte_mbuf.c
> @@ -161,7 +161,7 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m,
> unsigned dump_len)
>
> fprintf(f, "dump mbuf at 0x%p, phys=%"PRIx64", buf_len=%u\n",
> m, (uint64_t)m->buf_physaddr, (unsigned)m->buf_len);
> - fprintf(f, " pkt_len=%"PRIu32", ol_flags=%"PRIx16", nb_segs=%u, "
> + fprintf(f, " pkt_len=%"PRIu32", ol_flags=%"PRIx64", nb_segs=%u, "
> "in_port=%u\n", m->pkt_len, m->ol_flags,
> (unsigned)m->nb_segs, (unsigned)m->port);
> nb_segs = m->nb_segs;
I think this should not go in this patch. Another one "change ol_flags
to 64 bits" would be nice.
> diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
> index e0981c9..566bb7e 100644
> --- a/lib/librte_mbuf/rte_mbuf.h
> +++ b/lib/librte_mbuf/rte_mbuf.h
> @@ -132,22 +132,20 @@ union rte_vlan_macip {
> /**< MAC+IP length. */
> #define TX_MACIP_LEN_CMP_MASK (TX_MAC_LEN_CMP_MASK | TX_IP_LEN_CMP_MASK)
>
> +
> /**
Garbage here.
>* The generic rte_mbuf, containing a packet mbuf.
>*/
> struct rte_mbuf {
> - struct rte_mempool *pool; /**< Pool from which mbuf was allocated. */
> void *buf_addr; /**< Virtual address of segment buffer. */
> phys_addr_t buf_physaddr; /**< Physical address of segment buffer. */
> - uint16_t buf_len; /**< Length of segment buffer. */
>
> - /* valid for any segment */
> - struct rte_mbuf *next;/**< Next segment of scattered packet. */
> + /* next 8 bytes are initialised on RX descriptor rearm */
> + uint64_t rearm_data[0]; /**< dummy element so we can get uin64_t ptrs
> + * to this part of the mbuf without alias error
> + */
> + uint16_t buf_len; /**< Length of segment buffer. */
> uint16_t data_off;
> - uint16_t data_len;/**< Amount of data in segment buffer. */
> - uint32_t pkt_len; /**< Total pkt len: sum of all segments. */
What do you think about using an union instead? I'm not sure it's
clearer, but in case of:
union {
uint64_t u64;
struct {
uint16_t buf_len;
uint16_t data_off;
...
};
};
> -
> -#ifdef RTE_MBUF_REFCNT
> /**
>* 16-bit Reference counter.
>* It should only be accessed using the following functions:
> @@ -157,20 +155,23 @@ struct rte_mbuf {
>* config option.
>*/
> union {
> +#ifdef RTE_MBUF_REFCNT
> rte_atomic16_t refcnt_atomic; /**< Atomically accessed refcnt
> */
> uint16_t refcnt;/**< Non-atomically accessed
> refcnt */
> - };
> -#else
> - uint16_t refcnt_reserved; /**< Do not use this field */
> #endif
> -
> - /* these fields are valid for first segment only */
> + uint16_t refcnt_reserved; /**< Do not use this field */
> + };
I think this should go in another cosmetic patch.
> uint8_t nb_segs;/**< Number of segments. */
> uint8_t port;/**< Input port. */
> - uint16_t ol_flags;/**< Offload features. */
> - uint16_t reserved; /**< Unused field. Required for padding.
> */
>
> - /* offload features, valid for first segment only */
> + /* remaining bytes are set on RX when pulling packet from descriptor */
> + uint64_t ol_flags;/**< Offload features. */
Should be moved to "change ol_flags to 64 bits".
> +
> + __m128i rx_descriptor_fields1[0]; /**< dummy field used as marker for
> +* writes in a vector driver */
Is it a good idea to have a specific type in the generic mbuf structure?
Moreover it seems that later in your patch series it's replaced by
something else.
Also, the 2nd line of comment mixes tabs and spaces.
>
> + /* second cache line, fields only used in slow path or on TX */
> +
[dpdk-dev] [PATCH 3/6]i40e:Add VxLAN Cloud filter API
Hi Jijiang, 2014-08-12 11:12, Jijiang Liu: > Support VxLAN cloud filters,which is used to use MAC, VLAN to point >to a queue. The filter types supported include below: >1. Inner MAC and Inner VLAN ID >2. Inner MAC address and inner VLAN ID, tenned ID. >3. Inner MAC and tenant ID >4. Inner MAC address >5. Outer MAC address, tenant ID and inner MAC > > Signed-off-by: jijiangl > Acked-by: Helin Zhang > Acked-by: Jingjing Wu > Acked-by: Jing Chen > --- > lib/librte_ether/rte_ethdev.c | 50 > lib/librte_ether/rte_ethdev.h | 72 > lib/librte_pmd_i40e/i40e_ethdev.c | 112 > + > 3 files changed, 234 insertions(+), 0 deletions(-) I prefer to have a separated commit for API (ethdev) and another one for implementation (i40e). About API, why name it cloud filter instead of VxLAN? Thanks -- Thomas
[dpdk-dev] [RFC PATCH 09/14] Fix performance regression due to moved pool ptr
Hi Bruce, On 08/11/2014 10:44 PM, Bruce Richardson wrote: > Adjust the fast-path code to fix the regression caused by the pool > pointer moving to the second cache line. This change adjusts the > prefetching and also the way in which the mbufs are freed back to the > mempool. > > Signed-off-by: Bruce Richardson Just one comment here (maybe this code should be reviewed by someone knowing the ixgbe driver better than me): > @@ -252,14 +250,6 @@ tx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, > volatile union ixgbe_adv_tx_desc *tx_r = txq->tx_ring; > uint16_t n = 0; > > - /* > - * Begin scanning the H/W ring for done descriptors when the > - * number of available descriptors drops below tx_free_thresh. For > - * each done descriptor, free the associated buffer. > - */ > - if (txq->nb_tx_free < txq->tx_free_thresh) > - ixgbe_tx_free_bufs(txq); > - > /* Only use descriptors that are available */ > nb_pkts = (uint16_t)RTE_MIN(txq->nb_tx_free, nb_pkts); > if (unlikely(nb_pkts == 0)) > @@ -323,6 +313,15 @@ tx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, > if (txq->tx_tail >= txq->nb_tx_desc) > txq->tx_tail = 0; > > + /* > + * Begin scanning the H/W ring for done descriptors when the > + * number of available descriptors drops below tx_free_thresh. For > + * each done descriptor, free the associated buffer. > + */ > + if (txq->nb_tx_free < txq->tx_free_thresh) > + ixgbe_tx_free_bufs(txq); > + > + > /* update tail pointer */ > rte_wmb(); > IXGBE_PCI_REG_WRITE(txq->tdt_reg_addr, txq->tx_tail); It looks like these 2 hunks are reverted in next commit. I'm not sure this is what you expected.
[dpdk-dev] [RFC PATCH 13/14] mbuf: cleanup + added in additional mbuf fields.
Hi Bruce, On 08/11/2014 10:44 PM, Bruce Richardson wrote: > Cleanups: > * use typedefs for markers within mbuf struct > * split up vlan_macip field as the l2/l3 lengths are for TX so go on the >second cache line. > * created a tx_ol field in second cache line for data used for tx >offloads > * rename the hash field to the filter field as it contains more than >just a hash value. > > Added in the extra mbuf fields needed: > * fdir flex bytes for i40e driver, i.e. extra 32-bits for filters > * field to be used for a sequence number, extra 32-bit field > * field for a second vlan tag, extra 16-bits, using space freed by >moving out the l2 l3 lengths. > * userdata field for general application use. > * added inner_l3 and l4 length fields to allow tunneling. > > Signed-off-by: Bruce Richardson I think it would be clearer if splitted in several patches. First 2 patches for: - rename hash in filter - rename vlan_macip in rte_tx_offloads (and change to 64 bits ?) By the way, the modification of ol_flags in 64 bits probably requires more modifications in driver and testpmd. See me initial patch "mbuf: change ol_flags to 32 bits". Why not directly adding the MARKER typedef in previous patches? Also, I'm wondering if the markers really need to by typed. An empty struct would do the job, just requiring the users to cast it into the proper type. About sequence, double vlan id, userdata: they are not used now. I think we should add them one by one in separate patches, with code really that really requires the added field to be present. By the way, there is already a way to reserve a zone in mbuf for the application at mbuf pool creation. What is the purpose of the userdata field? About fdir_i40e field, I'm not sure that we should have driver-specific info in the generic mbuf structure. In addition, the application would need to know which hash type is present in the mbuf. Each time we add a new field in the mbuf, I think we should ask ourselves how the application will use it, especially if the application manages several kind of ports (virtual and physical for instance), which may not support all features. For instance, who will fill the "sequence" field ? Is it the driver? If it's application-specific Regards, Olivier
[dpdk-dev] [RFC PATCH 00/14] Extend the mbuf structure
Hi Bruce, On 08/11/2014 10:44 PM, Bruce Richardson wrote: > This patch set expands and enhances the mbuf data structure. This set > includes patches previously > submitted by Olivier to rework the mbuf, but takes the rework further than > proposed there. > > NOTE: This is still a work in progress! Feedback at this stage is still > welcome though. From the original series, I think the following ones could be added in a second patchset, do you agree? dpdk igb/ixgbe: fix IP checksum calculation dpdk mbuf: add functions to get the name of an ol_flag dpdk testpmd: modify source address to validate checksum dpdk mbuf: generic support of TCP segmentation offload dpdk ixgbe: support TCP segmentation offload virtio-net-pmd pmd: adapt to new rte_mbuf structure vmxnet3-usermap pmd: remove support of old dpdk versions vmxnet3-usermap pmd: adapt to new rte_mbuf structure memnic pmd: adapt to new rte_mbuf structure Regards, Olivier
[dpdk-dev] [RFC PATCH 01/14] mbuf: rename RTE_MBUF_SCATTER_GATHER into RTE_MBUF_REFCNT
Ok, thanks, I'll see about fixing those. I see a number of comments about the format and structure of the patch set itself. I'll take those all on board, but I'll admit that I didn't rework the patchset much before submitting it as an RFC. I'm leaving that until I've finished on this and ready to start submitting non-RFC patchset for merge. Right now my primary concern is whether the reworked struct rte_mbuf has everything we need, and whether there are any performance regressions we need to fix due to the second cache line. Regards, /Bruce > -Original Message- > From: Olivier MATZ [mailto:olivier.matz at 6wind.com] > Sent: Tuesday, August 12, 2014 1:00 AM > To: Richardson, Bruce > Cc: Stephen Hemminger; dev at dpdk.org > Subject: Re: [dpdk-dev] [RFC PATCH 01/14] mbuf: rename > RTE_MBUF_SCATTER_GATHER into RTE_MBUF_REFCNT > > Hi Bruce, > > On 08/11/2014 11:45 PM, Stephen Hemminger wrote: > > On Mon, 11 Aug 2014 21:44:37 +0100 > > Bruce Richardson wrote: > > > >> From: Olivier Matz > >> > >> It seems that RTE_MBUF_SCATTER_GATHER is not the proper name for the > >> feature it provides. "Scatter gather" means that data is stored using > >> several buffers. RTE_MBUF_REFCNT seems to be a better name for that > >> feature as it provides a reference counter for mbufs. > >> > >> The macro RTE_MBUF_SCATTER_GATHER is poisoned to ensure this > >> modification is seen by drivers or applications using it. > >> > >> Signed-off-by: Olivier Matz > >> Signed-off-by: Bruce Richardson > > After applying this first patch, I still get references to > "scatter gather": > > $ git grep RTE_MBUF_SCATTER_GATHER > examples/Makefile:DIRS-$(CONFIG_RTE_MBUF_SCATTER_GATHER) += > ip_fragmentation > examples/Makefile:DIRS-$(CONFIG_RTE_MBUF_SCATTER_GATHER) += > ipv4_multicast > examples/ip_fragmentation/Makefile:ifneq > ($(CONFIG_RTE_MBUF_SCATTER_GATHER),y) > examples/ip_fragmentation/Makefile:$(error This application requires > RTE_MBUF_SCATTER_GATHER to be enabled) > examples/ip_pipeline/Makefile:ifeq > ($(CONFIG_RTE_MBUF_SCATTER_GATHER),y) > lib/librte_mbuf/rte_mbuf.h:#pragma GCC poison RTE_MBUF_SCATTER_GATHER > lib/librte_port/Makefile:ifeq ($(CONFIG_RTE_MBUF_SCATTER_GATHER),y) > lib/librte_port/Makefile:ifeq ($(CONFIG_RTE_MBUF_SCATTER_GATHER),y) > > Olivier
[dpdk-dev] [PATCH] hash: added rte_hash_keys to extract all keys
I added a function which extracts all the configured keys in a hash map.
This is good to have when debugging and printing data store in hash
maps.
Signed-off-by: Tomas Vestelind
---
lib/librte_hash/rte_hash.c | 26 ++
lib/librte_hash/rte_hash.h | 15 +++
2 files changed, 41 insertions(+)
diff --git a/lib/librte_hash/rte_hash.c b/lib/librte_hash/rte_hash.c
index d02b6b4..2108c4f 100644
--- a/lib/librte_hash/rte_hash.c
+++ b/lib/librte_hash/rte_hash.c
@@ -481,3 +481,29 @@ rte_hash_lookup_bulk(const struct rte_hash *h, const void
**keys,
return 0;
}
+
+unsigned int
+rte_hash_keys(const struct rte_hash *h, void *keys)
+{
+unsigned int found_keys = 0;
+unsigned int bucket, entry;
+
+/* Go through each bucket and all its entries */
+for (bucket = 0; bucket < h->num_buckets; bucket++) {
+const hash_sig_t *sig = get_sig_tbl_bucket(h, bucket);
+
+for (entry = 0; entry < h->bucket_entries; entry++) {
+/* If the signature is valid, find and save the corresponding key
*/
+if (sig[entry] != NULL_SIGNATURE) {
+ uint8_t *key_bucket = get_key_tbl_bucket(h, bucket);
+ void *key = get_key_from_bucket(h, key_bucket, entry);
+ rte_memcpy(keys, key, h->key_len);
+
+ keys = (uint8_t* )keys + h->key_len;
+ found_keys++;
+}
+}
+}
+
+return found_keys;
+}
diff --git a/lib/librte_hash/rte_hash.h b/lib/librte_hash/rte_hash.h
index 2ecaf1a..e0fb28f 100644
--- a/lib/librte_hash/rte_hash.h
+++ b/lib/librte_hash/rte_hash.h
@@ -303,6 +303,21 @@ rte_hash_hash(const struct rte_hash *h, const void *key)
int
rte_hash_lookup_bulk(const struct rte_hash *h, const void **keys,
uint32_t num_keys, int32_t *positions);
+
+/**
+ * Copy the hash table keys to the supplied list of keys.
+ * This operation is multi-thread safe.
+ *
+ * @param h
+ * Hash table to look in.
+ * @param keys
+ * A pointer to a list of where keys will be written.
+ * Must be large enough to fit a potentially full hash map.
+ * @return
+ * The number of found keys.
+ */
+unsigned int
+rte_hash_keys(const struct rte_hash *h, void *keys);
#ifdef __cplusplus
}
#endif
--
1.7.10.4
[dpdk-dev] [PATCH] hash: added rte_hash_clear that clears all keys
I added rte_hash_clear which clear the map from all previously added
keys.
Signed-off-by: Tomas Vestelind
---
lib/librte_hash/rte_hash.c | 14 ++
lib/librte_hash/rte_hash.h | 10 ++
2 files changed, 24 insertions(+)
diff --git a/lib/librte_hash/rte_hash.c b/lib/librte_hash/rte_hash.c
index 2108c4f..917a6c1 100644
--- a/lib/librte_hash/rte_hash.c
+++ b/lib/librte_hash/rte_hash.c
@@ -507,3 +507,17 @@ rte_hash_keys(const struct rte_hash *h, void *keys)
return found_keys;
}
+
+void
+rte_hash_clear(const struct rte_hash *h)
+{
+unsigned int bucket, entry;
+
+/* Clear all entries by invalidating each signature */
+for (bucket = 0; bucket < h->num_buckets; bucket++) {
+hash_sig_t *sig = get_sig_tbl_bucket(h, bucket);
+for (entry = 0; entry < h->bucket_entries; entry++) {
+sig[entry] = NULL_SIGNATURE;
+}
+}
+}
diff --git a/lib/librte_hash/rte_hash.h b/lib/librte_hash/rte_hash.h
index e0fb28f..b84137e 100644
--- a/lib/librte_hash/rte_hash.h
+++ b/lib/librte_hash/rte_hash.h
@@ -318,6 +318,16 @@ rte_hash_lookup_bulk(const struct rte_hash *h, const void
**keys,
*/
unsigned int
rte_hash_keys(const struct rte_hash *h, void *keys);
+
+/**
+ * Clear all keys. This operation is not multi-thread safe and should only be
+ * called from one thread.
+ *
+ * @param h
+ * Hash table to clear.
+ */
+void
+rte_hash_clear(const struct rte_hash *h);
#ifdef __cplusplus
}
#endif
--
1.7.10.4
