[Bug 1043] [dpdk-22.07]vm2vm_virtio_net_perf_cbdma/vm2vm_split_ring_iperf_with_tso_and_cbdma_enable: iperf test no data between 2 VMs
https://bugs.dpdk.org/show_bug.cgi?id=1043 lingwei (weix.l...@intel.com) changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED --- Comment #2 from lingwei (weix.l...@intel.com) --- Verified based on DPDK-22.07-rc2 with the local patch PASSED. OS: Ubuntu 22.04 LTS/Linux 5.15.45-051545-generic -- You are receiving this mail because: You are the assignee for the bug.
[Bug 1028] [dpdk-22.07] dynamic_queue/txq_setup: after set “port 0 txq 1 stop”, this stopped queue not display transmits 255 packets
https://bugs.dpdk.org/show_bug.cgi?id=1028 linglix.c...@intel.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |INVALID --- Comment #3 from linglix.c...@intel.com --- sync with dev and confirm that rxq/txq stats after stop is dpdk requirement changed, modify testcase in dts and close this bug. -- You are receiving this mail because: You are the assignee for the bug.
Re: [PATCH 00/10] ethdev: cleanup deprecated defines
On 8/4/22 22:29, Stephen Hemminger wrote: On Thu, 4 Aug 2022 22:05:52 +0300 Andrew Rybchenko wrote: Remove deprecated because of invalid namespace defines. Andrew Rybchenko (10): ethdev: remove deprecated link speed and duplex defines ethdev: remove deprecated Rx and Tx multi-queue mode defines ethdev: remove deprecated defines for RSS configuration ethdev: remove deprecated Rx and Tx offload defines ethdev: remove deprecated DCB and VMDq defines ethdev: remove deprecated tunnel type defines ethdev: remove deprecated flow control defines ethdev: remove deprecated VLAN offload configuration defines ethdev: remove deprecated maximum Rx MAC addresses define ethdev: remove deprecated metadata dynamic fields defines doc/guides/rel_notes/release_22_11.rst | 34 lib/ethdev/rte_ethdev.h| 242 - lib/ethdev/rte_flow.h | 4 - 3 files changed, 34 insertions(+), 246 deletions(-) Looks good. I assume the flow director (FDIR) defines should also go away in this release when it is removed. Yes, I wanted but simply forgot to mention it in the cover letter. FDIR defines are covered by fdir cleanup patch series [1]. I decided that it does not deserve separate patch. [1] https://patches.dpdk.org/project/dpdk/patch/20220803111358.375544-4-andrew.rybche...@oktetlabs.ru/ Series-Acked-by: Stephen Hemminger Thanks for the review, Stephen.
[PATCH] mbuf: remove deprecated offload flags
Remove deprecated ``PKT_*`` flags. Use corresponding flags with
``RTE_MBUF_F_`` prefix instead.
Signed-off-by: Andrew Rybchenko
---
doc/guides/rel_notes/release_22_11.rst | 3 +
lib/mbuf/rte_mbuf_core.h | 113 -
2 files changed, 3 insertions(+), 113 deletions(-)
diff --git a/doc/guides/rel_notes/release_22_11.rst
b/doc/guides/rel_notes/release_22_11.rst
index 8c021cf050..7052a55dfc 100644
--- a/doc/guides/rel_notes/release_22_11.rst
+++ b/doc/guides/rel_notes/release_22_11.rst
@@ -84,6 +84,9 @@ API Changes
Also, make sure to start the actual text at the margin.
===
+* mbuf: Removed deprecated ``PKT_*`` flags.
+ Use corresponding flags with ``RTE_MBUF_F_`` prefix instead.
+
ABI Changes
---
diff --git a/lib/mbuf/rte_mbuf_core.h b/lib/mbuf/rte_mbuf_core.h
index 3d6ddd6773..a59bb6d3ad 100644
--- a/lib/mbuf/rte_mbuf_core.h
+++ b/lib/mbuf/rte_mbuf_core.h
@@ -48,23 +48,18 @@ extern "C" {
* present.
*/
#define RTE_MBUF_F_RX_VLAN (1ULL << 0)
-#define PKT_RX_VLAN RTE_DEPRECATED(PKT_RX_VLAN) RTE_MBUF_F_RX_VLAN
/** RX packet with RSS hash result. */
#define RTE_MBUF_F_RX_RSS_HASH (1ULL << 1)
-#define PKT_RX_RSS_HASH RTE_DEPRECATED(PKT_RX_RSS_HASH) RTE_MBUF_F_RX_RSS_HASH
/** RX packet with FDIR match indicate. */
#define RTE_MBUF_F_RX_FDIR (1ULL << 2)
-#define PKT_RX_FDIR RTE_DEPRECATED(PKT_RX_FDIR) RTE_MBUF_F_RX_FDIR
/**
* This flag is set when the outermost IP header checksum is detected as
* wrong by the hardware.
*/
#define RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD (1ULL << 5)
-#define PKT_RX_OUTER_IP_CKSUM_BAD RTE_DEPRECATED(PKT_RX_OUTER_IP_CKSUM_BAD) \
- RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD
/**
* A vlan has been stripped by the hardware and its tci is saved in
@@ -73,8 +68,6 @@ extern "C" {
* When RTE_MBUF_F_RX_VLAN_STRIPPED is set, RTE_MBUF_F_RX_VLAN must also be
set.
*/
#define RTE_MBUF_F_RX_VLAN_STRIPPED (1ULL << 6)
-#define PKT_RX_VLAN_STRIPPED RTE_DEPRECATED(PKT_RX_VLAN_STRIPPED) \
- RTE_MBUF_F_RX_VLAN_STRIPPED
/**
* Mask of bits used to determine the status of RX IP checksum.
@@ -85,21 +78,11 @@ extern "C" {
* data, but the integrity of the IP header is verified.
*/
#define RTE_MBUF_F_RX_IP_CKSUM_MASK ((1ULL << 4) | (1ULL << 7))
-#define PKT_RX_IP_CKSUM_MASK RTE_DEPRECATED(PKT_RX_IP_CKSUM_MASK) \
- RTE_MBUF_F_RX_IP_CKSUM_MASK
#define RTE_MBUF_F_RX_IP_CKSUM_UNKNOWN 0
#define RTE_MBUF_F_RX_IP_CKSUM_BAD (1ULL << 4)
#define RTE_MBUF_F_RX_IP_CKSUM_GOOD(1ULL << 7)
#define RTE_MBUF_F_RX_IP_CKSUM_NONE((1ULL << 4) | (1ULL << 7))
-#define PKT_RX_IP_CKSUM_UNKNOWN RTE_DEPRECATED(PKT_RX_IP_CKSUM_UNKNOWN) \
- RTE_MBUF_F_RX_IP_CKSUM_UNKNOWN
-#define PKT_RX_IP_CKSUM_BAD RTE_DEPRECATED(PKT_RX_IP_CKSUM_BAD) \
- RTE_MBUF_F_RX_IP_CKSUM_BAD
-#define PKT_RX_IP_CKSUM_GOOD RTE_DEPRECATED(PKT_RX_IP_CKSUM_GOOD) \
- RTE_MBUF_F_RX_IP_CKSUM_GOOD
-#define PKT_RX_IP_CKSUM_NONE RTE_DEPRECATED(PKT_RX_IP_CKSUM_NONE) \
- RTE_MBUF_F_RX_IP_CKSUM_NONE
/**
* Mask of bits used to determine the status of RX L4 checksum.
@@ -110,41 +93,23 @@ extern "C" {
* data, but the integrity of the L4 data is verified.
*/
#define RTE_MBUF_F_RX_L4_CKSUM_MASK ((1ULL << 3) | (1ULL << 8))
-#define PKT_RX_L4_CKSUM_MASK RTE_DEPRECATED(PKT_RX_L4_CKSUM_MASK) \
- RTE_MBUF_F_RX_L4_CKSUM_MASK
#define RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN 0
#define RTE_MBUF_F_RX_L4_CKSUM_BAD (1ULL << 3)
#define RTE_MBUF_F_RX_L4_CKSUM_GOOD(1ULL << 8)
#define RTE_MBUF_F_RX_L4_CKSUM_NONE((1ULL << 3) | (1ULL << 8))
-#define PKT_RX_L4_CKSUM_UNKNOWN RTE_DEPRECATED(PKT_RX_L4_CKSUM_UNKNOWN) \
- RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN
-#define PKT_RX_L4_CKSUM_BAD RTE_DEPRECATED(PKT_RX_L4_CKSUM_BAD) \
- RTE_MBUF_F_RX_L4_CKSUM_BAD
-#define PKT_RX_L4_CKSUM_GOOD RTE_DEPRECATED(PKT_RX_L4_CKSUM_GOOD) \
- RTE_MBUF_F_RX_L4_CKSUM_GOOD
-#define PKT_RX_L4_CKSUM_NONE RTE_DEPRECATED(PKT_RX_L4_CKSUM_NONE) \
- RTE_MBUF_F_RX_L4_CKSUM_NONE
/** RX IEEE1588 L2 Ethernet PT Packet. */
#define RTE_MBUF_F_RX_IEEE1588_PTP (1ULL << 9)
-#define PKT_RX_IEEE1588_PTP RTE_DEPRECATED(PKT_RX_IEEE1588_PTP) \
- RTE_MBUF_F_RX_IEEE1588_PTP
/** RX IEEE1588 L2/L4 timestamped packet.*/
#define RTE_MBUF_F_RX_IEEE1588_TMST (1ULL << 10)
-#define PKT_RX_IEEE1588_TMST RTE_DEPRECATED(PKT_RX_IEEE1588_TMST) \
- RTE_MBUF_F_RX_IEEE1588_TMST
/** FD id reported if FDIR match. */
#define RTE_MBUF_F_RX_FDIR_ID (1ULL << 13)
-#define PKT_RX_FDIR_ID RTE_DEPRECATED(PKT_RX_FDIR_ID) \
- RTE_MBUF_F_RX_FDIR_ID
/** Flexible bytes reported if FDIR match. */
#define RTE_MBUF_F_RX_FDIR_FLX (1ULL << 14)
-#define PKT_RX_FDIR_FLX RTE_DEPRECATED(PKT_RX_FDIR_FLX) \
- RTE_MBUF_F_RX_FDIR_FLX
/**
* The outer VLA
RE: [PATCH 3/3] crypto/qat: compilation fix for GCC-12
> -Original Message- > From: Amit Prakash Shukla > Sent: Thursday, August 4, 2022 2:41 PM > To: Zhang, Roy Fan > Cc: dev@dpdk.org; jer...@marvell.com; Amit Prakash Shukla > > Subject: [PATCH 3/3] crypto/qat: compilation fix for GCC-12 > > GCC 12 raises the following warning: > > from ../lib/eal/x86/include/rte_vect.h:31, > from ../lib/eal/x86/include/rte_memcpy.h:17, > from ../drivers/crypto/qat/qat_sym_session.c:10: > In function '_mm_storeu_si128', > inlined from 'rte_mov16' at > ../lib/eal/x86/include/rte_memcpy.h:508:2, > inlined from 'rte_mov128' at > ../lib/eal/x86/include/rte_memcpy.h:542:2, > inlined from 'rte_memcpy_generic' at > ../lib/eal/x86/include/rte_memcpy.h:732:4, > inlined from 'rte_memcpy' at > ../lib/eal/x86/include/rte_memcpy.h:882:10, > inlined from 'qat_sym_do_precomputes.constprop' at > ../drivers/crypto/qat/qat_sym_session.c:1434:2: > /usr/lib/gcc/x86_64-pc-linux-gnu/12.1.1/include/emmintrin.h:739:8: error: > array subscript 8 is outside array bounds of 'unsigned char[128]' > [-Werror=array-bounds] > 739 | *__P = __B; > | ~^ > > ../drivers/crypto/qat/qat_sym_session.c: > In function 'qat_sym_do_precomputes.constprop': > ../drivers/crypto/qat/qat_sym_session.c:1305:17: note: > at offset 192 into object 'opad.750' of size 128 > 1305 | uint8_t > > opad[qat_hash_get_block_size(ICP_QAT_HW_AUTH_ALGO_DELIMITER)]; > | ^~~~ > > ../drivers/crypto/qat/qat_sym_session.c: > In function 'qat_sym_do_precomputes.constprop': > ../drivers/crypto/qat/qat_sym_session.c:1304:17: note: > at offset 128 into object 'ipad.749' of size 128 > 1304 | uint8_t > > ipad[qat_hash_get_block_size(ICP_QAT_HW_AUTH_ALGO_DELIMITER)]; > | ^~~~ > > Added a check to prevent compiler warnings. > > Signed-off-by: Amit Prakash Shukla > --- Thanks for the help! The commit log could be shorter. Could you provide a V3 for that? Apart from that Acked-by: Fan Zhang
RE: [EXT] [dpdk-dev v1] lib/cryptodev: multi-process IPC request handler
Hi Akhil, > -Original Message- > From: Akhil Goyal > Sent: Wednesday, July 27, 2022 5:26 AM > To: Ji, Kai ; dev@dpdk.org > Cc: Anoob Joseph ; hemant.agra...@nxp.com; > Zhang, Roy Fan ; Chandubabu Namburu > ; Ruifeng Wang ; > ajit.khapa...@broadcom.com; Michael Shamis ; > Nagadheeraj Rottela ; ma...@nvidia.com; Jay > Zhou > Subject: RE: [EXT] [dpdk-dev v1] lib/cryptodev: multi-process IPC request > handler > > This is a library change you should cc all PMD owners while sending patch. Kai is in holiday at the moment and will be back in a week. I will sync with him then. > > > This patch add in multi-process IPC request handler function in rte > > cryptodev. This function intend to support a queue-pair configuration > > request to allow the secondary process to reconfigure the queue-pair > > setup'ed by the primary process. > > Who will release the queue pair already setup by primary in the first place? Fan: If the queue pair already setup by primary the secondary shall not recreate it but use it instead. > Currently, all queues are setup by primary and secondary uses them. > So if a queue is re-initialized by secondary, and if it is being used in > primary > process, > Wont that drop packets abruptly if the queue is re-initialized? You are right. What about creating a variable in the queue pair with either PID or thread id who own the queue pair? > > Also, I see register API but not deregister. There will be V2 for that. Regards, Fan
[PATCH] ring: compilation fix with GCC-12
GCC 12 raises the following warning:
In function '__rte_ring_dequeue_elems_128',
inlined from '__rte_ring_dequeue_elems' at
../lib/ring/rte_ring_elem_pvt.h:262:3,
inlined from '__rte_ring_do_hts_dequeue_elem' at
../lib/ring/rte_ring_hts_elem_pvt.h:237:3,
inlined from 'rte_ring_mc_hts_dequeue_bulk_elem' at
../lib/ring/rte_ring_hts.h:83:9,
inlined from 'rte_ring_dequeue_bulk_elem' at
../lib/ring/rte_ring_elem.h:391:10,
inlined from 'rte_ring_dequeue_elem' at
../lib/ring/rte_ring_elem.h:476:9,
inlined from 'rte_ring_dequeue' at
../lib/ring/rte_ring.h:463:9,
inlined from 'rxa_intr_ring_dequeue' at
../lib/eventdev/rte_event_eth_rx_adapter.c:1196:10:
../lib/ring/rte_ring_elem_pvt.h:234:25: error: 'memcpy' writing
32 bytes into a region of size 8 overflows the destination
[-Werror=stringop-overflow=]
234 |memcpy((void *)(obj + i), (void *)(ring + idx), 32);
|^~~
Replacing memcpy with rte_memcpy fixes the GCC-12 compilation issue.
Also it would be better to change to rte_memcpy as the function is
called in fastpath.
Bugzilla ID: 1062
Fixes: 1fc73390bcf5 ("ring: refactor exported headers")
Cc: sta...@dpdk.org
Signed-off-by: Amit Prakash Shukla
---
lib/ring/rte_ring_elem_pvt.h | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/lib/ring/rte_ring_elem_pvt.h b/lib/ring/rte_ring_elem_pvt.h
index 83788c56e6..3d85b1 100644
--- a/lib/ring/rte_ring_elem_pvt.h
+++ b/lib/ring/rte_ring_elem_pvt.h
@@ -10,6 +10,8 @@
#ifndef _RTE_RING_ELEM_PVT_H_
#define _RTE_RING_ELEM_PVT_H_
+#include
+
static __rte_always_inline void
__rte_ring_enqueue_elems_32(struct rte_ring *r, const uint32_t size,
uint32_t idx, const void *obj_table, uint32_t n)
@@ -97,20 +99,20 @@ __rte_ring_enqueue_elems_128(struct rte_ring *r, uint32_t
prod_head,
const rte_int128_t *obj = (const rte_int128_t *)obj_table;
if (likely(idx + n <= size)) {
for (i = 0; i < (n & ~0x1); i += 2, idx += 2)
- memcpy((void *)(ring + idx),
+ rte_memcpy((void *)(ring + idx),
(const void *)(obj + i), 32);
switch (n & 0x1) {
case 1:
- memcpy((void *)(ring + idx),
+ rte_memcpy((void *)(ring + idx),
(const void *)(obj + i), 16);
}
} else {
for (i = 0; idx < size; i++, idx++)
- memcpy((void *)(ring + idx),
+ rte_memcpy((void *)(ring + idx),
(const void *)(obj + i), 16);
/* Start at the beginning */
for (idx = 0; i < n; i++, idx++)
- memcpy((void *)(ring + idx),
+ rte_memcpy((void *)(ring + idx),
(const void *)(obj + i), 16);
}
}
@@ -231,17 +233,17 @@ __rte_ring_dequeue_elems_128(struct rte_ring *r, uint32_t
prod_head,
rte_int128_t *obj = (rte_int128_t *)obj_table;
if (likely(idx + n <= size)) {
for (i = 0; i < (n & ~0x1); i += 2, idx += 2)
- memcpy((void *)(obj + i), (void *)(ring + idx), 32);
+ rte_memcpy((void *)(obj + i), (void *)(ring + idx), 32);
switch (n & 0x1) {
case 1:
- memcpy((void *)(obj + i), (void *)(ring + idx), 16);
+ rte_memcpy((void *)(obj + i), (void *)(ring + idx), 16);
}
} else {
for (i = 0; idx < size; i++, idx++)
- memcpy((void *)(obj + i), (void *)(ring + idx), 16);
+ rte_memcpy((void *)(obj + i), (void *)(ring + idx), 16);
/* Start at the beginning */
for (idx = 0; i < n; i++, idx++)
- memcpy((void *)(obj + i), (void *)(ring + idx), 16);
+ rte_memcpy((void *)(obj + i), (void *)(ring + idx), 16);
}
}
--
2.25.1
RE: [PATCH 3/6] examples/ipsec-secgw: add lookaside event mode
snip
> > static inline int
> > process_ipsec_ev_inbound(struct ipsec_ctx *ctx, struct route_table *rt,
> > - struct rte_event *ev)
> > + const struct eh_event_link_info *ev_link, struct rte_event *ev)
> > {
> > struct ipsec_sa *sa = NULL;
> > struct rte_mbuf *pkt;
> > @@ -340,7 +437,22 @@ process_ipsec_ev_inbound(struct ipsec_ctx *ctx,
> > struct route_table *rt,
> > goto drop_pkt_and_exit;
> > }
> > break;
> > + case PKT_TYPE_IPSEC_IPV4:
> > + case PKT_TYPE_IPSEC_IPV6:
> > + rte_pktmbuf_adj(pkt, RTE_ETHER_HDR_LEN);
> > + pkt_l3_len_set(pkt);
>
> One small question, in case free_pkts() happens inside pkt_l3_len_set(pkt),
> can the pkt still be used in sad_lookup() below?
> Should return value be added to pkt_l3_len_set() in case pkt free?
>
Hi, thank you for noticing this.
Return value should be checked, I'll address this issue in v2.
> > +
> > + sad_lookup(&ctx->sa_ctx->sad, &pkt, (void **)&sa, 1);
> > + sa = ipsec_mask_saptr(sa);
> > + if (unlikely(sa == NULL)) {
> > + RTE_LOG_DP(DEBUG, IPSEC, "Cannot find sa\n");
> > + goto drop_pkt_and_exit;
> > + }
> >
snip
Re: [PATCH v5 01/12] net/nfp: move app specific attributes to own struct
On 8/5/22 09:32, Chaoyong He wrote:
The NFP Card can load different firmware applications. Currently
only the CoreNIC application is supported. This commit makes
needed infrastructure changes in order to support other firmware
applications too.
Clearer separation is made between the PF device and any application
specific concepts. The PF struct is now generic regardless of the
application loaded. A new struct is also made for the CoreNIC
application. Future additions to support other applications should
also add an applications specific struct.
Signed-off-by: Chaoyong He
Signed-off-by: Heinrich Kuhn
Reviewed-by: Niklas Söderlund
---
drivers/net/nfp/nfp_common.h | 33 +++-
drivers/net/nfp/nfp_ethdev.c | 196 +++
2 files changed, 154 insertions(+), 75 deletions(-)
diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h
index 6d917e4..2aaf1d6 100644
--- a/drivers/net/nfp/nfp_common.h
+++ b/drivers/net/nfp/nfp_common.h
@@ -111,6 +111,14 @@
#include
#include
+/* Firmware application ID's */
+enum nfp_app_id {
+ NFP_APP_CORE_NIC = 0x1,
[snip]
+ NFP_APP_BPF_NIC= 0x2,
+ NFP_APP_FLOWER_NIC = 0x3,
+ NFP_APP_ACTIVE_BUFFER_MGMT_NIC = 0x4,
Above three defines are dead in the patch. I think it would make
subsequent patches more selfcontained if corresponding defines are
added later when they are really required and used.
+};
+
/* nfp_qcp_ptr - Read or Write Pointer of a queue */
enum nfp_qcp_ptr {
NFP_QCP_READ_PTR = 0,
@@ -121,8 +129,10 @@ struct nfp_pf_dev {
/* Backpointer to associated pci device */
struct rte_pci_device *pci_dev;
- /* Array of physical ports belonging to this PF */
- struct nfp_net_hw *ports[NFP_MAX_PHYPORTS];
+ enum nfp_app_id app_id;
+
+ /* Pointer to the app running on the PF */
+ void *app_priv;
/* Current values for control */
uint32_t ctrl;
@@ -151,8 +161,6 @@ struct nfp_pf_dev {
struct nfp_cpp_area *msix_area;
uint8_t *hw_queues;
- uint8_t total_phyports;
- boolmultiport;
union eth_table_entry *eth_table;
@@ -161,6 +169,20 @@ struct nfp_pf_dev {
uint32_t nfp_cpp_service_id;
};
+struct nfp_app_nic {
+ /* Backpointer to the PF device */
+ struct nfp_pf_dev *pf_dev;
+
+ /*
+* Array of physical ports belonging to the this CoreNIC app
+* This is really a list of vNIC's. One for each physical port
+*/
+ struct nfp_net_hw *ports[NFP_MAX_PHYPORTS];
+
+ bool multiport;
+ uint8_t total_phyports;
+};
+
struct nfp_net_hw {
/* Backpointer to the PF this port belongs to */
struct nfp_pf_dev *pf_dev;
@@ -424,6 +446,9 @@ int nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
#define NFP_NET_DEV_PRIVATE_TO_PF(dev_priv)\
(((struct nfp_net_hw *)dev_priv)->pf_dev)
+#define NFP_APP_PRIV_TO_APP_NIC(app_priv)\
+ ((struct nfp_app_nic *)app_priv)
+
Wouldn't it be better if tiny function is used instead.
It should accept struct nfp_pf_dev pointer as an input argument.
It would allow to validate that pf_dev->app_id is NFP_APP_CORE_NIC and
make code more robust.
#endif /* _NFP_COMMON_H_ */
/*
* Local variables:
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 5cdd34e..3c4b0ac 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -39,15 +39,15 @@
#include "nfp_cpp_bridge.h"
static int
-nfp_net_pf_read_mac(struct nfp_pf_dev *pf_dev, int port)
+nfp_net_pf_read_mac(struct nfp_app_nic *app_nic, int port)
{
struct nfp_eth_table *nfp_eth_table;
struct nfp_net_hw *hw = NULL;
/* Grab a pointer to the correct physical port */
- hw = pf_dev->ports[port];
+ hw = app_nic->ports[port];
- nfp_eth_table = nfp_eth_read_ports(pf_dev->cpp);
+ nfp_eth_table = nfp_eth_read_ports(app_nic->pf_dev->cpp);
nfp_eth_copy_mac((uint8_t *)&hw->mac_addr,
(uint8_t *)&nfp_eth_table->ports[port].mac_addr);
@@ -64,6 +64,7 @@
uint32_t new_ctrl, update = 0;
struct nfp_net_hw *hw;
struct nfp_pf_dev *pf_dev;
+ struct nfp_app_nic *app_nic;
struct rte_eth_conf *dev_conf;
struct rte_eth_rxmode *rxmode;
uint32_t intr_vector;
@@ -71,6 +72,7 @@
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
pf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+ app_nic = NFP_APP_PRIV_TO_APP_NIC(pf_dev->app_priv);
PMD_INIT_LOG(DEBUG, "Start");
@@ -82,7 +84,7 @@
/* check and configure queue intr-vector mapping */
if (dev->data->dev_conf.intr_conf.rxq != 0) {
- if (pf_dev->multiport) {
+ if (app_nic->multiport) {
PMD_INIT_LOG(ERR, "PMD rx interrupt is not supported "
Re: [PATCH v5 03/12] net/nfp: move app specific init logic to own function
On 8/5/22 09:32, Chaoyong He wrote:
The NFP card can load different firmware applications.
This commit move the init logic of corenic app of the
secondary process into its own function.
Signed-off-by: Chaoyong He
Reviewed-by: Niklas Söderlund
---
drivers/net/nfp/nfp_ethdev.c | 93 +---
1 file changed, 62 insertions(+), 31 deletions(-)
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 2c5607c..90dd01e 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -936,7 +936,7 @@
break;
default:
PMD_INIT_LOG(ERR, "nfp_net: no device ID matching");
- err = -ENODEV;
+ ret = -ENODEV;
It looks unrelated to the patch and looks as a bug in previous
code/patches which deserves separate fix.
goto pf_cleanup;
}
@@ -991,6 +991,50 @@
return ret;
}
+static int
+nfp_secondary_init_app_nic(struct rte_pci_device *pci_dev,
+ struct nfp_rtsym_table *sym_tbl,
+ struct nfp_cpp *cpp)
+{
+ int i;
+ int err = 0;
+ int ret = 0;
+ int total_vnics;
+ struct nfp_net_hw *hw;
+
+ /* Read the number of vNIC's created for the PF */
+ total_vnics = nfp_rtsym_read_le(sym_tbl, "nfd_cfg_pf0_num_ports", &err);
+ if (err || total_vnics <= 0 || total_vnics > 8) {
Compare err vs 0 explicitly
+ PMD_INIT_LOG(ERR, "nfd_cfg_pf0_num_ports symbol with wrong
value");
+ return -ENODEV;
+ }
+
+ for (i = 0; i < total_vnics; i++) {
+ struct rte_eth_dev *eth_dev;
+ char port_name[RTE_ETH_NAME_MAX_LEN];
+ snprintf(port_name, sizeof(port_name), "%s_port%d",
+ pci_dev->device.name, i);
+
+ PMD_DRV_LOG(DEBUG, "Secondary attaching to port %s", port_name);
+ eth_dev = rte_eth_dev_attach_secondary(port_name);
+ if (eth_dev == NULL) {
+ RTE_LOG(ERR, EAL,
+ "secondary process attach failed, ethdev doesn't
exist");
+ ret = -ENODEV;
+ break;
+ }
+
+ eth_dev->process_private = cpp;
+ hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+ if (nfp_net_ethdev_ops_mount(hw, eth_dev))
+ return -EINVAL;
+
+ rte_eth_dev_probing_finish(eth_dev);
+ }
+
+ return ret;
+}
+
/*
* When attaching to the NFP4000/6000 PF on a secondary process there
* is no need to initialise the PF again. Only minimal work is required
@@ -999,12 +1043,10 @@
static int
nfp_pf_secondary_init(struct rte_pci_device *pci_dev)
{
- int i;
int err = 0;
int ret = 0;
- int total_ports;
+ enum nfp_app_id app_id;
struct nfp_cpp *cpp;
- struct nfp_net_hw *hw;
struct nfp_rtsym_table *sym_tbl;
if (pci_dev == NULL)
@@ -1038,37 +1080,26 @@
return -EIO;
}
- total_ports = nfp_rtsym_read_le(sym_tbl, "nfd_cfg_pf0_num_ports", &err);
- if (err || total_ports <= 0 || total_ports > 8) {
- PMD_INIT_LOG(ERR, "nfd_cfg_pf0_num_ports symbol with wrong
value");
- ret = -ENODEV;
+ /* Read the app ID of the firmware loaded */
+ app_id = nfp_rtsym_read_le(sym_tbl, "_pf0_net_app_id", &err);
+ if (err) {
Compare vs 0
+ PMD_INIT_LOG(ERR, "Couldn't read app_id from fw");
goto sym_tbl_cleanup;
}
- for (i = 0; i < total_ports; i++) {
- struct rte_eth_dev *eth_dev;
- char port_name[RTE_ETH_NAME_MAX_LEN];
-
- snprintf(port_name, sizeof(port_name), "%s_port%d",
-pci_dev->device.name, i);
-
- PMD_DRV_LOG(DEBUG, "Secondary attaching to port %s", port_name);
- eth_dev = rte_eth_dev_attach_secondary(port_name);
- if (eth_dev == NULL) {
- RTE_LOG(ERR, EAL,
- "secondary process attach failed, ethdev doesn't
exist");
- ret = -ENODEV;
- break;
+ switch (app_id) {
+ case NFP_APP_CORE_NIC:
+ PMD_INIT_LOG(INFO, "Initializing coreNIC");
+ ret = nfp_secondary_init_app_nic(pci_dev, sym_tbl, cpp);
+ if (ret) {
Compare vs 0
+ PMD_INIT_LOG(ERR, "Could not initialize coreNIC!");
+ goto sym_tbl_cleanup;
}
-
- hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
-
- if (nfp_net_ethdev_ops_mount(hw, eth_dev))
- return -EINVAL;
-
- eth_dev->process_private = cpp;
-
- rte_eth_dev_probing_finish(eth_dev);
+ break
Re: [PATCH v5 04/12] net/nfp: add initial flower firmware support
On 8/5/22 09:32, Chaoyong He wrote:
This commits adds the basic probing infrastructure to support the flower
"This commits adds" -> "Add"
It is the description of the commit from the very beginning.
firmware. This firmware is geared towards offloading OVS and can
generally be found in /lib/firmware/netronome/flower. It is also used by
the NFP kernel driver when OVS offload with TC is desired.
This commit also adds the basic infrastructure needed by the flower
Same here.
firmware to operate. The firmware requires threads to service both the
PF vNIC and the ctrl vNIC. The PF is responsible for handling any
fallback traffic and the ctrl vNIC is used to communicate OVS flows
and flow statistics to and from the smartNIC. rte_services are used to
facilitate this logic.
This commit also adds the cpp service, used for some user tools.
Signed-off-by: Chaoyong He
Signed-off-by: Heinrich Kuhn
Reviewed-by: Niklas Söderlund
---
drivers/net/nfp/flower/nfp_flower.c | 101
drivers/net/nfp/flower/nfp_flower.h | 22
drivers/net/nfp/meson.build | 1 +
drivers/net/nfp/nfp_cpp_bridge.c| 88 ++-
drivers/net/nfp/nfp_cpp_bridge.h| 6 ++-
drivers/net/nfp/nfp_ethdev.c| 40 --
6 files changed, 239 insertions(+), 19 deletions(-)
create mode 100644 drivers/net/nfp/flower/nfp_flower.c
create mode 100644 drivers/net/nfp/flower/nfp_flower.h
diff --git a/drivers/net/nfp/flower/nfp_flower.c
b/drivers/net/nfp/flower/nfp_flower.c
new file mode 100644
index 000..1dddced
--- /dev/null
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -0,0 +1,101 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2022 Corigine, Inc.
+ * All rights reserved.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "../nfp_common.h"
+#include "../nfp_logs.h"
+#include "../nfp_ctrl.h"
+#include "../nfp_cpp_bridge.h"
+#include "nfp_flower.h"
+
+static struct rte_service_spec flower_services[NFP_FLOWER_SERVICE_MAX] = {
+};
+
+static int
+nfp_flower_enable_services(struct nfp_app_flower *app_flower)
+{
+ int i;
+ int ret = 0;
+
+ for (i = 0; i < NFP_FLOWER_SERVICE_MAX; i++) {
+ /* Pass a pointer to the flower app to the service */
+ flower_services[i].callback_userdata = (void *)app_flower;
+
+ /* Register the flower services */
+ ret = rte_service_component_register(&flower_services[i],
+ &app_flower->flower_services_ids[i]);
+ if (ret) {
Compare vs 0 explicitly
+ PMD_INIT_LOG(WARNING,
+ "Could not register Flower PF vNIC service");
+ break;
+ }
+
+ PMD_INIT_LOG(INFO, "Flower PF vNIC service registered");
+
+ /* Map them to available service cores*/
+ ret = nfp_map_service(app_flower->flower_services_ids[i]);
+ if (ret)
Compare vs 0 explicitly
+ break;
+ }
+
+ return ret;
+}
+
+int
+nfp_init_app_flower(struct nfp_pf_dev *pf_dev)
+{
+ int ret;
+ unsigned int numa_node;
+ struct nfp_net_hw *pf_hw;
+ struct nfp_app_flower *app_flower;
+
+ numa_node = rte_socket_id();
+
+ /* Allocate memory for the Flower app */
+ app_flower = rte_zmalloc_socket("nfp_app_flower", sizeof(*app_flower),
+ RTE_CACHE_LINE_SIZE, numa_node);
+ if (app_flower == NULL) {
+ ret = -ENOMEM;
+ goto done;
+ }
+
+ pf_dev->app_priv = app_flower;
+
+ /* Allocate memory for the PF AND ctrl vNIC here (hence the * 2) */
+ pf_hw = rte_zmalloc_socket("nfp_pf_vnic", 2 * sizeof(struct
nfp_net_adapter),
+ RTE_CACHE_LINE_SIZE, numa_node);
+ if (pf_hw == NULL) {
+ ret = -ENOMEM;
+ goto app_cleanup;
+ }
+
+ /* Start up flower services */
+ if (nfp_flower_enable_services(app_flower)) {
+ ret = -ESRCH;
+ goto vnic_cleanup;
+ }
+
+ return 0;
+
+vnic_cleanup:
+ rte_free(pf_hw);
+app_cleanup:
+ rte_free(app_flower);
+done:
+ return ret;
+}
+
+int
+nfp_secondary_init_app_flower(__rte_unused struct nfp_cpp *cpp)
+{
+ PMD_INIT_LOG(ERR, "Flower firmware not supported");
+ return -ENOTSUP;
+}
diff --git a/drivers/net/nfp/flower/nfp_flower.h
b/drivers/net/nfp/flower/nfp_flower.h
new file mode 100644
index 000..4a9b302
--- /dev/null
+++ b/drivers/net/nfp/flower/nfp_flower.h
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2022 Corigine, Inc.
+ * All rights reserved.
+ */
+
+#ifndef _NFP_FLOWER_H_
+#define _NFP_FLOWER_H_
+
+enum nfp_flower_service {
+ NFP_FLOWER_SERVICE_MAX
+};
+
+/* The flower application's private structure */
+struct nfp_app_flo
RE: [PATCH 2/4] event/sw: report periodic event timer capability
> -Original Message- > From: Naga Harish K, S V > Sent: Wednesday, August 3, 2022 5:27 PM > To: Carrillo, Erik G ; jer...@marvell.com; Van > Haaren, > Harry > Cc: dev@dpdk.org > Subject: [PATCH 2/4] event/sw: report periodic event timer capability > > update the software eventdev pmd timer_adapter_caps_get > callback function to report the support of periodic > event timer capability Apologies for my non-familiarity with the Eventdev and DPDK Timer features.. but what does a PMD need to "do" to be capable of TIMER_ADAPTER_CAP_PERIODIC? I see the code change to enable reporting that "sw pmd supports it", but I didn't find (in rte_eventdev.h[0] or event-timer-adapter docs[1]) what the PMD must actually "do" to support it? If a PMD does not have to actually change anything in the implementation, then why does the flag exist at all? [0] https://doc.dpdk.org/api/rte__eventdev_8h.html#ac9a05105d3e7f16cce2776408571e1a2 [1] https://doc.dpdk.org/guides-21.05/prog_guide/event_timer_adapter.html
Re: [PATCH v5 05/12] net/nfp: add flower PF setup and mempool init logic
@Thomas, @Stephen, @Hemant, please, see lines from OvS below.
On 8/5/22 09:32, Chaoyong He wrote:
This commit adds the vNIC initialization logic for the flower PF vNIC.
"This commit adds" -> "Add"
The flower firmware exposes this vNIC for the purposes of fallback
traffic in the switchdev use-case. The logic of setting up this vNIC is
similar to the logic seen in nfp_net_init() and nfp_net_start().
This commit also adds minimal dev_ops for this PF device. Because the
same here
device is being exposed externally to DPDK it should also be configured
using DPDK helpers like rte_eth_configure(). For these helpers to work
the flower logic needs to implements a minimal set of dev_ops. The Rx
and Tx logic for this vNIC will be added in a subsequent commit.
OVS expects incoming packets coming into the OVS datapath to be
allocated from a mempool that contains objects of type "struct
dp_packet". For the PF handling the slowpath into OVS it should
use a mempool that is compatible with OVS. This commit adds the logic
to create the OVS compatible mempool. It adds certain OVS specific
structs to be able to instantiate the mempool.
Signed-off-by: Chaoyong He
Reviewed-by: Niklas Söderlund
---
drivers/net/nfp/flower/nfp_flower.c| 384 -
drivers/net/nfp/flower/nfp_flower.h| 9 +
drivers/net/nfp/flower/nfp_flower_ovs_compat.h | 145 ++
drivers/net/nfp/nfp_common.h | 3 +
4 files changed, 537 insertions(+), 4 deletions(-)
create mode 100644 drivers/net/nfp/flower/nfp_flower_ovs_compat.h
diff --git a/drivers/net/nfp/flower/nfp_flower.c
b/drivers/net/nfp/flower/nfp_flower.c
index 1dddced..c05d4ca 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -14,7 +14,35 @@
#include "../nfp_logs.h"
#include "../nfp_ctrl.h"
#include "../nfp_cpp_bridge.h"
+#include "../nfp_rxtx.h"
+#include "../nfpcore/nfp_mip.h"
+#include "../nfpcore/nfp_rtsym.h"
+#include "../nfpcore/nfp_nsp.h"
#include "nfp_flower.h"
+#include "nfp_flower_ovs_compat.h"
+
+#define MAX_PKT_BURST 32
+#define MEMPOOL_CACHE_SIZE 512
+#define DEFAULT_FLBUF_SIZE 9216
+
+/*
+ * Simple dev ops functions for the flower PF. Because a rte_device is exposed
+ * to DPDK the flower logic also makes use of helper functions like
+ * rte_dev_configure() to set up the PF device. Stub functions are needed to
+ * use these helper functions
+ */
+static int
+nfp_flower_pf_configure(__rte_unused struct rte_eth_dev *dev)
+{
+ return 0;
+}
+
+static const struct eth_dev_ops nfp_flower_pf_dev_ops = {
+ .dev_configure = nfp_flower_pf_configure,
+
+ /* Use the normal dev_infos_get functionality in the NFP PMD */
+ .dev_infos_get = nfp_net_infos_get,
+};
static struct rte_service_spec flower_services[NFP_FLOWER_SERVICE_MAX] = {
};
@@ -49,6 +77,304 @@
return ret;
}
+static void
+nfp_flower_pf_mp_init(__rte_unused struct rte_mempool *mp,
+ __rte_unused void *opaque_arg,
+ void *_p,
+ __rte_unused unsigned int i)
+{
+ struct dp_packet *pkt = _p;
+ pkt->source = DPBUF_DPDK;
+ pkt->l2_pad_size = 0;
+ pkt->l2_5_ofs= UINT16_MAX;
+ pkt->l3_ofs = UINT16_MAX;
+ pkt->l4_ofs = UINT16_MAX;
+ pkt->packet_type = 0; /* PT_ETH */
+}
+
+static struct rte_mempool *
+nfp_flower_pf_mp_create(void)
+{
+ uint32_t nb_mbufs;
+ uint32_t pkt_size;
+ uint32_t n_rxd = 1024;
+ uint32_t n_txd = 1024;
+ unsigned int numa_node;
+ uint32_t aligned_mbuf_size;
+ uint32_t mbuf_priv_data_len;
+ struct rte_mempool *pktmbuf_pool;
+
+ nb_mbufs = RTE_MAX(n_rxd + n_txd + MAX_PKT_BURST + MEMPOOL_CACHE_SIZE,
+ 81920U);
+
+ /*
+* The size of the mbuf's private area (i.e. area that holds OvS'
+* dp_packet data)
+*/
+ mbuf_priv_data_len = sizeof(struct dp_packet) - sizeof(struct rte_mbuf);
+ /* The size of the entire dp_packet. */
+ pkt_size = sizeof(struct dp_packet) + RTE_MBUF_DEFAULT_BUF_SIZE;
+ /* mbuf size, rounded up to cacheline size. */
+ aligned_mbuf_size = ROUND_UP(pkt_size, RTE_CACHE_LINE_SIZE);
+ mbuf_priv_data_len += (aligned_mbuf_size - pkt_size);
+
+ numa_node = rte_socket_id();
+ pktmbuf_pool = rte_pktmbuf_pool_create("flower_pf_mbuf_pool", nb_mbufs,
+ MEMPOOL_CACHE_SIZE, mbuf_priv_data_len,
+ RTE_MBUF_DEFAULT_BUF_SIZE, numa_node);
+ if (pktmbuf_pool == NULL) {
+ RTE_LOG(ERR, PMD, "Cannot init mbuf pool\n");
+ return NULL;
+ }
+
+ rte_mempool_obj_iter(pktmbuf_pool, nfp_flower_pf_mp_init, NULL);
+
+ return pktmbuf_pool;
+}
+
+static void
+nfp_flower_cleanup_pf_vnic(struct nfp_net_hw *hw)
+{
+ uint16_t i;
+ struct rte_eth_dev *eth_dev;
+ struct nfp_app_flo
Re: [PATCH v5 06/12] net/nfp: add flower PF related routines
On 8/5/22 09:32, Chaoyong He wrote:
This commit adds the start/stop/close routine of the
"This commit adds" -> "Add"
Typically close goes in pair with configure.
flower PF vNIC.
Signed-off-by: Chaoyong He
Reviewed-by: Niklas Söderlund
---
drivers/net/nfp/flower/nfp_flower.c | 193
1 file changed, 193 insertions(+)
diff --git a/drivers/net/nfp/flower/nfp_flower.c
b/drivers/net/nfp/flower/nfp_flower.c
index c05d4ca..2498020 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -7,6 +7,7 @@
#include
#include
#include
+#include
#include
#include
@@ -37,11 +38,178 @@
return 0;
}
+static int
+nfp_flower_pf_start(struct rte_eth_dev *dev)
+{
+ int ret;
+ uint32_t new_ctrl;
+ uint32_t update = 0;
+ struct nfp_net_hw *hw;
+
+ hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+ /* Disabling queues just in case... */
+ nfp_net_disable_queues(dev);
+
+ /* Enabling the required queues in the device */
+ nfp_net_enable_queues(dev);
+
+ new_ctrl = nfp_check_offloads(dev);
+
+ /* Writing configuration parameters in the device */
+ nfp_net_params_setup(hw);
+
+ nfp_net_rss_config_default(dev);
+ update |= NFP_NET_CFG_UPDATE_RSS;
+
+ if (hw->cap & NFP_NET_CFG_CTRL_RSS2)
+ new_ctrl |= NFP_NET_CFG_CTRL_RSS2;
+ else
+ new_ctrl |= NFP_NET_CFG_CTRL_RSS;
+
+ /* Enable device */
+ new_ctrl |= NFP_NET_CFG_CTRL_ENABLE;
+
+ update |= NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING;
+
+ if (hw->cap & NFP_NET_CFG_CTRL_RINGCFG)
+ new_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;
+
+ nn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl);
+
+ /* If an error when reconfig we avoid to change hw state */
+ ret = nfp_net_reconfig(hw, new_ctrl, update);
+ if (ret) {
Compare vs 0
+ PMD_INIT_LOG(ERR, "Failed to reconfig PF vnic");
+ return -EIO;
+ }
+
+ hw->ctrl = new_ctrl;
+
+ /* Setup the freelist ring */
+ ret = nfp_net_rx_freelist_setup(dev);
+ if (ret) {
Compare vs 0
+ PMD_INIT_LOG(ERR, "Error with flower PF vNIC freelist setup");
+ return -EIO;
+ }
+
+ return 0;
+}
+
+/* Stop device: disable rx and tx functions to allow for reconfiguring. */
+static int
+nfp_flower_pf_stop(struct rte_eth_dev *dev)
+{
+ uint16_t i;
+ struct nfp_net_hw *hw;
+ struct nfp_net_txq *this_tx_q;
+ struct nfp_net_rxq *this_rx_q;
+
+ hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+ nfp_net_disable_queues(dev);
+
+ /* Clear queues */
+ for (i = 0; i < dev->data->nb_tx_queues; i++) {
+ this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i];
+ nfp_net_reset_tx_queue(this_tx_q);
+ }
+
+ for (i = 0; i < dev->data->nb_rx_queues; i++) {
+ this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i];
+ nfp_net_reset_rx_queue(this_rx_q);
+ }
+
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+ /* Configure the physical port down */
+ nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
+ else
+ nfp_eth_set_configured(dev->process_private, hw->nfp_idx, 0);
+
+ return 0;
+}
+
+/* Reset and stop device. The device can not be restarted. */
+static int
+nfp_flower_pf_close(struct rte_eth_dev *dev)
+{
+ uint16_t i;
+ struct nfp_net_hw *hw;
+ struct nfp_pf_dev *pf_dev;
+ struct nfp_net_txq *this_tx_q;
+ struct nfp_net_rxq *this_rx_q;
+ struct rte_pci_device *pci_dev;
+ struct nfp_app_flower *app_flower;
+
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+
+ pf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+ hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ pci_dev = RTE_ETH_DEV_TO_PCI(dev);
+ app_flower = NFP_APP_PRIV_TO_APP_FLOWER(pf_dev->app_priv);
+
+ /*
+* We assume that the DPDK application is stopping all the
+* threads/queues before calling the device close function.
+*/
+
+ nfp_net_disable_queues(dev);
+
+ /* Clear queues */
+ for (i = 0; i < dev->data->nb_tx_queues; i++) {
+ this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i];
+ nfp_net_reset_tx_queue(this_tx_q);
+ }
+
+ for (i = 0; i < dev->data->nb_rx_queues; i++) {
+ this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i];
+ nfp_net_reset_rx_queue(this_rx_q);
+ }
+
+ /* Cancel possible impending LSC work here before releasing the port*/
+ rte_eal_alarm_cancel(nfp_net_dev_interrupt_delayed_handler, (void
*)dev);
+
+ nn_cfg_writeb(hw, NFP_NET_CFG_LSC, 0xff);
+
+ rte_eth
Re: [PATCH v5 07/12] net/nfp: add flower ctrl VNIC related logics
On 8/5/22 09:32, Chaoyong He wrote:
This commit adds the setup/start logic for the ctrl vNIC. This vNIC
"This commit adds" -> "Add"
is used by the PMD and flower firmware as a communication channel
between driver and firmware. In the case of OVS it is also used to
communicate flow statistics from hardware to the driver.
A rte_eth device is not exposed to DPDK for this vNIC as it is strictly
used internally by flower logic. Rx and Tx logic will be added later for
this vNIC.
Signed-off-by: Chaoyong He
Reviewed-by: Niklas Söderlund
---
drivers/net/nfp/flower/nfp_flower.c | 385 +++-
drivers/net/nfp/flower/nfp_flower.h | 6 +
2 files changed, 388 insertions(+), 3 deletions(-)
diff --git a/drivers/net/nfp/flower/nfp_flower.c
b/drivers/net/nfp/flower/nfp_flower.c
index 2498020..51df504 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -26,6 +26,10 @@
#define MEMPOOL_CACHE_SIZE 512
#define DEFAULT_FLBUF_SIZE 9216
+#define CTRL_VNIC_NB_DESC 64
+#define CTRL_VNIC_RX_FREE_THRESH 32
+#define CTRL_VNIC_TX_FREE_THRESH 32
+
/*
* Simple dev ops functions for the flower PF. Because a rte_device is exposed
* to DPDK the flower logic also makes use of helper functions like
@@ -543,6 +547,302 @@
return ret;
}
+static void
+nfp_flower_cleanup_ctrl_vnic(struct nfp_net_hw *hw)
+{
+ uint32_t i;
+ struct nfp_net_rxq *rxq;
+ struct nfp_net_txq *txq;
+ struct rte_eth_dev *eth_dev;
+
+ eth_dev = hw->eth_dev;
+
+ for (i = 0; i < hw->max_tx_queues; i++) {
+ txq = eth_dev->data->tx_queues[i];
+ if (txq) {
Compare vs NULL as you do in other cases and as DPDK coding style
recommends.
+ rte_free(txq->txbufs);
+ rte_eth_dma_zone_free(eth_dev, "ctrl_tx_ring", i);
+ rte_free(txq);
+ }
+ }
+
+ for (i = 0; i < hw->max_rx_queues; i++) {
+ rxq = eth_dev->data->rx_queues[i];
+ if (rxq) {
Compare vs NULL
+ rte_free(rxq->rxbufs);
+ rte_eth_dma_zone_free(eth_dev, "ctrl_rx_ring", i);
+ rte_free(rxq);
+ }
+ }
+
+ rte_free(eth_dev->data->tx_queues);
+ rte_free(eth_dev->data->rx_queues);
+ rte_free(eth_dev->data);
+ rte_free(eth_dev);
+}
+
+static int
+nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw)
+{
+ uint32_t i;
+ int ret = 0;
+ uint16_t nb_desc;
+ unsigned int numa_node;
+ struct rte_mempool *mp;
+ uint16_t rx_free_thresh;
+ uint16_t tx_free_thresh;
+ struct nfp_net_rxq *rxq;
+ struct nfp_net_txq *txq;
+ struct nfp_pf_dev *pf_dev;
+ struct rte_eth_dev *eth_dev;
+ const struct rte_memzone *tz;
+ struct nfp_app_flower *app_flower;
+
+ /* Hardcoded values for now */
+ nb_desc = CTRL_VNIC_NB_DESC;
+ rx_free_thresh = CTRL_VNIC_RX_FREE_THRESH;
What's the point to introduce the variable and use it only
once below?
+ tx_free_thresh = CTRL_VNIC_TX_FREE_THRESH;
Same here.
+ numa_node = rte_socket_id();
+
+ /* Set up some pointers here for ease of use */
+ pf_dev = hw->pf_dev;
+ app_flower = NFP_APP_PRIV_TO_APP_FLOWER(pf_dev->app_priv);
+
+ ret = nfp_flower_init_vnic_common(hw, "ctrl_vnic");
+ if (ret)
Compare vs 0
+ goto done;
+
+ /* Allocate memory for the eth_dev of the vNIC */
+ hw->eth_dev = rte_zmalloc("ctrl_vnic_eth_dev",
Why not rte_eth_dev_allocate()? Isn't an ethdev?
Why do you bypsss ethdev layer in this case completely and do
everything yourself?
+ sizeof(struct rte_eth_dev), RTE_CACHE_LINE_SIZE);
+ if (hw->eth_dev == NULL) {
+ ret = -ENOMEM;
+ goto done;
+ }
+
+ /* Grab the pointer to the newly created rte_eth_dev here */
+ eth_dev = hw->eth_dev;
+
+ /* Also allocate memory for the data part of the eth_dev */
+ eth_dev->data = rte_zmalloc("ctrl_vnic_eth_dev_data",
+ sizeof(struct rte_eth_dev_data), RTE_CACHE_LINE_SIZE);
+ if (eth_dev->data == NULL) {
+ ret = -ENOMEM;
+ goto eth_dev_cleanup;
+ }
+
+ eth_dev->data->rx_queues = rte_zmalloc("ethdev->rx_queues",
+ sizeof(eth_dev->data->rx_queues[0]) * hw->max_rx_queues,
+ RTE_CACHE_LINE_SIZE);
+ if (eth_dev->data->rx_queues == NULL) {
+ PMD_INIT_LOG(ERR, "rte_zmalloc failed for ctrl vnic rx queues");
+ ret = -ENOMEM;
+ goto dev_data_cleanup;
+ }
+
+ eth_dev->data->tx_queues = rte_zmalloc("ethdev->tx_queues",
+ sizeof(eth_dev->data->tx_queues[0]) * hw->max_tx_queues,
+ RTE_CACHE_LINE_SIZE);
+ if (eth_dev->data->tx_queues == NULL) {
+ PMD_
Re: [PATCH v5 10/12] net/nfp: add flower representor framework
On 8/5/22 09:32, Chaoyong He wrote:
This commit adds the framework to support flower representors.
"This commit adds" -> "Add"
The number of VF representors are parsed from the command line. For
physical port representors the current logic aims to create a
representor for each physical port present on the hardware.
A eth_dev is created for each phyport and VF, and flower firmware
A -> An, phyport -> physical port
requires a MAC repr cmsg to be transmitted to firmware with
info about the number of physical ports configured.
Reify messages are sent to hardware for each phyport representor.
A rte_ring is also created per representor so that traffic can be
A -> An
pushed and pulled to this interface.
To up and down the real device represented by a flower representor port
a port mod message is used to convey that info to the firmware. This
message will be used in the dev_ops callbacks of flower representors.
Each cmsg generated by the driver is prepended with a cmsg header.
This commit also adds the logic to fill in the header of cmsgs.
This commit also adds the Rx and Tx path for flower representors. For
"This commit also adds" -> "Also add"
Rx packets are dequeued from the representor ring and passed to the
eth_dev. For Tx the first queue of the PF vNIC is used. Metadata about
the representor is added before the packet is sent down to firmware.
Signed-off-by: Chaoyong He
Reviewed-by: Niklas Söderlund
---
drivers/net/nfp/flower/nfp_flower.c | 59 +++
drivers/net/nfp/flower/nfp_flower.h | 18 +
drivers/net/nfp/flower/nfp_flower_cmsg.c| 186 +
drivers/net/nfp/flower/nfp_flower_cmsg.h| 173
drivers/net/nfp/flower/nfp_flower_representor.c | 508
drivers/net/nfp/flower/nfp_flower_representor.h | 39 ++
drivers/net/nfp/meson.build | 2 +
drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 31 +-
8 files changed, 1004 insertions(+), 12 deletions(-)
create mode 100644 drivers/net/nfp/flower/nfp_flower_cmsg.c
create mode 100644 drivers/net/nfp/flower/nfp_flower_cmsg.h
create mode 100644 drivers/net/nfp/flower/nfp_flower_representor.c
create mode 100644 drivers/net/nfp/flower/nfp_flower_representor.h
diff --git a/drivers/net/nfp/flower/nfp_flower.c
b/drivers/net/nfp/flower/nfp_flower.c
index 5e9c4ef..d7772d6 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -22,6 +22,7 @@
#include "nfp_flower.h"
#include "nfp_flower_ovs_compat.h"
#include "nfp_flower_ctrl.h"
+#include "nfp_flower_representor.h"
#define MAX_PKT_BURST 32
#define MEMPOOL_CACHE_SIZE 512
@@ -927,8 +928,13 @@
unsigned int numa_node;
struct nfp_net_hw *pf_hw;
struct nfp_net_hw *ctrl_hw;
+ struct rte_pci_device *pci_dev;
struct nfp_app_flower *app_flower;
+ struct rte_eth_devargs eth_da = {
+ .nb_representor_ports = 0
+ };
+ pci_dev = pf_dev->pci_dev;
numa_node = rte_socket_id();
/* Allocate memory for the Flower app */
@@ -1021,6 +1027,59 @@
goto ctrl_vnic_cleanup;
}
+ /* Allocate a switch domain for the flower app */
+ if (app_flower->switch_domain_id == RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID
&&
+
rte_eth_switch_domain_alloc(&app_flower->switch_domain_id)) {
+ PMD_INIT_LOG(WARNING,
+ "failed to allocate switch domain for device");
+ }
+
+ /* Now parse PCI device args passed for representor info */
+ if (pci_dev->device.devargs) {
Compare vs NULL
+ ret = rte_eth_devargs_parse(pci_dev->device.devargs->args,
+ ð_da);
+ if (ret) {
Compare vs 0
+ PMD_INIT_LOG(ERR, "devarg parse failed");
+ goto ctrl_vnic_cleanup;
+ }
+ }
+
I see no representor_info_get implementation. How is application
supporsed to find out which representors can be instantiated?
+ if (eth_da.nb_representor_ports == 0) {
+ PMD_INIT_LOG(DEBUG, "No representor port need to create.");
+ ret = 0;
+ goto done;
+ }
+
+ /* There always exist phy repr */
+ if (eth_da.nb_representor_ports < app_flower->nfp_eth_table->count) {
It is really strange check. First of all I'd say that it is very
inconvinient to oblidge user to create some representors.
Second, who said that these representors are physical port representors?
May be number of representors is OK, but it is different representors...
+ PMD_INIT_LOG(DEBUG, "Should also create phy representor port.");
+ ret = -ERANGE;
+ goto ctrl_vnic_cleanup;
+ }
+
+ /* Only support VF representor creation via the command line */
+ if (eth_da.type != RTE_ETH_REPRESENTOR_VF) {
I'm confused. Above you're
DPDK Release Status Meeting 2022-08-05
Release status meeting minutes 2022-08-05 = Agenda: * Release Dates * Subtrees * Roadmaps * LTS * Defects * Opens Participants: * ARM * Debian/Microsoft * Intel * Marvell * Nvidia Release Dates - The following are the proposed current dates for 22.11: * V1 deadline: 14 August 2022 * RC1: 3 October 2022 * RC2: 23 June 2022 * RC3: 31 October 2022 * Release: 16 November 2022 Subtrees * next-net * New drivers in this release * next-net-intel * No update * next-net-mlx * No update * next-net-brcm * No update * next-net-mrvl * 30-40 patches in this release * next-eventdev * Some patches from Intel * Probably 30-40 patches * next-virtio * Currently ~16 patches in the release * Chenbo will cover this release * next-crypto * Patches for BBDev * Adding crypto security and sessions rework * Additional FIPs validation patches in this release * main * Need to start reviews early on the mailing list * Machine learning inference library RFC: * https://inbox.dpdk.org/dev/20220803132839.2747858-1-jer...@marvell.com/ Other - * DPDK Summit: https://events.linuxfoundation.org/dpdk-userspace-summit/ * Event Dates: Tuesday, September 6 - Thursday, September 8, 2022 LTS --- Waiting for test results. Aiming for August 29th for all 3 LTSs. * 21.11.2 * Back porting in progress * 20.11.6 * Back porting in progress * 19.11.13 * Back porting in progress * Distros * v20.11 in Debian 11 * Ubuntu 22.04 contains 21.11 Defects --- * Bugzilla links, 'Bugs', added for hosted projects * https://www.dpdk.org/hosted-projects/ Opens - * None DPDK Release Status Meetings The DPDK Release Status Meeting is intended for DPDK Committers to discuss the status of the master tree and sub-trees, and for project managers to track progress or milestone dates. The meeting occurs on every Thursday at 9:30 UTC. on https://meet.jit.si/DPDK If you wish to attend just send an email to "John McNamara john.mcnam...@intel.com" for the invite.
Re: [PATCH] usertools: fix bind failure from dpdk to kernel
On Fri, 5 Aug 2022 11:10:22 +0800
Huisong Li wrote:
> Currently, the steps for binding device from dpdk driver to kernel
> driver is as follows:
> echo $BDF > /sys/bus/pci/drivers/vfio-pci/unbind
> echo $BDF > /sys/bus/pci/drivers/$kernel_driver/bind
>
> This steps cannot bind device from dpdk driver to kernel driver on
> platform with kernel 5.19. The 'driver_override' must be specify
> kernel driver before binding device to kernel driver.
>
> Fixes: 720b7a058260 ("usertools: fix device binding with kernel tools")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Huisong Li
Not sure exactly what you did and why.
The patch seems to just remove the check that the driver
is in the set of dpdk_drivers.
Re: [PATCH] ring: compilation fix with GCC-12
On Fri, 5 Aug 2022 14:33:48 +0530
Amit Prakash Shukla wrote:
> GCC 12 raises the following warning:
>
> In function '__rte_ring_dequeue_elems_128',
> inlined from '__rte_ring_dequeue_elems' at
> ../lib/ring/rte_ring_elem_pvt.h:262:3,
> inlined from '__rte_ring_do_hts_dequeue_elem' at
> ../lib/ring/rte_ring_hts_elem_pvt.h:237:3,
> inlined from 'rte_ring_mc_hts_dequeue_bulk_elem' at
> ../lib/ring/rte_ring_hts.h:83:9,
> inlined from 'rte_ring_dequeue_bulk_elem' at
> ../lib/ring/rte_ring_elem.h:391:10,
> inlined from 'rte_ring_dequeue_elem' at
> ../lib/ring/rte_ring_elem.h:476:9,
> inlined from 'rte_ring_dequeue' at
> ../lib/ring/rte_ring.h:463:9,
> inlined from 'rxa_intr_ring_dequeue' at
> ../lib/eventdev/rte_event_eth_rx_adapter.c:1196:10:
> ../lib/ring/rte_ring_elem_pvt.h:234:25: error: 'memcpy' writing
> 32 bytes into a region of size 8 overflows the destination
> [-Werror=stringop-overflow=]
> 234 |memcpy((void *)(obj + i), (void *)(ring + idx), 32);
> |^~~
>
> Replacing memcpy with rte_memcpy fixes the GCC-12 compilation issue.
> Also it would be better to change to rte_memcpy as the function is
> called in fastpath.
>
> Bugzilla ID: 1062
> Fixes: 1fc73390bcf5 ("ring: refactor exported headers")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Amit Prakash Shukla
This seems to be just using a different routine and in effect
wallpapering over a possibly valid warning.
[PATCH] dma/cnxk: add support for CN10K DMA engine
Added support for CN10K SoC DMA engine to dmadev.
Signed-off-by: Radha Mohan Chintakuntla
Change-Id: Ib119b3ceab0810724820e9af1d29fdd3f95d5cc9
Reviewed-on: https://sj1git1.cavium.com/c/IP/SW/dataplane/dpdk/+/68103
Tested-by: sa_ip-toolkits-Jenkins
Reviewed-by: Jerin Jacob Kollanukkaran
---
drivers/dma/cnxk/cnxk_dmadev.c | 248 +
drivers/dma/cnxk/cnxk_dmadev.h | 2 +-
2 files changed, 220 insertions(+), 30 deletions(-)
diff --git a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c
index 2824c1b44f..a67bcba9d4 100644
--- a/drivers/dma/cnxk/cnxk_dmadev.c
+++ b/drivers/dma/cnxk/cnxk_dmadev.c
@@ -70,31 +70,31 @@ cnxk_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t
vchan,
RTE_SET_USED(vchan);
RTE_SET_USED(conf_sz);
- header->s.pt = DPI_HDR_PT_ZBW_CA;
+ header->cn9k.pt = DPI_HDR_PT_ZBW_CA;
switch (conf->direction) {
case RTE_DMA_DIR_DEV_TO_MEM:
- header->s.xtype = DPI_XTYPE_INBOUND;
- header->s.lport = conf->src_port.pcie.coreid;
- header->s.fport = 0;
- header->s.pvfe = 1;
+ header->cn9k.xtype = DPI_XTYPE_INBOUND;
+ header->cn9k.lport = conf->src_port.pcie.coreid;
+ header->cn9k.fport = 0;
+ header->cn9k.pvfe = 1;
break;
case RTE_DMA_DIR_MEM_TO_DEV:
- header->s.xtype = DPI_XTYPE_OUTBOUND;
- header->s.lport = 0;
- header->s.fport = conf->dst_port.pcie.coreid;
- header->s.pvfe = 1;
+ header->cn9k.xtype = DPI_XTYPE_OUTBOUND;
+ header->cn9k.lport = 0;
+ header->cn9k.fport = conf->dst_port.pcie.coreid;
+ header->cn9k.pvfe = 1;
break;
case RTE_DMA_DIR_MEM_TO_MEM:
- header->s.xtype = DPI_XTYPE_INTERNAL_ONLY;
- header->s.lport = 0;
- header->s.fport = 0;
- header->s.pvfe = 0;
+ header->cn9k.xtype = DPI_XTYPE_INTERNAL_ONLY;
+ header->cn9k.lport = 0;
+ header->cn9k.fport = 0;
+ header->cn9k.pvfe = 0;
break;
case RTE_DMA_DIR_DEV_TO_DEV:
- header->s.xtype = DPI_XTYPE_EXTERNAL_ONLY;
- header->s.lport = conf->src_port.pcie.coreid;
- header->s.fport = conf->dst_port.pcie.coreid;
+ header->cn9k.xtype = DPI_XTYPE_EXTERNAL_ONLY;
+ header->cn9k.lport = conf->src_port.pcie.coreid;
+ header->cn9k.fport = conf->dst_port.pcie.coreid;
};
for (i = 0; i < conf->nb_desc; i++) {
@@ -103,6 +103,63 @@ cnxk_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t
vchan,
plt_err("Failed to allocate for comp_data");
return -ENOMEM;
}
+ comp_data->cdata = DPI_REQ_CDATA;
+ dpivf->conf.c_desc.compl_ptr[i] = comp_data;
+ };
+ dpivf->conf.c_desc.max_cnt = DPI_MAX_DESC;
+ dpivf->conf.c_desc.head = 0;
+ dpivf->conf.c_desc.tail = 0;
+
+ return 0;
+}
+
+static int
+cn10k_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t vchan,
+const struct rte_dma_vchan_conf *conf,
+uint32_t conf_sz)
+{
+ struct cnxk_dpi_vf_s *dpivf = dev->fp_obj->dev_private;
+ struct cnxk_dpi_compl_s *comp_data;
+ union dpi_instr_hdr_s *header = &dpivf->conf.hdr;
+ int i;
+
+ RTE_SET_USED(vchan);
+ RTE_SET_USED(conf_sz);
+
+ header->cn10k.pt = DPI_HDR_PT_ZBW_CA;
+
+ switch (conf->direction) {
+ case RTE_DMA_DIR_DEV_TO_MEM:
+ header->cn10k.xtype = DPI_XTYPE_INBOUND;
+ header->cn10k.lport = conf->src_port.pcie.coreid;
+ header->cn10k.fport = 0;
+ header->cn10k.pvfe = 1;
+ break;
+ case RTE_DMA_DIR_MEM_TO_DEV:
+ header->cn10k.xtype = DPI_XTYPE_OUTBOUND;
+ header->cn10k.lport = 0;
+ header->cn10k.fport = conf->dst_port.pcie.coreid;
+ header->cn10k.pvfe = 1;
+ break;
+ case RTE_DMA_DIR_MEM_TO_MEM:
+ header->cn10k.xtype = DPI_XTYPE_INTERNAL_ONLY;
+ header->cn10k.lport = 0;
+ header->cn10k.fport = 0;
+ header->cn10k.pvfe = 0;
+ break;
+ case RTE_DMA_DIR_DEV_TO_DEV:
+ header->cn10k.xtype = DPI_XTYPE_EXTERNAL_ONLY;
+ header->cn10k.lport = conf->src_port.pcie.coreid;
+ header->cn10k.fport = conf->dst_port.pcie.coreid;
+ };
+
+ for (i = 0; i < conf->nb_desc; i++) {
+ comp_data = rte_zmalloc(NULL, sizeof(*comp_data), 0);
+ if (comp_data == NULL) {
+ plt_err("Failed to allocate for comp_data");
+ return -ENOMEM;
+
[PATCH v2] dma/cnxk: add support for CN10K DMA engine
Added support for CN10K SoC DMA engine to dmadev.
Signed-off-by: Radha Mohan Chintakuntla
Reviewed-by: Jerin Jacob Kollanukkaran
---
Changes from v1:
- Removed gerrit changeID
drivers/dma/cnxk/cnxk_dmadev.c | 248 +
drivers/dma/cnxk/cnxk_dmadev.h | 2 +-
2 files changed, 220 insertions(+), 30 deletions(-)
diff --git a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c
index 2824c1b44f..a67bcba9d4 100644
--- a/drivers/dma/cnxk/cnxk_dmadev.c
+++ b/drivers/dma/cnxk/cnxk_dmadev.c
@@ -70,31 +70,31 @@ cnxk_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t
vchan,
RTE_SET_USED(vchan);
RTE_SET_USED(conf_sz);
- header->s.pt = DPI_HDR_PT_ZBW_CA;
+ header->cn9k.pt = DPI_HDR_PT_ZBW_CA;
switch (conf->direction) {
case RTE_DMA_DIR_DEV_TO_MEM:
- header->s.xtype = DPI_XTYPE_INBOUND;
- header->s.lport = conf->src_port.pcie.coreid;
- header->s.fport = 0;
- header->s.pvfe = 1;
+ header->cn9k.xtype = DPI_XTYPE_INBOUND;
+ header->cn9k.lport = conf->src_port.pcie.coreid;
+ header->cn9k.fport = 0;
+ header->cn9k.pvfe = 1;
break;
case RTE_DMA_DIR_MEM_TO_DEV:
- header->s.xtype = DPI_XTYPE_OUTBOUND;
- header->s.lport = 0;
- header->s.fport = conf->dst_port.pcie.coreid;
- header->s.pvfe = 1;
+ header->cn9k.xtype = DPI_XTYPE_OUTBOUND;
+ header->cn9k.lport = 0;
+ header->cn9k.fport = conf->dst_port.pcie.coreid;
+ header->cn9k.pvfe = 1;
break;
case RTE_DMA_DIR_MEM_TO_MEM:
- header->s.xtype = DPI_XTYPE_INTERNAL_ONLY;
- header->s.lport = 0;
- header->s.fport = 0;
- header->s.pvfe = 0;
+ header->cn9k.xtype = DPI_XTYPE_INTERNAL_ONLY;
+ header->cn9k.lport = 0;
+ header->cn9k.fport = 0;
+ header->cn9k.pvfe = 0;
break;
case RTE_DMA_DIR_DEV_TO_DEV:
- header->s.xtype = DPI_XTYPE_EXTERNAL_ONLY;
- header->s.lport = conf->src_port.pcie.coreid;
- header->s.fport = conf->dst_port.pcie.coreid;
+ header->cn9k.xtype = DPI_XTYPE_EXTERNAL_ONLY;
+ header->cn9k.lport = conf->src_port.pcie.coreid;
+ header->cn9k.fport = conf->dst_port.pcie.coreid;
};
for (i = 0; i < conf->nb_desc; i++) {
@@ -103,6 +103,63 @@ cnxk_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t
vchan,
plt_err("Failed to allocate for comp_data");
return -ENOMEM;
}
+ comp_data->cdata = DPI_REQ_CDATA;
+ dpivf->conf.c_desc.compl_ptr[i] = comp_data;
+ };
+ dpivf->conf.c_desc.max_cnt = DPI_MAX_DESC;
+ dpivf->conf.c_desc.head = 0;
+ dpivf->conf.c_desc.tail = 0;
+
+ return 0;
+}
+
+static int
+cn10k_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t vchan,
+const struct rte_dma_vchan_conf *conf,
+uint32_t conf_sz)
+{
+ struct cnxk_dpi_vf_s *dpivf = dev->fp_obj->dev_private;
+ struct cnxk_dpi_compl_s *comp_data;
+ union dpi_instr_hdr_s *header = &dpivf->conf.hdr;
+ int i;
+
+ RTE_SET_USED(vchan);
+ RTE_SET_USED(conf_sz);
+
+ header->cn10k.pt = DPI_HDR_PT_ZBW_CA;
+
+ switch (conf->direction) {
+ case RTE_DMA_DIR_DEV_TO_MEM:
+ header->cn10k.xtype = DPI_XTYPE_INBOUND;
+ header->cn10k.lport = conf->src_port.pcie.coreid;
+ header->cn10k.fport = 0;
+ header->cn10k.pvfe = 1;
+ break;
+ case RTE_DMA_DIR_MEM_TO_DEV:
+ header->cn10k.xtype = DPI_XTYPE_OUTBOUND;
+ header->cn10k.lport = 0;
+ header->cn10k.fport = conf->dst_port.pcie.coreid;
+ header->cn10k.pvfe = 1;
+ break;
+ case RTE_DMA_DIR_MEM_TO_MEM:
+ header->cn10k.xtype = DPI_XTYPE_INTERNAL_ONLY;
+ header->cn10k.lport = 0;
+ header->cn10k.fport = 0;
+ header->cn10k.pvfe = 0;
+ break;
+ case RTE_DMA_DIR_DEV_TO_DEV:
+ header->cn10k.xtype = DPI_XTYPE_EXTERNAL_ONLY;
+ header->cn10k.lport = conf->src_port.pcie.coreid;
+ header->cn10k.fport = conf->dst_port.pcie.coreid;
+ };
+
+ for (i = 0; i < conf->nb_desc; i++) {
+ comp_data = rte_zmalloc(NULL, sizeof(*comp_data), 0);
+ if (comp_data == NULL) {
+ plt_err("Failed to allocate for comp_data");
+ return -ENOMEM;
+ }
+ comp_data->cdata = DPI_REQ_CDATA;
dpivf->conf.c_desc.compl_ptr[i] = comp_dat
[PATCH v3] dma/cnxk: add support for CN10K DMA engine
Added support for CN10K SoC DMA engine to dmadev.
Signed-off-by: Radha Mohan Chintakuntla
Reviewed-by: Jerin Jacob Kollanukkaran
---
Changes from v2:
- Added missing files required in the patch
Changes from v1:
- Removed gerrit changeID
drivers/common/cnxk/hw/dpi.h | 16 +-
drivers/common/cnxk/roc_dpi_priv.h | 2 +-
drivers/dma/cnxk/cnxk_dmadev.c | 248 +
drivers/dma/cnxk/cnxk_dmadev.h | 2 +-
4 files changed, 225 insertions(+), 43 deletions(-)
diff --git a/drivers/common/cnxk/hw/dpi.h b/drivers/common/cnxk/hw/dpi.h
index 2da123228f..a34713dde6 100644
--- a/drivers/common/cnxk/hw/dpi.h
+++ b/drivers/common/cnxk/hw/dpi.h
@@ -61,7 +61,7 @@
*/
union dpi_instr_hdr_s {
uint64_t u[4];
- struct dpi_dma_instr_hdr_s_s {
+ struct dpi_cn9k_instr_hdr_s_s {
uint64_t tag : 32;
uint64_t tt : 2;
uint64_t grp : 10;
@@ -93,17 +93,9 @@ union dpi_instr_hdr_s {
/* Word 2 - End */
uint64_t reserved_192_255 : 64;
/* Word 3 - End */
- } s;
-};
+ } cn9k;
-/**
- * Structure dpi_cn10k_instr_hdr_s for CN10K
- *
- * DPI DMA Instruction Header Format
- */
-union dpi_cn10k_instr_hdr_s {
- uint64_t u[4];
- struct dpi_cn10k_dma_instr_hdr_s_s {
+ struct dpi_cn10k_instr_hdr_s_s {
uint64_t nfst : 4;
uint64_t reserved_4_5 : 2;
uint64_t nlst : 4;
@@ -135,7 +127,7 @@ union dpi_cn10k_instr_hdr_s {
/* Word 2 - End */
uint64_t reserved_192_255 : 64;
/* Word 3 - End */
- } s;
+ } cn10k;
};
#endif /*__DEV_DPI_HW_H__*/
diff --git a/drivers/common/cnxk/roc_dpi_priv.h
b/drivers/common/cnxk/roc_dpi_priv.h
index 92953fbcfc..1fa1a715d3 100644
--- a/drivers/common/cnxk/roc_dpi_priv.h
+++ b/drivers/common/cnxk/roc_dpi_priv.h
@@ -23,7 +23,7 @@ typedef union dpi_mbox_msg_t {
uint64_t u[2];
struct dpi_mbox_message_s {
/* VF ID to configure */
- uint64_t vfid : 4;
+ uint64_t vfid : 8;
/* Command code */
uint64_t cmd : 4;
/* Command buffer size in 8-byte words */
diff --git a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c
index 2824c1b44f..a67bcba9d4 100644
--- a/drivers/dma/cnxk/cnxk_dmadev.c
+++ b/drivers/dma/cnxk/cnxk_dmadev.c
@@ -70,31 +70,31 @@ cnxk_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t
vchan,
RTE_SET_USED(vchan);
RTE_SET_USED(conf_sz);
- header->s.pt = DPI_HDR_PT_ZBW_CA;
+ header->cn9k.pt = DPI_HDR_PT_ZBW_CA;
switch (conf->direction) {
case RTE_DMA_DIR_DEV_TO_MEM:
- header->s.xtype = DPI_XTYPE_INBOUND;
- header->s.lport = conf->src_port.pcie.coreid;
- header->s.fport = 0;
- header->s.pvfe = 1;
+ header->cn9k.xtype = DPI_XTYPE_INBOUND;
+ header->cn9k.lport = conf->src_port.pcie.coreid;
+ header->cn9k.fport = 0;
+ header->cn9k.pvfe = 1;
break;
case RTE_DMA_DIR_MEM_TO_DEV:
- header->s.xtype = DPI_XTYPE_OUTBOUND;
- header->s.lport = 0;
- header->s.fport = conf->dst_port.pcie.coreid;
- header->s.pvfe = 1;
+ header->cn9k.xtype = DPI_XTYPE_OUTBOUND;
+ header->cn9k.lport = 0;
+ header->cn9k.fport = conf->dst_port.pcie.coreid;
+ header->cn9k.pvfe = 1;
break;
case RTE_DMA_DIR_MEM_TO_MEM:
- header->s.xtype = DPI_XTYPE_INTERNAL_ONLY;
- header->s.lport = 0;
- header->s.fport = 0;
- header->s.pvfe = 0;
+ header->cn9k.xtype = DPI_XTYPE_INTERNAL_ONLY;
+ header->cn9k.lport = 0;
+ header->cn9k.fport = 0;
+ header->cn9k.pvfe = 0;
break;
case RTE_DMA_DIR_DEV_TO_DEV:
- header->s.xtype = DPI_XTYPE_EXTERNAL_ONLY;
- header->s.lport = conf->src_port.pcie.coreid;
- header->s.fport = conf->dst_port.pcie.coreid;
+ header->cn9k.xtype = DPI_XTYPE_EXTERNAL_ONLY;
+ header->cn9k.lport = conf->src_port.pcie.coreid;
+ header->cn9k.fport = conf->dst_port.pcie.coreid;
};
for (i = 0; i < conf->nb_desc; i++) {
@@ -103,6 +103,63 @@ cnxk_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t
vchan,
plt_err("Failed to allocate for comp_data");
return -ENOMEM;
}
+ comp_data->cdata = DPI_REQ_CDATA;
+ dpivf->conf.c_desc.compl_ptr[i] = comp_data;
+ };
+ dpivf->conf.c_desc.max_cnt = DPI_MAX_DESC;
+ dpivf->conf.c_desc.head = 0;
+ dpivf->conf.c_desc.tail = 0;
+
+ return 0;
+}
+
+static in
[PATCH 04/10] port: free buffered packets on Ethernet device output port free
Free the buffered packets as opposed to retrying to send them when the
output port is freed.
Signed-off-by: Cristian Dumitrescu
---
lib/port/rte_swx_port_ethdev.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/port/rte_swx_port_ethdev.c b/lib/port/rte_swx_port_ethdev.c
index eae20d34ce..8a1da71003 100644
--- a/lib/port/rte_swx_port_ethdev.c
+++ b/lib/port/rte_swx_port_ethdev.c
@@ -371,11 +371,17 @@ static void
writer_free(void *port)
{
struct writer *p = port;
+ int i;
if (!p)
return;
- writer_flush(p);
+ for (i = 0; i < p->n_pkts; i++) {
+ struct rte_mbuf *m = p->pkts[i];
+
+ rte_pktmbuf_free(m);
+ }
+
free(p->pkts);
free(port);
}
--
2.34.1
[PATCH 05/10] port: prevent unnecessary flush for the Ethernet device output port
Do not flush the buffered packets unnecessarily when a burst was sent
since the last flush call.
Signed-off-by: Cristian Dumitrescu
---
lib/port/rte_swx_port_ethdev.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/port/rte_swx_port_ethdev.c b/lib/port/rte_swx_port_ethdev.c
index 8a1da71003..7cb3c4dfb1 100644
--- a/lib/port/rte_swx_port_ethdev.c
+++ b/lib/port/rte_swx_port_ethdev.c
@@ -174,6 +174,7 @@ struct writer {
struct rte_mbuf **pkts;
int n_pkts;
uint32_t n_bytes;
+ int flush_flag;
};
static void *
@@ -249,6 +250,7 @@ __writer_flush(struct writer *p)
p->stats.n_bytes_drop = n_bytes_drop_total + n_bytes_drop;
p->n_pkts = 0;
p->n_bytes = 0;
+ p->flush_flag = 0;
TRACE("[Ethdev TX port %u queue %u] Buffered packets flushed: %d out,
%d dropped\n",
(uint32_t)p->params.port_id,
@@ -363,8 +365,10 @@ writer_flush(void *port)
{
struct writer *p = port;
- if (p->n_pkts)
+ if (p->n_pkts && p->flush_flag)
__writer_flush(p);
+
+ p->flush_flag = 1;
}
static void
--
2.34.1
[PATCH 06/10] port: rework the ring output port behavior to non-blocking
Drop packets that cannot be sent instead of retry sending the same
packets potentially forever when the ring consumer that is down.
Signed-off-by: Cristian Dumitrescu
---
lib/port/rte_swx_port_ring.c | 99
1 file changed, 66 insertions(+), 33 deletions(-)
diff --git a/lib/port/rte_swx_port_ring.c b/lib/port/rte_swx_port_ring.c
index c62fb3d8c8..72ec7209bf 100644
--- a/lib/port/rte_swx_port_ring.c
+++ b/lib/port/rte_swx_port_ring.c
@@ -172,6 +172,7 @@ struct writer {
struct rte_mbuf **pkts;
int n_pkts;
+ uint32_t n_bytes;
};
static void *
@@ -218,31 +219,55 @@ writer_create(void *args)
return NULL;
}
-static void
+static inline void
__writer_flush(struct writer *p)
{
- int n_pkts;
-
- for (n_pkts = 0; ; ) {
- n_pkts += rte_ring_sp_enqueue_burst(p->params.ring,
- (void **)p->pkts + n_pkts,
- p->n_pkts - n_pkts,
- NULL);
-
- TRACE("[Ring %s] %d packets out\n", p->params.name, n_pkts);
-
- if (n_pkts == p->n_pkts)
- break;
+ struct rte_mbuf **pkts = p->pkts;
+ uint64_t n_pkts_total = p->stats.n_pkts;
+ uint64_t n_bytes_total = p->stats.n_bytes;
+ uint64_t n_pkts_drop_total = p->stats.n_pkts_drop;
+ uint64_t n_bytes_drop_total = p->stats.n_bytes_drop;
+ int n_pkts = p->n_pkts, n_pkts_drop, n_pkts_tx;
+ uint32_t n_bytes = p->n_bytes, n_bytes_drop = 0;
+
+ /* Packet TX. */
+ n_pkts_tx = rte_ring_sp_enqueue_burst(p->params.ring,
+ (void **)pkts,
+ n_pkts,
+ NULL);
+
+ /* Packet drop. */
+ n_pkts_drop = n_pkts - n_pkts_tx;
+
+ for ( ; n_pkts_tx < n_pkts; n_pkts_tx++) {
+ struct rte_mbuf *m = pkts[n_pkts_tx];
+
+ n_bytes_drop += m->pkt_len;
+ rte_pktmbuf_free(m);
}
+ /* Port update. */
+ p->stats.n_pkts = n_pkts_total + n_pkts - n_pkts_drop;
+ p->stats.n_bytes = n_bytes_total + n_bytes - n_bytes_drop;
+ p->stats.n_pkts_drop = n_pkts_drop_total + n_pkts_drop;
+ p->stats.n_bytes_drop = n_bytes_drop_total + n_bytes_drop;
p->n_pkts = 0;
+ p->n_bytes = 0;
+
+ TRACE("[Ring %s] Buffered packets flushed: %d out, %d dropped\n",
+ p->params.name,
+ n_pkts - n_pkts_drop,
+ n_pkts_drop);
}
static void
writer_pkt_tx(void *port, struct rte_swx_pkt *pkt)
{
struct writer *p = port;
+ int n_pkts = p->n_pkts;
+ uint32_t n_bytes = p->n_bytes;
struct rte_mbuf *m = pkt->handle;
+ uint32_t pkt_length = pkt->length;
TRACE("[Ring %s] Pkt %d (%u bytes at offset %u)\n",
p->params.name,
@@ -252,15 +277,15 @@ writer_pkt_tx(void *port, struct rte_swx_pkt *pkt)
if (TRACE_LEVEL)
rte_hexdump(stdout, NULL, &pkt->pkt[pkt->offset], pkt->length);
- m->data_len = (uint16_t)(pkt->length + m->data_len - m->pkt_len);
- m->pkt_len = pkt->length;
+ m->data_len = (uint16_t)(pkt_length + m->data_len - m->pkt_len);
+ m->pkt_len = pkt_length;
m->data_off = (uint16_t)pkt->offset;
- p->stats.n_pkts++;
- p->stats.n_bytes += pkt->length;
+ p->pkts[n_pkts++] = m;
+ p->n_pkts = n_pkts;
+ p->n_bytes = n_bytes + pkt_length;
- p->pkts[p->n_pkts++] = m;
- if (p->n_pkts == (int)p->params.burst_size)
+ if (n_pkts == (int)p->params.burst_size)
__writer_flush(p);
}
@@ -268,7 +293,11 @@ static void
writer_pkt_fast_clone_tx(void *port, struct rte_swx_pkt *pkt)
{
struct writer *p = port;
+ int n_pkts = p->n_pkts;
+ uint32_t n_bytes = p->n_bytes;
+ uint64_t n_pkts_clone = p->stats.n_pkts_clone;
struct rte_mbuf *m = pkt->handle;
+ uint32_t pkt_length = pkt->length;
TRACE("[Ring %s] Pkt %d (%u bytes at offset %u) (fast clone)\n",
p->params.name,
@@ -278,17 +307,17 @@ writer_pkt_fast_clone_tx(void *port, struct rte_swx_pkt
*pkt)
if (TRACE_LEVEL)
rte_hexdump(stdout, NULL, &pkt->pkt[pkt->offset], pkt->length);
- m->data_len = (uint16_t)(pkt->length + m->data_len - m->pkt_len);
- m->pkt_len = pkt->length;
+ m->data_len = (uint16_t)(pkt_length + m->data_len - m->pkt_len);
+ m->pkt_len = pkt_length;
m->data_off = (uint16_t)pkt->offset;
rte_pktmbuf_refcnt_update(m, 1);
- p->stats.n_pkts++;
- p->stats.n_bytes += pkt->length;
- p->stats.n_pkts_clone++;
+ p->pkts[n_pkts++] = m;
+ p->n_pkts = n_pkts;
+ p->n_bytes = n_bytes + pkt_length;
+ p->stats.n_pkts_clone = n_pkts_clone + 1;
-
[PATCH 07/10] port: free buffered packets on ring output port free
Free the buffered packets as opposed to retrying to send them when the
output port is freed.
Signed-off-by: Cristian Dumitrescu
---
lib/port/rte_swx_port_ring.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/port/rte_swx_port_ring.c b/lib/port/rte_swx_port_ring.c
index 72ec7209bf..7cdcd4b638 100644
--- a/lib/port/rte_swx_port_ring.c
+++ b/lib/port/rte_swx_port_ring.c
@@ -371,11 +371,17 @@ static void
writer_free(void *port)
{
struct writer *p = port;
+ int i;
if (!p)
return;
- writer_flush(p);
+ for (i = 0; i < p->n_pkts; i++) {
+ struct rte_mbuf *m = p->pkts[i];
+
+ rte_pktmbuf_free(m);
+ }
+
free(p->pkts);
free(p->params.name);
free(port);
--
2.34.1
[PATCH 01/10] port: add output port packet drop statistics couters
Add packet drop statistics counters for the output ports. Required by
the non-blocking output port behavior where the packets that cannot
be sent at the time of the operation are dropped as opposed to the
send operation being retried potentially forever for the same packets.
Signed-off-by: Cristian Dumitrescu
---
lib/port/rte_swx_port.h | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/port/rte_swx_port.h b/lib/port/rte_swx_port.h
index 5e29100f59..1dbd95ae87 100644
--- a/lib/port/rte_swx_port.h
+++ b/lib/port/rte_swx_port.h
@@ -185,12 +185,18 @@ typedef void
/** Output port statistics counters. */
struct rte_swx_port_out_stats {
- /** Number of packets. */
+ /** Number of packets successfully transmitted. */
uint64_t n_pkts;
- /** Number of bytes. */
+ /** Number of bytes successfully transmitted. */
uint64_t n_bytes;
+ /** Number of packets dropped. */
+ uint64_t n_pkts_drop;
+
+ /** Number of bytes dropped. */
+ uint64_t n_bytes_drop;
+
/** Number of packets cloned successfully. */
uint64_t n_pkts_clone;
--
2.34.1
[PATCH 08/10] port: prevent unnecessary flush for the ring output port
Do not flush the buffered packets unnecessarily when a burst was sent
since the last flush call.
Signed-off-by: Cristian Dumitrescu
---
lib/port/rte_swx_port_ring.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/port/rte_swx_port_ring.c b/lib/port/rte_swx_port_ring.c
index 7cdcd4b638..d0058087bd 100644
--- a/lib/port/rte_swx_port_ring.c
+++ b/lib/port/rte_swx_port_ring.c
@@ -173,6 +173,7 @@ struct writer {
struct rte_mbuf **pkts;
int n_pkts;
uint32_t n_bytes;
+ int flush_flag;
};
static void *
@@ -253,6 +254,7 @@ __writer_flush(struct writer *p)
p->stats.n_bytes_drop = n_bytes_drop_total + n_bytes_drop;
p->n_pkts = 0;
p->n_bytes = 0;
+ p->flush_flag = 0;
TRACE("[Ring %s] Buffered packets flushed: %d out, %d dropped\n",
p->params.name,
@@ -363,8 +365,10 @@ writer_flush(void *port)
{
struct writer *p = port;
- if (p->n_pkts)
+ if (p->n_pkts && p->flush_flag)
__writer_flush(p);
+
+ p->flush_flag = 1;
}
static void
--
2.34.1
[PATCH 00/10] port: implement output port non-blocking behavior
In case of blocking behavior, the output port retries sending the
packets that could not be sent successfully. The retry can take place
potentially forever in case the Ethernet device or the ring consumer
are down, which leads to deadlock.
In case of the non-blocking behavior introduced by this series, the
packets that could not be sent successfully are dropped and the
associated drop statistics counters are incremented.
Depends-on: series-24205 ("net/softnic: replace the legacy pipeline with SWX
pipeline")
Cristian Dumitrescu (10):
port: add output port packet drop statistics couters
port: adjust the sink port counters
port: rework the Ethernet device output port behavior to non-blocking
port: free buffered packets on Ethernet device output port free
port: prevent unnecessary flush for the Ethernet device output port
port: rework the ring output port behavior to non-blocking
port: free buffered packets on ring output port free
port: prevent unnecessary flush for the ring output port
examples/pipeline: print the output port packet drop counters
net/softnic: print the output port packet drop counters
drivers/net/softnic/rte_eth_softnic_cli.c | 4 +
examples/pipeline/cli.c | 4 +
lib/port/rte_swx_port.h | 10 +-
lib/port/rte_swx_port_ethdev.c| 117 +++---
lib/port/rte_swx_port_ring.c | 113 ++---
lib/port/rte_swx_port_source_sink.c | 8 +-
6 files changed, 177 insertions(+), 79 deletions(-)
--
2.34.1
[PATCH 02/10] port: adjust the sink port counters
The sink port is tasked to drop all packets, hence the packet and byte
counters should be named to reflect the drop operation.
Signed-off-by: Cristian Dumitrescu
---
lib/port/rte_swx_port_source_sink.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/port/rte_swx_port_source_sink.c
b/lib/port/rte_swx_port_source_sink.c
index d3cf42c30b..757a2c4a2e 100644
--- a/lib/port/rte_swx_port_source_sink.c
+++ b/lib/port/rte_swx_port_source_sink.c
@@ -299,8 +299,8 @@ sink_pkt_tx(void *port, struct rte_swx_pkt *pkt)
m->pkt_len = pkt->length;
m->data_off = (uint16_t)pkt->offset;
- p->stats.n_pkts++;
- p->stats.n_bytes += pkt->length;
+ p->stats.n_pkts_drop++;
+ p->stats.n_bytes_drop += pkt->length;
#ifdef RTE_PORT_PCAP
if (p->f_dump) {
@@ -335,8 +335,8 @@ __sink_pkt_clone_tx(void *port, struct rte_swx_pkt *pkt,
uint32_t truncation_len
m->pkt_len = pkt->length;
m->data_off = (uint16_t)pkt->offset;
- p->stats.n_pkts++;
- p->stats.n_bytes += pkt->length;
+ p->stats.n_pkts_drop++;
+ p->stats.n_bytes_drop += pkt->length;
p->stats.n_pkts_clone++;
#ifdef RTE_PORT_PCAP
--
2.34.1
[PATCH 09/10] examples/pipeline: print the output port packet drop counters
Print the output port pacet drop statistics counters. Signed-off-by: Cristian Dumitrescu --- examples/pipeline/cli.c | 4 1 file changed, 4 insertions(+) diff --git a/examples/pipeline/cli.c b/examples/pipeline/cli.c index 75c32b9089..2e69698031 100644 --- a/examples/pipeline/cli.c +++ b/examples/pipeline/cli.c @@ -2276,10 +2276,14 @@ cmd_pipeline_stats(char **tokens, out_size, " packets %" PRIu64 " bytes %" PRIu64 + " packets dropped %" PRIu64 + " bytes dropped %" PRIu64 " clone %" PRIu64 " clonerr %" PRIu64 "\n", stats.n_pkts, stats.n_bytes, + stats.n_pkts_drop, + stats.n_bytes_drop, stats.n_pkts_clone, stats.n_pkts_clone_err); -- 2.34.1
[PATCH 03/10] port: rework the Ethernet device output port behavior to non-blocking
Drop packets that cannot be sent instead of retry sending the same
packets potentially forever when the Ethernet device that is down.
Signed-off-by: Cristian Dumitrescu
---
lib/port/rte_swx_port_ethdev.c | 103 +
1 file changed, 67 insertions(+), 36 deletions(-)
diff --git a/lib/port/rte_swx_port_ethdev.c b/lib/port/rte_swx_port_ethdev.c
index ca4a43ac4f..eae20d34ce 100644
--- a/lib/port/rte_swx_port_ethdev.c
+++ b/lib/port/rte_swx_port_ethdev.c
@@ -173,6 +173,7 @@ struct writer {
struct rte_mbuf **pkts;
int n_pkts;
+ uint32_t n_bytes;
};
static void *
@@ -214,34 +215,56 @@ writer_create(void *args)
return p;
}
-static void
+static inline void
__writer_flush(struct writer *p)
{
- int n_pkts;
-
- for (n_pkts = 0; ; ) {
- n_pkts += rte_eth_tx_burst(p->params.port_id,
- p->params.queue_id,
- p->pkts + n_pkts,
- p->n_pkts - n_pkts);
-
- TRACE("[Ethdev TX port %u queue %u] %d packets out\n",
- (uint32_t)p->params.port_id,
- (uint32_t)p->params.queue_id,
- n_pkts);
-
- if (n_pkts == p->n_pkts)
- break;
+ struct rte_mbuf **pkts = p->pkts;
+ uint64_t n_pkts_total = p->stats.n_pkts;
+ uint64_t n_bytes_total = p->stats.n_bytes;
+ uint64_t n_pkts_drop_total = p->stats.n_pkts_drop;
+ uint64_t n_bytes_drop_total = p->stats.n_bytes_drop;
+ int n_pkts = p->n_pkts, n_pkts_drop, n_pkts_tx;
+ uint32_t n_bytes = p->n_bytes, n_bytes_drop = 0;
+
+ /* Packet TX. */
+ n_pkts_tx = rte_eth_tx_burst(p->params.port_id,
+p->params.queue_id,
+pkts,
+n_pkts);
+
+ /* Packet drop. */
+ n_pkts_drop = n_pkts - n_pkts_tx;
+
+ for ( ; n_pkts_tx < n_pkts; n_pkts_tx++) {
+ struct rte_mbuf *m = pkts[n_pkts_tx];
+
+ n_bytes_drop += m->pkt_len;
+ rte_pktmbuf_free(m);
}
+ /* Port update. */
+ p->stats.n_pkts = n_pkts_total + n_pkts - n_pkts_drop;
+ p->stats.n_bytes = n_bytes_total + n_bytes - n_bytes_drop;
+ p->stats.n_pkts_drop = n_pkts_drop_total + n_pkts_drop;
+ p->stats.n_bytes_drop = n_bytes_drop_total + n_bytes_drop;
p->n_pkts = 0;
+ p->n_bytes = 0;
+
+ TRACE("[Ethdev TX port %u queue %u] Buffered packets flushed: %d out,
%d dropped\n",
+ (uint32_t)p->params.port_id,
+ (uint32_t)p->params.queue_id,
+ n_pkts - n_pkts_drop,
+ n_pkts_drop);
}
static void
writer_pkt_tx(void *port, struct rte_swx_pkt *pkt)
{
struct writer *p = port;
+ int n_pkts = p->n_pkts;
+ uint32_t n_bytes = p->n_bytes;
struct rte_mbuf *m = pkt->handle;
+ uint32_t pkt_length = pkt->length;
TRACE("[Ethdev TX port %u queue %u] Pkt %d (%u bytes at offset %u)\n",
(uint32_t)p->params.port_id,
@@ -252,15 +275,15 @@ writer_pkt_tx(void *port, struct rte_swx_pkt *pkt)
if (TRACE_LEVEL)
rte_hexdump(stdout, NULL, &pkt->pkt[pkt->offset], pkt->length);
- m->data_len = (uint16_t)(pkt->length + m->data_len - m->pkt_len);
- m->pkt_len = pkt->length;
+ m->data_len = (uint16_t)(pkt_length + m->data_len - m->pkt_len);
+ m->pkt_len = pkt_length;
m->data_off = (uint16_t)pkt->offset;
- p->stats.n_pkts++;
- p->stats.n_bytes += pkt->length;
+ p->pkts[n_pkts++] = m;
+ p->n_pkts = n_pkts;
+ p->n_bytes = n_bytes + pkt_length;
- p->pkts[p->n_pkts++] = m;
- if (p->n_pkts == (int)p->params.burst_size)
+ if (n_pkts == (int)p->params.burst_size)
__writer_flush(p);
}
@@ -268,7 +291,11 @@ static void
writer_pkt_fast_clone_tx(void *port, struct rte_swx_pkt *pkt)
{
struct writer *p = port;
+ int n_pkts = p->n_pkts;
+ uint32_t n_bytes = p->n_bytes;
+ uint64_t n_pkts_clone = p->stats.n_pkts_clone;
struct rte_mbuf *m = pkt->handle;
+ uint32_t pkt_length = pkt->length;
TRACE("[Ethdev TX port %u queue %u] Pkt %d (%u bytes at offset %u)
(fast clone)\n",
(uint32_t)p->params.port_id,
@@ -279,17 +306,17 @@ writer_pkt_fast_clone_tx(void *port, struct rte_swx_pkt
*pkt)
if (TRACE_LEVEL)
rte_hexdump(stdout, NULL, &pkt->pkt[pkt->offset], pkt->length);
- m->data_len = (uint16_t)(pkt->length + m->data_len - m->pkt_len);
- m->pkt_len = pkt->length;
+ m->data_len = (uint16_t)(pkt_length + m->data_len - m->pkt_len);
+ m->pkt_len = pkt_length;
m->data_off = (uint16_t)pkt->offset;
rte_pktmbuf_refcnt_update(m, 1);
- p->stats.n_pkts++;
- p->stat
[PATCH 10/10] net/softnic: print the output port packet drop counters
Print the output port packet drop statistics counters. Signed-off-by: Cristian Dumitrescu --- drivers/net/softnic/rte_eth_softnic_cli.c | 4 1 file changed, 4 insertions(+) diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c b/drivers/net/softnic/rte_eth_softnic_cli.c index 61221b2f2e..9f4c44579a 100644 --- a/drivers/net/softnic/rte_eth_softnic_cli.c +++ b/drivers/net/softnic/rte_eth_softnic_cli.c @@ -1987,10 +1987,14 @@ cmd_softnic_pipeline_stats(struct pmd_internals *softnic, out_size, " packets %" PRIu64 " bytes %" PRIu64 + " packets dropped %" PRIu64 + " bytes dropped %" PRIu64 " clone %" PRIu64 " clonerr %" PRIu64 "\n", stats.n_pkts, stats.n_bytes, + stats.n_pkts_drop, + stats.n_bytes_drop, stats.n_pkts_clone, stats.n_pkts_clone_err); -- 2.34.1
