d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

i40e: VXLAN packet identification

Browse Source 
Implement the configuration API of VXLAN destination UDP port,
and add new Rx offload flags for supporting VXLAN packet offload.

Signed-off-by: Jijiang Liu <jijiang.liu@intel.com>
Acked-by: Helin Zhang <helin.zhang@intel.com>
Tested-by: Yong Liu <yong.liu@intel.com>
This commit is contained in:
Jijiang Liu 2014-10-23 21:18:54 +08:00 committed by Thomas Monjalon
parent 6f1f04afac
commit 15dbb63ef9
4 changed files with 223 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/librte_mbuf/rte_mbuf.h
View File

@ -91,6 +91,8 @@ extern "C" {
#define PKT_RX_IPV6_HDR_EXT (1ULL << 8) /**< RX packet with extended IPv6 header. */
#define PKT_RX_IEEE1588_PTP (1ULL << 9) /**< RX IEEE1588 L2 Ethernet PT Packet. */
#define PKT_RX_IEEE1588_TMST (1ULL << 10) /**< RX IEEE1588 L2/L4 timestamped packet.*/
#define PKT_RX_TUNNEL_IPV4_HDR (1ULL << 11) /**< RX tunnel packet with IPv4 header.*/
#define PKT_RX_TUNNEL_IPV6_HDR (1ULL << 12) /**< RX tunnel packet with IPv6 header. */
#define PKT_TX_VLAN_PKT (1ULL << 55) /**< TX packet is a 802.1q VLAN packet. */
#define PKT_TX_IP_CKSUM (1ULL << 54) /**< IP cksum of TX pkt. computed by NIC. */

157
lib/librte_pmd_i40e/i40e_ethdev.c
View File

@ -186,6 +186,10 @@ static int i40e_dev_rss_hash_update(struct rte_eth_dev *dev,
struct rte_eth_rss_conf *rss_conf);
static int i40e_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
struct rte_eth_rss_conf *rss_conf);
static int i40e_dev_udp_tunnel_add(struct rte_eth_dev *dev,
struct rte_eth_udp_tunnel *udp_tunnel);
static int i40e_dev_udp_tunnel_del(struct rte_eth_dev *dev,
struct rte_eth_udp_tunnel *udp_tunnel);
static int i40e_dev_filter_ctrl(struct rte_eth_dev *dev,
enum rte_filter_type filter_type,
enum rte_filter_op filter_op,
@ -241,6 +245,8 @@ static struct eth_dev_ops i40e_eth_dev_ops = {
.reta_query = i40e_dev_rss_reta_query,
.rss_hash_update = i40e_dev_rss_hash_update,
.rss_hash_conf_get = i40e_dev_rss_hash_conf_get,
.udp_tunnel_add = i40e_dev_udp_tunnel_add,
.udp_tunnel_del = i40e_dev_udp_tunnel_del,
.filter_ctrl = i40e_dev_filter_ctrl,
};
@ -4092,6 +4098,157 @@ i40e_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
return 0;
}
static int
i40e_get_vxlan_port_idx(struct i40e_pf *pf, uint16_t port)
{
uint8_t i;
for (i = 0; i < I40E_MAX_PF_UDP_OFFLOAD_PORTS; i++) {
if (pf->vxlan_ports[i] == port)
return i;
}
return -1;
}
static int
i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port)
{
int idx, ret;
uint8_t filter_idx;
struct i40e_hw *hw = I40E_PF_TO_HW(pf);
idx = i40e_get_vxlan_port_idx(pf, port);
/* Check if port already exists */
if (idx >= 0) {
PMD_DRV_LOG(ERR, "Port %d already offloaded", port);
return -EINVAL;
}
/* Now check if there is space to add the new port */
idx = i40e_get_vxlan_port_idx(pf, 0);
if (idx < 0) {
PMD_DRV_LOG(ERR, "Maximum number of UDP ports reached,"
"not adding port %d", port);
return -ENOSPC;
}
ret = i40e_aq_add_udp_tunnel(hw, port, I40E_AQC_TUNNEL_TYPE_VXLAN,
&filter_idx, NULL);
if (ret < 0) {
PMD_DRV_LOG(ERR, "Failed to add VxLAN UDP port %d", port);
return -1;
}
PMD_DRV_LOG(INFO, "Added %s port %d with AQ command with index %d",
port, filter_index);
/* New port: add it and mark its index in the bitmap */
pf->vxlan_ports[idx] = port;
pf->vxlan_bitmap |= (1 << idx);
if (!(pf->flags & I40E_FLAG_VXLAN))
pf->flags |= I40E_FLAG_VXLAN;
return 0;
}
static int
i40e_del_vxlan_port(struct i40e_pf *pf, uint16_t port)
{
int idx;
struct i40e_hw *hw = I40E_PF_TO_HW(pf);
if (!(pf->flags & I40E_FLAG_VXLAN)) {
PMD_DRV_LOG(ERR, "VxLAN UDP port was not configured.");
return -EINVAL;
}
idx = i40e_get_vxlan_port_idx(pf, port);
if (idx < 0) {
PMD_DRV_LOG(ERR, "Port %d doesn't exist", port);
return -EINVAL;
}
if (i40e_aq_del_udp_tunnel(hw, idx, NULL) < 0) {
PMD_DRV_LOG(ERR, "Failed to delete VxLAN UDP port %d", port);
return -1;
}
PMD_DRV_LOG(INFO, "Deleted port %d with AQ command with index %d",
port, idx);
pf->vxlan_ports[idx] = 0;
pf->vxlan_bitmap &= ~(1 << idx);
if (!pf->vxlan_bitmap)
pf->flags &= ~I40E_FLAG_VXLAN;
return 0;
}
/* Add UDP tunneling port */
static int
i40e_dev_udp_tunnel_add(struct rte_eth_dev *dev,
struct rte_eth_udp_tunnel *udp_tunnel)
{
int ret = 0;
struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
if (udp_tunnel == NULL)
return -EINVAL;
switch (udp_tunnel->prot_type) {
case RTE_TUNNEL_TYPE_VXLAN:
ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port);
break;
case RTE_TUNNEL_TYPE_GENEVE:
case RTE_TUNNEL_TYPE_TEREDO:
PMD_DRV_LOG(ERR, "Tunnel type is not supported now.");
ret = -1;
break;
default:
PMD_DRV_LOG(ERR, "Invalid tunnel type");
ret = -1;
break;
}
return ret;
}
/* Remove UDP tunneling port */
static int
i40e_dev_udp_tunnel_del(struct rte_eth_dev *dev,
struct rte_eth_udp_tunnel *udp_tunnel)
{
int ret = 0;
struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
if (udp_tunnel == NULL)
return -EINVAL;
switch (udp_tunnel->prot_type) {
case RTE_TUNNEL_TYPE_VXLAN:
ret = i40e_del_vxlan_port(pf, udp_tunnel->udp_port);
break;
case RTE_TUNNEL_TYPE_GENEVE:
case RTE_TUNNEL_TYPE_TEREDO:
PMD_DRV_LOG(ERR, "Tunnel type is not supported now.");
ret = -1;
break;
default:
PMD_DRV_LOG(ERR, "Invalid tunnel type");
ret = -1;
break;
}
return ret;
}
/* Configure RSS */
static int
i40e_pf_config_rss(struct i40e_pf *pf)

