From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 1978B58E6 for ; Mon, 13 Oct 2014 18:07:48 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 13 Oct 2014 09:10:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,711,1406617200"; d="scan'208";a="588110749" Received: from irsmsx104.ger.corp.intel.com ([163.33.3.159]) by orsmga001.jf.intel.com with ESMTP; 13 Oct 2014 09:13:00 -0700 Received: from irsmsx109.ger.corp.intel.com (163.33.3.23) by IRSMSX104.ger.corp.intel.com (163.33.3.159) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 13 Oct 2014 17:13:00 +0100 Received: from irsmsx108.ger.corp.intel.com ([169.254.11.21]) by IRSMSX109.ger.corp.intel.com ([169.254.13.253]) with mapi id 14.03.0195.001; Mon, 13 Oct 2014 17:12:59 +0100 From: "De Lara Guarch, Pablo" To: "Liu, Jijiang" , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH v5 2/8]i40e:support VxLAN packet identification in librte_pmd_i40e Thread-Index: AQHP5RgTODrYrJwTpUy7GE5CuRcioZwuNqEw Date: Mon, 13 Oct 2014 16:12:59 +0000 Message-ID: References: <1413006935-22535-1-git-send-email-jijiang.liu@intel.com> <1413006935-22535-3-git-send-email-jijiang.liu@intel.com> In-Reply-To: <1413006935-22535-3-git-send-email-jijiang.liu@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.182] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v5 2/8]i40e:support VxLAN packet identification in librte_pmd_i40e X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Oct 2014 16:07:50 -0000 > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Jijiang Liu > Sent: Saturday, October 11, 2014 6:55 AM > To: dev@dpdk.org > Subject: [dpdk-dev] [PATCH v5 2/8]i40e:support VxLAN packet identificatio= n > in librte_pmd_i40e >=20 > Support tunneling UDP port configuration on i40e in librte_pmd_i40e. > Currently, only VxLAN is implemented, which include > - VxLAN UDP port initialization > - Implement the APIs to configure VxLAN UDP port in librte_pmd_i40e. >=20 > Signed-off-by: Jijiang Liu > Acked-by: Helin Zhang > Acked-by: Jingjing Wu > Acked-by: Jing Chen >=20 > --- > config/common_linuxapp | 5 + > lib/librte_mbuf/rte_mbuf.h | 4 +- > lib/librte_pmd_i40e/i40e_ethdev.c | 200 > ++++++++++++++++++++++++++++++++++++- > lib/librte_pmd_i40e/i40e_ethdev.h | 5 + > lib/librte_pmd_i40e/i40e_rxtx.c | 9 ++ > 5 files changed, 221 insertions(+), 2 deletions(-) >=20 > diff --git a/config/common_linuxapp b/config/common_linuxapp > index 4713eb4..185cb0f 100644 > --- a/config/common_linuxapp > +++ b/config/common_linuxapp > @@ -210,6 +210,11 @@ > CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF=3D4 > CONFIG_RTE_LIBRTE_I40E_ITR_INTERVAL=3D-1 >=20 > # > +# Compile tunneling UDP port support > +# > +CONFIG_RTE_LIBRTE_TUNNEL_UDP_PORT=3D4789 > + > +# Should you add also this option in the common_bsdapp? > # Compile burst-oriented VIRTIO PMD driver > # > CONFIG_RTE_LIBRTE_VIRTIO_PMD=3Dy > diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h > index ddadc21..0984650 100644 > --- a/lib/librte_mbuf/rte_mbuf.h > +++ b/lib/librte_mbuf/rte_mbuf.h > @@ -163,7 +163,7 @@ struct rte_mbuf { >=20 > /* remaining bytes are set on RX when pulling packet from descriptor > */ > MARKER rx_descriptor_fields1; > - uint16_t reserved2; /**< Unused field. Required for padding */ > + uint16_t packet_type; /**< Packet type, which indicates packet > format */ > uint16_t data_len; /**< Amount of data in segment buffer. */ > uint32_t pkt_len; /**< Total pkt len: sum of all segments. */ > uint16_t vlan_tci; /**< VLAN Tag Control Identifier (CPU order) = */ > @@ -551,6 +551,7 @@ static inline void rte_pktmbuf_reset(struct rte_mbuf > *m) > m->port =3D 0xff; >=20 > m->ol_flags =3D 0; > + m->packet_type =3D 0; > m->data_off =3D (RTE_PKTMBUF_HEADROOM <=3D m->buf_len) ? > RTE_PKTMBUF_HEADROOM : m->buf_len; >=20 > @@ -620,6 +621,7 @@ static inline void rte_pktmbuf_attach(struct rte_mbuf > *mi, struct rte_mbuf *md) > mi->pkt_len =3D mi->data_len; > mi->nb_segs =3D 1; > mi->ol_flags =3D md->ol_flags; > + mi->packet_type =3D md->packet_type; >=20 > __rte_mbuf_sanity_check(mi, 1); > __rte_mbuf_sanity_check(md, 0); > diff --git a/lib/librte_pmd_i40e/i40e_ethdev.c > b/lib/librte_pmd_i40e/i40e_ethdev.c > index 52f01a5..3ebb8e2 100644 > --- a/lib/librte_pmd_i40e/i40e_ethdev.c > +++ b/lib/librte_pmd_i40e/i40e_ethdev.c > @@ -189,7 +189,7 @@ static int i40e_res_pool_alloc(struct > i40e_res_pool_info *pool, > static int i40e_dev_init_vlan(struct rte_eth_dev *dev); > static int i40e_veb_release(struct i40e_veb *veb); > static struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, > - struct i40e_vsi *vsi); > + struct i40e_vsi *vsi); > static int i40e_pf_config_mq_rx(struct i40e_pf *pf); > static int i40e_vsi_config_double_vlan(struct i40e_vsi *vsi, int on); > static inline int i40e_find_all_vlan_for_mac(struct i40e_vsi *vsi, > @@ -205,6 +205,14 @@ 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, > + uint8_t count); > +static int i40e_dev_udp_tunnel_del(struct rte_eth_dev *dev, > + struct rte_eth_udp_tunnel *udp_tunnel, > + uint8_t count); > +static int i40e_pf_config_vxlan(struct i40e_pf *pf); > + >=20 > /* Default hash key buffer for RSS */ > static uint32_t rss_key_default[I40E_PFQF_HKEY_MAX_INDEX + 1]; > @@ -256,6 +264,8 @@ static struct eth_dev_ops i40e_eth_dev_ops =3D { > .reta_query =3D i40e_dev_rss_reta_query, > .rss_hash_update =3D i40e_dev_rss_hash_update, > .rss_hash_conf_get =3D i40e_dev_rss_hash_conf_get, > + .udp_tunnel_add =3D i40e_dev_udp_tunnel_add, > + .udp_tunnel_del =3D i40e_dev_udp_tunnel_del, > }; >=20 > static struct eth_driver rte_i40e_pmd =3D { > @@ -2532,6 +2542,34 @@ i40e_vsi_dump_bw_config(struct i40e_vsi *vsi) > return 0; > } >=20 > +static int > +i40e_vxlan_filters_init(struct i40e_pf *pf) > +{ > + uint8_t filter_index; > + int ret =3D 0; > + struct i40e_hw *hw =3D I40E_PF_TO_HW(pf); > + > + if (!(pf->flags & I40E_FLAG_VXLAN)) > + return 0; > + > + /* Init first entry in tunneling UDP table */ > + ret =3D i40e_aq_add_udp_tunnel(hw, > RTE_LIBRTE_TUNNEL_UDP_PORT, > + I40E_AQC_TUNNEL_TYPE_VXLAN, > + &filter_index, NULL); > + if (ret < 0) { > + PMD_DRV_LOG(ERR, "Failed to add UDP tunnel port %d " > + "with index=3D%d\n", > RTE_LIBRTE_TUNNEL_UDP_PORT, > + filter_index); > + } else { > + pf->vxlan_bitmap |=3D 1; > + pf->vxlan_ports[0] =3D RTE_LIBRTE_TUNNEL_UDP_PORT; > + PMD_DRV_LOG(INFO, "Added UDP tunnel port %d with " > + "index=3D%d\n", RTE_LIBRTE_TUNNEL_UDP_PORT, > filter_index); > + } > + > + return ret; > +} > + > /* Setup a VSI */ > struct i40e_vsi * > i40e_vsi_setup(struct i40e_pf *pf, > @@ -3163,6 +3201,12 @@ i40e_vsi_rx_init(struct i40e_vsi *vsi) > uint16_t i; >=20 > i40e_pf_config_mq_rx(pf); > + > + if (data->dev_conf.tunnel_type =3D=3D RTE_TUNNEL_TYPE_VXLAN) { > + pf->flags |=3D I40E_FLAG_VXLAN; > + i40e_pf_config_vxlan(pf); > + } > + > for (i =3D 0; i < data->nb_rx_queues; i++) { > ret =3D i40e_rx_queue_init(data->rx_queues[i]); > if (ret !=3D I40E_SUCCESS) { > @@ -4077,6 +4121,150 @@ i40e_dev_rss_hash_conf_get(struct > rte_eth_dev *dev, > return 0; > } >=20 > +static int > +i40e_get_vxlan_port_idx(struct i40e_pf *pf, uint16_t port) > +{ > + uint8_t i; > + > + for (i =3D 0; i < I40E_MAX_PF_UDP_OFFLOAD_PORTS; i++) { > + if (pf->vxlan_ports[i] =3D=3D 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 =3D I40E_PF_TO_HW(pf); > + > + if (!(pf->flags & I40E_FLAG_VXLAN)) { > + PMD_DRV_LOG(ERR, "VxLAN tunneling mode is not > configured\n"); > + return -EINVAL; > + } > + > + idx =3D i40e_get_vxlan_port_idx(pf, port); > + > + /* Check if port already exists */ > + if (idx >=3D 0) { > + PMD_DRV_LOG(ERR, "Port %d already offloaded\n", port); > + return -1; > + } > + > + /* Now check if there is space to add the new port */ > + idx =3D i40e_get_vxlan_port_idx(pf, 0); > + if (idx < 0) { > + PMD_DRV_LOG(ERR, "Maximum number of UDP ports > reached," > + "not adding port %d\n", port); > + return -ENOSPC; > + } > + > + ret =3D 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\n", > port); > + return -1; > + } > + > + PMD_DRV_LOG(INFO, "Added %s port %d with AQ command with > index %d\n", > + port, filter_index); > + > + /* New port: add it and mark its index in the bitmap */ > + pf->vxlan_ports[idx] =3D port; > + pf->vxlan_bitmap |=3D (1 << idx); > + > + return 0; > +} > + > +static int > +i40e_del_vxlan_port(struct i40e_pf *pf, uint16_t port) > +{ > + int idx; > + struct i40e_hw *hw =3D I40E_PF_TO_HW(pf); > + > + idx =3D i40e_get_vxlan_port_idx(pf, port); > + > + if (idx < 0) { > + PMD_DRV_LOG(ERR, "Port %d doesn't exist\n", port); > + return -1; > + } > + > + if (i40e_aq_del_udp_tunnel(hw, idx, NULL) < 0) { > + PMD_DRV_LOG(ERR, "Failed to delete VxLAN UDP port > %d\n", port); > + return -1; > + } > + > + PMD_DRV_LOG(INFO, "Added port %d with AQ command with index > %d\n", > + port, idx); > + > + pf->vxlan_ports[idx] =3D 0; > + pf->vxlan_bitmap &=3D ~(1 << idx); > + > + return 0; > +} > + > +/* configure port of UDP tunneling */ > +static int > +i40e_dev_udp_tunnel_add(struct rte_eth_dev *dev, > + struct rte_eth_udp_tunnel *udp_tunnel, uint8_t count) > +{ > + uint16_t i; > + int ret =3D 0; > + struct i40e_pf *pf =3D I40E_DEV_PRIVATE_TO_PF(dev->data- > >dev_private); > + > + for (i =3D 0; i < count; i++, udp_tunnel++) { > + switch (udp_tunnel->prot_type) { > + case RTE_TUNNEL_TYPE_VXLAN: > + ret =3D 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.\n"); > + ret =3D -1; > + break; > + > + default: > + PMD_DRV_LOG(ERR, "Invalid tunnel type\n"); > + ret =3D -1; > + break; > + } > + } > + > + return ret; > +} > + > +static int > +i40e_dev_udp_tunnel_del(struct rte_eth_dev *dev, > + struct rte_eth_udp_tunnel *udp_tunnel, uint8_t > count) > +{ > + uint16_t i; > + int ret =3D 0; > + struct i40e_pf *pf =3D I40E_DEV_PRIVATE_TO_PF(dev->data- > >dev_private); > + > + for (i =3D 0; i < count; i++, udp_tunnel++) { > + switch (udp_tunnel->prot_type) { > + case RTE_TUNNEL_TYPE_VXLAN: > + ret =3D 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.\n"); > + ret =3D -1; > + break; > + default: > + PMD_DRV_LOG(ERR, "Invalid tunnel type\n"); > + ret =3D -1; > + break; > + } > + } > + > + return ret; > +} > + > /* Configure RSS */ > static int > i40e_pf_config_rss(struct i40e_pf *pf) > @@ -4113,6 +4301,16 @@ i40e_pf_config_rss(struct i40e_pf *pf) > return i40e_hw_rss_hash_set(hw, &rss_conf); > } >=20 > +/* Configure VxLAN */ > +static int > +i40e_pf_config_vxlan(struct i40e_pf *pf) > +{ > + if (pf->flags & I40E_FLAG_VXLAN) > + i40e_vxlan_filters_init(pf); > + > + return 0; > +} > + > static int > i40e_pf_config_mq_rx(struct i40e_pf *pf) > { > diff --git a/lib/librte_pmd_i40e/i40e_ethdev.h > b/lib/librte_pmd_i40e/i40e_ethdev.h > index 64deef2..22d0628 100644 > --- a/lib/librte_pmd_i40e/i40e_ethdev.h > +++ b/lib/librte_pmd_i40e/i40e_ethdev.h > @@ -60,6 +60,7 @@ > #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 | \ > @@ -216,6 +217,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 */ > }; >=20 > enum pending_msg { > diff --git a/lib/librte_pmd_i40e/i40e_rxtx.c b/lib/librte_pmd_i40e/i40e_r= xtx.c > index 7c5b6a8..369bc3b 100644 > --- a/lib/librte_pmd_i40e/i40e_rxtx.c > +++ b/lib/librte_pmd_i40e/i40e_rxtx.c > @@ -638,6 +638,10 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq) > pkt_flags |=3D i40e_rxd_error_to_pkt_flags(qword1); > pkt_flags |=3D i40e_rxd_ptype_to_pkt_flags(qword1); > mb->ol_flags =3D pkt_flags; > + > + mb->packet_type =3D (uint16_t)((qword1 & > + I40E_RXD_QW1_PTYPE_MASK) >> > + I40E_RXD_QW1_PTYPE_SHIFT); > if (pkt_flags & PKT_RX_RSS_HASH) > mb->hash.rss =3D 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 =3D i40e_rxd_status_to_pkt_flags(qword1); > pkt_flags |=3D i40e_rxd_error_to_pkt_flags(qword1); > pkt_flags |=3D i40e_rxd_ptype_to_pkt_flags(qword1); > + rxm->packet_type =3D (uint16_t)((qword1 & > I40E_RXD_QW1_PTYPE_MASK) >> > + I40E_RXD_QW1_PTYPE_SHIFT); > rxm->ol_flags =3D pkt_flags; > if (pkt_flags & PKT_RX_RSS_HASH) > rxm->hash.rss =3D > @@ -1027,6 +1033,9 @@ i40e_recv_scattered_pkts(void *rx_queue, > pkt_flags =3D i40e_rxd_status_to_pkt_flags(qword1); > pkt_flags |=3D i40e_rxd_error_to_pkt_flags(qword1); > pkt_flags |=3D i40e_rxd_ptype_to_pkt_flags(qword1); > + first_seg->packet_type =3D (uint8_t)((qword1 & > + I40E_RXD_QW1_PTYPE_MASK) >> > + I40E_RXD_QW1_PTYPE_SHIFT); > first_seg->ol_flags =3D pkt_flags; > if (pkt_flags & PKT_RX_RSS_HASH) > rxm->hash.rss =3D > -- > 1.7.7.6