[dpdk-dev] [PATCH] examples/flow_filtering: remove out-of-date comment
Now we've setup both rx and tx queues.
Signed-off-by: Xiaolong Ye
---
examples/flow_filtering/main.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c
index 09dbbcea9..a0487be77 100644
--- a/examples/flow_filtering/main.c
+++ b/examples/flow_filtering/main.c
@@ -149,7 +149,6 @@ init_port(void)
rxq_conf = dev_info.default_rxconf;
rxq_conf.offloads = port_conf.rxmode.offloads;
- /* only set Rx queues: something we care only so far */
for (i = 0; i < nr_queues; i++) {
ret = rte_eth_rx_queue_setup(port_id, i, 512,
rte_eth_dev_socket_id(port_id),
--
2.17.1
[dpdk-dev] [PATCH v3 2/2] doc: update for ICE driver
Update feature for ICE driver Signed-off-by: Beilei Xing --- doc/guides/rel_notes/release_19_08.rst | 5 + 1 file changed, 5 insertions(+) diff --git a/doc/guides/rel_notes/release_19_08.rst b/doc/guides/rel_notes/release_19_08.rst index 8da66fe..81ec5fa 100644 --- a/doc/guides/rel_notes/release_19_08.rst +++ b/doc/guides/rel_notes/release_19_08.rst @@ -58,6 +58,11 @@ New Features Enabled the new device whose device id is 0x15FF. +* **Updated the ice driver.** + + Updated ice driver with new features and improvements, including: + + * Enabled Tx outer/inner L3/L4 checksum offload. Removed Items - -- 2.5.5
[dpdk-dev] [PATCH v3 1/2] net/ice: support Tx checksum offload for tunneling packets
Enable Tx checksum offload for tunneling packets by
configuring tunneling parameters in Tx descriptors,
including outer L3/L4 checksum offload.
Signed-off-by: Beilei Xing
---
drivers/net/ice/ice_ethdev.c | 3 +-
drivers/net/ice/ice_rxtx.c | 78 +---
2 files changed, 76 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 19fbbc3..b6a473f 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2051,7 +2051,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
DEV_TX_OFFLOAD_UDP_CKSUM |
DEV_TX_OFFLOAD_TCP_CKSUM |
DEV_TX_OFFLOAD_SCTP_CKSUM |
- DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM;
+ DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
+ DEV_TX_OFFLOAD_OUTER_UDP_CKSUM;
dev_info->flow_type_rss_offloads |= ICE_RSS_OFFLOAD_ALL;
}
diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 620a5ea..7ff3ff8 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -1742,14 +1742,71 @@ ice_recv_pkts(void *rx_queue,
}
static inline void
+ice_parse_tunneling_params(uint64_t ol_flags,
+ union ice_tx_offload tx_offload,
+ uint32_t *cd_tunneling)
+{
+ /* EIPT: External (outer) IP header type */
+ if (ol_flags & PKT_TX_OUTER_IP_CKSUM)
+ *cd_tunneling |= ICE_TX_CTX_EIPT_IPV4;
+ else if (ol_flags & PKT_TX_OUTER_IPV4)
+ *cd_tunneling |= ICE_TX_CTX_EIPT_IPV4_NO_CSUM;
+ else if (ol_flags & PKT_TX_OUTER_IPV6)
+ *cd_tunneling |= ICE_TX_CTX_EIPT_IPV6;
+
+ /* EIPLEN: External (outer) IP header length, in DWords */
+ *cd_tunneling |= (tx_offload.outer_l3_len >> 2) <<
+ ICE_TXD_CTX_QW0_EIPLEN_S;
+
+ /* L4TUNT: L4 Tunneling Type */
+ switch (ol_flags & PKT_TX_TUNNEL_MASK) {
+ case PKT_TX_TUNNEL_IPIP:
+ /* for non UDP / GRE tunneling, set to 00b */
+ break;
+ case PKT_TX_TUNNEL_VXLAN:
+ case PKT_TX_TUNNEL_GENEVE:
+ *cd_tunneling |= ICE_TXD_CTX_UDP_TUNNELING;
+ break;
+ case PKT_TX_TUNNEL_GRE:
+ *cd_tunneling |= ICE_TXD_CTX_GRE_TUNNELING;
+ break;
+ default:
+ PMD_TX_LOG(ERR, "Tunnel type not supported");
+ return;
+ }
+
+ /* L4TUNLEN: L4 Tunneling Length, in Words
+*
+* We depend on app to set rte_mbuf.l2_len correctly.
+* For IP in GRE it should be set to the length of the GRE
+* header;
+* For MAC in GRE or MAC in UDP it should be set to the length
+* of the GRE or UDP headers plus the inner MAC up to including
+* its last Ethertype.
+* If MPLS labels exists, it should include them as well.
+*/
+ *cd_tunneling |= (tx_offload.l2_len >> 1) <<
+ ICE_TXD_CTX_QW0_NATLEN_S;
+
+ if ((ol_flags & PKT_TX_OUTER_UDP_CKSUM) &&
+ (ol_flags & PKT_TX_OUTER_IP_CKSUM) &&
+ (*cd_tunneling & ICE_TXD_CTX_UDP_TUNNELING))
+ *cd_tunneling |= ICE_TXD_CTX_QW0_L4T_CS_M;
+}
+
+static inline void
ice_txd_enable_checksum(uint64_t ol_flags,
uint32_t *td_cmd,
uint32_t *td_offset,
union ice_tx_offload tx_offload)
{
- /* L2 length must be set. */
- *td_offset |= (tx_offload.l2_len >> 1) <<
- ICE_TX_DESC_LEN_MACLEN_S;
+ /* Set MACLEN */
+ if (ol_flags & PKT_TX_TUNNEL_MASK)
+ *td_offset |= (tx_offload.outer_l2_len >> 1)
+ << ICE_TX_DESC_LEN_MACLEN_S;
+ else
+ *td_offset |= (tx_offload.l2_len >> 1)
+ << ICE_TX_DESC_LEN_MACLEN_S;
/* Enable L3 checksum offloads */
if (ol_flags & PKT_TX_IP_CKSUM) {
@@ -1863,7 +1920,10 @@ ice_build_ctob(uint32_t td_cmd,
static inline uint16_t
ice_calc_context_desc(uint64_t flags)
{
- static uint64_t mask = PKT_TX_TCP_SEG | PKT_TX_QINQ;
+ static uint64_t mask = PKT_TX_TCP_SEG |
+ PKT_TX_QINQ |
+ PKT_TX_OUTER_IP_CKSUM |
+ PKT_TX_TUNNEL_MASK;
return (flags & mask) ? 1 : 0;
}
@@ -1909,6 +1969,7 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts)
struct ice_tx_entry *txe, *txn;
struct rte_mbuf *tx_pkt;
struct rte_mbuf *m_seg;
+ uint32_t cd_tunneling_params;
uint16_t tx_id;
uint16_t nb_tx;
uint16_t nb_used;
@@ -1979,6 +2040,12 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts)
td_tag = tx_pkt->vlan_tci;
}
+ /* Fill in tunneling parameters if nece
[dpdk-dev] [PATCH v3 0/2] net/ice: support Tx checksum offload
Enable Tx checksum offload for tunneling packets. Update release notes. v3 change: - Add release notes. v2 change: - Parse udp checksum in tunneling parameter. Beilei Xing (2): net/ice: support Tx checksum offload for tunneling packets doc: update for ICE driver doc/guides/rel_notes/release_19_08.rst | 5 +++ drivers/net/ice/ice_ethdev.c | 3 +- drivers/net/ice/ice_rxtx.c | 78 -- 3 files changed, 81 insertions(+), 5 deletions(-) -- 2.5.5
[dpdk-dev] [PATCH] doc: fix typos in rte flow guide
Fixes: 3e0ceb9f17ff ("doc: add basic howto for flow API")
Cc: sta...@dpdk.org
Signed-off-by: Xiaolong Ye
---
doc/guides/howto/rte_flow.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/guides/howto/rte_flow.rst b/doc/guides/howto/rte_flow.rst
index e197376e2..27d4f28f7 100644
--- a/doc/guides/howto/rte_flow.rst
+++ b/doc/guides/howto/rte_flow.rst
@@ -45,7 +45,7 @@ Code
pattern[0].type = RTE_FLOW_ITEM_TYPE_ETH;
pattern[0].spec = ð
- /* set the vlan to pas all packets */
+ /* set the vlan to pass all packets */
pattern[1] = RTE_FLOW_ITEM_TYPE_VLAN;
pattern[1].spec = &vlan;
@@ -141,7 +141,7 @@ Code
pattern[0].type = RTE_FLOW_ITEM_TYPE_ETH;
pattern[0].spec = ð
- /* set the vlan to pas all packets */
+ /* set the vlan to pass all packets */
pattern[1] = RTE_FLOW_ITEM_TYPE_VLAN;
pattern[1].spec = &vlan;
--
2.17.1
Re: [dpdk-dev] [PATCH v1 1/5] vhost: fix add a missing include
On 6/18/19 8:24 AM, Noa Ezra wrote:
Hi,
Does anyone else want to review this patch?
I do, but it seems that the other 4 patches of the series aren't on
dev@dpdk.org, is that expected?
Thanks,
Noa.
-Original Message-
From: Matan Azrad
Sent: Sunday, May 26, 2019 1:23 PM
To: Noa Ezra ; dev@dpdk.org; maxime.coque...@redhat.com
Cc: Noa Ezra ; sta...@dpdk.org
Subject: RE: [PATCH v1 1/5] vhost: fix add a missing include
From: Noa Ezra
Add a missing include with the defines for vhost-user driver features.
Fixes: 5fbb3941da9f ("vhost: introduce driver features related APIs")
Cc: sta...@dpdk.org
Signed-off-by: Noa Ezra
Reviewed-by: Matan Azrad For all the series.
For this patch only:
Reviewed-by: Maxime Coquelin
Thanks,
Maxime
---
lib/librte_vhost/rte_vhost.h | 1 +
1 file changed, 1 insertion(+)
mode change 100644 => 100755 lib/librte_vhost/rte_vhost.h
diff --git a/lib/librte_vhost/rte_vhost.h
b/lib/librte_vhost/rte_vhost.h old mode 100644 new mode 100755 index
0226b3e..338e47c
--- a/lib/librte_vhost/rte_vhost.h
+++ b/lib/librte_vhost/rte_vhost.h
@@ -23,6 +23,7 @@
/* These are not C++-aware. */
#include
#include
+#include
#define RTE_VHOST_USER_CLIENT (1ULL << 0)
#define RTE_VHOST_USER_NO_RECONNECT (1ULL << 1)
--
1.8.3.1
Re: [dpdk-dev] [EXT] Re: [PATCH v3 25/27] mempool/octeontx2: add optimized dequeue operation for arm64
Hi Aaron,
>-Original Message-
>From: Aaron Conole
>Sent: Tuesday, June 18, 2019 2:55 AM
>To: Jerin Jacob Kollanukkaran
>Cc: dev@dpdk.org; Nithin Kumar Dabilpuram
>; Vamsi Krishna Attunuru
>; Pavan Nikhilesh Bhagavatula
>; Olivier Matz
>Subject: [EXT] Re: [dpdk-dev] [PATCH v3 25/27] mempool/octeontx2:
>add optimized dequeue operation for arm64
>
>> From: Pavan Nikhilesh
>>
>> This patch adds an optimized arm64 instruction based routine to
>leverage
>> CPU pipeline characteristics of octeontx2. The theme is to fill the
>> pipeline with CASP operations as much HW can do so that HW can do
>alloc()
>> HW ops in full throttle.
>>
>> Cc: Olivier Matz
>> Cc: Aaron Conole
>>
>> Signed-off-by: Pavan Nikhilesh
>> Signed-off-by: Jerin Jacob
>> Signed-off-by: Vamsi Attunuru
>> ---
>> drivers/mempool/octeontx2/otx2_mempool_ops.c | 291
>+++
>> 1 file changed, 291 insertions(+)
>>
>> diff --git a/drivers/mempool/octeontx2/otx2_mempool_ops.c
>b/drivers/mempool/octeontx2/otx2_mempool_ops.c
>> index c59bd73c0..e6737abda 100644
>> --- a/drivers/mempool/octeontx2/otx2_mempool_ops.c
>> +++ b/drivers/mempool/octeontx2/otx2_mempool_ops.c
>> @@ -37,6 +37,293 @@ npa_lf_aura_op_alloc_one(const int64_t
>wdata, int64_t * const addr,
>> return -ENOENT;
>> }
>>
>> +#if defined(RTE_ARCH_ARM64)
>> +static __rte_noinline int
>> +npa_lf_aura_op_search_alloc(const int64_t wdata, int64_t * const
>addr,
>> +void **obj_table, unsigned int n)
>> +{
>> +uint8_t i;
>> +
>> +for (i = 0; i < n; i++) {
>> +if (obj_table[i] != NULL)
>> +continue;
>> +if (npa_lf_aura_op_alloc_one(wdata, addr, obj_table,
>i))
>> +return -ENOENT;
>> +}
>> +
>> +return 0;
>> +}
>> +
>> +static __attribute__((optimize("-O3"))) __rte_noinline int __hot
>
>Sorry if I missed this before.
>
>Is there a good reason to hard-code this optimization, rather than let
>the build system provide it?
Some versions of compiler don't have support for __int128_t for CASP inline-asm.
i.e. if the optimization level is reduced to -O0 the CASP restrictions aren't
followed and
compiler might end up violation the CASP rules example:
/tmp/ccSPMGzq.s:1648: Error: reg pair must start from even reg at operand 1 -
`casp x21,x22,x0,x1,[x19]'
/tmp/ccSPMGzq.s:1706: Error: reg pair must start from even reg at operand 1 -
`casp x13,x14,x0,x1,[x11]'
/tmp/ccSPMGzq.s:1745: Error: reg pair must start from even reg at operand 1 -
`casp x9,x10,x0,x1,[x7]'
/tmp/ccSPMGzq.s:1775: Error: reg pair must start from even reg at operand 1 -
`casp x7,x8,x0,x1,[x5]'*
Forcing to -O3 with __rte_noinline in place fixes it as the alignment fits in.
Regards,
Pavan.
>
>> +npa_lf_aura_op_alloc_bulk(const int64_t wdata, int64_t * const
>addr,
>> + unsigned int n, void **obj_table)
>> +{
>> +const __uint128_t wdata128 = ((__uint128_t)wdata << 64) |
>wdata;
>> +uint64x2_t failed = vdupq_n_u64(~0);
>> +
>> +switch (n) {
>> +case 32:
>> +{
>> +__uint128_t t0, t1, t2, t3, t4, t5, t6, t7, t8, t9;
>> +__uint128_t t10, t11;
>> +
>> +asm volatile (
>> +".cpu generic+lse\n"
>> +"casp %[t0], %H[t0], %[wdata], %H[wdata], [%[loc]]\n"
[dpdk-dev] [PATCH 0/4] Some fixes for mergeable Rx
Tiwei Bie (4): net/virtio: fix memory leak in in-order Rx net/virtio: fix memory leak in mergeable Rx net/virtio: fix memory leak in mergeable packed Rx net/virtio: fix packets check in mergeable packed Rx drivers/net/virtio/virtio_rxtx.c | 56 +++- 1 file changed, 26 insertions(+), 30 deletions(-) -- 2.17.1
[dpdk-dev] [PATCH 4/4] net/virtio: fix packets check in mergeable packed Rx
We should check the descriptor state instead of vq's internal
free count (i.e. the number of descriptors that we haven't made
available) for the remaining mergeable packets.
Fixes: a76290c8f1cf ("net/virtio: implement Rx path for packed queues")
Cc: sta...@dpdk.org
Signed-off-by: Tiwei Bie
---
drivers/net/virtio/virtio_rxtx.c | 50 +++-
1 file changed, 23 insertions(+), 27 deletions(-)
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 8b75291f5..b5062ff84 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -1882,38 +1882,34 @@ virtio_recv_mergeable_pkts_packed(void *rx_queue,
while (seg_res != 0) {
uint16_t rcv_cnt = RTE_MIN((uint16_t)seg_res,
VIRTIO_MBUF_BURST_SZ);
- if (likely(vq->vq_free_cnt >= rcv_cnt)) {
- num = virtqueue_dequeue_burst_rx_packed(vq, rcv_pkts,
- len, rcv_cnt);
- uint16_t extra_idx = 0;
+ uint16_t extra_idx = 0;
- rcv_cnt = num;
-
- while (extra_idx < rcv_cnt) {
- rxm = rcv_pkts[extra_idx];
-
- rxm->data_off =
- RTE_PKTMBUF_HEADROOM - hdr_size;
- rxm->pkt_len = (uint32_t)(len[extra_idx]);
- rxm->data_len = (uint16_t)(len[extra_idx]);
-
- prev->next = rxm;
- prev = rxm;
- rx_pkts[nb_rx]->pkt_len += len[extra_idx];
- extra_idx += 1;
- }
- seg_res -= rcv_cnt;
- if (!seg_res) {
- virtio_rx_stats_updated(rxvq, rx_pkts[nb_rx]);
- nb_rx++;
- }
- } else {
- PMD_RX_LOG(ERR,
- "No enough segments for packet.");
+ rcv_cnt = virtqueue_dequeue_burst_rx_packed(vq, rcv_pkts,
+ len, rcv_cnt);
+ if (unlikely(rcv_cnt == 0)) {
+ PMD_RX_LOG(ERR, "No enough segments for packet.");
rte_pktmbuf_free(rx_pkts[nb_rx]);
rxvq->stats.errors++;
break;
}
+
+ while (extra_idx < rcv_cnt) {
+ rxm = rcv_pkts[extra_idx];
+
+ rxm->data_off = RTE_PKTMBUF_HEADROOM - hdr_size;
+ rxm->pkt_len = (uint32_t)(len[extra_idx]);
+ rxm->data_len = (uint16_t)(len[extra_idx]);
+
+ prev->next = rxm;
+ prev = rxm;
+ rx_pkts[nb_rx]->pkt_len += len[extra_idx];
+ extra_idx += 1;
+ }
+ seg_res -= rcv_cnt;
+ if (!seg_res) {
+ virtio_rx_stats_updated(rxvq, rx_pkts[nb_rx]);
+ nb_rx++;
+ }
}
rxvq->stats.packets += nb_rx;
--
2.17.1
[dpdk-dev] [PATCH 2/4] net/virtio: fix memory leak in mergeable Rx
When there is no enough segments for a packet in mergeable
Rx path, we should free the whole mbuf chain instead of just
the last segment.
Fixes: bcac5aa207f8 ("net/virtio: improve batching in mergeable path")
Cc: sta...@dpdk.org
Signed-off-by: Tiwei Bie
---
drivers/net/virtio/virtio_rxtx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index bdb3a2f18..9cf422ffe 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -1737,7 +1737,7 @@ virtio_recv_mergeable_pkts(void *rx_queue,
} else {
PMD_RX_LOG(ERR,
"No enough segments for packet.");
- virtio_discard_rxbuf(vq, prev);
+ rte_pktmbuf_free(rx_pkts[nb_rx]);
rxvq->stats.errors++;
break;
}
--
2.17.1
[dpdk-dev] [PATCH 3/4] net/virtio: fix memory leak in mergeable packed Rx
When there is no enough segments for a packet in mergeable
packed Rx path, we should free the whole mbuf chain instead
of just the last segment.
Fixes: a76290c8f1cf ("net/virtio: implement Rx path for packed queues")
Cc: sta...@dpdk.org
Signed-off-by: Tiwei Bie
---
drivers/net/virtio/virtio_rxtx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 9cf422ffe..8b75291f5 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -1910,7 +1910,7 @@ virtio_recv_mergeable_pkts_packed(void *rx_queue,
} else {
PMD_RX_LOG(ERR,
"No enough segments for packet.");
- virtio_discard_rxbuf(vq, prev);
+ rte_pktmbuf_free(rx_pkts[nb_rx]);
rxvq->stats.errors++;
break;
}
--
2.17.1
[dpdk-dev] [PATCH 1/4] net/virtio: fix memory leak in in-order Rx
When there is no enough segments for a packet in in-order
mergeable Rx path, we should free the whole mbuf chain instead
of just the last segment.
Fixes: e5f456a98d3c ("net/virtio: support in-order Rx and Tx")
Cc: sta...@dpdk.org
Signed-off-by: Tiwei Bie
---
drivers/net/virtio/virtio_rxtx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 1f1178467..bdb3a2f18 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -1555,7 +1555,7 @@ virtio_recv_pkts_inorder(void *rx_queue,
} else {
PMD_RX_LOG(ERR,
"No enough segments for packet.");
- virtio_discard_rxbuf_inorder(vq, prev);
+ rte_pktmbuf_free(rx_pkts[nb_rx]);
rxvq->stats.errors++;
break;
}
--
2.17.1
Re: [dpdk-dev] [PATCH 00/29] net/sfc/base: update base driver
On 6/10/2019 8:38 AM, Andrew Rybchenko wrote:
> checkpatches.sh generates warnings/errors because of a bit different
> coding style in base driver.
>
> Andrew Lee (1):
> net/sfc/base: fix signed/unsigned mismatch errors
>
> Andrew Rybchenko (2):
> net/sfc/base: do not rely on indirect header inclusion
> net/sfc/base: update MCDI headers
>
> Gautam Dawar (14):
> net/sfc/base: enable chained multicast on all EF10 cards
> net/sfc/base: export the zero-based MCDI port number
> net/sfc/base: introduce of EVB module for SR-IOV support
> net/sfc/base: add MCDI wrappers for vPort and vSwitch in EVB
> net/sfc/base: add EVB module vSwitch/vPort/vAdaptor ops
> net/sfc/base: implement vSwitch create/destroy
> net/sfc/base: factor out upstream port vAdaptor allocation
> net/sfc/base: support data path with EVB module
> net/sfc/base: support proxy auth operations for SR-IOV
> net/sfc/base: implement proxy auth MCDI event handling
> net/sfc/base: provide proxy APIs to client drivers
> net/sfc/base: provide APIs to configure and reset vPort
> net/sfc/base: provide API to fetch vPort statistics
> net/sfc/base: add APIs for PTP privilege configuration
>
> Kevin Lampis (1):
> net/sfc/base: add definition of OEM TLV
>
> Mark Spender (2):
> net/sfc/base: fix shift by more bits than field width
> net/sfc/base: improve code style in sensors decoding
>
> Paul Fox (1):
> net/sfc/base: add definition of bundle metadata partition
>
> Richard Houldsworth (8):
> net/sfc/base: add driver version string registration
> net/sfc/base: add capabilities for bundle partition support
> net/sfc/base: add extensible NVRAM info function
> net/sfc/base: add NVRAM info to API
> net/sfc/base: add firmware ID header
> net/sfc/base: support direct FW update for bundle partitions
> net/sfc/base: transition to the extensible NVRAM info API
> net/sfc/base: add background mode firmware updating
Series applied to dpdk-next-net/master, thanks.
Fixed following checkpatch warnings while merging:
ERROR:SPACING: space required before the open brace '{'
#49: FILE: drivers/net/sfc/base/mcdi_mon.c:85:
+ (efx_mon_get_stat_portmap(id, &stat_portmask) != B_TRUE)){
WARNING:TYPO_SPELLING: 'paramter' may be misspelled - perhaps 'parameter'?
#1:
identifier and hence this paramter is unused for EF10 architecture
WARNING:TYPO_SPELLING: 'initilization' may be misspelled - perhaps
'initialization'?
#13:
the changes in NIC initilization flow.
Re: [dpdk-dev] [PATCH v2] doc: support new i40e device
On 6/18/2019 7:52 AM, Beilei Xing wrote: > Add support for new i40e device. > > Signed-off-by: Beilei Xing Can you please add the commit that introduces the device as Fixes line? > --- > v2 change: > - Change indentation. > > doc/guides/rel_notes/release_19_08.rst | 4 > 1 file changed, 4 insertions(+) > > diff --git a/doc/guides/rel_notes/release_19_08.rst > b/doc/guides/rel_notes/release_19_08.rst > index b9510f9..8da66fe 100644 > --- a/doc/guides/rel_notes/release_19_08.rst > +++ b/doc/guides/rel_notes/release_19_08.rst > @@ -54,6 +54,10 @@ New Features > Also, make sure to start the actual text at the margin. > = > > +* **Enabled new i40e device.** > + > + Enabled the new device whose device id is 0x15FF. > + > > Removed Items > - >
[dpdk-dev] [PATCH v2] net/memif: multi-process support
Multi-process support for memif PMD.
Primary process handles connection establishment.
Secondary process queries for memory regions.
Signed-off-by: Jakub Grajciar
---
drivers/net/memif/Makefile| 3 +
drivers/net/memif/memif_socket.c | 45 +--
drivers/net/memif/meson.build | 3 +
drivers/net/memif/rte_eth_memif.c | 439 ++
drivers/net/memif/rte_eth_memif.h | 16 +-
5 files changed, 356 insertions(+), 150 deletions(-)
requires patch: https://patches.dpdk.org/patch/54490/
V2:
- fix coding style
- free reply after use, rte_mp_request_sync()
diff --git a/drivers/net/memif/Makefile b/drivers/net/memif/Makefile
index c3119625c..fdbdf3378 100644
--- a/drivers/net/memif/Makefile
+++ b/drivers/net/memif/Makefile
@@ -17,6 +17,9 @@ CFLAGS += $(WERROR_FLAGS)
CFLAGS += -DALLOW_EXPERIMENTAL_API
# Experimantal APIs:
# - rte_intr_callback_unregister_pending
+# - rte_mp_action_register
+# - rte_mp_reply
+# - rte_mp_request_sync
LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
LDLIBS += -lrte_ethdev -lrte_kvargs
LDLIBS += -lrte_hash
diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c
index 1e046b6b1..01a935f87 100644
--- a/drivers/net/memif/memif_socket.c
+++ b/drivers/net/memif/memif_socket.c
@@ -256,6 +256,7 @@ memif_msg_receive_add_region(struct rte_eth_dev *dev,
memif_msg_t *msg,
int fd)
{
struct pmd_internals *pmd = dev->data->dev_private;
+ struct pmd_process_private *proc_private = dev->process_private;
memif_msg_add_region_t *ar = &msg->add_region;
struct memif_region *r;
@@ -264,16 +265,16 @@ memif_msg_receive_add_region(struct rte_eth_dev *dev,
memif_msg_t *msg,
return -1;
}
- if (ar->index >= ETH_MEMIF_MAX_REGION_NUM || ar->index !=
pmd->regions_num ||
- pmd->regions[ar->index] != NULL) {
+ if (ar->index >= ETH_MEMIF_MAX_REGION_NUM ||
+ ar->index != proc_private->regions_num ||
+ proc_private->regions[ar->index] != NULL) {
memif_msg_enq_disconnect(pmd->cc, "Invalid region index", 0);
return -1;
}
r = rte_zmalloc("region", sizeof(struct memif_region), 0);
if (r == NULL) {
- MIF_LOG(ERR, "%s: Failed to alloc memif region.",
- rte_vdev_device_name(pmd->vdev));
+ memif_msg_enq_disconnect(pmd->cc, "Failed to alloc memif
region.", 0);
return -ENOMEM;
}
@@ -281,8 +282,8 @@ memif_msg_receive_add_region(struct rte_eth_dev *dev,
memif_msg_t *msg,
r->region_size = ar->size;
r->addr = NULL;
- pmd->regions[ar->index] = r;
- pmd->regions_num++;
+ proc_private->regions[ar->index] = r;
+ proc_private->regions_num++;
return 0;
}
@@ -377,8 +378,7 @@ memif_msg_receive_disconnect(struct rte_eth_dev *dev,
memif_msg_t *msg)
rte_vdev_device_name(pmd->vdev), pmd->remote_disc_string);
memset(pmd->local_disc_string, 0, ETH_MEMIF_DISC_STRING_SIZE);
- memif_disconnect(rte_eth_dev_allocated
-(rte_vdev_device_name(pmd->vdev)));
+ memif_disconnect(dev);
return 0;
}
@@ -423,9 +423,10 @@ static int
memif_msg_enq_add_region(struct rte_eth_dev *dev, uint8_t idx)
{
struct pmd_internals *pmd = dev->data->dev_private;
+ struct pmd_process_private *proc_private = dev->process_private;
struct memif_msg_queue_elt *e = memif_msg_enq(pmd->cc);
memif_msg_add_region_t *ar;
- struct memif_region *mr = pmd->regions[idx];
+ struct memif_region *mr = proc_private->regions[idx];
if (e == NULL)
return -1;
@@ -524,12 +525,17 @@ void
memif_disconnect(struct rte_eth_dev *dev)
{
struct pmd_internals *pmd = dev->data->dev_private;
+ struct pmd_process_private *proc_private = dev->process_private;
struct memif_msg_queue_elt *elt, *next;
struct memif_queue *mq;
struct rte_intr_handle *ih;
int i;
int ret;
+ dev->data->dev_link.link_status = ETH_LINK_DOWN;
+ pmd->flags &= ~ETH_MEMIF_FLAG_CONNECTING;
+ pmd->flags &= ~ETH_MEMIF_FLAG_CONNECTED;
+
if (pmd->cc != NULL) {
/* Clear control message queue (except disconnect message if
any). */
for (elt = TAILQ_FIRST(&pmd->cc->msg_queue); elt != NULL; elt =
next) {
@@ -545,8 +551,7 @@ memif_disconnect(struct rte_eth_dev *dev)
/* at this point, there should be no more messages in queue */
if (TAILQ_FIRST(&pmd->cc->msg_queue) != NULL) {
MIF_LOG(WARNING,
- "%s: Unexpected message(s) in message queue.",
- rte_vdev_device_name(pmd->vdev));
+ "Unexpected message(s) in message queue.");
}
Re: [dpdk-dev] [dpdk-stable] [PATCH] lib/telemetry: fix memory leak
31/05/2019 15:15, Laatz, Kevin:
> On 29/05/2019 13:43, Reshma Pattan wrote:
> > Free the `values` pointer before returning
> > from rte_telemetry_command_ports_all_stat_values()
> > to avoid memory leak.
> >
> > Fixes: c12cefa379 ("telemetry: fix mapping of statistics")
> > CC: sta...@dpdk.org
> > CC: bruce.richard...@intel.com
> >
> > Signed-off-by: Reshma Pattan
>
> Acked-by: Kevin Laatz
Applied, thanks
Re: [dpdk-dev] [PATCH v2] net/memif: multi-process support
On 18-Jun-19 9:48 AM, Jakub Grajciar wrote:
Multi-process support for memif PMD.
Primary process handles connection establishment.
Secondary process queries for memory regions.
Signed-off-by: Jakub Grajciar
---
<...>
+/*
+ * Request regions
+ * Called by secondary process, when ports link status goes up.
+ */
+static int
+memif_mp_request_regions(struct rte_eth_dev *dev)
+{
+ int ret, i;
+ struct timespec timeout = {.tv_sec = 5, .tv_nsec = 0};
+ struct rte_mp_msg msg, *reply;
+ struct rte_mp_reply replies;
+ struct mp_region_msg *msg_param = (struct mp_region_msg *)msg.param;
+ struct mp_region_msg *reply_param;
+ struct memif_region *r;
+ struct pmd_process_private *proc_private = dev->process_private;
+
+ MIF_LOG(DEBUG, "Requesting memory regions");
+
+ for (i = 0; i < ETH_MEMIF_MAX_REGION_NUM; i++) {
+ /* Prepare the message */
+ memset(&msg, 0, sizeof(msg));
+ strlcpy(msg.name, MEMIF_MP_SEND_REGION, sizeof(msg.name));
+ strlcpy(msg_param->port_name, dev->data->name,
+ sizeof(msg_param->port_name));
+ msg_param->idx = i;
+ msg.len_param = sizeof(*msg_param);
+
+ /* Send message */
+ ret = rte_mp_request_sync(&msg, &replies, &timeout);
+ if (ret < 0 || replies.nb_received != 1) {
+ MIF_LOG(ERR, "Failed to send mp msg: %d",
+ rte_errno);
+ return -1;
+ }
+
+ reply = &replies.msgs[0];
+ reply_param = (struct mp_region_msg *)reply->param;
+
+ if (reply_param->size > 0) {
+ r = rte_zmalloc("region", sizeof(struct memif_region),
0);
+ if (r == NULL) {
+ MIF_LOG(ERR, "Failed to alloc memif region.");
+free(reply);
+return -ENOMEM;
+ }
+ r->region_size = reply_param->size;
+ if (reply->num_fds < 1) {
+ MIF_LOG(ERR, "Missing file descriptor.");
+free(reply);
+return -1;
+ }
+ r->fd = reply->fds[0];
+ r->addr = NULL;
+
+ proc_private->regions[reply_param->idx] = r;
+ proc_private->regions_num++;
+ }
+ }
+
+free(reply);
Indentation here is wrong, but more importantly, you're sending requests
in a loop, but you're only freeing the last reply. This should be inside
the loop, not outside it.
--
Thanks,
Anatoly
Re: [dpdk-dev] [PATCH] lib/telemetry: add support to fetch global metrics
17/05/2019 19:07, Reshma Pattan: > telemetry has support for fetching port based stats > from metrics library. > > Metrics library also has global stats which are > not fetched by telemetry, so extend telemetry to > fetch the global metrics. > > Signed-off-by: Reshma Pattan > --- I see some errors with GCC: rte_telemetry_parser.c:362:27: error: unused variable ‘p’ rte_telemetry.c:550:11: error: unused variable ‘i’ rte_telemetry.c:613:16: error: comparison of integer expressions of different signedness: ‘int’ and ‘uint32_t’
Re: [dpdk-dev] [PATCH v2] maintainers: claim maintainership of BBDEV
On Mon, Jun 17, 2019 at 11:21:28AM -0700, Nicolas Chautru wrote: > Reorg within Intel teams causing transfer of maintainership > > Signed-off-by: Nicolas Chautru > --- Acked-by: Bruce Richardson > MAINTAINERS | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 15d0829..d0e1b25 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -355,7 +355,7 @@ M: Cristian Dumitrescu > F: lib/librte_ethdev/rte_mtr* > > Baseband API - EXPERIMENTAL > -M: Amr Mokhtar > +M: Nicolas Chautru > T: git://dpdk.org/next/dpdk-next-crypto > F: lib/librte_bbdev/ > F: doc/guides/prog_guide/bbdev.rst > -- > 1.8.3.1 >
Re: [dpdk-dev] [Bug 285] rte_table unit test crashes in ipv6
Hello Christian, Could you have a look at this? Is there someone working on it? We will have to disable the table unit tests in CI otherwise. Thanks. -- David Marchand On Mon, May 27, 2019 at 6:50 PM wrote: > https://bugs.dpdk.org/show_bug.cgi?id=285 > > Bug ID: 285 >Summary: rte_table unit test crashes in ipv6 >Product: DPDK >Version: unspecified > Hardware: All > OS: All > Status: CONFIRMED > Severity: major > Priority: Normal > Component: other > Assignee: dev@dpdk.org > Reporter: david.march...@redhat.com > CC: cristian.dumitre...@intel.com > Target Milestone: --- > > Starting the table_autotest ut on current master, with 2048 hugepages > available > and 8 cores triggers a crash in librte_table: > > (gdb) run -c 0xff > Starting program: /home/dmarchan/git/pub/dpdk/./master/app/test -c 0xff > [Thread debugging using libthread_db enabled] > Using host libthread_db library "/lib64/libthread_db.so.1". > EAL: Detected 8 lcore(s) > EAL: Detected 1 NUMA nodes > [New Thread 0x76cc1700 (LWP 28387)] > EAL: Multi-process socket /var/run/dpdk/rte/mp_socket > [New Thread 0x764c0700 (LWP 28388)] > EAL: No available hugepages reported in hugepages-1048576kB > EAL: Probing VFIO support... > [New Thread 0x75cbf700 (LWP 28389)] > [New Thread 0x754be700 (LWP 28390)] > [New Thread 0x74cbd700 (LWP 28391)] > [New Thread 0x744bc700 (LWP 28392)] > [New Thread 0x73cbb700 (LWP 28394)] > [New Thread 0x734ba700 (LWP 28395)] > [New Thread 0x72cb9700 (LWP 28396)] > EAL: PCI device :00:1f.6 on NUMA socket -1 > EAL: Invalid NUMA socket, default to 0 > EAL: probe driver: 8086:15d7 net_e1000_em > APP: HPET is not enabled, using TSC as default timer > RTE>>table_autotest > Getting/Creating the mempool ... > > [...] > > Table tests > -- > RUNNING TEST - test_table_lpm_combined > -- > Expected 50, got 50 > Expected 0, got 0 > Expected 25, got 25 > Expected 1, got 1 > Expected 0, got 0 > Change entry action > Expected 0, got 0 > Expected 50, got 50 > delete entry > TABLE: rte_table_lpm_create: Invalid n_rules > PIPELINE: rte_pipeline_table_create: Table creation failed > TABLE: rte_table_lpm_entry_add: invalid depth (0) > TABLE: rte_table_lpm_entry_add: invalid depth (33) > -- > RUNNING TEST - test_table_lpm_ipv6_combined > -- > > Program received signal SIGSEGV, Segmentation fault. > rte_table_lpm_ipv6_entry_add (table=0x100215e40, key=0x7fff76a0, > entry=0x7fff7520, key_found=0x7fff74dc, entry_ptr=0x7fff7530) > at > /home/dmarchan/git/pub/dpdk/lib/librte_table/rte_table_lpm_ipv6.c:236 > 236 lpm->nht_users[nht_pos0] -= nht_pos0_valid; > > (gdb) bt > #0 rte_table_lpm_ipv6_entry_add (table=0x100215e40, key=0x7fff76a0, > entry=0x7fff7520, key_found=0x7fff74dc, entry_ptr=0x7fff7530) > at > /home/dmarchan/git/pub/dpdk/lib/librte_table/rte_table_lpm_ipv6.c:236 > #1 0x004ac437 in test_table_type (table_ops=0xfb4dc0 > , table_args=table_args@entry=0x7fff76c0, > key=, table_packets=table_packets@entry=0x7fff76e0, > n_ops=0, manage_ops=0x0) at > /home/dmarchan/git/pub/dpdk/app/test/test_table_combined.c:150 > #2 0x004af476 in test_table_lpm_ipv6_combined () at > /home/dmarchan/git/pub/dpdk/app/test/test_table_combined.c:379 > #3 0x004a2090 in test_table () at > /home/dmarchan/git/pub/dpdk/app/test/test_table.c:174 > #4 0x0048a05b in cmd_autotest_parsed > (parsed_result=0x7fff7c20, > cl=, data=) at > /home/dmarchan/git/pub/dpdk/app/test/commands.c:76 > #5 0x00682f0d in cmdline_parse (cl=cl@entry=0x95b4690, > buf=0x95b46d8 > "table_autotest \n") at > /home/dmarchan/git/pub/dpdk/lib/librte_cmdline/cmdline_parse.c:295 > #6 0x00681eb0 in cmdline_valid_buffer (rdl=, > buf=, size=) at > /home/dmarchan/git/pub/dpdk/lib/librte_cmdline/cmdline.c:31 > #7 0x00684dc4 in rdline_char_in (rdl=rdl@entry=0x95b46a0, c=10 > '\n') > at /home/dmarchan/git/pub/dpdk/lib/librte_cmdline/cmdline_rdline.c:421 > #8 0x00681bcc in cmdline_in (cl=cl@entry=0x95b4690, > buf=buf@entry=0x7fffdd20 "\n\377", size=1) at > /home/dmarchan/git/pub/dpdk/lib/librte_cmdline/cmdline.c:148 > #9 0x0068215b in cmdline_interact (cl=cl@entry=0x95b4690) at > /home/dmarchan/git/pub/dpdk/lib/librte_cmdline/cmdline.c:227 > #10 0x004806cc in main (argc=, argv= out>) at > /home/dmarchan/git/pub/dpdk/app/test/test.c:184 > > -- > You are receiving this mail because: > You are the assignee for the bug.
Re: [dpdk-dev] [dpdk-stable] [PATCH] test-pmd: removed references to crc_strip
On Tue, Jun 18, 2019 at 12:59 PM Andrius Sirvys
wrote:
> crc_strip was removed from lib/librte_ethdev/rte_ethdev.c as the
> NICs carry out this operation themselves. However once removed,
> the references to it we're forgotten to be taken out in test-pmd.
>
> Fixes: 323e7b667f18 ("ethdev: make default behavior CRC strip on Rx")
> Cc: ferruh.yi...@intel.com
>
> Signed-off-by: Andrius Sirvys
> ---
> app/test-pmd/cmdline.c | 12 ++--
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index d1e0d4402..cd3f33add 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -878,7 +878,7 @@ static void cmd_help_long_parsed(void *parsed_result,
> "port config rx_offload vlan_strip|"
>
> "ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
> "outer_ipv4_cksum|macsec_strip|header_split|"
> - "vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
> + "vlan_filter|vlan_extend|jumbo_frame|"
> "scatter|timestamp|security|keep_crc on|off\n"
> " Enable or disable a per port Rx offloading"
> " on all Rx queues of a port\n\n"
> @@ -886,7 +886,7 @@ static void cmd_help_long_parsed(void *parsed_result,
> "port (port_id) rxq (queue_id) rx_offload
> vlan_strip|"
>
> "ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
> "outer_ipv4_cksum|macsec_strip|header_split|"
> - "vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
> + "vlan_filter|vlan_extend|jumbo_frame|"
> "scatter|timestamp|security|keep_crc on|off\n"
> "Enable or disable a per queue Rx offloading"
> " only on a specific Rx queue\n\n"
> @@ -17991,7 +17991,7 @@ cmdline_parse_token_string_t
> cmd_config_per_port_rx_offload_result_offload =
> offload,
> "vlan_strip#ipv4_cksum#udp_cksum#tcp_cksum#tcp_lro#"
>"qinq_strip#outer_ipv4_cksum#macsec_strip#"
>
> "header_split#vlan_filter#vlan_extend#jumbo_frame#"
> -
> "crc_strip#scatter#timestamp#security#keep_crc");
> + "scatter#timestamp#security#keep_crc");
> cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_on_off
> =
> TOKEN_STRING_INITIALIZER
> (struct cmd_config_per_port_rx_offload_result,
> @@ -18067,7 +18067,7 @@ cmdline_parse_inst_t
> cmd_config_per_port_rx_offload = {
> .help_str = "port config rx_offload
> vlan_strip|ipv4_cksum|"
>
> "udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|"
> "macsec_strip|header_split|vlan_filter|vlan_extend|"
> -
> "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc "
> + "jumbo_frame|scatter|timestamp|security|keep_crc "
> "on|off",
> .tokens = {
> (void *)&cmd_config_per_port_rx_offload_result_port,
> @@ -18117,7 +18117,7 @@ cmdline_parse_token_string_t
> cmd_config_per_queue_rx_offload_result_offload =
> offload,
> "vlan_strip#ipv4_cksum#udp_cksum#tcp_cksum#tcp_lro#"
>"qinq_strip#outer_ipv4_cksum#macsec_strip#"
>
> "header_split#vlan_filter#vlan_extend#jumbo_frame#"
> -
> "crc_strip#scatter#timestamp#security#keep_crc");
> + "scatter#timestamp#security#keep_crc");
> cmdline_parse_token_string_t
> cmd_config_per_queue_rx_offload_result_on_off =
> TOKEN_STRING_INITIALIZER
> (struct cmd_config_per_queue_rx_offload_result,
> @@ -18169,7 +18169,7 @@ cmdline_parse_inst_t
> cmd_config_per_queue_rx_offload = {
> "vlan_strip|ipv4_cksum|"
>
> "udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|"
> "macsec_strip|header_split|vlan_filter|vlan_extend|"
> -
> "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc "
> + "jumbo_frame|scatter|timestamp|security|keep_crc "
> "on|off",
> .tokens = {
> (void *)&cmd_config_per_queue_rx_offload_result_port,
> --
> 2.17.1
>
Rather than fix this list in all those places, is it possible to use
rte_rx_offload_names[] in a little wrapper in testpmd?
The same would have to be done with the tx flags after this.
--
David Marchand
[dpdk-dev] [PATCH v4 0/2] net/mlx5: remove TCF support from PMD
Today, it is possible to offload an interface flow rules to the hardware using DPDK flow commands. With mlx5 it is also possible to offload a limited set of flow rules to the mlxsw (or E-switch) using the same DPDK flow commands. A 'transfer' attribute was added to the flow rule creation command in order to distinguish between configuring port flows and E-switch flows. The commands destined for the E-switch are transposed to TC-flower rules and are send, as Netlink messages, to the mlx5 driver, or more precisely to the netdev which represent the mlxsw port. With the addition to the PMD of E-switch configuration via DR (direct verbs rules) it is now possible to configure the E-switch using these commands instead of using TC-Flower messages. Doing so will allow us to remove the TCF support and the dependency of libmnl from the PMD. The purpose of this RFC is to propose configuring the E-switch flow filtering using DR, to remove the TCF support from the PMD and to remove the dependency of the PMD in libmnl. As for today VLAN insertion or removal is not supported in DR, this support will be added in separate commits. Moti Haimovsky (2): net/mlx5: fix crashing testpmd on null drv opts net/mlx5: remove TCF support from PMD doc/build-sdk-meson.txt |2 +- doc/guides/nics/mlx5.rst | 19 - doc/guides/platform/bluefield.rst |4 - drivers/net/mlx5/Makefile | 303 -- drivers/net/mlx5/meson.build | 123 +- drivers/net/mlx5/mlx5.c | 32 - drivers/net/mlx5/mlx5.h |3 - drivers/net/mlx5/mlx5_flow.c | 43 +- drivers/net/mlx5/mlx5_flow.h | 25 - drivers/net/mlx5/mlx5_flow_tcf.c | 6382 - mk/rte.app.mk |2 +- 11 files changed, 24 insertions(+), 6914 deletions(-) delete mode 100644 drivers/net/mlx5/mlx5_flow_tcf.c -- 1.8.3.1
[dpdk-dev] [PATCH v4 1/2] net/mlx5: fix crashing testpmd on null drv opts
mlx5 implements mlx5_flow_null_drv_ops to be used when a specific
flow typei/driver is not available or invalid.
This routines return error without modifying the rte_flow_error
parameter passed to them which causes testpmd, for example, to crash.
This commit addresses the issue by modifying the rte_flow_error
parameter in theses routines.
Fixes: 0c76d1c9a18d ("net/mlx5: add abstraction for multiple flow drivers")
Fixes: 684dafe795d0 ("net/mlx5: add flow query abstraction interface")
Cc: sta...@dpdk.org
Signed-off-by: Moti Haimovsky
---
v4:
* Resend the message from a server not inserting DOS line-termination
symbols.
v3:
* Modified patch subject.
v2:
* Fixed checkpatch warnings.
---
drivers/net/mlx5/mlx5_flow.c | 29 +++--
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 9887018..e5a8e33 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1694,19 +1694,20 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static struct mlx5_flow *
flow_null_prepare(const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
+ rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
return NULL;
}
@@ -1716,19 +1717,19 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static int
flow_null_apply(struct rte_eth_dev *dev __rte_unused,
struct rte_flow *flow __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static void
@@ -1748,10 +1749,10 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
struct rte_flow *flow __rte_unused,
const struct rte_flow_action *actions __rte_unused,
void *data __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
/* Void driver to protect from null pointer reference. */
--
1.8.3.1
Re: [dpdk-dev] [PATCH] lib/telemetry: add support to fetch global metrics
> -Original Message- > From: Thomas Monjalon [mailto:tho...@monjalon.net] > > I see some errors with GCC: > > rte_telemetry_parser.c:362:27: error: unused variable ‘p’ > > rte_telemetry.c:550:11: error: unused variable ‘i’ > > rte_telemetry.c:613:16: error: comparison of integer expressions of different > signedness: ‘int’ and ‘uint32_t’ Hmm, yes these have to be fixed, strange they were not caught on my board with gcc (GCC) 9.0.1 20190312 (Red Hat 9.0.1-0.10) Will fix and send v2. Thanks, Reshma
[dpdk-dev] [PATCH v4 1/2] net/mlx5: fix crashing testpmd on null drv opts
mlx5 implements mlx5_flow_null_drv_ops to be used when a specific
flow typei/driver is not available or invalid.
This routines return error without modifying the rte_flow_error
parameter passed to them which causes testpmd, for example, to crash.
This commit addresses the issue by modifying the rte_flow_error
parameter in theses routines.
Fixes: 0c76d1c9a18d ("net/mlx5: add abstraction for multiple flow drivers")
Fixes: 684dafe795d0 ("net/mlx5: add flow query abstraction interface")
Cc: sta...@dpdk.org
Signed-off-by: Moti Haimovsky
---
v4:
* Resend the message from a server not inserting DOS line-termination
symbols.
v3:
* Modified patch subject.
v2:
* Fixed checkpatch warnings.
---
drivers/net/mlx5/mlx5_flow.c | 29 +++--
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 9887018..e5a8e33 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1694,19 +1694,20 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static struct mlx5_flow *
flow_null_prepare(const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
+ rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
return NULL;
}
@@ -1716,19 +1717,19 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static int
flow_null_apply(struct rte_eth_dev *dev __rte_unused,
struct rte_flow *flow __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static void
@@ -1748,10 +1749,10 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
struct rte_flow *flow __rte_unused,
const struct rte_flow_action *actions __rte_unused,
void *data __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
/* Void driver to protect from null pointer reference. */
--
1.8.3.1
[dpdk-dev] [PATCH v4 0/2] net/mlx5: remove TCF support from PMD
Today, it is possible to offload an interface flow rules to the hardware using DPDK flow commands. With mlx5 it is also possible to offload a limited set of flow rules to the mlxsw (or E-switch) using the same DPDK flow commands. A 'transfer' attribute was added to the flow rule creation command in order to distinguish between configuring port flows and E-switch flows. The commands destined for the E-switch are transposed to TC-flower rules and are send, as Netlink messages, to the mlx5 driver, or more precisely to the netdev which represent the mlxsw port. With the addition to the PMD of E-switch configuration via DR (direct verbs rules) it is now possible to configure the E-switch using these commands instead of using TC-Flower messages. Doing so will allow us to remove the TCF support and the dependency of libmnl from the PMD. The purpose of this RFC is to propose configuring the E-switch flow filtering using DR, to remove the TCF support from the PMD and to remove the dependency of the PMD in libmnl. As for today VLAN insertion or removal is not supported in DR, this support will be added in separate commits. Moti Haimovsky (2): net/mlx5: fix crashing testpmd on null drv opts net/mlx5: remove TCF support from PMD doc/build-sdk-meson.txt |2 +- doc/guides/nics/mlx5.rst | 19 - doc/guides/platform/bluefield.rst |4 - drivers/net/mlx5/Makefile | 303 -- drivers/net/mlx5/meson.build | 123 +- drivers/net/mlx5/mlx5.c | 32 - drivers/net/mlx5/mlx5.h |3 - drivers/net/mlx5/mlx5_flow.c | 43 +- drivers/net/mlx5/mlx5_flow.h | 25 - drivers/net/mlx5/mlx5_flow_tcf.c | 6382 - mk/rte.app.mk |2 +- 11 files changed, 24 insertions(+), 6914 deletions(-) delete mode 100644 drivers/net/mlx5/mlx5_flow_tcf.c -- 1.8.3.1
Re: [dpdk-dev] [PATCH] net/netvsc: initialize vf spinlock
On 6/6/2019 5:15 PM, Stephen Hemminger wrote:
> The VF spinlock was never initialized. It works because it is
> in zmalloc'd memory and an unlocked lock on x86 is 0.
> But for good practice, all spinlock's should be initialized.
>
> Fixes: dc7680e8597c ("net/netvsc: support integrated VF")
> Signed-off-by: Stephen Hemminger
Applied to dpdk-next-net/master, thanks.
Re: [dpdk-dev] [PATCH v2 4/4] net/ipn3ke: implementation of statistics
On 6/11/2019 10:48 AM, Andy Pei wrote:
> This patch implemente statistics read and reset
> function for ipn3ke.
>
> Fixes: 70d6b7f550f4 ("net/ipn3ke: add representor")
> Cc: rosen...@intel.com
>
> Signed-off-by: Andy Pei
<...>
> +#define IPN3KE_RPST_TXQ_PRIO_XSTATS_CNT
> (sizeof(ipn3ke_rpst_txq_prio_strings) \
> + / sizeof(ipn3ke_rpst_txq_prio_strings[0]))
> +
> +static uint32_t
> +ipn3ke_rpst_xstats_calc_num(void)
> +{
> + return IPN3KE_RPST_ETH_XSTATS_CNT
> + + IPN3KE_RPST_HW_PORT_XSTATS_CNT
> + + (IPN3KE_RPST_RXQ_PRIO_XSTATS_CNT
> + * IPN3KE_RPST_PRIO_XSTATS_CNT)
> + + (IPN3KE_RPST_TXQ_PRIO_XSTATS_CNT
> + * IPN3KE_RPST_PRIO_XSTATS_CNT);
> +}
> +
> +#if 0
Please don't add "#if 0" to the code, if required you can delete the code, same
is valid for below one too.
[dpdk-dev] i219 reset hang
Hello, Can somebody please provide an equivalent patch for DPDK. https://patchwork.ozlabs.org/patch/479888/ We are most likely hitting this issue in our setup, when we restart our DPDK application multiple times on the i219LM NIC. If someone can provide a patch, we can test it and see whether we hit this problem or not. Also, it looks like some of the patches that made to Linux for i219 didn’t make it to the DPDK driver. Cheers, Anand
Re: [dpdk-dev] [PATCH v2 4/4] net/ipn3ke: implementation of statistics
On 6/18/2019 12:59 PM, Ferruh Yigit wrote:
> On 6/11/2019 10:48 AM, Andy Pei wrote:
>> This patch implemente statistics read and reset
>> function for ipn3ke.
>>
>> Fixes: 70d6b7f550f4 ("net/ipn3ke: add representor")
>> Cc: rosen...@intel.com
>>
>> Signed-off-by: Andy Pei
>
> <...>
>
>> +#define IPN3KE_RPST_TXQ_PRIO_XSTATS_CNT
>> (sizeof(ipn3ke_rpst_txq_prio_strings) \
>> +/ sizeof(ipn3ke_rpst_txq_prio_strings[0]))
>> +
>> +static uint32_t
>> +ipn3ke_rpst_xstats_calc_num(void)
>> +{
>> +return IPN3KE_RPST_ETH_XSTATS_CNT
>> ++ IPN3KE_RPST_HW_PORT_XSTATS_CNT
>> ++ (IPN3KE_RPST_RXQ_PRIO_XSTATS_CNT
>> +* IPN3KE_RPST_PRIO_XSTATS_CNT)
>> ++ (IPN3KE_RPST_TXQ_PRIO_XSTATS_CNT
>> +* IPN3KE_RPST_PRIO_XSTATS_CNT);
>> +}
>> +
>> +#if 0
>
> Please don't add "#if 0" to the code, if required you can delete the code,
> same
> is valid for below one too.
>
Also getting following build error in patch by patch build [1], please remind
that each individual patch should build successfully.
[1]
.../dpdk/drivers/net/ipn3ke/ipn3ke_ethdev.c: In function ‘ipn3ke_hw_init’:
.../dpdk/drivers/net/ipn3ke/ipn3ke_ethdev.c:248:4: error: implicit declaration
of function ‘ipn3ke_xmac_tx_clr_stcs’; did you mean
‘ipn3ke_xmac_tx_clr_25G_stcs’? [-Werror=implicit-function-declaration]
248 |ipn3ke_xmac_tx_clr_stcs(hw, i, 1);
|^~~
|ipn3ke_xmac_tx_clr_25G_stcs
Re: [dpdk-dev] [PATCH 1/5] doc/guides/cryptodevs: cleanup for armv8 and openssl PMDs
>
> The perf tests were removed in a previous commit.
>
> Fixes: 2ac67c32837a ('test/crypto: remove crypto perf tests')
> Signed-off-by: Thierry Herbelot
> ---
Acked-by: Akhil Goyal
Re: [dpdk-dev] [PATCH] crypto/openssl: fix inproper freeing of asymmetric crypto keys in rsa
Hi Arek,
> In case big number need to be freed, data it contains should be cleared
> before especially if it is critical data like private keys.
>
> Fixes: 3e9d6bd447fb ("crypto/openssl: add RSA and mod asym operations")
>
> Signed-off-by: Arek Kusztal
> ---
> config/common_base | 4 ++--
> drivers/crypto/openssl/rte_openssl_pmd_ops.c | 16
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/config/common_base b/config/common_base
> index 6b96e0e..a3d8e17 100644
> --- a/config/common_base
> +++ b/config/common_base
> @@ -573,7 +573,7 @@ CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO=y
> #
> CONFIG_RTE_LIBRTE_PMD_QAT=y
> CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n
> -CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n
> +CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=y
> #
> # Max. number of QuickAssist devices, which can be detected and attached
> #
> @@ -597,7 +597,7 @@ CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n
> #
> # Compile PMD for Software backed device
> #
> -CONFIG_RTE_LIBRTE_PMD_OPENSSL=n
> +CONFIG_RTE_LIBRTE_PMD_OPENSSL=y
>
I think these config changes were done by mistake in this patch.
Openssl cannot be enabled by default as it needs external codebase.
Please send fix only for openssl driver as the description says.
Thanks,
Akhil
Re: [dpdk-dev] [PATCH v4] net/i40e: allow VF to configure pctype mapping
> -Original Message- > From: Xing, Beilei > Sent: Monday, June 17, 2019 11:18 AM > To: Zhang, Qi Z > Cc: dev@dpdk.org > Subject: [PATCH v4] net/i40e: allow VF to configure pctype mapping > > This patch allows VF to get/update/reset pctype mapping info. > > Signed-off-by: Beilei Xing Acked-by: Qi Zhang Applied to dpdk-next-net-intel. Thanks Qi
Re: [dpdk-dev] [PATCH v3 0/2] net/ice: support Tx checksum offload
> -Original Message- > From: Xing, Beilei > Sent: Tuesday, June 18, 2019 3:05 PM > To: Zhang, Qi Z ; Mcnamara, John > > Cc: dev@dpdk.org > Subject: [PATCH v3 0/2] net/ice: support Tx checksum offload > > Enable Tx checksum offload for tunneling packets. > Update release notes. > > v3 change: > - Add release notes. > v2 change: > - Parse udp checksum in tunneling parameter. > > Beilei Xing (2): > net/ice: support Tx checksum offload for tunneling packets > doc: update for ICE driver > > doc/guides/rel_notes/release_19_08.rst | 5 +++ > drivers/net/ice/ice_ethdev.c | 3 +- > drivers/net/ice/ice_rxtx.c | 78 > -- > 3 files changed, 81 insertions(+), 5 deletions(-) > > -- > 2.5.5 Acked-by: Qi Zhang Applied to dpdk-next-net-intel Thanks Qi
Re: [dpdk-dev] [PATCH v4] net/i40e: allow VF to configure pctype mapping
> -Original Message- > From: Zhang, Qi Z > Sent: Tuesday, June 18, 2019 9:14 PM > To: Xing, Beilei > Cc: dev@dpdk.org > Subject: RE: [PATCH v4] net/i40e: allow VF to configure pctype mapping > > > > > -Original Message- > > From: Xing, Beilei > > Sent: Monday, June 17, 2019 11:18 AM > > To: Zhang, Qi Z > > Cc: dev@dpdk.org > > Subject: [PATCH v4] net/i40e: allow VF to configure pctype mapping > > > > This patch allows VF to get/update/reset pctype mapping info. > > > > Signed-off-by: Beilei Xing Added Cc: sta...@dpdk.org during apply. > > Acked-by: Qi Zhang > > Applied to dpdk-next-net-intel. > > Thanks > Qi
Re: [dpdk-dev] [PATCH 00/10] enhance meson summary - list disabled components
On Wed, Jun 05, 2019 at 09:39:07PM +0100, Luca Boccassi wrote: > On Wed, 2019-06-05 at 21:22 +0100, Bruce Richardson wrote: > > After using meson to configure a build, we output a brief list of all > > components that are enabled. However, of more use to most users is a > > list of what is not being enabled, so that they can look for gaps and > > see about fixing those gaps, e.g. by installing driver dependencies. > > > > This patchset adds such a printout at the end, but to make things > > easier, it also adds support for drivers adding a reason why they not > > being built, e.g. unsupported platform, or missing software > > dependency. > > Series-acked-by: Luca Boccassi > Ping on this patchset. It's acked almost 2 weeks now, so can it be merged? [to get it off my "list-of-stuff-to-track"] /Bruce
Re: [dpdk-dev] [PATCH] net/ipn3ke: delete identical branch
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Xu, Rosen
> Sent: Thursday, May 23, 2019 10:27 AM
> To: Pei, Andy ; dev@dpdk.org
> Cc: sta...@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/ipn3ke: delete identical branch
>
> Hi,
>
> > -Original Message-
> > From: Pei, Andy
> > Sent: Wednesday, May 22, 2019 14:45
> > To: dev@dpdk.org
> > Cc: Pei, Andy ; Xu, Rosen ;
> > sta...@dpdk.org
> > Subject: [PATCH] net/ipn3ke: delete identical branch
> >
> > Whether the if statement is ture or not, the operation is identical.
> > It is unnecessary to check the if statement, so just delete the if
> > statement.
> >
> > Coverity issue: 337928
> > Fixes: c820468ac99c ("net/ipn3ke: support TM")
> > Cc: rosen...@intel.com
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Andy Pei
> > ---
> Acked-by: Rosen Xu
Applied to dpdk-next-net-intel.
Thanks
Qi
Re: [dpdk-dev] [PATCH v2] net/ipn3ke: check input argument before other operation
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Xu, Rosen
> Sent: Thursday, May 23, 2019 11:00 AM
> To: Pei, Andy ; dev@dpdk.org
> Cc: sta...@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v2] net/ipn3ke: check input argument before
> other operation
>
> Hi,
>
> > -Original Message-
> > From: Pei, Andy
> > Sent: Thursday, May 23, 2019 10:53
> > To: dev@dpdk.org
> > Cc: Pei, Andy ; Xu, Rosen ;
> > sta...@dpdk.org
> > Subject: [PATCH v2] net/ipn3ke: check input argument before other
> > operation
> >
> > check input argument rte_eth_dev *ethdev, ensuring ethdev is not NULL
> > before operation on ethdev.
> >
> > Coverity issue: 337922
> > Fixes: 70d6b7f550f4 ("net/ipn3ke: add representor")
> > Cc: rosen...@intel.com
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Andy Pei
> > ---
> Acked-by: Rosen Xu
Applied to dpdk-next-net-intel
Thanks
Qi
Re: [dpdk-dev] [PATCH] net/ipn3ke: fix null pointer dereference
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Xu, Rosen
> Sent: Thursday, May 23, 2019 1:20 PM
> To: Pei, Andy ; dev@dpdk.org
> Cc: sta...@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/ipn3ke: fix null pointer dereference
>
>
>
> > -Original Message-
> > From: Pei, Andy
> > Sent: Thursday, May 23, 2019 12:31
> > To: dev@dpdk.org
> > Cc: Pei, Andy ; Xu, Rosen ;
> > sta...@dpdk.org
> > Subject: [PATCH] net/ipn3ke: fix null pointer dereference
> >
> > In current code, scenario may happens that when function
> > ipn3ke_hw_tm_node_wr is called, struct ipn3ke_tm_node n has a NULL
> > element parent_node, however, the element parent_node of struct
> > ipn3ke_tm_node n is used in an invalid way.
> > After applying this patch,
> > this null pointer dereference is avoided.
> >
> > Coverity issue: 337921
> > Fixes: c820468ac99c ("net/ipn3ke: support TM")
> > Cc: rosen...@intel.com
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Andy Pei
> > ---
> Acked-by: Rosen Xu
Applied to dpdk-next-net-intel.
Thanks
Qi
Re: [dpdk-dev] [PATCH v2] aesni_mb: fix out-of-bounds access
Hi Fan,
>
> This patch fixes the out-of-bounds coverity issue by adding
> missed algorithms to the array.
>
> Coverity issue: 337683
>
> Fixes: c68d7aa354f6 ("crypto/aesni_mb: use architecture independent macros")
>
> Signed-off-by: Fan Zhang
> ---
> drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 17
> -
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> index 4d439360f..dda78d989 100644
> --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> @@ -41,6 +41,14 @@ static const unsigned auth_blocksize[] = {
> [SHA_512] = 128,
> [AES_XCBC] = 16,
> [AES_CCM] = 16,
> + [AES_CMAC] = 16,
> + [AES_GMAC] = 16,
> + [AES_GCM] = 16,
> + [PLAIN_SHA1]= 64,
> + [PLAIN_SHA_224] = 64,
> + [PLAIN_SHA_256] = 64,
> + [PLAIN_SHA_384] = 128,
> + [PLAIN_SHA_512] = 128
> };
>
> /**
> @@ -65,7 +73,13 @@ static const unsigned
> auth_truncated_digest_byte_lengths[] = {
> [AES_XCBC] = 12,
> [AES_CMAC] = 12,
> [AES_CCM] = 8,
> - [NULL_HASH] = 0
> + [NULL_HASH] = 0,
> + [AES_GMAC] = 16,
> + [PLAIN_SHA1]= 20,
> + [PLAIN_SHA_224] = 28,
> + [PLAIN_SHA_256] = 32,
> + [PLAIN_SHA_384] = 48,
> + [PLAIN_SHA_512] = 64
> };
>
> /**
> @@ -90,6 +104,7 @@ static const unsigned auth_digest_byte_lengths[] = {
> [SHA_512] = 64,
> [AES_XCBC] = 16,
> [AES_CMAC] = 16,
> + [AES_CCM] = 16,
> [AES_GMAC] = 12,
> [NULL_HASH] = 0,
> [PLAIN_SHA1]= 20,
> --
> 2.14.5
Patchworks say that there is a compilation issue in this patch.
Could you please check.
Thanks,
Akhil
[dpdk-dev] [PATCH v2] lib/telemetry: add support to fetch global metrics
telemetry has support for fetching port based stats
from metrics library.
Metrics library also has global stats which are
not fetched by telemetry, so extend telemetry to
fetch the global metrics.
Signed-off-by: Reshma Pattan
Acked-by: Kevin Laatz
---
v2: fix GCC compilation issues.
rebase with latest release notes.
---
doc/guides/howto/telemetry.rst| 9 +-
doc/guides/rel_notes/release_19_08.rst| 5 +
lib/librte_telemetry/rte_telemetry.c | 122 +++-
lib/librte_telemetry/rte_telemetry_internal.h | 31 -
lib/librte_telemetry/rte_telemetry_parser.c | 130 +++---
usertools/dpdk-telemetry-client.py| 13 +-
6 files changed, 255 insertions(+), 55 deletions(-)
diff --git a/doc/guides/howto/telemetry.rst b/doc/guides/howto/telemetry.rst
index 00f8f7a85..cacc08216 100644
--- a/doc/guides/howto/telemetry.rst
+++ b/doc/guides/howto/telemetry.rst
@@ -11,9 +11,10 @@ Introduction
The ``librte_telemetry`` provides the functionality so that users may query
-metrics from incoming port traffic. The application which initializes packet
-forwarding will act as the server, sending metrics to the requesting
application
-which acts as the client.
+metrics from incoming port traffic and global stats(application stats).
+The application which initializes packet forwarding will act as the server,
+sending metrics to the requesting application which acts as the client.
+
In DPDK, applications are used to initialize the ``telemetry``. To view
incoming
traffic on featured ports, the application should be run first (ie. after ports
@@ -79,7 +80,7 @@ any DPDK application is applicable.
the menu.
#. Send traffic to any or all available ports from a traffic generator.
- Select a query option(recursive or singular polling).
+ Select a query option(recursive or singular polling or global stats).
The metrics will then be displayed on the client terminal in JSON format.
#. Once finished, unregister the client using the menu command.
diff --git a/doc/guides/rel_notes/release_19_08.rst
b/doc/guides/rel_notes/release_19_08.rst
index 8c3932d06..083a738e6 100644
--- a/doc/guides/rel_notes/release_19_08.rst
+++ b/doc/guides/rel_notes/release_19_08.rst
@@ -88,6 +88,11 @@ New Features
* Added multi-queue support to allow one af_xdp vdev with multiple netdev
queues
+* **Updated telemetry library for global metrics support.**
+
+ Updated ``librte_telemetry`` to fetch the global metrics from the
+ ``librte_metrics`` library.
+
Removed Items
-
diff --git a/lib/librte_telemetry/rte_telemetry.c
b/lib/librte_telemetry/rte_telemetry.c
index b852630c5..a4b82c97f 100644
--- a/lib/librte_telemetry/rte_telemetry.c
+++ b/lib/librte_telemetry/rte_telemetry.c
@@ -449,17 +449,14 @@ rte_telemetry_json_format_port(struct telemetry_impl
*telemetry,
static int32_t
rte_telemetry_encode_json_format(struct telemetry_impl *telemetry,
- uint32_t *port_ids, uint32_t num_port_ids, uint32_t *metric_ids,
- uint32_t num_metric_ids, char **json_buffer)
+ struct telemetry_encode_param *ep, char **json_buffer)
{
int ret;
json_t *root, *ports;
uint32_t i;
-
- if (num_port_ids <= 0 || num_metric_ids <= 0) {
- TELEMETRY_LOG_ERR("Please provide port and metric ids to
query");
- goto einval_fail;
- }
+ uint32_t port_id;
+ uint32_t num_port_ids;
+ uint32_t num_metric_ids;
ports = json_array();
if (ports == NULL) {
@@ -467,20 +464,47 @@ rte_telemetry_encode_json_format(struct telemetry_impl
*telemetry,
goto eperm_fail;
}
- for (i = 0; i < num_port_ids; i++) {
- if (!rte_eth_dev_is_valid_port(port_ids[i])) {
- TELEMETRY_LOG_ERR("Port: %d invalid", port_ids[i]);
+ if (ep->type == PORT_STATS) {
+ num_port_ids = ep->pp.num_port_ids;
+ num_metric_ids = ep->pp.num_metric_ids;
+
+ if (num_port_ids <= 0 || num_metric_ids <= 0) {
+ TELEMETRY_LOG_ERR("Please provide port and metric ids
to query");
goto einval_fail;
}
- }
- for (i = 0; i < num_port_ids; i++) {
- ret = rte_telemetry_json_format_port(telemetry, port_ids[i],
- ports, metric_ids, num_metric_ids);
+ for (i = 0; i < num_port_ids; i++) {
+ port_id = ep->pp.port_ids[i];
+ if (!rte_eth_dev_is_valid_port(port_id)) {
+ TELEMETRY_LOG_ERR("Port: %d invalid",
+ port_id);
+ goto einval_fail;
+ }
+ }
+
+ for (i = 0; i < num_port_ids; i++) {
+ port_id = ep->pp.port_ids[i];
+ ret = rte_te
Re: [dpdk-dev] [PATCH 1/2] net/i40e: fix dropped packets statistics name
> -Original Message-
> From: Xing, Beilei
> Sent: Wednesday, June 12, 2019 9:35 AM
> To: David Marchand ; dev@dpdk.org
> Cc: sta...@dpdk.org; Zhang, Qi Z
> Subject: RE: [dpdk-dev] [PATCH 1/2] net/i40e: fix dropped packets statistics
> name
>
>
>
> > -Original Message-
> > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of David Marchand
> > Sent: Monday, June 3, 2019 4:31 PM
> > To: dev@dpdk.org
> > Cc: sta...@dpdk.org; Xing, Beilei ; Zhang, Qi Z
> >
> > Subject: [dpdk-dev] [PATCH 1/2] net/i40e: fix dropped packets
> > statistics name
> >
> > i40e and i40evf currently use two different names for the statistic on
> > dropped packets on the rx and tx sides.
> > Let's prefer i40evf so that all statistics are suffixed with _packets.
> >
> > This also avoids a statistic name conflict in OVS.
> >
> > Fixes: f4a91c38b4ad ("i40e: add extended stats")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: David Marchand
> > ---
>
> Acked-by: Beilei Xing
Applied to dpdk-next-net-intel.
Thanks
Qi
Re: [dpdk-dev] [dpdk-stable] [PATCH 2/2] net/ice: fix dropped packets statistics name
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Eelco Chaudron
> Sent: Monday, June 3, 2019 4:53 PM
> To: David Marchand
> Cc: dev@dpdk.org; sta...@dpdk.org; Yang, Qiming ;
> Lu, Wenzhuo
> Subject: Re: [dpdk-dev] [dpdk-stable] [PATCH 2/2] net/ice: fix dropped packets
> statistics name
>
> Looks good to me…
>
> Acked-by: Eelco Chaudron
>
> On 3 Jun 2019, at 10:31, David Marchand wrote:
>
> > Copy/paste from i40e, let's align with the fix on i40e.
> >
> > Fixes: a37bde56314d ("net/ice: support statistics")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: David Marchand
> > ---
> > drivers/net/ice/ice_ethdev.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/ice/ice_ethdev.c
> > b/drivers/net/ice/ice_ethdev.c index bdbceb4..6cd1c74 100644
> > --- a/drivers/net/ice/ice_ethdev.c
> > +++ b/drivers/net/ice/ice_ethdev.c
> > @@ -153,13 +153,13 @@ struct ice_xstats_name_off {
> > {"rx_unicast_packets", offsetof(struct ice_eth_stats, rx_unicast)},
> > {"rx_multicast_packets", offsetof(struct ice_eth_stats, rx_multicast)},
> > {"rx_broadcast_packets", offsetof(struct ice_eth_stats, rx_broadcast)},
> > - {"rx_dropped", offsetof(struct ice_eth_stats, rx_discards)},
> > + {"rx_dropped_packets", offsetof(struct ice_eth_stats, rx_discards)},
> > {"rx_unknown_protocol_packets", offsetof(struct ice_eth_stats,
> > rx_unknown_protocol)},
> > {"tx_unicast_packets", offsetof(struct ice_eth_stats, tx_unicast)},
> > {"tx_multicast_packets", offsetof(struct ice_eth_stats, tx_multicast)},
> > {"tx_broadcast_packets", offsetof(struct ice_eth_stats, tx_broadcast)},
> > - {"tx_dropped", offsetof(struct ice_eth_stats, tx_discards)},
> > + {"tx_dropped_packets", offsetof(struct ice_eth_stats, tx_discards)},
> > };
> >
> > #define ICE_NB_ETH_XSTATS (sizeof(ice_stats_strings) / \
> > --
> > 1.8.3.1
Applied to dpdk-next-next-intel.
Thanks
Qi
Re: [dpdk-dev] [PATCH] net/i40e: remove queue_stats_mapping_set
> -Original Message-
> From: Maxime Coquelin [mailto:maxime.coque...@redhat.com]
> Sent: Wednesday, May 29, 2019 5:12 PM
> To: Stephen Hemminger ; Xing, Beilei
> ; Zhang, Qi Z
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/i40e: remove queue_stats_mapping_set
>
>
>
> On 5/28/19 9:43 PM, Stephen Hemminger wrote:
> > This driver was inserting its own stub for queue_stats_mapping which
> > did nothing but cause this device to return a different errno than
> > every other device driver. All devices that don't implement queue
> > stats mapping should return the same error.
> >
> > Maybe the plan originally was to implement something, if that ever
> > happens, just put in the right code.
> >
> > Fixes: 4861cde46116 ("i40e: new poll mode driver")
> > Signed-off-by: Stephen Hemminger
> > ---
> > drivers/net/i40e/i40e_ethdev.c | 16
> > 1 file changed, 16 deletions(-)
> >
>
>
> Acked-by: Maxime Coquelin
Applied to dpdk-next-net-intel.
Thanks
Qi
Re: [dpdk-dev] [PATCH] net/iavf: move debug dump desc flag to config file
> -Original Message- > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Lavanya > Govindarajan > Sent: Monday, June 10, 2019 9:08 PM > To: dev@dpdk.org > Cc: Pattan, Reshma ; Wu, Jingjing > ; Lu, Wenzhuo ; > Parthasarathy, JananeeX M ; > Govindarajan, LavanyaX > Subject: [dpdk-dev] [PATCH] net/iavf: move debug dump desc flag to config > file > > DEBUG_DUMP_DESC flag is commented out in IAVF Makefile and to enable it > user needs to edit the Makefile. It is felt that this method is not good. > Hence > removing this flag from IAVF makefile and adding a flag > CONFIG_RTE_LIBRTE_IAVF_DEBUG_DUMP_DESC to config/common_base. > > Signed-off-by: Lavanya Govindarajan Acked-by: Qi Zhang Applied to dpdk-next-net-intel. Thanks Qi
[dpdk-dev] [PATCH v5 0/2] net/mlx5: remove TCF support from PMD
Today, it is possible to offload an interface flow rules to the hardware using DPDK flow commands. With mlx5 it is also possible to offload a limited set of flow rules to the mlxsw (or E-switch) using the same DPDK flow commands. A 'transfer' attribute was added to the flow rule creation command in order to distinguish between configuring port flows and E-switch flows. The commands destined for the E-switch are transposed to TC-flower rules and are send, as Netlink messages, to the mlx5 driver, or more precisely to the netdev which represent the mlxsw port. With the addition to the PMD of E-switch configuration via DR (direct verbs rules) it is now possible to configure the E-switch using these commands instead of using TC-Flower messages. Doing so will allow us to remove the TCF support and the dependency of libmnl from the PMD. The purpose of this RFC is to propose configuring the E-switch flow filtering using DR, to remove the TCF support from the PMD and to remove the dependency of the PMD in libmnl. As for today VLAN insertion or removal is not supported in DR, this support will be added in separate commits. Moti Haimovsky (2): net/mlx5: fix crashing testpmd on null drv opts net/mlx5: remove TCF support from PMD doc/build-sdk-meson.txt |2 +- doc/guides/nics/mlx5.rst | 19 - doc/guides/platform/bluefield.rst |4 - drivers/net/mlx5/Makefile | 303 -- drivers/net/mlx5/meson.build | 123 +- drivers/net/mlx5/mlx5.c | 32 - drivers/net/mlx5/mlx5.h |3 - drivers/net/mlx5/mlx5_flow.c | 43 +- drivers/net/mlx5/mlx5_flow.h | 25 - drivers/net/mlx5/mlx5_flow_tcf.c | 6382 - mk/rte.app.mk |2 +- 11 files changed, 24 insertions(+), 6914 deletions(-) delete mode 100644 drivers/net/mlx5/mlx5_flow_tcf.c -- 1.8.3.1
[dpdk-dev] [PATCH v5 1/2] net/mlx5: fix crashing testpmd on null drv opts
mlx5 implements mlx5_flow_null_drv_ops to be used when a specific
flow typei/driver is not available or invalid.
This routines return error without modifying the rte_flow_error
parameter passed to them which causes testpmd, for example, to crash.
This commit addresses the issue by modifying the rte_flow_error
parameter in theses routines.
Fixes: 0c76d1c9a18d ("net/mlx5: add abstraction for multiple flow drivers")
Fixes: 684dafe795d0 ("net/mlx5: add flow query abstraction interface")
Cc: sta...@dpdk.org
Signed-off-by: Moti Haimovsky
---
v4, v5:
* Resend the message from a server not inserting DOS line-termination
symbols.
v3:
* Modified patch subject.
v2:
* Fixed checkpatch warnings.
---
drivers/net/mlx5/mlx5_flow.c | 29 +++--
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 9887018..e5a8e33 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1694,19 +1694,20 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static struct mlx5_flow *
flow_null_prepare(const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
+ rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
return NULL;
}
@@ -1716,19 +1717,19 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static int
flow_null_apply(struct rte_eth_dev *dev __rte_unused,
struct rte_flow *flow __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static void
@@ -1748,10 +1749,10 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
struct rte_flow *flow __rte_unused,
const struct rte_flow_action *actions __rte_unused,
void *data __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
/* Void driver to protect from null pointer reference. */
--
1.8.3.1
[dpdk-dev] [PATCH v5 0/2] net/mlx5: remove TCF support from PMD
Today, it is possible to offload an interface flow rules to the hardware using DPDK flow commands. With mlx5 it is also possible to offload a limited set of flow rules to the mlxsw (or E-switch) using the same DPDK flow commands. A 'transfer' attribute was added to the flow rule creation command in order to distinguish between configuring port flows and E-switch flows. The commands destined for the E-switch are transposed to TC-flower rules and are send, as Netlink messages, to the mlx5 driver, or more precisely to the netdev which represent the mlxsw port. With the addition to the PMD of E-switch configuration via DR (direct verbs rules) it is now possible to configure the E-switch using these commands instead of using TC-Flower messages. Doing so will allow us to remove the TCF support and the dependency of libmnl from the PMD. The purpose of this RFC is to propose configuring the E-switch flow filtering using DR, to remove the TCF support from the PMD and to remove the dependency of the PMD in libmnl. As for today VLAN insertion or removal is not supported in DR, this support will be added in separate commits. Moti Haimovsky (2): net/mlx5: fix crashing testpmd on null drv opts net/mlx5: remove TCF support from PMD doc/build-sdk-meson.txt |2 +- doc/guides/nics/mlx5.rst | 19 - doc/guides/platform/bluefield.rst |4 - drivers/net/mlx5/Makefile | 303 -- drivers/net/mlx5/meson.build | 123 +- drivers/net/mlx5/mlx5.c | 32 - drivers/net/mlx5/mlx5.h |3 - drivers/net/mlx5/mlx5_flow.c | 43 +- drivers/net/mlx5/mlx5_flow.h | 25 - drivers/net/mlx5/mlx5_flow_tcf.c | 6382 - mk/rte.app.mk |2 +- 11 files changed, 24 insertions(+), 6914 deletions(-) delete mode 100644 drivers/net/mlx5/mlx5_flow_tcf.c -- 1.8.3.1
[dpdk-dev] [PATCH v5 1/2] net/mlx5: fix crashing testpmd on null drv opts
mlx5 implements mlx5_flow_null_drv_ops to be used when a specific
flow typei/driver is not available or invalid.
This routines return error without modifying the rte_flow_error
parameter passed to them which causes testpmd, for example, to crash.
This commit addresses the issue by modifying the rte_flow_error
parameter in theses routines.
Fixes: 0c76d1c9a18d ("net/mlx5: add abstraction for multiple flow drivers")
Fixes: 684dafe795d0 ("net/mlx5: add flow query abstraction interface")
Cc: sta...@dpdk.org
Signed-off-by: Moti Haimovsky
---
v4, v5:
* Resend the message from a server not inserting DOS line-termination
symbols.
v3:
* Modified patch subject.
v2:
* Fixed checkpatch warnings.
---
drivers/net/mlx5/mlx5_flow.c | 29 +++--
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 9887018..e5a8e33 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1694,19 +1694,20 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static struct mlx5_flow *
flow_null_prepare(const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
+ rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
return NULL;
}
@@ -1716,19 +1717,19 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static int
flow_null_apply(struct rte_eth_dev *dev __rte_unused,
struct rte_flow *flow __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static void
@@ -1748,10 +1749,10 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
struct rte_flow *flow __rte_unused,
const struct rte_flow_action *actions __rte_unused,
void *data __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
/* Void driver to protect from null pointer reference. */
--
1.8.3.1
[dpdk-dev] [PATCH v5 1/2] net/mlx5: fix crashing testpmd on null drv opts
mlx5 implements mlx5_flow_null_drv_ops to be used when a specific
flow typei/driver is not available or invalid.
This routines return error without modifying the rte_flow_error
parameter passed to them which causes testpmd, for example, to crash.
This commit addresses the issue by modifying the rte_flow_error
parameter in theses routines.
Fixes: 0c76d1c9a18d ("net/mlx5: add abstraction for multiple flow drivers")
Fixes: 684dafe795d0 ("net/mlx5: add flow query abstraction interface")
Cc: sta...@dpdk.org
Signed-off-by: Moti Haimovsky
---
v4, v5:
* Resend the message from a server not inserting DOS line-termination
symbols.
v3:
* Modified patch subject.
v2:
* Fixed checkpatch warnings.
---
drivers/net/mlx5/mlx5_flow.c | 29 +++--
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 9887018..e5a8e33 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1694,19 +1694,20 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static struct mlx5_flow *
flow_null_prepare(const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
+ rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
return NULL;
}
@@ -1716,19 +1717,19 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static int
flow_null_apply(struct rte_eth_dev *dev __rte_unused,
struct rte_flow *flow __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static void
@@ -1748,10 +1749,10 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
struct rte_flow *flow __rte_unused,
const struct rte_flow_action *actions __rte_unused,
void *data __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
/* Void driver to protect from null pointer reference. */
--
1.8.3.1
[dpdk-dev] [PATCH v5 0/2] net/mlx5: remove TCF support from PMD
Today, it is possible to offload an interface flow rules to the hardware using DPDK flow commands. With mlx5 it is also possible to offload a limited set of flow rules to the mlxsw (or E-switch) using the same DPDK flow commands. A 'transfer' attribute was added to the flow rule creation command in order to distinguish between configuring port flows and E-switch flows. The commands destined for the E-switch are transposed to TC-flower rules and are send, as Netlink messages, to the mlx5 driver, or more precisely to the netdev which represent the mlxsw port. With the addition to the PMD of E-switch configuration via DR (direct verbs rules) it is now possible to configure the E-switch using these commands instead of using TC-Flower messages. Doing so will allow us to remove the TCF support and the dependency of libmnl from the PMD. The purpose of this RFC is to propose configuring the E-switch flow filtering using DR, to remove the TCF support from the PMD and to remove the dependency of the PMD in libmnl. As for today VLAN insertion or removal is not supported in DR, this support will be added in separate commits. Moti Haimovsky (2): net/mlx5: fix crashing testpmd on null drv opts net/mlx5: remove TCF support from PMD doc/build-sdk-meson.txt |2 +- doc/guides/nics/mlx5.rst | 19 - doc/guides/platform/bluefield.rst |4 - drivers/net/mlx5/Makefile | 303 -- drivers/net/mlx5/meson.build | 123 +- drivers/net/mlx5/mlx5.c | 32 - drivers/net/mlx5/mlx5.h |3 - drivers/net/mlx5/mlx5_flow.c | 43 +- drivers/net/mlx5/mlx5_flow.h | 25 - drivers/net/mlx5/mlx5_flow_tcf.c | 6382 - mk/rte.app.mk |2 +- 11 files changed, 24 insertions(+), 6914 deletions(-) delete mode 100644 drivers/net/mlx5/mlx5_flow_tcf.c -- 1.8.3.1
Re: [dpdk-dev] [PATCH v2] eal/stack: fix 'pointer-sign' warning
> clang raise 'pointer-sign' warnings in __atomic_compare_exchange when
> passing 'uint64_t *' to parameter of type 'int64_t *' converts between
> pointers to integer types with different sign.
>
> Fixes: 7e6e609939a8 ("stack: add C11 atomic implementation")
>
> Suggested-by: Gage Eads
> Signed-off-by: Phil Yang
> Reviewed-by: Honnappa Nagarahalli
> Reviewed-by: Gavin Hu
Acked-By: Gage Eads
Thanks,
Gage
Re: [dpdk-dev] [PATCH v2] kni: fix possible kernel crash with va2pa
On Tue, 12 Mar 2019 17:22:32 +0800 Yangchao Zhou wrote: > va2pa depends on the physical address and virtual address offset of > current mbuf. It may get the wrong physical address of next mbuf which > allocated in another hugepage segment. > > In rte_mempool_populate_default(), trying to allocate whole block of > contiguous memory could be failed. Then, it would reserve memory in > several memzones that have different physical address and virtual address > offsets. The rte_mempool_populate_default() is used by > rte_pktmbuf_pool_create(). > > Signed-off-by: Yangchao Zhou Could you add a Fixes tag?
Re: [dpdk-dev] [PATCH] lib/telemetry: add support to fetch global metrics
> -Original Message- > From: Thomas Monjalon [mailto:tho...@monjalon.net] > > I see some errors with GCC: On which GCC version the errors are shown? > > rte_telemetry_parser.c:362:27: error: unused variable ‘p’ > > rte_telemetry.c:550:11: error: unused variable ‘i’ > > rte_telemetry.c:613:16: error: comparison of integer expressions of different > signedness: ‘int’ and ‘uint32_t’
Re: [dpdk-dev] [PATCH] kni: remove PCI related information
On Thu, 6 Jun 2019 16:26:26 +0300 Igor Ryzhov wrote: > As there is no ethtool support in KNI anymore, > PCI related information is no longer needed. > > Signed-off-by: Igor Ryzhov Several other fields are unused, and are removed by a patch I sent a week ago.
Re: [dpdk-dev] [PATCH] kni: remove PCI related information
On Thu, 6 Jun 2019 16:26:26 +0300 Igor Ryzhov wrote: > As there is no ethtool support in KNI anymore, > PCI related information is no longer needed. > > Signed-off-by: Igor Ryzhov See http://patchwork.dpdk.org/patch/54627/
Re: [dpdk-dev] [PATCH v6 1/6] raw/ntb: introduce ntb rawdev driver
> +
> +static void
> +ntb_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t dev_info)
> +{
> + struct ntb_hw *hw = dev->dev_private;
> + struct ntb_attr *ntb_attrs = dev_info;
> +
> + strncpy(ntb_attrs[NTB_TOPO_ID].name, NTB_TOPO_NAME,
> NTB_ATTR_NAME_LEN);
> + switch (hw->topo) {
> + case NTB_TOPO_B2B_DSD:
> + strncpy(ntb_attrs[NTB_TOPO_ID].value, "B2B DSD",
> + NTB_ATTR_NAME_LEN);
> + break;
> + case NTB_TOPO_B2B_USD:
> + strncpy(ntb_attrs[NTB_TOPO_ID].value, "B2B USD",
> + NTB_ATTR_NAME_LEN);
> + break;
> + default:
> + strncpy(ntb_attrs[NTB_TOPO_ID].value, "Unsupported",
> + NTB_ATTR_NAME_LEN);
> + }
> +
> + strncpy(ntb_attrs[NTB_LINK_STATUS_ID].name, NTB_LINK_STATUS_NAME,
> + NTB_ATTR_NAME_LEN);
> + snprintf(ntb_attrs[NTB_LINK_STATUS_ID].value, NTB_ATTR_NAME_LEN,
> + "%d", hw->link_status);
> +
You are sharing NTB_ATTR_NAME_LEN for both name and value? How about
NTB_ATTR_NUM_LEN/NTB_ATTR_VALUE_LEN?
[...]
> + if (!strncmp(attr_name, NTB_PEER_SPAD_14, NTB_ATTR_NAME_LEN)) {
> + if (hw->ntb_ops->spad_write == NULL)
> + return -ENOTSUP;
> + (*hw->ntb_ops->spad_write)(dev, 14, 1, attr_value);
> + NTB_LOG(INFO, "Set attribute (%s) Value (%" PRIu64 ")",
> + attr_name, attr_value);
> + return 0;
> + }
> +
> + if (!strncmp(attr_name, NTB_PEER_SPAD_15, NTB_ATTR_NAME_LEN)) {
> + if (hw->ntb_ops->spad_write == NULL)
> + return -ENOTSUP;
> + (*hw->ntb_ops->spad_write)(dev, 15, 1, attr_value);
> + NTB_LOG(INFO, "Set attribute (%s) Value (%" PRIu64 ")",
> + attr_name, attr_value);
> + return 0;
> + }
> +
What are 14 and 15 for? Is that generic?
> +static int
> +ntb_init_hw(struct rte_rawdev *dev, struct rte_pci_device *pci_dev)
> +{
> + struct ntb_hw *hw = dev->dev_private;
> + int ret;
> +
> + hw->pci_dev = pci_dev;
> + hw->peer_dev_up = 0;
> + hw->link_status = 0;
> + hw->link_speed = NTB_SPEED_NONE;
> + hw->link_width = NTB_WIDTH_NONE;
> +
> + switch (pci_dev->id.device_id) {
> + default:
> + NTB_LOG(ERR, "Not supported device.");
> + return -EINVAL;
> + }
> +
> + if (hw->ntb_ops->ntb_dev_init == NULL)
> + return -ENOTSUP;
> + ret = (*hw->ntb_ops->ntb_dev_init)(dev);
> + if (ret) {
> + NTB_LOG(ERR, "Unanle to init ntb dev.");
Typo: unanle -> unable
[...]
> +static int
> +ntb_rawdev_create(struct rte_pci_device *pci_dev, int socket_id)
> +{
> + char name[RTE_RAWDEV_NAME_MAX_LEN];
> + struct rte_rawdev *rawdev = NULL;
> + int ret;
> +
> + if (pci_dev == NULL) {
> + NTB_LOG(ERR, "Invalid pci_dev.");
> + ret = -EINVAL;
> + goto fail;
Is there possibility to release rawdev at fail? Return might be enough.
> + }
> +
> + memset(name, 0, sizeof(name));
> + snprintf(name, RTE_RAWDEV_NAME_MAX_LEN, "NTB:%x:%02x.%x",
> + pci_dev->addr.bus, pci_dev->addr.devid,
> + pci_dev->addr.function);
> +
> + NTB_LOG(INFO, "Init %s on NUMA node %d", name, rte_socket_id());
Why not use the parameter "socket_id"?
> +
> + /* Allocate device structure. */
> + rawdev = rte_rawdev_pmd_allocate(name, sizeof(struct ntb_hw),
> + socket_id);
> + if (rawdev == NULL) {
> + NTB_LOG(ERR, "Unable to allocate rawdev.");
> + ret = -EINVAL;
> + goto fail;
No need to goto fail as rawdev in NULL.
[...]
> +enum ntb_link {
> + NTB_LINK_DOWN = 0,
> + NTB_LINK_UP,
> +};
> +
You defined the enum, but you used 0 and 1 above.
Thanks
Jingjing
Re: [dpdk-dev] [PATCH v6 2/6] raw/ntb: add intel ntb support
One general comment:
Think about to use rte_read32() and rte_write32() when reading and writing
registers. Or you can define a Macro or inline function for NTB driver to touch
registers. Then you can omit lots of "(char *)hw->pci_dev->mem_resource[0].addr
" and "*((volatile uint32_t *)" like things. It will make the code much easier
to read.
> +static void *
> +intel_ntb_get_peer_mw_addr(struct rte_rawdev *dev, int mw_idx)
> +{
> + struct ntb_hw *hw = dev->dev_private;
> + uint8_t bar;
> +
> + if (hw == NULL) {
> + NTB_LOG(ERR, "Invalid device.");
> + return 0;
> + }
> +
> + if (mw_idx < 0 || mw_idx > hw->mw_cnt) {
mw_idx >= hw->mw_cnt?
[...]
> +static int
> +intel_ntb_mw_set_trans(struct rte_rawdev *dev, int mw_idx,
> +uint64_t addr, uint64_t size)
> +{
> + struct ntb_hw *hw = dev->dev_private;
> + void *xlat_addr, *limit_addr;
> + uint64_t xlat_off, limit_off;
> + uint64_t base, limit;
> + uint8_t bar;
> +
> + if (hw == NULL) {
> + NTB_LOG(ERR, "Invalid device.");
> + return -EINVAL;
> + }
> +
> + if (mw_idx < 0 || mw_idx > hw->mw_cnt) {
Same as above.
[...]
> +static uint32_t
> +intel_ntb_spad_read(struct rte_rawdev *dev, int spad, bool peer)
> +{
> + struct ntb_hw *hw = dev->dev_private;
> + uint32_t spad_v, reg_off;
> + void *reg_addr;
> +
> + if (spad < 0 || spad >= hw->spad_cnt) {
> + NTB_LOG(ERR, "Invalid spad reg index.");
> + return 0;
> + }
> +
> + /* When peer is true, read peer spad reg */
> + if (peer)
> + reg_off = XEON_B2B_SPAD_OFFSET;
> + else
> + reg_off = XEON_IM_SPAD_OFFSET;
How about one line if check is simple?
reg_off = peer ? XEON_B2B_SPAD_OFFSET : XEON_IM_SPAD_OFFSET;
Thanks
Jingjing
Re: [dpdk-dev] [PATCH v6 3/6] raw/ntb: add handshake process
> -Original Message-
> From: Li, Xiaoyun
> Sent: Tuesday, June 18, 2019 10:11 AM
> To: Wu, Jingjing ; Wiles, Keith
> ; Liang,
> Cunming ; Maslekar, Omkar
> Cc: dev@dpdk.org; Li, Xiaoyun
> Subject: [PATCH v6 3/6] raw/ntb: add handshake process
>
> Add handshake process using doorbell so that two hosts can
> communicate to start and stop.
>
> Signed-off-by: Xiaoyun Li
> ---
> drivers/raw/ntb_rawdev/ntb_rawdev.c | 336 +++-
> 1 file changed, 335 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/raw/ntb_rawdev/ntb_rawdev.c
> b/drivers/raw/ntb_rawdev/ntb_rawdev.c
> index a03decd55..d9088e825 100644
> --- a/drivers/raw/ntb_rawdev/ntb_rawdev.c
> +++ b/drivers/raw/ntb_rawdev/ntb_rawdev.c
> @@ -28,6 +28,183 @@ static const struct rte_pci_id pci_id_ntb_map[] = {
> { .vendor_id = 0, /* sentinel */ },
> };
>
> +static int
> +ntb_set_mw(struct rte_rawdev *dev, int mw_idx, uint64_t mw_size)
> +{
> + struct ntb_hw *hw = dev->dev_private;
> + char mw_name[RTE_MEMZONE_NAMESIZE];
> + const struct rte_memzone *mz;
> + int ret = 0;
> +
> + if (hw->ntb_ops->mw_set_trans == NULL) {
> + NTB_LOG(ERR, "Not supported to set mw.");
> + return -ENOTSUP;
> + }
> +
> + snprintf(mw_name, sizeof(mw_name), "ntb_%d_mw_%d",
> + dev->dev_id, mw_idx);
> +
> + mz = rte_memzone_lookup(mw_name);
> + if (mz)
> + return 0;
> +
> + /**
> + * Hardware requires that mapped memory base address should be
> + * aligned with EMBARSZ and needs continuous memzone.
> + */
> + mz = rte_memzone_reserve_aligned(mw_name, mw_size, dev->socket_id,
> + RTE_MEMZONE_IOVA_CONTIG, hw->mw_size[mw_idx]);
If the memzone is reserved inside of driver, how is the buffer be mapped
without copy when enqueuer/dequeuer as the buffer might not be in the memzone?
How about to design the dev_config to set the mw to be a memzone (might address
+ size) which can be created by application instead of created internally?
[.]
> +static void
> +ntb_dev_intr_handler(void *param)
> +{
> + struct rte_rawdev *dev = (struct rte_rawdev *)param;
> + struct ntb_hw *hw = dev->dev_private;
> + uint32_t mw_size_h, mw_size_l;
> + uint64_t db_bits = 0;
> + int i = 0;
> +
> + if (hw->ntb_ops->db_read == NULL ||
> + hw->ntb_ops->db_clear == NULL ||
> + hw->ntb_ops->peer_db_set == NULL) {
> + NTB_LOG(ERR, "Doorbell is not supported.");
> + return;
> + }
> +
> + db_bits = (*hw->ntb_ops->db_read)(dev);
> + if (!db_bits)
> + NTB_LOG(ERR, "No doorbells");
> +
Is the db_bits a common setting between different kind of NTB?
[..]
>
> @@ -356,7 +608,9 @@ static int
> ntb_init_hw(struct rte_rawdev *dev, struct rte_pci_device *pci_dev)
> {
> struct ntb_hw *hw = dev->dev_private;
> - int ret;
> + struct rte_intr_handle *intr_handle;
> + uint32_t val;
> + int ret, i;
>
> hw->pci_dev = pci_dev;
> hw->peer_dev_up = 0;
> @@ -387,6 +641,86 @@ ntb_init_hw(struct rte_rawdev *dev, struct rte_pci_device
> *pci_dev)
> if (ret)
> return ret;
>
> + /* Init doorbell. */
> + hw->db_valid_mask = ((uint64_t)1 << hw->db_cnt) - 1;
Use RTE_LEN2MASK instead?
Thanks
Jingjing
[dpdk-dev] [PATCH v3 0/8] kni: fixes and cleanups
While testing KNI with netvsc, saw lots of places more code could be safely removed from KNI kernel driver. v3 - rebase to current master, add style fix patch v2 - get rid of unnecessary padding, combine the unused field patches Stephen Hemminger (8): kni: don't need stubs for rx_mode or ioctl kni: use netdev_alloc_skb kni: don't keep stats in kni_net kni: drop unused fields kni: use proper type for kni fifo's kni: return -EFAULT if copy_from_user fails doc: update KNI documentation kni: fix style issues .../sample_app_ug/kernel_nic_interface.rst| 18 ++--- kernel/linux/kni/kni_dev.h| 18 ++--- kernel/linux/kni/kni_misc.c | 17 ++-- kernel/linux/kni/kni_net.c| 79 +-- lib/librte_kni/rte_kni.c | 30 +++ 5 files changed, 53 insertions(+), 109 deletions(-) -- 2.20.1
[dpdk-dev] [PATCH v3 1/8] kni: don't need stubs for rx_mode or ioctl
The netdev subsystem already handles case where
network sevice does not support ioctl.
If device has no rx_mode hook it is not called.
Signed-off-by: Stephen Hemminger
---
kernel/linux/kni/kni_net.c | 19 ---
1 file changed, 19 deletions(-)
diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index ad8365877cda..c86337d099ab 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -593,23 +593,6 @@ kni_net_tx_timeout(struct net_device *dev)
netif_wake_queue(dev);
}
-/*
- * Ioctl commands
- */
-static int
-kni_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
- pr_debug("kni_net_ioctl group:%d cmd:%d\n",
- ((struct kni_dev *)netdev_priv(dev))->group_id, cmd);
-
- return -EOPNOTSUPP;
-}
-
-static void
-kni_net_set_rx_mode(struct net_device *dev)
-{
-}
-
static int
kni_net_change_mtu(struct net_device *dev, int new_mtu)
{
@@ -758,8 +741,6 @@ static const struct net_device_ops kni_net_netdev_ops = {
.ndo_change_rx_flags = kni_net_set_promiscusity,
.ndo_start_xmit = kni_net_tx,
.ndo_change_mtu = kni_net_change_mtu,
- .ndo_do_ioctl = kni_net_ioctl,
- .ndo_set_rx_mode = kni_net_set_rx_mode,
.ndo_get_stats = kni_net_stats,
.ndo_tx_timeout = kni_net_tx_timeout,
.ndo_set_mac_address = kni_net_set_mac,
--
2.20.1
[dpdk-dev] [PATCH v3 3/8] kni: don't keep stats in kni_net
Since kernel 2.6.28 the network subsystem has provided
dev->stats for devices to use statistics handling and is the
default if no ndo_get_stats is provided.
This allow allows for 64 bit (rather than just 32 bit)
statistics with KNI.
Signed-off-by: Stephen Hemminger
---
kernel/linux/kni/kni_dev.h | 1 -
kernel/linux/kni/kni_net.c | 43 +-
2 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h
index d57bce647e4a..21e4b0d92368 100644
--- a/kernel/linux/kni/kni_dev.h
+++ b/kernel/linux/kni/kni_dev.h
@@ -39,7 +39,6 @@ struct kni_dev {
/* kni list */
struct list_head list;
- struct net_device_stats stats;
int status;
uint16_t group_id; /* Group ID of a group of KNI devices */
uint32_t core_id;/* Core ID to bind */
diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index cce5e7eb991f..06310fec57bb 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -291,15 +291,15 @@ kni_net_tx(struct sk_buff *skb, struct net_device *dev)
/* Free skb and update statistics */
dev_kfree_skb(skb);
- kni->stats.tx_bytes += len;
- kni->stats.tx_packets++;
+ dev->stats.tx_bytes += len;
+ dev->stats.tx_packets++;
return NETDEV_TX_OK;
drop:
/* Free skb and update statistics */
dev_kfree_skb(skb);
- kni->stats.tx_dropped++;
+ dev->stats.tx_dropped++;
return NETDEV_TX_OK;
}
@@ -343,7 +343,7 @@ kni_net_rx_normal(struct kni_dev *kni)
skb = netdev_alloc_skb(dev, len);
if (!skb) {
/* Update statistics */
- kni->stats.rx_dropped++;
+ dev->stats.rx_dropped++;
continue;
}
@@ -372,8 +372,8 @@ kni_net_rx_normal(struct kni_dev *kni)
netif_rx_ni(skb);
/* Update statistics */
- kni->stats.rx_bytes += len;
- kni->stats.rx_packets++;
+ dev->stats.rx_bytes += len;
+ dev->stats.rx_packets++;
}
/* Burst enqueue mbufs into free_q */
@@ -396,6 +396,7 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
void *data_kva;
struct rte_kni_mbuf *alloc_kva;
void *alloc_data_kva;
+ struct net_device *dev = kni->net_dev;
/* Get the number of entries in rx_q */
num_rq = kni_fifo_count(kni->rx_q);
@@ -443,8 +444,8 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
alloc_kva->pkt_len = len;
alloc_kva->data_len = len;
- kni->stats.tx_bytes += len;
- kni->stats.rx_bytes += len;
+ dev->stats.tx_bytes += len;
+ dev->stats.rx_bytes += len;
}
/* Burst enqueue mbufs into tx_q */
@@ -464,8 +465,8 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
* Update statistic, and enqueue/dequeue failure is impossible,
* as all queues are checked at first.
*/
- kni->stats.tx_packets += num;
- kni->stats.rx_packets += num;
+ dev->stats.tx_packets += num;
+ dev->stats.rx_packets += num;
}
/*
@@ -518,7 +519,7 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)
/* Simulate real usage, allocate/copy skb twice */
skb = netdev_alloc_skb(dev, len);
if (skb == NULL) {
- kni->stats.rx_dropped++;
+ dev->stats.rx_dropped++;
continue;
}
@@ -542,8 +543,8 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)
skb->ip_summed = CHECKSUM_UNNECESSARY;
- kni->stats.rx_bytes += len;
- kni->stats.rx_packets++;
+ dev->stats.rx_bytes += len;
+ dev->stats.rx_packets++;
/* call tx interface */
kni_net_tx(skb, dev);
@@ -573,12 +574,10 @@ kni_net_rx(struct kni_dev *kni)
static void
kni_net_tx_timeout(struct net_device *dev)
{
- struct kni_dev *kni = netdev_priv(dev);
-
pr_debug("Transmit timeout at %ld, latency %ld\n", jiffies,
jiffies - dev_trans_start(dev));
- kni->stats.tx_errors++;
+ dev->stats.tx_errors++;
netif_wake_queue(dev);
}
@@ -627,17 +626,6 @@ kni_net_poll_resp(struct kni_dev *kni)
wake_up_interruptible(&kni->wq);
}
-/*
- * Return statistics to the caller
- */
-static struct net_device_stats *
-kni_net_stats(struct net_device *dev)
-{
- struct kni_dev *kni = netdev_priv(dev);
-
- return &kni->stats;
-}
-
/*
* Fill the eth header
*/
@@ -730,7 +718,6 @@ static const struct net_device_ops kni_net_netdev_ops = {
.ndo_change_rx_flags = kni_net_set_promiscusity,
.ndo_sta
[dpdk-dev] [PATCH v3 2/8] kni: use netdev_alloc_skb
netdev_alloc_skb is optimized to any alignment or setup
of skb->dev that is required. The kernel has chosen to not pad
packets on x86 (for many years), because it is faster.
Signed-off-by: Stephen Hemminger
---
kernel/linux/kni/kni_net.c | 17 +++--
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index c86337d099ab..cce5e7eb991f 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -340,16 +340,13 @@ kni_net_rx_normal(struct kni_dev *kni)
data_kva = kva2data_kva(kva);
kni->va[i] = pa2va(kni->pa[i], kva);
- skb = dev_alloc_skb(len + 2);
+ skb = netdev_alloc_skb(dev, len);
if (!skb) {
/* Update statistics */
kni->stats.rx_dropped++;
continue;
}
- /* Align IP on 16B boundary */
- skb_reserve(skb, 2);
-
if (kva->nb_segs == 1) {
memcpy(skb_put(skb, len), data_kva, len);
} else {
@@ -368,7 +365,6 @@ kni_net_rx_normal(struct kni_dev *kni)
}
}
- skb->dev = dev;
skb->protocol = eth_type_trans(skb, dev);
skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -512,26 +508,20 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)
data_kva = kva2data_kva(kva);
kni->va[i] = pa2va(kni->pa[i], kva);
- skb = dev_alloc_skb(len + 2);
+ skb = netdev_alloc_skb(dev, len);
if (skb) {
- /* Align IP on 16B boundary */
- skb_reserve(skb, 2);
memcpy(skb_put(skb, len), data_kva, len);
- skb->dev = dev;
skb->ip_summed = CHECKSUM_UNNECESSARY;
dev_kfree_skb(skb);
}
/* Simulate real usage, allocate/copy skb twice */
- skb = dev_alloc_skb(len + 2);
+ skb = netdev_alloc_skb(dev, len);
if (skb == NULL) {
kni->stats.rx_dropped++;
continue;
}
- /* Align IP on 16B boundary */
- skb_reserve(skb, 2);
-
if (kva->nb_segs == 1) {
memcpy(skb_put(skb, len), data_kva, len);
} else {
@@ -550,7 +540,6 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)
}
}
- skb->dev = dev;
skb->ip_summed = CHECKSUM_UNNECESSARY;
kni->stats.rx_bytes += len;
--
2.20.1
[dpdk-dev] [PATCH v3 4/8] kni: drop unused fields
The kni net structure only exists in driver no API/ABI.
Several fields were either totally unused or set and never used.
The fields in dev_info do need to stay in the ABI but
kernel can ignore them.
Signed-off-by: Stephen Hemminger
kni: drop unused status element
Yet another ethtool leftover.
Signed-off-by: Stephen Hemminger
---
kernel/linux/kni/kni_dev.h | 5 -
kernel/linux/kni/kni_misc.c | 1 -
2 files changed, 6 deletions(-)
diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h
index 21e4b0d92368..f3e6c3ca4efa 100644
--- a/kernel/linux/kni/kni_dev.h
+++ b/kernel/linux/kni/kni_dev.h
@@ -39,8 +39,6 @@ struct kni_dev {
/* kni list */
struct list_head list;
- int status;
- uint16_t group_id; /* Group ID of a group of KNI devices */
uint32_t core_id;/* Core ID to bind */
char name[RTE_KNI_NAMESIZE]; /* Network device name */
struct task_struct *pthread;
@@ -79,9 +77,6 @@ struct kni_dev {
/* mbuf size */
uint32_t mbuf_size;
- /* synchro for request processing */
- unsigned long synchro;
-
/* buffers */
void *pa[MBUF_BURST_SZ];
void *va[MBUF_BURST_SZ];
diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index 1fc5eeb9c8ca..b59cf24c2184 100644
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -346,7 +346,6 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
kni = netdev_priv(net_dev);
kni->net_dev = net_dev;
- kni->group_id = dev_info.group_id;
kni->core_id = dev_info.core_id;
strncpy(kni->name, dev_info.name, RTE_KNI_NAMESIZE);
--
2.20.1
[dpdk-dev] [PATCH v3 5/8] kni: use proper type for kni fifo's
Using void * instead of proper type is unsafe practice.
Signed-off-by: Stephen Hemminger
---
kernel/linux/kni/kni_dev.h | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h
index f3e6c3ca4efa..ceba5f73c1d9 100644
--- a/kernel/linux/kni/kni_dev.h
+++ b/kernel/linux/kni/kni_dev.h
@@ -51,22 +51,22 @@ struct kni_dev {
struct net_device *net_dev;
/* queue for packets to be sent out */
- void *tx_q;
+ struct rte_kni_fifo *tx_q;
/* queue for the packets received */
- void *rx_q;
+ struct rte_kni_fifo *rx_q;
/* queue for the allocated mbufs those can be used to save sk buffs */
- void *alloc_q;
+ struct rte_kni_fifo *alloc_q;
/* free queue for the mbufs to be freed */
- void *free_q;
+ struct rte_kni_fifo *free_q;
/* request queue */
- void *req_q;
+ struct rte_kni_fifo *req_q;
/* response queue */
- void *resp_q;
+ struct rte_kni_fifo *resp_q;
void *sync_kva;
void *sync_va;
--
2.20.1
[dpdk-dev] [PATCH v3 7/8] doc: update KNI documentation
Make the KNI documentation reflect modern kernel networking. Ifconfig has been superseded by iproute2 for 15 years. Iproute2 is well maintained, supports current feature set. Ethtool is no longer supported by KNI. Tshark is a better replacement for tcpdump. Signed-off-by: Stephen Hemminger --- .../sample_app_ug/kernel_nic_interface.rst | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/guides/sample_app_ug/kernel_nic_interface.rst b/doc/guides/sample_app_ug/kernel_nic_interface.rst index a7e549d5213a..422bd8c98465 100644 --- a/doc/guides/sample_app_ug/kernel_nic_interface.rst +++ b/doc/guides/sample_app_ug/kernel_nic_interface.rst @@ -21,14 +21,14 @@ The FIFO queues contain pointers to data packets in the DPDK. This: * Provides a faster mechanism to interface with the kernel net stack and eliminates system calls -* Facilitates the DPDK using standard Linux* userspace net tools (tcpdump, ftp, and so on) +* Facilitates the DPDK using standard Linux* userspace net tools (tshark, rsync, and so on) * Eliminate the copy_to_user and copy_from_user operations on packets. The Kernel NIC Interface sample application is a simple example that demonstrates the use of the DPDK to create a path for packets to go through the Linux* kernel. This is done by creating one or more kernel net devices for each of the DPDK ports. -The application allows the use of standard Linux tools (ethtool, ifconfig, tcpdump) with the DPDK ports and +The application allows the use of standard Linux tools (iproute, tshark) with the DPDK ports and also the exchange of packets between the DPDK application and the Linux* kernel. The Kernel NIC Interface sample application requires that the @@ -220,13 +220,13 @@ Enable KNI interface and assign an IP address: .. code-block:: console -# ifconfig vEth0_0 192.168.0.1 +# ip addr add dev vEth0_0 192.168.0.1 Show KNI interface configuration and statistics: .. code-block:: console -# ifconfig vEth0_0 +# ip -s -d addr show vEth0_0 The user can also check and reset the packet statistics inside the ``kni`` application by sending the app the USR1 and USR2 signals: @@ -234,16 +234,16 @@ application by sending the app the USR1 and USR2 signals: .. code-block:: console # Print statistics -# kill -SIGUSR1 `pidof kni` +# pkill -USR1 kni # Zero statistics -# kill -SIGUSR2 `pidof kni` +# pkill -USR2 kni Dump network traffic: .. code-block:: console -# tcpdump -i vEth0_0 +# tshark -n -i vEth0_0 The normal Linux commands can also be used to change the MAC address and MTU size used by the physical NIC which corresponds to the KNI interface. @@ -254,13 +254,13 @@ Change the MAC address: .. code-block:: console -# ifconfig vEth0_0 hw ether 0C:01:02:03:04:08 +# ip link set dev vEth0_0 lladdr 0C:01:02:03:04:08 Change the MTU size: .. code-block:: console -# ifconfig vEth0_0 mtu 1450 +# ip link set dev vEth0_0 mtu 1450 When the ``kni`` application is closed, all the KNI interfaces are deleted from the Linux kernel. -- 2.20.1
[dpdk-dev] [PATCH v3 6/8] kni: return -EFAULT if copy_from_user fails
The correct thing to return if user gives a bad data
is to return -EFAULT. Logging is also discouraged because
it could be used as a DoS attack.
Signed-off-by: Stephen Hemminger
---
kernel/linux/kni/kni_misc.c | 16 +---
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index b59cf24c2184..be45f823408f 100644
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -301,11 +301,8 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
return -EINVAL;
/* Copy kni info from user space */
- ret = copy_from_user(&dev_info, (void *)ioctl_param, sizeof(dev_info));
- if (ret) {
- pr_err("copy_from_user in kni_ioctl_create");
- return -EIO;
- }
+ if (copy_from_user(&dev_info, (void *)ioctl_param, sizeof(dev_info)))
+ return -EFAULT;
/* Check if name is zero-ended */
if (strnlen(dev_info.name, sizeof(dev_info.name)) ==
sizeof(dev_info.name)) {
@@ -427,15 +424,12 @@ kni_ioctl_release(struct net *net, uint32_t ioctl_num,
if (_IOC_SIZE(ioctl_num) > sizeof(dev_info))
return -EINVAL;
- ret = copy_from_user(&dev_info, (void *)ioctl_param, sizeof(dev_info));
- if (ret) {
- pr_err("copy_from_user in kni_ioctl_release");
- return -EIO;
- }
+ if (copy_from_user(&dev_info, (void *)ioctl_param, sizeof(dev_info)))
+ return -EFAULT;
/* Release the network device according to its name */
if (strlen(dev_info.name) == 0)
- return ret;
+ return -EINVAL;
down_write(&knet->kni_list_lock);
list_for_each_entry_safe(dev, n, &knet->kni_list_head, list) {
--
2.20.1
[dpdk-dev] [PATCH v3 8/8] kni: fix style issues
rte_kni does not follow standard style rules.
Noticed some extra \ line continuation etc.
Signed-off-by: Stephen Hemminger
---
lib/librte_kni/rte_kni.c | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index e29d0cc7df3c..4828df3ca1e6 100644
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -59,7 +59,7 @@ struct rte_kni {
uint16_t group_id; /**< Group ID of KNI devices */
uint32_t slot_id; /**< KNI pool slot ID */
struct rte_mempool *pktmbuf_pool; /**< pkt mbuf mempool */
- unsigned mbuf_size; /**< mbuf size */
+ unsigned int mbuf_size; /**< mbuf size */
const struct rte_memzone *m_tx_q; /**< TX queue memzone */
const struct rte_memzone *m_rx_q; /**< RX queue memzone */
@@ -78,7 +78,7 @@ struct rte_kni {
/* For request & response */
struct rte_kni_fifo *req_q; /**< Request queue */
struct rte_kni_fifo *resp_q;/**< Response queue */
- void * sync_addr; /**< Req/Resp Mem address */
+ void *sync_addr; /**< Req/Resp Mem address */
struct rte_kni_ops ops; /**< operations for request */
};
@@ -473,7 +473,7 @@ kni_config_promiscusity(uint16_t port_id, uint8_t to_on)
int
rte_kni_handle_request(struct rte_kni *kni)
{
- unsigned ret;
+ unsigned int ret;
struct rte_kni_request *req = NULL;
if (kni == NULL)
@@ -498,8 +498,8 @@ rte_kni_handle_request(struct rte_kni *kni)
break;
case RTE_KNI_REQ_CFG_NETWORK_IF: /* Set network interface up/down */
if (kni->ops.config_network_if)
- req->result = kni->ops.config_network_if(\
- kni->ops.port_id, req->if_up);
+ req->result =
kni->ops.config_network_if(kni->ops.port_id,
+req->if_up);
break;
case RTE_KNI_REQ_CHANGE_MAC_ADDR: /* Change MAC Address */
if (kni->ops.config_mac_address)
@@ -534,7 +534,7 @@ rte_kni_handle_request(struct rte_kni *kni)
}
unsigned
-rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned num)
+rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned int
num)
{
void *phy_mbufs[num];
unsigned int ret;
@@ -552,9 +552,9 @@ rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf
**mbufs, unsigned num)
}
unsigned
-rte_kni_rx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned num)
+rte_kni_rx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned int
num)
{
- unsigned ret = kni_fifo_get(kni->tx_q, (void **)mbufs, num);
+ unsigned int ret = kni_fifo_get(kni->tx_q, (void **)mbufs, num);
/* If buffers removed, allocate mbufs and then put them into alloc_q */
if (ret)
@@ -605,7 +605,7 @@ kni_allocate_mbufs(struct rte_kni *kni)
return;
}
- allocq_free = (kni->alloc_q->read - kni->alloc_q->write - 1) \
+ allocq_free = (kni->alloc_q->read - kni->alloc_q->write - 1)
& (MAX_MBUF_BURST_NUM - 1);
for (i = 0; i < allocq_free; i++) {
pkts[i] = rte_pktmbuf_alloc(kni->pktmbuf_pool);
@@ -659,7 +659,7 @@ static enum kni_ops_status
kni_check_request_register(struct rte_kni_ops *ops)
{
/* check if KNI request ops has been registered*/
- if( NULL == ops )
+ if (NULL == ops)
return KNI_REQ_NO_REGISTER;
if ((ops->change_mtu == NULL)
@@ -672,22 +672,22 @@ kni_check_request_register(struct rte_kni_ops *ops)
}
int
-rte_kni_register_handlers(struct rte_kni *kni,struct rte_kni_ops *ops)
+rte_kni_register_handlers(struct rte_kni *kni, struct rte_kni_ops *ops)
{
enum kni_ops_status req_status;
- if (NULL == ops) {
+ if (ops == NULL) {
RTE_LOG(ERR, KNI, "Invalid KNI request operation.\n");
return -1;
}
- if (NULL == kni) {
+ if (kni == NULL) {
RTE_LOG(ERR, KNI, "Invalid kni info.\n");
return -1;
}
req_status = kni_check_request_register(&kni->ops);
- if ( KNI_REQ_REGISTERED == req_status) {
+ if (req_status == KNI_REQ_REGISTERED) {
RTE_LOG(ERR, KNI, "The KNI request operation has already
registered.\n");
return -1;
}
@@ -699,7 +699,7 @@ rte_kni_register_handlers(struct rte_kni *kni,struct
rte_kni_ops *ops)
int
rte_kni_unregister_handlers(struct rte_kni *kni)
{
- if (NULL == kni) {
+ if (kni == NULL) {
RTE_LOG(ERR, KNI, "Invalid kni info.\n");
return -1;
}
--
2.20.1
Re: [dpdk-dev] [PATCH v2] aesni_mb: fix out-of-bounds access
Hi Fan,
> -Original Message-
> From: Zhang, Roy Fan
> Sent: Monday, June 17, 2019 3:31 PM
> To: dev@dpdk.org
> Cc: akhil.go...@nxp.com; De Lara Guarch, Pablo
> ; Zhang, Roy Fan
>
> Subject: [PATCH v2] aesni_mb: fix out-of-bounds access
>
> This patch fixes the out-of-bounds coverity issue by adding missed
> algorithms to the array.
>
> Coverity issue: 337683
>
> Fixes: c68d7aa354f6 ("crypto/aesni_mb: use architecture independent
> macros")
>
> Signed-off-by: Fan Zhang
> ---
> drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 17
> -
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> index 4d439360f..dda78d989 100644
> --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> @@ -41,6 +41,14 @@ static const unsigned auth_blocksize[] = {
> [SHA_512] = 128,
> [AES_XCBC] = 16,
> [AES_CCM] = 16,
> + [AES_CMAC] = 16,
> + [AES_GMAC] = 16,
> + [AES_GCM] = 16,
As Akhil has pointed out, there is a compilation error,
because there is no AES_GCM in JOB_HASH_ALG list.
I think instead what's missing is NULL_HASH, which block size should be 0.
Thanks,
Pablo
[dpdk-dev] [PATCH v2] examples/multi_process - fix crash in mp_client with sparse ports
From: Stephen Hemminger
The mp_client crashes if run on Azure or any system where ethdev
ports are owned. This is because the flush loop is confusing the
index into the array of ports[] with the port id.
For example if the server has Ports 3 and 5. Then calling
rte_eth_tx_buffer_flush on any other buffer will dereference null
because the tx buffer for that port was not allocated.
Also:
- the flush code is common enough that it should not be marked
unlikely
- combine conditions to reduce indentation
- avoid unnecessary if() if sent is zero.
Fixes: e2366e74e029 ("examples: use buffered Tx")
Signed-off-by: Stephen Hemminger
---
.../client_server_mp/mp_client/client.c | 19 ++-
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/examples/multi_process/client_server_mp/mp_client/client.c
b/examples/multi_process/client_server_mp/mp_client/client.c
index c23dd3f378f7..db9ebbe2402a 100644
--- a/examples/multi_process/client_server_mp/mp_client/client.c
+++ b/examples/multi_process/client_server_mp/mp_client/client.c
@@ -246,19 +246,20 @@ main(int argc, char *argv[])
for (;;) {
uint16_t i, rx_pkts;
- uint16_t port;
rx_pkts = rte_ring_dequeue_burst(rx_ring, pkts,
PKT_READ_SIZE, NULL);
- if (unlikely(rx_pkts == 0)){
- if (need_flush)
- for (port = 0; port < ports->num_ports; port++)
{
- sent =
rte_eth_tx_buffer_flush(ports->id[port], client_id,
- tx_buffer[port]);
- if (unlikely(sent))
- tx_stats->tx[port] += sent;
- }
+ if (rx_pkts == 0 && need_flush) {
+ for (i = 0; i < ports->num_ports; i++) {
+ uint16_t port = ports->id[i];
+
+ sent = rte_eth_tx_buffer_flush(port,
+ client_id,
+ tx_buffer[port]);
+ if (unlikely(sent))
+ tx_stats->tx[port] += sent;
+ }
need_flush = 0;
continue;
}
--
2.20.1
[dpdk-dev] [PATCH v3] examples/multi_process - fix crash in mp_client with sparse ports
From: Stephen Hemminger
The mp_client crashes if run on Azure or any system where ethdev
ports are owned. This is because the flush loop is confusing the
index into the array of ports[] with the port id.
For example if the server has Ports 3 and 5. Then calling
rte_eth_tx_buffer_flush on any other buffer will dereference null
because the tx buffer for that port was not allocated.
v2
- fix typo
- the flush code is common enough that it should not be marked unlikely
- combine conditions to reduce indentation
v3
- avoid unnecessary if() if sent is zero.
Fixes: e2366e74e029 ("examples: use buffered Tx")
Signed-off-by: Stephen Hemminger
---
.../client_server_mp/mp_client/client.c| 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/examples/multi_process/client_server_mp/mp_client/client.c
b/examples/multi_process/client_server_mp/mp_client/client.c
index c23dd3f378f7..361d90b54b2d 100644
--- a/examples/multi_process/client_server_mp/mp_client/client.c
+++ b/examples/multi_process/client_server_mp/mp_client/client.c
@@ -246,19 +246,19 @@ main(int argc, char *argv[])
for (;;) {
uint16_t i, rx_pkts;
- uint16_t port;
rx_pkts = rte_ring_dequeue_burst(rx_ring, pkts,
PKT_READ_SIZE, NULL);
- if (unlikely(rx_pkts == 0)){
- if (need_flush)
- for (port = 0; port < ports->num_ports; port++)
{
- sent =
rte_eth_tx_buffer_flush(ports->id[port], client_id,
- tx_buffer[port]);
- if (unlikely(sent))
- tx_stats->tx[port] += sent;
- }
+ if (rx_pkts == 0 && need_flush) {
+ for (i = 0; i < ports->num_ports; i++) {
+ uint16_t port = ports->id[i];
+
+ sent = rte_eth_tx_buffer_flush(port,
+ client_id,
+ tx_buffer[port]);
+ tx_stats->tx[port] += sent;
+ }
need_flush = 0;
continue;
}
--
2.20.1
Re: [dpdk-dev] [PATCH v3] examples/multi_process - fix crash in mp_client with sparse ports
On Tue, Jun 18, 2019 at 6:41 PM Stephen Hemminger <
step...@networkplumber.org> wrote:
> From: Stephen Hemminger
>
> The mp_client crashes if run on Azure or any system where ethdev
> ports are owned. This is because the flush loop is confusing the
> index into the array of ports[] with the port id.
>
> For example if the server has Ports 3 and 5. Then calling
> rte_eth_tx_buffer_flush on any other buffer will dereference null
> because the tx buffer for that port was not allocated.
>
> v2
>- fix typo
>- the flush code is common enough that it should not be marked unlikely
>- combine conditions to reduce indentation
>
> v3
>- avoid unnecessary if() if sent is zero.
>
Annotations should be after the ---.
> Fixes: e2366e74e029 ("examples: use buffered Tx")
>
Cc: sta...@dpdk.org
Signed-off-by: Stephen Hemminger
> ---
> .../client_server_mp/mp_client/client.c| 18 +-
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/examples/multi_process/client_server_mp/mp_client/client.c
> b/examples/multi_process/client_server_mp/mp_client/client.c
> index c23dd3f378f7..361d90b54b2d 100644
> --- a/examples/multi_process/client_server_mp/mp_client/client.c
> +++ b/examples/multi_process/client_server_mp/mp_client/client.c
> @@ -246,19 +246,19 @@ main(int argc, char *argv[])
>
> for (;;) {
> uint16_t i, rx_pkts;
> - uint16_t port;
>
> rx_pkts = rte_ring_dequeue_burst(rx_ring, pkts,
> PKT_READ_SIZE, NULL);
>
> - if (unlikely(rx_pkts == 0)){
> - if (need_flush)
> - for (port = 0; port < ports->num_ports;
> port++) {
> - sent =
> rte_eth_tx_buffer_flush(ports->id[port], client_id,
> - tx_buffer[port]);
> - if (unlikely(sent))
> - tx_stats->tx[port] += sent;
> - }
> + if (rx_pkts == 0 && need_flush) {
> + for (i = 0; i < ports->num_ports; i++) {
> + uint16_t port = ports->id[i];
> +
> + sent = rte_eth_tx_buffer_flush(port,
> + client_id,
> +
> tx_buffer[port]);
> + tx_stats->tx[port] += sent;
> + }
> need_flush = 0;
> continue;
> }
>
>
Woh, had to concentrate to see that the pb was when accessing tx_buffer[]
and tx_stats->tx[] arrays, good catch :-)
Reviewed-by: David Marchand
--
David Marchand
Re: [dpdk-dev] [RFC,v2] lfring: lock-free ring buffer
> -Original Message-
> From: Ola Liljedahl [mailto:ola.liljed...@arm.com]
> Sent: Saturday, June 15, 2019 4:00 PM
> To: Honnappa Nagarahalli ; Richardson,
> Bruce ; Eads, Gage ;
> dev@dpdk.org
> Cc: nd
> Subject: Re: [RFC,v2] lfring: lock-free ring buffer
>
> On Wed, 2019-06-05 at 18:21 +, Eads, Gage wrote:
> > Hi Ola,
> >
> > Is it possible to add burst enqueue and dequeue functions as well, so
> > we can plug this into a mempool handler?
> Proper burst enqueue is difficult or at least not very efficient.
>
> > Besides the mempool handler, I think the all-or-nothing semantics
> > would be useful for applications. Besides that, this RFC looks good at a
> > high
> level.
> >
> > For a complete submission, a few more changes are needed:
> > - Builds: Need to add 'lfring' to lib/meson.build and mk/rte.app.mk
> > - Documentation: need to update release notes, add a new section in
> > the programmer's guide, and update the doxygen configuration files
> > - Tests: This patchset should add a set of lfring tests as well
> >
> > Code comments follow.
> Thanks for the review comments, I only had time to look at a few of them. I
> will return with more complete answers and a new version of the patch.
>
Sounds good.
> > +/* search a ring from its name */
> > +struct rte_lfring *
> > +rte_lfring_lookup(const char *name)
> > +{
> > + struct rte_tailq_entry *te;
> > + struct rte_lfring *r = NULL;
> > + struct rte_lfring_list *ring_list;
> > +
> > + ring_list = RTE_TAILQ_CAST(rte_lfring_tailq.head, rte_lfring_list);
> > +
> > + rte_rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK);
> > +
> > + TAILQ_FOREACH(te, ring_list, next) {
> > + r = (struct rte_lfring *) te->data;
> > + if (strncmp(name, r->name, RTE_LFRING_NAMESIZE) == 0)
> >
> > Missing a NULL pointer check before dereferencing 'name'
> Why shouldn't the program crash if someone passes a NULL pointer
> parameter?
> Callers will be internal, external users should be able to control whether
> NULL is passed instead of a valid pointer.
> A crash and a core dump is the best way to detect and debug errors.
If you think crashing is the appropriate response, rte_panic() with a
descriptive error string would be better than a segfault alone.
> > +/**
> > + * Return the number of elements which can be stored in the lfring.
> > + *
> > + * @param r
> > + * A pointer to the lfring structure.
> > + * @return
> > + * The usable size of the lfring.
> > + */
> > +static inline unsigned int
> > +rte_lfring_get_capacity(const struct rte_lfring *r) {
> > + return r->size;
> >
> > I believe this should return r->mask, to account for the one unusable
> > ring entry.
>
> I think this is a mistake, all ring entries should be usable.
Ok, then do these comments from elsewhere in the header need to be corrected?
"The real usable lfring size is *count-1* instead of *count* to differentiate a
free lfring from an empty lfring."
Re: [dpdk-dev] ***Spam*** Re: Mempool handler ops index allocation issue
> -Original Message- > From: Andrew Rybchenko [mailto:arybche...@solarflare.com] > Sent: Monday, May 13, 2019 7:22 AM > To: Olivier Matz ; Eads, Gage > > Cc: dev@dpdk.org > Subject: Re: ***Spam*** Re: Mempool handler ops index allocation issue > > Hi Olivier, > > On 5/13/19 3:14 PM, Olivier Matz wrote: > > Hi Gage, > > > > On Thu, May 09, 2019 at 10:19:55PM +, Eads, Gage wrote: > >> Hi all, > >> > >> I ran into a problem with a multi-process application, in which two > processes assigned the same mempool handler ops index to *different* > handlers. This happened because the two processes supplied the -d EAL > arguments in different order, e.g.: > >> > >> sudo ./appA -dlibrte_mempool_bucket.so -dlibrte_mempool_ring.so > >> --proc-type primary & sudo ./appB -dlibrte_mempool_ring.so > >> -dlibrte_mempool_bucket.so --proc-type secondary & > >> > >> The dynamic load order matters because the ops indexes are assigned in > the order the library ctors are run. This can result in the different > processes > trying to use different handlers for the same mempool. > >> > >> I'm not aware of any requirement that the EAL argument order should > match across processes, so I don't think this is a user error. This could also > happen in static libraries if they linked the libraries in a different order > - but > that shouldn't occur if both applications are following the rules for > building an > external application > (https://doc.dpdk.org/guides/prog_guide/dev_kit_build_system.html#build > ing-external-applications). > >> > >> If you agree that this is an issue, I see a couple possible resolutions: > >> > >> > >> 1. Add a note/warning to the mempool handlers section of the user > guide > (https://doc.dpdk.org/guides/prog_guide/mempool_lib.html#mempool- > handlers) > >> > >> 2. Modify rte_mempool_register_ops() so that built-in handlers (ring, > stack, etc.) have fixed IDs. E.g. ring is always 0, stack is always 1, etc. > These > handlers could be identified by their name string. User-registered mempools > would still be susceptible to this problem, though. > >> > >> Thoughts? Alternatives? > > What about this: > > > > - add a new table in a named memory zone that stores the association > >between mempool_ops id and name (but not the ops pointers) of the > >primary process. > > > > - change rte_mempool_register_ops() to have a specific behavior in case > >of a secondary process: lookup in that table to get the id associated > >to the name (fail if not found). > > Sorry for the delay, just revisiting this now. Memory zones won't be available in rte_mempool_register_ops when using static libraries (or shared libraries loaded at program startup), since the ctors execute before rte_eal_init() is called. > > > > On the other hand, using secondary processes always looked a bit > > dangerous to me (for several reasons), so adding a note in the > > programmer's guide (your proposal 1) is also fine to me. Considering the memzone issue, I'll go this route. Thanks, Gage
[dpdk-dev] [PATCH] doc: add multi-proc shared lib mempool note
The mempool library assigns handler ops indexes based on the dynamic load
order of mempool handlers. Indexes are used so a mempool can be used by
multiple processes, but this only works if all processes agree on the
mapping from index to mempool handler.
When using the '-d' argument, it's possible for different processes to load
mempool handlers in different orders, and thus have different
index->handler mappings. Using a mempool in multiple of such processes will
result in undefined behavior.
This commit adds a note to the mempool library programmer's guide warning
users against this.
Fixes: 449c49b93a6b ("mempool: support handler operations")
Cc: sta...@dpdk.org
Signed-off-by: Gage Eads
---
doc/guides/prog_guide/mempool_lib.rst | 7 +++
1 file changed, 7 insertions(+)
diff --git a/doc/guides/prog_guide/mempool_lib.rst
b/doc/guides/prog_guide/mempool_lib.rst
index 52a569f57..4470f6b38 100644
--- a/doc/guides/prog_guide/mempool_lib.rst
+++ b/doc/guides/prog_guide/mempool_lib.rst
@@ -133,6 +133,13 @@ For applications that use ``rte_pktmbuf_create()``, there
is a config setting
(``RTE_MBUF_DEFAULT_MEMPOOL_OPS``) that allows the application to make use of
an alternative mempool handler.
+ .. note::
+
+When running a DPDK application with shared libraries, mempool handler
+shared objects specified with the '-d' EAL command-line parameter are
+dynamically loaded. When running a multi-process application with shared
+libraries, the -d arguments for mempool handlers *must be specified in the
+same order for all processes* to ensure correct operation.
Use Cases
-
--
2.13.6
[dpdk-dev] [PATCH v3] net/avp: remove resources when port is closed
The rte_eth_dev_close() function now handles freeing resources for
devices (e.g., mac_addrs). To conform with the new close() behaviour we
are asserting the RTE_ETH_DEV_CLOSE_REMOVE flag so that
rte_eth_dev_close() releases all device level dynamic memory.
Second level memory allocated to each individual rx/tx queue is now
freed as part of the close() operation therefore making it safe for the
rte_eth_dev_close() function to free the device private data without
orphaning the rx/tx queue pointers.
Cc: Matt Peters
Signed-off-by: Allain Legacy
---
drivers/net/avp/avp_ethdev.c | 52
1 file changed, 43 insertions(+), 9 deletions(-)
diff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c
index 57af5158d..47b96eca0 100644
--- a/drivers/net/avp/avp_ethdev.c
+++ b/drivers/net/avp/avp_ethdev.c
@@ -959,6 +959,8 @@ eth_avp_dev_init(struct rte_eth_dev *eth_dev)
eth_dev->dev_ops = &avp_eth_dev_ops;
eth_dev->rx_pkt_burst = &avp_recv_pkts;
eth_dev->tx_pkt_burst = &avp_xmit_pkts;
+ /* Let rte_eth_dev_close() release the port resources */
+ eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
/*
@@ -1023,19 +1025,13 @@ eth_avp_dev_init(struct rte_eth_dev *eth_dev)
static int
eth_avp_dev_uninit(struct rte_eth_dev *eth_dev)
{
- int ret;
-
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return -EPERM;
if (eth_dev->data == NULL)
return 0;
- ret = avp_dev_disable_interrupts(eth_dev);
- if (ret != 0) {
- PMD_DRV_LOG(ERR, "Failed to disable interrupts, ret=%d\n", ret);
- return ret;
- }
+ avp_dev_close(eth_dev);
return 0;
}
@@ -1941,8 +1937,25 @@ avp_dev_rx_queue_release(void *rx_queue)
unsigned int i;
for (i = 0; i < avp->num_rx_queues; i++) {
- if (data->rx_queues[i] == rxq)
+ if (data->rx_queues[i] == rxq) {
+ rte_free(data->rx_queues[i]);
+ data->rx_queues[i] = NULL;
+ }
+ }
+}
+
+static void
+avp_dev_rx_queue_release_all(struct rte_eth_dev *eth_dev)
+{
+ struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+ struct rte_eth_dev_data *data = avp->dev_data;
+ unsigned int i;
+
+ for (i = 0; i < avp->num_rx_queues; i++) {
+ if (data->rx_queues[i]) {
+ rte_free(data->rx_queues[i]);
data->rx_queues[i] = NULL;
+ }
}
}
@@ -1955,8 +1968,25 @@ avp_dev_tx_queue_release(void *tx_queue)
unsigned int i;
for (i = 0; i < avp->num_tx_queues; i++) {
- if (data->tx_queues[i] == txq)
+ if (data->tx_queues[i] == txq) {
+ rte_free(data->tx_queues[i]);
+ data->tx_queues[i] = NULL;
+ }
+ }
+}
+
+static void
+avp_dev_tx_queue_release_all(struct rte_eth_dev *eth_dev)
+{
+ struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+ struct rte_eth_dev_data *data = avp->dev_data;
+ unsigned int i;
+
+ for (i = 0; i < avp->num_tx_queues; i++) {
+ if (data->tx_queues[i]) {
+ rte_free(data->tx_queues[i]);
data->tx_queues[i] = NULL;
+ }
}
}
@@ -2105,6 +2135,10 @@ avp_dev_close(struct rte_eth_dev *eth_dev)
/* continue */
}
+ /* release dynamic storage for rx/tx queues */
+ avp_dev_rx_queue_release_all(eth_dev);
+ avp_dev_tx_queue_release_all(eth_dev);
+
unlock:
rte_spinlock_unlock(&avp->lock);
}
--
2.12.1
Re: [dpdk-dev] [PATCH] lib/telemetry: add support to fetch global metrics
18/06/2019 18:55, Pattan, Reshma: > > > -Original Message- > > From: Thomas Monjalon [mailto:tho...@monjalon.net] > > > I see some errors with GCC: > > On which GCC version the errors are shown? GCC 8.3 Given the type of the errors I think it should be visible with older versions. > > rte_telemetry_parser.c:362:27: error: unused variable ‘p’ > > > > rte_telemetry.c:550:11: error: unused variable ‘i’ > > > > rte_telemetry.c:613:16: error: comparison of integer expressions of > > different > > signedness: ‘int’ and ‘uint32_t’
[dpdk-dev] [PATCH] pktgen: fix clang compiler errors / warnings
Clang complains about the following issues:
(1) unclear meaning of =- in assignment of pktgen.verbose
(2) unused function sct(), which is also defined in cli_cmds.c
(3) typo in include guard for rte_lua_vec.h
(4) duplicate inline due to expansion of __rte_always_inline
Tested the patch on both clang and gcc. Not sure how strong
pktgen's backwards compatability guarantees are, but
__rte_always_inline is good back to DPDK v18.02 at least.
Signed-off-by: Adam Drescher
---
app/pktgen-main.c | 2 +-
lib/cli/cli_cmap.c| 23 ---
lib/lua/rte_lua_vec.h | 2 +-
lib/vec/rte_vec.h | 32
4 files changed, 18 insertions(+), 41 deletions(-)
diff --git a/app/pktgen-main.c b/app/pktgen-main.c
index 6b9d90e..e87e2f5 100644
--- a/app/pktgen-main.c
+++ b/app/pktgen-main.c
@@ -252,7 +252,7 @@ pktgen_parse_args(int argc, char **argv)
pktgen.flags|= ENABLE_THEME_FLAG;
break;
case 'v':
- pktgen.verbose =- 1;
+ pktgen.verbose = 1;
break;
case 'h': /* print out the help message */
diff --git a/lib/cli/cli_cmap.c b/lib/cli/cli_cmap.c
index 66638b7..1c932d6 100644
--- a/lib/cli/cli_cmap.c
+++ b/lib/cli/cli_cmap.c
@@ -285,26 +285,3 @@ cmap_free(struct cmap *cmap)
{
free(cmap);
}
-
-/* Helper for building log strings.
- * The macro takes an existing string, a printf-like format string and optional
- * arguments. It formats the string and appends it to the existing string,
- * while avoiding possible buffer overruns.
- */
-#define strncatf(dest, fmt, ...) do { \
- char _buff[1024]; \
- snprintf(_buff, sizeof(_buff), fmt, ## __VA_ARGS__);\
- strncat(dest, _buff, sizeof(dest) - strlen(dest) - 1); \
-} while (0)
-
-static __inline__ uint8_t
-sct(struct cmap *cm, uint8_t s, uint8_t c, uint8_t t) {
- lc_info_t *lc = cm->linfo;
- uint8_t i;
-
- for (i = 0; i < cm->num_cores; i++, lc++)
- if (lc->sid == s && lc->cid == c && lc->tid == t)
- return lc->lid;
-
- return 0;
-}
diff --git a/lib/lua/rte_lua_vec.h b/lib/lua/rte_lua_vec.h
index b329f1a..8eaf83c 100644
--- a/lib/lua/rte_lua_vec.h
+++ b/lib/lua/rte_lua_vec.h
@@ -4,7 +4,7 @@
/* Created 2018 by Keith Wiles @ intel.com */
#ifndef _RTE_LUA_VEC_H_
-#define _RTE_LUAVEC_H_
+#define _RTE_LUA_VEC_H_
#include
#include
diff --git a/lib/vec/rte_vec.h b/lib/vec/rte_vec.h
index b465525..77dc706 100644
--- a/lib/vec/rte_vec.h
+++ b/lib/vec/rte_vec.h
@@ -99,49 +99,49 @@ rte_vec_clr_dont_free(struct rte_vec *vec)
vec->flags &= ~VEC_DONT_FREE_FLAG;
}
-static inline __rte_always_inline uint16_t
+static __rte_always_inline uint16_t
rte_vec_len(struct rte_vec *v)
{
return v->len;
}
-static inline __rte_always_inline int
+static __rte_always_inline int
rte_vec_byte_len(struct rte_vec *v)
{
return v->len * sizeof(void *);
}
-static inline __rte_always_inline void
+static __rte_always_inline void
rte_vec_set_len(struct rte_vec *v, uint16_t n)
{
v->len = n;
}
-static inline __rte_always_inline void
+static __rte_always_inline void
rte_vec_set_max_len(struct rte_vec *v, uint16_t n)
{
v->tlen = n;
}
-static inline __rte_always_inline void
+static __rte_always_inline void
rte_vec_dec_len(struct rte_vec *v)
{
v->len--;
}
-static inline __rte_always_inline void
+static __rte_always_inline void
rte_vec_inc_len(struct rte_vec *v)
{
v->len++;
}
-static inline __rte_always_inline uint16_t
+static __rte_always_inline uint16_t
rte_vec_max_len(struct rte_vec *v)
{
return v->tlen;
}
-static inline __rte_always_inline struct rte_mbuf **
+static __rte_always_inline struct rte_mbuf **
rte_vec_list(struct rte_vec *v)
{
return (struct rte_mbuf * *)&v->list[0];
@@ -151,7 +151,7 @@ rte_vec_list(struct rte_vec *v)
#pragma GCC diagnostic ignored "-Warray-bounds"
/* return -1 on full and index value if OK */
-static inline __rte_always_inline int
+static __rte_always_inline int
rte_vec_add1(struct rte_vec *vec, void *val)
{
if (vec->len >= vec->tlen)
@@ -161,7 +161,7 @@ rte_vec_add1(struct rte_vec *vec, void *val)
return vec->len - 1;
}
-static inline __rte_always_inline int
+static __rte_always_inline int
rte_vec_add_at_index(struct rte_vec *vec, void *val, uint16_t n)
{
if (vec->len >= vec->tlen)
@@ -171,7 +171,7 @@ rte_vec_add_at_index(struct rte_vec *vec, void *val,
uint16_t n)
return 0;
}
-static inline __rte_always_inline void *
+static __rte_always_inline void *
rte_vec_at_index(struct rte_vec *vec, uint16_t n)
{
if (n >= vec->len)
@@ -179,32 +179,32 @@ rte_vec_at_index(struct rte_vec *vec, uint16_t n)
return vec->list[n];
}
-st
Re: [dpdk-dev] [PATCH] pktgen: fix clang compiler errors / warnings
> On Jun 18, 2019, at 3:58 PM, Adam Drescher wrote:
>
> Clang complains about the following issues:
> (1) unclear meaning of =- in assignment of pktgen.verbose
> (2) unused function sct(), which is also defined in cli_cmds.c
> (3) typo in include guard for rte_lua_vec.h
> (4) duplicate inline due to expansion of __rte_always_inline
>
> Tested the patch on both clang and gcc. Not sure how strong
> pktgen's backwards compatability guarantees are, but
> __rte_always_inline is good back to DPDK v18.02 at least.
Thanks, I will review the patch and commit or reply with comments.
>
> Signed-off-by: Adam Drescher
> ---
> app/pktgen-main.c | 2 +-
> lib/cli/cli_cmap.c| 23 ---
> lib/lua/rte_lua_vec.h | 2 +-
> lib/vec/rte_vec.h | 32
> 4 files changed, 18 insertions(+), 41 deletions(-)
>
> diff --git a/app/pktgen-main.c b/app/pktgen-main.c
> index 6b9d90e..e87e2f5 100644
> --- a/app/pktgen-main.c
> +++ b/app/pktgen-main.c
> @@ -252,7 +252,7 @@ pktgen_parse_args(int argc, char **argv)
> pktgen.flags|= ENABLE_THEME_FLAG;
> break;
> case 'v':
> - pktgen.verbose =- 1;
> + pktgen.verbose = 1;
> break;
>
> case 'h': /* print out the help message */
> diff --git a/lib/cli/cli_cmap.c b/lib/cli/cli_cmap.c
> index 66638b7..1c932d6 100644
> --- a/lib/cli/cli_cmap.c
> +++ b/lib/cli/cli_cmap.c
> @@ -285,26 +285,3 @@ cmap_free(struct cmap *cmap)
> {
> free(cmap);
> }
> -
> -/* Helper for building log strings.
> - * The macro takes an existing string, a printf-like format string and
> optional
> - * arguments. It formats the string and appends it to the existing string,
> - * while avoiding possible buffer overruns.
> - */
> -#define strncatf(dest, fmt, ...) do {
> \
> - char _buff[1024]; \
> - snprintf(_buff, sizeof(_buff), fmt, ## __VA_ARGS__);\
> - strncat(dest, _buff, sizeof(dest) - strlen(dest) - 1); \
> -} while (0)
> -
> -static __inline__ uint8_t
> -sct(struct cmap *cm, uint8_t s, uint8_t c, uint8_t t) {
> - lc_info_t *lc = cm->linfo;
> - uint8_t i;
> -
> - for (i = 0; i < cm->num_cores; i++, lc++)
> - if (lc->sid == s && lc->cid == c && lc->tid == t)
> - return lc->lid;
> -
> - return 0;
> -}
> diff --git a/lib/lua/rte_lua_vec.h b/lib/lua/rte_lua_vec.h
> index b329f1a..8eaf83c 100644
> --- a/lib/lua/rte_lua_vec.h
> +++ b/lib/lua/rte_lua_vec.h
> @@ -4,7 +4,7 @@
> /* Created 2018 by Keith Wiles @ intel.com */
>
> #ifndef _RTE_LUA_VEC_H_
> -#define _RTE_LUAVEC_H_
> +#define _RTE_LUA_VEC_H_
>
> #include
> #include
> diff --git a/lib/vec/rte_vec.h b/lib/vec/rte_vec.h
> index b465525..77dc706 100644
> --- a/lib/vec/rte_vec.h
> +++ b/lib/vec/rte_vec.h
> @@ -99,49 +99,49 @@ rte_vec_clr_dont_free(struct rte_vec *vec)
> vec->flags &= ~VEC_DONT_FREE_FLAG;
> }
>
> -static inline __rte_always_inline uint16_t
> +static __rte_always_inline uint16_t
> rte_vec_len(struct rte_vec *v)
> {
> return v->len;
> }
>
> -static inline __rte_always_inline int
> +static __rte_always_inline int
> rte_vec_byte_len(struct rte_vec *v)
> {
> return v->len * sizeof(void *);
> }
>
> -static inline __rte_always_inline void
> +static __rte_always_inline void
> rte_vec_set_len(struct rte_vec *v, uint16_t n)
> {
> v->len = n;
> }
>
> -static inline __rte_always_inline void
> +static __rte_always_inline void
> rte_vec_set_max_len(struct rte_vec *v, uint16_t n)
> {
> v->tlen = n;
> }
>
> -static inline __rte_always_inline void
> +static __rte_always_inline void
> rte_vec_dec_len(struct rte_vec *v)
> {
> v->len--;
> }
>
> -static inline __rte_always_inline void
> +static __rte_always_inline void
> rte_vec_inc_len(struct rte_vec *v)
> {
> v->len++;
> }
>
> -static inline __rte_always_inline uint16_t
> +static __rte_always_inline uint16_t
> rte_vec_max_len(struct rte_vec *v)
> {
> return v->tlen;
> }
>
> -static inline __rte_always_inline struct rte_mbuf **
> +static __rte_always_inline struct rte_mbuf **
> rte_vec_list(struct rte_vec *v)
> {
> return (struct rte_mbuf * *)&v->list[0];
> @@ -151,7 +151,7 @@ rte_vec_list(struct rte_vec *v)
> #pragma GCC diagnostic ignored "-Warray-bounds"
>
> /* return -1 on full and index value if OK */
> -static inline __rte_always_inline int
> +static __rte_always_inline int
> rte_vec_add1(struct rte_vec *vec, void *val)
> {
> if (vec->len >= vec->tlen)
> @@ -161,7 +161,7 @@ rte_vec_add1(struct rte_vec *vec, void *val)
> return vec->len - 1;
> }
>
> -static inline __rte_always_inline int
> +static __rte_always_inline int
> rte_vec_add_at_index(struct rte_vec *vec, void *val, uint16_t n)
> {
> if (vec->len >= vec->tlen)
> @@ -171,7 +171,7 @@ rte_vec_add_at_ind
Re: [dpdk-dev] [PATCH v2 1/3] net/ice: enable switch filter
Hi, xiaolong
> -Original Message-
> From: Ye, Xiaolong
> Sent: Tuesday, June 18, 2019 5:41 PM
> To: Yang, Qiming
> Cc: dev@dpdk.org; Zhao1, Wei
> Subject: Re: [dpdk-dev] [PATCH v2 1/3] net/ice: enable switch filter
>
> On 06/12, Qiming Yang wrote:
> >From: wei zhao
> >
> >The patch enables the backend of rte_flow. It transfers rte_flow_xxx to
> >device specific data structure and configures packet process engine's
> >binary classifier
> >(switch) properly.
> >
> >Signed-off-by: Wei Zhao
> >---
> > drivers/net/ice/Makefile| 1 +
> > drivers/net/ice/ice_ethdev.h| 6 +
> > drivers/net/ice/ice_switch_filter.c | 502
> >
> > drivers/net/ice/ice_switch_filter.h | 28 ++
> > drivers/net/ice/meson.build | 3 +-
> > 5 files changed, 539 insertions(+), 1 deletion(-) create mode 100644
> >drivers/net/ice/ice_switch_filter.c
> > create mode 100644 drivers/net/ice/ice_switch_filter.h
> >
> >diff --git a/drivers/net/ice/Makefile b/drivers/net/ice/Makefile index
> >0e5c55e..b10d826 100644
> >--- a/drivers/net/ice/Makefile
> >+++ b/drivers/net/ice/Makefile
> >@@ -60,6 +60,7 @@ ifeq ($(CONFIG_RTE_ARCH_X86), y)
> > SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx_vec_sse.c endif
> >
> >+SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_switch_filter.c
> > ifeq ($(findstring
> RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2)
> > CC_AVX2_SUPPORT=1
> > else
> >diff --git a/drivers/net/ice/ice_ethdev.h
> >b/drivers/net/ice/ice_ethdev.h index 1385afa..67a358a 100644
> >--- a/drivers/net/ice/ice_ethdev.h
> >+++ b/drivers/net/ice/ice_ethdev.h
> >@@ -234,6 +234,12 @@ struct ice_vsi {
> > bool offset_loaded;
> > };
> >
> >+/* Struct to store flow created. */
> >+struct rte_flow {
> >+TAILQ_ENTRY(rte_flow) node;
> >+void *rule;
>
> Minor nit: An indentation is needed before void.
Ok, Update in v3
>
> Thanks,
> Xiaolong
Re: [dpdk-dev] [PATCH v2 4/4] net/ipn3ke: implementation of statistics
Hi, Ferruh
I will fix this in next version.
Thanks
-Original Message-
From: Yigit, Ferruh
Sent: Tuesday, June 18, 2019 8:40 PM
To: Pei, Andy ; dev@dpdk.org
Cc: Xu, Rosen
Subject: Re: [dpdk-dev] [PATCH v2 4/4] net/ipn3ke: implementation of statistics
On 6/18/2019 12:59 PM, Ferruh Yigit wrote:
> On 6/11/2019 10:48 AM, Andy Pei wrote:
>> This patch implemente statistics read and reset function for ipn3ke.
>>
>> Fixes: 70d6b7f550f4 ("net/ipn3ke: add representor")
>> Cc: rosen...@intel.com
>>
>> Signed-off-by: Andy Pei
>
> <...>
>
>> +#define IPN3KE_RPST_TXQ_PRIO_XSTATS_CNT
>> (sizeof(ipn3ke_rpst_txq_prio_strings) \
>> +/ sizeof(ipn3ke_rpst_txq_prio_strings[0]))
>> +
>> +static uint32_t
>> +ipn3ke_rpst_xstats_calc_num(void)
>> +{
>> +return IPN3KE_RPST_ETH_XSTATS_CNT
>> ++ IPN3KE_RPST_HW_PORT_XSTATS_CNT
>> ++ (IPN3KE_RPST_RXQ_PRIO_XSTATS_CNT
>> +* IPN3KE_RPST_PRIO_XSTATS_CNT)
>> ++ (IPN3KE_RPST_TXQ_PRIO_XSTATS_CNT
>> +* IPN3KE_RPST_PRIO_XSTATS_CNT);
>> +}
>> +
>> +#if 0
>
> Please don't add "#if 0" to the code, if required you can delete the
> code, same is valid for below one too.
>
Also getting following build error in patch by patch build [1], please remind
that each individual patch should build successfully.
[1]
.../dpdk/drivers/net/ipn3ke/ipn3ke_ethdev.c: In function ‘ipn3ke_hw_init’:
.../dpdk/drivers/net/ipn3ke/ipn3ke_ethdev.c:248:4: error: implicit declaration
of function ‘ipn3ke_xmac_tx_clr_stcs’; did you mean
‘ipn3ke_xmac_tx_clr_25G_stcs’? [-Werror=implicit-function-declaration]
248 |ipn3ke_xmac_tx_clr_stcs(hw, i, 1);
|^~~
|ipn3ke_xmac_tx_clr_25G_stcs
[dpdk-dev] [PATCH v5 1/2] net/mlx5: fix crashing testpmd on null drv opts
mlx5 implements mlx5_flow_null_drv_ops to be used when a specific
flow typei/driver is not available or invalid.
This routines return error without modifying the rte_flow_error
parameter passed to them which causes testpmd, for example, to crash.
This commit addresses the issue by modifying the rte_flow_error
parameter in theses routines.
Fixes: 0c76d1c9a18d ("net/mlx5: add abstraction for multiple flow drivers")
Fixes: 684dafe795d0 ("net/mlx5: add flow query abstraction interface")
Cc: sta...@dpdk.org
Signed-off-by: Moti Haimovsky
---
v4,v5:
* Resend the message from a server not inserting DOS line-termination
symbols.
v3:
* Modified patch subject.
v2:
* Fixed checkpatch warnings.
---
drivers/net/mlx5/mlx5_flow.c | 29 +++--
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 9887018..e5a8e33 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1694,19 +1694,20 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static struct mlx5_flow *
flow_null_prepare(const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
+ rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
return NULL;
}
@@ -1716,19 +1717,19 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
const struct rte_flow_attr *attr __rte_unused,
const struct rte_flow_item items[] __rte_unused,
const struct rte_flow_action actions[] __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static int
flow_null_apply(struct rte_eth_dev *dev __rte_unused,
struct rte_flow *flow __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
static void
@@ -1748,10 +1749,10 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev
*dev, int32_t priority,
struct rte_flow *flow __rte_unused,
const struct rte_flow_action *actions __rte_unused,
void *data __rte_unused,
- struct rte_flow_error *error __rte_unused)
+ struct rte_flow_error *error)
{
- rte_errno = ENOTSUP;
- return -rte_errno;
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
}
/* Void driver to protect from null pointer reference. */
--
1.8.3.1
[dpdk-dev] [PATCH v5 0/2] net/mlx5: remove TCF support from PMD
Today, it is possible to offload an interface flow rules to the hardware using DPDK flow commands. With mlx5 it is also possible to offload a limited set of flow rules to the mlxsw (or E-switch) using the same DPDK flow commands. A 'transfer' attribute was added to the flow rule creation command in order to distinguish between configuring port flows and E-switch flows. The commands destined for the E-switch are transposed to TC-flower rules and are send, as Netlink messages, to the mlx5 driver, or more precisely to the netdev which represent the mlxsw port. With the addition to the PMD of E-switch configuration via DR (direct verbs rules) it is now possible to configure the E-switch using these commands instead of using TC-Flower messages. Doing so will allow us to remove the TCF support and the dependency of libmnl from the PMD. The purpose of this RFC is to propose configuring the E-switch flow filtering using DR, to remove the TCF support from the PMD and to remove the dependency of the PMD in libmnl. As for today VLAN insertion or removal is not supported in DR, this support will be added in separate commits. Moti Haimovsky (2): net/mlx5: fix crashing testpmd on null drv opts net/mlx5: remove TCF support from PMD doc/build-sdk-meson.txt |2 +- doc/guides/nics/mlx5.rst | 19 - doc/guides/platform/bluefield.rst |4 - drivers/net/mlx5/Makefile | 303 -- drivers/net/mlx5/meson.build | 123 +- drivers/net/mlx5/mlx5.c | 32 - drivers/net/mlx5/mlx5.h |3 - drivers/net/mlx5/mlx5_flow.c | 43 +- drivers/net/mlx5/mlx5_flow.h | 25 - drivers/net/mlx5/mlx5_flow_tcf.c | 6382 - mk/rte.app.mk |2 +- 11 files changed, 24 insertions(+), 6914 deletions(-) delete mode 100644 drivers/net/mlx5/mlx5_flow_tcf.c -- 1.8.3.1
[dpdk-dev] [PATCH v2 2/3] lib/lpm: memory orderings to avoid race conditions for v20
When a tbl8 group is getting attached to a tbl24 entry, lookup
might fail even though the entry is configured in the table.
For ex: consider a LPM table configured with 10.10.10.1/24.
When a new entry 10.10.10.32/28 is being added, a new tbl8
group is allocated and tbl24 entry is changed to point to
the tbl8 group. If the tbl24 entry is written without the tbl8
group entries updated, a lookup on 10.10.10.9 will return
failure.
Correct memory orderings are required to ensure that the
store to tbl24 does not happen before the stores to tbl8 group
entries complete.
Suggested-by: Honnappa Nagarahalli
Signed-off-by: Ruifeng Wang
Reviewed-by: Honnappa Nagarahalli
Reviewed-by: Gavin Hu
---
v2: fixed clang building issue by supplying alignment attribute.
v1: initail version
lib/librte_lpm/rte_lpm.c | 31 ---
lib/librte_lpm/rte_lpm.h | 4 ++--
2 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c
index 6ec450a08..0addff5d4 100644
--- a/lib/librte_lpm/rte_lpm.c
+++ b/lib/librte_lpm/rte_lpm.c
@@ -737,7 +737,8 @@ add_depth_small_v20(struct rte_lpm_v20 *lpm, uint32_t ip,
uint8_t depth,
/* Setting tbl24 entry in one go to avoid race
* conditions
*/
- lpm->tbl24[i] = new_tbl24_entry;
+ __atomic_store(&lpm->tbl24[i], &new_tbl24_entry,
+ __ATOMIC_RELEASE);
continue;
}
@@ -892,7 +893,8 @@ add_depth_big_v20(struct rte_lpm_v20 *lpm, uint32_t
ip_masked, uint8_t depth,
.depth = 0,
};
- lpm->tbl24[tbl24_index] = new_tbl24_entry;
+ __atomic_store(&lpm->tbl24[tbl24_index], &new_tbl24_entry,
+ __ATOMIC_RELEASE);
} /* If valid entry but not extended calculate the index into Table8. */
else if (lpm->tbl24[tbl24_index].valid_group == 0) {
@@ -938,7 +940,8 @@ add_depth_big_v20(struct rte_lpm_v20 *lpm, uint32_t
ip_masked, uint8_t depth,
.depth = 0,
};
- lpm->tbl24[tbl24_index] = new_tbl24_entry;
+ __atomic_store(&lpm->tbl24[tbl24_index], &new_tbl24_entry,
+ __ATOMIC_RELEASE);
} else { /*
* If it is valid, extended entry calculate the index into tbl8.
@@ -1320,7 +1323,14 @@ delete_depth_small_v20(struct rte_lpm_v20 *lpm, uint32_t
ip_masked,
if (lpm->tbl24[i].valid_group == 0 &&
lpm->tbl24[i].depth <= depth) {
- lpm->tbl24[i].valid = INVALID;
+ struct rte_lpm_tbl_entry_v20 zero_tbl_entry = {
+ .valid = INVALID,
+ .depth = 0,
+ .valid_group = 0,
+ };
+ zero_tbl_entry.next_hop = 0;
+ __atomic_store(&lpm->tbl24[i], &zero_tbl_entry,
+ __ATOMIC_RELEASE);
} else if (lpm->tbl24[i].valid_group == 1) {
/*
* If TBL24 entry is extended, then there has
@@ -1365,7 +1375,8 @@ delete_depth_small_v20(struct rte_lpm_v20 *lpm, uint32_t
ip_masked,
if (lpm->tbl24[i].valid_group == 0 &&
lpm->tbl24[i].depth <= depth) {
- lpm->tbl24[i] = new_tbl24_entry;
+ __atomic_store(&lpm->tbl24[i], &new_tbl24_entry,
+ __ATOMIC_RELEASE);
} else if (lpm->tbl24[i].valid_group == 1) {
/*
* If TBL24 entry is extended, then there has
@@ -1647,8 +1658,11 @@ delete_depth_big_v20(struct rte_lpm_v20 *lpm, uint32_t
ip_masked,
tbl8_recycle_index = tbl8_recycle_check_v20(lpm->tbl8,
tbl8_group_start);
if (tbl8_recycle_index == -EINVAL) {
- /* Set tbl24 before freeing tbl8 to avoid race condition. */
+ /* Set tbl24 before freeing tbl8 to avoid race condition.
+* Prevent the free of the tbl8 group from hoisting.
+*/
lpm->tbl24[tbl24_index].valid = 0;
+ __atomic_thread_fence(__ATOMIC_RELEASE);
tbl8_free_v20(lpm->tbl8, tbl8_group_start);
} else if (tbl8_recycle_index > -1) {
/* Update tbl24 entry. */
@@ -1659,8 +1673,11 @@ delete_depth_big_v20(struct rte_lpm_v20 *lpm, uint32_t
ip_masked,
.depth = lpm->tbl8[tbl8_recycle_ind
[dpdk-dev] [PATCH v2 1/3] lib/lpm: memory orderings to avoid race conditions for v1604
When a tbl8 group is getting attached to a tbl24 entry, lookup
might fail even though the entry is configured in the table.
For ex: consider a LPM table configured with 10.10.10.1/24.
When a new entry 10.10.10.32/28 is being added, a new tbl8
group is allocated and tbl24 entry is changed to point to
the tbl8 group. If the tbl24 entry is written without the tbl8
group entries updated, a lookup on 10.10.10.9 will return
failure.
Correct memory orderings are required to ensure that the
store to tbl24 does not happen before the stores to tbl8 group
entries complete.
The orderings have impact on LPM performance test.
On Arm A72 platform, delete operation has 2.7% degradation, while
add / lookup has no notable performance change.
On x86 E5 platform, add operation has 4.3% degradation, delete
operation has 2.2% - 10.2% degradation, lookup has no performance
change.
Signed-off-by: Honnappa Nagarahalli
Signed-off-by: Ruifeng Wang
---
v2: no changes
v1: initial version
lib/librte_lpm/rte_lpm.c | 32 +---
lib/librte_lpm/rte_lpm.h | 4
2 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c
index 6b7b28a2e..6ec450a08 100644
--- a/lib/librte_lpm/rte_lpm.c
+++ b/lib/librte_lpm/rte_lpm.c
@@ -806,7 +806,8 @@ add_depth_small_v1604(struct rte_lpm *lpm, uint32_t ip,
uint8_t depth,
/* Setting tbl24 entry in one go to avoid race
* conditions
*/
- lpm->tbl24[i] = new_tbl24_entry;
+ __atomic_store(&lpm->tbl24[i], &new_tbl24_entry,
+ __ATOMIC_RELEASE);
continue;
}
@@ -1017,7 +1018,11 @@ add_depth_big_v1604(struct rte_lpm *lpm, uint32_t
ip_masked, uint8_t depth,
.depth = 0,
};
- lpm->tbl24[tbl24_index] = new_tbl24_entry;
+ /* The tbl24 entry must be written only after the
+* tbl8 entries are written.
+*/
+ __atomic_store(&lpm->tbl24[tbl24_index], &new_tbl24_entry,
+ __ATOMIC_RELEASE);
} /* If valid entry but not extended calculate the index into Table8. */
else if (lpm->tbl24[tbl24_index].valid_group == 0) {
@@ -1063,7 +1068,11 @@ add_depth_big_v1604(struct rte_lpm *lpm, uint32_t
ip_masked, uint8_t depth,
.depth = 0,
};
- lpm->tbl24[tbl24_index] = new_tbl24_entry;
+ /* The tbl24 entry must be written only after the
+* tbl8 entries are written.
+*/
+ __atomic_store(&lpm->tbl24[tbl24_index], &new_tbl24_entry,
+ __ATOMIC_RELEASE);
} else { /*
* If it is valid, extended entry calculate the index into tbl8.
@@ -1391,6 +1400,7 @@ delete_depth_small_v1604(struct rte_lpm *lpm, uint32_t
ip_masked,
/* Calculate the range and index into Table24. */
tbl24_range = depth_to_range(depth);
tbl24_index = (ip_masked >> 8);
+ struct rte_lpm_tbl_entry zero_tbl24_entry = {0};
/*
* Firstly check the sub_rule_index. A -1 indicates no replacement rule
@@ -1405,7 +1415,8 @@ delete_depth_small_v1604(struct rte_lpm *lpm, uint32_t
ip_masked,
if (lpm->tbl24[i].valid_group == 0 &&
lpm->tbl24[i].depth <= depth) {
- lpm->tbl24[i].valid = INVALID;
+ __atomic_store(&lpm->tbl24[i],
+ &zero_tbl24_entry, __ATOMIC_RELEASE);
} else if (lpm->tbl24[i].valid_group == 1) {
/*
* If TBL24 entry is extended, then there has
@@ -1450,7 +1461,8 @@ delete_depth_small_v1604(struct rte_lpm *lpm, uint32_t
ip_masked,
if (lpm->tbl24[i].valid_group == 0 &&
lpm->tbl24[i].depth <= depth) {
- lpm->tbl24[i] = new_tbl24_entry;
+ __atomic_store(&lpm->tbl24[i], &new_tbl24_entry,
+ __ATOMIC_RELEASE);
} else if (lpm->tbl24[i].valid_group == 1) {
/*
* If TBL24 entry is extended, then there has
@@ -1713,8 +1725,11 @@ delete_depth_big_v1604(struct rte_lpm *lpm, uint32_t
ip_masked,
tbl8_recycle_index = tbl8_recycle_check_v1604(lpm->tbl8,
tbl8_group_start);
if (tbl8_recycle_index == -EINVAL) {
- /* Set tbl24 before freeing tbl8 to avoid race condition. */
+ /* Set tbl24 before freeing tbl8 to avoid race condition.
+* Prevent the free of the tbl8
[dpdk-dev] [PATCH v2 3/3] lib/lpm: remove unnecessary inline
Tests showed that the 'inline' keyword caused performance drop
on some x86 platforms after the memory ordering patches applied.
By removing the 'inline' keyword, the performance was recovered
as before on x86 and no impact to arm64 platforms.
Suggested-by: Medvedkin Vladimir
Signed-off-by: Ruifeng Wang
Reviewed-by: Gavin Hu
---
v2: initail version to recover rte_lpm_add() performance
lib/librte_lpm/rte_lpm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c
index 0addff5d4..c97b602e6 100644
--- a/lib/librte_lpm/rte_lpm.c
+++ b/lib/librte_lpm/rte_lpm.c
@@ -778,7 +778,7 @@ add_depth_small_v20(struct rte_lpm_v20 *lpm, uint32_t ip,
uint8_t depth,
return 0;
}
-static inline int32_t
+static int32_t
add_depth_small_v1604(struct rte_lpm *lpm, uint32_t ip, uint8_t depth,
uint32_t next_hop)
{
@@ -975,7 +975,7 @@ add_depth_big_v20(struct rte_lpm_v20 *lpm, uint32_t
ip_masked, uint8_t depth,
return 0;
}
-static inline int32_t
+static int32_t
add_depth_big_v1604(struct rte_lpm *lpm, uint32_t ip_masked, uint8_t depth,
uint32_t next_hop)
{
--
2.17.1
[dpdk-dev] [PATCH] vhost: fix add a missing include
Add a missing include with the defines for vhost-user driver features.
Fixes: 5fbb3941da9f ("vhost: introduce driver features related APIs")
Cc: sta...@dpdk.org
Signed-off-by: Noa Ezra
Reviewed-by: Maxime Coquelin
Reviewed-by: Matan Azrad
---
lib/librte_vhost/rte_vhost.h | 1 +
1 file changed, 1 insertion(+)
mode change 100644 => 100755 lib/librte_vhost/rte_vhost.h
diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
old mode 100644
new mode 100755
index 0226b3e..338e47c
--- a/lib/librte_vhost/rte_vhost.h
+++ b/lib/librte_vhost/rte_vhost.h
@@ -23,6 +23,7 @@
/* These are not C++-aware. */
#include
#include
+#include
#define RTE_VHOST_USER_CLIENT (1ULL << 0)
#define RTE_VHOST_USER_NO_RECONNECT(1ULL << 1)
--
1.8.3.1
[dpdk-dev] [PATCH 0/2] support tso and mrg-rxbuf disabling
Add support for disabling TSO and mrg-rxbuf in vhost. Noa Ezra (2): net/vhost: support TSO disabling net/vhost: support mrg-rxbuf disabling doc/guides/nics/vhost.rst | 10 + drivers/net/vhost/rte_eth_vhost.c | 45 --- 2 files changed, 52 insertions(+), 3 deletions(-) -- 1.8.3.1
[dpdk-dev] [PATCH 1/2] net/vhost: support TSO disabling
TSO (TCP Segmentation Offload) is enabled by default on vhost.
Add the ability to disable TSO on vhost.
The user should also disable the feature on the virtual machine's xml.
Signed-off-by: Noa Ezra
Reviewed-by: Matan Azrad
---
doc/guides/nics/vhost.rst | 5 +
drivers/net/vhost/rte_eth_vhost.c | 30 +++---
2 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/doc/guides/nics/vhost.rst b/doc/guides/nics/vhost.rst
index 23f2e87..8cfda4d 100644
--- a/doc/guides/nics/vhost.rst
+++ b/doc/guides/nics/vhost.rst
@@ -76,6 +76,11 @@ The user can specify below arguments in `--vdev` option.
It is used to enable postcopy live-migration support in vhost library.
(Default: 0 (disabled))
+#. ``tso``:
+
+It is used to disable tso support in vhost library.
+(Default: 1 (enabled))
+
Vhost PMD event handling
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index b2cda04..a38c235 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -31,6 +31,7 @@
#define ETH_VHOST_DEQUEUE_ZERO_COPY"dequeue-zero-copy"
#define ETH_VHOST_IOMMU_SUPPORT"iommu-support"
#define ETH_VHOST_POSTCOPY_SUPPORT "postcopy-support"
+#define ETH_VHOST_VIRTIO_NET_F_HOST_TSO "tso"
#define VHOST_MAX_PKT_BURST 32
static const char *valid_arguments[] = {
@@ -40,6 +41,7 @@
ETH_VHOST_DEQUEUE_ZERO_COPY,
ETH_VHOST_IOMMU_SUPPORT,
ETH_VHOST_POSTCOPY_SUPPORT,
+ ETH_VHOST_VIRTIO_NET_F_HOST_TSO,
NULL
};
@@ -1200,7 +1202,8 @@ struct vhost_xstats_name_off {
static int
eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,
- int16_t queues, const unsigned int numa_node, uint64_t flags)
+ int16_t queues, const unsigned int numa_node, uint64_t flags,
+ uint64_t disable_flags)
{
const char *name = rte_vdev_device_name(dev);
struct rte_eth_dev_data *data;
@@ -1272,6 +1275,11 @@ struct vhost_xstats_name_off {
if (rte_vhost_driver_register(iface_name, flags))
goto error;
+ if (disable_flags) {
+ if (rte_vhost_driver_disable_features(iface_name,
disable_flags))
+ goto error;
+ }
+
if (rte_vhost_driver_callback_register(iface_name, &vhost_ops) < 0) {
VHOST_LOG(ERR, "Can't register callbacks\n");
goto error;
@@ -1334,10 +1342,12 @@ struct vhost_xstats_name_off {
char *iface_name;
uint16_t queues;
uint64_t flags = 0;
+ uint64_t disable_flags = 0;
int client_mode = 0;
int dequeue_zero_copy = 0;
int iommu_support = 0;
int postcopy_support = 0;
+ int tso = 1;
struct rte_eth_dev *eth_dev;
const char *name = rte_vdev_device_name(dev);
@@ -1419,11 +1429,24 @@ struct vhost_xstats_name_off {
flags |= RTE_VHOST_USER_POSTCOPY_SUPPORT;
}
+ if (rte_kvargs_count(kvlist, ETH_VHOST_VIRTIO_NET_F_HOST_TSO) == 1) {
+ ret = rte_kvargs_process(kvlist,
+ ETH_VHOST_VIRTIO_NET_F_HOST_TSO,
+ &open_int, &tso);
+ if (ret < 0)
+ goto out_free;
+
+ if (tso == 0) {
+ disable_flags |= (1ULL << VIRTIO_NET_F_HOST_TSO4);
+ disable_flags |= (1ULL << VIRTIO_NET_F_HOST_TSO6);
+ }
+ }
+
if (dev->device.numa_node == SOCKET_ID_ANY)
dev->device.numa_node = rte_socket_id();
eth_dev_vhost_create(dev, iface_name, queues, dev->device.numa_node,
- flags);
+ flags, disable_flags);
out_free:
rte_kvargs_free(kvlist);
@@ -1470,7 +1493,8 @@ struct vhost_xstats_name_off {
"client=<0|1> "
"dequeue-zero-copy=<0|1> "
"iommu-support=<0|1> "
- "postcopy-support=<0|1>");
+ "postcopy-support=<0|1> "
+ "tso=<0|1>");
RTE_INIT(vhost_init_log)
{
--
1.8.3.1
[dpdk-dev] [PATCH 2/2] net/vhost: support mrg-rxbuf disabling
Rx mergeable buffers is a virtio feature that allows chaining of
multiple virtio descriptors to handle large packet size.
This behavior is supported and enabled by default, however in case
the user knows that rx mergeable buffers are not needed, he can disable
the feature.
The user should also set mrg_rxbuf=off in virtual machine's xml.
Signed-off-by: Noa Ezra
Reviewed-by: Matan Azrad
---
doc/guides/nics/vhost.rst | 5 +
drivers/net/vhost/rte_eth_vhost.c | 17 -
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/doc/guides/nics/vhost.rst b/doc/guides/nics/vhost.rst
index 8cfda4d..2a455b5 100644
--- a/doc/guides/nics/vhost.rst
+++ b/doc/guides/nics/vhost.rst
@@ -81,6 +81,11 @@ The user can specify below arguments in `--vdev` option.
It is used to disable tso support in vhost library.
(Default: 1 (enabled))
+#. ``mrg-rxbuf``:
+
+It is used to disable mrg rxbuf support in vhost library.
+(Default: 1 (enabled))
+
Vhost PMD event handling
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index a38c235..9a54020 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -32,6 +32,7 @@
#define ETH_VHOST_IOMMU_SUPPORT"iommu-support"
#define ETH_VHOST_POSTCOPY_SUPPORT "postcopy-support"
#define ETH_VHOST_VIRTIO_NET_F_HOST_TSO "tso"
+#define ETH_VHOST_VIRTIO_NET_F_MRG_RXBUF "mrg-rxbuf"
#define VHOST_MAX_PKT_BURST 32
static const char *valid_arguments[] = {
@@ -42,6 +43,7 @@
ETH_VHOST_IOMMU_SUPPORT,
ETH_VHOST_POSTCOPY_SUPPORT,
ETH_VHOST_VIRTIO_NET_F_HOST_TSO,
+ ETH_VHOST_VIRTIO_NET_F_MRG_RXBUF,
NULL
};
@@ -1348,6 +1350,7 @@ struct vhost_xstats_name_off {
int iommu_support = 0;
int postcopy_support = 0;
int tso = 1;
+ int mrg_rxbuf = 1;
struct rte_eth_dev *eth_dev;
const char *name = rte_vdev_device_name(dev);
@@ -1442,6 +1445,17 @@ struct vhost_xstats_name_off {
}
}
+ if (rte_kvargs_count(kvlist, ETH_VHOST_VIRTIO_NET_F_MRG_RXBUF) == 1) {
+ ret = rte_kvargs_process(kvlist,
+ ETH_VHOST_VIRTIO_NET_F_MRG_RXBUF,
+ &open_int, &mrg_rxbuf);
+ if (ret < 0)
+ goto out_free;
+
+ if (mrg_rxbuf == 0)
+ disable_flags |= (1ULL << VIRTIO_NET_F_MRG_RXBUF);
+ }
+
if (dev->device.numa_node == SOCKET_ID_ANY)
dev->device.numa_node = rte_socket_id();
@@ -1494,7 +1508,8 @@ struct vhost_xstats_name_off {
"dequeue-zero-copy=<0|1> "
"iommu-support=<0|1> "
"postcopy-support=<0|1> "
- "tso=<0|1>");
+ "tso=<0|1> "
+ "mrg-rxbuf=<0|1>");
RTE_INIT(vhost_init_log)
{
--
1.8.3.1
[dpdk-dev] [PATCH] net/vhost: add an API for get queue status
Add an API that returns queue status for requested queue in the port.
The queue's status can be changed before the user has signed for the
queue state event interrupt. In this case the user can't know the
current queue's status. This API returns the current status.
Signed-off-by: Noa Ezra
Reviewed-by: Matan Azrad
---
drivers/net/vhost/rte_eth_vhost.c | 47 +
drivers/net/vhost/rte_eth_vhost.h | 18 +++
drivers/net/vhost/rte_pmd_vhost_version.map | 6
3 files changed, 71 insertions(+)
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index 9a54020..cad1e5c 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -855,6 +855,7 @@ struct vhost_xstats_name_off {
/* won't be NULL */
state = vring_states[eth_dev->data->port_id];
rte_spinlock_lock(&state->lock);
+
state->cur[vring] = enable;
state->max_vring = RTE_MAX(vring, state->max_vring);
rte_spinlock_unlock(&state->lock);
@@ -874,6 +875,52 @@ struct vhost_xstats_name_off {
};
int
+rte_eth_vhost_get_queue_status(uint16_t port_id, bool rx, uint16_t queue_id,
+ bool *queue_status)
+{
+ struct rte_vhost_vring_state *state;
+ struct internal_list *list;
+ struct rte_eth_dev *eth_dev;
+ int found = 0;
+ uint16_t nb_q = 0;
+
+ if (port_id >= RTE_MAX_ETHPORTS) {
+ VHOST_LOG(ERR, "Invalid port id\n");
+ return -1;
+ }
+ TAILQ_FOREACH(list, &internal_list, next) {
+ eth_dev = list->eth_dev;
+ if (eth_dev->data->port_id == port_id) {
+ nb_q = rx ? eth_dev->data->nb_rx_queues :
+ eth_dev->data->nb_tx_queues;
+ found = 1;
+ break;
+ }
+ }
+ if (!found) {
+ VHOST_LOG(ERR, "No device found for port id %u\n", port_id);
+ return -1;
+ }
+ if (queue_id >= nb_q) {
+ VHOST_LOG(ERR, "Invalid queue id\n");
+ return -1;
+ }
+
+ state = vring_states[port_id];
+ if (!state) {
+ VHOST_LOG(ERR, "Unused port\n");
+ return -1;
+ }
+
+ rte_spinlock_lock(&state->lock);
+ *queue_status = rx ? state->cur[queue_id * 2 + 1] :
+ state->cur[queue_id * 2];
+ rte_spinlock_unlock(&state->lock);
+
+ return 0;
+}
+
+int
rte_eth_vhost_get_queue_event(uint16_t port_id,
struct rte_eth_vhost_queue_event *event)
{
diff --git a/drivers/net/vhost/rte_eth_vhost.h
b/drivers/net/vhost/rte_eth_vhost.h
index 0e68b9f..1e65c69 100644
--- a/drivers/net/vhost/rte_eth_vhost.h
+++ b/drivers/net/vhost/rte_eth_vhost.h
@@ -44,6 +44,24 @@ int rte_eth_vhost_get_queue_event(uint16_t port_id,
struct rte_eth_vhost_queue_event *event);
/**
+ * Get queue status for specific queue in the port.
+ *
+ * @param[in] port_id
+ * Port id.
+ * @param[in] rx
+ * True is rx, False if tx
+ * @paran[in] queue_id
+ * Queue_id
+ * @param[out] queue_status
+ * Pointer to a boolean, True is enable, False if disable.
+ * @return
+ * - On success, zero, queue_status is updated.
+ * - On failure, a negative value, queue_status is not updated.
+ */
+int rte_eth_vhost_get_queue_status(uint16_t port_id, bool rx, uint16_t
queue_id,
+ bool *queue_status);
+
+/**
* Get the 'vid' value associated with the specified port.
*
* @return
diff --git a/drivers/net/vhost/rte_pmd_vhost_version.map
b/drivers/net/vhost/rte_pmd_vhost_version.map
index 695db85..1eabfd2 100644
--- a/drivers/net/vhost/rte_pmd_vhost_version.map
+++ b/drivers/net/vhost/rte_pmd_vhost_version.map
@@ -11,3 +11,9 @@ DPDK_16.11 {
rte_eth_vhost_get_vid_from_port_id;
};
+
+DPDK_19.08 {
+ global:
+
+ rte_eth_vhost_get_queue_status;
+};
--
1.8.3.1
[dpdk-dev] [PATCH] net/vhost: fix redundant queue state event
In some situations, when a virtual machine is starting,
vring_state_changed can be called while there was no change in the
queue state. This fix makes sure that there was really a change in the
queue state before calling the callback for EVENT_QUEUE_STATE.
Fixes: ee584e9710b9 ("vhost: add driver on top of the library")
Cc: sta...@dpdk.org
Reviewed-by: Matan Azrad
---
drivers/net/vhost/rte_eth_vhost.c | 4
1 file changed, 4 insertions(+)
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index cad1e5c..fbe7a37 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -855,6 +855,10 @@ struct vhost_xstats_name_off {
/* won't be NULL */
state = vring_states[eth_dev->data->port_id];
rte_spinlock_lock(&state->lock);
+ if (state->cur[vring] == enable) {
+ rte_spinlock_unlock(&state->lock);
+ return 0;
+ }
state->cur[vring] = enable;
state->max_vring = RTE_MAX(vring, state->max_vring);
--
1.8.3.1