8
lib/librte_pmd_i40e/i40e_ethdev.h
View File

@ -60,13 +60,15 @@
#define I40E_FLAG_HEADER_SPLIT_DISABLED (1ULL << 4)
#define I40E_FLAG_HEADER_SPLIT_ENABLED (1ULL << 5)
#define I40E_FLAG_FDIR (1ULL << 6)
#define I40E_FLAG_VXLAN (1ULL << 7)
#define I40E_FLAG_ALL (I40E_FLAG_RSS | \
I40E_FLAG_DCB | \
I40E_FLAG_VMDQ | \
I40E_FLAG_SRIOV | \
I40E_FLAG_HEADER_SPLIT_DISABLED | \
I40E_FLAG_HEADER_SPLIT_ENABLED | \
I40E_FLAG_FDIR)
I40E_FLAG_FDIR | \
I40E_FLAG_VXLAN)
#define I40E_RSS_OFFLOAD_ALL ( \
ETH_RSS_NONF_IPV4_UDP | \
@ -246,6 +248,10 @@ struct i40e_pf {
uint16_t vmdq_nb_qps; /* The number of queue pairs of VMDq */
uint16_t vf_nb_qps; /* The number of queue pairs of VF */
uint16_t fdir_nb_qps; /* The number of queue pairs of Flow Director */
/* store VxLAN UDP ports */
uint16_t vxlan_ports[I40E_MAX_PF_UDP_OFFLOAD_PORTS];
uint16_t vxlan_bitmap; /* Vxlan bit mask */
};
enum pending_msg {

105
lib/librte_pmd_i40e/i40e_rxtx.c
View File

@ -208,34 +208,34 @@ i40e_rxd_ptype_to_pkt_flags(uint64_t qword)
PKT_RX_IPV4_HDR_EXT, /* PTYPE 56 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 57 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 58 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 59 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 60 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 61 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 59 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 60 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 61 */
0, /* PTYPE 62 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 63 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 64 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 65 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 66 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 67 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 68 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 63 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 64 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 65 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 66 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 67 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 68 */
0, /* PTYPE 69 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 70 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 71 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 72 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 73 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 74 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 75 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 76 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 70 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 71 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 72 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 73 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 74 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 75 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 76 */
0, /* PTYPE 77 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 78 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 79 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 80 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 81 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 82 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 83 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 78 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 79 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 80 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 81 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 82 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 83 */
0, /* PTYPE 84 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 85 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 86 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 85 */
PKT_RX_TUNNEL_IPV4_HDR, /* PTYPE 86 */
PKT_RX_IPV4_HDR_EXT, /* PTYPE 87 */
PKT_RX_IPV6_HDR, /* PTYPE 88 */
PKT_RX_IPV6_HDR, /* PTYPE 89 */
@ -274,34 +274,34 @@ i40e_rxd_ptype_to_pkt_flags(uint64_t qword)
PKT_RX_IPV6_HDR_EXT, /* PTYPE 122 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 123 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 124 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 125 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 126 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 127 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 125 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 126 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 127 */
0, /* PTYPE 128 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 129 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 130 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 131 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 132 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 133 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 134 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 129 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 130 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 131 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 132 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 133 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 134 */
0, /* PTYPE 135 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 136 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 137 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 138 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 139 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 140 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 141 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 142 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 136 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 137 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 138 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 139 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 140 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 141 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 142 */
0, /* PTYPE 143 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 144 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 145 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 146 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 147 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 148 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 149 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 144 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 145 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 146 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 147 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 148 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 149 */
0, /* PTYPE 150 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 151 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 152 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 151 */
PKT_RX_TUNNEL_IPV6_HDR, /* PTYPE 152 */
PKT_RX_IPV6_HDR_EXT, /* PTYPE 153 */
0, /* PTYPE 154 */
0, /* PTYPE 155 */
@ -638,6 +638,10 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq)
pkt_flags |= i40e_rxd_error_to_pkt_flags(qword1);
pkt_flags |= i40e_rxd_ptype_to_pkt_flags(qword1);
mb->ol_flags = pkt_flags;
mb->packet_type = (uint16_t)((qword1 &
I40E_RXD_QW1_PTYPE_MASK) >>
I40E_RXD_QW1_PTYPE_SHIFT);
if (pkt_flags & PKT_RX_RSS_HASH)
mb->hash.rss = rte_le_to_cpu_32(\
rxdp->wb.qword0.hi_dword.rss);
@ -873,6 +877,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_flags(qword1);
rxm->packet_type = (uint16_t)((qword1 & I40E_RXD_QW1_PTYPE_MASK) >>
I40E_RXD_QW1_PTYPE_SHIFT);
rxm->ol_flags = pkt_flags;
if (pkt_flags & PKT_RX_RSS_HASH)
rxm->hash.rss =
@ -1027,6 +1033,9 @@ i40e_recv_scattered_pkts(void *rx_queue,
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_flags(qword1);
first_seg->packet_type = (uint16_t)((qword1 &
I40E_RXD_QW1_PTYPE_MASK) >>
I40E_RXD_QW1_PTYPE_SHIFT);
first_seg->ol_flags = pkt_flags;
if (pkt_flags & PKT_RX_RSS_HASH)
rxm->hash.rss =