[dpdk-dev] [PATCH v5 01/11] ethdev: add API to query packet type filling info
Hi Panu,
On 2/29/2016 7:34 PM, Panu Matilainen wrote:
> On 02/26/2016 09:34 AM, Jianfeng Tan wrote:
>> Add a new API rte_eth_dev_get_ptype_info to query whether/what packet
>> type can be filled by given pmd rx burst function.
>>
>> Signed-off-by: Jianfeng Tan
>> ---
>> lib/librte_ether/rte_ethdev.c | 26 ++
>> lib/librte_ether/rte_ethdev.h | 26 ++
>> 2 files changed, 52 insertions(+)
>>
> [...]
>> diff --git a/lib/librte_ether/rte_ethdev.h
>> b/lib/librte_ether/rte_ethdev.h
>> index 16da821..16f32a0 100644
>> --- a/lib/librte_ether/rte_ethdev.h
>> +++ b/lib/librte_ether/rte_ethdev.h
>> @@ -1021,6 +1021,9 @@ typedef void (*eth_dev_infos_get_t)(struct
>> rte_eth_dev *dev,
>> struct rte_eth_dev_info *dev_info);
>> /**< @internal Get specific informations of an Ethernet device. */
>>
>> +typedef const uint32_t *(*eth_dev_ptype_info_get_t)(struct
>> rte_eth_dev *dev);
>> +/**< @internal Get ptype info of eth_rx_burst_t. */
>> +
>> typedef int (*eth_queue_start_t)(struct rte_eth_dev *dev,
>> uint16_t queue_id);
>> /**< @internal Start rx and tx of a queue of an Ethernet device. */
>> @@ -1347,6 +1350,7 @@ struct eth_dev_ops {
>> eth_queue_stats_mapping_set_t queue_stats_mapping_set;
>> /**< Configure per queue stat counter mapping. */
>> eth_dev_infos_get_tdev_infos_get; /**< Get device info. */
>> +eth_dev_ptype_info_get_t dev_ptype_info_get; /** Get ptype
>> info */
>> mtu_set_t mtu_set; /**< Set MTU. */
>> vlan_filter_set_t vlan_filter_set; /**< Filter VLAN
>> Setup. */
>> vlan_tpid_set_tvlan_tpid_set; /**< Outer VLAN
>> TPID Setup. */
>> @@ -2268,6 +2272,28 @@ void rte_eth_macaddr_get(uint8_t port_id,
>> struct ether_addr *mac_addr);
>
> Technically this is an ABI break but its marked internal and I guess
> it falls into the "drivers only" territory similar to what was
> discussed in this thead:
> http://dpdk.org/ml/archives/dev/2016-January/032348.html so its
> probably ok.
Yes, I think so too.
>
>> void rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info
>> *dev_info);
>>
>> /**
>> + * Retrieve the packet type information of an Ethernet device.
>> + *
>> + * @param port_id
>> + * The port identifier of the Ethernet device.
>> + * @param ptype_mask
>> + * A hint of what kind of packet type which the caller is
>> interested in.
>> + * @param ptypes
>> + * An array pointer to store adequent packet types, allocated by
>> caller.
>> + * @param num
>> + * Size of the array pointed by param ptypes.
>> + * @return
>> + * - (>0) Number of ptypes supported. If it exceeds param num,
>> exceeding
>> + * packet types will not be filled in the given array.
>> + * - (0 or -ENOTSUP) if PMD does not fill the specified ptype.
>> + * - (-ENODEV) if *port_id* invalid.
>> + */
>> +extern int rte_eth_dev_get_ptype_info(uint8_t port_id,
>> + uint32_t ptype_mask,
>> + uint32_t *ptypes,
>> + int num);
>> +
>> +/**
>>* Retrieve the MTU of an Ethernet device.
>>*
>>* @param port_id
>>
>
> "extern" is redundant in headers. We just saw a round of removing them
> (commit dd34ff1f0e03b2c5e4a97e9fbcba5c8238aac573), lets not add them
> back :)
>
> More importantly, to export a function you need to add an entry for it
> in rte_ether_version.map.
Oh, yes, thanks for pointing out this, I'll change this and update
rte_ether_version.map.
Is it like this? Before or after DPDK_2.2 {}?
DPDK_2.3 {
global:
rte_eth_dev_get_ptype_info;
local: *;
};
Thanks,
Jianfeng
>
> - Panu -
>
>
[dpdk-dev] [PATCH v6 00/11] Add API to get packet type info
To achieve this, a new function pointer, dev_ptype_info_get, is added into struct eth_dev_ops. For those devices who do not implement it, it means it does not provide any ptype info. v6: - Remove extern in function declaration. - Update rte_ether_version.map. v5: - Exclude l3fwd change from this series, as a separated one. - Fix malposition of mlx4 code in mlx5 commit introduced in v4. v4: - Change how to use this API: to previously agreement reached in mail. v3: - Change how to use this API: api to allocate mem for storing ptype array; and caller to free the mem. - Change how to return back ptypes from PMDs: return a pointer to corresponding static const array of supported ptypes, terminated by RTE_PTYPE_UNKNOWN. - Fix l3fwd parse_packet_type() when EXACT_MATCH is enabled. - Fix l3fwd memory leak when calling the API. v2: - Move ptype_mask filter function from each PMDs into ether layer. - Add ixgbe vPMD's ptype info. - Fix code style issues. Signed-off-by: Jianfeng Tan Acked-by: Konstantin Ananyev Acked-by: Adrien Mazarguil Jianfeng Tan (11): ethdev: add API to query packet type filling info pmd/cxgbe: add dev_ptype_info_get implementation pmd/e1000: add dev_ptype_info_get implementation pmd/enic: add dev_ptype_info_get implementation pmd/fm10k: add dev_ptype_info_get implementation pmd/i40e: add dev_ptype_info_get implementation pmd/ixgbe: add dev_ptype_info_get implementation pmd/mlx4: add dev_ptype_info_get implementation pmd/mlx5: add dev_ptype_info_get implementation pmd/nfp: add dev_ptype_info_get implementation pmd/vmxnet3: add dev_ptype_info_get implementation drivers/net/cxgbe/cxgbe_ethdev.c | 14 ++ drivers/net/e1000/igb_ethdev.c | 30 drivers/net/enic/enic_ethdev.c | 17 drivers/net/fm10k/fm10k_ethdev.c | 50 ++ drivers/net/fm10k/fm10k_rxtx.c | 3 ++ drivers/net/fm10k/fm10k_rxtx_vec.c | 3 ++ drivers/net/i40e/i40e_ethdev.c | 1 + drivers/net/i40e/i40e_ethdev_vf.c | 1 + drivers/net/i40e/i40e_rxtx.c | 46 ++- drivers/net/i40e/i40e_rxtx.h | 1 + drivers/net/ixgbe/ixgbe_ethdev.c | 38 ++ drivers/net/ixgbe/ixgbe_ethdev.h | 2 ++ drivers/net/ixgbe/ixgbe_rxtx.c | 4 ++- drivers/net/mlx4/mlx4.c| 21 ++ drivers/net/mlx5/mlx5.c| 1 + drivers/net/mlx5/mlx5.h| 1 + drivers/net/mlx5/mlx5_ethdev.c | 20 ++ drivers/net/mlx5/mlx5_rxtx.c | 2 ++ drivers/net/nfp/nfp_net.c | 19 + drivers/net/vmxnet3/vmxnet3_ethdev.c | 16 +++ lib/librte_ether/rte_ethdev.c | 26 ++ lib/librte_ether/rte_ethdev.h | 24 lib/librte_ether/rte_ether_version.map | 7 + 23 files changed, 345 insertions(+), 2 deletions(-) -- 2.1.4
[dpdk-dev] [PATCH v6 01/11] ethdev: add API to query packet type filling info
Add a new API rte_eth_dev_get_ptype_info to query whether/what packet
type can be filled by given pmd rx burst function.
Signed-off-by: Jianfeng Tan
---
lib/librte_ether/rte_ethdev.c | 26 ++
lib/librte_ether/rte_ethdev.h | 24
lib/librte_ether/rte_ether_version.map | 7 +++
3 files changed, 57 insertions(+)
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 1257965..66dc7c5 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1576,6 +1576,32 @@ rte_eth_dev_info_get(uint8_t port_id, struct
rte_eth_dev_info *dev_info)
dev_info->driver_name = dev->data->drv_name;
}
+int
+rte_eth_dev_get_ptype_info(uint8_t port_id, uint32_t ptype_mask,
+ uint32_t *ptypes, int num)
+{
+ int i, j;
+ struct rte_eth_dev *dev;
+ const uint32_t *all_ptypes;
+
+ RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+ dev = &rte_eth_devices[port_id];
+ RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_ptype_info_get, -ENOTSUP);
+ all_ptypes = (*dev->dev_ops->dev_ptype_info_get)(dev);
+
+ if (!all_ptypes)
+ return 0;
+
+ for (i = 0, j = 0; all_ptypes[i] != RTE_PTYPE_UNKNOWN; ++i)
+ if (all_ptypes[i] & ptype_mask) {
+ if (j < num)
+ ptypes[j] = all_ptypes[i];
+ j++;
+ }
+
+ return j;
+}
+
void
rte_eth_macaddr_get(uint8_t port_id, struct ether_addr *mac_addr)
{
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 16da821..75261ca 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1021,6 +1021,9 @@ typedef void (*eth_dev_infos_get_t)(struct rte_eth_dev
*dev,
struct rte_eth_dev_info *dev_info);
/**< @internal Get specific informations of an Ethernet device. */
+typedef const uint32_t *(*eth_dev_ptype_info_get_t)(struct rte_eth_dev *dev);
+/**< @internal Get ptype info of eth_rx_burst_t. */
+
typedef int (*eth_queue_start_t)(struct rte_eth_dev *dev,
uint16_t queue_id);
/**< @internal Start rx and tx of a queue of an Ethernet device. */
@@ -1347,6 +1350,7 @@ struct eth_dev_ops {
eth_queue_stats_mapping_set_t queue_stats_mapping_set;
/**< Configure per queue stat counter mapping. */
eth_dev_infos_get_tdev_infos_get; /**< Get device info. */
+ eth_dev_ptype_info_get_t dev_ptype_info_get; /** Get ptype info */
mtu_set_t mtu_set; /**< Set MTU. */
vlan_filter_set_t vlan_filter_set; /**< Filter VLAN Setup. */
vlan_tpid_set_tvlan_tpid_set; /**< Outer VLAN TPID
Setup. */
@@ -2268,6 +2272,26 @@ void rte_eth_macaddr_get(uint8_t port_id, struct
ether_addr *mac_addr);
void rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info);
/**
+ * Retrieve the packet type information of an Ethernet device.
+ *
+ * @param port_id
+ * The port identifier of the Ethernet device.
+ * @param ptype_mask
+ * A hint of what kind of packet type which the caller is interested in.
+ * @param ptypes
+ * An array pointer to store adequent packet types, allocated by caller.
+ * @param num
+ * Size of the array pointed by param ptypes.
+ * @return
+ * - (>0) Number of ptypes supported. If it exceeds param num, exceeding
+ * packet types will not be filled in the given array.
+ * - (0 or -ENOTSUP) if PMD does not fill the specified ptype.
+ * - (-ENODEV) if *port_id* invalid.
+ */
+int rte_eth_dev_get_ptype_info(uint8_t port_id, uint32_t ptype_mask,
+ uint32_t *ptypes, int num);
+
+/**
* Retrieve the MTU of an Ethernet device.
*
* @param port_id
diff --git a/lib/librte_ether/rte_ether_version.map
b/lib/librte_ether/rte_ether_version.map
index d8db24d..3d2c4b6 100644
--- a/lib/librte_ether/rte_ether_version.map
+++ b/lib/librte_ether/rte_ether_version.map
@@ -117,3 +117,10 @@ DPDK_2.2 {
local: *;
};
+DPDK_2.3 {
+ global:
+
+ rte_eth_dev_get_ptype_info;
+
+ local: *;
+};
--
2.1.4
[dpdk-dev] [PATCH v6 02/11] pmd/cxgbe: add dev_ptype_info_get implementation
Signed-off-by: Jianfeng Tan
---
drivers/net/cxgbe/cxgbe_ethdev.c | 14 ++
1 file changed, 14 insertions(+)
diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c
index 97ef152..33bd815 100644
--- a/drivers/net/cxgbe/cxgbe_ethdev.c
+++ b/drivers/net/cxgbe/cxgbe_ethdev.c
@@ -767,6 +767,19 @@ static int cxgbe_flow_ctrl_set(struct rte_eth_dev *eth_dev,
&pi->link_cfg);
}
+static const uint32_t *cxgbe_dev_ptype_info_get(struct rte_eth_dev *eth_dev)
+{
+ static const uint32_t ptypes[] = {
+ RTE_PTYPE_L3_IPV4,
+ RTE_PTYPE_L3_IPV6,
+ RTE_PTYPE_UNKNOWN
+ };
+
+ if (eth_dev->rx_pkt_burst == cxgbe_recv_pkts)
+ return ptypes;
+ return NULL;
+}
+
static struct eth_dev_ops cxgbe_eth_dev_ops = {
.dev_start = cxgbe_dev_start,
.dev_stop = cxgbe_dev_stop,
@@ -777,6 +790,7 @@ static struct eth_dev_ops cxgbe_eth_dev_ops = {
.allmulticast_disable = cxgbe_dev_allmulticast_disable,
.dev_configure = cxgbe_dev_configure,
.dev_infos_get = cxgbe_dev_info_get,
+ .dev_ptype_info_get = cxgbe_dev_ptype_info_get,
.link_update= cxgbe_dev_link_update,
.mtu_set= cxgbe_dev_mtu_set,
.tx_queue_setup = cxgbe_dev_tx_queue_setup,
--
2.1.4
[dpdk-dev] [PATCH v6 03/11] pmd/e1000: add dev_ptype_info_get implementation
Signed-off-by: Jianfeng Tan
---
drivers/net/e1000/igb_ethdev.c | 30 ++
1 file changed, 30 insertions(+)
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 4ed5e95..b3a3ee6 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -103,6 +103,7 @@ static void eth_igb_stats_reset(struct rte_eth_dev *dev);
static void eth_igb_xstats_reset(struct rte_eth_dev *dev);
static void eth_igb_infos_get(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info);
+static const uint32_t *eth_igb_ptype_info_get(struct rte_eth_dev *dev);
static void eth_igbvf_infos_get(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info);
static int eth_igb_flow_ctrl_get(struct rte_eth_dev *dev,
@@ -319,6 +320,7 @@ static const struct eth_dev_ops eth_igb_ops = {
.stats_reset = eth_igb_stats_reset,
.xstats_reset = eth_igb_xstats_reset,
.dev_infos_get= eth_igb_infos_get,
+ .dev_ptype_info_get = eth_igb_ptype_info_get,
.mtu_set = eth_igb_mtu_set,
.vlan_filter_set = eth_igb_vlan_filter_set,
.vlan_tpid_set= eth_igb_vlan_tpid_set,
@@ -376,6 +378,7 @@ static const struct eth_dev_ops igbvf_eth_dev_ops = {
.xstats_reset = eth_igbvf_stats_reset,
.vlan_filter_set = igbvf_vlan_filter_set,
.dev_infos_get= eth_igbvf_infos_get,
+ .dev_ptype_info_get = eth_igb_ptype_info_get,
.rx_queue_setup = eth_igb_rx_queue_setup,
.rx_queue_release = eth_igb_rx_queue_release,
.tx_queue_setup = eth_igb_tx_queue_setup,
@@ -1910,6 +1913,33 @@ eth_igb_infos_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
dev_info->tx_desc_lim = tx_desc_lim;
}
+static const uint32_t *
+eth_igb_ptype_info_get(struct rte_eth_dev *dev)
+{
+ static const uint32_t ptypes[] = {
+ /* refers to igb_rxd_pkt_info_to_pkt_type() */
+ RTE_PTYPE_L2_ETHER,
+ RTE_PTYPE_L3_IPV4,
+ RTE_PTYPE_L3_IPV4_EXT,
+ RTE_PTYPE_L3_IPV6,
+ RTE_PTYPE_L3_IPV6_EXT,
+ RTE_PTYPE_L4_TCP,
+ RTE_PTYPE_L4_UDP,
+ RTE_PTYPE_L4_SCTP,
+ RTE_PTYPE_TUNNEL_IP,
+ RTE_PTYPE_INNER_L3_IPV6,
+ RTE_PTYPE_INNER_L3_IPV6_EXT,
+ RTE_PTYPE_INNER_L4_TCP,
+ RTE_PTYPE_INNER_L4_UDP,
+ RTE_PTYPE_UNKNOWN
+ };
+
+ if (dev->rx_pkt_burst == eth_igb_recv_pkts ||
+ dev->rx_pkt_burst == eth_igb_recv_scattered_pkts)
+ return ptypes;
+ return NULL;
+}
+
static void
eth_igbvf_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
{
--
2.1.4
[dpdk-dev] [PATCH v6 04/11] pmd/enic: add dev_ptype_info_get implementation
Signed-off-by: Jianfeng Tan
---
drivers/net/enic/enic_ethdev.c | 17 +
1 file changed, 17 insertions(+)
diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index 2a88043..fbeab6f 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -54,6 +54,9 @@
#define ENICPMD_FUNC_TRACE() (void)0
#endif
+static uint16_t enicpmd_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
+ uint16_t nb_pkts);
+
/*
* The set of PCI devices this driver supports
*/
@@ -431,6 +434,19 @@ static void enicpmd_dev_info_get(struct rte_eth_dev
*eth_dev,
DEV_TX_OFFLOAD_TCP_CKSUM;
}
+static const uint32_t *enicpmd_dev_ptype_info_get(struct rte_eth_dev *dev)
+{
+ static const uint32_t ptypes[] = {
+ RTE_PTYPE_L3_IPV4,
+ RTE_PTYPE_L3_IPV6,
+ RTE_PTYPE_UNKNOWN
+ };
+
+ if (dev->rx_pkt_burst == enicpmd_recv_pkts)
+ return ptypes;
+ return NULL;
+}
+
static void enicpmd_dev_promiscuous_enable(struct rte_eth_dev *eth_dev)
{
struct enic *enic = pmd_priv(eth_dev);
@@ -566,6 +582,7 @@ static const struct eth_dev_ops enicpmd_eth_dev_ops = {
.stats_reset = enicpmd_dev_stats_reset,
.queue_stats_mapping_set = NULL,
.dev_infos_get= enicpmd_dev_info_get,
+ .dev_ptype_info_get = enicpmd_dev_ptype_info_get,
.mtu_set = NULL,
.vlan_filter_set = enicpmd_vlan_filter_set,
.vlan_tpid_set= NULL,
--
2.1.4
[dpdk-dev] [PATCH v6 05/11] pmd/fm10k: add dev_ptype_info_get implementation
Signed-off-by: Jianfeng Tan
---
drivers/net/fm10k/fm10k_ethdev.c | 50 ++
drivers/net/fm10k/fm10k_rxtx.c | 3 +++
drivers/net/fm10k/fm10k_rxtx_vec.c | 3 +++
3 files changed, 56 insertions(+)
diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index 421266b..429cbdd 100644
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -1335,6 +1335,55 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,
};
}
+#ifdef RTE_LIBRTE_FM10K_RX_OLFLAGS_ENABLE
+static const uint32_t *
+fm10k_dev_ptype_info_get(struct rte_eth_dev *dev)
+{
+ if (dev->rx_pkt_burst == fm10k_recv_pkts ||
+ dev->rx_pkt_burst == fm10k_recv_scattered_pkts) {
+ static uint32_t ptypes[] = {
+ /* refers to rx_desc_to_ol_flags() */
+ RTE_PTYPE_L2_ETHER,
+ RTE_PTYPE_L3_IPV4,
+ RTE_PTYPE_L3_IPV4_EXT,
+ RTE_PTYPE_L3_IPV6,
+ RTE_PTYPE_L3_IPV6_EXT,
+ RTE_PTYPE_L4_TCP,
+ RTE_PTYPE_L4_UDP,
+ RTE_PTYPE_UNKNOWN
+ };
+
+ return ptypes;
+ } else if (dev->rx_pkt_burst == fm10k_recv_pkts_vec ||
+ dev->rx_pkt_burst == fm10k_recv_scattered_pkts_vec) {
+ static uint32_t ptypes_vec[] = {
+ /* refers to fm10k_desc_to_pktype_v() */
+ RTE_PTYPE_L3_IPV4,
+ RTE_PTYPE_L3_IPV4_EXT,
+ RTE_PTYPE_L3_IPV6,
+ RTE_PTYPE_L3_IPV6_EXT,
+ RTE_PTYPE_L4_TCP,
+ RTE_PTYPE_L4_UDP,
+ RTE_PTYPE_TUNNEL_GENEVE,
+ RTE_PTYPE_TUNNEL_NVGRE,
+ RTE_PTYPE_TUNNEL_VXLAN,
+ RTE_PTYPE_TUNNEL_GRE,
+ RTE_PTYPE_UNKNOWN
+ };
+
+ return ptypes_vec;
+ }
+
+ return NULL;
+}
+#else
+static const uint32_t *
+fm10k_dev_ptype_info_get(struct rte_eth_dev *dev __rte_unused)
+{
+ return NULL;
+}
+#endif
+
static int
fm10k_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
{
@@ -2423,6 +2472,7 @@ static const struct eth_dev_ops fm10k_eth_dev_ops = {
.xstats_reset = fm10k_stats_reset,
.link_update= fm10k_link_update,
.dev_infos_get = fm10k_dev_infos_get,
+ .dev_ptype_info_get = fm10k_dev_ptype_info_get,
.vlan_filter_set= fm10k_vlan_filter_set,
.vlan_offload_set = fm10k_vlan_offload_set,
.mac_addr_add = fm10k_macaddr_add,
diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c
index e958865..cbe0111 100644
--- a/drivers/net/fm10k/fm10k_rxtx.c
+++ b/drivers/net/fm10k/fm10k_rxtx.c
@@ -65,6 +65,9 @@ static inline void dump_rxd(union fm10k_rx_desc *rxd)
}
#endif
+/* @note: When this function is changed, make corresponding change to
+ * fm10k_dev_ptype_info_get()
+ */
static inline void
rx_desc_to_ol_flags(struct rte_mbuf *m, const union fm10k_rx_desc *d)
{
diff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c
b/drivers/net/fm10k/fm10k_rxtx_vec.c
index 2a57eef..f347641 100644
--- a/drivers/net/fm10k/fm10k_rxtx_vec.c
+++ b/drivers/net/fm10k/fm10k_rxtx_vec.c
@@ -109,6 +109,9 @@ fm10k_desc_to_olflags_v(__m128i descs[4], struct rte_mbuf
**rx_pkts)
rx_pkts[3]->ol_flags = vol.e[3];
}
+/* @note: When this function is changed, make corresponding change to
+ * fm10k_dev_ptype_info_get().
+ */
static inline void
fm10k_desc_to_pktype_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
{
--
2.1.4
[dpdk-dev] [PATCH v6 06/11] pmd/i40e: add dev_ptype_info_get implementation
Signed-off-by: Jianfeng Tan
---
drivers/net/i40e/i40e_ethdev.c| 1 +
drivers/net/i40e/i40e_ethdev_vf.c | 1 +
drivers/net/i40e/i40e_rxtx.c | 46 ++-
drivers/net/i40e/i40e_rxtx.h | 1 +
4 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index ef24122..81849fa 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -439,6 +439,7 @@ static const struct eth_dev_ops i40e_eth_dev_ops = {
.xstats_reset = i40e_dev_stats_reset,
.queue_stats_mapping_set = i40e_dev_queue_stats_mapping_set,
.dev_infos_get= i40e_dev_info_get,
+ .dev_ptype_info_get = i40e_dev_ptype_info_get,
.vlan_filter_set = i40e_vlan_filter_set,
.vlan_tpid_set= i40e_vlan_tpid_set,
.vlan_offload_set = i40e_vlan_offload_set,
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c
b/drivers/net/i40e/i40e_ethdev_vf.c
index 13c5b3d..afd436e 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -196,6 +196,7 @@ static const struct eth_dev_ops i40evf_eth_dev_ops = {
.xstats_reset = i40evf_dev_xstats_reset,
.dev_close= i40evf_dev_close,
.dev_infos_get= i40evf_dev_info_get,
+ .dev_ptype_info_get = i40e_dev_ptype_info_get,
.vlan_filter_set = i40evf_vlan_filter_set,
.vlan_offload_set = i40evf_vlan_offload_set,
.vlan_pvid_set= i40evf_vlan_pvid_set,
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 40cffc1..1a952df 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -194,7 +194,10 @@ i40e_get_iee15888_flags(struct rte_mbuf *mb, uint64_t
qword)
}
#endif
-/* For each value it means, datasheet of hardware can tell more details */
+/* For each value it means, datasheet of hardware can tell more details
+ *
+ * @note: fix i40e_dev_ptype_info_get() if any change here.
+ */
static inline uint32_t
i40e_rxd_pkt_type_mapping(uint8_t ptype)
{
@@ -2093,6 +2096,47 @@ i40e_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t
tx_queue_id)
return 0;
}
+const uint32_t *
+i40e_dev_ptype_info_get(struct rte_eth_dev *dev)
+{
+ static const uint32_t ptypes[] = {
+ /* refers to i40e_rxd_pkt_type_mapping() */
+ RTE_PTYPE_L2_ETHER,
+ RTE_PTYPE_L2_ETHER_TIMESYNC,
+ RTE_PTYPE_L2_ETHER_LLDP,
+ RTE_PTYPE_L2_ETHER_ARP,
+ RTE_PTYPE_L3_IPV4_EXT_UNKNOWN,
+ RTE_PTYPE_L3_IPV6_EXT_UNKNOWN,
+ RTE_PTYPE_L4_FRAG,
+ RTE_PTYPE_L4_ICMP,
+ RTE_PTYPE_L4_NONFRAG,
+ RTE_PTYPE_L4_SCTP,
+ RTE_PTYPE_L4_TCP,
+ RTE_PTYPE_L4_UDP,
+ RTE_PTYPE_TUNNEL_GRENAT,
+ RTE_PTYPE_TUNNEL_IP,
+ RTE_PTYPE_INNER_L2_ETHER,
+ RTE_PTYPE_INNER_L2_ETHER_VLAN,
+ RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN,
+ RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN,
+ RTE_PTYPE_INNER_L4_FRAG,
+ RTE_PTYPE_INNER_L4_ICMP,
+ RTE_PTYPE_INNER_L4_NONFRAG,
+ RTE_PTYPE_INNER_L4_SCTP,
+ RTE_PTYPE_INNER_L4_TCP,
+ RTE_PTYPE_INNER_L4_UDP,
+ RTE_PTYPE_UNKNOWN
+ };
+
+ if (dev->rx_pkt_burst == i40e_recv_pkts ||
+#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC
+ dev->rx_pkt_burst == i40e_recv_pkts_bulk_alloc ||
+#endif
+ dev->rx_pkt_burst == i40e_recv_scattered_pkts)
+ return ptypes;
+ return NULL;
+}
+
int
i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h
index 5c2f5c2..3a59d81 100644
--- a/drivers/net/i40e/i40e_rxtx.h
+++ b/drivers/net/i40e/i40e_rxtx.h
@@ -200,6 +200,7 @@ int i40e_dev_rx_queue_start(struct rte_eth_dev *dev,
uint16_t rx_queue_id);
int i40e_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id);
int i40e_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id);
int i40e_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id);
+const uint32_t *i40e_dev_ptype_info_get(struct rte_eth_dev *dev);
int i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
--
2.1.4
[dpdk-dev] [PATCH v6 07/11] pmd/ixgbe: add dev_ptype_info_get implementation
Signed-off-by: Jianfeng Tan
---
drivers/net/ixgbe/ixgbe_ethdev.c | 38 ++
drivers/net/ixgbe/ixgbe_ethdev.h | 2 ++
drivers/net/ixgbe/ixgbe_rxtx.c | 4 +++-
3 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 3e6fe86..605d958 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -166,6 +166,7 @@ static int ixgbe_dev_queue_stats_mapping_set(struct
rte_eth_dev *eth_dev,
uint8_t is_rx);
static void ixgbe_dev_info_get(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info);
+static const uint32_t *ixgbe_dev_ptype_info_get(struct rte_eth_dev *dev);
static void ixgbevf_dev_info_get(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info);
static int ixgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
@@ -428,6 +429,7 @@ static const struct eth_dev_ops ixgbe_eth_dev_ops = {
.xstats_reset = ixgbe_dev_xstats_reset,
.queue_stats_mapping_set = ixgbe_dev_queue_stats_mapping_set,
.dev_infos_get= ixgbe_dev_info_get,
+ .dev_ptype_info_get = ixgbe_dev_ptype_info_get,
.mtu_set = ixgbe_dev_mtu_set,
.vlan_filter_set = ixgbe_vlan_filter_set,
.vlan_tpid_set= ixgbe_vlan_tpid_set,
@@ -512,6 +514,7 @@ static const struct eth_dev_ops ixgbevf_eth_dev_ops = {
.xstats_reset = ixgbevf_dev_stats_reset,
.dev_close= ixgbevf_dev_close,
.dev_infos_get= ixgbevf_dev_info_get,
+ .dev_ptype_info_get = ixgbe_dev_ptype_info_get,
.mtu_set = ixgbevf_dev_set_mtu,
.vlan_filter_set = ixgbevf_vlan_filter_set,
.vlan_strip_queue_set = ixgbevf_vlan_strip_queue_set,
@@ -2829,6 +2832,41 @@ ixgbe_dev_info_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
dev_info->flow_type_rss_offloads = IXGBE_RSS_OFFLOAD_ALL;
}
+static const uint32_t *
+ixgbe_dev_ptype_info_get(struct rte_eth_dev *dev)
+{
+ static const uint32_t ptypes[] = {
+ /* For non-vec functions,
+* refers to ixgbe_rxd_pkt_info_to_pkt_type();
+* for vec functions,
+* refers to _recv_raw_pkts_vec().
+*/
+ RTE_PTYPE_L2_ETHER,
+ RTE_PTYPE_L3_IPV4,
+ RTE_PTYPE_L3_IPV4_EXT,
+ RTE_PTYPE_L3_IPV6,
+ RTE_PTYPE_L3_IPV6_EXT,
+ RTE_PTYPE_L4_SCTP,
+ RTE_PTYPE_L4_TCP,
+ RTE_PTYPE_L4_UDP,
+ RTE_PTYPE_TUNNEL_IP,
+ RTE_PTYPE_INNER_L3_IPV6,
+ RTE_PTYPE_INNER_L3_IPV6_EXT,
+ RTE_PTYPE_INNER_L4_TCP,
+ RTE_PTYPE_INNER_L4_UDP,
+ RTE_PTYPE_UNKNOWN
+ };
+
+ if (dev->rx_pkt_burst == ixgbe_recv_pkts ||
+ dev->rx_pkt_burst == ixgbe_recv_pkts_lro_single_alloc ||
+ dev->rx_pkt_burst == ixgbe_recv_pkts_lro_bulk_alloc ||
+ dev->rx_pkt_burst == ixgbe_recv_pkts_bulk_alloc ||
+ dev->rx_pkt_burst == ixgbe_recv_pkts_vec ||
+ dev->rx_pkt_burst == ixgbe_recv_scattered_pkts_vec)
+ return ptypes;
+ return NULL;
+}
+
static void
ixgbevf_dev_info_get(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h
index d26771a..b07d3da 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.h
+++ b/drivers/net/ixgbe/ixgbe_ethdev.h
@@ -379,6 +379,8 @@ void ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev);
uint16_t ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts);
+uint16_t ixgbe_recv_pkts_bulk_alloc(void *rx_queue, struct rte_mbuf **rx_pkts,
+ uint16_t nb_pkts);
uint16_t ixgbe_recv_pkts_lro_single_alloc(void *rx_queue,
struct rte_mbuf **rx_pkts, uint16_t nb_pkts);
uint16_t ixgbe_recv_pkts_lro_bulk_alloc(void *rx_queue,
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index e95e6b7..17851cc 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -899,6 +899,8 @@ end_of_tx:
#define IXGBE_PACKET_TYPE_MAX 0X80
#define IXGBE_PACKET_TYPE_MASK 0X7F
#define IXGBE_PACKET_TYPE_SHIFT 0X04
+
+/* @note: fix ixgbe_dev_ptype_info_get() if any change here. */
static inline uint32_t
ixgbe_rxd_pkt_info_to_pkt_type(uint16_t pkt_info)
{
@@ -1247,7 +1249,7 @@ rx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
}
/* split requests into chunks of size RTE_PMD_IXGBE_RX_MAX_BURST */
-static uint16_t
+uint16_t
ixgbe_recv_pkts_bulk_alloc(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts)
[dpdk-dev] [PATCH v6 08/11] pmd/mlx4: add dev_ptype_info_get implementation
Signed-off-by: Jianfeng Tan
---
drivers/net/mlx4/mlx4.c | 21 +
1 file changed, 21 insertions(+)
diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index ee00151..58f4e1a 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -2835,6 +2835,8 @@ rxq_cleanup(struct rxq *rxq)
* @param flags
* RX completion flags returned by poll_length_flags().
*
+ * @note: fix mlx4_dev_ptype_info_get() if any change here.
+ *
* @return
* Packet type for struct rte_mbuf.
*/
@@ -4267,6 +4269,24 @@ mlx4_dev_infos_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *info)
priv_unlock(priv);
}
+static const uint32_t *
+mlx4_dev_ptype_info_get(struct rte_eth_dev *dev)
+{
+ static const uint32_t ptypes[] = {
+ /* refers to rxq_cq_to_pkt_type() */
+ RTE_PTYPE_L3_IPV4,
+ RTE_PTYPE_L3_IPV6,
+ RTE_PTYPE_INNER_L3_IPV4,
+ RTE_PTYPE_INNER_L3_IPV6,
+ RTE_PTYPE_UNKNOWN
+ };
+
+ if (dev->rx_pkt_burst == mlx4_rx_burst ||
+ dev->rx_pkt_burst == mlx4_rx_burst_sp)
+ return ptypes;
+ return NULL;
+}
+
/**
* DPDK callback to get device statistics.
*
@@ -4988,6 +5008,7 @@ static const struct eth_dev_ops mlx4_dev_ops = {
.stats_reset = mlx4_stats_reset,
.queue_stats_mapping_set = NULL,
.dev_infos_get = mlx4_dev_infos_get,
+ .dev_ptypes_info_get = mlx4_dev_ptype_info_get,
.vlan_filter_set = mlx4_vlan_filter_set,
.vlan_tpid_set = NULL,
.vlan_strip_queue_set = NULL,
--
2.1.4
[dpdk-dev] [PATCH v6 09/11] pmd/mlx5: add dev_ptype_info_get implementation
Signed-off-by: Jianfeng Tan
---
drivers/net/mlx5/mlx5.c| 1 +
drivers/net/mlx5/mlx5.h| 1 +
drivers/net/mlx5/mlx5_ethdev.c | 20
drivers/net/mlx5/mlx5_rxtx.c | 2 ++
4 files changed, 24 insertions(+)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 821ee0f..e18b1e9 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -153,6 +153,7 @@ static const struct eth_dev_ops mlx5_dev_ops = {
.stats_get = mlx5_stats_get,
.stats_reset = mlx5_stats_reset,
.dev_infos_get = mlx5_dev_infos_get,
+ .dev_ptype_info_get = mlx5_dev_ptype_info_get,
.vlan_filter_set = mlx5_vlan_filter_set,
.rx_queue_setup = mlx5_rx_queue_setup,
.tx_queue_setup = mlx5_tx_queue_setup,
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index b84d31d..196435d 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -156,6 +156,7 @@ int priv_get_mtu(struct priv *, uint16_t *);
int priv_set_flags(struct priv *, unsigned int, unsigned int);
int mlx5_dev_configure(struct rte_eth_dev *);
void mlx5_dev_infos_get(struct rte_eth_dev *, struct rte_eth_dev_info *);
+const uint32_t *mlx5_dev_ptype_info_get(struct rte_eth_dev *dev);
int mlx5_link_update(struct rte_eth_dev *, int);
int mlx5_dev_set_mtu(struct rte_eth_dev *, uint16_t);
int mlx5_dev_get_flow_ctrl(struct rte_eth_dev *, struct rte_eth_fc_conf *);
diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 1159fa3..406f8dc 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -526,6 +526,26 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *info)
priv_unlock(priv);
}
+const uint32_t *
+mlx5_dev_ptype_info_get(struct rte_eth_dev *dev)
+{
+ static const uint32_t ptypes[] = {
+ /* refers to rxq_cq_to_pkt_type() */
+ RTE_PTYPE_L3_IPV4,
+ RTE_PTYPE_L3_IPV6,
+ RTE_PTYPE_INNER_L3_IPV4,
+ RTE_PTYPE_INNER_L3_IPV6,
+ RTE_PTYPE_UNKNOWN
+
+ };
+
+ if (dev->rx_pkt_burst == mlx5_rx_burst ||
+ dev->rx_pkt_burst == mlx5_rx_burst_sp)
+ return ptypes;
+ return NULL;
+
+}
+
/**
* DPDK callback to retrieve physical link information (unlocked version).
*
diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index fa5e648..79bdf8d 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -603,6 +603,8 @@ stop:
* @param flags
* RX completion flags returned by poll_length_flags().
*
+ * @note: fix mlx5_dev_ptype_info_get() if any change here.
+ *
* @return
* Packet type for struct rte_mbuf.
*/
--
2.1.4
[dpdk-dev] [PATCH v6 10/11] pmd/nfp: add dev_ptype_info_get implementation
Signed-off-by: Jianfeng Tan
---
drivers/net/nfp/nfp_net.c | 19 +++
1 file changed, 19 insertions(+)
diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index fd4dd39..5894a9d 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -1073,6 +1073,24 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
dev_info->hash_key_size = NFP_NET_CFG_RSS_KEY_SZ;
}
+static const uint32_t *
+nfp_net_ptype_info_get(struct rte_eth_dev *dev)
+{
+ static const uint32_t ptypes[] = {
+ /* refers to nfp_net_set_hash() */
+ RTE_PTYPE_INNER_L3_IPV4,
+ RTE_PTYPE_INNER_L3_IPV6,
+ RTE_PTYPE_INNER_L3_IPV6_EXT,
+ RTE_PTYPE_INNER_L4_MASK,
+ RTE_PTYPE_UNKNOWN
+ };
+
+
+ if (dev->rx_pkt_burst == nfp_net_recv_pkts)
+ return ptypes;
+ return num;
+}
+
static uint32_t
nfp_net_rx_queue_count(struct rte_eth_dev *dev, uint16_t queue_idx)
{
@@ -2292,6 +2310,7 @@ static struct eth_dev_ops nfp_net_eth_dev_ops = {
.stats_get = nfp_net_stats_get,
.stats_reset= nfp_net_stats_reset,
.dev_infos_get = nfp_net_infos_get,
+ .dev_ptype_info_get = nfp_net_ptype_info_get,
.mtu_set= nfp_net_dev_mtu_set,
.vlan_offload_set = nfp_net_vlan_offload_set,
.reta_update= nfp_net_reta_update,
--
2.1.4
[dpdk-dev] [PATCH v6 11/11] pmd/vmxnet3: add dev_ptype_info_get implementation
Signed-off-by: Jianfeng Tan
---
drivers/net/vmxnet3/vmxnet3_ethdev.c | 16
1 file changed, 16 insertions(+)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c
b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index c363bf6..ac120a1 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -86,6 +86,7 @@ static void vmxnet3_dev_stats_get(struct rte_eth_dev *dev,
struct rte_eth_stats *stats);
static void vmxnet3_dev_info_get(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info);
+static const uint32_t *vmxnet3_dev_ptype_info_get(struct rte_eth_dev *dev);
static int vmxnet3_dev_vlan_filter_set(struct rte_eth_dev *dev,
uint16_t vid, int on);
static void vmxnet3_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask);
@@ -118,6 +119,7 @@ static const struct eth_dev_ops vmxnet3_eth_dev_ops = {
.link_update = vmxnet3_dev_link_update,
.stats_get= vmxnet3_dev_stats_get,
.dev_infos_get= vmxnet3_dev_info_get,
+ .dev_ptype_info_get = vmxnet3_dev_ptype_info_get,
.vlan_filter_set = vmxnet3_dev_vlan_filter_set,
.vlan_offload_set = vmxnet3_dev_vlan_offload_set,
.rx_queue_setup = vmxnet3_dev_rx_queue_setup,
@@ -718,6 +720,20 @@ vmxnet3_dev_info_get(__attribute__((unused))struct
rte_eth_dev *dev, struct rte_
};
}
+static const uint32_t *
+vmxnet3_dev_ptype_info_get(struct rte_eth_dev *dev)
+{
+ static const uint32_t ptypes[] = {
+ RTE_PTYPE_L3_IPV4_EXT,
+ RTE_PTYPE_L3_IPV4,
+ RTE_PTYPE_UNKNOWN
+ };
+
+ if (dev->rx_pkt_burst == vmxnet3_recv_pkts)
+ return ptypes;
+ return NULL;
+}
+
/* return 0 means link status changed, -1 means not changed */
static int
vmxnet3_dev_link_update(struct rte_eth_dev *dev, __attribute__((unused)) int
wait_to_complete)
--
2.1.4
[dpdk-dev] [PATCH v9 0/4] ethdev: add speed capabilities and refactor link API
The current rte_eth_dev_info abstraction does not provide any mechanism to get the supported speed(s) of an ethdev. For some drivers (e.g. ixgbe), an educated guess could be done based on the driver's name (driver_name in rte_eth_dev_info), see: http://dpdk.org/ml/archives/dev/2013-August/000412.html However, i) doing string comparisons is annoying, and can silently break existing applications if PMDs change their names ii) it does not provide all the supported capabilities of the ethdev iii) for some drivers it is impossible determine correctly the (max) speed by the application (e.g. in i40, distinguish between XL710 and X710). In addition, the link APIs do not allow to define a set of advertised link speeds for autonegociation. This series of patches adds the following capabilities: * speed_capa bitmap in rte_eth_dev_info, which is filled by the PMDs according to the physical device capabilities. * refactors link API in ethdev to allow the definition of the advertised link speeds, fix speed (no auto-negociation) or advertise all supported speeds (default). WARNING: this patch series, specifically 3/4, is NOT tested for most of the PMDs, due to the lack of hardware. Only generic EM is tested (VM). Reviewing and testing required by PMD maintainers. * * * * * v2: rebase, converted speed_capa into 32 bits bitmap, fixed alignment (checkpatch). v3: rebase to v2.1. unified ETH_LINK_SPEED and ETH_SPEED_CAP into ETH_SPEED. Converted field speed in struct rte_eth_conf to speed, to allow a bitmap for defining the announced speeds, as suggested M. Brorup. Fixed spelling issues. v4: fixed errata in the documentation of field speeds of rte_eth_conf, and commit 1/2 message. rebased to v2.1.0. v3 was incorrectly based on ~2.1.0-rc1. v5: revert to v2 speed capabilities patch. Fixed MLX4 speed capabilities (thanks N. Laranjeiro). Refactored link speed API to allow setting advertised speeds (3/4). Added NO_AUTONEG option to explicitely disable auto-negociation. Updated 2.2 rel. notes (4/4). Rebased to current HEAD. v6: Move link_duplex to be part of bitfield. Fixed i40 autoneg flag link update code. Added rte_eth_speed_to_bm_flag() to .map file. Fixed other spelling issues. Rebased to current HEAD. v7: Rebased to current HEAD. Moved documentation to v2.3. Still needs testing from PMD maintainers. v8: Rebased to current HEAD. Modified em driver impl. to not touch base files. Merged patch 5 into 3 (map file). Changed numeric speed to a 64 bit value. Filled-in speed capabilities for drivers bnx2x, cxgbe, mlx5 and nfp in addition to the ones of previous patch sets. v9: rebased to current HEAD. Reverted numeric speed to 32 bit in struct rte_eth_link (no atomic link get > 64bit). Fixed mlx5 driver compilation and link speeds. Moved documentation to release_16_04.rst and fixed several issues. Upgrade NIC notes with speed capabilities. Marc Sune (4): ethdev: Added ETH_SPEED_CAP bitmap for ports ethdev: Fill speed capability bitmaps in the PMDs ethdev: redesign link speed config API doc: update with link changes app/test-pipeline/init.c | 2 +- app/test-pmd/cmdline.c| 124 +++--- app/test-pmd/config.c | 4 +- app/test/virtual_pmd.c| 4 +- doc/guides/nics/overview.rst | 1 + doc/guides/rel_notes/release_16_04.rst| 27 +++ drivers/net/af_packet/rte_eth_af_packet.c | 5 +- drivers/net/bnx2x/bnx2x_ethdev.c | 7 +- drivers/net/bonding/rte_eth_bond_8023ad.c | 14 ++-- drivers/net/cxgbe/base/t4_hw.c| 8 +- drivers/net/cxgbe/cxgbe_ethdev.c | 1 + drivers/net/e1000/em_ethdev.c | 112 ++- drivers/net/e1000/igb_ethdev.c| 107 +++--- drivers/net/fm10k/fm10k_ethdev.c | 6 +- drivers/net/i40e/i40e_ethdev.c| 78 +++ drivers/net/i40e/i40e_ethdev_vf.c | 11 +-- drivers/net/ixgbe/ixgbe_ethdev.c | 80 +-- drivers/net/mlx4/mlx4.c | 6 ++ drivers/net/mlx5/mlx5_ethdev.c| 7 ++ drivers/net/mpipe/mpipe_tilegx.c | 6 +- drivers/net/nfp/nfp_net.c | 4 +- drivers/net/null/rte_eth_null.c | 5 +- drivers/net/pcap/rte_eth_pcap.c | 9 ++- drivers/net/ring/rte_eth_ring.c | 5 +- drivers/net/virtio/virtio_ethdev.c| 2 +- drivers/net/virtio/virtio_ethdev.h| 2 - drivers/net/vmxnet3/vmxnet3_ethdev.c | 5 +- drivers/net/xenvirt/rte_eth_xenvirt.c | 5 +- examples/ip_pipeline/config_parse.c | 3 +- lib/librte_ether/rte_ethdev.c | 49 lib/librte_ether/rte_ethdev.h | 97 ++- lib/librte_ether/rte_ether_version.map| 6 ++ 32 files changed, 501 insertions(+), 30
[dpdk-dev] [PATCH v9 1/4] ethdev: Added ETH_SPEED_CAP bitmap for ports
Added constants and bitmap to struct rte_eth_dev_info to be used by PMDs.
Signed-off-by: Marc Sune
---
lib/librte_ether/rte_ethdev.h | 24
1 file changed, 24 insertions(+)
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 16da821..83ddbb7 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -824,6 +824,29 @@ struct rte_eth_conf {
#define DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM 0x0080 /**< Used for tunneling
packet. */
#define DEV_TX_OFFLOAD_QINQ_INSERT 0x0100
+/**
+ * Device supported speeds
+ */
+#define ETH_SPEED_CAP_NOT_PHY (0) /*< No phy media > */
+#define ETH_SPEED_CAP_10M_HD (1 << 0) /*< 10 Mbps half-duplex> */
+#define ETH_SPEED_CAP_10M_FD (1 << 1) /*< 10 Mbps full-duplex> */
+#define ETH_SPEED_CAP_100M_HD (1 << 2) /*< 100 Mbps half-duplex> */
+#define ETH_SPEED_CAP_100M_FD (1 << 3) /*< 100 Mbps full-duplex> */
+#define ETH_SPEED_CAP_1G (1 << 4) /*< 1 Gbps > */
+#define ETH_SPEED_CAP_2_5G (1 << 5) /*< 2.5 Gbps > */
+#define ETH_SPEED_CAP_5G (1 << 6) /*< 5 Gbps > */
+#define ETH_SPEED_CAP_10G (1 << 7) /*< 10 Mbps > */
+#define ETH_SPEED_CAP_20G (1 << 8) /*< 20 Gbps > */
+#define ETH_SPEED_CAP_25G (1 << 9) /*< 25 Gbps > */
+#define ETH_SPEED_CAP_40G (1 << 10) /*< 40 Gbps > */
+#define ETH_SPEED_CAP_50G (1 << 11) /*< 50 Gbps > */
+#define ETH_SPEED_CAP_56G (1 << 12) /*< 56 Gbps > */
+#define ETH_SPEED_CAP_100G (1 << 13) /*< 100 Gbps > */
+
+
+/**
+ * Ethernet device information
+ */
struct rte_eth_dev_info {
struct rte_pci_device *pci_dev; /**< Device PCI information. */
const char *driver_name; /**< Device Driver name. */
@@ -852,6 +875,7 @@ struct rte_eth_dev_info {
uint16_t vmdq_pool_base; /**< First ID of VMDQ pools. */
struct rte_eth_desc_lim rx_desc_lim; /**< RX descriptors limits */
struct rte_eth_desc_lim tx_desc_lim; /**< TX descriptors limits */
+ uint32_t speed_capa; /**< Supported speeds bitmap (ETH_SPEED_CAP_). */
};
/**
--
2.1.4
[dpdk-dev] [PATCH v9 2/4] ethdev: Fill speed capability bitmaps in the PMDs
Added speed capabilities to all pmds supporting physical NICs:
* e1000
* ixgbe
* i40
* bnx2x
* cxgbe
* mlx4
* mlx5
* nfp
* fm10k
Signed-off-by: Marc Sune
---
drivers/net/bnx2x/bnx2x_ethdev.c | 1 +
drivers/net/cxgbe/cxgbe_ethdev.c | 1 +
drivers/net/e1000/em_ethdev.c| 6 ++
drivers/net/e1000/igb_ethdev.c | 6 ++
drivers/net/fm10k/fm10k_ethdev.c | 4
drivers/net/i40e/i40e_ethdev.c | 9 +
drivers/net/ixgbe/ixgbe_ethdev.c | 10 ++
drivers/net/mlx4/mlx4.c | 4
drivers/net/mlx5/mlx5_ethdev.c | 7 +++
drivers/net/nfp/nfp_net.c| 2 ++
10 files changed, 50 insertions(+)
diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index 69df02e..b547ac3 100644
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -347,6 +347,7 @@ bnx2x_dev_infos_get(struct rte_eth_dev *dev, __rte_unused
struct rte_eth_dev_inf
dev_info->min_rx_bufsize = BNX2X_MIN_RX_BUF_SIZE;
dev_info->max_rx_pktlen = BNX2X_MAX_RX_PKT_LEN;
dev_info->max_mac_addrs = BNX2X_MAX_MAC_ADDRS;
+ dev_info->speed_capa = ETH_SPEED_CAP_10G | ETH_SPEED_CAP_20G;
}
static void
diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c
index 97ef152..203e119 100644
--- a/drivers/net/cxgbe/cxgbe_ethdev.c
+++ b/drivers/net/cxgbe/cxgbe_ethdev.c
@@ -171,6 +171,7 @@ static void cxgbe_dev_info_get(struct rte_eth_dev *eth_dev,
device_info->rx_desc_lim = cxgbe_desc_lim;
device_info->tx_desc_lim = cxgbe_desc_lim;
+ device_info->speed_capa = ETH_SPEED_CAP_10G | ETH_SPEED_CAP_40G;
}
static void cxgbe_dev_promiscuous_enable(struct rte_eth_dev *eth_dev)
diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index 4a843fe..e40dc37 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -1023,6 +1023,12 @@ eth_em_infos_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
.nb_min = E1000_MIN_RING_DESC,
.nb_align = EM_TXD_ALIGN,
};
+
+ dev_info->speed_capa = ETH_SPEED_CAP_10M_HD |
+ ETH_SPEED_CAP_10M_FD |
+ ETH_SPEED_CAP_100M_HD |
+ ETH_SPEED_CAP_100M_FD |
+ ETH_SPEED_CAP_1G;
}
/* return 0 means link status changed, -1 means not changed */
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 4ed5e95..7eac8ea 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -1908,6 +1908,12 @@ eth_igb_infos_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
dev_info->rx_desc_lim = rx_desc_lim;
dev_info->tx_desc_lim = tx_desc_lim;
+
+ dev_info->speed_capa = ETH_SPEED_CAP_10M_HD |
+ ETH_SPEED_CAP_10M_FD |
+ ETH_SPEED_CAP_100M_HD |
+ ETH_SPEED_CAP_100M_FD |
+ ETH_SPEED_CAP_1G;
}
static void
diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index 421266b..2e6ec60 100644
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -1333,6 +1333,10 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,
.nb_min = FM10K_MIN_TX_DESC,
.nb_align = FM10K_MULT_TX_DESC,
};
+
+ dev_info->speed_capa = ETH_SPEED_CAP_1G | ETH_SPEED_CAP_2_5G |
+ ETH_SPEED_CAP_10G | ETH_SPEED_CAP_25G |
+ ETH_SPEED_CAP_40G | ETH_SPEED_CAP_100G;
}
static int
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index ef24122..78a0cbd 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2233,6 +2233,7 @@ static void
i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
{
struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+ struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct i40e_vsi *vsi = pf->main_vsi;
dev_info->max_rx_queues = vsi->nb_qps;
@@ -2304,6 +2305,14 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
dev_info->max_rx_queues += dev_info->vmdq_queue_num;
dev_info->max_tx_queues += dev_info->vmdq_queue_num;
}
+
+ if (i40e_is_40G_device(hw->device_id))
+ /* For XL710 */
+ dev_info->speed_capa = ETH_SPEED_CAP_1G | ETH_SPEED_CAP_10G;
+ else
+ /* For X710 */
+ dev_info->speed_capa = ETH_SPEED_CAP_10G | ETH_SPEED_CAP_40G;
+
}
static int
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 3e6fe86..7e29c18 100644
--- a/drivers/net/ixgb
[dpdk-dev] [PATCH v9 3/4] ethdev: redesign link speed config API
This patch redesigns the API to set the link speed/s configure
for an ethernet port. Specifically:
- it allows to define a set of advertised speeds for
auto-negociation.
- it allows to disable link auto-negociation (single fixed speed).
- default: auto-negociate all supported speeds.
Other changes:
* Added utility MACROs ETH_SPEED_NUM_XXX with the numeric
values of all supported link speeds, in Mbps.
* Converted link_speed to uint32_t to accomodate 100G speeds
and beyond (bug).
* Added autoneg flag in struct rte_eth_link to indicate if
link speed was a result of auto-negociation or was fixed
by configuration.
* Added utility function to convert numeric speeds to bitmap
fields.
* Added rte_eth_speed_to_bm_flag() to version map.
Signed-off-by: Marc Sune
---
app/test-pipeline/init.c | 2 +-
app/test-pmd/cmdline.c| 124 +++---
app/test-pmd/config.c | 4 +-
app/test/virtual_pmd.c| 4 +-
drivers/net/af_packet/rte_eth_af_packet.c | 5 +-
drivers/net/bnx2x/bnx2x_ethdev.c | 8 +-
drivers/net/bonding/rte_eth_bond_8023ad.c | 14 ++--
drivers/net/cxgbe/base/t4_hw.c| 8 +-
drivers/net/cxgbe/cxgbe_ethdev.c | 2 +-
drivers/net/e1000/em_ethdev.c | 116 ++--
drivers/net/e1000/igb_ethdev.c| 111 +-
drivers/net/fm10k/fm10k_ethdev.c | 8 +-
drivers/net/i40e/i40e_ethdev.c| 73 +-
drivers/net/i40e/i40e_ethdev_vf.c | 11 +--
drivers/net/ixgbe/ixgbe_ethdev.c | 78 ---
drivers/net/mlx4/mlx4.c | 6 +-
drivers/net/mlx5/mlx5_ethdev.c| 10 +--
drivers/net/mpipe/mpipe_tilegx.c | 6 +-
drivers/net/nfp/nfp_net.c | 4 +-
drivers/net/null/rte_eth_null.c | 5 +-
drivers/net/pcap/rte_eth_pcap.c | 9 ++-
drivers/net/ring/rte_eth_ring.c | 5 +-
drivers/net/virtio/virtio_ethdev.c| 2 +-
drivers/net/virtio/virtio_ethdev.h| 2 -
drivers/net/vmxnet3/vmxnet3_ethdev.c | 5 +-
drivers/net/xenvirt/rte_eth_xenvirt.c | 5 +-
examples/ip_pipeline/config_parse.c | 3 +-
lib/librte_ether/rte_ethdev.c | 49
lib/librte_ether/rte_ethdev.h | 113 +--
lib/librte_ether/rte_ether_version.map| 6 ++
30 files changed, 448 insertions(+), 350 deletions(-)
diff --git a/app/test-pipeline/init.c b/app/test-pipeline/init.c
index db2196b..6a69fe2 100644
--- a/app/test-pipeline/init.c
+++ b/app/test-pipeline/init.c
@@ -200,7 +200,7 @@ app_ports_check_link(void)
port = (uint8_t) app.ports[i];
memset(&link, 0, sizeof(link));
rte_eth_link_get_nowait(port, &link);
- RTE_LOG(INFO, USER1, "Port %u (%u Gbps) %s\n",
+ RTE_LOG(INFO, USER1, "Port %u (%d Gbps) %s\n",
port,
link.link_speed / 1000,
link.link_status ? "UP" : "DOWN");
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 52e9f5f..57ad25f 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -956,14 +956,65 @@ struct cmd_config_speed_all {
cmdline_fixed_string_t value2;
};
+static int
+parse_and_check_speed_duplex(char *value1, char *value2, uint32_t *link_speed)
+{
+
+ int duplex;
+
+ if (!strcmp(value2, "half")) {
+ duplex = 0;
+ } else if (!strcmp(value2, "full")) {
+ duplex = 1;
+ } else if (!strcmp(value2, "auto")) {
+ duplex = 1;
+ } else {
+ printf("Unknown parameter\n");
+ return -1;
+ }
+
+ if (!strcmp(value1, "10")) {
+ *link_speed = (duplex) ? ETH_LINK_SPEED_10M :
+ ETH_LINK_SPEED_10M_HD;
+ } else if (!strcmp(value1, "100")) {
+ *link_speed = (duplex) ? ETH_LINK_SPEED_100M :
+ ETH_LINK_SPEED_100M_HD;
+ } else if (!strcmp(value1, "1000")) {
+ if (!duplex)
+ goto invalid_speed_param;
+ *link_speed = ETH_LINK_SPEED_1G;
+ } else if (!strcmp(value1, "1")) {
+ if (!duplex)
+ goto invalid_speed_param;
+ *link_speed = ETH_LINK_SPEED_10G;
+ } else if (!strcmp(value1, "4")) {
+ if (!duplex)
+ goto invalid_speed_param;
+ *link_speed = ETH_LINK_SPEED_40G;
+ } else if (!strcmp(value1, "auto")) {
+ if (!duplex)
+ goto invalid_speed_param;
+ *link_speed = ETH_LINK_SPEED_AUTONEG;
+ } else {
+ printf("Unknown parameter\n");
+ r
[dpdk-dev] [PATCH v9 4/4] doc: update with link changes
Add new features, ABI changes and resolved issues notice for the refactored link patch. Signed-off-by: Marc Sune --- doc/guides/nics/overview.rst | 1 + doc/guides/rel_notes/release_16_04.rst | 27 +++ 2 files changed, 28 insertions(+) diff --git a/doc/guides/nics/overview.rst b/doc/guides/nics/overview.rst index d4c6ff4..6c1ae33 100644 --- a/doc/guides/nics/overview.rst +++ b/doc/guides/nics/overview.rst @@ -88,6 +88,7 @@ Most of these differences are summarized below. = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = link status link status event + Speed capabilities Rx interrupt queue start/stop MTU update diff --git a/doc/guides/rel_notes/release_16_04.rst b/doc/guides/rel_notes/release_16_04.rst index 64e913d..fd2d3cc 100644 --- a/doc/guides/rel_notes/release_16_04.rst +++ b/doc/guides/rel_notes/release_16_04.rst @@ -20,6 +20,18 @@ Build the docs and view the output file to ensure the changes are correct:: New Features +* **ethdev: define a set of advertised link speeds.** + + Added functionality to Allow defining a set of advertised speeds for + auto-negociation, explicitely disabling link auto-negociation (single speed) + and full auto-negociation. + +* **ethdev: add speed_cap bitmap for link speed capabilities.** + + ``struct rte_eth_dev_info`` has now ``speed_cap`` bitmap, which allows the + application to recover the supported speeds for that ethernet device. + + This section should contain new features added in this release. Sample format: * **Add a title in the past tense with a full stop.** @@ -55,6 +67,11 @@ This section should contain new features added in this release. Sample format: Resolved Issues --- +* **ethdev: Fixed link_speed overflow in rte_eth_link for 100Gbps.** + + 100Gbps in Mbps (10) exceeds 16 bit max value of ``link_speed`` in + ``rte_eth_link``. + This section should contain bug fixes added to the relevant sections. Sample format: * **code/section Fixed issue in the past tense with a full stop.** @@ -87,6 +104,9 @@ Drivers Libraries ~ +* New API call, ``rte_eth_speed_to_bm_flag`` in ethdev to, map numerical speeds + to bitmap fields. + Examples @@ -119,6 +139,13 @@ This section should contain API changes. Sample format: ABI Changes --- +* The ethdev ``rte_eth_link`` and ``rte_eth_conf`` structures were changed to + support the new link API, as well as ``ETH_LINK_HALF``/``FULL_DUPLEX``. + +* The ethdev ``rte_eth_dev_info`` was changed to support device speed + capabilities. + + * Add a short 1-2 sentence description of the ABI change that was announced in the previous releases and made in this release. Use fixed width quotes for ``rte_function_names`` or ``rte_struct_names``. Use the past tense. -- 2.1.4
[dpdk-dev] [PATCH v9 0/2] Add VHOST PMD
On 2/26/2016 4:36 PM, Tetsuya Mukawa wrote: > On 2016/02/26 13:29, Tetsuya Mukawa wrote: >> On 2016/02/25 16:51, Qiu, Michael wrote: >>> On 2/24/2016 1:10 PM, Tetsuya Mukawa wrote: On 2016/02/24 11:45, Qiu, Michael wrote: > Hi, Tetsuya > > When I applied your v6 patch, I could reach 9.5Mpps with 64B packet. > > But when apply v9 only 8.4 Mpps, could you figure out why has > performance drop? Hi Michael, Thanks for checking it. I tried to re-produce it, but I don't see the drop on my environment. (My cpu is Xeon E5-2697-v2, and the performances of v6 and v9 patch are almost 5.9Mpps) Did you use totally same code except for vhost PMD? >>> Yes, totally same code and same platform, only difference is versions of >>> vhost PMD. >>> >>> BTW, I have set the frontend mergeable off. >> I have checked below cases. >> - Case1: Disable mergeable feature in virtio-net PMD. >> - Case2: Disable mergeable feature in virtio-net PMD and use >> '--txqflags=0xf01' option to use simple ring deploying. >> Both cases, I still cannot see the drop. >> >> Anyway, I will send a few patch-series to determine the cause of drop. >> So, could you please apply them and check the performance to determine >> which cause the drop? > Hi Michael, > > I may find what causes the drop. > Could you please restart testpmd on guest when you see the drop, then > check performance again? > > I guess the drop will occur only first time when testpmd on guest and > host is connected. > Here are rough steps. > > 1. Start testpmd on host > 2. Start QEMU > 3. Start testpmd on guest > > Then you will see the drop. > Probably, if testpmd on guest is restarted, then you don't see the drop > again. > > 4. Type 'quit' on guest. > 5. Start testpmd on guest again. OK, I will help to tested today. Thanks, Michael > If so, I guess the drop is caused by queue notifying. > Could you please let me know whether your issue is above case? > > Thanks, > Tetsuya > >> Thanks, >> Tetsuya >> >>> Thanks, >>> Michael Thanks, Tetsuya > Thanks, > Michael > On 2/9/2016 5:38 PM, Tetsuya Mukawa wrote: >> The patch introduces a new PMD. This PMD is implemented as thin wrapper >> of librte_vhost. >> >> >> PATCH v9 changes: >> - Fix a null pointer access issue implemented in v8 patch. >> >> PATCH v8 changes: >> - Manage ether devices list instead of internal structures list. >> - Remove needless NULL checking. >> - Replace "pthread_exit" to "return NULL". >> - Replace rte_panic to RTE_LOG, also add error handling. >> - Remove duplicated lines. >> - Remove needless casting. >> - Follow coding style. >> - Remove needless parenthesis. >> >> PATCH v7 changes: >> - Remove needless parenthesis. >> - Add release note. >> - Remove needless line wraps. >> - Add null pointer check in vring_state_changed(). >> - Free queue memory in eth_queue_release(). >> - Fix wrong variable name. >> - Fix error handling code of eth_dev_vhost_create() and >>rte_pmd_vhost_devuninit(). >> - Remove needless null checking from rte_pmd_vhost_devinit/devuninit(). >> - Use port id to create mac address. >> - Add doxygen style comments in "rte_eth_vhost.h". >> - Fix wrong comment in "mk/rte.app.mk". >> >> PATCH v6 changes: >> - Remove rte_vhost_driver_pmd_callback_registe(). >> - Support link status interrupt. >> - Support queue state changed interrupt. >> - Add rte_eth_vhost_get_queue_event(). >> - Support numa node detection when new device is connected. >> >> PATCH v5 changes: >> - Rebase on latest master. >> - Fix RX/TX routine to count RX/TX bytes. >> - Fix RX/TX routine not to count as error packets if enqueue/dequeue >>cannot send all packets. >> - Fix if-condition checking for multiqueues. >> - Add "static" to pthread variable. >> - Fix format. >> - Change default behavior not to receive queueing event from driver. >> - Split the patch to separate rte_eth_vhost_portid2vdev(). >> >> PATCH v4 changes: >> - Rebase on latest DPDK tree. >> - Fix cording style. >> - Fix code not to invoke multiple messaging handling threads. >> - Fix code to handle vdev parameters correctly. >> - Remove needless cast. >> - Remove needless if-condition before rt_free(). >> >> PATCH v3 changes: >> - Rebase on latest matser >> - Specify correct queue_id in RX/TX function. >> >> PATCH v2 changes: >> - Remove a below patch that fixes vhost library. >>The patch was applied as a separate patch. >>- vhost: fix crash with multiqueue enabled >> - Fix typos. >>(Thanks to Thomas, Monjalon) >> - Rebase on latest tree with above bernard's patches. >> >> PATCH v1 changes: >> - Support vhost multiple queues. >>>
[dpdk-dev] [PATCH v9 0/2] Add VHOST PMD
On 2016/03/01 11:00, Qiu, Michael wrote: > On 2/26/2016 4:36 PM, Tetsuya Mukawa wrote: >> On 2016/02/26 13:29, Tetsuya Mukawa wrote: >>> On 2016/02/25 16:51, Qiu, Michael wrote: On 2/24/2016 1:10 PM, Tetsuya Mukawa wrote: > On 2016/02/24 11:45, Qiu, Michael wrote: >> Hi, Tetsuya >> >> When I applied your v6 patch, I could reach 9.5Mpps with 64B packet. >> >> But when apply v9 only 8.4 Mpps, could you figure out why has >> performance drop? > Hi Michael, > > Thanks for checking it. > I tried to re-produce it, but I don't see the drop on my environment. > (My cpu is Xeon E5-2697-v2, and the performances of v6 and v9 patch are > almost 5.9Mpps) > Did you use totally same code except for vhost PMD? Yes, totally same code and same platform, only difference is versions of vhost PMD. BTW, I have set the frontend mergeable off. >>> I have checked below cases. >>> - Case1: Disable mergeable feature in virtio-net PMD. >>> - Case2: Disable mergeable feature in virtio-net PMD and use >>> '--txqflags=0xf01' option to use simple ring deploying. >>> Both cases, I still cannot see the drop. >>> >>> Anyway, I will send a few patch-series to determine the cause of drop. >>> So, could you please apply them and check the performance to determine >>> which cause the drop? >> Hi Michael, >> >> I may find what causes the drop. >> Could you please restart testpmd on guest when you see the drop, then >> check performance again? >> >> I guess the drop will occur only first time when testpmd on guest and >> host is connected. >> Here are rough steps. >> >> 1. Start testpmd on host >> 2. Start QEMU >> 3. Start testpmd on guest >> >> Then you will see the drop. >> Probably, if testpmd on guest is restarted, then you don't see the drop >> again. >> >> 4. Type 'quit' on guest. >> 5. Start testpmd on guest again. Hi Michael, I am sorry that above was caused by my miss configuration. So please ignore it. If you can have time today, could you please check v7 and v8 performance? Thanks, Tetsuya > OK, I will help to tested today. > > Thanks, > Michael >> If so, I guess the drop is caused by queue notifying. >> Could you please let me know whether your issue is above case? >> >> Thanks, >> Tetsuya >> >>> Thanks, >>> Tetsuya >>> Thanks, Michael > Thanks, > Tetsuya > >> Thanks, >> Michael >> On 2/9/2016 5:38 PM, Tetsuya Mukawa wrote: >>> The patch introduces a new PMD. This PMD is implemented as thin wrapper >>> of librte_vhost. >>> >>> >>> PATCH v9 changes: >>> - Fix a null pointer access issue implemented in v8 patch. >>> >>> PATCH v8 changes: >>> - Manage ether devices list instead of internal structures list. >>> - Remove needless NULL checking. >>> - Replace "pthread_exit" to "return NULL". >>> - Replace rte_panic to RTE_LOG, also add error handling. >>> - Remove duplicated lines. >>> - Remove needless casting. >>> - Follow coding style. >>> - Remove needless parenthesis. >>> >>> PATCH v7 changes: >>> - Remove needless parenthesis. >>> - Add release note. >>> - Remove needless line wraps. >>> - Add null pointer check in vring_state_changed(). >>> - Free queue memory in eth_queue_release(). >>> - Fix wrong variable name. >>> - Fix error handling code of eth_dev_vhost_create() and >>>rte_pmd_vhost_devuninit(). >>> - Remove needless null checking from rte_pmd_vhost_devinit/devuninit(). >>> - Use port id to create mac address. >>> - Add doxygen style comments in "rte_eth_vhost.h". >>> - Fix wrong comment in "mk/rte.app.mk". >>> >>> PATCH v6 changes: >>> - Remove rte_vhost_driver_pmd_callback_registe(). >>> - Support link status interrupt. >>> - Support queue state changed interrupt. >>> - Add rte_eth_vhost_get_queue_event(). >>> - Support numa node detection when new device is connected. >>> >>> PATCH v5 changes: >>> - Rebase on latest master. >>> - Fix RX/TX routine to count RX/TX bytes. >>> - Fix RX/TX routine not to count as error packets if enqueue/dequeue >>>cannot send all packets. >>> - Fix if-condition checking for multiqueues. >>> - Add "static" to pthread variable. >>> - Fix format. >>> - Change default behavior not to receive queueing event from driver. >>> - Split the patch to separate rte_eth_vhost_portid2vdev(). >>> >>> PATCH v4 changes: >>> - Rebase on latest DPDK tree. >>> - Fix cording style. >>> - Fix code not to invoke multiple messaging handling threads. >>> - Fix code to handle vdev parameters correctly. >>> - Remove needless cast. >>> - Remove needless if-condition before rt_free(). >>> >>> PATCH v3 changes: >>> - Rebase on latest matser >>> - Specify correct queue_id in RX/TX function. >>> >>> PATCH v2 change
[dpdk-dev] [PATCH v6 1/4] lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure
Change the fields of outer_mac and inner_mac from pointer to struct
in order to keep the code's readability.
Signed-off-by: Xutao Sun
Signed-off-by: Jijiang Liu
---
app/test-pmd/cmdline.c | 6 --
doc/guides/rel_notes/deprecation.rst | 5 -
doc/guides/rel_notes/release_16_04.rst | 2 ++
drivers/net/i40e/i40e_ethdev.c | 12 ++--
lib/librte_ether/rte_eth_ctrl.h| 4 ++--
5 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 52e9f5f..c707318 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -6640,8 +6640,10 @@ cmd_tunnel_filter_parsed(void *parsed_result,
struct rte_eth_tunnel_filter_conf tunnel_filter_conf;
int ret = 0;
- tunnel_filter_conf.outer_mac = &res->outer_mac;
- tunnel_filter_conf.inner_mac = &res->inner_mac;
+ rte_memcpy(&tunnel_filter_conf.outer_mac, &res->outer_mac,
+ ETHER_ADDR_LEN);
+ rte_memcpy(&tunnel_filter_conf.inner_mac, &res->inner_mac,
+ ETHER_ADDR_LEN);
tunnel_filter_conf.inner_vlan = res->inner_vlan;
if (res->ip_value.family == AF_INET) {
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index e94d4a2..a895364 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -32,11 +32,6 @@ Deprecation Notices
RTE_ETH_FLOW_MAX. The release 2.2 does not contain these ABI changes,
but release 2.3 will.
-* ABI changes are planned for rte_eth_tunnel_filter_conf. Change the fields
- of outer_mac and inner_mac from pointer to struct in order to keep the
- code's readability. The release 2.2 does not contain these ABI changes, but
- release 2.3 will, and no backwards compatibility is planned.
-
* The scheduler statistics structure will change to allow keeping track of
RED actions.
diff --git a/doc/guides/rel_notes/release_16_04.rst
b/doc/guides/rel_notes/release_16_04.rst
index 64e913d..704d0f6 100644
--- a/doc/guides/rel_notes/release_16_04.rst
+++ b/doc/guides/rel_notes/release_16_04.rst
@@ -123,6 +123,8 @@ ABI Changes
the previous releases and made in this release. Use fixed width quotes for
``rte_function_names`` or ``rte_struct_names``. Use the past tense.
+* The fields of outer_mac and inner_mac were changed from pointer
+ to struct in order to keep the code's readability.
Shared Library Versions
---
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index ef24122..7c22358 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -5828,10 +5828,10 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
}
pfilter = cld_filter;
- (void)rte_memcpy(&pfilter->outer_mac, tunnel_filter->outer_mac,
- sizeof(struct ether_addr));
- (void)rte_memcpy(&pfilter->inner_mac, tunnel_filter->inner_mac,
- sizeof(struct ether_addr));
+ (void)rte_memcpy(&pfilter->outer_mac, &tunnel_filter->outer_mac,
+ ETHER_ADDR_LEN);
+ (void)rte_memcpy(&pfilter->inner_mac, &tunnel_filter->inner_mac,
+ ETHER_ADDR_LEN);
pfilter->inner_vlan = tunnel_filter->inner_vlan;
if (tunnel_filter->ip_type == RTE_TUNNEL_IPTYPE_IPV4) {
@@ -6131,13 +6131,13 @@ i40e_tunnel_filter_param_check(struct i40e_pf *pf,
}
if ((filter->filter_type & ETH_TUNNEL_FILTER_OMAC) &&
- (is_zero_ether_addr(filter->outer_mac))) {
+ (is_zero_ether_addr(&filter->outer_mac))) {
PMD_DRV_LOG(ERR, "Cannot add NULL outer MAC address");
return -EINVAL;
}
if ((filter->filter_type & ETH_TUNNEL_FILTER_IMAC) &&
- (is_zero_ether_addr(filter->inner_mac))) {
+ (is_zero_ether_addr(&filter->inner_mac))) {
PMD_DRV_LOG(ERR, "Cannot add NULL inner MAC address");
return -EINVAL;
}
diff --git a/lib/librte_ether/rte_eth_ctrl.h b/lib/librte_ether/rte_eth_ctrl.h
index ce224ad..30cbde7 100644
--- a/lib/librte_ether/rte_eth_ctrl.h
+++ b/lib/librte_ether/rte_eth_ctrl.h
@@ -280,8 +280,8 @@ enum rte_tunnel_iptype {
* Tunneling Packet filter configuration.
*/
struct rte_eth_tunnel_filter_conf {
- struct ether_addr *outer_mac; /**< Outer MAC address filter. */
- struct ether_addr *inner_mac; /**< Inner MAC address filter. */
+ struct ether_addr outer_mac; /**< Outer MAC address filter. */
+ struct ether_addr inner_mac; /**< Inner MAC address filter. */
uint16_t inner_vlan; /**< Inner VLAN filter. */
enum rte_tunnel_iptype ip_type; /**< IP address type. */
union {
--
1.9.3
[dpdk-dev] [PATCH v6 4/4] app/test-pmd: test tunnel filter for IP in GRE
This patch add some options in tunnel_filter command to test IP in
GRE packet classification on i40e.
Update the testpmd documentation.
Signed-off-by: Xutao Sun
Signed-off-by: Jijiang Liu
---
app/test-pmd/cmdline.c | 32 +-
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 35 +++--
2 files changed, 55 insertions(+), 12 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index c707318..3e7cec8 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -302,11 +302,13 @@ static void cmd_help_long_parsed(void *parsed_result,
" a port\n\n"
"tunnel_filter add (port_id) (outer_mac) (inner_mac)
(ip_addr) "
- "(inner_vlan) (vxlan|nvgre) (filter_type) (tenant_id)
(queue_id)\n"
+ "(inner_vlan) (vxlan|nvgre|ipingre)
(imac-ivlan|imac-ivlan-tenid|"
+ "imac-tenid|imac|omac-imac-tenid|oip|iip) (tenant_id)
(queue_id)\n"
" add a tunnel filter of a port.\n\n"
"tunnel_filter rm (port_id) (outer_mac) (inner_mac)
(ip_addr) "
- "(inner_vlan) (vxlan|nvgre) (filter_type) (tenant_id)
(queue_id)\n"
+ "(inner_vlan) (vxlan|nvgre|ipingre)
(imac-ivlan|imac-ivlan-tenid|"
+ "imac-tenid|imac|omac-imac-tenid|oip|iip) (tenant_id)
(queue_id)\n"
" remove a tunnel filter of a port.\n\n"
"rx_vxlan_port add (udp_port) (port_id)\n"
@@ -6640,6 +6642,8 @@ cmd_tunnel_filter_parsed(void *parsed_result,
struct rte_eth_tunnel_filter_conf tunnel_filter_conf;
int ret = 0;
+ memset(&tunnel_filter_conf, 0, sizeof(tunnel_filter_conf));
+
rte_memcpy(&tunnel_filter_conf.outer_mac, &res->outer_mac,
ETHER_ADDR_LEN);
rte_memcpy(&tunnel_filter_conf.inner_mac, &res->inner_mac,
@@ -6648,12 +6652,14 @@ cmd_tunnel_filter_parsed(void *parsed_result,
if (res->ip_value.family == AF_INET) {
tunnel_filter_conf.ip_addr.ipv4_addr =
- res->ip_value.addr.ipv4.s_addr;
+ rte_be_to_cpu_32(res->ip_value.addr.ipv4.s_addr);
tunnel_filter_conf.ip_type = RTE_TUNNEL_IPTYPE_IPV4;
} else {
- memcpy(&(tunnel_filter_conf.ip_addr.ipv6_addr),
- &(res->ip_value.addr.ipv6),
- sizeof(struct in6_addr));
+ int i;
+ for (i = 0; i < 4; i++) {
+ tunnel_filter_conf.ip_addr.ipv6_addr[i] =
+ rte_be_to_cpu_32(res->ip_value.addr.ipv6.s6_addr32[i]);
+ }
tunnel_filter_conf.ip_type = RTE_TUNNEL_IPTYPE_IPV6;
}
@@ -6669,6 +6675,10 @@ cmd_tunnel_filter_parsed(void *parsed_result,
else if (!strcmp(res->filter_type, "omac-imac-tenid"))
tunnel_filter_conf.filter_type =
RTE_TUNNEL_FILTER_OMAC_TENID_IMAC;
+ else if (!strcmp(res->filter_type, "oip"))
+ tunnel_filter_conf.filter_type = ETH_TUNNEL_FILTER_OIP;
+ else if (!strcmp(res->filter_type, "iip"))
+ tunnel_filter_conf.filter_type = ETH_TUNNEL_FILTER_IIP;
else {
printf("The filter type is not supported");
return;
@@ -6678,6 +6688,8 @@ cmd_tunnel_filter_parsed(void *parsed_result,
tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN;
else if (!strcmp(res->tunnel_type, "nvgre"))
tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_NVGRE;
+ else if (!strcmp(res->tunnel_type, "ipingre"))
+ tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_IP_IN_GRE;
else {
printf("The tunnel type %s not supported.\n", res->tunnel_type);
return;
@@ -6723,11 +6735,11 @@ cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value
=
ip_value);
cmdline_parse_token_string_t cmd_tunnel_filter_tunnel_type =
TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
- tunnel_type, "vxlan#nvgre");
+ tunnel_type, "vxlan#nvgre#ipingre");
cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
- filter_type, "imac-ivlan#imac-ivlan-tenid#imac-tenid#"
+ filter_type, "oip#iip#imac-ivlan#imac-ivlan-tenid#imac-tenid#"
"imac#omac-imac-tenid");
cmdline_parse_token_num_t cmd_tunnel_filter_tenant_id =
TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
@@ -6741,8 +6753,8 @@ cmdline_parse_inst_t cmd_tunnel_filter = {
.data = (void *)0,
.help_str = "add/rm tunnel filter of a port: "
"tunnel_filter add port_id outer_mac inner_mac ip "
- "inner_vlan tunnel_type(vxlan|nvgre) filter_type "
[dpdk-dev] [PATCH v6 0/4] Add tunnel filter support for IP in GRE on i40e
This patch set adds tunnel filter support for IP in GRE on i40e. v2 changes: Fix the byte order problem. v3 changes: Remove the deprecation notice and update the release notes. v4 changes: Modify the mistakes in cmdline.c in the old patch. v5 changes: Fix type errors and update the testpmd documentation. v6 changes: Use internal variables to convert byte order. Xutao Sun (4): lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure lib/ether: add IP in GRE type driver/i40e: implement tunnel filter for IP in GRE app/test-pmd: test tunnel filter for IP in GRE app/test-pmd/cmdline.c | 38 +++--- doc/guides/rel_notes/deprecation.rst| 5 --- doc/guides/rel_notes/release_16_04.rst | 2 ++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 35 +++-- drivers/net/i40e/i40e_ethdev.c | 49 +++-- lib/librte_ether/rte_eth_ctrl.h | 5 +-- 6 files changed, 97 insertions(+), 37 deletions(-) -- 1.9.3
[dpdk-dev] [PATCH v6 3/4] driver/i40e: implement tunnel filter for IP in GRE
Signed-off-by: Xutao Sun
Signed-off-by: Jijiang Liu
---
drivers/net/i40e/i40e_ethdev.c | 37 +++--
1 file changed, 27 insertions(+), 10 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 7c22358..6d860ee 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -5797,6 +5797,12 @@ i40e_dev_get_filter_type(uint16_t filter_type, uint16_t
*flag)
case ETH_TUNNEL_FILTER_IMAC:
*flag = I40E_AQC_ADD_CLOUD_FILTER_IMAC;
break;
+ case ETH_TUNNEL_FILTER_OIP:
+ *flag = I40E_AQC_ADD_CLOUD_FILTER_OIP;
+ break;
+ case ETH_TUNNEL_FILTER_IIP:
+ *flag = I40E_AQC_ADD_CLOUD_FILTER_IIP;
+ break;
default:
PMD_DRV_LOG(ERR, "invalid tunnel filter type");
return -EINVAL;
@@ -5811,7 +5817,10 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
uint8_t add)
{
uint16_t ip_type;
- uint8_t tun_type = 0;
+ uint8_t i, tun_type = 0;
+ /* internal varialbe to convert byte order */
+ uint32_t convert_ipv4;
+ uint32_t convert_ipv6[4];
int val, ret = 0;
struct i40e_hw *hw = I40E_PF_TO_HW(pf);
struct i40e_vsi *vsi = pf->main_vsi;
@@ -5833,16 +5842,20 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
(void)rte_memcpy(&pfilter->inner_mac, &tunnel_filter->inner_mac,
ETHER_ADDR_LEN);
- pfilter->inner_vlan = tunnel_filter->inner_vlan;
+ pfilter->inner_vlan = rte_cpu_to_le_16(tunnel_filter->inner_vlan);
if (tunnel_filter->ip_type == RTE_TUNNEL_IPTYPE_IPV4) {
ip_type = I40E_AQC_ADD_CLOUD_FLAGS_IPV4;
- (void)rte_memcpy(&pfilter->ipaddr.v4.data,
- &tunnel_filter->ip_addr,
+ convert_ipv4 =
+ rte_cpu_to_le_32(tunnel_filter->ip_addr.ipv4_addr);
+ (void)rte_memcpy(&pfilter->ipaddr.v4.data, &convert_ipv4,
sizeof(pfilter->ipaddr.v4.data));
} else {
ip_type = I40E_AQC_ADD_CLOUD_FLAGS_IPV6;
- (void)rte_memcpy(&pfilter->ipaddr.v6.data,
- &tunnel_filter->ip_addr,
+ for (i = 0; i < 4; i++) {
+ convert_ipv6[i] =
+ rte_cpu_to_le_32(tunnel_filter->ip_addr.ipv6_addr[i]);
+ }
+ (void)rte_memcpy(&pfilter->ipaddr.v6.data, &convert_ipv6,
sizeof(pfilter->ipaddr.v6.data));
}
@@ -5854,6 +5867,9 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
case RTE_TUNNEL_TYPE_NVGRE:
tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_NVGRE_OMAC;
break;
+ case RTE_TUNNEL_TYPE_IP_IN_GRE:
+ tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_IP;
+ break;
default:
/* Other tunnel types is not supported. */
PMD_DRV_LOG(ERR, "tunnel type is not supported.");
@@ -5868,10 +5884,11 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
return -EINVAL;
}
- pfilter->flags |= I40E_AQC_ADD_CLOUD_FLAGS_TO_QUEUE | ip_type |
- (tun_type << I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT);
- pfilter->tenant_id = tunnel_filter->tenant_id;
- pfilter->queue_number = tunnel_filter->queue_id;
+ pfilter->flags |= rte_cpu_to_le_16(
+ I40E_AQC_ADD_CLOUD_FLAGS_TO_QUEUE
+ | ip_type | (tun_type << I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT));
+ pfilter->tenant_id = rte_cpu_to_le_32(tunnel_filter->tenant_id);
+ pfilter->queue_number = rte_cpu_to_le_16(tunnel_filter->queue_id);
if (add)
ret = i40e_aq_add_cloud_filters(hw, vsi->seid, cld_filter, 1);
--
1.9.3
[dpdk-dev] [PATCH v6 2/4] lib/ether: add IP in GRE type
Signed-off-by: Xutao Sun
Signed-off-by: Jijiang Liu
---
lib/librte_ether/rte_eth_ctrl.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/librte_ether/rte_eth_ctrl.h b/lib/librte_ether/rte_eth_ctrl.h
index 30cbde7..0e948a1 100644
--- a/lib/librte_ether/rte_eth_ctrl.h
+++ b/lib/librte_ether/rte_eth_ctrl.h
@@ -244,6 +244,7 @@ enum rte_eth_tunnel_type {
RTE_TUNNEL_TYPE_GENEVE,
RTE_TUNNEL_TYPE_TEREDO,
RTE_TUNNEL_TYPE_NVGRE,
+ RTE_TUNNEL_TYPE_IP_IN_GRE,
RTE_TUNNEL_TYPE_MAX,
};
--
1.9.3
[dpdk-dev] [PATCH v2] I217 and I218 changes
Hi, > -Original Message- > From: Ravi Kerur [mailto:rkerur at gmail.com] > Sent: Tuesday, March 1, 2016 2:31 AM > To: Lu, Wenzhuo; dev at dpdk.org > Cc: Ravi Kerur > Subject: [PATCH v2] I217 and I218 changes > > v2: > Incorporate Wenzhou's comments > Compiled and tested (via testpmd) on Ubuntu 14.04 on target > x86_64-native-linuxapp-gcc > Compiled for target x86_64-native-linuxapp-clang > > v1: > Modified driver and eal code to recognize and support I217 and > I218 Intel NICs. > Compiled and tested (via testpmd) on Ubuntu 14.04 for target > x86_64-native-linuxapp-gcc > Compiled for target x86_64-native-linuxapp-clang > > Signed-off-by: Ravi Kerur Acked-by: Wenzhuo Lu But the v1, v2 info in the commit log is a little strange. For you didn't send a v1 and others don't know our discussion :)
[dpdk-dev] [PATCH v4 0/3] fm10k: enable FTAG based forwarding
v4: * Removed the build time config option, used devargs to config FTAG. * Rebased on head of dpdk-next-net/rel_16_04 branch. v3: * Removed "\n" in PMD_INIT_LOG. * Returned "-ENOTSUP" instead of -1 in VF FTAG use case. v2: * Gave an error message for VF FTAG use case. * Added a notice in the doc to emphasize that application should ensure an appropriate FTAG for every frame in FTAG based forwarding mode. Wang Xiao W (3): fm10k: enable FTAG based forwarding doc: add introduction for fm10k FTAG based forwarding doc: update release note for fm10k FTAG support doc/guides/nics/fm10k.rst | 16 +- doc/guides/rel_notes/release_16_04.rst | 2 ++ drivers/net/fm10k/fm10k.h | 2 ++ drivers/net/fm10k/fm10k_ethdev.c | 38 +- drivers/net/fm10k/fm10k_rxtx.c | 15 ++ drivers/net/fm10k/fm10k_rxtx_vec.c | 4 6 files changed, 75 insertions(+), 2 deletions(-) -- 1.9.3
[dpdk-dev] [PATCH v4 1/3] fm10k: enable FTAG based forwarding
This patch enables reading sglort info into mbuf for RX and inserting
an FTAG at the beginning of the packet for TX. The vlan_tci_outer field
selected from rte_mbuf structure for sglort is not used in fm10k now.
In FTAG based forwarding mode, the switch will forward packets according
to glort info in FTAG rather than mac and vlan table.
To activate this feature, user needs to pass a devargs parameter to eal
for fm10k device like "-w :84:00.0,enable_ftag=1". Currently this
feature is supported only on PF, because FM10K_PFVTCTL register is
read-only for VF.
Signed-off-by: Wang Xiao W
Acked-by: Jing Chen
Acked-by: John McNamara
---
drivers/net/fm10k/fm10k.h | 2 ++
drivers/net/fm10k/fm10k_ethdev.c | 38 +-
drivers/net/fm10k/fm10k_rxtx.c | 15 +++
drivers/net/fm10k/fm10k_rxtx_vec.c | 4
4 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h
index 770d6ba..05aa1a2 100644
--- a/drivers/net/fm10k/fm10k.h
+++ b/drivers/net/fm10k/fm10k.h
@@ -204,6 +204,7 @@ struct fm10k_rx_queue {
uint8_t port_id;
uint8_t drop_en;
uint8_t rx_deferred_start; /* don't start this queue in dev start. */
+ uint16_t rx_ftag_en; /* indicates FTAG RX supported */
};
/*
@@ -240,6 +241,7 @@ struct fm10k_tx_queue {
uint8_t port_id;
uint8_t tx_deferred_start; /** don't start this queue in dev start. */
uint16_t queue_id;
+ uint16_t tx_ftag_en; /* indicates FTAG TX supported */
};
struct fm10k_txq_ops {
diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index 3c1e1d6..963a8af 100644
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -79,6 +79,7 @@ static void fm10k_tx_queue_release(void *queue);
static void fm10k_rx_queue_release(void *queue);
static void fm10k_set_rx_function(struct rte_eth_dev *dev);
static void fm10k_set_tx_function(struct rte_eth_dev *dev);
+static int fm10k_check_ftag(struct rte_devargs *devargs);
struct fm10k_xstats_name_off {
char name[RTE_ETH_XSTATS_NAME_SIZE];
@@ -668,6 +669,18 @@ fm10k_dev_tx_init(struct rte_eth_dev *dev)
PMD_INIT_LOG(ERR, "failed to disable queue %d", i);
return -1;
}
+ /* Enable use of FTAG bit in TX descriptor, PFVTCTL
+* register is read-only for VF.
+*/
+ if (fm10k_check_ftag(dev->pci_dev->devargs)) {
+ if (hw->mac.type == fm10k_mac_pf)
+ FM10K_WRITE_REG(hw, FM10K_PFVTCTL(i),
+ FM10K_PFVTCTL_FTAG_DESC_ENABLE);
+ else {
+ PMD_INIT_LOG(ERR, "VF FTAG is not supported.");
+ return -ENOTSUP;
+ }
+ }
/* set location and size for descriptor ring */
FM10K_WRITE_REG(hw, FM10K_TDBAL(i),
@@ -2597,15 +2610,32 @@ static const struct eth_dev_ops fm10k_eth_dev_ops = {
.rss_hash_conf_get = fm10k_rss_hash_conf_get,
};
+static int
+fm10k_check_ftag(struct rte_devargs *devargs)
+{
+ if (devargs == NULL)
+ return 0;
+
+ if (strstr(devargs->args, "enable_ftag=1") == NULL)
+ return 0;
+
+ return 1;
+}
+
static void __attribute__((cold))
fm10k_set_tx_function(struct rte_eth_dev *dev)
{
struct fm10k_tx_queue *txq;
int i;
int use_sse = 1;
+ uint16_t tx_ftag_en = 0;
+
+ if (fm10k_check_ftag(dev->pci_dev->devargs))
+ tx_ftag_en = 1;
for (i = 0; i < dev->data->nb_tx_queues; i++) {
txq = dev->data->tx_queues[i];
+ txq->tx_ftag_en = tx_ftag_en;
/* Check if Vector Tx is satisfied */
if (fm10k_tx_vec_condition_check(txq)) {
use_sse = 0;
@@ -2631,11 +2661,16 @@ fm10k_set_rx_function(struct rte_eth_dev *dev)
{
struct fm10k_dev_info *dev_info = FM10K_DEV_PRIVATE_TO_INFO(dev);
uint16_t i, rx_using_sse;
+ uint16_t rx_ftag_en = 0;
+
+ if (fm10k_check_ftag(dev->pci_dev->devargs))
+ rx_ftag_en = 1;
/* In order to allow Vector Rx there are a few configuration
* conditions to be met.
*/
- if (!fm10k_rx_vec_condition_check(dev) && dev_info->rx_vec_allowed) {
+ if (!fm10k_rx_vec_condition_check(dev) &&
+ dev_info->rx_vec_allowed && !rx_ftag_en) {
if (dev->data->scattered_rx)
dev->rx_pkt_burst = fm10k_recv_scattered_pkts_vec;
else
@@ -2658,6 +2693,7 @@ fm10k_set_rx_function(struct rte_eth_dev *dev)
struct fm10k_rx_queue *rxq = dev->data->rx_queues[i];
rxq->rx_using_sse = rx_using_sse;
+ rxq-
[dpdk-dev] [PATCH v4 2/3] doc: add introduction for fm10k FTAG based forwarding
Add a brief introduction on FTAG, describe what's FTAG and how it works in forwarding. Signed-off-by: Wang Xiao W --- doc/guides/nics/fm10k.rst | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/fm10k.rst b/doc/guides/nics/fm10k.rst index dc5cb6e..89d6ae2 100644 --- a/doc/guides/nics/fm10k.rst +++ b/doc/guides/nics/fm10k.rst @@ -1,5 +1,5 @@ .. BSD LICENSE -Copyright(c) 2015 Intel Corporation. All rights reserved. +Copyright(c) 2015-2016 Intel Corporation. All rights reserved. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -34,6 +34,20 @@ FM10K Poll Mode Driver The FM10K poll mode driver library provides support for the Intel FM1 (FM10K) family of 40GbE/100GbE adapters. +FTAG Based Forwarding of FM10K +-- + +FTAG Based Forwarding is a unique feature of FM10K. The FM10K family of NICs +support the addition of a Fabric Tag (FTAG) to carry special information. +The FTAG is placed at the beginning of the frame, it contains information +such as where the packet comes from and goes, and the vlan tag. In FTAG based +forwarding mode, the switch logic forwards packets according to glort (global +resource tag) information, rather than the mac and vlan table. Currently this +feature works only on PF. + +To enable this feature, the user should pass a devargs parameter to the eal +like "-w 84:00.0,enable_ftag=1", and the application should make sure an +appropriate FTAG is inserted for every frame on TX side. Limitations --- -- 1.9.3
[dpdk-dev] [PATCH v4 3/3] doc: update release note for fm10k FTAG support
Update the 16_04 release note. Signed-off-by: Wang Xiao W --- doc/guides/rel_notes/release_16_04.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/guides/rel_notes/release_16_04.rst b/doc/guides/rel_notes/release_16_04.rst index 73494f9..c3ee8b1 100644 --- a/doc/guides/rel_notes/release_16_04.rst +++ b/doc/guides/rel_notes/release_16_04.rst @@ -49,6 +49,8 @@ This section should contain new features added in this release. Sample format: * Free multiple mbufs at a time to reduce freeing mbuf cycles. +* **Added fm10k FTAG based forwarding support.** + * **Added new new X550EM_a devices.** Added new X550EM_a devices and their mac types, X550EM_a and X550EM_a_vf. -- 1.9.3
[dpdk-dev] [PATCH v1] virtio: Use cpuflag for vector api
On Mon, Feb 29, 2016 at 06:01:38PM +0530, Santosh Shukla wrote: > On Mon, Feb 29, 2016 at 9:57 AM, Yuanhan Liu > wrote: > > On Fri, Feb 26, 2016 at 02:21:02PM +0530, Santosh Shukla wrote: > >> Check cpuflag macro before using vectored api. > >> -virtio_recv_pkts_vec() uses _sse3__ simd instruction for now so added > >> cpuflag. > >> - Also wrap other vectored freind api ie.. > >> 1) virtqueue_enqueue_recv_refill_simple > >> 2) virtio_rxq_vec_setup > >> > > ... > >> diff --git a/drivers/net/virtio/virtio_rxtx_simple.c > >> b/drivers/net/virtio/virtio_rxtx_simple.c > >> index 3a1de9d..be51d7c 100644 > >> --- a/drivers/net/virtio/virtio_rxtx_simple.c > >> +++ b/drivers/net/virtio/virtio_rxtx_simple.c > > > > Hmm, why not wrapping the whole file, instead of just few functions? > > > > Better to refactor code and make arch specific. Current implementation > is temporary. I'm okay to refactor, if it's a clean one. But moving virtio __driver__ stuff to EAL, sorry, it still doesn't make too much sense to me. For this case, let's make it simple so far, and consider it when we have another vec implementation, or better refactor comes out. > > Or maybe better, do a compile time check at the Makefile, something > > like: > > > > if has_CPUFLAG_xxx > > SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple.c > > endif > > > Tried this approach but end up with link error, If I try to fix below > link error then I will be ending up writing similar code, Sure you need the first part of your patch. Yes, it's similar code, but it has fewer "#ifdef " conditions, and more importantly, it leaves virtio_rxtx_simple.c alone. --yliu > linker error snap: > > /work/santosh/thunder/nfs/dpdk/arm64-thunderx-linuxapp-gcc/lib/librte_pmd_virtio.a(virtio_rxtx.o): > In function `virtio_dev_rxtx_start': > virtio_rxtx.c:(.text+0x168c): undefined reference to > `virtqueue_enqueue_recv_refill_simple' > /work/santosh/thunder/nfs/dpdk/arm64-thunderx-linuxapp-gcc/lib/librte_pmd_virtio.a(virtio_rxtx.o): > In function `virtio_dev_rx_queue_setup': > virtio_rxtx.c:(.text+0x2364): undefined reference to `virtio_rxq_vec_setup' > /work/santosh/thunder/nfs/dpdk/arm64-thunderx-linuxapp-gcc/lib/librte_pmd_virtio.a(virtio_rxtx.o): > In function `virtio_dev_tx_queue_setup': > virtio_rxtx.c:(.text+0x2460): undefined reference to `virtio_xmit_pkts_simple' > virtio_rxtx.c:(.text+0x2464): undefined reference to `virtio_recv_pkts_vec' > virtio_rxtx.c:(.text+0x2468): undefined reference to `virtio_xmit_pkts_simple' > virtio_rxtx.c:(.text+0x246c): undefined reference to `virtio_recv_pkts_vec'
[dpdk-dev] [PATCH v2] virtio: Use cpuflag for vector api
On Mon, Feb 29, 2016 at 06:28:10PM +0530, Santosh Shukla wrote: > Check cpuflag macro before using vectored api. > -virtio_recv_pkts_vec() uses _sse3__ simd instruction for now so added > cpuflag. > - Also wrap other vectored freind api ie.. > 1) virtqueue_enqueue_recv_refill_simple > 2) virtio_rxq_vec_setup > > - removed VIRTIO_PMD=n from armv7/v8 config. > > todo: > 1) Move virtio_recv_pkts_vec() implementation to >drivers/virtio/virtio_vec_.h file. > 2) Remove use_simple_rxtx flag, so that virtio/virtio_vec_.h >files to provide vectored/non-vectored rx/tx apis. > > Signed-off-by: Santosh Shukla > --- > - v2: Removed VIRTIO_PMD=n from arm v7/v8 Firstly, I would not suggest you to send another new version, while there still was discussions ongoing on old version. And, you should not mix the ARM stuff here; this patch should only do what the patch title tells. In generic, don't do two or more things in one patch. --yliu
[dpdk-dev] [PATCH v2 0/7] vhost rxtx refactor
On Mon, Feb 29, 2016 at 05:06:27PM +0100, Thomas Monjalon wrote: > Hi Yuanhan > > 2016-02-18 21:49, Yuanhan Liu: > > Here is a patchset for refactoring vhost rxtx code, mainly for > > improving readability. > > This series requires to be rebased. > > And maybe you could check also the series about numa_realloc. Hi Thomas, Sure, I will. And since you are considering to merge it, I will do more tests, espeically on this patchset (it touches the vhost-user core). Thus, I may send the new version out a bit late, say, next week. --yliu
[dpdk-dev] [PATCH v2] virtio: Use cpuflag for vector api
On Tue, Mar 1, 2016 at 11:29 AM, Yuanhan Liu wrote: > On Mon, Feb 29, 2016 at 06:28:10PM +0530, Santosh Shukla wrote: >> Check cpuflag macro before using vectored api. >> -virtio_recv_pkts_vec() uses _sse3__ simd instruction for now so added >> cpuflag. >> - Also wrap other vectored freind api ie.. >> 1) virtqueue_enqueue_recv_refill_simple >> 2) virtio_rxq_vec_setup >> >> - removed VIRTIO_PMD=n from armv7/v8 config. >> >> todo: >> 1) Move virtio_recv_pkts_vec() implementation to >>drivers/virtio/virtio_vec_.h file. >> 2) Remove use_simple_rxtx flag, so that virtio/virtio_vec_.h >>files to provide vectored/non-vectored rx/tx apis. >> >> Signed-off-by: Santosh Shukla >> --- >> - v2: Removed VIRTIO_PMD=n from arm v7/v8 > > Firstly, I would not suggest you to send another new version, while there > still was discussions ongoing on old version. > > And, you should not mix the ARM stuff here; this patch should only do > what the patch title tells. In generic, don't do two or more things in > one patch. > w/o v2 patch, old version wont build for armv7/v8. Clubbing both in v2, inspired from v7 virtio INC_VEC review comment/feedback [1]. [1] http://dpdk.org/dev/patchwork/patch/10429/ > --yliu
[dpdk-dev] [PATCH v1] virtio: Use cpuflag for vector api
On Tue, Mar 1, 2016 at 11:25 AM, Yuanhan Liu wrote: > On Mon, Feb 29, 2016 at 06:01:38PM +0530, Santosh Shukla wrote: >> On Mon, Feb 29, 2016 at 9:57 AM, Yuanhan Liu >> wrote: >> > On Fri, Feb 26, 2016 at 02:21:02PM +0530, Santosh Shukla wrote: >> >> Check cpuflag macro before using vectored api. >> >> -virtio_recv_pkts_vec() uses _sse3__ simd instruction for now so added >> >> cpuflag. >> >> - Also wrap other vectored freind api ie.. >> >> 1) virtqueue_enqueue_recv_refill_simple >> >> 2) virtio_rxq_vec_setup >> >> >> > ... >> >> diff --git a/drivers/net/virtio/virtio_rxtx_simple.c >> >> b/drivers/net/virtio/virtio_rxtx_simple.c >> >> index 3a1de9d..be51d7c 100644 >> >> --- a/drivers/net/virtio/virtio_rxtx_simple.c >> >> +++ b/drivers/net/virtio/virtio_rxtx_simple.c >> > >> > Hmm, why not wrapping the whole file, instead of just few functions? >> > >> >> Better to refactor code and make arch specific. Current implementation >> is temporary. > > I'm okay to refactor, if it's a clean one. But moving virtio __driver__ > stuff to EAL, sorry, it still doesn't make too much sense to me. > You misunderstood my comment, my arch specific meaning driver/net/virtio/virtio_vec_.h > For this case, let's make it simple so far, and consider it when we > have another vec implementation, or better refactor comes out. > >> > Or maybe better, do a compile time check at the Makefile, something >> > like: >> > >> > if has_CPUFLAG_xxx >> > SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple.c >> > endif >> > >> Tried this approach but end up with link error, If I try to fix below >> link error then I will be ending up writing similar code, > > Sure you need the first part of your patch. Yes, it's similar code, > but it has fewer "#ifdef " conditions, and more importantly, it > leaves virtio_rxtx_simple.c alone. > Ok., > --yliu > >> linker error snap: >> >> /work/santosh/thunder/nfs/dpdk/arm64-thunderx-linuxapp-gcc/lib/librte_pmd_virtio.a(virtio_rxtx.o): >> In function `virtio_dev_rxtx_start': >> virtio_rxtx.c:(.text+0x168c): undefined reference to >> `virtqueue_enqueue_recv_refill_simple' >> /work/santosh/thunder/nfs/dpdk/arm64-thunderx-linuxapp-gcc/lib/librte_pmd_virtio.a(virtio_rxtx.o): >> In function `virtio_dev_rx_queue_setup': >> virtio_rxtx.c:(.text+0x2364): undefined reference to `virtio_rxq_vec_setup' >> /work/santosh/thunder/nfs/dpdk/arm64-thunderx-linuxapp-gcc/lib/librte_pmd_virtio.a(virtio_rxtx.o): >> In function `virtio_dev_tx_queue_setup': >> virtio_rxtx.c:(.text+0x2460): undefined reference to >> `virtio_xmit_pkts_simple' >> virtio_rxtx.c:(.text+0x2464): undefined reference to `virtio_recv_pkts_vec' >> virtio_rxtx.c:(.text+0x2468): undefined reference to >> `virtio_xmit_pkts_simple' >> virtio_rxtx.c:(.text+0x246c): undefined reference to `virtio_recv_pkts_vec'
[dpdk-dev] [PATCH v1] virtio: Use cpuflag for vector api
On Tue, Mar 01, 2016 at 11:40:41AM +0530, Santosh Shukla wrote: > On Tue, Mar 1, 2016 at 11:25 AM, Yuanhan Liu > wrote: > > On Mon, Feb 29, 2016 at 06:01:38PM +0530, Santosh Shukla wrote: > >> On Mon, Feb 29, 2016 at 9:57 AM, Yuanhan Liu > >> wrote: > >> > On Fri, Feb 26, 2016 at 02:21:02PM +0530, Santosh Shukla wrote: > >> >> Check cpuflag macro before using vectored api. > >> >> -virtio_recv_pkts_vec() uses _sse3__ simd instruction for now so added > >> >> cpuflag. > >> >> - Also wrap other vectored freind api ie.. > >> >> 1) virtqueue_enqueue_recv_refill_simple > >> >> 2) virtio_rxq_vec_setup > >> >> > >> > ... > >> >> diff --git a/drivers/net/virtio/virtio_rxtx_simple.c > >> >> b/drivers/net/virtio/virtio_rxtx_simple.c > >> >> index 3a1de9d..be51d7c 100644 > >> >> --- a/drivers/net/virtio/virtio_rxtx_simple.c > >> >> +++ b/drivers/net/virtio/virtio_rxtx_simple.c > >> > > >> > Hmm, why not wrapping the whole file, instead of just few functions? > >> > > >> > >> Better to refactor code and make arch specific. Current implementation > >> is temporary. > > > > I'm okay to refactor, if it's a clean one. But moving virtio __driver__ > > stuff to EAL, sorry, it still doesn't make too much sense to me. > > > > You misunderstood my comment, my arch specific meaning > driver/net/virtio/virtio_vec_.h Oh, sorry. Then, yes, that's the way to go, if refactor is really needed. --yliu
[dpdk-dev] [PATCH v5 01/11] ethdev: add API to query packet type filling info
On 02/29/2016 06:41 PM, Tan, Jianfeng wrote:
> Hi Panu,
>
> On 2/29/2016 7:34 PM, Panu Matilainen wrote:
[...]
>>
>> More importantly, to export a function you need to add an entry for it
>> in rte_ether_version.map.
>
> Oh, yes, thanks for pointing out this, I'll change this and update
> rte_ether_version.map.
>
> Is it like this? Before or after DPDK_2.2 {}?
> DPDK_2.3 {
> global:
>
> rte_eth_dev_get_ptype_info;
>
> local: *;
> };
Sorry I didn't have a chance to reply to this yesterday and I see you
already posted a v6 with the above, which is almost but not quite there:
it needs to inherit from DPDK_2.2, ie
DPDK_2.3 {
global:
rte_eth_dev_get_ptype_info;
local: *;
} DPDK_2.2;
...but if there are no other reasons to respin the series perhaps Thomas
can fixup that while applying.
Then there's the actual version, which should optimally be DPDK_16.04
but that's purely cosmetical. There are a number of patches floating
around with DPDK_2.3 {} and librte_eal actually has one on board, so
clearly the dust from versioning change has not yet settled.
- Panu -
>
> Thanks,
> Jianfeng
>
>>
>> - Panu -
>>
>>
>
[dpdk-dev] [PATCH v2] virtio: Use cpuflag for vector api
On Tue, Mar 01, 2016 at 11:38:55AM +0530, Santosh Shukla wrote: > On Tue, Mar 1, 2016 at 11:29 AM, Yuanhan Liu > wrote: > > On Mon, Feb 29, 2016 at 06:28:10PM +0530, Santosh Shukla wrote: > >> Check cpuflag macro before using vectored api. > >> -virtio_recv_pkts_vec() uses _sse3__ simd instruction for now so added > >> cpuflag. > >> - Also wrap other vectored freind api ie.. > >> 1) virtqueue_enqueue_recv_refill_simple > >> 2) virtio_rxq_vec_setup > >> > >> - removed VIRTIO_PMD=n from armv7/v8 config. > >> > >> todo: > >> 1) Move virtio_recv_pkts_vec() implementation to > >>drivers/virtio/virtio_vec_.h file. > >> 2) Remove use_simple_rxtx flag, so that virtio/virtio_vec_.h > >>files to provide vectored/non-vectored rx/tx apis. > >> > >> Signed-off-by: Santosh Shukla > >> --- > >> - v2: Removed VIRTIO_PMD=n from arm v7/v8 > > > > Firstly, I would not suggest you to send another new version, while there > > still was discussions ongoing on old version. > > > > And, you should not mix the ARM stuff here; this patch should only do > > what the patch title tells. In generic, don't do two or more things in > > one patch. > > > > w/o v2 patch, old version wont build for armv7/v8. Clubbing both in > v2, inspired from v7 virtio INC_VEC review comment/feedback [1]. Thinking it this way, that build won't work for ARM, with or without this patch. And this patch just fix a build error for platforms that doesn't has vec instructions (which could include old x86 platforms). So, the right way to go is to separate the ARM stuff to another standalone patch, claiming that we now supports ARM. Makes sense to you? BTW, is this the last piece of code to make virtio for ARM work? I maybe wrong, but I remembered you have few more patches for virtio in old versions. (Yeah, I'm aware of that the EAL parts have been merged) Anyway, here is a remind: don't forget to update release note: doc/guides/rel_notes/release_16_04.rst --yliu
[dpdk-dev] [PATCH v4 4/4] virtio: return 1 to tell the upper layer we don't take over this device
Hi Huawei,
2016-02-26 09:53, Huawei Xie:
> --- a/drivers/net/virtio/virtio_ethdev.c
> +++ b/drivers/net/virtio/virtio_ethdev.c
> @@ -1,4 +1,5 @@
> /*-
> +
This new line seems useless :)
> * BSD LICENSE
> *
[...]
> @@ -1037,8 +1039,11 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
>
> pci_dev = eth_dev->pci_dev;
>
> - if (vtpci_init(pci_dev, hw) < 0)
> - return -1;
> + ret = vtpci_init(pci_dev, hw);
> + if (ret) {
> + rte_free(eth_dev->data->mac_addrs);
The freeing seems not related to this patch.
> + return ret;
> + }
[...]
> PMD_INIT_LOG(INFO, "trying with legacy virtio pci.");
> - if (legacy_virtio_resource_init(dev, hw) < 0)
> + if (legacy_virtio_resource_init(dev, hw) < 0) {
> + if (dev->kdrv == RTE_KDRV_UNKNOWN) {
> + PMD_INIT_LOG(INFO,
> + "skip kernel managed virtio device.");
> + return 1;
> + }
> return -1;
> + }
You cannot skip a device if it was whitelisted.
I think you should check RTE_DEVTYPE_WHITELISTED_PCI and throw an error
in this case.
[dpdk-dev] [PATCH v4 1/3] fm10k: enable FTAG based forwarding
2016-03-01 13:36, Wang Xiao W:
> +static int
> +fm10k_check_ftag(struct rte_devargs *devargs)
> +{
> + if (devargs == NULL)
> + return 0;
> +
> + if (strstr(devargs->args, "enable_ftag=1") == NULL)
> + return 0;
> +
> + return 1;
> +}
With strstr(), chenable_ftag=12 will work :)
Please check how to use kvargs.
[dpdk-dev] [PATCH v4 4/4] virtio: return 1 to tell the upper layer we don't take over this device
On 3/1/2016 3:18 PM, Thomas Monjalon wrote:
> Hi Huawei,
>
> 2016-02-26 09:53, Huawei Xie:
>> --- a/drivers/net/virtio/virtio_ethdev.c
>> +++ b/drivers/net/virtio/virtio_ethdev.c
>> @@ -1,4 +1,5 @@
>> /*-
>> +
> This new line seems useless :)
Sorry, would fix.
>
>> * BSD LICENSE
>> *
> [...]
>> @@ -1037,8 +1039,11 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
>>
>> pci_dev = eth_dev->pci_dev;
>>
>> -if (vtpci_init(pci_dev, hw) < 0)
>> -return -1;
>> +ret = vtpci_init(pci_dev, hw);
>> +if (ret) {
>> +rte_free(eth_dev->data->mac_addrs);
> The freeing seems not related to this patch.
I can send a separate patch, ok within this patchset?
>
>> +return ret;
>> +}
> [...]
>> PMD_INIT_LOG(INFO, "trying with legacy virtio pci.");
>> -if (legacy_virtio_resource_init(dev, hw) < 0)
>> +if (legacy_virtio_resource_init(dev, hw) < 0) {
>> +if (dev->kdrv == RTE_KDRV_UNKNOWN) {
>> +PMD_INIT_LOG(INFO,
>> +"skip kernel managed virtio device.");
>> +return 1;
>> +}
>> return -1;
>> +}
> You cannot skip a device if it was whitelisted.
> I think you should check RTE_DEVTYPE_WHITELISTED_PCI and throw an error
> in this case.
I feel there is a subtle difference on the understanding of -w args. To
me, without it, probe all devices; with it, only probe whiltelisted API.
That is all.
Do you mean that -w implies that devices whitelisted must be probed
successfully otherwise we throw an error? If i get it right, then what
about the devices whitelisted but without PMD driver?
I will fix, :).
if (dev->kdrv == RTE_KDRV_UNKNOWN && dev->devargs->type !=
RTE_DEVTYPE_WHITELISTED_PCI) {
return 1;
}
>
>
[dpdk-dev] [PATCH] eal: fix symbol map version number
The version 2.3 has been renamed 16.04.
Fixes: 6d7de6d2e357 ("version: switch to year.month numbers")
Reported-by: Panu Matilainen
Signed-off-by: Thomas Monjalon
---
lib/librte_eal/bsdapp/eal/rte_eal_version.map | 2 +-
lib/librte_eal/linuxapp/eal/rte_eal_version.map | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map
b/lib/librte_eal/bsdapp/eal/rte_eal_version.map
index 127abaa..0c24223 100644
--- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map
+++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map
@@ -138,7 +138,7 @@ DPDK_2.2 {
} DPDK_2.1;
-DPDK_2.3 {
+DPDK_16.04 {
global:
rte_cpu_get_flag_name;
diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map
b/lib/librte_eal/linuxapp/eal/rte_eal_version.map
index f61ec48..4aa9de7 100644
--- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map
+++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map
@@ -141,7 +141,7 @@ DPDK_2.2 {
} DPDK_2.1;
-DPDK_2.3 {
+DPDK_16.04 {
global:
rte_cpu_get_flag_name;
--
2.7.0
[dpdk-dev] [PATCH v5 01/11] ethdev: add API to query packet type filling info
On 3/1/2016 2:29 PM, Panu Matilainen wrote:
> On 02/29/2016 06:41 PM, Tan, Jianfeng wrote:
>> Hi Panu,
>>
>> On 2/29/2016 7:34 PM, Panu Matilainen wrote:
> [...]
>>>
>>> More importantly, to export a function you need to add an entry for it
>>> in rte_ether_version.map.
>>
>> Oh, yes, thanks for pointing out this, I'll change this and update
>> rte_ether_version.map.
>>
>> Is it like this? Before or after DPDK_2.2 {}?
>> DPDK_2.3 {
>> global:
>>
>> rte_eth_dev_get_ptype_info;
>>
>> local: *;
>> };
>
> Sorry I didn't have a chance to reply to this yesterday and I see you
> already posted a v6 with the above, which is almost but not quite
> there: it needs to inherit from DPDK_2.2, ie
>
> DPDK_2.3 {
> global:
>
> rte_eth_dev_get_ptype_info;
>
> local: *;
> } DPDK_2.2;
>
> ...but if there are no other reasons to respin the series perhaps
> Thomas can fixup that while applying.
OK, thanks. Should I add this new API into _API Changes_ section in
doc/guides/rel_notes/release_16_04.rst?
>
> Then there's the actual version, which should optimally be DPDK_16.04
> but that's purely cosmetical. There are a number of patches floating
> around with DPDK_2.3 {} and librte_eal actually has one on board, so
> clearly the dust from versioning change has not yet settled.
Maybe Thomas can give some advice here? DPDK_2.3 or DPDK_16.04 be used here?
Thanks,
Jianfeng
>
> - Panu -
>
>>
>> Thanks,
>> Jianfeng
>>
>>>
>>> - Panu -
>>>
>>>
>>
>
[dpdk-dev] [PATCH v5 01/11] ethdev: add API to query packet type filling info
2016-03-01 08:29, Panu Matilainen:
> DPDK_2.3 {
> global:
>
> rte_eth_dev_get_ptype_info;
>
> local: *;
> } DPDK_2.2;
>
> ...but if there are no other reasons to respin the series perhaps Thomas
> can fixup that while applying.
>
> Then there's the actual version, which should optimally be DPDK_16.04
> but that's purely cosmetical. There are a number of patches floating
> around with DPDK_2.3 {} and librte_eal actually has one on board, so
> clearly the dust from versioning change has not yet settled.
Yes it must be 16.04.
I've just sent a patch for EAL:
http://dpdk.org/ml/archives/dev/2016-March/034266.html
Thanks
[dpdk-dev] [PATCH v4 4/4] virtio: return 1 to tell the upper layer we don't take over this device
2016-03-01 07:53, Xie, Huawei:
> On 3/1/2016 3:18 PM, Thomas Monjalon wrote:
> > 2016-02-26 09:53, Huawei Xie:
> >> @@ -1037,8 +1039,11 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
> >>
> >>pci_dev = eth_dev->pci_dev;
> >>
> >> - if (vtpci_init(pci_dev, hw) < 0)
> >> - return -1;
> >> + ret = vtpci_init(pci_dev, hw);
> >> + if (ret) {
> >> + rte_free(eth_dev->data->mac_addrs);
> > The freeing seems not related to this patch.
>
> I can send a separate patch, ok within this patchset?
Yes
> > [...]
> >>PMD_INIT_LOG(INFO, "trying with legacy virtio pci.");
> >> - if (legacy_virtio_resource_init(dev, hw) < 0)
> >> + if (legacy_virtio_resource_init(dev, hw) < 0) {
> >> + if (dev->kdrv == RTE_KDRV_UNKNOWN) {
> >> + PMD_INIT_LOG(INFO,
> >> + "skip kernel managed virtio device.");
> >> + return 1;
> >> + }
> >>return -1;
> >> + }
> > You cannot skip a device if it was whitelisted.
> > I think you should check RTE_DEVTYPE_WHITELISTED_PCI and throw an error
> > in this case.
>
> I feel there is a subtle difference on the understanding of -w args. To
> me, without it, probe all devices; with it, only probe whiltelisted API.
> That is all.
I don't know if it is clearly documented indeed.
> Do you mean that -w implies that devices whitelisted must be probed
> successfully otherwise we throw an error? If i get it right, then what
> about the devices whitelisted but without PMD driver?
Yes we should probably consider the whitelist as a "forced" init.
Later, we could introduce some device flags for probing/discovery:
PROBE_AUTO, PROBE_FORCE, PROBE_IGNORE. It would make white/black list
more precise.
> I will fix, :).
> if (dev->kdrv == RTE_KDRV_UNKNOWN && dev->devargs->type !=
> RTE_DEVTYPE_WHITELISTED_PCI) {
>
> return 1;
> }
You should also consider the blacklist case: if there is a blacklist,
the not blacklisted devices must be initialised or throw an error.
[dpdk-dev] [PATCH] examples/l3fwd: fix using packet type blindly
As a example to use ptype info, l3fwd needs firstly to use
rte_eth_dev_get_ptype_info() API to check if device and/or
its PMD driver will parse and fill the needed packet type;
if not, use the newly added option, --parse-ptype, to
analyze it in the callback softly.
As the mode of EXACT_MATCH uses the 5 tuples to caculate
hash, so we narrow down its scope to:
a. ip packets with no extensions, and
b. L4 payload should be either tcp or udp.
Note: this patch does not completely solve the issue, "cannot
run l3fwd on virtio or other devices", because hw_ip_checksum
may be not supported by the devices. Currently we can: option
1, remove this requirements; option 2, wait for virtio front
end (pmd) to support it.
Signed-off-by: Jianfeng Tan
---
doc/guides/rel_notes/release_16_04.rst | 5 ++
doc/guides/sample_app_ug/l3_forward.rst | 6 ++-
examples/l3fwd/l3fwd.h | 12 +
examples/l3fwd/l3fwd_em.c | 94 +
examples/l3fwd/l3fwd_lpm.c | 57
examples/l3fwd/main.c | 50 ++
6 files changed, 223 insertions(+), 1 deletion(-)
diff --git a/doc/guides/rel_notes/release_16_04.rst
b/doc/guides/rel_notes/release_16_04.rst
index 64e913d..4d6260e 100644
--- a/doc/guides/rel_notes/release_16_04.rst
+++ b/doc/guides/rel_notes/release_16_04.rst
@@ -68,6 +68,11 @@ This section should contain bug fixes added to the relevant
sections. Sample for
vhost-switch often fails to allocate mbuf when dequeue from vring because it
wrongly calculates the number of mbufs needed.
+* **examples/l3fwd: Fixed using packet type blindly.**
+
+ l3fwd makes use of packet type information without even query if devices or
PMDs
+ really set it. For those don't set ptypes, add an option to parse it softly.
+
EAL
~~~
diff --git a/doc/guides/sample_app_ug/l3_forward.rst
b/doc/guides/sample_app_ug/l3_forward.rst
index 4ce734b..e0c22e3 100644
--- a/doc/guides/sample_app_ug/l3_forward.rst
+++ b/doc/guides/sample_app_ug/l3_forward.rst
@@ -93,7 +93,7 @@ The application has a number of command line options:
.. code-block:: console
-./build/l3fwd [EAL options] -- -p PORTMASK [-P]
--config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len
PKTLEN]] [--no-numa][--hash-entry-num][--ipv6]
+./build/l3fwd [EAL options] -- -p PORTMASK [-P]
--config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len
PKTLEN]] [--no-numa][--hash-entry-num][--ipv6] [--parse-ptype]
where,
@@ -114,6 +114,8 @@ where,
* --ipv6: optional, set it if running ipv6 packets
+* --parse-ptype: optional, set it if use software way to analyze packet type
+
For example, consider a dual processor socket platform where cores 0-7 and
16-23 appear on socket 0, while cores 8-15 and 24-31 appear on socket 1.
Let's say that the programmer wants to use memory from both NUMA nodes, the
platform has only two ports, one connected to each NUMA node,
and the programmer wants to use two cores from each processor socket to do the
packet processing.
@@ -334,6 +336,8 @@ The key code snippet of simple_ipv4_fwd_4pkts() is shown
below:
The simple_ipv6_fwd_4pkts() function is similar to the simple_ipv4_fwd_4pkts()
function.
+Known issue: IP packets with extensions or IP packets which are not TCP/UDP
cannot work well with this mode.
+
Packet Forwarding for LPM-based Lookups
~~~
diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index da6d369..966c83b 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -198,6 +198,18 @@ void
setup_hash(const int socketid);
int
+em_check_ptype(int portid);
+
+int
+lpm_check_ptype(int portid);
+
+void
+em_parse_ptype(struct rte_mbuf *);
+
+void
+lpm_parse_ptype(struct rte_mbuf *);
+
+int
em_main_loop(__attribute__((unused)) void *dummy);
int
diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
index f6a65d8..1061baf 100644
--- a/examples/l3fwd/l3fwd_em.c
+++ b/examples/l3fwd/l3fwd_em.c
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include
#include
@@ -508,6 +509,99 @@ populate_ipv6_many_flow_into_table(const struct rte_hash
*h,
printf("Hash: Adding 0x%x keys\n", nr_flow);
}
+/* Requirements:
+ * 1. IP packets without extension;
+ * 2. L4 payload should be either TCP or UDP.
+ */
+int
+em_check_ptype(int portid)
+{
+ int i, ret;
+ int ptype_l3_ipv4_ext = 0;
+ int ptype_l3_ipv6_ext = 0;
+ int ptype_l4_tcp = 0;
+ int ptype_l4_udp = 0;
+
+ ret = rte_eth_dev_get_ptype_info(portid,
+RTE_PTYPE_L3_MASK | RTE_PTYPE_L4_MASK,
+NULL, 0);
+ if (ret <= 0)
+ return 0;
+
+ uint32_t ptypes[ret];
+
+ ret = rte_eth_dev_get_ptype_info(portid,
+RTE_PTYPE_L3_MASK | RTE_PTYPE_L4_MASK,
+
[dpdk-dev] [PATCH 2.3] tools/dpdk_nic_bind.py: Verbosely warn the user on bind
2016-01-26 21:21, David Marchand: > On Tue, Jan 26, 2016 at 9:14 PM, Thomas Monjalon > wrote: > > 2015-12-11 11:20, Aaron Conole: > >> DPDK ports are only detected during the EAL initialization. After that, any > >> new DPDK ports which are bound will not be visible to the application. > >> > >> The dpdk_nic_bind.py can be a bit more helpful to let users know that DPDK > >> enabled applications will not find rebound ports until after they have been > >> restarted. > > > > I think it's better to improve hotplug and allow hot binding. > > A work is in progress towards this direction. > > David, can you confirm? > > I intend to provide some rfc patches later this week, for next release. These "auto-hotplug" patches won't be ready for 16.04. But it's possible to use a new bound device with rte_eth_dev_attach(). So this patch is rejected.
[dpdk-dev] [PATCH v4 4/4] virtio: return 1 to tell the upper layer we don't take over this device
On 3/1/2016 4:24 PM, Thomas Monjalon wrote:
> 2016-03-01 07:53, Xie, Huawei:
>> On 3/1/2016 3:18 PM, Thomas Monjalon wrote:
>>> 2016-02-26 09:53, Huawei Xie:
@@ -1037,8 +1039,11 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
pci_dev = eth_dev->pci_dev;
- if (vtpci_init(pci_dev, hw) < 0)
- return -1;
+ ret = vtpci_init(pci_dev, hw);
+ if (ret) {
+ rte_free(eth_dev->data->mac_addrs);
>>> The freeing seems not related to this patch.
>> I can send a separate patch, ok within this patchset?
> Yes
>
>>> [...]
PMD_INIT_LOG(INFO, "trying with legacy virtio pci.");
- if (legacy_virtio_resource_init(dev, hw) < 0)
+ if (legacy_virtio_resource_init(dev, hw) < 0) {
+ if (dev->kdrv == RTE_KDRV_UNKNOWN) {
+ PMD_INIT_LOG(INFO,
+ "skip kernel managed virtio device.");
+ return 1;
+ }
return -1;
+ }
>>> You cannot skip a device if it was whitelisted.
>>> I think you should check RTE_DEVTYPE_WHITELISTED_PCI and throw an error
>>> in this case.
>> I feel there is a subtle difference on the understanding of -w args. To
>> me, without it, probe all devices; with it, only probe whiltelisted API.
>> That is all.
> I don't know if it is clearly documented indeed.
>
>> Do you mean that -w implies that devices whitelisted must be probed
>> successfully otherwise we throw an error? If i get it right, then what
>> about the devices whitelisted but without PMD driver?
> Yes we should probably consider the whitelist as a "forced" init.
> Later, we could introduce some device flags for probing/discovery:
> PROBE_AUTO, PROBE_FORCE, PROBE_IGNORE. It would make white/black list
> more precise.
>
>> I will fix, :).
>> if (dev->kdrv == RTE_KDRV_UNKNOWN && dev->devargs->type !=
>> RTE_DEVTYPE_WHITELISTED_PCI) {
>>
>> return 1;
>> }
> You should also consider the blacklist case: if there is a blacklist,
> the not blacklisted devices must be initialised or throw an error.
>
Don't we already skip probing the blacklisted device in
rte_eal_pci_probe_one_driver?
[dpdk-dev] [PATCH v7 0/4] Add tunnel filter support for IP in GRE on i40e
This patch set adds tunnel filter support for IP in GRE on i40e. v2 changes: Fix the byte order problem. v3 changes: Remove the deprecation notice and update the release notes. v4 changes: Modify the mistakes in cmdline.c in the old patch. v5 changes: Fix type errors and update the testpmd documentation. v6 changes: Use internal variables to convert byte order. v7 changes: Modify the mistakes of code style. Xutao Sun (4): lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure lib/ether: add IP in GRE type driver/i40e: implement tunnel filter for IP in GRE app/test-pmd: test tunnel filter for IP in GRE app/test-pmd/cmdline.c | 38 doc/guides/rel_notes/deprecation.rst| 5 doc/guides/rel_notes/release_16_04.rst | 2 ++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 35 -- drivers/net/i40e/i40e_ethdev.c | 45 +++-- lib/librte_ether/rte_eth_ctrl.h | 5 ++-- 6 files changed, 94 insertions(+), 36 deletions(-) -- 1.9.3
[dpdk-dev] [PATCH v7 1/4] lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure
Change the fields of outer_mac and inner_mac from pointer to struct
in order to keep the code's readability.
Signed-off-by: Xutao Sun
Signed-off-by: Jijiang Liu
---
app/test-pmd/cmdline.c | 6 --
doc/guides/rel_notes/deprecation.rst | 5 -
doc/guides/rel_notes/release_16_04.rst | 2 ++
drivers/net/i40e/i40e_ethdev.c | 12 ++--
lib/librte_ether/rte_eth_ctrl.h| 4 ++--
5 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 52e9f5f..c707318 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -6640,8 +6640,10 @@ cmd_tunnel_filter_parsed(void *parsed_result,
struct rte_eth_tunnel_filter_conf tunnel_filter_conf;
int ret = 0;
- tunnel_filter_conf.outer_mac = &res->outer_mac;
- tunnel_filter_conf.inner_mac = &res->inner_mac;
+ rte_memcpy(&tunnel_filter_conf.outer_mac, &res->outer_mac,
+ ETHER_ADDR_LEN);
+ rte_memcpy(&tunnel_filter_conf.inner_mac, &res->inner_mac,
+ ETHER_ADDR_LEN);
tunnel_filter_conf.inner_vlan = res->inner_vlan;
if (res->ip_value.family == AF_INET) {
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index e94d4a2..a895364 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -32,11 +32,6 @@ Deprecation Notices
RTE_ETH_FLOW_MAX. The release 2.2 does not contain these ABI changes,
but release 2.3 will.
-* ABI changes are planned for rte_eth_tunnel_filter_conf. Change the fields
- of outer_mac and inner_mac from pointer to struct in order to keep the
- code's readability. The release 2.2 does not contain these ABI changes, but
- release 2.3 will, and no backwards compatibility is planned.
-
* The scheduler statistics structure will change to allow keeping track of
RED actions.
diff --git a/doc/guides/rel_notes/release_16_04.rst
b/doc/guides/rel_notes/release_16_04.rst
index 64e913d..704d0f6 100644
--- a/doc/guides/rel_notes/release_16_04.rst
+++ b/doc/guides/rel_notes/release_16_04.rst
@@ -123,6 +123,8 @@ ABI Changes
the previous releases and made in this release. Use fixed width quotes for
``rte_function_names`` or ``rte_struct_names``. Use the past tense.
+* The fields of outer_mac and inner_mac were changed from pointer
+ to struct in order to keep the code's readability.
Shared Library Versions
---
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index ef24122..7c22358 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -5828,10 +5828,10 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
}
pfilter = cld_filter;
- (void)rte_memcpy(&pfilter->outer_mac, tunnel_filter->outer_mac,
- sizeof(struct ether_addr));
- (void)rte_memcpy(&pfilter->inner_mac, tunnel_filter->inner_mac,
- sizeof(struct ether_addr));
+ (void)rte_memcpy(&pfilter->outer_mac, &tunnel_filter->outer_mac,
+ ETHER_ADDR_LEN);
+ (void)rte_memcpy(&pfilter->inner_mac, &tunnel_filter->inner_mac,
+ ETHER_ADDR_LEN);
pfilter->inner_vlan = tunnel_filter->inner_vlan;
if (tunnel_filter->ip_type == RTE_TUNNEL_IPTYPE_IPV4) {
@@ -6131,13 +6131,13 @@ i40e_tunnel_filter_param_check(struct i40e_pf *pf,
}
if ((filter->filter_type & ETH_TUNNEL_FILTER_OMAC) &&
- (is_zero_ether_addr(filter->outer_mac))) {
+ (is_zero_ether_addr(&filter->outer_mac))) {
PMD_DRV_LOG(ERR, "Cannot add NULL outer MAC address");
return -EINVAL;
}
if ((filter->filter_type & ETH_TUNNEL_FILTER_IMAC) &&
- (is_zero_ether_addr(filter->inner_mac))) {
+ (is_zero_ether_addr(&filter->inner_mac))) {
PMD_DRV_LOG(ERR, "Cannot add NULL inner MAC address");
return -EINVAL;
}
diff --git a/lib/librte_ether/rte_eth_ctrl.h b/lib/librte_ether/rte_eth_ctrl.h
index ce224ad..30cbde7 100644
--- a/lib/librte_ether/rte_eth_ctrl.h
+++ b/lib/librte_ether/rte_eth_ctrl.h
@@ -280,8 +280,8 @@ enum rte_tunnel_iptype {
* Tunneling Packet filter configuration.
*/
struct rte_eth_tunnel_filter_conf {
- struct ether_addr *outer_mac; /**< Outer MAC address filter. */
- struct ether_addr *inner_mac; /**< Inner MAC address filter. */
+ struct ether_addr outer_mac; /**< Outer MAC address filter. */
+ struct ether_addr inner_mac; /**< Inner MAC address filter. */
uint16_t inner_vlan; /**< Inner VLAN filter. */
enum rte_tunnel_iptype ip_type; /**< IP address type. */
union {
--
1.9.3
[dpdk-dev] [PATCH v7 3/4] driver/i40e: implement tunnel filter for IP in GRE
Signed-off-by: Xutao Sun
Signed-off-by: Jijiang Liu
---
drivers/net/i40e/i40e_ethdev.c | 33 -
1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 7c22358..237c735 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -5797,6 +5797,12 @@ i40e_dev_get_filter_type(uint16_t filter_type, uint16_t
*flag)
case ETH_TUNNEL_FILTER_IMAC:
*flag = I40E_AQC_ADD_CLOUD_FILTER_IMAC;
break;
+ case ETH_TUNNEL_FILTER_OIP:
+ *flag = I40E_AQC_ADD_CLOUD_FILTER_OIP;
+ break;
+ case ETH_TUNNEL_FILTER_IIP:
+ *flag = I40E_AQC_ADD_CLOUD_FILTER_IIP;
+ break;
default:
PMD_DRV_LOG(ERR, "invalid tunnel filter type");
return -EINVAL;
@@ -5811,7 +5817,9 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
uint8_t add)
{
uint16_t ip_type;
- uint8_t tun_type = 0;
+ uint8_t i, tun_type = 0;
+ /* internal varialbe to convert ipv6 byte order */
+ uint32_t convert_ipv6[4];
int val, ret = 0;
struct i40e_hw *hw = I40E_PF_TO_HW(pf);
struct i40e_vsi *vsi = pf->main_vsi;
@@ -5833,16 +5841,19 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
(void)rte_memcpy(&pfilter->inner_mac, &tunnel_filter->inner_mac,
ETHER_ADDR_LEN);
- pfilter->inner_vlan = tunnel_filter->inner_vlan;
+ pfilter->inner_vlan = rte_cpu_to_le_16(tunnel_filter->inner_vlan);
if (tunnel_filter->ip_type == RTE_TUNNEL_IPTYPE_IPV4) {
ip_type = I40E_AQC_ADD_CLOUD_FLAGS_IPV4;
(void)rte_memcpy(&pfilter->ipaddr.v4.data,
- &tunnel_filter->ip_addr,
+ &rte_cpu_to_le_32(tunnel_filter->ip_addr.ipv4_addr),
sizeof(pfilter->ipaddr.v4.data));
} else {
ip_type = I40E_AQC_ADD_CLOUD_FLAGS_IPV6;
- (void)rte_memcpy(&pfilter->ipaddr.v6.data,
- &tunnel_filter->ip_addr,
+ for (i = 0; i < 4; i++) {
+ convert_ipv6[i] =
+ rte_cpu_to_le_32(tunnel_filter->ip_addr.ipv6_addr[i]);
+ }
+ (void)rte_memcpy(&pfilter->ipaddr.v6.data, &convert_ipv6,
sizeof(pfilter->ipaddr.v6.data));
}
@@ -5854,6 +5865,9 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
case RTE_TUNNEL_TYPE_NVGRE:
tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_NVGRE_OMAC;
break;
+ case RTE_TUNNEL_TYPE_IP_IN_GRE:
+ tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_IP;
+ break;
default:
/* Other tunnel types is not supported. */
PMD_DRV_LOG(ERR, "tunnel type is not supported.");
@@ -5868,10 +5882,11 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
return -EINVAL;
}
- pfilter->flags |= I40E_AQC_ADD_CLOUD_FLAGS_TO_QUEUE | ip_type |
- (tun_type << I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT);
- pfilter->tenant_id = tunnel_filter->tenant_id;
- pfilter->queue_number = tunnel_filter->queue_id;
+ pfilter->flags |= rte_cpu_to_le_16(
+ I40E_AQC_ADD_CLOUD_FLAGS_TO_QUEUE |
+ ip_type | (tun_type << I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT));
+ pfilter->tenant_id = rte_cpu_to_le_32(tunnel_filter->tenant_id);
+ pfilter->queue_number = rte_cpu_to_le_16(tunnel_filter->queue_id);
if (add)
ret = i40e_aq_add_cloud_filters(hw, vsi->seid, cld_filter, 1);
--
1.9.3
[dpdk-dev] [PATCH v7 4/4] app/test-pmd: test tunnel filter for IP in GRE
This patch add some options in tunnel_filter command to test IP in GRE packet
classification on i40e.
Update the testpmd documentation.
Signed-off-by: Xutao Sun
Signed-off-by: Jijiang Liu
---
app/test-pmd/cmdline.c | 32 +-
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 35 +++--
2 files changed, 55 insertions(+), 12 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index c707318..3e7cec8 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -302,11 +302,13 @@ static void cmd_help_long_parsed(void *parsed_result,
" a port\n\n"
"tunnel_filter add (port_id) (outer_mac) (inner_mac)
(ip_addr) "
- "(inner_vlan) (vxlan|nvgre) (filter_type) (tenant_id)
(queue_id)\n"
+ "(inner_vlan) (vxlan|nvgre|ipingre)
(imac-ivlan|imac-ivlan-tenid|"
+ "imac-tenid|imac|omac-imac-tenid|oip|iip) (tenant_id)
(queue_id)\n"
" add a tunnel filter of a port.\n\n"
"tunnel_filter rm (port_id) (outer_mac) (inner_mac)
(ip_addr) "
- "(inner_vlan) (vxlan|nvgre) (filter_type) (tenant_id)
(queue_id)\n"
+ "(inner_vlan) (vxlan|nvgre|ipingre)
(imac-ivlan|imac-ivlan-tenid|"
+ "imac-tenid|imac|omac-imac-tenid|oip|iip) (tenant_id)
(queue_id)\n"
" remove a tunnel filter of a port.\n\n"
"rx_vxlan_port add (udp_port) (port_id)\n"
@@ -6640,6 +6642,8 @@ cmd_tunnel_filter_parsed(void *parsed_result,
struct rte_eth_tunnel_filter_conf tunnel_filter_conf;
int ret = 0;
+ memset(&tunnel_filter_conf, 0, sizeof(tunnel_filter_conf));
+
rte_memcpy(&tunnel_filter_conf.outer_mac, &res->outer_mac,
ETHER_ADDR_LEN);
rte_memcpy(&tunnel_filter_conf.inner_mac, &res->inner_mac,
@@ -6648,12 +6652,14 @@ cmd_tunnel_filter_parsed(void *parsed_result,
if (res->ip_value.family == AF_INET) {
tunnel_filter_conf.ip_addr.ipv4_addr =
- res->ip_value.addr.ipv4.s_addr;
+ rte_be_to_cpu_32(res->ip_value.addr.ipv4.s_addr);
tunnel_filter_conf.ip_type = RTE_TUNNEL_IPTYPE_IPV4;
} else {
- memcpy(&(tunnel_filter_conf.ip_addr.ipv6_addr),
- &(res->ip_value.addr.ipv6),
- sizeof(struct in6_addr));
+ int i;
+ for (i = 0; i < 4; i++) {
+ tunnel_filter_conf.ip_addr.ipv6_addr[i] =
+ rte_be_to_cpu_32(res->ip_value.addr.ipv6.s6_addr32[i]);
+ }
tunnel_filter_conf.ip_type = RTE_TUNNEL_IPTYPE_IPV6;
}
@@ -6669,6 +6675,10 @@ cmd_tunnel_filter_parsed(void *parsed_result,
else if (!strcmp(res->filter_type, "omac-imac-tenid"))
tunnel_filter_conf.filter_type =
RTE_TUNNEL_FILTER_OMAC_TENID_IMAC;
+ else if (!strcmp(res->filter_type, "oip"))
+ tunnel_filter_conf.filter_type = ETH_TUNNEL_FILTER_OIP;
+ else if (!strcmp(res->filter_type, "iip"))
+ tunnel_filter_conf.filter_type = ETH_TUNNEL_FILTER_IIP;
else {
printf("The filter type is not supported");
return;
@@ -6678,6 +6688,8 @@ cmd_tunnel_filter_parsed(void *parsed_result,
tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN;
else if (!strcmp(res->tunnel_type, "nvgre"))
tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_NVGRE;
+ else if (!strcmp(res->tunnel_type, "ipingre"))
+ tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_IP_IN_GRE;
else {
printf("The tunnel type %s not supported.\n", res->tunnel_type);
return;
@@ -6723,11 +6735,11 @@ cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value
=
ip_value);
cmdline_parse_token_string_t cmd_tunnel_filter_tunnel_type =
TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
- tunnel_type, "vxlan#nvgre");
+ tunnel_type, "vxlan#nvgre#ipingre");
cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
- filter_type, "imac-ivlan#imac-ivlan-tenid#imac-tenid#"
+ filter_type, "oip#iip#imac-ivlan#imac-ivlan-tenid#imac-tenid#"
"imac#omac-imac-tenid");
cmdline_parse_token_num_t cmd_tunnel_filter_tenant_id =
TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
@@ -6741,8 +6753,8 @@ cmdline_parse_inst_t cmd_tunnel_filter = {
.data = (void *)0,
.help_str = "add/rm tunnel filter of a port: "
"tunnel_filter add port_id outer_mac inner_mac ip "
- "inner_vlan tunnel_type(vxlan|nvgre) filter_type
[dpdk-dev] [PATCH v7 2/4] lib/ether: add IP in GRE type
Signed-off-by: Xutao Sun
Signed-off-by: Jijiang Liu
---
lib/librte_ether/rte_eth_ctrl.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/librte_ether/rte_eth_ctrl.h b/lib/librte_ether/rte_eth_ctrl.h
index 30cbde7..0e948a1 100644
--- a/lib/librte_ether/rte_eth_ctrl.h
+++ b/lib/librte_ether/rte_eth_ctrl.h
@@ -244,6 +244,7 @@ enum rte_eth_tunnel_type {
RTE_TUNNEL_TYPE_GENEVE,
RTE_TUNNEL_TYPE_TEREDO,
RTE_TUNNEL_TYPE_NVGRE,
+ RTE_TUNNEL_TYPE_IP_IN_GRE,
RTE_TUNNEL_TYPE_MAX,
};
--
1.9.3
[dpdk-dev] [PATCH v6 1/4] lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure
On 03/01/2016 05:47 AM, Xutao Sun wrote: > Change the fields of outer_mac and inner_mac from pointer to struct > in order to keep the code's readability. > > Signed-off-by: Xutao Sun > Signed-off-by: Jijiang Liu > --- > app/test-pmd/cmdline.c | 6 -- > doc/guides/rel_notes/deprecation.rst | 5 - > doc/guides/rel_notes/release_16_04.rst | 2 ++ > drivers/net/i40e/i40e_ethdev.c | 12 ++-- > lib/librte_ether/rte_eth_ctrl.h| 4 ++-- > 5 files changed, 14 insertions(+), 15 deletions(-) > Since this is the commit actually changing the ABI, its best to actually bump LIBABIVER right here as well lest it go forgotten, and also update the list of shared library versions in release notes. See commit d8c4ae275582784ec0ff3b2c54a4c861b55bc056 for an example. Oh and sorry for not noticing this earlier. - Panu -
[dpdk-dev] [PATCH v1] virtio: Use cpuflag for vector api
On 2/26/2016 4:53 PM, Santosh Shukla wrote:
> Check cpuflag macro before using vectored api.
> -virtio_recv_pkts_vec() uses _sse3__ simd instruction for now so added
> cpuflag.
> - Also wrap other vectored freind api ie..
> 1) virtqueue_enqueue_recv_refill_simple
> 2) virtio_rxq_vec_setup
>
> todo:
> 1) Move virtio_recv_pkts_vec() implementation to
>drivers/virtio/virtio_vec_.h file.
> 2) Remove use_simple_rxtx flag, so that virtio/virtio_vec_.h
>files to provide vectored/non-vectored rx/tx apis.
>
> Signed-off-by: Santosh Shukla
> ---
> - v1: This is a rework of patch [1].
> Note: This patch will let non-x86 arch to use virtio pmd.
>
> [1] http://dpdk.org/dev/patchwork/patch/10429/
>
> drivers/net/virtio/virtio_rxtx.c| 16 +++-
> drivers/net/virtio/virtio_rxtx.h|2 ++
> drivers/net/virtio/virtio_rxtx_simple.c | 11 ++-
> 3 files changed, 27 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/virtio/virtio_rxtx.c
> b/drivers/net/virtio/virtio_rxtx.c
> index 41a1366..ec0b8de 100644
> --- a/drivers/net/virtio/virtio_rxtx.c
> +++ b/drivers/net/virtio/virtio_rxtx.c
> @@ -67,7 +67,9 @@
> #define VIRTIO_SIMPLE_FLAGS ((uint32_t)ETH_TXQ_FLAGS_NOMULTSEGS | \
> ETH_TXQ_FLAGS_NOOFFLOADS)
>
> +#ifdef RTE_MACHINE_CPUFLAG_SSSE3
> static int use_simple_rxtx;
> +#endif
>
>
I don't think so much #ifdef ... #endif in *.c file is a good choice.
Would you consider let it only in header file like:
in drivers/net/virtio/virtio_rxtx.h
[...]
#ifdef RTE_MACHINE_CPUFLAG_SSSE3
int virtio_rxq_vec_setup(struct virtqueue *rxq);
int virtqueue_enqueue_recv_refill_simple(struct virtqueue *vq,
struct rte_mbuf *m);
#else
int virtio_rxq_vec_setup(__rte_unused struct virtqueue *rxq) {return -1;}
int virtqueue_enqueue_recv_refill_simple(__rte_unused struct virtqueue *vq,
__rte_unused struct rte_mbuf *m) {
return -1;
}
#endif
and remove most #ifdef ... #endif in *.c file.
Thanks,
Michael
[dpdk-dev] [PATCH v3] af_packet: make the device detachable
On 02/29/2016 08:22 PM, Wojciech ?muda wrote:
> Hi Bernard,
>
>> Does making rte_pmd_af_packet_devinit local result in an ABI breakage?
> If someone uses it in their app, they'll be forced to change it.
> However, as this function is not intentionally public and there is API
> to create devices that finally calls rte_pmd_af_packet_devinit(), I'm
> not sure if any special caution is needed here.
Yeah this is a bit of a gray area. Strictly speaking it certainly is an
ABI break, but given that the function is documented as internal-only
and there's a proper, public way to create the device, there's no good
excuse for anybody to be using it. I think its okay to remove without
going through the deprecation process.
>
>> Should the DPDK_2.0 structure be kept and a DPDK_2.3 structure added?
> Should it be just `DPDK_2.3 { local: *} DPDK_2.0`? Doesn't inheritance
> of DPDK_2.0 make the symbol also global in 2.3?
Since there are no symbols being exported I dont see any point in
changing the version, just drop the accidentally exported symbol from
the 2.0 definition.
- Panu -
>> A deprecation notice may need to be added to the
>> doc/guides/rel_notes/deprecation.rst file.
> As far as I understand, deprecation.rst is used to announce something
> will be removed in the future release. Changes already done should be
> moved from deprecation.rst to the release's .rst file. At least, this
> is what I see in commit logs. If this change should be announced in
> deprecation.rst, does this mean there should be another patch in the
> future (after 2.3 release?) making this function static? And that
> future patch will add DPDK_2.3 structure in the map file?
>
> Thank you for your time,
> Wojtek
>
[dpdk-dev] [PATCH v1] virtio: Use cpuflag for vector api
On Tue, Mar 1, 2016 at 2:41 PM, Qiu, Michael wrote:
> On 2/26/2016 4:53 PM, Santosh Shukla wrote:
>> Check cpuflag macro before using vectored api.
>> -virtio_recv_pkts_vec() uses _sse3__ simd instruction for now so added
>> cpuflag.
>> - Also wrap other vectored freind api ie..
>> 1) virtqueue_enqueue_recv_refill_simple
>> 2) virtio_rxq_vec_setup
>>
>> todo:
>> 1) Move virtio_recv_pkts_vec() implementation to
>>drivers/virtio/virtio_vec_.h file.
>> 2) Remove use_simple_rxtx flag, so that virtio/virtio_vec_.h
>>files to provide vectored/non-vectored rx/tx apis.
>>
>> Signed-off-by: Santosh Shukla
>> ---
>> - v1: This is a rework of patch [1].
>> Note: This patch will let non-x86 arch to use virtio pmd.
>>
>> [1] http://dpdk.org/dev/patchwork/patch/10429/
>>
>> drivers/net/virtio/virtio_rxtx.c| 16 +++-
>> drivers/net/virtio/virtio_rxtx.h|2 ++
>> drivers/net/virtio/virtio_rxtx_simple.c | 11 ++-
>> 3 files changed, 27 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/virtio/virtio_rxtx.c
>> b/drivers/net/virtio/virtio_rxtx.c
>> index 41a1366..ec0b8de 100644
>> --- a/drivers/net/virtio/virtio_rxtx.c
>> +++ b/drivers/net/virtio/virtio_rxtx.c
>> @@ -67,7 +67,9 @@
>> #define VIRTIO_SIMPLE_FLAGS ((uint32_t)ETH_TXQ_FLAGS_NOMULTSEGS | \
>> ETH_TXQ_FLAGS_NOOFFLOADS)
>>
>> +#ifdef RTE_MACHINE_CPUFLAG_SSSE3
>> static int use_simple_rxtx;
>> +#endif
>>
>>
>
> I don't think so much #ifdef ... #endif in *.c file is a good choice.
> Would you consider let it only in header file like:
>
> in drivers/net/virtio/virtio_rxtx.h
>
> [...]
>
> #ifdef RTE_MACHINE_CPUFLAG_SSSE3
> int virtio_rxq_vec_setup(struct virtqueue *rxq);
>
> int virtqueue_enqueue_recv_refill_simple(struct virtqueue *vq,
> struct rte_mbuf *m);
> #else
> int virtio_rxq_vec_setup(__rte_unused struct virtqueue *rxq) {return -1;}
> int virtqueue_enqueue_recv_refill_simple(__rte_unused struct virtqueue *vq,
> __rte_unused struct rte_mbuf *m) {
> return -1;
> }
> #endif
>
> and remove most #ifdef ... #endif in *.c file.
>
I guess, above approach wont work for non-x86 arch, ad those func are
dummy, right? also code wont build for arm/non-86 arch because
tx/rx_pkt_burst callback will be using x86 specific virtio vec rx/tx
api.
> Thanks,
> Michael
[dpdk-dev] [PATCH v4 4/4] virtio: return 1 to tell the upper layer we don't take over this device
2016-03-01 08:39, Xie, Huawei:
> On 3/1/2016 4:24 PM, Thomas Monjalon wrote:
> > 2016-03-01 07:53, Xie, Huawei:
> >> On 3/1/2016 3:18 PM, Thomas Monjalon wrote:
> >>> 2016-02-26 09:53, Huawei Xie:
> @@ -1037,8 +1039,11 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
>
> pci_dev = eth_dev->pci_dev;
>
> -if (vtpci_init(pci_dev, hw) < 0)
> -return -1;
> +ret = vtpci_init(pci_dev, hw);
> +if (ret) {
> +rte_free(eth_dev->data->mac_addrs);
> >>> The freeing seems not related to this patch.
> >> I can send a separate patch, ok within this patchset?
> > Yes
> >
> >>> [...]
> PMD_INIT_LOG(INFO, "trying with legacy virtio pci.");
> -if (legacy_virtio_resource_init(dev, hw) < 0)
> +if (legacy_virtio_resource_init(dev, hw) < 0) {
> +if (dev->kdrv == RTE_KDRV_UNKNOWN) {
> +PMD_INIT_LOG(INFO,
> +"skip kernel managed virtio device.");
> +return 1;
> +}
> return -1;
> +}
> >>> You cannot skip a device if it was whitelisted.
> >>> I think you should check RTE_DEVTYPE_WHITELISTED_PCI and throw an error
> >>> in this case.
> >> I feel there is a subtle difference on the understanding of -w args. To
> >> me, without it, probe all devices; with it, only probe whiltelisted API.
> >> That is all.
> > I don't know if it is clearly documented indeed.
> >
> >> Do you mean that -w implies that devices whitelisted must be probed
> >> successfully otherwise we throw an error? If i get it right, then what
> >> about the devices whitelisted but without PMD driver?
> > Yes we should probably consider the whitelist as a "forced" init.
> > Later, we could introduce some device flags for probing/discovery:
> > PROBE_AUTO, PROBE_FORCE, PROBE_IGNORE. It would make white/black list
> > more precise.
> >
> >> I will fix, :).
> >> if (dev->kdrv == RTE_KDRV_UNKNOWN && dev->devargs->type !=
> >> RTE_DEVTYPE_WHITELISTED_PCI) {
> >>
> >> return 1;
> >> }
> > You should also consider the blacklist case: if there is a blacklist,
> > the not blacklisted devices must be initialised or throw an error.
> >
> Don't we already skip probing the blacklisted device in
> rte_eal_pci_probe_one_driver?
Yes, I'm talking about the devices which are not blacklisted.
Having some blacklisted devices imply that others are implicitly whitelisted.
[dpdk-dev] [PATCH v1 0/3] virtio vector and misc
- 1st patch: let non-x86 arch use virtio pmd driver in non-vec - 2nd patch: enable virtio arm support - 3rd patch: update virtio for arm feature entry in release guide. Thanks. Santosh Shukla (3): virtio: use vector rx/tx for ssse cpuflag only config: enable virtio for armv7/v8 guide/release: add virtio for arm feature info config/defconfig_arm-armv7a-linuxapp-gcc |1 - config/defconfig_arm64-armv8a-linuxapp-gcc |1 - doc/guides/rel_notes/release_16_04.rst |5 + drivers/net/virtio/Makefile|3 +++ drivers/net/virtio/virtio_rxtx.c | 16 +++- drivers/net/virtio/virtio_rxtx.h |2 ++ 6 files changed, 25 insertions(+), 3 deletions(-) -- 1.7.9.5
[dpdk-dev] [PATCH v1 1/3] virtio: use vector rx/tx for ssse cpuflag only
Temporary implementation to let virtio operate in non-vec mode for archs which
doesn't support _ssse_ cpuflag.
todo:
1) Move virtio_recv_pkts_vec() implementation to
drivers/virtio/virtio_vec_.h file.
2) Remove use_simple_rxtx flag, so that virtio/virtio_vec_.h
files to provide vectored/non-vectored rx/tx apis.
Signed-off-by: Santosh Shukla
---
v1: rework of this[1] patch
[1] http://dpdk.org/dev/patchwork/patch/10911/
- Removed ifdef from virtio_rxtx_simple.c
drivers/net/virtio/Makefile |3 +++
drivers/net/virtio/virtio_rxtx.c | 16 +++-
drivers/net/virtio/virtio_rxtx.h |2 ++
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/net/virtio/Makefile b/drivers/net/virtio/Makefile
index 43835ba..ef84f60 100644
--- a/drivers/net/virtio/Makefile
+++ b/drivers/net/virtio/Makefile
@@ -50,7 +50,10 @@ SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtqueue.c
SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_pci.c
SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx.c
SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_ethdev.c
+
+ifeq ($(findstring
RTE_MACHINE_CPUFLAG_SSSE3,$(CFLAGS)),RTE_MACHINE_CPUFLAG_SSSE3)
SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple.c
+endif
# this lib depends upon:
DEPDIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += lib/librte_eal lib/librte_ether
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 41a1366..ec0b8de 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -67,7 +67,9 @@
#define VIRTIO_SIMPLE_FLAGS ((uint32_t)ETH_TXQ_FLAGS_NOMULTSEGS | \
ETH_TXQ_FLAGS_NOOFFLOADS)
+#ifdef RTE_MACHINE_CPUFLAG_SSSE3
static int use_simple_rxtx;
+#endif
static void
vq_ring_free_chain(struct virtqueue *vq, uint16_t desc_idx)
@@ -307,12 +309,13 @@ virtio_dev_vring_start(struct virtqueue *vq, int
queue_type)
nbufs = 0;
error = ENOSPC;
+#ifdef RTE_MACHINE_CPUFLAG_SSSE3
if (use_simple_rxtx)
for (i = 0; i < vq->vq_nentries; i++) {
vq->vq_ring.avail->ring[i] = i;
vq->vq_ring.desc[i].flags = VRING_DESC_F_WRITE;
}
-
+#endif
memset(&vq->fake_mbuf, 0, sizeof(vq->fake_mbuf));
for (i = 0; i < RTE_PMD_VIRTIO_RX_MAX_BURST; i++)
vq->sw_ring[vq->vq_nentries + i] = &vq->fake_mbuf;
@@ -325,9 +328,11 @@ virtio_dev_vring_start(struct virtqueue *vq, int
queue_type)
/**
* Enqueue allocated buffers*
***/
+#ifdef RTE_MACHINE_CPUFLAG_SSSE3
if (use_simple_rxtx)
error =
virtqueue_enqueue_recv_refill_simple(vq, m);
else
+#endif
error = virtqueue_enqueue_recv_refill(vq, m);
if (error) {
rte_pktmbuf_free(m);
@@ -340,6 +345,7 @@ virtio_dev_vring_start(struct virtqueue *vq, int queue_type)
PMD_INIT_LOG(DEBUG, "Allocated %d bufs", nbufs);
} else if (queue_type == VTNET_TQ) {
+#ifdef RTE_MACHINE_CPUFLAG_SSSE3
if (use_simple_rxtx) {
int mid_idx = vq->vq_nentries >> 1;
for (i = 0; i < mid_idx; i++) {
@@ -357,6 +363,7 @@ virtio_dev_vring_start(struct virtqueue *vq, int queue_type)
for (i = mid_idx; i < vq->vq_nentries; i++)
vq->vq_ring.avail->ring[i] = i;
}
+#endif
}
}
@@ -423,7 +430,9 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
dev->data->rx_queues[queue_idx] = vq;
+#ifdef RTE_MACHINE_CPUFLAG_SSSE3
virtio_rxq_vec_setup(vq);
+#endif
return 0;
}
@@ -449,7 +458,10 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev,
const struct rte_eth_txconf *tx_conf)
{
uint8_t vtpci_queue_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX;
+
+#ifdef RTE_MACHINE_CPUFLAG_SSSE3
struct virtio_hw *hw = dev->data->dev_private;
+#endif
struct virtqueue *vq;
uint16_t tx_free_thresh;
int ret;
@@ -462,6 +474,7 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev,
return -EINVAL;
}
+#ifdef RTE_MACHINE_CPUFLAG_SSSE3
/* Use simple rx/tx func if single segment and no offloads */
if ((tx_conf->txq_flags & VIRTIO_SIMPLE_FLAGS) == VIRTIO_SIMPLE_FLAGS &&
!vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) {
@@ -470,6 +483,7 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev,
dev->rx_pkt_burst = virtio_recv_pkts_vec;
use_simple_rxtx = 1;
}
+#endif
ret = virtio_dev_queue_setup(dev, VTNET_TQ, queue_idx, vtpci_queue_idx,
[dpdk-dev] [PATCH v1 2/3] config: enable virtio for armv7/v8
removed _VIRTIO_PMD=n from arch config and let arch to use _VIRTIO_PMD from config/common_linuxapp. Signed-off-by: Santosh Shukla --- config/defconfig_arm-armv7a-linuxapp-gcc |1 - config/defconfig_arm64-armv8a-linuxapp-gcc |1 - 2 files changed, 2 deletions(-) diff --git a/config/defconfig_arm-armv7a-linuxapp-gcc b/config/defconfig_arm-armv7a-linuxapp-gcc index cbebd64..4bfdfad 100644 --- a/config/defconfig_arm-armv7a-linuxapp-gcc +++ b/config/defconfig_arm-armv7a-linuxapp-gcc @@ -70,7 +70,6 @@ CONFIG_RTE_LIBRTE_I40E_PMD=n CONFIG_RTE_LIBRTE_IXGBE_PMD=n CONFIG_RTE_LIBRTE_MLX4_PMD=n CONFIG_RTE_LIBRTE_MPIPE_PMD=n -CONFIG_RTE_LIBRTE_VIRTIO_PMD=n CONFIG_RTE_LIBRTE_VMXNET3_PMD=n CONFIG_RTE_LIBRTE_PMD_XENVIRT=n CONFIG_RTE_LIBRTE_PMD_BNX2X=n diff --git a/config/defconfig_arm64-armv8a-linuxapp-gcc b/config/defconfig_arm64-armv8a-linuxapp-gcc index eacd01c..f6f5d18 100644 --- a/config/defconfig_arm64-armv8a-linuxapp-gcc +++ b/config/defconfig_arm64-armv8a-linuxapp-gcc @@ -44,7 +44,6 @@ CONFIG_RTE_TOOLCHAIN="gcc" CONFIG_RTE_TOOLCHAIN_GCC=y CONFIG_RTE_IXGBE_INC_VECTOR=n -CONFIG_RTE_LIBRTE_VIRTIO_PMD=n CONFIG_RTE_LIBRTE_IVSHMEM=n CONFIG_RTE_LIBRTE_FM10K_PMD=n CONFIG_RTE_LIBRTE_I40E_PMD=n -- 1.7.9.5
[dpdk-dev] [PATCH v1 3/3] guide/release: add virtio for arm feature info
Signed-off-by: Santosh Shukla --- doc/guides/rel_notes/release_16_04.rst |5 + 1 file changed, 5 insertions(+) diff --git a/doc/guides/rel_notes/release_16_04.rst b/doc/guides/rel_notes/release_16_04.rst index 8273817..fc0b3bd 100644 --- a/doc/guides/rel_notes/release_16_04.rst +++ b/doc/guides/rel_notes/release_16_04.rst @@ -46,6 +46,11 @@ This section should contain new features added in this release. Sample format: * **Added vhost-user live migration support.** +* **Added virtio for arm support.** + Enabled virtio support for armv7/v8. Tested for arm64. Virtio can work with + other non-x86 arch too like powerpc. + * virtio for arm support VFIO(-noiommu) mode only + Resolved Issues --- -- 1.7.9.5
[dpdk-dev] [PATCH v2] virtio: Use cpuflag for vector api
On Tue, Mar 1, 2016 at 12:02 PM, Yuanhan Liu wrote: > On Tue, Mar 01, 2016 at 11:38:55AM +0530, Santosh Shukla wrote: >> On Tue, Mar 1, 2016 at 11:29 AM, Yuanhan Liu >> wrote: >> > On Mon, Feb 29, 2016 at 06:28:10PM +0530, Santosh Shukla wrote: >> >> Check cpuflag macro before using vectored api. >> >> -virtio_recv_pkts_vec() uses _sse3__ simd instruction for now so added >> >> cpuflag. >> >> - Also wrap other vectored freind api ie.. >> >> 1) virtqueue_enqueue_recv_refill_simple >> >> 2) virtio_rxq_vec_setup >> >> >> >> - removed VIRTIO_PMD=n from armv7/v8 config. >> >> >> >> todo: >> >> 1) Move virtio_recv_pkts_vec() implementation to >> >>drivers/virtio/virtio_vec_.h file. >> >> 2) Remove use_simple_rxtx flag, so that virtio/virtio_vec_.h >> >>files to provide vectored/non-vectored rx/tx apis. >> >> >> >> Signed-off-by: Santosh Shukla >> >> --- >> >> - v2: Removed VIRTIO_PMD=n from arm v7/v8 >> > >> > Firstly, I would not suggest you to send another new version, while there >> > still was discussions ongoing on old version. >> > >> > And, you should not mix the ARM stuff here; this patch should only do >> > what the patch title tells. In generic, don't do two or more things in >> > one patch. >> > >> >> w/o v2 patch, old version wont build for armv7/v8. Clubbing both in >> v2, inspired from v7 virtio INC_VEC review comment/feedback [1]. > > Thinking it this way, that build won't work for ARM, with or without > this patch. And this patch just fix a build error for platforms that > doesn't has vec instructions (which could include old x86 platforms). > > So, the right way to go is to separate the ARM stuff to another > standalone patch, claiming that we now supports ARM. > > Makes sense to you? > Sent a new patch series. Incorporated comments in this thread http://dpdk.org/dev/patchwork/patch/10945/ http://dpdk.org/dev/patchwork/patch/10946/ > BTW, is this the last piece of code to make virtio for ARM work? > I maybe wrong, but I remembered you have few more patches for virtio > in old versions. (Yeah, I'm aware of that the EAL parts have been > merged) > > Anyway, here is a remind: don't forget to update release note: > > doc/guides/rel_notes/release_16_04.rst > Posted a patch just now: http://dpdk.org/dev/patchwork/patch/10947/ > --yliu >
[dpdk-dev] [PATCH v4 4/4] virtio: return 1 to tell the upper layer we don't take over this device
On 3/1/2016 5:57 PM, Thomas Monjalon wrote:
> 2016-03-01 08:39, Xie, Huawei:
>> On 3/1/2016 4:24 PM, Thomas Monjalon wrote:
>>> 2016-03-01 07:53, Xie, Huawei:
On 3/1/2016 3:18 PM, Thomas Monjalon wrote:
> 2016-02-26 09:53, Huawei Xie:
>> @@ -1037,8 +1039,11 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
>>
>> pci_dev = eth_dev->pci_dev;
>>
>> -if (vtpci_init(pci_dev, hw) < 0)
>> -return -1;
>> +ret = vtpci_init(pci_dev, hw);
>> +if (ret) {
>> +rte_free(eth_dev->data->mac_addrs);
> The freeing seems not related to this patch.
I can send a separate patch, ok within this patchset?
>>> Yes
>>>
> [...]
>> PMD_INIT_LOG(INFO, "trying with legacy virtio pci.");
>> -if (legacy_virtio_resource_init(dev, hw) < 0)
>> +if (legacy_virtio_resource_init(dev, hw) < 0) {
>> +if (dev->kdrv == RTE_KDRV_UNKNOWN) {
>> +PMD_INIT_LOG(INFO,
>> +"skip kernel managed virtio device.");
>> +return 1;
>> +}
>> return -1;
>> +}
> You cannot skip a device if it was whitelisted.
> I think you should check RTE_DEVTYPE_WHITELISTED_PCI and throw an error
> in this case.
I feel there is a subtle difference on the understanding of -w args. To
me, without it, probe all devices; with it, only probe whiltelisted API.
That is all.
>>> I don't know if it is clearly documented indeed.
>>>
Do you mean that -w implies that devices whitelisted must be probed
successfully otherwise we throw an error? If i get it right, then what
about the devices whitelisted but without PMD driver?
>>> Yes we should probably consider the whitelist as a "forced" init.
>>> Later, we could introduce some device flags for probing/discovery:
>>> PROBE_AUTO, PROBE_FORCE, PROBE_IGNORE. It would make white/black list
>>> more precise.
>>>
I will fix, :).
if (dev->kdrv == RTE_KDRV_UNKNOWN && dev->devargs->type !=
RTE_DEVTYPE_WHITELISTED_PCI) {
return 1;
}
>>> You should also consider the blacklist case: if there is a blacklist,
>>> the not blacklisted devices must be initialised or throw an error.
>>>
>> Don't we already skip probing the blacklisted device in
>> rte_eal_pci_probe_one_driver?
> Yes, I'm talking about the devices which are not blacklisted.
> Having some blacklisted devices imply that others are implicitly whitelisted.
For blacklist, it only means the blacklisted device should be excluded
from being probed. It doesn't mean all other devices should be probed
either successfully or otherwise throw an error which cause DPDK exit.
Even that, the upper layer should explicitly put the non-blacklisted
device into whitelist, i mean here we should only deal with whitelist.
>
[dpdk-dev] [PATCH v2] examples/ip_pipeline: add link identification feature
This patch adds link identification feature to packet framework. To
identify a link, user can use both existing port-mask option, or specify
PCI device in every LINK section in the configuration file.
Signed-off-by: Fan Zhang
Acked-by: Cristian Dumitrescu
---
*v2
To be applied on top of:
[dpdk-dev,v2] examples/ip_pipeline: config parser clean-up
(http://dpdk.org/dev/patchwork/patch/10569/)
examples/ip_pipeline/app.h | 19 +--
examples/ip_pipeline/config_check.c| 16 ++-
examples/ip_pipeline/config_parse.c| 155 +
examples/ip_pipeline/init.c| 95 ++---
examples/ip_pipeline/pipeline/pipeline_common_fe.c | 12 +-
5 files changed, 231 insertions(+), 66 deletions(-)
diff --git a/examples/ip_pipeline/app.h b/examples/ip_pipeline/app.h
index 6510d6d..f749a5f 100644
--- a/examples/ip_pipeline/app.h
+++ b/examples/ip_pipeline/app.h
@@ -49,7 +49,7 @@
#include "pipeline.h"
#define APP_PARAM_NAME_SIZE PIPELINE_NAME_SIZE
-
+#define APP_LINK_PCI_BDF_SIZE16
struct app_mempool_params {
char *name;
uint32_t parsed;
@@ -64,7 +64,7 @@ struct app_link_params {
uint32_t parsed;
uint32_t pmd_id; /* Generated based on port mask */
uint32_t arp_q; /* 0 = Disabled (packets go to default queue 0) */
- uint32_t tcp_syn_local_q; /* 0 = Disabled (pkts go to default queue) */
+ uint32_t tcp_syn_q; /* 0 = Disabled (pkts go to default queue) */
uint32_t ip_local_q; /* 0 = Disabled (pkts go to default queue 0) */
uint32_t tcp_local_q; /* 0 = Disabled (pkts go to default queue 0) */
uint32_t udp_local_q; /* 0 = Disabled (pkts go to default queue 0) */
@@ -73,6 +73,7 @@ struct app_link_params {
uint32_t ip; /* 0 = Invalid */
uint32_t depth; /* Valid only when IP is valid */
uint64_t mac_addr; /* Read from HW */
+ char pci_bdf[APP_LINK_PCI_BDF_SIZE];
struct rte_eth_conf conf;
uint8_t promisc;
@@ -265,6 +266,10 @@ struct app_thread_data {
struct rte_ring *msgq_out;
};
+#ifndef APP_MAX_LINKS
+#define APP_MAX_LINKS16
+#endif
+
struct app_eal_params {
/* Map lcore set to physical cpu set */
char *coremap;
@@ -286,13 +291,13 @@ struct app_eal_params {
uint32_t ranks;
/* Add a PCI device in black list. */
- char *pci_blacklist;
+ char *pci_blacklist[APP_MAX_LINKS];
/* Add a PCI device in white list. */
- char *pci_whitelist;
+ char *pci_whitelist[APP_MAX_LINKS];
/* Add a virtual device. */
- char *vdev;
+ char *vdev[APP_MAX_LINKS];
/* Use VMware TSC map instead of native RDTSC */
uint32_t vmware_tsc_map_present;
@@ -367,10 +372,6 @@ struct app_eal_params {
#define APP_MAX_MEMPOOLS 8
#endif
-#ifndef APP_MAX_LINKS
-#define APP_MAX_LINKS16
-#endif
-
#ifndef APP_LINK_MAX_HWQ_IN
#define APP_LINK_MAX_HWQ_IN 64
#endif
diff --git a/examples/ip_pipeline/config_check.c
b/examples/ip_pipeline/config_check.c
index 1ff5763..fd9ff49 100644
--- a/examples/ip_pipeline/config_check.c
+++ b/examples/ip_pipeline/config_check.c
@@ -59,12 +59,16 @@ check_mempools(struct app_params *app)
static void
check_links(struct app_params *app)
{
- uint32_t n_links_port_mask = __builtin_popcountll(app->port_mask);
uint32_t i;
/* Check that number of links matches the port mask */
- APP_CHECK((app->n_links == n_links_port_mask),
- "Not enough links provided in the PORT_MASK\n");
+ if (app->port_mask) {
+ uint32_t n_links_port_mask =
+ __builtin_popcountll(app->port_mask);
+
+ APP_CHECK((app->n_links == n_links_port_mask),
+ "Not enough links provided in the PORT_MASK\n");
+ }
for (i = 0; i < app->n_links; i++) {
struct app_link_params *link = &app->link_params[i];
@@ -76,8 +80,8 @@ check_links(struct app_params *app)
rxq_max = 0;
if (link->arp_q > rxq_max)
rxq_max = link->arp_q;
- if (link->tcp_syn_local_q > rxq_max)
- rxq_max = link->tcp_syn_local_q;
+ if (link->tcp_syn_q > rxq_max)
+ rxq_max = link->tcp_syn_q;
if (link->ip_local_q > rxq_max)
rxq_max = link->ip_local_q;
if (link->tcp_local_q > rxq_max)
@@ -89,7 +93,7 @@ check_links(struct app_params *app)
for (i = 1; i <= rxq_max; i++)
APP_CHECK(((link->arp_q == i) ||
- (link->tcp_syn_local_q == i) ||
+ (link->tcp_syn_q == i) ||
(link->ip_local_q == i) ||
[dpdk-dev] [PATCH 3/8] drivers/net/e1000: Fix missing brackets
On 02/26/2016 03:13 PM, Aaron Conole wrote:
> Hi Wenzhou,
>
> "Lu, Wenzhuo" writes:
>
>> Hi Aaron,
>>
>>
>>> -Original Message-
>>> From: Aaron Conole [mailto:aconole at redhat.com]
>>> Sent: Friday, February 26, 2016 2:49 AM
>>> To: dev at dpdk.org
>>> Cc: Lu, Wenzhuo; Zhang, Helin; Ananyev, Konstantin; Richardson, Bruce
>>> Subject: [PATCH 3/8] drivers/net/e1000: Fix missing brackets
>>>
>>> The register read/write mphy functions have misleading whitespace around the
>>> locked check. This cleanup merely preserves the existing functionality while
>>> improving the ready check.
>>>
>>> Signed-off-by: Aaron Conole
>>> ---
>>> drivers/net/e1000/base/e1000_phy.c | 12 ++--
>>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/drivers/net/e1000/base/e1000_phy.c
>>> b/drivers/net/e1000/base/e1000_phy.c
>>> index d43b7ce..8642d38 100644
>>> --- a/drivers/net/e1000/base/e1000_phy.c
>>> +++ b/drivers/net/e1000/base/e1000_phy.c
>>> @@ -4153,13 +4153,13 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw
>>> *hw, u32 address, u32 *data)
>>> *data = E1000_READ_REG(hw, E1000_MPHY_DATA);
>>>
>>> /* Disable access to mPHY if it was originally disabled */
>>> - if (locked)
>>> + if (locked) {
>>> ready = e1000_is_mphy_ready(hw);
>>> if (!ready)
>>> return -E1000_ERR_PHY;
>>> - E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
>>> - E1000_MPHY_DIS_ACCESS);
>>> + }
>>>
>>> + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
>>> E1000_MPHY_DIS_ACCESS);
>>> return E1000_SUCCESS;
>>> }
>>>
>>> @@ -4218,13 +4218,13 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw
>>> *hw, u32 address, u32 data,
>>> E1000_WRITE_REG(hw, E1000_MPHY_DATA, data);
>>>
>>> /* Disable access to mPHY if it was originally disabled */
>>> - if (locked)
>>> + if (locked) {
>>> ready = e1000_is_mphy_ready(hw);
>>> if (!ready)
>>> return -E1000_ERR_PHY;
>>> - E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
>>> - E1000_MPHY_DIS_ACCESS);
>>> + }
>>>
>>> + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
>>> E1000_MPHY_DIS_ACCESS);
>>> return E1000_SUCCESS;
>>> }
>>>
>>> --
>>> 2.5.0
>> Normally we will not maintain the base code. It's just taken from kernel
>> driver.
>> Agree with you that the whitespace is misleading. But as it's no real
>> impact. I'd like to say not a big deal, better not change it. :)
>
> Thanks for this hint. It turns out my patch is wrong. It should actually
> be this (and I've confirmed by looking at the drivers):
>
> diff --git a/drivers/net/e1000/base/e1000_phy.c
> b/drivers/net/e1000/base/e1000_phy.c
> index d43b7ce..ad3fd58 100644
> --- a/drivers/net/e1000/base/e1000_phy.c
> +++ b/drivers/net/e1000/base/e1000_phy.c
> @@ -4153,12 +4153,12 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32
> address, u32 *data)
> *data = E1000_READ_REG(hw, E1000_MPHY_DATA);
>
> /* Disable access to mPHY if it was originally disabled */
> - if (locked)
> + if (locked) {
> ready = e1000_is_mphy_ready(hw);
> if (!ready)
> return -E1000_ERR_PHY;
> - E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
> - E1000_MPHY_DIS_ACCESS);
> + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
> E1000_MPHY_DIS_ACCESS);
> + }
>
> return E1000_SUCCESS;
> }
> @@ -4218,12 +4218,12 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32
> address, u32 data,
> E1000_WRITE_REG(hw, E1000_MPHY_DATA, data);
>
> /* Disable access to mPHY if it was originally disabled */
> - if (locked)
> + if (locked) {
> ready = e1000_is_mphy_ready(hw);
> if (!ready)
> return -E1000_ERR_PHY;
> - E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
> - E1000_MPHY_DIS_ACCESS);
> + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
> E1000_MPHY_DIS_ACCESS);
> + }
>
> return E1000_SUCCESS;
> }
>
> I will cook up a v2 of this patch if it makes sense. It is a real bug,
> so should be fixed.
Yes, it quite clearly is a real bug and there needs to be a documented
way of getting these things fixed. The README in the base/ directory is
not particularly helpful, since it only says "dont touch it".
This is apparently fixed in FreeBSD codebase so fixing it would be
"just" a matter of pulling in a newer version.
The other alternatives are either disabling the whole driver in gcc 6
builds, or paper over the bug with warning disablers, or have everybody
patch their packages locally to fix it, all of which just feel so stupid
they're not alternatives, really.
OTOH the bug has been there for 2.5 years (since commit
38db3f7f50bde45477f564783a06ac8fbd3348fa) and nobody has noticed...
Thomas, Bruce, thoughts/comments?
- Panu -
[dpdk-dev] [PATCH v4 1/3] fm10k: enable FTAG based forwarding
> -Original Message-
> From: Thomas Monjalon [mailto:thomas.monjalon at 6wind.com]
> Sent: Tuesday, March 1, 2016 3:36 PM
> To: Wang, Xiao W
> Cc: dev at dpdk.org; Chen, Jing D
> Subject: Re: [dpdk-dev] [PATCH v4 1/3] fm10k: enable FTAG based forwarding
>
> 2016-03-01 13:36, Wang Xiao W:
> > +static int
> > +fm10k_check_ftag(struct rte_devargs *devargs) {
> > + if (devargs == NULL)
> > + return 0;
> > +
> > + if (strstr(devargs->args, "enable_ftag=1") == NULL)
> > + return 0;
> > +
> > + return 1;
> > +}
>
> With strstr(), chenable_ftag=12 will work :) Please check how to use kvargs.
OK, it's better to standardize the args string processing. I'll rework it.
Best Regards,
Xiao
[dpdk-dev] [PATCH v2] I217 and I218 changes
On Mon, Feb 29, 2016 at 9:18 PM, Lu, Wenzhuo wrote: > Hi, > > > -Original Message- > > From: Ravi Kerur [mailto:rkerur at gmail.com] > > Sent: Tuesday, March 1, 2016 2:31 AM > > To: Lu, Wenzhuo; dev at dpdk.org > > Cc: Ravi Kerur > > Subject: [PATCH v2] I217 and I218 changes > > > > v2: > > Incorporate Wenzhou's comments > > Compiled and tested (via testpmd) on Ubuntu 14.04 on target > > x86_64-native-linuxapp-gcc > > Compiled for target x86_64-native-linuxapp-clang > > > > v1: > > Modified driver and eal code to recognize and support I217 and > > I218 Intel NICs. > > Compiled and tested (via testpmd) on Ubuntu 14.04 for target > > x86_64-native-linuxapp-gcc > > Compiled for target x86_64-native-linuxapp-clang > > > > Signed-off-by: Ravi Kerur > Acked-by: Wenzhuo Lu > But the v1, v2 info in the commit log is a little strange. For you didn't > send a v1 and others don't know our discussion :) > > Do you want me to resend it as 'v1' and include your comments in commit message? let me know. Thanks.
[dpdk-dev] [PATCH 1/5] mempool: add external mempool manager support
Olivier,
Here's my comments on your feedback. Hopefully I've covered all of
it this time, and I've summarised the outstanding questions at the bottom.
On 2/4/2016 2:52 PM, Olivier MATZ wrote:
>
>> -#ifndef RTE_LIBRTE_XEN_DOM0
>> -/* stub if DOM0 support not configured */
>> -struct rte_mempool *
>> -rte_dom0_mempool_create(const char *name __rte_unused,
>> -unsigned n __rte_unused,
>> -unsigned elt_size __rte_unused,
>> -unsigned cache_size __rte_unused,
>> -unsigned private_data_size __rte_unused,
>> -rte_mempool_ctor_t *mp_init __rte_unused,
>> -void *mp_init_arg __rte_unused,
>> -rte_mempool_obj_ctor_t *obj_init __rte_unused,
>> -void *obj_init_arg __rte_unused,
>> -int socket_id __rte_unused,
>> -unsigned flags __rte_unused)
>> -{
>> -rte_errno = EINVAL;
>> -return NULL;
>> -}
>> -#endif
>> -
>
> Could we move this is a separated commit?
> "mempool: remove unused rte_dom0_mempool_create stub"
Will do for v3.
--snip--
> return rte_mempool_xmem_create(name, n, elt_size,
>> - cache_size, private_data_size,
>> - mp_init, mp_init_arg,
>> - obj_init, obj_init_arg,
>> - socket_id, flags,
>> - NULL, NULL, MEMPOOL_PG_NUM_DEFAULT,
>> - MEMPOOL_PG_SHIFT_MAX);
>> +cache_size, private_data_size,
>> +mp_init, mp_init_arg,
>> +obj_init, obj_init_arg,
>> +socket_id, flags,
>> +NULL, NULL,
>> +MEMPOOL_PG_NUM_DEFAULT, MEMPOOL_PG_SHIFT_MAX);
>> }
>
> As far as I can see, you are not modifying the code here, only the
> style. For better readability, it should go in another commit that
> only fixes indent or style issues.
>
I've removed any changes to style in v2. Only makes things more
difficult to read.
> Also, I think the proper indentation is to use only one tab for the
> subsequent lines.
I've done this in v2.
>
>> @@ -598,6 +568,22 @@ rte_mempool_xmem_create(const char *name,
>> unsigned n, unsigned elt_size,
>> mp->cache_flushthresh = CALC_CACHE_FLUSHTHRESH(cache_size);
>> mp->private_data_size = private_data_size;
>>
>> +/*
>> + * Since we have 4 combinations of the SP/SC/MP/MC, and stack,
>> + * examine the
>> + * flags to set the correct index into the handler table.
>> + */
>
> nit: comment style is not correct
>
Will fix.
>> +if (flags & MEMPOOL_F_USE_STACK)
>> +mp->handler_idx = rte_get_mempool_handler("stack");
>
> The stack handler does not exist yet, it is introduced in the next
> commit. I think this code should be moved in the next commit too.
Done in v2
>
>> @@ -622,6 +607,10 @@ rte_mempool_xmem_create(const char *name,
>> unsigned n, unsigned elt_size,
>>
>> mp->elt_va_end = mp->elt_va_start;
>>
>> +/* Parameters are setup. Call the mempool handler alloc */
>> +if ((rte_mempool_ext_alloc(mp, name, n, socket_id, flags)) == NULL)
>> +goto exit;
>> +
>
> I think some memory needs to be freed here. At least 'te'.
Done in v2
>> @@ -681,7 +670,9 @@ rte_mempool_dump_cache(FILE *f, const struct
>> rte_mempool *mp)
>> fprintf(f, "cache_size=%"PRIu32"\n", mp->cache_size);
>> for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
>> cache_count = mp->local_cache[lcore_id].len;
>> -fprintf(f, "cache_count[%u]=%u\n", lcore_id, cache_count);
>> +if (cache_count > 0)
>> +fprintf(f, "cache_count[%u]=%u\n",
>> +lcore_id, cache_count);
>> count += cache_count;
>> }
>> fprintf(f, "total_cache_count=%u\n", count);
>
> This could also be moved in a separate commit.
Removed this change, as it's not really relevant to mempool manager
>> @@ -825,7 +815,7 @@ rte_mempool_dump(FILE *f, const struct
>> rte_mempool *mp)
>> mp->size);
>>
>> cache_count = rte_mempool_dump_cache(f, mp);
>> -common_count = rte_ring_count(mp->ring);
>> +common_count = /* rte_ring_count(mp->ring)*/0;
>> if ((cache_count + common_count) > mp->size)
>> common_count = mp->size - cache_count;
>> fprintf(f, " common_pool_count=%u\n", common_count);
>
> should it be rte_mempool_ext_get_count(mp) instead?
>
Done.
>
>
>> @@ -919,3 +909,111 @@ void rte_mempool_walk(void (*func)(const struct
>> rte_mempool *, void *),
>>
>> rte_rwlock_read_unlock(RTE_EAL_MEMPOOL_RWLOCK);
>> }
>> +
>> +
>> +/* create the mempool using and external mempool manager */
>> +struct rte_mempool *
>> +rte_mempool_create_ext(const char *name, unsigned n, unsigned elt_size,
>> +unsigned cache_size, unsigned private_data_size,
>> +rte_mempool_ctor_t *mp_init, void *mp_init_arg,
>> +rte_mempool_obj_ctor_t *obj_init, void *obj_init_arg,
>> +
[dpdk-dev] [PATCH v3 0/2] Fix CRC32c computation
> > CRC32c computation is not valid when buffer length is not a multiple of 4
> > bytes.
> > Values returned by rte_hash_crc functions does not match the one
> > computed by a trivial crc32c implementation.
> >
> > First patch fixes crc hash function autotests, to outline the problem.
> > Second patch fixes CRC32c computation.
> >
> > Didier Pallard (2):
> > test: fix CRC hash function autotest
> > hash: fix CRC32c computation
>
> Series-acked-by: Pablo de Lara
>
> Not sure if you need to include a "Fixes" line in the commit messages.
> In the first commit, probably you should, the commit that you are fixing is
> 6298d2c55ae8 ("app/test: add new functional tests for hash functions").
Thanks
> In the second commit, it is a bit more difficult, as we don't know that the
> commit is,
> that code was integrated a while ago, before 1.2.3, which is the first public
> release in dpdk.org.
Yes it helps to know the bug was there since the beginning.
> Also, there is a typo "lengthes", in both commit messages.
>
> You can leave the ack in both patches. Thanks!!
Applied, thanks
[dpdk-dev] [PATCH v2] mk: replace the combined library with a linker script
ping I would like to be sure nothing is forgotten in this new revision. 2016-02-23 23:20, Thomas Monjalon: > From: Panu Matilainen > > The physically linked-together combined library has been an increasing > source of problems, as was predicted when library and symbol versioning > was introduced. Replace the complex and fragile construction with a > simple linker script which achieves the same without all the problems, > remove the related kludges from eg mlx drivers. > > Since creating the linker script is practically zero cost, remove the > config option and just create it always. > > Based on a patch by Sergio Gonzales Monroy, linker script approach > initially suggested by Neil Horman. > > Suggested-by: Sergio Gonzalez Monroy > Suggested-by: Neil Horman > Signed-off-by: Panu Matilainen > Signed-off-by: Thomas Monjalon > --- > v2: > - move RTE_LIBNAME assignment rte.vars.mk to rte.combinedlib.mk > - update crypto > - update doc > - update rte.app.mk > - update test-build.sh
[dpdk-dev] [PATCH] examples/l3fwd: fix using packet type blindly
Hi Jianfeng,
> -Original Message-
> From: Tan, Jianfeng
> Sent: Tuesday, March 01, 2016 1:24 AM
> To: dev at dpdk.org
> Cc: Zhang, Helin; Ananyev, Konstantin; nelio.laranjeiro at 6wind.com;
> adrien.mazarguil at 6wind.com; rahul.lakkireddy at chelsio.com;
> pmatilai at redhat.com; Tan, Jianfeng
> Subject: [PATCH] examples/l3fwd: fix using packet type blindly
>
> As a example to use ptype info, l3fwd needs firstly to use
> rte_eth_dev_get_ptype_info() API to check if device and/or
> its PMD driver will parse and fill the needed packet type;
> if not, use the newly added option, --parse-ptype, to
> analyze it in the callback softly.
>
> As the mode of EXACT_MATCH uses the 5 tuples to caculate
> hash, so we narrow down its scope to:
> a. ip packets with no extensions, and
> b. L4 payload should be either tcp or udp.
>
> Note: this patch does not completely solve the issue, "cannot
> run l3fwd on virtio or other devices", because hw_ip_checksum
> may be not supported by the devices. Currently we can: option
> 1, remove this requirements; option 2, wait for virtio front
> end (pmd) to support it.
>
> Signed-off-by: Jianfeng Tan
> ---
> doc/guides/rel_notes/release_16_04.rst | 5 ++
> doc/guides/sample_app_ug/l3_forward.rst | 6 ++-
> examples/l3fwd/l3fwd.h | 12 +
> examples/l3fwd/l3fwd_em.c | 94
> +
> examples/l3fwd/l3fwd_lpm.c | 57
> examples/l3fwd/main.c | 50 ++
> 6 files changed, 223 insertions(+), 1 deletion(-)
>
> diff --git a/doc/guides/rel_notes/release_16_04.rst
> b/doc/guides/rel_notes/release_16_04.rst
> index 64e913d..4d6260e 100644
> --- a/doc/guides/rel_notes/release_16_04.rst
> +++ b/doc/guides/rel_notes/release_16_04.rst
> @@ -68,6 +68,11 @@ This section should contain bug fixes added to the
> relevant sections. Sample for
>vhost-switch often fails to allocate mbuf when dequeue from vring because
> it
>wrongly calculates the number of mbufs needed.
>
> +* **examples/l3fwd: Fixed using packet type blindly.**
> +
> + l3fwd makes use of packet type information without even query if devices
> or PMDs
> + really set it. For those don't set ptypes, add an option to parse it
> softly.
> +
>
> EAL
> ~~~
> diff --git a/doc/guides/sample_app_ug/l3_forward.rst
> b/doc/guides/sample_app_ug/l3_forward.rst
> index 4ce734b..e0c22e3 100644
> --- a/doc/guides/sample_app_ug/l3_forward.rst
> +++ b/doc/guides/sample_app_ug/l3_forward.rst
> @@ -93,7 +93,7 @@ The application has a number of command line options:
>
> .. code-block:: console
>
> -./build/l3fwd [EAL options] -- -p PORTMASK [-P]
> --config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len
> PKTLEN]] [--no-numa][--hash-entry-num][--ipv6]
> +./build/l3fwd [EAL options] -- -p PORTMASK [-P]
> --config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len
> PKTLEN]] [--no-numa][--hash-entry-num][--ipv6] [--parse-ptype]
>
> where,
>
> @@ -114,6 +114,8 @@ where,
>
> * --ipv6: optional, set it if running ipv6 packets
>
> +* --parse-ptype: optional, set it if use software way to analyze packet
> type
> +
> For example, consider a dual processor socket platform where cores 0-7 and
> 16-23 appear on socket 0, while cores 8-15 and 24-31
> appear on socket 1.
> Let's say that the programmer wants to use memory from both NUMA nodes, the
> platform has only two ports, one connected to
> each NUMA node,
> and the programmer wants to use two cores from each processor socket to do
> the packet processing.
> @@ -334,6 +336,8 @@ The key code snippet of simple_ipv4_fwd_4pkts() is shown
> below:
>
> The simple_ipv6_fwd_4pkts() function is similar to the
> simple_ipv4_fwd_4pkts() function.
>
> +Known issue: IP packets with extensions or IP packets which are not TCP/UDP
> cannot work well with this mode.
> +
> Packet Forwarding for LPM-based Lookups
> ~~~
>
> diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
> index da6d369..966c83b 100644
> --- a/examples/l3fwd/l3fwd.h
> +++ b/examples/l3fwd/l3fwd.h
> @@ -198,6 +198,18 @@ void
> setup_hash(const int socketid);
>
> int
> +em_check_ptype(int portid);
> +
> +int
> +lpm_check_ptype(int portid);
> +
> +void
> +em_parse_ptype(struct rte_mbuf *);
> +
> +void
> +lpm_parse_ptype(struct rte_mbuf *);
> +
> +int
> em_main_loop(__attribute__((unused)) void *dummy);
>
> int
> diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
> index f6a65d8..1061baf 100644
> --- a/examples/l3fwd/l3fwd_em.c
> +++ b/examples/l3fwd/l3fwd_em.c
> @@ -42,6 +42,7 @@
> #include
> #include
> #include
> +#include
>
> #include
> #include
> @@ -508,6 +509,99 @@ populate_ipv6_many_flow_into_table(const struct rte_hash
> *h,
> printf("Hash: Adding 0x%x keys\n", nr_flow);
> }
>
> +/* Requirements:
> + * 1. IP packets without
[dpdk-dev] [PATCH v2] doc: introduce networking driver matrix
Hi Thomas, D?a 27.01.2016 o 21:07 Thomas Monjalon nap?sal(a): > In order to better compare the drivers and check what is missing > for a common baseline, we need to fill a matrix. > > A CSS trick is used to fit the HTML page. > The PDF output needs some LaTeX wizardry. > > Signed-off-by: Thomas Monjalon > --- > v2: add vector PMDs > --- > doc/guides/nics/index.rst| 1 + > doc/guides/nics/overview.rst | 147 > +++ > 2 files changed, 148 insertions(+) > create mode 100644 doc/guides/nics/overview.rst > [...] > + > + = = = = = = = = = = = = = = = = = = = = = = = = = = > = = = = = > + Feature a b b b c e e i i i i i i i i i i f f m m m n n p r > s v v v x > +f n n o x 1 n 4 4 4 4 g g x x x x m m l l p f u c i > z i i m e > +p x x n g 0 i 0 0 0 0 b b g g g g 1 1 x x i p l a n > e r r x n > +a 2 2 d b 0 c e e e e v b b b b 0 0 4 5 p l p g > d t t n v > +c x x i e 0 . v v f e e e e k k e > a i i e i > +k v n . f f . v v . > t o o t r > +e f g . . . f f . > a . 3 t > +t v v v v v > 2 v > +e e e e e >e > +c c c c c >c > + = = = = = = = = = = = = = = = = = = = = = = = = = = > = = = = = [...] > + multiprocess aware Could you please clarify what was meant by this "multiprocess aware" field? Thanks, Matej
[dpdk-dev] [PATCH v2] doc: introduce networking driver matrix
2016-03-01 14:53, Matej Vido: > D?a 27.01.2016 o 21:07 Thomas Monjalon nap?sal(a): > > + multiprocess aware > Could you please clarify what was meant by this "multiprocess aware" field? The short answer is "git grep RTE_PROC -- drivers/" Some initializations must be done only in primay process.
[dpdk-dev] [PATCH] examples/l3fwd: fix using packet type blindly
Hi Konstantin,
On 3/1/2016 9:51 PM, Ananyev, Konstantin wrote:
> Hi Jianfeng,
>
>> -Original Message-
>> From: Tan, Jianfeng
>> Sent: Tuesday, March 01, 2016 1:24 AM
>> To: dev at dpdk.org
>> Cc: Zhang, Helin; Ananyev, Konstantin; nelio.laranjeiro at 6wind.com;
>> adrien.mazarguil at 6wind.com; rahul.lakkireddy at chelsio.com;
>> pmatilai at redhat.com; Tan, Jianfeng
>> Subject: [PATCH] examples/l3fwd: fix using packet type blindly
>>
>> As a example to use ptype info, l3fwd needs firstly to use
>> rte_eth_dev_get_ptype_info() API to check if device and/or
>> its PMD driver will parse and fill the needed packet type;
>> if not, use the newly added option, --parse-ptype, to
>> analyze it in the callback softly.
>>
>> As the mode of EXACT_MATCH uses the 5 tuples to caculate
>> hash, so we narrow down its scope to:
>>a. ip packets with no extensions, and
>>b. L4 payload should be either tcp or udp.
[...]
>> +
>> +if (ptype_l3_ipv4_ext == 0)
>> +printf("port %d cannot parse RTE_PTYPE_L3_IPV4_EXT\n", portid);
>> +if (ptype_l3_ipv6_ext == 0)
>> +printf("port %d cannot parse RTE_PTYPE_L3_IPV6_EXT\n", portid);
>> +if (ptype_l3_ipv4_ext && ptype_l3_ipv6_ext)
>> +return 1;
> Why return here?
> You'll miss L4 ptype checks below.
Oops, should be: if (!ptype_l3_ipv4_ext || !ptype_l3_ipv6_ext) return 0;
and continue check L4 ptype.
>> +
>> +if (ptype_l4_tcp == 0)
>> +printf("port %d cannot parse RTE_PTYPE_L4_TCP\n", portid);
>> +if (ptype_l4_udp == 0)
>> +printf("port %d cannot parse RTE_PTYPE_L4_UDP\n", portid);
>> +if (ptype_l4_tcp || ptype_l4_udp)
>> +return 1;
>> +
>> +return 0;
>> +}
>> +
>> +void
>> +em_parse_ptype(struct rte_mbuf *m)
>> +{
>> +struct ether_hdr *eth_hdr;
>> +uint32_t packet_type = 0;
>> +uint16_t ethertype;
>> +void *l4;
>> +int hdr_len;
>> +struct ipv4_hdr *ipv4_hdr;
>> +struct ipv6_hdr *ipv6_hdr;
>> +
>> +eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);
>> +ethertype = rte_be_to_cpu_16(eth_hdr->ether_type);
>> +l4 = (uint8_t *)eth_hdr + sizeof(struct ether_hdr);
> Just curious why l4? It looks like l3 :)
Yes, it's typo, should be l3. Thanks for pointing it out.
>> +switch (ethertype) {
>> +case ETHER_TYPE_IPv4:
>> +ipv4_hdr = (struct ipv4_hdr *)l4;
>> +hdr_len = (ipv4_hdr->version_ihl & IPV4_HDR_IHL_MASK) *
>> + IPV4_IHL_MULTIPLIER;
>> +if (hdr_len == sizeof(struct ipv4_hdr) &&
>> +(ipv4_hdr->next_proto_id == IPPROTO_TCP ||
>> + ipv4_hdr->next_proto_id == IPPROTO_UDP))
>> +packet_type |= RTE_PTYPE_L3_IPV4;
> I think it needs to be something like:
> If (hdr_len == sizeof(struct ipv4_hdr)) {
> packet_type = RTE_PTYPE_L3_IPV4;
> if (ipv4_hdr->next_proto_id == IPPROTO_TCP)
> packet_type |= RTE_PTYPE_L4_TCP;
> else if ipv4_hdr->next_proto_id == IPPROTO_UDP)
> packet_type |= RTE_PTYPE_L4_TCP;
> }
>
> And then inside em forward check ptype to be sure that is IPV4 with no
> options and UDP/TCP packet.
> Same for IPv6.
Got it, I'll change it and add this check in em forward function.
>> +break;
>> +case ETHER_TYPE_IPv6:
>> +ipv6_hdr = (struct ipv6_hdr *)l4;
>> +if (ipv6_hdr->proto == IPPROTO_TCP ||
>> +ipv6_hdr->proto == IPPROTO_UDP)
>> +packet_type |= RTE_PTYPE_L3_IPV6;
>> +break;
>> +}
>> +
>> +m->packet_type |= packet_type;
>> +}
>> +
>> /* main processing loop */
>> int
>> em_main_loop(__attribute__((unused)) void *dummy)
>> diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
>> index e0ed3c4..981227a 100644
>> --- a/examples/l3fwd/l3fwd_lpm.c
>> +++ b/examples/l3fwd/l3fwd_lpm.c
>> @@ -280,6 +280,63 @@ setup_lpm(const int socketid)
>> }
>> }
>>
>> +int
>> +lpm_check_ptype(int portid)
>> +{
>> +int i, ret;
>> +int ptype_l3_ipv4 = 0, ptype_l3_ipv6 = 0;
>> +
>> +ret = rte_eth_dev_get_ptype_info(portid, RTE_PTYPE_L3_MASK, NULL, 0);
>> +if (ret <= 0)
>> +return 0;
>> +
>> +uint32_t ptypes[ret];
>> +
>> +ret = rte_eth_dev_get_ptype_info(portid, RTE_PTYPE_L3_MASK,
>> + ptypes, ret);
>> +for (i = 0; i < ret; ++i) {
>> +if (ptypes[i] & RTE_PTYPE_L3_IPV4)
>> +ptype_l3_ipv4 = 1;
>> +if (ptypes[i] & RTE_PTYPE_L3_IPV6)
>> +ptype_l3_ipv6 = 1;
>> +}
>> +
>> +if (ptype_l3_ipv4 == 0)
>> +printf("port %d cannot parse RTE_PTYPE_L3_IPV4\n", portid);
>> +
>> +if (ptype_l3_ipv6 == 0)
>> +printf("port %d cannot parse RTE_PTYPE_L3_IPV6\n", portid);
>> +
>> +if (ptype_l3_ipv4 && ptype_l3_ipv6)
>> +return 1;
>> +
>> +return 0;
>> +
>> +}
>> +
>> +void
>> +lpm_parse_ptype(struct rte_m
[dpdk-dev] [PATCH] examples/l3fwd: fix using packet type blindly
> >> +
> >> +void
> >> +lpm_parse_ptype(struct rte_mbuf *m)
> >> +{
> >> + struct ether_hdr *eth_hdr;
> >> + uint32_t packet_type = 0;
> >> + uint16_t ethertype;
> >> +
> >> + eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);
> >> + ethertype = rte_be_to_cpu_16(eth_hdr->ether_type);
> >> + switch (ethertype) {
> >> + case ETHER_TYPE_IPv4:
> >> + packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
> >> + break;
> >> + case ETHER_TYPE_IPv6:
> >> + packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN;
> >> + break;
> >> + default:
> >> + break;
> >> + }
> >> +
> >> + m->packet_type |= packet_type;
> > Might be safer:
> > m->packet_type = packet_type;
>
> Your previous comment on this says that the assignment will write off
> some ptype info PMDs have filled. But for l3fwd, I think it does not
> care other ptype info.
Ah, yes - missed that you setup it to 0 at the start of that function.
Probably better than to use PTYPE_UNKNOW macro
>
> [...]
> > +static uint16_t
> > +cb_parse_packet_type(uint8_t port __rte_unused,
> > +uint16_t queue __rte_unused,
> > +struct rte_mbuf *pkts[],
> > +uint16_t nb_pkts,
> > +uint16_t max_pkts __rte_unused,
> > +void *user_param __rte_unused)
> > +{
> > + unsigned i;
> > +
> > + for (i = 0; i < nb_pkts; ++i)
> > + l3fwd_lkp.parse_ptype(pkts[i]);
> >
> > No need to create callback chains.
> > That way you have extra call per packet.
> > Just 2 callbaclks: cb_lpm_parse_ptype & cb_em_parse_ptype,
> > and then register one depending on which mode are we in.
> > Would be simpler and faster, I believe.
>
> Yes, I was considering it too. In addition, shall I use vector
> instruction here to accelerate it?
If you like you can have 2 versions one scalar one, another vector one.
Same as we have for the rest of EM/LPM processing.
Just scalar one would do too, at least for now.
Konstantin
[dpdk-dev] [PATCH v2] mk: replace the combined library with a linker script
On 03/01/2016 03:40 PM, Thomas Monjalon wrote: > ping > I would like to be sure nothing is forgotten in this new revision. Sorry, didn't realize you were waiting for input from me, it feels a bit strange to comment on something supposedly coming from myself :) > 2016-02-23 23:20, Thomas Monjalon: >> From: Panu Matilainen >> >> The physically linked-together combined library has been an increasing >> source of problems, as was predicted when library and symbol versioning >> was introduced. Replace the complex and fragile construction with a >> simple linker script which achieves the same without all the problems, >> remove the related kludges from eg mlx drivers. >> >> Since creating the linker script is practically zero cost, remove the >> config option and just create it always. >> >> Based on a patch by Sergio Gonzales Monroy, linker script approach >> initially suggested by Neil Horman. >> >> Suggested-by: Sergio Gonzalez Monroy >> Suggested-by: Neil Horman >> Signed-off-by: Panu Matilainen >> Signed-off-by: Thomas Monjalon >> --- >> v2: >> - move RTE_LIBNAME assignment rte.vars.mk to rte.combinedlib.mk >> - update crypto >> - update doc >> - update rte.app.mk >> - update test-build.sh > Briefly tested, gets generated and installed as it should etc - looks good to me. - Panu -
[dpdk-dev] [PATCH v4 0/4] Use common Linux tools to control DPDK ports
This work is to make DPDK ports more visible and to enable using common Linux tools to configure DPDK ports. Patch is based on KNI but contains only control functionality of it, also this patch does not include any Linux kernel network driver as part of it. Basically with the help of a kernel module (KCP), virtual Linux network interfaces named as "dpdk$" are created per DPDK port, control messages sent to these virtual interfaces are forwarded to DPDK, and response sent back to Linux application. Virtual interfaces created when DPDK application started and destroyed automatically when DPDK application terminated. Communication between kernel-space and DPDK done using netlink socket. In long term this patch intends to replace the KNI and KNI will be depreciated. v4: * Kernel side changes: * Remove logging helper macros, use pr_fmt * Seperate log msg for timeout and error * Control library changes: * Add ethtool_get_settings as dummy v3: * Kernel side changes: * Devices are not up by default * Add enable/disable promisc, allmulti support * Increase timeout to 500ms and print log when a command timedout * Control library changes: * Use librte_ethtool * Don't create interfaces for virtual PMDs * Add a new API ...msg_exist() to support port based locking * Add enable/disable promisc, allmulti support * Example changes: * Use blocking mode control interface processing, instead of poll mode v2: * Use rtnetlink to create interfaces * Add more ethtool support: get/set ringparam, set pauseparam. * fix ethtool get/set eeprom * lots of minor updates, enhancements in the code Samples: $ ifconfig dpdk0: flags=4163 mtu 1500 inet6 fe80::92e2:baff:fe0e:49b8 prefixlen 64 scopeid 0x20 ether 90:e2:ba:0e:49:b8 txqueuelen 1000 (Ethernet) RX packets 0 bytes 0 (0.0 B) RX errors 0 dropped 0 overruns 0 frame 0 TX packets 0 bytes 0 (0.0 B) TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0 dpdk1: flags=4163 mtu 1500 inet6 fe80::21b:21ff:fe76:fa20 prefixlen 64 scopeid 0x20 ether 00:1b:21:76:fa:20 txqueuelen 1000 (Ethernet) RX packets 0 bytes 0 (0.0 B) RX errors 0 dropped 0 overruns 0 frame 0 TX packets 0 bytes 0 (0.0 B) TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0 After some traffic on port 0: $ ifconfig dpdk0: flags=4163 mtu 1500 inet6 fe80::92e2:baff:fe0e:49b8 prefixlen 64 scopeid 0x20 ether 90:e2:ba:0e:49:b8 txqueuelen 1000 (Ethernet) RX packets 26117404 bytes 1671514264 (1.5 GiB) RX errors 0 dropped 0 overruns 0 frame 0 TX packets 27897889 bytes 1785463944 (1.6 GiB) TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0 $ ethtool -i dpdk0 driver: rte_ixgbe_pmd version: DPDK 16.04.0-rc0 firmware-version: expansion-rom-version: bus-info: :08:00.0 supports-statistics: no supports-test: no supports-eeprom-access: yes supports-register-dump: yes supports-priv-flags: no $ ethtool -e dpdk0 offset 20 length 10 Offset Values -- -- 0x0014: b7 01 bf 01 c7 01 cf 01 09 02 $ ip l show dpdk0 44: dpdk0: mtu 1500 qdisc fq_codel state UNKNOWN mode DEFAULT group default qlen 1000 link/ether 90:e2:ba:0e:49:b8 brd ff:ff:ff:ff:ff:ff $ ip l set dpdk0 addr 90:e2:ba:0e:49:b9 $ ip l show dpdk0 44: dpdk0: mtu 1500 qdisc fq_codel state UNKNOWN mode DEFAULT group default qlen 1000 link/ether 90:e2:ba:0e:49:b9 brd ff:ff:ff:ff:ff:ff Ferruh Yigit (4): lib/librte_ethtool: move librte_ethtool form examples to lib folder kcp: add kernel control path kernel module rte_ctrl_if: add control interface library examples/ethtool: add control interface support to the application MAINTAINERS| 5 + config/common_linuxapp | 14 +- doc/api/doxy-api-index.md | 4 +- doc/api/doxy-api.conf | 2 + doc/api/examples.dox | 5 +- doc/guides/prog_guide/ctrl_if_lib.rst | 52 ++ doc/guides/prog_guide/ethtool_lib.rst | 62 ++ doc/guides/prog_guide/index.rst| 4 +- doc/guides/rel_notes/release_16_04.rst | 10 + doc/guides/sample_app_ug/ethtool.rst | 77 +- examples/ethtool/Makefile | 24 +- examples/ethtool/ethapp.c | 873 + examples/ethtool/ethapp.h | 41 + examples/ethtool/ethtool-app/Makefile | 54 -- examples/ethtool/ethtool-app/ethapp.c | 873 - examples/ethtool/ethtool-app/ethapp.h | 41 - examples/ethtool/ethtool-app/main.c| 305 --- examples/ethtool/lib/Makefile | 57 -- examples/ethtool/lib/rte_ethtool.c | 423 -- example
[dpdk-dev] [PATCH v4 1/4] lib/librte_ethtool: move librte_ethtool form examples to lib folder
With KCP, examples/ethtool/lib/ethtool has two users, to prevent code dublication, moving library from examples folder into lib/ folder. Signed-off-by: Ferruh Yigit Acked-by: Remy Horton --- v4: * No update --- config/common_linuxapp | 5 + doc/api/doxy-api-index.md | 3 +- doc/api/doxy-api.conf | 1 + doc/api/examples.dox | 5 +- doc/guides/prog_guide/ethtool_lib.rst | 62 ++ doc/guides/prog_guide/index.rst| 3 +- doc/guides/rel_notes/release_16_04.rst | 1 + doc/guides/sample_app_ug/ethtool.rst | 36 +- examples/ethtool/Makefile | 24 +- examples/ethtool/ethapp.c | 873 + examples/ethtool/ethapp.h | 41 ++ examples/ethtool/ethtool-app/Makefile | 54 -- examples/ethtool/ethtool-app/ethapp.c | 873 - examples/ethtool/ethtool-app/ethapp.h | 41 -- examples/ethtool/ethtool-app/main.c| 305 -- examples/ethtool/lib/Makefile | 57 -- examples/ethtool/lib/rte_ethtool.c | 423 -- examples/ethtool/lib/rte_ethtool.h | 410 -- examples/ethtool/main.c| 305 ++ lib/Makefile | 1 + lib/librte_ethtool/Makefile| 57 ++ lib/librte_ethtool/rte_ethtool.c | 423 ++ lib/librte_ethtool/rte_ethtool.h | 413 ++ lib/librte_ethtool/rte_ethtool_version.map | 28 + mk/rte.app.mk | 1 + 25 files changed, 2236 insertions(+), 2209 deletions(-) create mode 100644 doc/guides/prog_guide/ethtool_lib.rst create mode 100644 examples/ethtool/ethapp.c create mode 100644 examples/ethtool/ethapp.h delete mode 100644 examples/ethtool/ethtool-app/Makefile delete mode 100644 examples/ethtool/ethtool-app/ethapp.c delete mode 100644 examples/ethtool/ethtool-app/ethapp.h delete mode 100644 examples/ethtool/ethtool-app/main.c delete mode 100644 examples/ethtool/lib/Makefile delete mode 100644 examples/ethtool/lib/rte_ethtool.c delete mode 100644 examples/ethtool/lib/rte_ethtool.h create mode 100644 examples/ethtool/main.c create mode 100644 lib/librte_ethtool/Makefile create mode 100644 lib/librte_ethtool/rte_ethtool.c create mode 100644 lib/librte_ethtool/rte_ethtool.h create mode 100644 lib/librte_ethtool/rte_ethtool_version.map diff --git a/config/common_linuxapp b/config/common_linuxapp index f1638db..960dde4 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -497,6 +497,11 @@ CONFIG_RTE_KNI_VHOST_DEBUG_RX=n CONFIG_RTE_KNI_VHOST_DEBUG_TX=n # +# Compile librte_ethtool +# +CONFIG_RTE_LIBRTE_ETHTOOL=y + +# # Compile vhost library # fuse-devel is needed to run vhost-cuse. # fuse-devel enables user space char driver development diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md index 7a91001..4cdd3f5 100644 --- a/doc/api/doxy-api-index.md +++ b/doc/api/doxy-api-index.md @@ -149,4 +149,5 @@ There are many libraries, so their headers may be grouped by topics: [common] (@ref rte_common.h), [ABI compat] (@ref rte_compat.h), [keepalive] (@ref rte_keepalive.h), - [version](@ref rte_version.h) + [version](@ref rte_version.h), + [ethtool](@ref rte_ethtool.h), diff --git a/doc/api/doxy-api.conf b/doc/api/doxy-api.conf index 57e8b5d..c5b8615 100644 --- a/doc/api/doxy-api.conf +++ b/doc/api/doxy-api.conf @@ -41,6 +41,7 @@ INPUT = doc/api/doxy-api-index.md \ lib/librte_cryptodev \ lib/librte_distributor \ lib/librte_ether \ + lib/librte_ethtool \ lib/librte_hash \ lib/librte_ip_frag \ lib/librte_ivshmem \ diff --git a/doc/api/examples.dox b/doc/api/examples.dox index 200af0b..8763d77 100644 --- a/doc/api/examples.dox +++ b/doc/api/examples.dox @@ -8,9 +8,8 @@ @example distributor/main.c @example dpdk_qat/crypto.c @example dpdk_qat/main.c - at example ethtool/ethtool-app/ethapp.c - at example ethtool/ethtool-app/main.c - at example ethtool/lib/rte_ethtool.c + at example ethtool/ethapp.c + at example ethtool/main.c @example exception_path/main.c @example helloworld/main.c @example ip_fragmentation/main.c diff --git a/doc/guides/prog_guide/ethtool_lib.rst b/doc/guides/prog_guide/ethtool_lib.rst new file mode 100644 index 000..e161cd0 --- /dev/null +++ b/doc/guides/prog_guide/ethtool_lib.rst @@ -0,0 +1,62 @@ +.. BSD LICENSE +Copyright(c) 2016 Intel Corporation. All rights reserved. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +
[dpdk-dev] [PATCH v4 2/4] kcp: add kernel control path kernel module
This kernel module is based on KNI module, but this one is stripped version of it and only for control messages, no data transfer functionality provided. This Linux kernel module helps userspace application create virtual interfaces and when a control command issued into that virtual interface, module pushes the command to the userspace and gets the response back for the caller application. The Linux tools like ethtool/ifconfig/ip can be used on virtual interfaces but not ones for related data, like tcpdump. In long term this patch intends to replace the KNI and KNI will be depreciated. Signed-off-by: Ferruh Yigit Acked-by: Remy Horton --- v4: * Remove logging helper macros, use pr_fmt * Seperate log msg for timeout and error v3: * Devices are not up by default * Add enable/disable promisc, allmulti support * Increase timeout to 500ms and print log when a command timedout v2: * Use rtnetlink to create interfaces * Fix ethtool get/set eeprom * Remove commented out code --- MAINTAINERS| 4 + config/common_linuxapp | 6 + lib/librte_eal/linuxapp/Makefile | 5 +- lib/librte_eal/linuxapp/eal/Makefile | 3 +- .../linuxapp/eal/include/exec-env/rte_kcp_common.h | 109 lib/librte_eal/linuxapp/kcp/Makefile | 57 lib/librte_eal/linuxapp/kcp/kcp_dev.h | 56 lib/librte_eal/linuxapp/kcp/kcp_ethtool.c | 300 + lib/librte_eal/linuxapp/kcp/kcp_net.c | 225 lib/librte_eal/linuxapp/kcp/kcp_nl.c | 220 +++ 10 files changed, 983 insertions(+), 2 deletions(-) create mode 100644 lib/librte_eal/linuxapp/eal/include/exec-env/rte_kcp_common.h create mode 100644 lib/librte_eal/linuxapp/kcp/Makefile create mode 100644 lib/librte_eal/linuxapp/kcp/kcp_dev.h create mode 100644 lib/librte_eal/linuxapp/kcp/kcp_ethtool.c create mode 100644 lib/librte_eal/linuxapp/kcp/kcp_net.c create mode 100644 lib/librte_eal/linuxapp/kcp/kcp_nl.c diff --git a/MAINTAINERS b/MAINTAINERS index 628bc05..6a77728 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -257,6 +257,10 @@ F: app/test/test_kni.c F: examples/kni/ F: doc/guides/sample_app_ug/kernel_nic_interface.rst +Linux KCP +M: Ferruh Yigit +F: lib/librte_eal/linuxapp/kcp/ + Linux AF_PACKET M: John W. Linville F: drivers/net/af_packet/ diff --git a/config/common_linuxapp b/config/common_linuxapp index 960dde4..0284fae 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -502,6 +502,12 @@ CONFIG_RTE_KNI_VHOST_DEBUG_TX=n CONFIG_RTE_LIBRTE_ETHTOOL=y # +# Compile librte_ctrl_if +# +CONFIG_RTE_KCP_KMOD=y +CONFIG_RTE_KCP_KO_DEBUG=n + +# # Compile vhost library # fuse-devel is needed to run vhost-cuse. # fuse-devel enables user space char driver development diff --git a/lib/librte_eal/linuxapp/Makefile b/lib/librte_eal/linuxapp/Makefile index d9c5233..d1fa3a3 100644 --- a/lib/librte_eal/linuxapp/Makefile +++ b/lib/librte_eal/linuxapp/Makefile @@ -1,6 +1,6 @@ # BSD LICENSE # -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +# Copyright(c) 2010-2016 Intel Corporation. All rights reserved. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -38,6 +38,9 @@ DIRS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal ifeq ($(CONFIG_RTE_KNI_KMOD),y) DIRS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += kni endif +ifeq ($(CONFIG_RTE_KCP_KMOD),y) +DIRS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += kcp +endif ifeq ($(CONFIG_RTE_LIBRTE_XEN_DOM0),y) DIRS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += xen_dom0 endif diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile index 6e26250..f6a3a41 100644 --- a/lib/librte_eal/linuxapp/eal/Makefile +++ b/lib/librte_eal/linuxapp/eal/Makefile @@ -1,6 +1,6 @@ # BSD LICENSE # -# Copyright(c) 2010-2015 Intel Corporation. All rights reserved. +# Copyright(c) 2010-2016 Intel Corporation. All rights reserved. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -121,6 +121,7 @@ CFLAGS_eal_thread.o += -Wno-return-type endif INC := rte_interrupts.h rte_kni_common.h rte_dom0_common.h +INC += rte_kcp_common.h SYMLINK-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP)-include/exec-env := \ $(addprefix include/exec-env/,$(INC)) diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kcp_common.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kcp_common.h new file mode 100644 index 000..988713e --- /dev/null +++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kcp_common.h @@ -0,0 +1,109 @@ +/*- + * This file is provided under a dual BSD/LGPLv2 license. When using or + * redistributing this file, you may do so under either license. + * + * GNU LESSER GENERAL PUBLIC LICENSE + * + * Copyright(c) 2016 Intel Corporation. All rights reserved. + * + * This program is
[dpdk-dev] [PATCH v4 3/4] rte_ctrl_if: add control interface library
This library gets control messages form kernelspace and forwards them to librte_ether and returns response back to the kernelspace. Library does: 1) Trigger Linux virtual interface creation 2) Initialize the netlink socket communication 3) Provides process() API to the application that does processing the received messages This library requires corresponding kernel module to be inserted. Signed-off-by: Ferruh Yigit Acked-by: Remy Horton --- v4: * Add ethtool_get_settings as dummy v3: * Use librte_ethtool * Don't create interfaces for virtual PMDs * Add a new API ...msg_exist() to support port based locking * Add enable/disable promisc, allmulti support v2: * User rtnetlink to create interfaces. * Add more ethtool support: get/set ringparam, set pauseparam. * return defined error instead of hardcoded value --- MAINTAINERS| 1 + config/common_linuxapp | 3 +- doc/api/doxy-api-index.md | 1 + doc/api/doxy-api.conf | 1 + doc/guides/prog_guide/ctrl_if_lib.rst | 52 doc/guides/prog_guide/index.rst| 1 + doc/guides/rel_notes/release_16_04.rst | 9 + lib/Makefile | 3 +- lib/librte_ctrl_if/Makefile| 58 + lib/librte_ctrl_if/rte_ctrl_ethtool.c | 390 lib/librte_ctrl_if/rte_ctrl_ethtool.h | 54 lib/librte_ctrl_if/rte_ctrl_if.c | 395 + lib/librte_ctrl_if/rte_ctrl_if.h | 129 ++ lib/librte_ctrl_if/rte_ctrl_if_version.map | 10 + lib/librte_ctrl_if/rte_nl.c| 313 +++ lib/librte_ctrl_if/rte_nl.h| 50 lib/librte_eal/common/include/rte_log.h| 3 +- mk/rte.app.mk | 3 +- 18 files changed, 1472 insertions(+), 4 deletions(-) create mode 100644 doc/guides/prog_guide/ctrl_if_lib.rst create mode 100644 lib/librte_ctrl_if/Makefile create mode 100644 lib/librte_ctrl_if/rte_ctrl_ethtool.c create mode 100644 lib/librte_ctrl_if/rte_ctrl_ethtool.h create mode 100644 lib/librte_ctrl_if/rte_ctrl_if.c create mode 100644 lib/librte_ctrl_if/rte_ctrl_if.h create mode 100644 lib/librte_ctrl_if/rte_ctrl_if_version.map create mode 100644 lib/librte_ctrl_if/rte_nl.c create mode 100644 lib/librte_ctrl_if/rte_nl.h diff --git a/MAINTAINERS b/MAINTAINERS index 6a77728..24dbfa0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -260,6 +260,7 @@ F: doc/guides/sample_app_ug/kernel_nic_interface.rst Linux KCP M: Ferruh Yigit F: lib/librte_eal/linuxapp/kcp/ +F: lib/librte_ctrl_if/ Linux AF_PACKET M: John W. Linville diff --git a/config/common_linuxapp b/config/common_linuxapp index 0284fae..dc75653 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -1,6 +1,6 @@ # BSD LICENSE # -# Copyright(c) 2010-2015 Intel Corporation. All rights reserved. +# Copyright(c) 2010-2016 Intel Corporation. All rights reserved. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -506,6 +506,7 @@ CONFIG_RTE_LIBRTE_ETHTOOL=y # CONFIG_RTE_KCP_KMOD=y CONFIG_RTE_KCP_KO_DEBUG=n +CONFIG_RTE_LIBRTE_CTRL_IF=y # # Compile vhost library diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md index 4cdd3f5..e34250d 100644 --- a/doc/api/doxy-api-index.md +++ b/doc/api/doxy-api-index.md @@ -151,3 +151,4 @@ There are many libraries, so their headers may be grouped by topics: [keepalive] (@ref rte_keepalive.h), [version](@ref rte_version.h), [ethtool](@ref rte_ethtool.h), + [control interface] (@ref rte_ctrl_if.h) diff --git a/doc/api/doxy-api.conf b/doc/api/doxy-api.conf index c5b8615..1a7999e 100644 --- a/doc/api/doxy-api.conf +++ b/doc/api/doxy-api.conf @@ -39,6 +39,7 @@ INPUT = doc/api/doxy-api-index.md \ lib/librte_cmdline \ lib/librte_compat \ lib/librte_cryptodev \ + lib/librte_ctrl_if \ lib/librte_distributor \ lib/librte_ether \ lib/librte_ethtool \ diff --git a/doc/guides/prog_guide/ctrl_if_lib.rst b/doc/guides/prog_guide/ctrl_if_lib.rst new file mode 100644 index 000..36054b9 --- /dev/null +++ b/doc/guides/prog_guide/ctrl_if_lib.rst @@ -0,0 +1,52 @@ +.. BSD LICENSE +Copyright(c) 2016 Intel Corporation. All rights reserved. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +* Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright +notice, this list
[dpdk-dev] [PATCH v4 4/4] examples/ethtool: add control interface support to the application
Control interface APIs added into the sample application.
To have the support corresponding kernel module (KCP) needs to be inserted.
If kernel module is not there, application will run as it is without
kernel control path support.
When KCP module inserted, running application creates a virtual Linux
network interface (dpdk$) per DPDK port. This interface can be used by
traditional Linux tools.
Signed-off-by: Ferruh Yigit
Acked-by: Remy Horton
---
v4:
* No update
v3:
* Use blocking mode control interface processing, instead of poll mode
v2:
* No update on sample app
---
doc/guides/sample_app_ug/ethtool.rst | 41
examples/ethtool/main.c | 31 +--
2 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/doc/guides/sample_app_ug/ethtool.rst
b/doc/guides/sample_app_ug/ethtool.rst
index 65240ae..af591c2 100644
--- a/doc/guides/sample_app_ug/ethtool.rst
+++ b/doc/guides/sample_app_ug/ethtool.rst
@@ -130,3 +130,44 @@ interface that accepts commands as described in `using the
application`_. Individual call-back functions handle the detail
associated with each command, which make use of librte_ethtool
library.
+
+Control Interface
+~
+
+If Kernel Control Path (KCP) kernel module (rte_kcp.ko) inserted,
+virtual interfaces created for each DPDK port for control purposes.
+
+Created interfaces are named as dpdk#, like:
+
+.. code-block:: console
+
+# ifconfig dpdk0; ifconfig dpdk1
+dpdk0: flags=4099 mtu 1500
+ether 90:e2:ba:0e:49:b9 txqueuelen 1000 (Ethernet)
+RX packets 0 bytes 0 (0.0 B)
+RX errors 0 dropped 0 overruns 0 frame 0
+TX packets 0 bytes 0 (0.0 B)
+TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0
+
+dpdk1: flags=4099 mtu 1500
+ether 00:1b:21:76:fa:21 txqueuelen 1000 (Ethernet)
+RX packets 0 bytes 0 (0.0 B)
+RX errors 0 dropped 0 overruns 0 frame 0
+TX packets 0 bytes 0 (0.0 B)
+TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0
+
+Regular Linux commands can be issued on interfaces:
+
+.. code-block:: console
+
+# ethtool -i dpdk0
+driver: rte_ixgbe_pmd
+version: RTE 2.3.0-rc0
+firmware-version:
+expansion-rom-version:
+bus-info: :08:00.1
+supports-statistics: yes
+supports-test: no
+supports-eeprom-access: yes
+supports-register-dump: yes
+supports-priv-flags: no
diff --git a/examples/ethtool/main.c b/examples/ethtool/main.c
index 2c655d8..72fbe4c 100644
--- a/examples/ethtool/main.c
+++ b/examples/ethtool/main.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2015 Intel Corporation. All rights reserved.
+ * Copyright(c) 2015-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@
#include
#include
#include
+#include
#include "ethapp.h"
@@ -54,7 +55,6 @@
#define PKTPOOL_EXTRA_SIZE 512
#define PKTPOOL_CACHE 32
-
struct txq_port {
uint16_t cnt_unsent;
struct rte_mbuf *buf_frames[MAX_BURST_LENGTH];
@@ -259,11 +259,32 @@ static int slave_main(__attribute__((unused)) void
*ptr_data)
return 0;
}
+static void *
+control_function(__attribute__((unused)) void *arg)
+{
+ int port_id;
+
+ while (1) {
+ /* blocking call with 1 sec timeout */
+ port_id = rte_eth_control_interface_msg_exist(1);
+ if (port_id < 0)
+ continue;
+
+ lock_port(port_id);
+ rte_eth_control_interface_msg_process(
+ RTE_ETHTOOL_CTRL_IF_PROCESS_MSG);
+ unlock_port(port_id);
+ }
+
+ return 0;
+}
+
int main(int argc, char **argv)
{
int cnt_args_parsed;
uint32_t id_core;
uint32_t cnt_ports;
+ pthread_t control_thread;
/* Init runtime enviornment */
cnt_args_parsed = rte_eal_init(argc, argv);
@@ -293,6 +314,9 @@ int main(int argc, char **argv)
id_core = rte_get_next_lcore(id_core, 1, 1);
rte_eal_remote_launch(slave_main, NULL, id_core);
+ pthread_create(&control_thread, NULL, control_function, NULL);
+ rte_eth_control_interface_create();
+
ethapp_main();
app_cfg.exit_now = 1;
@@ -301,5 +325,8 @@ int main(int argc, char **argv)
return -1;
}
+ rte_eth_control_interface_destroy();
+ pthread_cancel(control_thread);
+
return 0;
}
--
2.5.0
[dpdk-dev] [PATCH v3 2/4] kcp: add kernel control path kernel module
On 3/1/2016 1:02 AM, Stephen Hemminger wrote: > On Fri, 26 Feb 2016 14:10:39 + > Ferruh Yigit wrote: > >> +#define KCP_ERR(args...) printk(KERN_ERR "KCP: " args) >> +#define KCP_INFO(args...) printk(KERN_INFO "KCP: " args) >> + >> +#ifdef RTE_KCP_KO_DEBUG >> +#define KCP_DBG(args...) printk(KERN_DEBUG "KCP: " args) >> +#else >> +#define KCP_DBG(args...) >> +#endif > > These macros will not make netdev developers happy. > > Use standard printk macros, and if you want prefix, use pr_fmt > > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > Hi Stephen, I removed the macros and send a new version of patch set. v4: http://dpdk.org/dev/patchwork/patch/10950/ Thanks, ferruh
[dpdk-dev] [PATCH] app/test: fix qat autotest failure
This patch fix the QAT autotest failure when run for multiple times.
it was caused as mbuf was not freed.
Fixes: 202d375c60b (app/test: add cryptodev unit and performance tests)
This patch depends on following patch:
cryptodev API changes
http://dpdk.org/ml/archives/dev/2016-February/034212.html
Signed-off-by: Deepak Kumar JAIN
---
app/test/test_cryptodev.c | 12
1 file changed, 12 insertions(+)
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 208fc14..acba98a 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -1845,6 +1845,18 @@ test_multi_session(void)
sessions[i], ut_params, ts_params),
"Failed to perform decrypt on request "
"number %u.", i);
+ /* free crypto operation structure */
+ if (ut_params->op)
+ rte_crypto_op_free(ut_params->op);
+
+ /*
+* free mbuf - both obuf and ibuf are usually the same,
+* but rte copes even if we call free twice
+*/
+ if (ut_params->obuf) {
+ rte_pktmbuf_free(ut_params->obuf);
+ ut_params->obuf = 0;
+ }
}
/* Next session create should fail */
--
2.1.0
[dpdk-dev] port 0 is not present on the board
I see that this issue was raised a couple of months ago on this thread (http://dpdk.org/ml/archives/dev/2014-December/010661.html) But seems that the fix on that thread does not work on my DPDK setup using l3fwd application. The full output I'm getting looks as follows. # ./examples/l3fwd/build/l3fwd -c 0x3 -n 2 -- -p 0x3 --config="(0,0,0),(1,0,1)" EAL: Detected lcore 0 as core 0 on socket 0 EAL: Detected lcore 1 as core 1 on socket 0 EAL: Detected lcore 2 as core 2 on socket 0 EAL: Detected lcore 3 as core 3 on socket 0 EAL: Detected lcore 4 as core 4 on socket 0 EAL: Detected lcore 5 as core 5 on socket 0 EAL: Detected lcore 6 as core 6 on socket 0 EAL: Detected lcore 7 as core 7 on socket 0 EAL: Detected lcore 8 as core 8 on socket 0 EAL: Detected lcore 9 as core 9 on socket 0 EAL: Detected lcore 10 as core 10 on socket 0 EAL: Detected lcore 11 as core 11 on socket 0 EAL: Detected lcore 12 as core 12 on socket 0 EAL: Detected lcore 13 as core 13 on socket 0 EAL: Detected lcore 14 as core 14 on socket 0 EAL: Detected lcore 15 as core 15 on socket 0 EAL: Support maximum 128 logical core(s) by configuration. EAL: Detected 16 lcore(s) EAL: VFIO modules not all loaded, skip VFIO support... EAL: Setting up physically contiguous memory... EAL: Ask a virtual area of 0x20 bytes EAL: Virtual area found at 0x7f288040 (size = 0x20) EAL: Ask a virtual area of 0xc40 bytes EAL: Virtual area found at 0x7f2873e0 (size = 0xc40) EAL: Ask a virtual area of 0xc0 bytes EAL: Virtual area found at 0x7f287300 (size = 0xc0) EAL: Ask a virtual area of 0x340 bytes EAL: Virtual area found at 0x7f286fa0 (size = 0x340) EAL: Ask a virtual area of 0x40 bytes EAL: Virtual area found at 0x7f286f40 (size = 0x40) EAL: Ask a virtual area of 0x20 bytes EAL: Virtual area found at 0x7f286f00 (size = 0x20) EAL: Ask a virtual area of 0x140 bytes EAL: Virtual area found at 0x7f286da0 (size = 0x140) EAL: Ask a virtual area of 0xa80 bytes EAL: Virtual area found at 0x7f286300 (size = 0xa80) EAL: Ask a virtual area of 0x20 bytes EAL: Virtual area found at 0x7f2862c0 (size = 0x20) EAL: Ask a virtual area of 0xd680 bytes EAL: Ask a virtual area of 0xd680 bytes EAL: Virtual area found at 0x7f278c20 (size = 0xd680) EAL: Ask a virtual area of 0x200 bytes EAL: Virtual area found at 0x7f278a00 (size = 0x200) EAL: Ask a virtual area of 0x180 bytes EAL: Virtual area found at 0x7f278860 (size = 0x180) EAL: Ask a virtual area of 0x280 bytes EAL: Virtual area found at 0x7f2785c0 (size = 0x280) EAL: Ask a virtual area of 0x100 bytes EAL: Virtual area found at 0x7f2784a0 (size = 0x100) EAL: Ask a virtual area of 0xc0 bytes EAL: Virtual area found at 0x7f2783c0 (size = 0xc0) EAL: Ask a virtual area of 0x40 bytes EAL: Virtual area found at 0x7f278360 (size = 0x40) EAL: Ask a virtual area of 0xc0 bytes EAL: Virtual area found at 0x7f278280 (size = 0xc0) EAL: Ask a virtual area of 0x180 bytes EAL: Virtual area found at 0x7f2780e0 (size = 0x180) EAL: Ask a virtual area of 0x100 bytes EAL: Virtual area found at 0x7f277fc0 (size = 0x100) EAL: Ask a virtual area of 0x40 bytes EAL: Virtual area found at 0x7f277f60 (size = 0x40) EAL: Ask a virtual area of 0x40 bytes EAL: Virtual area found at 0x7f277f00 (size = 0x40) EAL: Ask a virtual area of 0x80 bytes EAL: Virtual area found at 0x7f277e60 (size = 0x80) EAL: Ask a virtual area of 0x40 bytes EAL: Virtual area found at 0x7f277e00 (size = 0x40) EAL: Ask a virtual area of 0x40 bytes EAL: Virtual area found at 0x7f277da0 (size = 0x40) EAL: Ask a virtual area of 0x20 bytes EAL: Virtual area found at 0x7f277d60 (size = 0x20) EAL: Requesting 2048 pages of size 2MB from socket 0 EAL: TSC frequency is ~174 KHz EAL: Master lcore 0 is ready (tid=81d1b8c0;cpuset=[0]) EAL: lcore 1 is ready (tid=7cde7700;cpuset=[1]) EAL: PCI device :01:00.0 on NUMA socket -1 EAL: probe driver: 8086:1572 rte_i40e_pmd EAL: Not managed by a supported kernel driver, skipped EAL: PCI device :01:00.1 on NUMA socket -1 EAL: probe driver: 8086:1572 rte_i40e_pmd EAL: Not managed by a supported kernel driver, skipped port 0 is not present on the board EAL: Error - exiting with code: 1 Cause: check_port_config failed root at host:~ My DPDK version is 2.2.0. Any suggestion or idea to fix the issue would be accepted. EP
[dpdk-dev] port 0 is not present on the board
Did you try to bind nics through /tools/dpdk_nic_bind.py script? Em ter?a-feira, 1 de mar?o de 2016, Posadas, Emerson < emerson.posadas at intel.com> escreveu: > I see that this issue was raised a couple of months ago on this thread ( > http://dpdk.org/ml/archives/dev/2014-December/010661.html) > > But seems that the fix on that thread does not work on my DPDK setup using > l3fwd application. The full output I'm getting looks as follows. > > # ./examples/l3fwd/build/l3fwd -c 0x3 -n 2 -- -p 0x3 > --config="(0,0,0),(1,0,1)" > EAL: Detected lcore 0 as core 0 on socket 0 > EAL: Detected lcore 1 as core 1 on socket 0 > EAL: Detected lcore 2 as core 2 on socket 0 > EAL: Detected lcore 3 as core 3 on socket 0 > EAL: Detected lcore 4 as core 4 on socket 0 > EAL: Detected lcore 5 as core 5 on socket 0 > EAL: Detected lcore 6 as core 6 on socket 0 > EAL: Detected lcore 7 as core 7 on socket 0 > EAL: Detected lcore 8 as core 8 on socket 0 > EAL: Detected lcore 9 as core 9 on socket 0 > EAL: Detected lcore 10 as core 10 on socket 0 > EAL: Detected lcore 11 as core 11 on socket 0 > EAL: Detected lcore 12 as core 12 on socket 0 > EAL: Detected lcore 13 as core 13 on socket 0 > EAL: Detected lcore 14 as core 14 on socket 0 > EAL: Detected lcore 15 as core 15 on socket 0 > EAL: Support maximum 128 logical core(s) by configuration. > EAL: Detected 16 lcore(s) > EAL: VFIO modules not all loaded, skip VFIO support... > EAL: Setting up physically contiguous memory... > EAL: Ask a virtual area of 0x20 bytes > EAL: Virtual area found at 0x7f288040 (size = 0x20) > EAL: Ask a virtual area of 0xc40 bytes > EAL: Virtual area found at 0x7f2873e0 (size = 0xc40) > EAL: Ask a virtual area of 0xc0 bytes > EAL: Virtual area found at 0x7f287300 (size = 0xc0) > EAL: Ask a virtual area of 0x340 bytes > EAL: Virtual area found at 0x7f286fa0 (size = 0x340) > EAL: Ask a virtual area of 0x40 bytes > EAL: Virtual area found at 0x7f286f40 (size = 0x40) > EAL: Ask a virtual area of 0x20 bytes > EAL: Virtual area found at 0x7f286f00 (size = 0x20) > EAL: Ask a virtual area of 0x140 bytes > EAL: Virtual area found at 0x7f286da0 (size = 0x140) > EAL: Ask a virtual area of 0xa80 bytes > EAL: Virtual area found at 0x7f286300 (size = 0xa80) > EAL: Ask a virtual area of 0x20 bytes > EAL: Virtual area found at 0x7f2862c0 (size = 0x20) > EAL: Ask a virtual area of 0xd680 bytes > EAL: Ask a virtual area of 0xd680 bytes > EAL: Virtual area found at 0x7f278c20 (size = 0xd680) > EAL: Ask a virtual area of 0x200 bytes > EAL: Virtual area found at 0x7f278a00 (size = 0x200) > EAL: Ask a virtual area of 0x180 bytes > EAL: Virtual area found at 0x7f278860 (size = 0x180) > EAL: Ask a virtual area of 0x280 bytes > EAL: Virtual area found at 0x7f2785c0 (size = 0x280) > EAL: Ask a virtual area of 0x100 bytes > EAL: Virtual area found at 0x7f2784a0 (size = 0x100) > EAL: Ask a virtual area of 0xc0 bytes > EAL: Virtual area found at 0x7f2783c0 (size = 0xc0) > EAL: Ask a virtual area of 0x40 bytes > EAL: Virtual area found at 0x7f278360 (size = 0x40) > EAL: Ask a virtual area of 0xc0 bytes > EAL: Virtual area found at 0x7f278280 (size = 0xc0) > EAL: Ask a virtual area of 0x180 bytes > EAL: Virtual area found at 0x7f2780e0 (size = 0x180) > EAL: Ask a virtual area of 0x100 bytes > EAL: Virtual area found at 0x7f277fc0 (size = 0x100) > EAL: Ask a virtual area of 0x40 bytes > EAL: Virtual area found at 0x7f277f60 (size = 0x40) > EAL: Ask a virtual area of 0x40 bytes > EAL: Virtual area found at 0x7f277f00 (size = 0x40) > EAL: Ask a virtual area of 0x80 bytes > EAL: Virtual area found at 0x7f277e60 (size = 0x80) > EAL: Ask a virtual area of 0x40 bytes > EAL: Virtual area found at 0x7f277e00 (size = 0x40) > EAL: Ask a virtual area of 0x40 bytes > EAL: Virtual area found at 0x7f277da0 (size = 0x40) > EAL: Ask a virtual area of 0x20 bytes > EAL: Virtual area found at 0x7f277d60 (size = 0x20) > EAL: Requesting 2048 pages of size 2MB from socket 0 > EAL: TSC frequency is ~174 KHz > EAL: Master lcore 0 is ready (tid=81d1b8c0;cpuset=[0]) > EAL: lcore 1 is ready (tid=7cde7700;cpuset=[1]) > EAL: PCI device :01:00.0 on NUMA socket -1 > EAL: probe driver: 8086:1572 rte_i40e_pmd > EAL: Not managed by a supported kernel driver, skipped > EAL: PCI device :01:00.1 on NUMA socket -1 > EAL: probe driver: 8086:1572 rte_i40e_pmd > EAL: Not managed by a supported kernel driver, skipped > port 0 is not present on the board > EAL: Error - exiting with code: 1 > Cause: check_port_config failed > root at host:~ > > My DPDK version is 2.2.0. Any suggestion or idea to fix the issue would be > accepted. > > EP > >
[dpdk-dev] [RFC] avoid testpmd only working in XEN
With LIBRTE_PMD_XENVIRT enabled testpmd is built in a way to ONLY work
in XEN environments.
It will surface as:
PMD: gntalloc: ioctl error
EAL: Error - exiting with code: 1
Cause: Creation of mbuf pool for socket 0 failed
There could be a complex solution checking if this is a Xen env via
something like:
#include
struct xs_handle *xsh = NULL;
xsh = xs_open(XS_OPEN_READONLY);
check for xsh being NULL ...
But I see no reason to go so complex and instead the patch goes the
simple and more readable way of just falling back to the normal
allocation if the xen based allocation failed.
---
app/test-pmd/testpmd.c | 33 -
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 1319917..b008df3 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -410,7 +410,7 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
unsigned int socket_id)
{
char pool_name[RTE_MEMPOOL_NAMESIZE];
- struct rte_mempool *rte_mp;
+ struct rte_mempool *rte_mp = NULL;
uint32_t mb_size;
mb_size = sizeof(struct rte_mbuf) + mbuf_seg_size;
@@ -423,24 +423,23 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
rte_pktmbuf_pool_init, NULL,
rte_pktmbuf_init, NULL,
socket_id, 0);
-
-
-
-#else
- if (mp_anon != 0)
- rte_mp = mempool_anon_create(pool_name, nb_mbuf, mb_size,
- (unsigned) mb_mempool_cache,
- sizeof(struct rte_pktmbuf_pool_private),
- rte_pktmbuf_pool_init, NULL,
- rte_pktmbuf_init, NULL,
- socket_id, 0);
- else
- /* wrapper to rte_mempool_create() */
- rte_mp = rte_pktmbuf_pool_create(pool_name, nb_mbuf,
- mb_mempool_cache, 0, mbuf_seg_size, socket_id);
-
#endif
+ /* if the former XEN allocation failed fall back to normal allocation */
+ if (rte_mp == NULL) {
+ if (mp_anon != 0)
+ rte_mp = mempool_anon_create(pool_name, nb_mbuf,
+ mb_size, (unsigned) mb_mempool_cache,
+ sizeof(struct rte_pktmbuf_pool_private),
+ rte_pktmbuf_pool_init, NULL,
+ rte_pktmbuf_init, NULL,
+ socket_id, 0);
+ else
+ /* wrapper to rte_mempool_create() */
+ rte_mp = rte_pktmbuf_pool_create(pool_name, nb_mbuf,
+ mb_mempool_cache, 0, mbuf_seg_size, socket_id);
+ }
+
if (rte_mp == NULL) {
rte_exit(EXIT_FAILURE, "Creation of mbuf pool for socket %u "
"failed\n", socket_id);
--
2.7.0
[dpdk-dev] port 0 is not present on the board
Hi Victor Yes, the devices are already binded to the DPDK driver: I have just found that my devices are not supported by DPDK, this is probably the reason l3fwd is failing. Thanks anyways EP From: Victor Detoni [mailto:victordet...@gmail.com] Sent: Tuesday, March 1, 2016 10:31 AM To: Posadas, Emerson Cc: dev at dpdk.org Subject: Re: [dpdk-dev] port 0 is not present on the board Did you try to bind nics through /tools/dpdk_nic_bind.py script? Em ter?a-feira, 1 de mar?o de 2016, Posadas, Emerson escreveu: I see that this issue was raised a couple of months ago on this thread (http://dpdk.org/ml/archives/dev/2014-December/010661.html) But seems that the fix on that thread does not work on my DPDK setup using l3fwd application. The full output I'm getting looks as follows. # ./examples/l3fwd/build/l3fwd -c 0x3 -n 2 -- -p 0x3 --config="(0,0,0),(1,0,1)" EAL: Detected lcore 0 as core 0 on socket 0 EAL: Detected lcore 1 as core 1 on socket 0 EAL: Detected lcore 2 as core 2 on socket 0 EAL: Detected lcore 3 as core 3 on socket 0 EAL: Detected lcore 4 as core 4 on socket 0 EAL: Detected lcore 5 as core 5 on socket 0 EAL: Detected lcore 6 as core 6 on socket 0 EAL: Detected lcore 7 as core 7 on socket 0 EAL: Detected lcore 8 as core 8 on socket 0 EAL: Detected lcore 9 as core 9 on socket 0 EAL: Detected lcore 10 as core 10 on socket 0 EAL: Detected lcore 11 as core 11 on socket 0 EAL: Detected lcore 12 as core 12 on socket 0 EAL: Detected lcore 13 as core 13 on socket 0 EAL: Detected lcore 14 as core 14 on socket 0 EAL: Detected lcore 15 as core 15 on socket 0 EAL: Support maximum 128 logical core(s) by configuration. EAL: Detected 16 lcore(s) EAL: VFIO modules not all loaded, skip VFIO support... EAL: Setting up physically contiguous memory... EAL: Ask a virtual area of 0x20 bytes EAL: Virtual area found at 0x7f288040 (size = 0x20) EAL: Ask a virtual area of 0xc40 bytes EAL: Virtual area found at 0x7f2873e0 (size = 0xc40) EAL: Ask a virtual area of 0xc0 bytes EAL: Virtual area found at 0x7f287300 (size = 0xc0) EAL: Ask a virtual area of 0x340 bytes EAL: Virtual area found at 0x7f286fa0 (size = 0x340) EAL: Ask a virtual area of 0x40 bytes EAL: Virtual area found at 0x7f286f40 (size = 0x40) EAL: Ask a virtual area of 0x20 bytes EAL: Virtual area found at 0x7f286f00 (size = 0x20) EAL: Ask a virtual area of 0x140 bytes EAL: Virtual area found at 0x7f286da0 (size = 0x140) EAL: Ask a virtual area of 0xa80 bytes EAL: Virtual area found at 0x7f286300 (size = 0xa80) EAL: Ask a virtual area of 0x20 bytes EAL: Virtual area found at 0x7f2862c0 (size = 0x20) EAL: Ask a virtual area of 0xd680 bytes EAL: Ask a virtual area of 0xd680 bytes EAL: Virtual area found at 0x7f278c20 (size = 0xd680) EAL: Ask a virtual area of 0x200 bytes EAL: Virtual area found at 0x7f278a00 (size = 0x200) EAL: Ask a virtual area of 0x180 bytes EAL: Virtual area found at 0x7f278860 (size = 0x180) EAL: Ask a virtual area of 0x280 bytes EAL: Virtual area found at 0x7f2785c0 (size = 0x280) EAL: Ask a virtual area of 0x100 bytes EAL: Virtual area found at 0x7f2784a0 (size = 0x100) EAL: Ask a virtual area of 0xc0 bytes EAL: Virtual area found at 0x7f2783c0 (size = 0xc0) EAL: Ask a virtual area of 0x40 bytes EAL: Virtual area found at 0x7f278360 (size = 0x40) EAL: Ask a virtual area of 0xc0 bytes EAL: Virtual area found at 0x7f278280 (size = 0xc0) EAL: Ask a virtual area of 0x180 bytes EAL: Virtual area found at 0x7f2780e0 (size = 0x180) EAL: Ask a virtual area of 0x100 bytes EAL: Virtual area found at 0x7f277fc0 (size = 0x100) EAL: Ask a virtual area of 0x40 bytes EAL: Virtual area found at 0x7f277f60 (size = 0x40) EAL: Ask a virtual area of 0x40 bytes EAL: Virtual area found at 0x7f277f00 (size = 0x40) EAL: Ask a virtual area of 0x80 bytes EAL: Virtual area found at 0x7f277e60 (size = 0x80) EAL: Ask a virtual area of 0x40 bytes EAL: Virtual area found at 0x7f277e00 (size = 0x40) EAL: Ask a virtual area of 0x40 bytes EAL: Virtual area found at 0x7f277da0 (size = 0x40) EAL: Ask a virtual area of 0x20 bytes EAL: Virtual area found at 0x7f277d60 (size = 0x20) EAL: Requesting 2048 pages of size 2MB from socket 0 EAL: TSC frequency is ~174 KHz EAL: Master lcore 0 is ready (tid=81d1b8c0;cpuset=[0]) EAL: lcore 1 is ready (tid=7cde7700;cpuset=[1]) EAL: PCI device :01:00.0 on NUMA socket -1 EAL:? ?probe driver: 8086:1572 rte_i40e_pmd EAL:? ?Not managed by a supported kernel driver, skipped EAL: PCI device :01:00.1 on NUMA socket -1 EAL:? ?probe driver: 8086:1572 rte_i40e_pmd EAL:? ?Not managed by a supported kernel driver, skipped port 0 is not present on the board EAL: Error - exiting with code: 1 ? Cause: check_port_config failed root at hos
[dpdk-dev] [PATCH v4 0/4] DPDK polling-mode driver for Amazon Elastic Network Adapters (ENA
This drop includes additional features for Amazon ENA: * Low Latenycy Queue (LLQ) for Tx * RSS and resolved previous issues: * Improved doc * Improved style according to checkpatch script * Fixed build problems on: i686, clang, +shared, +debug Jan Medala (4): ena: Amazon ENA documentation ena: Amazon ENA communication layer ena: Amazon ENA communication layer for DPDK platform ena: DPDK polling-mode driver for Amazon Elastic Network Adapters (ENA) MAINTAINERS|8 + config/common_linuxapp | 11 + doc/guides/nics/ena.rst| 252 ++ doc/guides/nics/index.rst |1 + drivers/net/Makefile |1 + drivers/net/ena/Makefile | 65 + drivers/net/ena/base/ena_com.c | 2750 drivers/net/ena/base/ena_com.h | 1038 drivers/net/ena/base/ena_defs/ena_admin_defs.h | 1714 .../net/ena/base/ena_defs/ena_admin_defs_custom.h | 40 + drivers/net/ena/base/ena_defs/ena_common_defs.h| 54 + drivers/net/ena/base/ena_defs/ena_eth_io_defs.h| 1143 drivers/net/ena/base/ena_defs/ena_gen_info.h | 35 + drivers/net/ena/base/ena_defs/ena_includes.h | 39 + drivers/net/ena/base/ena_defs/ena_regs_defs.h | 326 +++ drivers/net/ena/base/ena_eth_com.c | 506 drivers/net/ena/base/ena_eth_com.h | 154 ++ drivers/net/ena/base/ena_plat.h| 51 + drivers/net/ena/base/ena_plat_dpdk.h | 208 ++ drivers/net/ena/ena_ethdev.c | 1311 ++ drivers/net/ena/ena_ethdev.h | 155 ++ drivers/net/ena/ena_logs.h | 74 + drivers/net/ena/ena_platform.h | 58 + drivers/net/ena/rte_pmd_ena_version.map|4 + mk/rte.app.mk |1 + 25 files changed, insertions(+) create mode 100644 doc/guides/nics/ena.rst create mode 100644 drivers/net/ena/Makefile create mode 100644 drivers/net/ena/base/ena_com.c create mode 100644 drivers/net/ena/base/ena_com.h create mode 100644 drivers/net/ena/base/ena_defs/ena_admin_defs.h create mode 100644 drivers/net/ena/base/ena_defs/ena_admin_defs_custom.h create mode 100644 drivers/net/ena/base/ena_defs/ena_common_defs.h create mode 100644 drivers/net/ena/base/ena_defs/ena_eth_io_defs.h create mode 100644 drivers/net/ena/base/ena_defs/ena_gen_info.h create mode 100644 drivers/net/ena/base/ena_defs/ena_includes.h create mode 100644 drivers/net/ena/base/ena_defs/ena_regs_defs.h create mode 100644 drivers/net/ena/base/ena_eth_com.c create mode 100644 drivers/net/ena/base/ena_eth_com.h create mode 100644 drivers/net/ena/base/ena_plat.h create mode 100644 drivers/net/ena/base/ena_plat_dpdk.h create mode 100644 drivers/net/ena/ena_ethdev.c create mode 100644 drivers/net/ena/ena_ethdev.h create mode 100644 drivers/net/ena/ena_logs.h create mode 100644 drivers/net/ena/ena_platform.h create mode 100644 drivers/net/ena/rte_pmd_ena_version.map -- 1.9.1
[dpdk-dev] [PATCH v4 1/4] ena: Amazon ENA documentation
Signed-off-by: Evgeny Schemeilin Signed-off-by: Alexander Matushevsky Signed-off-by: Jan Medala Signed-off-by: Jakub Palider --- MAINTAINERS | 8 ++ doc/guides/nics/ena.rst | 252 ++ doc/guides/nics/index.rst | 1 + 3 files changed, 261 insertions(+) create mode 100644 doc/guides/nics/ena.rst diff --git a/MAINTAINERS b/MAINTAINERS index 628bc05..d6a726d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -261,6 +261,14 @@ Linux AF_PACKET M: John W. Linville F: drivers/net/af_packet/ +Amazon ena +M: Jan Medala +M: Jakub Palider +M: Netanel Belgazal +M: Evgeny Schemeilin +F: drivers/net/ena/ +F: doc/guides/nics/ena.rst + Chelsio cxgbe M: Rahul Lakkireddy F: drivers/net/cxgbe/ diff --git a/doc/guides/nics/ena.rst b/doc/guides/nics/ena.rst new file mode 100644 index 000..11bd922 --- /dev/null +++ b/doc/guides/nics/ena.rst @@ -0,0 +1,252 @@ +.. BSD LICENSE + +Copyright (c) 2015-2016 Amazon.com, Inc. or its affiliates. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +* Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in +the documentation and/or other materials provided with the +distribution. +* Neither the name of Amazon.com, Inc. nor the names of its +contributors may be used to endorse or promote products derived +from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +ENA Poll Mode Driver + + +The ENA PMD is a DPDK poll-mode driver for the Amazon Elastic +Network Adapter (ENA) family. + +Overview + + +The ENA driver exposes a lightweight management interface with a +minimal set of memory mapped registers and an extendable command set +through an Admin Queue. + +The driver supports a wide range of ENA adapters, is link-speed +independent (i.e., the same driver is used for 10GbE, 25GbE, 40GbE, +etc.), and it negotiates and supports an extendable feature set. + +ENA adapters allow high speed and low overhead Ethernet traffic +processing by providing a dedicated Tx/Rx queue pair per CPU core. + +The ENA driver supports industry standard TCP/IP offload features such +as checksum offload and TCP transmit segmentation offload (TSO). + +Receive-side scaling (RSS) is supported for multi-core scaling. + +Some of the ENA devices support a working mode called Low-latency +Queue (LLQ), which saves several more microseconds. + +Management Interface + + +ENA management interface is exposed by means of: + +* Device Registers +* Admin Queue (AQ) and Admin Completion Queue (ACQ) + +ENA device memory-mapped PCIe space for registers (MMIO registers) +are accessed only during driver initialization and are not involved +in further normal device operation. + +AQ is used for submitting management commands, and the +results/responses are reported asynchronously through ACQ. + +ENA introduces a very small set of management commands with room for +vendor-specific extensions. Most of the management operations are +framed in a generic Get/Set feature command. + +The following admin queue commands are supported: + +* Create I/O submission queue +* Create I/O completion queue +* Destroy I/O submission queue +* Destroy I/O completion queue +* Get feature +* Set feature +* Get statistics + +Refer to ``ena_admin_defs.h`` for the list of supported Get/Set Feature +properties. + +Data Path Interface +--- + +I/O operations are based on Tx and Rx Submission Queues (Tx SQ and Rx +SQ correspondingly). Each SQ has a completion queue (CQ) associated +with it. + +The SQs and CQs are implemented as descriptor rings in contiguous +physical memory. + +Refer to ``ena_eth_io_defs.h`` for the detailed structure of the descriptor + +The driver supports multi-queue for both Tx and Rx. + +Configuration information +---
[dpdk-dev] [PATCH v4 2/4] ena: Amazon ENA communication layer
Low level common abstraction for ENA device communication.
Signed-off-by: Netanel Belgazal
Signed-off-by: Jan Medala
Signed-off-by: Jakub Palider
---
drivers/net/ena/base/ena_com.c | 2750
drivers/net/ena/base/ena_com.h | 1038
drivers/net/ena/base/ena_defs/ena_admin_defs.h | 1714
.../net/ena/base/ena_defs/ena_admin_defs_custom.h | 40 +
drivers/net/ena/base/ena_defs/ena_common_defs.h| 54 +
drivers/net/ena/base/ena_defs/ena_eth_io_defs.h| 1143
drivers/net/ena/base/ena_defs/ena_gen_info.h | 35 +
drivers/net/ena/base/ena_defs/ena_includes.h | 39 +
drivers/net/ena/base/ena_defs/ena_regs_defs.h | 326 +++
drivers/net/ena/base/ena_eth_com.c | 506
drivers/net/ena/base/ena_eth_com.h | 154 ++
drivers/net/ena/base/ena_plat.h| 51 +
12 files changed, 7850 insertions(+)
create mode 100644 drivers/net/ena/base/ena_com.c
create mode 100644 drivers/net/ena/base/ena_com.h
create mode 100644 drivers/net/ena/base/ena_defs/ena_admin_defs.h
create mode 100644 drivers/net/ena/base/ena_defs/ena_admin_defs_custom.h
create mode 100644 drivers/net/ena/base/ena_defs/ena_common_defs.h
create mode 100644 drivers/net/ena/base/ena_defs/ena_eth_io_defs.h
create mode 100644 drivers/net/ena/base/ena_defs/ena_gen_info.h
create mode 100644 drivers/net/ena/base/ena_defs/ena_includes.h
create mode 100644 drivers/net/ena/base/ena_defs/ena_regs_defs.h
create mode 100644 drivers/net/ena/base/ena_eth_com.c
create mode 100644 drivers/net/ena/base/ena_eth_com.h
create mode 100644 drivers/net/ena/base/ena_plat.h
diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c
new file mode 100644
index 000..93cab5b
--- /dev/null
+++ b/drivers/net/ena/base/ena_com.c
@@ -0,0 +1,2750 @@
+/*-
+* BSD LICENSE
+*
+* Copyright (c) 2015-2016 Amazon.com, Inc. or its affiliates.
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+*
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in
+* the documentation and/or other materials provided with the
+* distribution.
+* * Neither the name of copyright holder nor the names of its
+* contributors may be used to endorse or promote products derived
+* from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "ena_com.h"
+
+/*/
+/*/
+
+/* Timeout in micro-sec */
+#define ADMIN_CMD_TIMEOUT_US (100)
+
+#define ENA_ASYNC_QUEUE_DEPTH 4
+#define ENA_ADMIN_QUEUE_DEPTH 32
+
+#define ENA_EXTENDED_STAT_GET_FUNCT(_funct_queue) (_funct_queue & 0x)
+#define ENA_EXTENDED_STAT_GET_QUEUE(_funct_queue) (_funct_queue >> 16)
+
+#define MIN_ENA_VER (((ENA_COMMON_SPEC_VERSION_MAJOR) << \
+ ENA_REGS_VERSION_MAJOR_VERSION_SHIFT) \
+ | (ENA_COMMON_SPEC_VERSION_MINOR))
+
+#define ENA_CTRL_MAJOR 0
+#define ENA_CTRL_MINOR 0
+#define ENA_CTRL_SUB_MINOR 1
+
+#define MIN_ENA_CTRL_VER \
+ (((ENA_CTRL_MAJOR) << \
+ (ENA_REGS_CONTROLLER_VERSION_MAJOR_VERSION_SHIFT)) | \
+ ((ENA_CTRL_MINOR) << \
+ (ENA_REGS_CONTROLLER_VERSION_MINOR_VERSION_SHIFT)) | \
+ (ENA_CTRL_SUB_MINOR))
+
+#define ENA_DMA_ADDR_TO_UINT32_LOW(x) ((u32)((u64)(x)))
+#define ENA_DMA_ADDR_TO_UINT32_HIGH(x) ((u32)(((u64)(x)) >> 32))
+
+#define ENA_MMIO_READ_TIMEOUT 0x
+
+static int ena_alloc_cnt = 0;
+
+/*/
+/*/
+/*/
+
+enum ena_cmd_status {
+ ENA_CMD_S
[dpdk-dev] [PATCH v4 3/4] ena: Amazon ENA communication layer for DPDK platform
Implementation of platform specific code for ENA communication layer.
Signed-off-by: Evgeny Schemeilin
Signed-off-by: Jan Medala
Signed-off-by: Jakub Palider
---
drivers/net/ena/base/ena_plat_dpdk.h | 208 +++
1 file changed, 208 insertions(+)
create mode 100644 drivers/net/ena/base/ena_plat_dpdk.h
diff --git a/drivers/net/ena/base/ena_plat_dpdk.h
b/drivers/net/ena/base/ena_plat_dpdk.h
new file mode 100644
index 000..2d245ab
--- /dev/null
+++ b/drivers/net/ena/base/ena_plat_dpdk.h
@@ -0,0 +1,208 @@
+/*-
+* BSD LICENSE
+*
+* Copyright (c) 2015-2016 Amazon.com, Inc. or its affiliates.
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+*
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in
+* the documentation and/or other materials provided with the
+* distribution.
+* * Neither the name of copyright holder nor the names of its
+* contributors may be used to endorse or promote products derived
+* from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef DPDK_ENA_COM_ENA_PLAT_DPDK_H_
+#define DPDK_ENA_COM_ENA_PLAT_DPDK_H_
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+typedef rte_atomic32_t ena_atomic32_t;
+
+typedef uint64_t u64;
+typedef uint32_t u32;
+typedef uint16_t u16;
+typedef uint8_t u8;
+
+typedef uint64_t dma_addr_t;
+typedef void *ena_mem_handle_t;
+
+#define SZ_4K 4096
+
+#defineENA_COM_OK 0
+#defineENA_COM_NO_MEM -ENOMEM
+#defineENA_COM_INVAL -EINVAL
+#defineENA_COM_NO_SPACE -ENOSPC
+#defineENA_COM_NO_DEVICE -ENODEV
+#defineENA_COM_PERMISSION -EPERM
+#defineENA_COM_TIMER_EXPIRED -ETIME
+#define ENA_COM_FAULT -EFAULT
+
+#define cacheline_aligned __rte_cache_aligned
+
+#define ENA_ABORT() abort()
+
+#define ENA_MSLEEP(x) rte_delay_ms(x)
+#define ENA_UDELAY(x) rte_delay_us(x)
+
+#define memcpy_toio memcpy
+#define wmb rte_wmb
+#define rmb rte_wmb
+#define mb rte_mb
+
+#define US_PER_S 100
+#define ENA_GET_SYSTEM_USECS() \
+ (rte_get_timer_cycles() * US_PER_S / rte_get_timer_hz())
+
+#define ENA_ASSERT(cond, format, arg...) \
+ do {\
+ if (unlikely(!(cond))) {\
+ printf("Assertion failed on %s:%s:%d:" format, \
+ __FILE__, __func__, __LINE__, ##arg);
\
+ rte_exit(EXIT_FAILURE, "ASSERTION FAILED\n");
\
+ } \
+ } while (0)
+
+#define max_t(type, x, y) ({ \
+ type __max1 = (x); \
+ type __max2 = (y); \
+ __max1 > __max2 ? __max1 : __max2; })
+
+#define ENA_MAX32(x, y) max_t(u32, (x), (y))
+#define ENA_MAX16(x, y) max_t(u16, (x), (y))
+#define ENA_MAX8(x, y) max_t(u8, (x), (y))
+
+#define U64_C(x) x ## ULL
+#define BIT(nr) (1UL << (nr))
+#define BITS_PER_LONG (__SIZEOF_LONG__ * 8)
+#define GENMASK(h, l) (((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h
+#define GENMASK_ULL(h, l) (((U64_C(1) << ((h) - (l) + 1)) - 1) << (l))
+
+#ifdef RTE_LIBRTE_ENA_COM_DEBUG
+#define ena_trc_dbg(format, arg...)\
+ RTE_LOG(DEBUG, PMD, "[ENA_COM: %s] " format, __func__, ##arg)
+#define ena_trc_info(format, arg...) \
+ RTE_LOG(INFO, PMD, "[ENA_COM: %s] " format, __func__, ##arg)
+#define ena_trc_warn(format, arg...) \
+ RTE_LOG(ERR, PMD, "[ENA_COM: %s] " format, __func__, ##arg)
+#define ena_trc_err(format, arg...)\
+ RTE_LOG(ERR, PMD, "[ENA_COM: %s] " format, __func__, ##arg)
+#else
+#define ena_trc_dbg(format, arg...) do { } while (0)
+#
[dpdk-dev] [PATCH v4 4/4] ena: DPDK polling-mode driver for Amazon Elastic Network Adapters (ENA)
This is a PMD for the Amazon ethernet ENA family. The driver operates variety of ENA adapters through feature negotiation with the adapter and upgradable commands set. ENA driver handles PCI Physical and Virtual ENA functions. Signed-off-by: Evgeny Schemeilin Signed-off-by: Jan Medala Signed-off-by: Jakub Palider --- config/common_linuxapp | 11 + drivers/net/Makefile|1 + drivers/net/ena/Makefile| 65 ++ drivers/net/ena/ena_ethdev.c| 1311 +++ drivers/net/ena/ena_ethdev.h| 155 drivers/net/ena/ena_logs.h | 74 ++ drivers/net/ena/ena_platform.h | 58 ++ drivers/net/ena/rte_pmd_ena_version.map |4 + mk/rte.app.mk |1 + 9 files changed, 1680 insertions(+) create mode 100644 drivers/net/ena/Makefile create mode 100644 drivers/net/ena/ena_ethdev.c create mode 100644 drivers/net/ena/ena_ethdev.h create mode 100644 drivers/net/ena/ena_logs.h create mode 100644 drivers/net/ena/ena_platform.h create mode 100644 drivers/net/ena/rte_pmd_ena_version.map diff --git a/config/common_linuxapp b/config/common_linuxapp index f1638db..a7c424a 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -243,6 +243,17 @@ CONFIG_RTE_LIBRTE_CXGBE_DEBUG_TX=n CONFIG_RTE_LIBRTE_CXGBE_DEBUG_RX=n # +# Compile burst-oriented Amazon ENA PMD driver +# +CONFIG_RTE_LIBRTE_ENA_PMD=y +CONFIG_RTE_LIBRTE_ENA_DEBUG_INIT=y +CONFIG_RTE_LIBRTE_ENA_DEBUG_RX=n +CONFIG_RTE_LIBRTE_ENA_DEBUG_TX=n +CONFIG_RTE_LIBRTE_ENA_DEBUG_TX_FREE=n +CONFIG_RTE_LIBRTE_ENA_DEBUG_DRIVER=n +CONFIG_RTE_LIBRTE_ENA_COM_DEBUG=n + +# # Compile burst-oriented Cisco ENIC PMD driver # CONFIG_RTE_LIBRTE_ENIC_PMD=y diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 6e4497e..8f2649f 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -36,6 +36,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bonding DIRS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000 +DIRS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e diff --git a/drivers/net/ena/Makefile b/drivers/net/ena/Makefile new file mode 100644 index 000..0beb850 --- /dev/null +++ b/drivers/net/ena/Makefile @@ -0,0 +1,65 @@ +# +# BSD LICENSE +# +# Copyright (c) 2015-2016 Amazon.com, Inc. or its affiliates. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of copyright holder nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +include $(RTE_SDK)/mk/rte.vars.mk + +# +# library name +# +LIB = librte_pmd_ena.a +CFLAGS += $(WERROR_FLAGS) -O2 +INCLUDES :=-I$(SRCDIR) -I$(SRCDIR)/base/ena_defs -I$(SRCDIR)/base + +EXPORT_MAP := rte_pmd_ena_version.map +LIBABIVER := 1 + +VPATH += $(SRCDIR)/base +# +# all source are stored in SRCS-y +# +SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_ethdev.c +SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_com.c +SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_eth_com.c + +# this lib depends upon: +DEPDIRS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += lib/librte_eal lib/librte_ether +DEPDIRS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += lib/librte_mempool lib/librte_mbuf +DEPDIRS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += lib/librte_net lib/librte_malloc + +ifeq ($(CONFIG_RTE_EXEC_ENV),"cvos") +CFLAGS += -Wno-old-style-definition +endif + +CFLAGS += $(INCLUDES) + +include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c n
[dpdk-dev] rte_mbuf's packet_type field
Hi, I have a quick question about this field: how do I know if the underlying PMD supports a particular protocol parsing. Let's say I want to check for SCTP packets, looking at this field tells me EITHER the packet is SCTP (or not), OR that the hardware has no idea about SCTP. Is there a way to figure that support out? Zoli
[dpdk-dev] port 0 is not present on the board
> -Original Message- > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Posadas, Emerson > Sent: Tuesday, March 01, 2016 4:43 PM > To: Victor Detoni > Cc: dev at dpdk.org > Subject: Re: [dpdk-dev] port 0 is not present on the board > > Hi Victor > > Yes, the devices are already binded to the DPDK driver: > > I have just found that my devices are not supported by DPDK, this is probably > the reason l3fwd is failing. Could you share the output of the script? ./tools/dpdk_nic_bind.py --status Which NIC you are trying to use? It looks like you have 2 X710 ports that are supported by DPDK, but they are not bound to igb_uio. Thanks, Pablo > > Thanks anyways > > EP >
[dpdk-dev] [PATCH] app/test: fix qat autotest failure
> -Original Message-
> From: Jain, Deepak K
> Sent: Tuesday, March 01, 2016 4:55 PM
> To: dev at dpdk.org
> Cc: Griffin, John; Trahe, Fiona; Jain, Deepak K
> Subject: [PATCH] app/test: fix qat autotest failure
>
> This patch fix the QAT autotest failure when run for multiple times.
> it was caused as mbuf was not freed.
>
> Fixes: 202d375c60b (app/test: add cryptodev unit and performance tests)
>
> This patch depends on following patch:
> cryptodev API changes
> http://dpdk.org/ml/archives/dev/2016-February/034212.html
>
> Signed-off-by: Deepak Kumar JAIN
> ---
> app/test/test_cryptodev.c | 12
> 1 file changed, 12 insertions(+)
>
> diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index
> 208fc14..acba98a 100644
> --- a/app/test/test_cryptodev.c
> +++ b/app/test/test_cryptodev.c
> @@ -1845,6 +1845,18 @@ test_multi_session(void)
> sessions[i], ut_params, ts_params),
> "Failed to perform decrypt on request "
> "number %u.", i);
> + /* free crypto operation structure */
> + if (ut_params->op)
> + rte_crypto_op_free(ut_params->op);
> +
> + /*
> + * free mbuf - both obuf and ibuf are usually the same,
> + * but rte copes even if we call free twice
> + */
> + if (ut_params->obuf) {
> + rte_pktmbuf_free(ut_params->obuf);
> + ut_params->obuf = 0;
> + }
> }
>
> /* Next session create should fail */
> --
> 2.1.0
Acked-by: Fiona Trahe
[dpdk-dev] [PATCH V3 0/4] bonding: fixes and enhancements
These are bug fixes and some small enhancements to allow bonding to work with external control (teamd). Please consider integrating these into DPDK 2.2 Changes in v2: - remove "bond: handle slaves with fewer queues than bonding device" - remove "bond: per-slave intermediate rx ring" Changes in v3: This version has only fixes. Patches with new functionality have been removed and will be submitted separately. - remove "bond mode 4: allow external state machine" - remove "bond: use existing enslaved device queues" Eric Kinzie (4): bond mode 4: copy entire config structure bond mode 4: do not ignore multicast bond: active slaves with no primary bond: do not activate slave twice app/test/test_link_bonding_mode4.c| 7 +-- drivers/net/bonding/rte_eth_bond_8023ad.c | 1 + drivers/net/bonding/rte_eth_bond_api.c| 13 +++-- drivers/net/bonding/rte_eth_bond_pmd.c| 1 + 4 files changed, 18 insertions(+), 4 deletions(-) -- 2.1.4
[dpdk-dev] [PATCH V3 1/4] bond mode 4: copy entire config structure
From: Eric Kinzie
Copy all needed fields from the mode8023ad_private structure in
bond_mode_8023ad_conf_get(). This help ensure that a subsequent call
to rte_eth_bond_8023ad_setup() is not passed uninitialized data that
would result in either incorrect behavior or a failed sanity check.
Fixes: 46fb43683679 ("bond: add mode 4")
Signed-off-by: Eric Kinzie
Signed-off-by: Stephen Hemminger
Acked-by: Declan Doherty
---
drivers/net/bonding/rte_eth_bond_8023ad.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c
b/drivers/net/bonding/rte_eth_bond_8023ad.c
index b3b30f6..1b7e93a 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -1019,6 +1019,7 @@ bond_mode_8023ad_conf_get(struct rte_eth_dev *dev,
conf->aggregate_wait_timeout_ms = mode4->aggregate_wait_timeout /
ms_ticks;
conf->tx_period_ms = mode4->tx_period_timeout / ms_ticks;
conf->update_timeout_ms = mode4->update_timeout_us / 1000;
+ conf->rx_marker_period_ms = mode4->rx_marker_timeout / ms_ticks;
}
void
--
2.1.4
[dpdk-dev] [PATCH V3 2/4] bond mode 4: do not ignore multicast
From: Eric Kinzie
The bonding PMD in mode 4 puts all enslaved interfaces into promiscuous
mode in order to receive LACPDUs and must filter unwanted packets
after the traffic has been "collected". Allow broadcast and multicast
through so that ARP and IPv6 neighbor discovery continue to work.
Fixes: 46fb43683679 ("bond: add mode 4")
Signed-off-by: Eric Kinzie
Signed-off-by: Stephen Hemminger
Acked-by: Declan Doherty
---
app/test/test_link_bonding_mode4.c | 7 +--
drivers/net/bonding/rte_eth_bond_pmd.c | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/test/test_link_bonding_mode4.c
b/app/test/test_link_bonding_mode4.c
index 713368d..31640cd 100644
--- a/app/test/test_link_bonding_mode4.c
+++ b/app/test/test_link_bonding_mode4.c
@@ -747,8 +747,11 @@ test_mode4_rx(void)
rte_eth_macaddr_get(test_params.bonded_port_id, &bonded_mac);
ether_addr_copy(&bonded_mac, &dst_mac);
- /* Assert that dst address is not bonding address */
- dst_mac.addr_bytes[0]++;
+ /* Assert that dst address is not bonding address. Do not set the
+* least significant bit of the zero byte as this would create a
+* multicast address.
+*/
+ dst_mac.addr_bytes[0] += 2;
/* First try with promiscuous mode enabled.
* Add 2 packets to each slave. First with bonding MAC address, second
with
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
b/drivers/net/bonding/rte_eth_bond_pmd.c
index b63c886..011150a 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -171,6 +171,7 @@ bond_ethdev_rx_burst_8023ad(void *queue, struct rte_mbuf
**bufs,
* mode and packet address does not match. */
if (unlikely(hdr->ether_type == ether_type_slow_be ||
!collecting || (!promisc &&
+ !is_multicast_ether_addr(&hdr->d_addr)
&&
!is_same_ether_addr(&bond_mac,
&hdr->d_addr {
if (hdr->ether_type == ether_type_slow_be) {
--
2.1.4
[dpdk-dev] [PATCH V3 3/4] bond: active slaves with no primary
From: Eric Kinzie
If the link state of a slave is "up" when added, it is added to the list
of active slaves but, even if it is the only slave, is not selected as
the primary interface. Generally, handling of link state interrupts
selects an interface to be primary, but only if the active count is zero.
This change avoids the situation where there are active slaves but
no primary.
Fixes: 2efb58cbab6e ("bond: new link bonding library")
Signed-off-by: Eric Kinzie
Signed-off-by: Stephen Hemminger
Acked-by: Declan Doherty
---
drivers/net/bonding/rte_eth_bond_api.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/bonding/rte_eth_bond_api.c
b/drivers/net/bonding/rte_eth_bond_api.c
index 8a000c8..630a461 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -427,8 +427,13 @@ __eth_bond_slave_add_lock_free(uint8_t bonded_port_id,
uint8_t slave_port_id)
if (bonded_eth_dev->data->dev_started) {
rte_eth_link_get_nowait(slave_port_id, &link_props);
-if (link_props.link_status == 1)
+if (link_props.link_status == 1) {
+ if (internals->active_slave_count == 0 &&
+ !internals->user_defined_primary_port)
+ bond_ethdev_primary_set(internals,
+ slave_port_id);
activate_slave(bonded_eth_dev, slave_port_id);
+ }
}
return 0;
--
2.1.4
