[dpdk-dev] [PATCH 0/2] NSH packet type support in i40e
NSH packet can be recognized by Intel X710/XL710 series. This patch set enables it. Jingjing Wu (2): mbuf: new NSH packet type i40e: NSH packet type support app/test-pmd/rxonly.c | 3 +++ doc/guides/rel_notes/release_16_07.rst | 2 ++ drivers/net/i40e/i40e_rxtx.c | 27 +++ lib/librte_mbuf/rte_mbuf.h | 7 +++ 4 files changed, 39 insertions(+) -- 2.4.0
[dpdk-dev] [PATCH 1/2] mbuf: new NSH packet type
Signed-off-by: Jingjing Wu
---
lib/librte_mbuf/rte_mbuf.h | 7 +++
1 file changed, 7 insertions(+)
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 529debb..79edae3 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -274,6 +274,13 @@ extern "C" {
*/
#define RTE_PTYPE_L2_ETHER_LLDP 0x0004
/**
+ * NSH (Network Service Header) packet type.
+ *
+ * Packet format:
+ * <'ether type'=0x894F>
+ */
+#define RTE_PTYPE_L2_ETHER_NSH 0x0005
+/**
* Mask of layer 2 packet types.
* It is used for outer packet for tunneling cases.
*/
--
2.4.0
[dpdk-dev] [PATCH 2/2] i40e: NSH packet type support
NSH packet can be recognized by Intel X710/XL710 series. This
patch enables the new packet type.
Signed-off-by: Jingjing Wu
---
app/test-pmd/rxonly.c | 3 +++
doc/guides/rel_notes/release_16_07.rst | 2 ++
drivers/net/i40e/i40e_rxtx.c | 27 +++
3 files changed, 32 insertions(+)
diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c
index 14555ab..5f3c2c0 100644
--- a/app/test-pmd/rxonly.c
+++ b/app/test-pmd/rxonly.c
@@ -179,6 +179,9 @@ pkt_burst_receive(struct fwd_stream *fs)
case RTE_PTYPE_L2_ETHER_LLDP:
printf(" - (outer) L2 type: ETHER_LLDP");
break;
+ case RTE_PTYPE_L2_ETHER_NSH:
+ printf(" - (outer) L2 type: ETHER_NSH");
+ break;
default:
printf(" - (outer) L2 type: Unknown");
break;
diff --git a/doc/guides/rel_notes/release_16_07.rst
b/doc/guides/rel_notes/release_16_07.rst
index 83c841b..3742b90 100644
--- a/doc/guides/rel_notes/release_16_07.rst
+++ b/doc/guides/rel_notes/release_16_07.rst
@@ -34,6 +34,8 @@ This section should contain new features added in this
release. Sample format:
Refer to the previous release notes for examples.
+* **Added NSH packet recognition in i40e.**
+
Resolved Issues
---
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 4d35d83..a7fc785 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -719,6 +719,33 @@ i40e_rxd_pkt_type_mapping(uint8_t ptype)
RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
RTE_PTYPE_INNER_L4_ICMP,
+ /* L2 NSH packet type */
+ [154] = RTE_PTYPE_L2_ETHER_NSH,
+ [155] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+ RTE_PTYPE_L4_FRAG,
+ [156] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+ RTE_PTYPE_L4_NONFRAG,
+ [157] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+ RTE_PTYPE_L4_UDP,
+ [158] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+ RTE_PTYPE_L4_TCP,
+ [159] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+ RTE_PTYPE_L4_SCTP,
+ [160] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+ RTE_PTYPE_L4_ICMP,
+ [161] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+ RTE_PTYPE_L4_FRAG,
+ [162] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+ RTE_PTYPE_L4_NONFRAG,
+ [163] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+ RTE_PTYPE_L4_UDP,
+ [164] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+ RTE_PTYPE_L4_TCP,
+ [165] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+ RTE_PTYPE_L4_SCTP,
+ [166] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+ RTE_PTYPE_L4_ICMP,
+
/* All others reserved */
};
--
2.4.0
[dpdk-dev] [PATCH v2 1/4] ixgbe: rearrange vector PMD code for x86
Ping, please review this updated version... On 26 April 2016 at 21:50, Jianbo Liu wrote: > move common code to new file "ixgbe_rxtx_vec_common.h", > and vPMD for x86 is implemented in ixgbe_rxtx_vec.c > > Signed-off-by: Jianbo Liu > Suggested-by: Bruce Richardson > --- > drivers/net/ixgbe/ixgbe_rxtx_vec.c| 256 +-- > drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 325 > ++ > 2 files changed, 333 insertions(+), 248 deletions(-) > create mode 100644 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h >
[dpdk-dev] [PATCH v2] virtio: fix modify drv_flags for specific device
Hello Tan, On Thu, Apr 28, 2016 at 8:08 PM, Jianfeng Tan wrote: > Issue: virtio's drv_flags are decided by devices types (modern vs legacy), > and which kernel driver is used, and the negotiated features (especially > VIRTIO_NET_STATUS) with backend, which makes it possible to multiple > virtio devices have different versions of drv_flags, but this variable > is currently shared by each virtio device. The wording is a bit strange, maybe the sentence is a bit too long. But the rest looks good to me. Acked-by: David Marchand -- David Marchand
[dpdk-dev] [PATCH v3 0/3] xen: netfront poll mode driver
On 4/20/2016 10:19 PM, Bruce Richardson wrote: > On Tue, Mar 22, 2016 at 10:55:26AM +0100, Jan Blunck wrote: >> v3 changes: >> - removed fake PCI interface >> - removed struct virt_eth_driver >> - check for UIO name and version >> - added basic documentation >> >> Jan Blunck (3): >> xen: Add UIO kernel driver >> xen: Add netfront poll mode driver >> xen: Add documentation >> > Hi Jan, > > any update on this series? > > /Bruce > Jan and Bruce: I will find time to review this starting from this week. It takes time. Please stay tuned. /huawei
[dpdk-dev] [PATCH] ethdev: make struct rte_eth_dev cache aligned
On Mon, May 02, 2016 at 01:37:45PM +0530, Jerin Jacob wrote:
> Elements of struct rte_eth_dev used in the fast path.
> Make struct rte_eth_dev cache aligned to avoid the cases where
> rte_eth_dev elements share the same cache line with other structures.
>
> Signed-off-by: Jerin Jacob
> ---
> lib/librte_ether/rte_ethdev.c | 2 +-
> lib/librte_ether/rte_ethdev.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
> index a31018e..04f492d 100644
> --- a/lib/librte_ether/rte_ethdev.c
> +++ b/lib/librte_ether/rte_ethdev.c
> @@ -70,7 +70,7 @@
> #include "rte_ethdev.h"
>
> static const char *MZ_RTE_ETH_DEV_DATA = "rte_eth_dev_data";
> -struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS];
> +struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS] __rte_cache_aligned;
> static struct rte_eth_dev_data *rte_eth_dev_data;
> static uint8_t nb_ports;
>
> diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
> index 8519ff6..e359dda 100644
> --- a/lib/librte_ether/rte_ethdev.h
> +++ b/lib/librte_ether/rte_ethdev.h
> @@ -1630,7 +1630,7 @@ struct rte_eth_dev {
> struct rte_eth_rxtx_callback *pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT];
> uint8_t attached; /**< Flag indicating the port is attached */
> enum rte_eth_dev_type dev_type; /**< Flag indicating the device type */
> -};
> +} __rte_cache_aligned;
>
> struct rte_eth_dev_sriov {
> uint8_t active; /**< SRIOV is active with 16, 32 or 64
> pools */
> --
Adding cache aligned in two places is overkill, I think. If the structure is
marked as being cache aligned, there is no need to have the rte_eth_devices
marked that way too. I suggest therefore just keeping the structure alignment.
Regards,
/Bruce
[dpdk-dev] [PATCH] ip_pipeline: configuration file parser cleanup
On Mon, May 02, 2016 at 12:53:55PM +0100, Jasvinder Singh wrote: > This patch updates the parsing routines of packet queues (pktq_in/out > fields in the PIPELINE section) and message queues (msgq_in/out fields > of in the MSGQ Section) specified in ip_pipeline configuration file. > > Signed-off-by: Jasvinder Singh > Acked-by: Cristian Dumitrescu Hi Jasvinder, can you provide more detail in the patch commit message, please? Why was this cleanup wanted/needed, and how was it done? The code diff is pretty large so a clear description of how the code works before and after this patch is needed to help someone scanning the patch understand what is happening there. Thanks, /Bruce
[dpdk-dev] [PATCH] app/testpmd: add packet data prefetch in macswap loop
On Mon, May 02, 2016 at 05:29:37PM +0530, Jerin Jacob wrote:
> prefetch the next packet data address in advance in macswap loop
> for performance improvement.
>
> Signed-off-by: Jerin Jacob
> ---
> app/test-pmd/macswap.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/app/test-pmd/macswap.c b/app/test-pmd/macswap.c
> index 154889d..c10f4b5 100644
> --- a/app/test-pmd/macswap.c
> +++ b/app/test-pmd/macswap.c
> @@ -113,6 +113,9 @@ pkt_burst_mac_swap(struct fwd_stream *fs)
> if (txp->tx_ol_flags & TESTPMD_TX_OFFLOAD_INSERT_QINQ)
> ol_flags |= PKT_TX_QINQ_PKT;
> for (i = 0; i < nb_rx; i++) {
> + if (likely(i < nb_rx - 1))
> + rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1],
> +void *));
At least on IA platforms, there is no issue with prefetching beyond the end of
the array, since it's only a hint to the cpu. If this is true for other
platforms,
then I suggest we just drop the conditional and just always prefetch.
/Bruce
> mb = pkts_burst[i];
> eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);
>
> --
> 2.1.0
>
[dpdk-dev] [PATCH] app/testpmd: add packet data prefetch in macswap loop
> -Original Message-
> From: Richardson, Bruce
> Sent: Tuesday, May 03, 2016 10:45 AM
> To: Jerin Jacob
> Cc: dev at dpdk.org; De Lara Guarch, Pablo
> Subject: Re: [dpdk-dev] [PATCH] app/testpmd: add packet data prefetch in
> macswap loop
>
> On Mon, May 02, 2016 at 05:29:37PM +0530, Jerin Jacob wrote:
> > prefetch the next packet data address in advance in macswap loop
> > for performance improvement.
> >
> > Signed-off-by: Jerin Jacob
> > ---
> > app/test-pmd/macswap.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/app/test-pmd/macswap.c b/app/test-pmd/macswap.c
> > index 154889d..c10f4b5 100644
> > --- a/app/test-pmd/macswap.c
> > +++ b/app/test-pmd/macswap.c
> > @@ -113,6 +113,9 @@ pkt_burst_mac_swap(struct fwd_stream *fs)
> > if (txp->tx_ol_flags & TESTPMD_TX_OFFLOAD_INSERT_QINQ)
> > ol_flags |= PKT_TX_QINQ_PKT;
> > for (i = 0; i < nb_rx; i++) {
> > + if (likely(i < nb_rx - 1))
> > + rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1],
> > + void *));
>
> At least on IA platforms, there is no issue with prefetching beyond the end of
> the array, since it's only a hint to the cpu. If this is true for other
> platforms,
> then I suggest we just drop the conditional and just always prefetch.
That's what I thought when I saw this patch, but the problem is that the
prefetch is not for pkts_burst,
but for rte_pktmbuf_mtod(pkts_burst...), so there must be a limit in nb_rx - 2,
or there will be a seg fault.
Pablo
>
> /Bruce
>
> > mb = pkts_burst[i];
> > eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);
> >
> > --
> > 2.1.0
> >
[dpdk-dev] [PATCH] app/testpmd: add packet data prefetch in macswap loop
On 05/03/2016 11:45 AM, Bruce Richardson wrote:
> On Mon, May 02, 2016 at 05:29:37PM +0530, Jerin Jacob wrote:
>> prefetch the next packet data address in advance in macswap loop
>> for performance improvement.
>>
>> ...
>> for (i = 0; i < nb_rx; i++) {
>> +if (likely(i < nb_rx - 1))
>> +rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1],
>> + void *));
>
> At least on IA platforms, there is no issue with prefetching beyond the end of
> the array, since it's only a hint to the cpu. If this is true for other
> platforms,
> then I suggest we just drop the conditional and just always prefetch.
This is an interesting point.
Bruce, are you suggesting that prefetching at an invalid [virtual]
address won't trigger a CPU exception?
Ivan
>
> /Bruce
>
>> mb = pkts_burst[i];
>> eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);
[dpdk-dev] [PATCH] app/testpmd: add packet data prefetch in macswap loop
On Tue, May 03, 2016 at 10:48:34AM +0100, De Lara Guarch, Pablo wrote:
>
>
> > -Original Message-
> > From: Richardson, Bruce
> > Sent: Tuesday, May 03, 2016 10:45 AM
> > To: Jerin Jacob
> > Cc: dev at dpdk.org; De Lara Guarch, Pablo
> > Subject: Re: [dpdk-dev] [PATCH] app/testpmd: add packet data prefetch in
> > macswap loop
> >
> > On Mon, May 02, 2016 at 05:29:37PM +0530, Jerin Jacob wrote:
> > > prefetch the next packet data address in advance in macswap loop
> > > for performance improvement.
> > >
> > > Signed-off-by: Jerin Jacob
> > > ---
> > > app/test-pmd/macswap.c | 3 +++
> > > 1 file changed, 3 insertions(+)
> > >
> > > diff --git a/app/test-pmd/macswap.c b/app/test-pmd/macswap.c
> > > index 154889d..c10f4b5 100644
> > > --- a/app/test-pmd/macswap.c
> > > +++ b/app/test-pmd/macswap.c
> > > @@ -113,6 +113,9 @@ pkt_burst_mac_swap(struct fwd_stream *fs)
> > > if (txp->tx_ol_flags & TESTPMD_TX_OFFLOAD_INSERT_QINQ)
> > > ol_flags |= PKT_TX_QINQ_PKT;
> > > for (i = 0; i < nb_rx; i++) {
> > > + if (likely(i < nb_rx - 1))
> > > + rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1],
> > > +void *));
> >
> > At least on IA platforms, there is no issue with prefetching beyond the end
> > of
> > the array, since it's only a hint to the cpu. If this is true for other
> > platforms,
> > then I suggest we just drop the conditional and just always prefetch.
>
> That's what I thought when I saw this patch, but the problem is that the
> prefetch is not for pkts_burst,
> but for rte_pktmbuf_mtod(pkts_burst...), so there must be a limit in nb_rx -
> 2, or there will be a seg fault.
>
> Pablo
Good point, Pablo, I missed that subtlety here.
/Bruce
> >
> > /Bruce
> >
> > > mb = pkts_burst[i];
> > > eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);
> > >
> > > --
> > > 2.1.0
> > >
[dpdk-dev] [PATCH] app/testpmd: add packet data prefetch in macswap loop
On Tue, May 03, 2016 at 11:50:31AM +0200, Ivan Boule wrote:
> On 05/03/2016 11:45 AM, Bruce Richardson wrote:
> >On Mon, May 02, 2016 at 05:29:37PM +0530, Jerin Jacob wrote:
> >>prefetch the next packet data address in advance in macswap loop
> >>for performance improvement.
> >>
> >>...
> >>for (i = 0; i < nb_rx; i++) {
> >>+ if (likely(i < nb_rx - 1))
> >>+ rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1],
> >>+ void *));
> >
> >At least on IA platforms, there is no issue with prefetching beyond the end
> >of
> >the array, since it's only a hint to the cpu. If this is true for other
> >platforms,
> >then I suggest we just drop the conditional and just always prefetch.
>
> This is an interesting point.
> Bruce, are you suggesting that prefetching at an invalid [virtual] address
> won't trigger a CPU exception?
>
Yep. For example, adding "rte_prefetch0(NULL)" at the start of main in testpmd
causes no ill effects when running the app.
/Bruce
[dpdk-dev] [PATCH v2] i40e: dereference before null check
On Wed, Apr 27, 2016 at 06:34:03AM +, Wu, Jingjing wrote:
>
>
> > -Original Message-
> > From: Mrzyglod, DanielX T
> > Sent: Tuesday, April 19, 2016 1:13 AM
> > To: Chen, Jing D; Wu, Jingjing; Zhang, Helin
> > Cc: dev at dpdk.org; Mrzyglod, DanielX T
> > Subject: [PATCH v2] i40e: dereference before null check
> >
> > Fix issue reported by Coverity.
> > Coverity ID 13302:
> > There may be a null pointer dereference, or else the comparison against null
> > is unnecessary.
> >
> > In i40evf_config_vlan_pvid: All paths that lead to this null pointer
> > comparison
> > already dereference the pointer earlier
> >
> > Fixes: 2b12431b5369 ("i40e: add vlan stripping and insertion to VF")
> >
> > Signed-off-by: Daniel Mrzyglod
> Acked-by: Jingjing Wu
>
Applied to dpdk-next-net/rel_16_07
/Bruce
[dpdk-dev] [PATCH v3] i40evf: Report error if HW CRC strip is disabled for non-DPDK PF hosts
On Fri, Apr 29, 2016 at 01:42:33PM +, Zhang, Helin wrote: > > > > -Original Message- > > From: Topel, Bjorn > > Sent: Friday, April 22, 2016 1:39 PM > > To: dev at dpdk.org > > Cc: Zhang, Helin; Wu, Jingjing; Topel, Bjorn > > Subject: [PATCH v3] i40evf: Report error if HW CRC strip is disabled for > > non- > > DPDK PF hosts > > > > On hosts running a non-DPDK PF driver, the VF has no means of changing the > > HW CRC strip setting for a RX queue. It's implicitly enabled. > > > > This patch checks if the host is running a non-DPDK PF kernel driver, and > > returns an error, if HW CRC stripping was disabled. > > > > Signed-off-by: Bj?rn T?pel > Acked-by: Helin Zhang Applied to dpdk-next-net/rel_16_07 /Bruce
[dpdk-dev] [PATCH] nfp: avoiding concurrency when hardware reconfig
On Tue, Apr 26, 2016 at 01:14:15PM +0100, Alejandro Lucero wrote: > Some apps calling some functions from different threads at the > same time could lead to reconfig problems. Reconfig mechanism is > based on a hardware queue where incrementing a counter signals the > firmware to do the reconfig. If there are two increments before the > first one has been processed the firmware will stop and a device > reset is necessary. > > Signed-off-by: Alejandro Lucero > --- > drivers/net/nfp/nfp_net.c | 8 > drivers/net/nfp/nfp_net_pmd.h | 1 + > 2 files changed, 9 insertions(+) > > diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c > index bc0a3d8..ba0ee04 100644 > --- a/drivers/net/nfp/nfp_net.c > +++ b/drivers/net/nfp/nfp_net.c > @@ -58,6 +58,7 @@ > #include "nfp_net_pmd.h" > #include "nfp_net_logs.h" > #include "nfp_net_ctrl.h" > +#include Hi Alejandro, I think this header addition is in the wrong place in the code. When I apply this patch to next-net and try a recompile I get the error: CC nfp_net.o In file included from /home/bruce/next-net/dpdk-next-net/drivers/net/nfp/nfp_net.c:58:0: /home/bruce/next-net/dpdk-next-net/drivers/net/nfp/nfp_net_pmd.h:409:2: error: unknown type name ?rte_spinlock_t? rte_spinlock_t reconfig_lock; ^ You either need to put the spinlock include before the nfp_net_pmd.h include or, perhaps better, put the spinlock include inside the nfp_net_pmd header file since that is where the spinlock variable is being defined. /Bruce
[dpdk-dev] [PATCH] nfp: avoiding concurrency when hardware reconfig
Hi Bruce, Sorry about this. I sent a v2 for this patch but not in the same thread: http://www.dpdk.org/ml/archives/dev/2016-April/037996.html On Tue, May 3, 2016 at 12:01 PM, Bruce Richardson < bruce.richardson at intel.com> wrote: > On Tue, Apr 26, 2016 at 01:14:15PM +0100, Alejandro Lucero wrote: > > Some apps calling some functions from different threads at the > > same time could lead to reconfig problems. Reconfig mechanism is > > based on a hardware queue where incrementing a counter signals the > > firmware to do the reconfig. If there are two increments before the > > first one has been processed the firmware will stop and a device > > reset is necessary. > > > > Signed-off-by: Alejandro Lucero > > --- > > drivers/net/nfp/nfp_net.c | 8 > > drivers/net/nfp/nfp_net_pmd.h | 1 + > > 2 files changed, 9 insertions(+) > > > > diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c > > index bc0a3d8..ba0ee04 100644 > > --- a/drivers/net/nfp/nfp_net.c > > +++ b/drivers/net/nfp/nfp_net.c > > @@ -58,6 +58,7 @@ > > #include "nfp_net_pmd.h" > > #include "nfp_net_logs.h" > > #include "nfp_net_ctrl.h" > > +#include > > Hi Alejandro, > > I think this header addition is in the wrong place in the code. When I > apply > this patch to next-net and try a recompile I get the error: > > CC nfp_net.o > In file included from > /home/bruce/next-net/dpdk-next-net/drivers/net/nfp/nfp_net.c:58:0: > /home/bruce/next-net/dpdk-next-net/drivers/net/nfp/nfp_net_pmd.h:409:2: > error: unknown type name ?rte_spinlock_t? > rte_spinlock_t reconfig_lock; > ^ > > You either need to put the spinlock include before the nfp_net_pmd.h > include > or, perhaps better, put the spinlock include inside the nfp_net_pmd header > file > since that is where the spinlock variable is being defined. > > /Bruce > >
[dpdk-dev] [PATCH] nfp: avoiding concurrency when hardware reconfig
On Tue, May 03, 2016 at 12:14:26PM +0100, Alejandro Lucero wrote: > Hi Bruce, > > Sorry about this. I sent a v2 for this patch but not in the same thread: > > http://www.dpdk.org/ml/archives/dev/2016-April/037996.html > Ok, I see it in patchwork now, thanks. When sending a v2, please keep the mails threaded, and please also update the original patch submission in patchwork to "superceded" so that it drops off the list of patches for consideration in DPDK. [That way at least if you forget one, the other will help hint to committers that they are not looking at the latest version. :-)] /Bruce > On Tue, May 3, 2016 at 12:01 PM, Bruce Richardson < > bruce.richardson at intel.com> wrote: > > > On Tue, Apr 26, 2016 at 01:14:15PM +0100, Alejandro Lucero wrote: > > > Some apps calling some functions from different threads at the > > > same time could lead to reconfig problems. Reconfig mechanism is > > > based on a hardware queue where incrementing a counter signals the > > > firmware to do the reconfig. If there are two increments before the > > > first one has been processed the firmware will stop and a device > > > reset is necessary. > > > > > > Signed-off-by: Alejandro Lucero > > > --- > > > drivers/net/nfp/nfp_net.c | 8 > > > drivers/net/nfp/nfp_net_pmd.h | 1 + > > > 2 files changed, 9 insertions(+) > > > > > > diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c > > > index bc0a3d8..ba0ee04 100644 > > > --- a/drivers/net/nfp/nfp_net.c > > > +++ b/drivers/net/nfp/nfp_net.c > > > @@ -58,6 +58,7 @@ > > > #include "nfp_net_pmd.h" > > > #include "nfp_net_logs.h" > > > #include "nfp_net_ctrl.h" > > > +#include > > > > Hi Alejandro, > > > > I think this header addition is in the wrong place in the code. When I > > apply > > this patch to next-net and try a recompile I get the error: > > > > CC nfp_net.o > > In file included from > > /home/bruce/next-net/dpdk-next-net/drivers/net/nfp/nfp_net.c:58:0: > > /home/bruce/next-net/dpdk-next-net/drivers/net/nfp/nfp_net_pmd.h:409:2: > > error: unknown type name ?rte_spinlock_t? > > rte_spinlock_t reconfig_lock; > > ^ > > > > You either need to put the spinlock include before the nfp_net_pmd.h > > include > > or, perhaps better, put the spinlock include inside the nfp_net_pmd header > > file > > since that is where the spinlock variable is being defined. > > > > /Bruce > > > >
[dpdk-dev] [PATCH] mk: cleanup leftover references to librte_malloc
On Tue, Apr 26, 2016 at 03:16:01PM +0300, Panu Matilainen wrote:
> librte_malloc was long since merged into librte_eal, mop up the
> leftovers from rarer drivers.
>
> Fixes: 2f9d47013e4d ("mem: move librte_malloc to eal/common")
>
> Signed-off-by: Panu Matilainen
> ---
> drivers/net/cxgbe/Makefile| 2 +-
> drivers/net/ena/Makefile | 2 +-
> drivers/net/mpipe/Makefile| 2 +-
> drivers/net/nfp/Makefile | 2 +-
> drivers/net/szedata2/Makefile | 1 -
> 5 files changed, 4 insertions(+), 5 deletions(-)
>
Applied to dpdk-next-net/rel_16_07 with an additional fix for new qede driver
which also had a malloc reference.
/Bruce
[dpdk-dev] 16.11 Roadmap
We were a little late doing this for 16.07, so we're going to try and communicate our roadmap for future releases earlier. Our aim is to do this 6 months before a release. Some things will obviously change during planning/development, so we'll provide an update 4 months before the release. After that, things should hopefully be relatively stable. Below are the features that we're planning to submit for 16.11. It would be good if others are also willing to share their plans so that we can build up a complete picture of what's planned for 16.11. Cryptodev Scheduler & Packet Reordering: Add a scheduler to cryptodev which will allow hardware and software acceleration to be used on the same core. If both are available, the scheduler will determine whether to use hardware or software acceleration based on packet size and other factors (TBD). Support packet reordering in cryptodev so that packet order is maintained when hardware and software acceleration are combined. Cryptodev Support for Hardware Acceleration (via Intel(r) QuickAssist Technology) for Additional Algorithms: Add support for all algorithms which are supported by Intel(r) QuickAssist Technology but are not currently supported in DPDK. This includes: AES_CTR_128/192/256, MD5, MD5_HMAC, SHA1, SHA224, SHA224_HMAC, SHA256, SHA384, SHA384_HMAC, SHA512, AES-XTS, KASUMI. Cryptodev Support for Software Acceleration for Additional Algorithms: For every algorithm that we support in hardware, provide a software implementation. This means that an application can always rely on the cryptodev API to provide the requested service, even if hardware acceleration is not available. Cryptodev Performance Optimization: Analyze the performance of the cryptodev API, identify bottlenecks, and optimize where required. Generic Classification API: Create a new API to provide generic filtering capabilities that works across NICs. This will include a software implementation which can be used in cases where NICs that don't support all the capabilities of the API. An RFC will be submitted in the 16.07 timeframe. We're targeting the implementation at the 16.11 release, but this is a complex change and there may be significant community interest/feedback on it, so it may be deferred until a later release. Enhanced Packet Distributor: Optimize performance of the Packet Distributor library by using vector instructions and other techniques. QEMU vHost Back-End Reconnect: Currently, if a vswitch is connected to VMs via vhost-user and the vswitch is restarted, then when it comes back up again it cannot reconnect to the existing VMs. To address this, both QEMU and vhost-user need to support client mode (currently only server mode is supported), which implements reconnection messages that allow the vswitch to reconnect to the VMs. Changes are required in QEMU as well as in DPDK, so this change will need to be coordinated with the QEMU community. Delay Packet Copy in vHost-User Dequeue: It may be possible to increase vhost-user performance by delaying the packet copy until a point where we know for certain whether the copy is required or not. This would avoid copying the packet in cases where it is not definitely required. Further investigation is required to determine how much of a performance gain can be achieved. Cuckoo Hash Acceleration using TSX: Improve performance of Cuckoo Hash using Transactional Synchronization Extensions (TSX).
[dpdk-dev] [RFC PATCH 0/4]: Implement module information export
On Tue, Apr 26, 2016 at 01:39:47PM -0400, Neil Horman wrote: > Hey- > So a few days ago we were reviewing Davids patch series to introduce the > abiilty to dump hardware support from pmd DSO's in a human readable format. > That effort encountered some problems, most notably the fact that stripping a > DSO removed the required information that the proposed tool keyed off, as well > as the need to dead reckon offsets between symbols that may not be constant > (dependent on architecture). > > I was going to start looking into the possibility of creating a modinfo > section in a simmilar fashion to what kernel modules do in linux or BSD. I > decided to propose this solution instead though, because the kernel style > solution requires a significant amount of infrastructure that I think we can > maybe avoid maintaining, if we accept some minor caviats > > To do this We emit a set of well known marker symbols for each DSO that an > external application can search for (in this case I called them > this_pmd_driver, where n is a counter macro). These marker symbols are > n is a counter macro). These marker symbols are exported by PMDs for > external access. External tools can then access these symbols via the > dlopen/dlsym api (or via elfutils libraries) > > The symbols above alias the rte_driver struct for each PMD, and the external > application can then interrogate the registered driver information. > > I also add a pointer to the pci id table struct for each PMD so that we can > export hardware support. > > This approach has a few pros and cons: > > pros: > 1) Its simple, and doesn't require extra infrastructure to implement. E.g. we > don't need a new tool to extract driver information and emit the C code to > build > the binary data for the special section, nor do we need a custom linker script > to link said special section in place > > 2) Its stable. Because the marker symbols are explicitly exported, this > approach is resilient against stripping. > > cons: > 1) It creates an artifact in that PMD_REGISTER_DRIVER has to be used in one > compilation unit per DSO. As an example em and igb effectively merge two > drivers into one DSO, and the uses of PMD_REGISTER_DRIVER occur in two > separate > C files for the same single linked DSO. Because of the use of the __COUNTER__ > macro we get multiple definitions of the same marker symbols. > > I would make the argument that the downside of the above artifact isn't that > big > a deal. Traditionally in other projects a unit like a module (or DSO in our > case) only ever codifies a single driver (e.g. module_init() in the linux > kernel > is only ever used once per built module). If we have code like igb/em that > shares some core code, we should build the shared code to object files and > link > them twice, once to an em.so pmd and again to an igb.so pmd. > > But regardless, I thought I would propose this to see what you all thought of > it. > > FWIW, heres sample output of the pmdinfo tool from this series probing the > librte_pmd_ena.so module: > > [nhorman at hmsreliant dpdk]$ ./build/app/pmdinfo > ~/git/dpdk/build/lib/librte_pmd_ena.so > PMD 0 Information: > Driver Name: ena_driver > Driver Type: PCI > |PCI Table| > | VENDOR ID | DEVICE ID | SUBVENDOR ID | SUBDEVICE ID | > |-| > | 1d0f| ec20| | | > | 1d0f| ec21| | | > |-| > > > > Ping, thoughts here? Neil
[dpdk-dev] [PATCH] ethdev: make struct rte_eth_dev cache aligned
On Tue, May 03, 2016 at 10:40:53AM +0100, Bruce Richardson wrote:
> On Mon, May 02, 2016 at 01:37:45PM +0530, Jerin Jacob wrote:
> > Elements of struct rte_eth_dev used in the fast path.
> > Make struct rte_eth_dev cache aligned to avoid the cases where
> > rte_eth_dev elements share the same cache line with other structures.
> >
> > Signed-off-by: Jerin Jacob
> > ---
> > lib/librte_ether/rte_ethdev.c | 2 +-
> > lib/librte_ether/rte_ethdev.h | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
> > index a31018e..04f492d 100644
> > --- a/lib/librte_ether/rte_ethdev.c
> > +++ b/lib/librte_ether/rte_ethdev.c
> > @@ -70,7 +70,7 @@
> > #include "rte_ethdev.h"
> >
> > static const char *MZ_RTE_ETH_DEV_DATA = "rte_eth_dev_data";
> > -struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS];
> > +struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS] __rte_cache_aligned;
> > static struct rte_eth_dev_data *rte_eth_dev_data;
> > static uint8_t nb_ports;
> >
> > diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
> > index 8519ff6..e359dda 100644
> > --- a/lib/librte_ether/rte_ethdev.h
> > +++ b/lib/librte_ether/rte_ethdev.h
> > @@ -1630,7 +1630,7 @@ struct rte_eth_dev {
> > struct rte_eth_rxtx_callback *pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT];
> > uint8_t attached; /**< Flag indicating the port is attached */
> > enum rte_eth_dev_type dev_type; /**< Flag indicating the device type */
> > -};
> > +} __rte_cache_aligned;
> >
> > struct rte_eth_dev_sriov {
> > uint8_t active; /**< SRIOV is active with 16, 32 or 64
> > pools */
> > --
> Adding cache aligned in two places is overkill, I think. If the structure is
> marked as being cache aligned, there is no need to have the rte_eth_devices
> marked that way too. I suggest therefore just keeping the structure alignment.
OK. Will fix it in v2
>
> Regards,
> /Bruce
[dpdk-dev] [RFC PATCH v1 2/3] drivers/net/ixgbe: change xstats to use integers
On 29/04/2016 14:43, David Harton (dharton) wrote:
[..]
>> +/* RX Priority Stats */
>> +for (stat = 0; stat < IXGBE_NB_RXQ_PRIO_STATS; stat++) {
>> +for (i = 0; i < 8; i++) {
>
> 8 seems magical. Is there a constant somewhere that can be used?
Not that I'm aware of. I've made it a #define as a small cleanup.
>> +static int ixgbevf_dev_xstats_names(__rte_unused struct rte_eth_dev *dev,
>> +struct rte_eth_xstats_name *ptr_names, __rte_unused unsigned limit)
>> +{
>> +unsigned i;
>> +
>> +if (limit < IXGBEVF_NB_XSTATS)
>
> Think this check has to be removed since rte_eth_xstats_count() calls with
> limit == 0.
Well spotted. It should only error-out if ptr_names is non-NULL.
As an aside, I am wondering whether getting stats counts should itself
be a seperate driver hook.
..Remy
[dpdk-dev] [PATCH v2] ethdev: make struct rte_eth_dev cache aligned
Elements of struct rte_eth_dev used in the fast path.
Make struct rte_eth_dev cache aligned to avoid the cases where
rte_eth_dev elements share the same cache line with other structures.
Signed-off-by: Jerin Jacob
---
v2:
Remove __rte_cache_aligned from rte_eth_devices and keep
it only at struct rte_eth_dev definition as suggested by Bruce
http://dpdk.org/dev/patchwork/patch/12328/
---
lib/librte_ether/rte_ethdev.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 2757510..48f14d5 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1615,7 +1615,7 @@ struct rte_eth_dev {
struct rte_eth_rxtx_callback *pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT];
uint8_t attached; /**< Flag indicating the port is attached */
enum rte_eth_dev_type dev_type; /**< Flag indicating the device type */
-};
+} __rte_cache_aligned;
struct rte_eth_dev_sriov {
uint8_t active; /**< SRIOV is active with 16, 32 or 64
pools */
--
2.1.0
[dpdk-dev] [PATCH] app/testpmd: add packet data prefetch in macswap loop
On Mon, May 02, 2016 at 05:48:02PM +, De Lara Guarch, Pablo wrote:
> Hi Jerin,
>
> > -Original Message-
> > From: Jerin Jacob [mailto:jerin.jacob at caviumnetworks.com]
> > Sent: Monday, May 02, 2016 1:00 PM
> > To: dev at dpdk.org
> > Cc: De Lara Guarch, Pablo; Jerin Jacob
> > Subject: [dpdk-dev] [PATCH] app/testpmd: add packet data prefetch in
> > macswap loop
> >
> > prefetch the next packet data address in advance in macswap loop
> > for performance improvement.
> >
> > Signed-off-by: Jerin Jacob
> > ---
> > app/test-pmd/macswap.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/app/test-pmd/macswap.c b/app/test-pmd/macswap.c
> > index 154889d..c10f4b5 100644
> > --- a/app/test-pmd/macswap.c
> > +++ b/app/test-pmd/macswap.c
> > @@ -113,6 +113,9 @@ pkt_burst_mac_swap(struct fwd_stream *fs)
> > if (txp->tx_ol_flags & TESTPMD_TX_OFFLOAD_INSERT_QINQ)
> > ol_flags |= PKT_TX_QINQ_PKT;
> > for (i = 0; i < nb_rx; i++) {
> > + if (likely(i < nb_rx - 1))
> > + rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1],
> > + void *));
> > mb = pkts_burst[i];
> > eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);
> >
> > --
> > 2.1.0
>
> This looks good. Could you also add it in the other forwarding modes (the
> ones that make changes in the packets)?
OK Pablo.
I will add the similar logic in the following forwarding modes in
testpmd.
macswap
macfwd
macfwd-retry
csumonly
icmpecho
/Jerin
>
> Thanks,
> Pablo
[dpdk-dev] [PATCH v2] nfp: avoiding concurrency when hardware reconfig
On Tue, Apr 26, 2016 at 02:03:01PM +0100, Alejandro Lucero wrote: > Some apps calling some functions from different threads at the > same time could lead to reconfig problems. Reconfig mechanism is > based on a hardware queue where incrementing a counter signals the > firmware to do the reconfig. If there are two increments before the > first one has been processed the firmware will stop and a device > reset is necessary. > > - v2: header file to the right place > > Signed-off-by: Alejandro Lucero Applied to dpdk-next-net/rel_16_07 /Bruce
[dpdk-dev] [PATCH] mk: add rpath for applications
On 5/2/2016 5:10 PM, Thomas Monjalon wrote: > 2016-04-29 17:34, Ferruh Yigit: >> Add default library output folder to the library search folder. >> >> This is useful for development environment, in production environment >> DPDK libraries already should be in know locations. > > Yes it is useful in dev environment, but can be risky or strange when > packaged for production environment. > Shouldn't we have a switch to avoid a development garbage in production? > I suggest to use RTE_DEVEL_BUILD. > Right, I will use RTE_DEVEL_BUILD >> Patch removes requirement to set LD_LIBRARY_PATH variable when DPDK >> compiled as shared library. > > Yes, this patch could remove > export LD_LIBRARY_PATH=$build/lib:$LD_LIBRARY_PATH > in scripts/test-null.sh. > Sure, I can update it. > [...] >> +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) >> +LDFLAGS += --rpath=$(RTE_SDK_BIN)/lib >> +endif > > Isn't it -rpath, with a single dash? > It seems both are working, I will convert to single dash. > As it is a variable setting, it should be added before the rules, > just after LDLIBS settings. > OK. I will send an updated version. Thanks for the review, ferruh
[dpdk-dev] [RFC PATCH v1 2/3] drivers/net/ixgbe: change xstats to use integers
> -Original Message-
> From: Remy Horton [mailto:remy.horton at intel.com]
> Sent: Tuesday, May 03, 2016 8:23 AM
> To: David Harton (dharton) ; dev at dpdk.org; Helin
> Zhang
>
> Subject: Re: [dpdk-dev] [RFC PATCH v1 2/3] drivers/net/ixgbe: change
> xstats to use integers
>
>
> On 29/04/2016 14:43, David Harton (dharton) wrote:
> [..]
> >> + /* RX Priority Stats */
> >> + for (stat = 0; stat < IXGBE_NB_RXQ_PRIO_STATS; stat++) {
> >> + for (i = 0; i < 8; i++) {
> >
> > 8 seems magical. Is there a constant somewhere that can be used?
>
> Not that I'm aware of. I've made it a #define as a small cleanup.
>
>
> >> +static int ixgbevf_dev_xstats_names(__rte_unused struct rte_eth_dev
> *dev,
> >> + struct rte_eth_xstats_name *ptr_names, __rte_unused unsigned limit)
> >> +{
> >> + unsigned i;
> >> +
> >> + if (limit < IXGBEVF_NB_XSTATS)
> >
> > Think this check has to be removed since rte_eth_xstats_count() calls
> > with limit == 0.
>
> Well spotted. It should only error-out if ptr_names is non-NULL.
>
> As an aside, I am wondering whether getting stats counts should itself be
> a seperate driver hook.
I personally think it would be cleaner. Bug, I can also see the argument of
keeping
the vector table smaller and would conceded to others that felt strongly about
it.
I do really like having a separate external API to the user. A user should
explicitly
ask for the count.
Cheers,
Dave
>
>
> ..Remy
[dpdk-dev] [PATCH v2] ip_pipeline: configuration file parser cleanup
This patch updates the parsing routines related to packet queues
(pktq_in/out fields in the PIPELINE section) and message queues
(msgq_in/out fields of in the MSGQ Section) specified in ip_pipeline
configuration file.
In the updated routines, function "strtok_r()" is used for parsing the
string instead of manually checking the string termination, white
spaces, tabs etc., between the string tokens. Each call to strtok_r()
returns a pointer to a null-terminated string containing the next token.
If no more tokens are found, strtok_r() returns NULL. As a result of
using strtok_r(), the code size of the parsing routines is reduced
significantly.
Signed-off-by: Jasvinder Singh
Acked-by: Cristian Dumitrescu
---
v2
- update the commit message
- change the local variable name from "token" to "name"
examples/ip_pipeline/config_parse.c | 169
1 file changed, 19 insertions(+), 150 deletions(-)
diff --git a/examples/ip_pipeline/config_parse.c
b/examples/ip_pipeline/config_parse.c
index e166891..208f39a 100644
--- a/examples/ip_pipeline/config_parse.c
+++ b/examples/ip_pipeline/config_parse.c
@@ -1128,49 +1128,17 @@ parse_pipeline_pcap_sink(struct app_params *app,
static int
parse_pipeline_pktq_in(struct app_params *app,
struct app_pipeline_params *p,
- const char *value)
+ char *value)
{
- const char *next = value;
- char *end;
- char name[APP_PARAM_NAME_SIZE];
- size_t name_len;
- while (*next != '\0') {
+ while (1) {
enum app_pktq_in_type type;
int id;
- char *end_space;
- char *end_tab;
+ char *name = strtok_r(value, PARSE_DELIMITER, &value);
- next = skip_white_spaces(next);
- if (!next)
+ if (name == NULL)
break;
- end_space = strchr(next, ' ');
- end_tab = strchr(next, '');
-
- if (end_space && (!end_tab))
- end = end_space;
- else if ((!end_space) && end_tab)
- end = end_tab;
- else if (end_space && end_tab)
- end = RTE_MIN(end_space, end_tab);
- else
- end = NULL;
-
- if (!end)
- name_len = strlen(next);
- else
- name_len = end - next;
-
- if (name_len == 0 || name_len == sizeof(name))
- return -EINVAL;
-
- strncpy(name, next, name_len);
- name[name_len] = '\0';
- next += name_len;
- if (*next != '\0')
- next++;
-
if (validate_name(name, "RXQ", 2) == 0) {
type = APP_PKTQ_IN_HWQ;
id = APP_PARAM_ADD(app->hwq_in_params, name);
@@ -1200,48 +1168,16 @@ parse_pipeline_pktq_in(struct app_params *app,
static int
parse_pipeline_pktq_out(struct app_params *app,
struct app_pipeline_params *p,
- const char *value)
+ char *value)
{
- const char *next = value;
- char *end;
- char name[APP_PARAM_NAME_SIZE];
- size_t name_len;
-
- while (*next != '\0') {
- enum app_pktq_out_type type;
+ while (1) {
+ enum app_pktq_in_type type;
int id;
- char *end_space;
- char *end_tab;
+ char *name = strtok_r(value, PARSE_DELIMITER, &value);
- next = skip_white_spaces(next);
- if (!next)
+ if (name == NULL)
break;
- end_space = strchr(next, ' ');
- end_tab = strchr(next, '');
-
- if (end_space && (!end_tab))
- end = end_space;
- else if ((!end_space) && end_tab)
- end = end_tab;
- else if (end_space && end_tab)
- end = RTE_MIN(end_space, end_tab);
- else
- end = NULL;
-
- if (!end)
- name_len = strlen(next);
- else
- name_len = end - next;
-
- if (name_len == 0 || name_len == sizeof(name))
- return -EINVAL;
-
- strncpy(name, next, name_len);
- name[name_len] = '\0';
- next += name_len;
- if (*next != '\0')
- next++;
if (validate_name(name, "TXQ", 2) == 0) {
type = APP_PKTQ_OUT_HWQ;
id = APP_PARAM_ADD(app->hwq_out_params, name);
@@ -1271,48 +1207,15 @@ parse_pipeline_pktq_out(struct app_params *app,
static int
parse_pipeline_msgq_in(struct app_params *app,
struct app_pipeline_params *p,
- const char *value)
+ char *value)
{
-
[dpdk-dev] [PATCH v2] app/testpmd: add packet data pointer prefetch in the forwarding loop
prefetch the next packet data address in advance in forwarding loop
for performance improvement.
Signed-off-by: Jerin Jacob
---
V2:
Extend the packet data prefetch logic to other similar forwarding modes like
macfwd, macfwd-retry, csumonly, icmpecho as suggested by Pablo
http://dpdk.org/dev/patchwork/patch/12330/
---
app/test-pmd/csumonly.c | 3 +++
app/test-pmd/icmpecho.c | 3 +++
app/test-pmd/macfwd-retry.c | 3 +++
app/test-pmd/macfwd.c | 3 +++
app/test-pmd/macswap.c | 3 +++
5 files changed, 15 insertions(+)
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 7e4f662..1d6cda1 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -676,6 +676,9 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
info.tso_segsz = txp->tso_segsz;
for (i = 0; i < nb_rx; i++) {
+ if (likely(i < nb_rx - 1))
+ rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1],
+ void *));
ol_flags = 0;
info.is_tunnel = 0;
diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c
index e510f9b..ed6e924 100644
--- a/app/test-pmd/icmpecho.c
+++ b/app/test-pmd/icmpecho.c
@@ -346,6 +346,9 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
fs->rx_packets += nb_rx;
nb_replies = 0;
for (i = 0; i < nb_rx; i++) {
+ if (likely(i < nb_rx - 1))
+ rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1],
+ void *));
pkt = pkts_burst[i];
eth_h = rte_pktmbuf_mtod(pkt, struct ether_hdr *);
eth_type = RTE_BE_TO_CPU_16(eth_h->ether_type);
diff --git a/app/test-pmd/macfwd-retry.c b/app/test-pmd/macfwd-retry.c
index 3a96b3d..d8cd069 100644
--- a/app/test-pmd/macfwd-retry.c
+++ b/app/test-pmd/macfwd-retry.c
@@ -117,6 +117,9 @@ pkt_burst_mac_retry_forward(struct fwd_stream *fs)
#endif
fs->rx_packets += nb_rx;
for (i = 0; i < nb_rx; i++) {
+ if (likely(i < nb_rx - 1))
+ rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1],
+ void *));
mb = pkts_burst[i];
eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);
ether_addr_copy(&peer_eth_addrs[fs->peer_addr],
diff --git a/app/test-pmd/macfwd.c b/app/test-pmd/macfwd.c
index 3b7fffb..07a399a 100644
--- a/app/test-pmd/macfwd.c
+++ b/app/test-pmd/macfwd.c
@@ -113,6 +113,9 @@ pkt_burst_mac_forward(struct fwd_stream *fs)
if (txp->tx_ol_flags & TESTPMD_TX_OFFLOAD_INSERT_QINQ)
ol_flags |= PKT_TX_QINQ_PKT;
for (i = 0; i < nb_rx; i++) {
+ if (likely(i < nb_rx - 1))
+ rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1],
+ void *));
mb = pkts_burst[i];
eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);
ether_addr_copy(&peer_eth_addrs[fs->peer_addr],
diff --git a/app/test-pmd/macswap.c b/app/test-pmd/macswap.c
index 154889d..c10f4b5 100644
--- a/app/test-pmd/macswap.c
+++ b/app/test-pmd/macswap.c
@@ -113,6 +113,9 @@ pkt_burst_mac_swap(struct fwd_stream *fs)
if (txp->tx_ol_flags & TESTPMD_TX_OFFLOAD_INSERT_QINQ)
ol_flags |= PKT_TX_QINQ_PKT;
for (i = 0; i < nb_rx; i++) {
+ if (likely(i < nb_rx - 1))
+ rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1],
+ void *));
mb = pkts_burst[i];
eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);
--
2.1.0
[dpdk-dev] [PATCH v2] app/testpmd: add packet data pointer prefetch in the forwarding loop
2016-05-03 19:37, Jerin Jacob: > prefetch the next packet data address in advance in forwarding loop > for performance improvement. I would like to get some attention to other patches adding some prefetch: http://dpdk.org/dev/patchwork/project/dpdk/list/?q=prefetch http://dpdk.org/patch/4678 http://dpdk.org/patch/8867 Maybe they deserve to be discussed. Thanks
[dpdk-dev] [PATCH] lpm: unchecked return value
On Wed, Apr 27, 2016 at 02:52:34PM +0200, Slawomir Mrozowicz wrote:
> Fix issue reported by Coverity.
>
> Coverity ID 13205: Unchecked return value
> Unchecked return value
> check_return: Calling rte_lpm6_add without checking return value
> Fixes: 5c510e13a9cb ("lpm: add IPv6 support")
>
> Signed-off-by: Slawomir Mrozowicz
> ---
> lib/librte_lpm/rte_lpm6.c | 10 ++
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/lib/librte_lpm/rte_lpm6.c b/lib/librte_lpm/rte_lpm6.c
> index ba4353c..f4db3fa 100644
> --- a/lib/librte_lpm/rte_lpm6.c
> +++ b/lib/librte_lpm/rte_lpm6.c
> @@ -749,6 +749,7 @@ rte_lpm6_delete(struct rte_lpm6 *lpm, uint8_t *ip,
> uint8_t depth)
> int32_t rule_to_delete_index;
> uint8_t ip_masked[RTE_LPM6_IPV6_ADDR_SIZE];
> unsigned i;
> + int status = 0;
>
> /*
>* Check input arguments.
> @@ -790,12 +791,13 @@ rte_lpm6_delete(struct rte_lpm6 *lpm, uint8_t *ip,
> uint8_t depth)
>* Add every rule again (except for the one that was removed from
>* the rules table).
>*/
> - for (i = 0; i < lpm->used_rules; i++) {
> - rte_lpm6_add(lpm, lpm->rules_tbl[i].ip, lpm->rules_tbl[i].depth,
> - lpm->rules_tbl[i].next_hop);
> + for (i = 0; i < lpm->used_rules && status >= 0; i++) {
> + status = rte_lpm6_add(
> + lpm, lpm->rules_tbl[i].ip, lpm->rules_tbl[i].depth,
> + lpm->rules_tbl[i].next_hop);
> }
>
> - return 0;
> + return status;
> }
Hi,
I'm not sure that this patch is actually necessary, as I'm not sure that the
lpm6_add calls can fail in this instance. Looking through the code, this
function
deletes the rule and then clears the actual lpm lookup tables before re-adding
all other routes to it again. The only error condition that could be returned,
that I can see, is -ENOSPC, which should never occur here since the original
rules fitted in the first place.
If it was possible to fail, then I think we would have a worse problem, in that
deleting a single rule has wiped out our lpm table and left it in an
inconsistent
state, so the error handling probably needs to be better than just quitting.
Finally, one other thing I spot looking through the code, is that there seems
to be a worrying set of calls between add and delete. If the add function fails,
then it calls delete which in turn will call add again, etc. etc. This may all
work correctly, but it seems fragile and error prone to me - especially if we
allow
calls from one to another to fail.
This looks like it might need some further examination to verify what the
possible
failure cases are and what happens in each scenario.
Regards,
/Bruce
[dpdk-dev] [PATCH] examples: remove useless checking
On 4/29/2016 4:48 PM, Mauricio Vasquez B wrote: > The rte_eth_dev_count() function will never return a value greater > than RTE_MAX_ETHPORTS, so that checking is useless. > > Signed-off-by: Mauricio Vasquez B studenti.polito.it> Patch looks good to me. Only there is one missed in examples/kni/main.c, can you please include that one too? Thanks, ferruh
[dpdk-dev] [PATCH] nfp: fixing a bug when gather
On Tue, Apr 26, 2016 at 02:06:36PM +0100, Alejandro Lucero wrote:
> mbufs where not properly released when they are chained.
>
> Fixes: b812daadad0d ("nfp: add Rx and Tx")
>
> Signed-off-by: Alejandro Lucero
> ---
> drivers/net/nfp/nfp_net.c | 21 ++---
> 1 file changed, 10 insertions(+), 11 deletions(-)
Applied to dpdk-next-net/rel_16_07
/Bruce
[dpdk-dev] [PATCH] nfp: add flag for enabling device hotplug
On Tue, Apr 26, 2016 at 02:10:25PM +0100, Alejandro Lucero wrote:
> RTE_PCI_DRV_DETACHABLE is required for detaching a device
> during execution.
>
> Signed-off-by: Alejandro Lucero
> ---
> drivers/net/nfp/nfp_net.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
> index 1259d2c..ea5a2a3 100644
> --- a/drivers/net/nfp/nfp_net.c
> +++ b/drivers/net/nfp/nfp_net.c
> @@ -2466,7 +2466,8 @@ static struct eth_driver rte_nfp_net_pmd = {
> {
> .name = "rte_nfp_net_pmd",
> .id_table = pci_id_nfp_net_map,
> - .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
> + .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC |
> + RTE_PCI_DRV_DETACHABLE,
> },
> .eth_dev_init = nfp_net_init,
> .dev_private_size = sizeof(struct nfp_net_adapter),
> --
> 1.9.1
>
Applied to dpdk-next-net/rel_16_07
/Bruce
[dpdk-dev] [PATCH v2] mk: add rpath for applications
Add default library output folder to the library search folder.
This is useful for development environment, in production environment
DPDK libraries already should be in know locations.
Patch removes requirement to set LD_LIBRARY_PATH variable when DPDK
compiled as shared library.
Signed-off-by: Ferruh Yigit
---
mk/rte.app.mk| 4
scripts/test-null.sh | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index c66e491..0914e4c 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -185,6 +185,10 @@ LDLIBS += $(_LDLIBS-y) $(CPU_LDLIBS) $(EXTRA_LDLIBS)
LDLIBS := $(shell echo $(LDLIBS) | \
awk '{for (i = 1; i <= NF; i++) { if (!seen[$$i]++) print $$i }}')
+ifeq ($(RTE_DEVEL_BUILD)$(CONFIG_RTE_BUILD_SHARED_LIB),yy)
+LDFLAGS += -rpath=$(RTE_SDK_BIN)/lib
+endif
+
.PHONY: all
all: install
diff --git a/scripts/test-null.sh b/scripts/test-null.sh
index ef6d800..32a47b1 100755
--- a/scripts/test-null.sh
+++ b/scripts/test-null.sh
@@ -36,7 +36,6 @@ build=${1:-build}
coremask=${2:-3} # default using cores 0 and 1
if grep -q SHARED_LIB=y $build/.config; then
- export LD_LIBRARY_PATH=$build/lib:$LD_LIBRARY_PATH
pmd='-d librte_pmd_null.so'
fi
--
2.5.5
[dpdk-dev] [PATCH v2 1/4] ixgbe: rearrange vector PMD code for x86
On Tue, Apr 26, 2016 at 09:50:40PM +0800, Jianbo Liu wrote: > move common code to new file "ixgbe_rxtx_vec_common.h", > and vPMD for x86 is implemented in ixgbe_rxtx_vec.c > > Signed-off-by: Jianbo Liu > Suggested-by: Bruce Richardson > --- > drivers/net/ixgbe/ixgbe_rxtx_vec.c| 256 +-- > drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 325 > ++ > 2 files changed, 333 insertions(+), 248 deletions(-) > create mode 100644 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h > Hi Jianbo, thanks for this, it looks a better approach to me. However, be aware that the following commit for ixgbe code cleanup has already been applied to the next-net/rel_16_07 branch and your patches need to take it account: http://dpdk.org/browse/next/dpdk-next-net/commit/?h=rel_16_07&id=3b060a97b18a88652bd401240c004f604739f6d2 Patch 1 does not apply cleanly because of this cleanup change, and, more importantly, the cleanups are not preserved when moving the code to the new header file. Can you please rework the patches off the top of the dpdk-next-net/rel_16_07 branch so that we don't lose these cleanups. Thanks, /Bruce
[dpdk-dev] [PATCH] app/test: fix +/-1 error in allocation
A bug has been detected by valgrind:
==14406== Invalid write of size 1
==14406==by 0x86ECC76: sprintf (in /usr/lib/libc-2.23.so)
==14406==by 0x430B0A: commands_init (in
/home/jviki/Projects/dpdk/dpdk-soc/build/app/test)
==14406==by 0x42F215: main (in
/home/jviki/Projects/dpdk/dpdk-soc/build/app/test)
==14406== Address 0x9d72ff2 is 0 bytes after a block of size 1,346 alloc'd
==14406==at 0x78C1BD0: malloc (in
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==14406==by 0x430AE4: commands_init (in
/home/jviki/Projects/dpdk/dpdk-soc/build/app/test)
==14406==by 0x42F215: main (in
/home/jviki/Projects/dpdk/dpdk-soc/build/app/test)
==14406==
The commands buffer is exactly 1346 B long so there is an access just after
the buffer. The sprintf always writes '\0' at the end of the string. The '#'
separator adds 1 B more to each string. This is correct until the last string
is sprinted there. The last one is 1 B longer then expected, i.e.:
strlen(t->command) + strlen("#") + ONE_FOR_ZERO
Fixes: 727909c59231 ("app/test: introduce dynamic commands list")
Signed-off-by: Jan Viktorin
---
app/test/commands.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/test/commands.c b/app/test/commands.c
index 9cb9606..e0af8e4 100644
--- a/app/test/commands.c
+++ b/app/test/commands.c
@@ -439,7 +439,7 @@ int commands_init(void)
commands_len += strlen(t->command) + 1;
}
- commands = malloc(commands_len);
+ commands = malloc(commands_len + 1);
if (!commands)
return -1;
--
2.8.0
[dpdk-dev] [PATCH v2] examples: remove useless checking
The rte_eth_dev_count() function will never return a value greater than RTE_MAX_ETHPORTS, so that checking is useless. Signed-off-by: Mauricio Vasquez B --- v2: Add missed case in examples/kni/main.c app/proc_info/main.c | 4 app/test/test_pmd_perf.c | 3 --- doc/guides/sample_app_ug/l2_forward_job_stats.rst| 3 --- doc/guides/sample_app_ug/l2_forward_real_virtual.rst | 3 --- doc/guides/sample_app_ug/link_status_intr.rst| 3 --- examples/dpdk_qat/main.c | 2 -- examples/ip_fragmentation/main.c | 4 +--- examples/ip_reassembly/main.c| 4 +--- examples/ipsec-secgw/ipsec-secgw.c | 4 examples/kni/main.c | 2 -- examples/l2fwd-crypto/main.c | 3 --- examples/l2fwd-ivshmem/host/host.c | 3 --- examples/l2fwd-jobstats/main.c | 3 --- examples/l2fwd-keepalive/main.c | 3 --- examples/l2fwd/main.c| 3 --- examples/l3fwd-acl/main.c| 2 -- examples/l3fwd-power/main.c | 3 --- examples/l3fwd-vf/main.c | 2 -- examples/l3fwd/main.c| 2 -- examples/link_status_interrupt/main.c| 3 --- examples/multi_process/l2fwd_fork/main.c | 3 --- examples/performance-thread/l3fwd-thread/main.c | 2 -- examples/tep_termination/main.c | 2 -- examples/vhost/main.c| 2 -- examples/vhost_xen/main.c| 2 -- examples/vmdq/main.c | 2 -- examples/vmdq_dcb/main.c | 2 -- 27 files changed, 2 insertions(+), 72 deletions(-) diff --git a/app/proc_info/main.c b/app/proc_info/main.c index 341176d..5f83092 100644 --- a/app/proc_info/main.c +++ b/app/proc_info/main.c @@ -327,10 +327,6 @@ main(int argc, char **argv) if (nb_ports == 0) rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n"); - - if (nb_ports > RTE_MAX_ETHPORTS) - nb_ports = RTE_MAX_ETHPORTS; - /* If no port mask was specified*/ if (enabled_port_mask == 0) enabled_port_mask = 0x; diff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c index 59803f7..3d56cd2 100644 --- a/app/test/test_pmd_perf.c +++ b/app/test/test_pmd_perf.c @@ -709,9 +709,6 @@ test_pmd_perf(void) return -1; } - if (nb_ports > RTE_MAX_ETHPORTS) - nb_ports = RTE_MAX_ETHPORTS; - nb_lcores = rte_lcore_count(); memset(lcore_conf, 0, sizeof(lcore_conf)); diff --git a/doc/guides/sample_app_ug/l2_forward_job_stats.rst b/doc/guides/sample_app_ug/l2_forward_job_stats.rst index 03d9977..2444e36 100644 --- a/doc/guides/sample_app_ug/l2_forward_job_stats.rst +++ b/doc/guides/sample_app_ug/l2_forward_job_stats.rst @@ -238,9 +238,6 @@ in the *DPDK Programmer's Guide* and the *DPDK API Reference*. if (nb_ports == 0) rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n"); -if (nb_ports > RTE_MAX_ETHPORTS) -nb_ports = RTE_MAX_ETHPORTS; - /* reset l2fwd_dst_ports */ for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++) diff --git a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst index e77d67c..b51b2dc 100644 --- a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst +++ b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst @@ -242,9 +242,6 @@ in the *DPDK Programmer's Guide* - Rel 1.4 EAR and the *DPDK API Reference*. if (nb_ports == 0) rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n"); -if (nb_ports > RTE_MAX_ETHPORTS) -nb_ports = RTE_MAX_ETHPORTS; - /* reset l2fwd_dst_ports */ for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++) diff --git a/doc/guides/sample_app_ug/link_status_intr.rst b/doc/guides/sample_app_ug/link_status_intr.rst index a4dbb54..779df97 100644 --- a/doc/guides/sample_app_ug/link_status_intr.rst +++ b/doc/guides/sample_app_ug/link_status_intr.rst @@ -145,9 +145,6 @@ To fully understand this code, it is recommended to study the chapters that rela if (nb_ports == 0) rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n"); -if (nb_ports > RTE_MAX_ETHPORTS) -nb_ports = RTE_MAX_ETHPORTS; - /* * Each logical core is assigned a dedicated TX queue on each port. */ diff --git a/examples/dpdk_qat/main.c b/examples/dpdk_qat/main.c index dc68989..3c6112d 100644 --- a/examples/dpdk_qat/main.c +++ b/examples/dpdk_qat/main.c @@ -661,8 +661,6 @@ main(int argc, char **argv) return -1; nb_ports = rte_eth_dev_count(); - if (nb_ports > RTE_MAX_ETHPORTS) - nb_port
[dpdk-dev] [PATCH v4 1/3] bnx2x: refactor Tx routine for single doorbell mechanism
Change the Tx routine logic to ring the doorbell once per burst and not
on every Tx packet. This driver-level optimization is necessary to achieve
line rates for larger frame sizes (1k or more).
Fixes: 540a211084a7 ("bnx2x: driver core")
Signed-off-by: Rasesh Mody
Signed-off-by: Harish Patil
---
drivers/net/bnx2x/bnx2x.c | 207 ++--
drivers/net/bnx2x/bnx2x.h |4 +-
drivers/net/bnx2x/bnx2x_rxtx.c | 45 -
3 files changed, 118 insertions(+), 138 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 6edb2f9..149fdef 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -1293,7 +1293,7 @@ bnx2x_free_tx_pkt(__rte_unused struct bnx2x_fastpath *fp,
struct bnx2x_tx_queue
struct rte_mbuf *tx_mbuf = txq->sw_ring[TX_BD(pkt_idx, txq)];
if (likely(tx_mbuf != NULL)) {
- rte_pktmbuf_free(tx_mbuf);
+ rte_pktmbuf_free_seg(tx_mbuf);
} else {
PMD_RX_LOG(ERR, "fp[%02d] lost mbuf %lu",
fp->index, (unsigned long)TX_BD(pkt_idx, txq));
@@ -2113,147 +2113,128 @@ bnx2x_nic_unload(struct bnx2x_softc *sc, uint32_t
unload_mode, uint8_t keep_link
* the mbuf and return to the caller.
*
* Returns:
- * 0 = Success, !0 = Failure
+ * Number of TX BDs used for the mbuf
* Note the side effect that an mbuf may be freed if it causes a problem.
*/
-int bnx2x_tx_encap(struct bnx2x_tx_queue *txq, struct rte_mbuf **m_head, int
m_pkts)
+uint32_t
+bnx2x_tx_encap(struct bnx2x_tx_queue *txq, struct rte_mbuf *m0)
{
- struct rte_mbuf *m0;
struct eth_tx_start_bd *tx_start_bd;
uint16_t bd_prod, pkt_prod;
- int m_tx;
struct bnx2x_softc *sc;
uint32_t nbds = 0;
- struct bnx2x_fastpath *fp;
sc = txq->sc;
- fp = &sc->fp[txq->queue_id];
bd_prod = txq->tx_bd_tail;
pkt_prod = txq->tx_pkt_tail;
- for (m_tx = 0; m_tx < m_pkts; m_tx++) {
+ txq->sw_ring[TX_BD(pkt_prod, txq)] = m0;
- m0 = *m_head++;
+ tx_start_bd = &txq->tx_ring[TX_BD(bd_prod, txq)].start_bd;
- if (unlikely(txq->nb_tx_avail < 3)) {
- PMD_TX_LOG(ERR, "no enough bds %d/%d",
- bd_prod, txq->nb_tx_avail);
- return -ENOMEM;
- }
+ tx_start_bd->addr =
+ rte_cpu_to_le_64(rte_mbuf_data_dma_addr(m0));
+ tx_start_bd->nbytes = rte_cpu_to_le_16(m0->data_len);
+ tx_start_bd->bd_flags.as_bitfield = ETH_TX_BD_FLAGS_START_BD;
+ tx_start_bd->general_data =
+ (1 << ETH_TX_START_BD_HDR_NBDS_SHIFT);
- txq->sw_ring[TX_BD(pkt_prod, txq)] = m0;
+ tx_start_bd->nbd = rte_cpu_to_le_16(2);
- tx_start_bd = &txq->tx_ring[TX_BD(bd_prod, txq)].start_bd;
-
- tx_start_bd->addr =
- rte_cpu_to_le_64(rte_mbuf_data_dma_addr(m0));
- tx_start_bd->nbytes = rte_cpu_to_le_16(m0->data_len);
- tx_start_bd->bd_flags.as_bitfield = ETH_TX_BD_FLAGS_START_BD;
- tx_start_bd->general_data =
- (1 << ETH_TX_START_BD_HDR_NBDS_SHIFT);
-
- tx_start_bd->nbd = rte_cpu_to_le_16(2);
+ if (m0->ol_flags & PKT_TX_VLAN_PKT) {
+ tx_start_bd->vlan_or_ethertype =
+ rte_cpu_to_le_16(m0->vlan_tci);
+ tx_start_bd->bd_flags.as_bitfield |=
+ (X_ETH_OUTBAND_VLAN <<
+ETH_TX_BD_FLAGS_VLAN_MODE_SHIFT);
+ } else {
+ if (IS_PF(sc))
+ tx_start_bd->vlan_or_ethertype =
+ rte_cpu_to_le_16(pkt_prod);
+ else {
+ struct ether_hdr *eh =
+ rte_pktmbuf_mtod(m0, struct ether_hdr *);
- if (m0->ol_flags & PKT_TX_VLAN_PKT) {
tx_start_bd->vlan_or_ethertype =
- rte_cpu_to_le_16(m0->vlan_tci);
- tx_start_bd->bd_flags.as_bitfield |=
- (X_ETH_OUTBAND_VLAN <<
-ETH_TX_BD_FLAGS_VLAN_MODE_SHIFT);
- } else {
- if (IS_PF(sc))
- tx_start_bd->vlan_or_ethertype =
- rte_cpu_to_le_16(pkt_prod);
- else {
- struct ether_hdr *eh
- = rte_pktmbuf_mtod(m0, struct ether_hdr *);
-
- tx_start_bd->vlan_or_ethertype
- =
rte_cpu_to_le_16(rte_be_to_cpu_16(eh->ether_type));
- }
+rte_cpu_to_le_16(rte_be_to_cpu_16(eh->ether_type));
}
+ }
- bd_prod = NEXT_TX_BD(bd_prod);
- if (IS_VF(sc)) {
-
[dpdk-dev] [PATCH v4 2/3] bnx2x: enhance stats get
Enhance the stats_get() routine to display drop counters under
imissed counter.
Added extended stats get support to provide additional info.
Encorporated review comment to rename some of the stats.
Signed-off-by: Rasesh Mody
Signed-off-by: Harish Patil
---
doc/guides/nics/overview.rst |2 +-
drivers/net/bnx2x/bnx2x_ethdev.c | 76 ++
drivers/net/bnx2x/bnx2x_rxtx.c |2 +
3 files changed, 79 insertions(+), 1 deletion(-)
diff --git a/doc/guides/nics/overview.rst b/doc/guides/nics/overview.rst
index f08039e..70b0caf 100644
--- a/doc/guides/nics/overview.rst
+++ b/doc/guides/nics/overview.rst
@@ -128,7 +128,7 @@ Most of these differences are summarized below.
Packet type parsing Y Y Y Y Y Y Y Y Y Y Y Y Y Y
Timesync Y Y Y Y Y
Basic statsY Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y
Y Y Y Y Y
- Extended stats Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y
Y Y
+ Extended stats Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y
Y Y
Stats per queue Y Y Y Y Y Y Y Y Y
Y Y Y
EEPROM dump Y Y Y
Registers dump Y Y Y Y Y Y
diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index 071b44f..062ffbc 100644
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -276,6 +276,9 @@ static void
bnx2x_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
{
struct bnx2x_softc *sc = dev->data->dev_private;
+ uint32_t brb_truncate_discard;
+ uint64_t brb_drops;
+ uint64_t brb_truncates;
PMD_INIT_FUNC_TRACE();
@@ -316,6 +319,77 @@ bnx2x_dev_stats_get(struct rte_eth_dev *dev, struct
rte_eth_stats *stats)
stats->rx_nombuf =
HILO_U64(sc->eth_stats.no_buff_discard_hi,
sc->eth_stats.no_buff_discard_lo);
+
+ brb_drops =
+ HILO_U64(sc->eth_stats.brb_drop_hi,
+sc->eth_stats.brb_drop_lo);
+
+ brb_truncates =
+ HILO_U64(sc->eth_stats.brb_truncate_hi,
+sc->eth_stats.brb_truncate_lo);
+
+ brb_truncate_discard = sc->eth_stats.brb_truncate_discard;
+
+ stats->imissed = brb_drops + brb_truncates +
+brb_truncate_discard + stats->rx_nombuf;
+}
+
+#define BNX2X_EXTENDED_STATS 9
+
+static int
+bnx2x_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstats *xstats,
+unsigned int n)
+{
+ struct bnx2x_softc *sc = dev->data->dev_private;
+ unsigned int num = BNX2X_EXTENDED_STATS;
+
+ if (n < num)
+ return num;
+
+ num = 0;
+
+ bnx2x_stats_handle(sc, STATS_EVENT_UPDATE);
+
+ snprintf(xstats[num].name, sizeof(xstats[num].name), "rx_buf_drops");
+ xstats[num++].value = HILO_U64(sc->eth_stats.brb_drop_hi,
+ sc->eth_stats.brb_drop_lo);
+
+ snprintf(xstats[num].name, sizeof(xstats[num].name),
+"rx_buf_truncates");
+ xstats[num++].value = HILO_U64(sc->eth_stats.brb_truncate_hi,
+ sc->eth_stats.brb_truncate_lo);
+
+ snprintf(xstats[num].name, sizeof(xstats[num].name),
+"rx_buf_truncate_discard");
+ xstats[num++].value = sc->eth_stats.brb_truncate_discard;
+
+ snprintf(xstats[num].name, sizeof(xstats[num].name),
+"mac_filter_discard");
+ xstats[num++].value = sc->eth_stats.mac_filter_discard;
+
+ snprintf(xstats[num].name, sizeof(xstats[num].name),
+"no_match_vlan_tag_discard");
+ xstats[num++].value = sc->eth_stats.mf_tag_discard;
+
+ snprintf(xstats[num].name, sizeof(xstats[num].name), "tx_pause");
+ xstats[num++].value = HILO_U64(sc->eth_stats.pause_frames_sent_hi,
+ sc->eth_stats.pause_frames_sent_lo);
+
+ snprintf(xstats[num].name, sizeof(xstats[num].name), "rx_pause");
+ xstats[num++].value = HILO_U64(sc->eth_stats.pause_frames_received_hi,
+ sc->eth_stats.pause_frames_received_lo);
+
+ snprintf(xstats[num].name, sizeof(xstats[num].name),
+"tx_prio_flow_ctrl");
+ xstats[num++].value = HILO_U64(sc->eth_stats.pfc_frames_sent_hi,
+ sc->eth_stats.pfc_frames_sent_lo);
+
+ snprintf(xstats[num].name, sizeof(xstats[num].name),
+"rx_prio_flow_ctrl");
+ xstats[num++].value = HILO_U64(sc->eth_stats.pfc_frames_received_hi,
+ sc->eth_stats.pfc_frames_received_lo);
+
+ return num;
}
static void
@@ -360,6 +434,7 @@ static const struct eth_dev_ops bnx2x_eth_dev_ops = {
.allmulticast_dis
[dpdk-dev] [PATCH v4 3/3] bnx2x: update PMD version to 1.0.1.1
Signed-off-by: Rasesh Mody
Signed-off-by: Harish Patil
---
drivers/net/bnx2x/bnx2x.c |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 149fdef..dcd21f8 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -32,18 +32,20 @@
#define BNX2X_PMD_VER_PREFIX "BNX2X PMD"
#define BNX2X_PMD_VERSION_MAJOR 1
#define BNX2X_PMD_VERSION_MINOR 0
-#define BNX2X_PMD_VERSION_PATCH 0
+#define BNX2X_PMD_VERSION_REVISION 1
+#define BNX2X_PMD_VERSION_PATCH 1
static inline const char *
bnx2x_pmd_version(void)
{
static char version[32];
- snprintf(version, sizeof(version), "%s %s_%d.%d.%d",
+ snprintf(version, sizeof(version), "%s %s_%d.%d.%d.%d",
BNX2X_PMD_VER_PREFIX,
BNX2X_DRIVER_VERSION,
BNX2X_PMD_VERSION_MAJOR,
BNX2X_PMD_VERSION_MINOR,
+ BNX2X_PMD_VERSION_REVISION,
BNX2X_PMD_VERSION_PATCH);
return version;
--
1.7.10.3
