[dpdk-dev] [PATCH 1/2] app/testpmd: fix csumonly mode when run without outer chksum
Donot use outer metadata when neither outer ip checksum nor
outer udp checksum is enabled. PMD's will ignore the
outer_l2_len and outer_l3_len in cases where none of
the outer checksum is enabled and hence only l2_len and
l3_len will be used to calculate the offsets for L2 or L3
header.
Fixes: 3c32113a1aac ("app/testpmd: fix IPv6 tunnel checksum")
Cc: jia@intel.com
Cc: sta...@dpdk.org
Signed-off-by: Nithin Dabilpuram
---
app/test-pmd/csumonly.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 607c889..38cc256 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -961,8 +961,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
(tx_offloads &
DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) ||
(tx_offloads &
-DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) ||
- (tx_ol_flags & PKT_TX_OUTER_IPV6)) {
+DEV_TX_OFFLOAD_OUTER_UDP_CKSUM)) {
m->outer_l2_len = info.outer_l2_len;
m->outer_l3_len = info.outer_l3_len;
m->l2_len = info.l2_len;
--
2.8.4
[dpdk-dev] [PATCH 2/2] app/testpmd: fix verbose mode dump for Tx
Fix verbose mode dump for Tx to dump tx offload flags instead of
Rx offload flags.
Fixes: d862c45b5955 ("app/testpmd: move dumping packets to a separate function")
Cc: rasl...@mellanox.com
Cc: sta...@dpdk.org
Signed-off-by: Nithin Dabilpuram
---
app/test-pmd/util.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c
index 5dd7157..14a9a25 100644
--- a/app/test-pmd/util.c
+++ b/app/test-pmd/util.c
@@ -275,7 +275,11 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct
rte_mbuf *pkts[],
" - %s queue=0x%x", is_rx ? "Receive" : "Send",
(unsigned int) queue);
MKDUMPSTR(print_buf, buf_size, cur_len, "\n");
- rte_get_rx_ol_flag_list(mb->ol_flags, buf, sizeof(buf));
+ if (is_rx)
+ rte_get_rx_ol_flag_list(mb->ol_flags, buf, sizeof(buf));
+ else
+ rte_get_tx_ol_flag_list(mb->ol_flags, buf, sizeof(buf));
+
MKDUMPSTR(print_buf, buf_size, cur_len,
" ol_flags: %s\n", buf);
if (rte_mbuf_check(mb, 1, &reason) < 0)
--
2.8.4
Re: [dpdk-dev] [PATCH 1/2] app/testpmd: fix csumonly mode when run without outer chksum
Hi
> -Original Message-
> From: Nithin Dabilpuram
> Sent: Monday, August 16, 2021 15:10
> To: Li, Xiaoyun
> Cc: jer...@marvell.com; dev@dpdk.org; Nithin Dabilpuram
> ; jia@intel.com; sta...@dpdk.org
> Subject: [PATCH 1/2] app/testpmd: fix csumonly mode when run without outer
> chksum
>
> Donot use outer metadata when neither outer ip checksum nor outer udp
> checksum is enabled. PMD's will ignore the outer_l2_len and outer_l3_len in
> cases where none of the outer checksum is enabled and hence only l2_len and
> l3_len will be used to calculate the offsets for L2 or L3 header.
I don't understand.
In process_outer_chksum, only PKT_TX_OUTER_IPV6 Will be set if it's ipv6
packets.
So PKT_TX_OUTER_IPV6 means this packet is tunnel ipv6 packet. So it actually
needs outer l2 len and outer l3 len put them to hw.
At least i40e needs outer l2 len and outer l3 len as far as I know.
>
> Fixes: 3c32113a1aac ("app/testpmd: fix IPv6 tunnel checksum")
> Cc: jia@intel.com
> Cc: sta...@dpdk.org
>
> Signed-off-by: Nithin Dabilpuram
> ---
> app/test-pmd/csumonly.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index
> 607c889..38cc256 100644
> --- a/app/test-pmd/csumonly.c
> +++ b/app/test-pmd/csumonly.c
> @@ -961,8 +961,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
> (tx_offloads &
>DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) ||
> (tx_offloads &
> - DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) ||
> - (tx_ol_flags & PKT_TX_OUTER_IPV6)) {
> + DEV_TX_OFFLOAD_OUTER_UDP_CKSUM)) {
> m->outer_l2_len = info.outer_l2_len;
> m->outer_l3_len = info.outer_l3_len;
> m->l2_len = info.l2_len;
> --
> 2.8.4
[dpdk-dev] Minutes of Technical Board Meeting, 2021-08-11
Minutes of Technical Board Meeting, 2021-08-11 Members Attending: 8/12 - Aaron Conole - Ferruh Yigit (Chair) - Hemant Agrawal - Honnappa Nagarahalli - Jerin Jacob - Kevin Traynor - Konstantin Ananyev - Stephen Hemminger NOTE: The Technical Board meetings take place every second Wednesday on https://meet.jit.si/DPDK at 3 pm UTC. Meetings are public, and DPDK community members are welcome to attend. Agenda and minutes can be found at http://core.dpdk.org/techboard/minutes NOTE: Next meeting will be on Wednesday 2021-08-25 @3pm UTC, and will be chaired by Hemant. #1 Extending stable ABI / API to two years * No decision given yet, left decision to next meeting. * Can continue executing the tasks listed in the excel sheet during v21.11 #2 Documenting criteria on adding/removing members to technical board * Document needs further reviews, please review. * Will set a deadline for the document review in next meeting. #3 Atomic API * Atomic built-ins used because of old compilers. * If we can drop old compiler support, we can switch to atomic APIs. * Discussion to drop RHEL7 is going on in the mail list. #4 Exception path sample app * No objection to have the sample app in principal. * Details and design can be discussed more when patches are available. #5 github repo access for extending CI for Arm support * Honnappa and Aaron will figure out the details on what is exactly required * Later we can crate an policy around it, right now it is for Thomas/Aaron/Honnappa to manage.
[dpdk-dev] [PATCH v4 0/2] Use macro to print MAC address
Added macros to simplyfy print of MAC address. The six bytes of mac address is extracted using a macro to improve code readability. Aman Singh (2): net: added macro for MAC address print net: added macro to extract MAC address bytes app/pdump/main.c | 5 +--- app/test-pmd/cmdline.c| 6 ++-- app/test-pmd/config.c | 6 ++-- app/test-pmd/testpmd.c| 9 ++ app/test/test_event_eth_rx_adapter.c | 5 +--- app/test/test_event_eth_tx_adapter.c | 5 +--- drivers/bus/dpaa/base/fman/netcfg_layer.c | 9 ++ drivers/common/mlx5/linux/mlx5_nl.c | 6 ++-- drivers/net/bnx2x/bnx2x.c | 4 +-- drivers/net/bnx2x/bnx2x_vfpf.c| 10 ++- drivers/net/bnx2x/ecore_sp.c | 14 - drivers/net/bnxt/bnxt_ethdev.c| 2 +- drivers/net/bonding/rte_eth_bond_8023ad.c | 4 +-- drivers/net/bonding/rte_eth_bond_pmd.c| 12 +++- drivers/net/dpaa/dpaa_ethdev.c| 10 ++- drivers/net/e1000/igb_ethdev.c| 9 ++ drivers/net/enic/base/vnic_dev.c | 4 +-- drivers/net/enic/enic_res.c | 2 +- drivers/net/failsafe/failsafe.c | 6 ++-- drivers/net/hinic/hinic_pmd_ethdev.c | 6 ++-- drivers/net/i40e/i40e_ethdev_vf.c | 21 -- drivers/net/iavf/iavf_ethdev.c| 18 +++- drivers/net/iavf/iavf_vchnl.c | 15 +++--- drivers/net/ice/ice_dcf.c | 6 ++-- drivers/net/ixgbe/ixgbe_ethdev.c | 29 --- drivers/net/mlx4/mlx4.c | 7 ++--- drivers/net/mlx5/linux/mlx5_os.c | 7 ++--- drivers/net/mlx5/windows/mlx5_os.c| 7 ++--- drivers/net/mvpp2/mrvl_flow.c | 4 +-- drivers/net/netvsc/hn_rndis.c | 2 +- drivers/net/nfp/nfp_net.c | 2 +- drivers/net/qede/base/ecore_mcp.c | 2 +- drivers/net/qede/base/ecore_sriov.c | 2 +- drivers/net/qede/qede_ethdev.c| 9 ++ drivers/net/thunderx/nicvf_ethdev.c | 2 +- drivers/net/txgbe/txgbe_ethdev_vf.c | 29 --- drivers/net/virtio/virtio_ethdev.c| 4 +-- drivers/net/vmxnet3/vmxnet3_ethdev.c | 4 +-- examples/bbdev_app/main.c | 9 ++ examples/bond/main.c | 3 +- examples/distributor/main.c | 5 +--- examples/ethtool/ethtool-app/ethapp.c | 10 ++- .../pipeline_worker_generic.c | 5 +--- .../eventdev_pipeline/pipeline_worker_tx.c| 5 +--- examples/flow_classify/flow_classify.c| 5 +--- examples/ioat/ioatfwd.c | 9 ++ examples/ip_pipeline/cli.c| 11 ++- examples/l2fwd-cat/l2fwd-cat.c| 5 +--- examples/l2fwd-crypto/main.c | 11 ++- examples/l2fwd-event/l2fwd_common.c | 9 ++ examples/l2fwd-jobstats/main.c| 11 ++- examples/l2fwd-keepalive/main.c | 9 ++ examples/l2fwd/main.c | 11 ++- examples/link_status_interrupt/main.c | 9 ++ examples/packet_ordering/main.c | 5 +--- examples/pipeline/cli.c | 6 ++-- examples/rxtx_callbacks/main.c| 4 +-- examples/server_node_efd/server/main.c| 6 ++-- examples/skeleton/basicfwd.c | 5 +--- examples/vhost/main.c | 17 +++ examples/vm_power_manager/channel_monitor.c | 4 +-- .../guest_cli/vm_power_cli_guest.c| 5 +--- examples/vm_power_manager/main.c | 5 +--- examples/vmdq/main.c | 14 ++--- examples/vmdq_dcb/main.c | 14 ++--- lib/net/rte_ether.h | 14 + lib/vhost/vhost_user.c| 2 +- 67 files changed, 155 insertions(+), 377 deletions(-) -- 2.17.1
[dpdk-dev] [PATCH v4 1/2] net: added macro for MAC address print
Added macro to print six bytes of MAC address.
The MAC addresses will be printed in lower case
hexadecimal format.
In case there is a specific check for upper case
MAC address, the user may need to make a change in
such test case after this patch.
Signed-off-by: Aman Singh
Reviewed-by: Ferruh Yigit
---
V2: Fix build issue in examples code
V3: Fix Windows compilation issue
V4: Taken review comments on V3
---
app/test-pmd/cmdline.c| 2 +-
app/test-pmd/config.c | 2 +-
app/test-pmd/testpmd.c| 2 +-
drivers/bus/dpaa/base/fman/netcfg_layer.c | 2 +-
drivers/common/mlx5/linux/mlx5_nl.c | 2 +-
drivers/net/bnx2x/bnx2x.c | 4 ++--
drivers/net/bnx2x/bnx2x_vfpf.c| 3 ++-
drivers/net/bnx2x/ecore_sp.c | 14 +++---
drivers/net/bnxt/bnxt_ethdev.c| 2 +-
drivers/net/bonding/rte_eth_bond_8023ad.c | 4 ++--
drivers/net/bonding/rte_eth_bond_pmd.c| 4 ++--
drivers/net/dpaa/dpaa_ethdev.c| 2 +-
drivers/net/e1000/igb_ethdev.c| 2 +-
drivers/net/enic/base/vnic_dev.c | 4 ++--
drivers/net/enic/enic_res.c | 2 +-
drivers/net/failsafe/failsafe.c | 2 +-
drivers/net/hinic/hinic_pmd_ethdev.c | 2 +-
drivers/net/i40e/i40e_ethdev_vf.c | 6 +++---
drivers/net/iavf/iavf_ethdev.c| 4 ++--
drivers/net/iavf/iavf_vchnl.c | 4 ++--
drivers/net/ice/ice_dcf.c | 2 +-
drivers/net/ixgbe/ixgbe_ethdev.c | 6 +++---
drivers/net/mlx4/mlx4.c | 2 +-
drivers/net/mlx5/linux/mlx5_os.c | 2 +-
drivers/net/mlx5/windows/mlx5_os.c| 2 +-
drivers/net/mvpp2/mrvl_flow.c | 4 ++--
drivers/net/netvsc/hn_rndis.c | 2 +-
drivers/net/nfp/nfp_net.c | 2 +-
drivers/net/qede/base/ecore_mcp.c | 2 +-
drivers/net/qede/base/ecore_sriov.c | 2 +-
drivers/net/qede/qede_ethdev.c| 2 +-
drivers/net/thunderx/nicvf_ethdev.c | 2 +-
drivers/net/txgbe/txgbe_ethdev_vf.c | 6 +++---
drivers/net/virtio/virtio_ethdev.c| 4 ++--
drivers/net/vmxnet3/vmxnet3_ethdev.c | 4 ++--
examples/bbdev_app/main.c | 2 +-
examples/ethtool/ethtool-app/ethapp.c | 2 +-
examples/ioat/ioatfwd.c | 2 +-
examples/ip_pipeline/cli.c| 4 ++--
examples/l2fwd-crypto/main.c | 2 +-
examples/l2fwd-event/l2fwd_common.c | 2 +-
examples/l2fwd-jobstats/main.c| 2 +-
examples/l2fwd-keepalive/main.c | 2 +-
examples/l2fwd/main.c | 2 +-
examples/link_status_interrupt/main.c | 2 +-
examples/pipeline/cli.c | 2 +-
examples/server_node_efd/server/main.c| 2 +-
examples/vhost/main.c | 2 +-
examples/vmdq/main.c | 2 +-
examples/vmdq_dcb/main.c | 2 +-
lib/net/rte_ether.h | 5 +
lib/vhost/vhost_user.c| 2 +-
52 files changed, 79 insertions(+), 73 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 82253bc751..d4186eb9b2 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -10899,7 +10899,7 @@ static void cmd_mcast_addr_parsed(void *parsed_result,
if (!rte_is_multicast_ether_addr(&res->mc_addr)) {
fprintf(stderr,
- "Invalid multicast addr
%02X:%02X:%02X:%02X:%02X:%02X\n",
+ "Invalid multicast addr " RTE_ETHER_ADDR_PRT_FMT "\n",
res->mc_addr.addr_bytes[0], res->mc_addr.addr_bytes[1],
res->mc_addr.addr_bytes[2], res->mc_addr.addr_bytes[3],
res->mc_addr.addr_bytes[4], res->mc_addr.addr_bytes[5]);
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 31d8ba1b91..21d5db5297 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -782,7 +782,7 @@ port_summary_display(portid_t port_id)
if (ret != 0)
return;
- printf("%-4d %02X:%02X:%02X:%02X:%02X:%02X %-12s %-14s %-8s %s\n",
+ printf("%-4d " RTE_ETHER_ADDR_PRT_FMT " %-12s %-14s %-8s %s\n",
port_id, mac_addr.addr_bytes[0], mac_addr.addr_bytes[1],
mac_addr.addr_bytes[2], mac_addr.addr_bytes[3],
mac_addr.addr_bytes[4], mac_addr.addr_bytes[5], name,
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 6cbe9ba3c8..d0ede963ea 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2622,7 +2622,7 @@ start_port(portid_t pid)
pi);
if (eth_macaddr_get_print_err(pi, &port->eth_addr) == 0)
- printf("Port %d: %02X:%02X:%02X:%02X:%02X:%02X\n", pi,
+ printf("Port %d: " RTE_ETHER_ADDR_PRT_FMT "\n", pi,
[dpdk-dev] [PATCH v4 2/2] net: added macro to extract MAC address bytes
Added macros to simplify print of MAC address.
The six bytes of a MAC address are extracted in
a macro here, to improve code readablity.
Signed-off-by: Aman Singh
Reviewed-by: Ferruh Yigit
---
The change in the document will be done in seperate patch.
To ensure document has direct reference of the code as shown in
commit 413c75c33c40 ("doc: show how to include code in guides").
V2: Fix build issue in examples code
V3: Fix Windows compilation issue
V4: Taken review comments on V3
---
app/pdump/main.c | 5 +---
app/test-pmd/cmdline.c| 4 +---
app/test-pmd/config.c | 4 +---
app/test-pmd/testpmd.c| 7 +-
app/test/test_event_eth_rx_adapter.c | 5 +---
app/test/test_event_eth_tx_adapter.c | 5 +---
drivers/bus/dpaa/base/fman/netcfg_layer.c | 7 +-
drivers/common/mlx5/linux/mlx5_nl.c | 4 +---
drivers/net/bnx2x/bnx2x_vfpf.c| 7 +-
drivers/net/bonding/rte_eth_bond_pmd.c| 8 ++-
drivers/net/dpaa/dpaa_ethdev.c| 8 +--
drivers/net/e1000/igb_ethdev.c| 7 +-
drivers/net/failsafe/failsafe.c | 4 +---
drivers/net/hinic/hinic_pmd_ethdev.c | 4 +---
drivers/net/i40e/i40e_ethdev_vf.c | 15 +++-
drivers/net/iavf/iavf_ethdev.c| 14 ++-
drivers/net/iavf/iavf_vchnl.c | 11 ++---
drivers/net/ice/ice_dcf.c | 4 +---
drivers/net/ixgbe/ixgbe_ethdev.c | 23 +++
drivers/net/mlx4/mlx4.c | 5 +---
drivers/net/mlx5/linux/mlx5_os.c | 5 +---
drivers/net/mlx5/windows/mlx5_os.c| 5 +---
drivers/net/qede/qede_ethdev.c| 7 +-
drivers/net/txgbe/txgbe_ethdev_vf.c | 23 +++
examples/bbdev_app/main.c | 7 +-
examples/bond/main.c | 3 +--
examples/distributor/main.c | 5 +---
examples/ethtool/ethtool-app/ethapp.c | 8 +--
.../pipeline_worker_generic.c | 5 +---
.../eventdev_pipeline/pipeline_worker_tx.c| 5 +---
examples/flow_classify/flow_classify.c| 5 +---
examples/ioat/ioatfwd.c | 7 +-
examples/ip_pipeline/cli.c| 9 ++--
examples/l2fwd-cat/l2fwd-cat.c| 5 +---
examples/l2fwd-crypto/main.c | 9 ++--
examples/l2fwd-event/l2fwd_common.c | 7 +-
examples/l2fwd-jobstats/main.c| 9 ++--
examples/l2fwd-keepalive/main.c | 7 +-
examples/l2fwd/main.c | 9 ++--
examples/link_status_interrupt/main.c | 7 +-
examples/packet_ordering/main.c | 5 +---
examples/pipeline/cli.c | 4 +---
examples/rxtx_callbacks/main.c| 4 +---
examples/server_node_efd/server/main.c| 4 +---
examples/skeleton/basicfwd.c | 5 +---
examples/vhost/main.c | 15 +++-
examples/vm_power_manager/channel_monitor.c | 4 +---
.../guest_cli/vm_power_cli_guest.c| 5 +---
examples/vm_power_manager/main.c | 5 +---
examples/vmdq/main.c | 12 ++
examples/vmdq_dcb/main.c | 12 ++
lib/net/rte_ether.h | 9
52 files changed, 77 insertions(+), 305 deletions(-)
diff --git a/app/pdump/main.c b/app/pdump/main.c
index 63bbe65cd8..46f9d25db0 100644
--- a/app/pdump/main.c
+++ b/app/pdump/main.c
@@ -612,10 +612,7 @@ configure_vdev(uint16_t port_id)
printf("Port %u MAC: %02"PRIx8" %02"PRIx8" %02"PRIx8
" %02"PRIx8" %02"PRIx8" %02"PRIx8"\n",
- port_id,
- addr.addr_bytes[0], addr.addr_bytes[1],
- addr.addr_bytes[2], addr.addr_bytes[3],
- addr.addr_bytes[4], addr.addr_bytes[5]);
+ port_id, RTE_ETHER_ADDR_BYTES(&addr));
ret = rte_eth_promiscuous_enable(port_id);
if (ret != 0) {
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index d4186eb9b2..a5d6c20be1 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -10900,9 +10900,7 @@ static void cmd_mcast_addr_parsed(void *parsed_result,
if (!rte_is_multicast_ether_addr(&res->mc_addr)) {
fprintf(stderr,
"Invalid multicast addr " RTE_ETHER_ADDR_PRT_FMT "\n",
- res->mc_addr.addr_bytes[0], res->mc_addr.addr_bytes[1],
- res->mc_addr.addr_bytes[2], res->mc_addr.addr_bytes[3],
- res->mc_addr.addr_bytes[4], res->mc_addr.addr_bytes[5]);
+ RTE_ETHER_ADDR_BYTES(&re
Re: [dpdk-dev] [PATCH 1/2] app/testpmd: fix csumonly mode when run without outer chksum
On Mon, Aug 16, 2021 at 08:48:20AM +, Li, Xiaoyun wrote:
> Hi
>
> > -Original Message-
> > From: Nithin Dabilpuram
> > Sent: Monday, August 16, 2021 15:10
> > To: Li, Xiaoyun
> > Cc: jer...@marvell.com; dev@dpdk.org; Nithin Dabilpuram
> > ; jia@intel.com; sta...@dpdk.org
> > Subject: [PATCH 1/2] app/testpmd: fix csumonly mode when run without outer
> > chksum
> >
> > Donot use outer metadata when neither outer ip checksum nor outer udp
> > checksum is enabled. PMD's will ignore the outer_l2_len and outer_l3_len in
> > cases where none of the outer checksum is enabled and hence only l2_len and
> > l3_len will be used to calculate the offsets for L2 or L3 header.
>
> I don't understand.
> In process_outer_chksum, only PKT_TX_OUTER_IPV6 Will be set if it's ipv6
> packets.
> So PKT_TX_OUTER_IPV6 means this packet is tunnel ipv6 packet. So it actually
> needs outer l2 len and outer l3 len put them to hw.
> At least i40e needs outer l2 len and outer l3 len as far as I know.
Ok, do you mean m->outer_l2_len and m->outer_l3_len will be referred in i40e
driver
even when both DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM and
DEV_TX_OFFLOAD_OUTER_UDP_CKSUM are not enabled in ethdev Tx offloads ?
I thought as per spec, those fields will only be used when the Outer offloads
are enabled.
>
> >
> > Fixes: 3c32113a1aac ("app/testpmd: fix IPv6 tunnel checksum")
> > Cc: jia@intel.com
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Nithin Dabilpuram
> > ---
> > app/test-pmd/csumonly.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index
> > 607c889..38cc256 100644
> > --- a/app/test-pmd/csumonly.c
> > +++ b/app/test-pmd/csumonly.c
> > @@ -961,8 +961,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
> > (tx_offloads &
> > DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) ||
> > (tx_offloads &
> > -DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) ||
> > - (tx_ol_flags & PKT_TX_OUTER_IPV6)) {
> > +DEV_TX_OFFLOAD_OUTER_UDP_CKSUM)) {
> > m->outer_l2_len = info.outer_l2_len;
> > m->outer_l3_len = info.outer_l3_len;
> > m->l2_len = info.l2_len;
> > --
> > 2.8.4
>
Re: [dpdk-dev] EAL: failed to parse device "XX:XX.X" on CentOS 7
Hi Thao, the original issue was resolved by updating pkg-config. I compiled a new version of it on our centos 7 setup. We are currently using pkg-config 0.29.2 and it works. BR, SM On 8/13/21 12:32 AM, Thao Hull wrote: Hi. This looks similar to the problem I am having. https://lore.kernel.org/dpdk-dev/bug-68...@http.bugs.dpdk.org%2F/T/ I can't figure out how this issue was resolved on Centos7 per the thread. Can someone please explain how to get past this failure error? Just like this user, testpmd works fine for me. My device is in slot b3:00.0. I am using arkville on a bittware FPGA card. My error is slightly different as shown below: EAL: Detected 24 lcore(s) EAL: Detected 2 NUMA nodes EAL: Detected static linkage of DPDK EAL: failed to parse device "b3:00.0" EAL: Unable to parse device 'b3:00.0, Pkt_dir=0xF, Pkt_gen=./pg.conf' EAL: Error - exiting with EAL initialization I'm using dpdk version 21.08.0 Any thoughts on how to debug, if not fix this? I am new to dpdk. Thank you! Thao
[dpdk-dev] [PATCH V4 1/4] table: add support learner tables
A learner table is typically used for learning or connection tracking,
where it allows for the implementation of the "add on miss" scenario:
whenever the lookup key is not found in the table (lookup miss), the
data plane can decide to add this key to the table with a given action
with no control plane intervention. Likewise, the table keys expire
based on a configurable timeout and are automatically deleted from the
table with no control plane intervention.
Signed-off-by: Cristian Dumitrescu
---
Depends-on: series-18023 ("[V2,1/5] pipeline: prepare for variable size
headers")
V2: fixed one "line too long" coding style warning.
lib/table/meson.build | 2 +
lib/table/rte_swx_table_learner.c | 617 ++
lib/table/rte_swx_table_learner.h | 206 ++
lib/table/version.map | 9 +
4 files changed, 834 insertions(+)
create mode 100644 lib/table/rte_swx_table_learner.c
create mode 100644 lib/table/rte_swx_table_learner.h
diff --git a/lib/table/meson.build b/lib/table/meson.build
index a1384456a9..ac1f1aac27 100644
--- a/lib/table/meson.build
+++ b/lib/table/meson.build
@@ -3,6 +3,7 @@
sources = files(
'rte_swx_table_em.c',
+'rte_swx_table_learner.c',
'rte_swx_table_selector.c',
'rte_swx_table_wm.c',
'rte_table_acl.c',
@@ -21,6 +22,7 @@ headers = files(
'rte_lru.h',
'rte_swx_table.h',
'rte_swx_table_em.h',
+'rte_swx_table_learner.h',
'rte_swx_table_selector.h',
'rte_swx_table_wm.h',
'rte_table.h',
diff --git a/lib/table/rte_swx_table_learner.c
b/lib/table/rte_swx_table_learner.c
new file mode 100644
index 00..c3c840ff06
--- /dev/null
+++ b/lib/table/rte_swx_table_learner.c
@@ -0,0 +1,617 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Intel Corporation
+ */
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+#include "rte_swx_table_learner.h"
+
+#ifndef RTE_SWX_TABLE_LEARNER_USE_HUGE_PAGES
+#define RTE_SWX_TABLE_LEARNER_USE_HUGE_PAGES 1
+#endif
+
+#ifndef RTE_SWX_TABLE_SELECTOR_HUGE_PAGES_DISABLE
+
+#include
+
+static void *
+env_calloc(size_t size, size_t alignment, int numa_node)
+{
+ return rte_zmalloc_socket(NULL, size, alignment, numa_node);
+}
+
+static void
+env_free(void *start, size_t size __rte_unused)
+{
+ rte_free(start);
+}
+
+#else
+
+#include
+
+static void *
+env_calloc(size_t size, size_t alignment __rte_unused, int numa_node)
+{
+ void *start;
+
+ if (numa_available() == -1)
+ return NULL;
+
+ start = numa_alloc_onnode(size, numa_node);
+ if (!start)
+ return NULL;
+
+ memset(start, 0, size);
+ return start;
+}
+
+static void
+env_free(void *start, size_t size)
+{
+ if ((numa_available() == -1) || !start)
+ return;
+
+ numa_free(start, size);
+}
+
+#endif
+
+#if defined(RTE_ARCH_X86_64)
+
+#include
+
+#define crc32_u64(crc, v) _mm_crc32_u64(crc, v)
+
+#else
+
+static inline uint64_t
+crc32_u64_generic(uint64_t crc, uint64_t value)
+{
+ int i;
+
+ crc = (crc & 0xLLU) ^ value;
+ for (i = 63; i >= 0; i--) {
+ uint64_t mask;
+
+ mask = -(crc & 1LLU);
+ crc = (crc >> 1LLU) ^ (0x82F63B78LLU & mask);
+ }
+
+ return crc;
+}
+
+#define crc32_u64(crc, v) crc32_u64_generic(crc, v)
+
+#endif
+
+/* Key size needs to be one of: 8, 16, 32 or 64. */
+static inline uint32_t
+hash(void *key, void *key_mask, uint32_t key_size, uint32_t seed)
+{
+ uint64_t *k = key;
+ uint64_t *m = key_mask;
+ uint64_t k0, k2, k5, crc0, crc1, crc2, crc3, crc4, crc5;
+
+ switch (key_size) {
+ case 8:
+ crc0 = crc32_u64(seed, k[0] & m[0]);
+ return crc0;
+
+ case 16:
+ k0 = k[0] & m[0];
+
+ crc0 = crc32_u64(k0, seed);
+ crc1 = crc32_u64(k0 >> 32, k[1] & m[1]);
+
+ crc0 ^= crc1;
+
+ return crc0;
+
+ case 32:
+ k0 = k[0] & m[0];
+ k2 = k[2] & m[2];
+
+ crc0 = crc32_u64(k0, seed);
+ crc1 = crc32_u64(k0 >> 32, k[1] & m[1]);
+
+ crc2 = crc32_u64(k2, k[3] & m[3]);
+ crc3 = k2 >> 32;
+
+ crc0 = crc32_u64(crc0, crc1);
+ crc1 = crc32_u64(crc2, crc3);
+
+ crc0 ^= crc1;
+
+ return crc0;
+
+ case 64:
+ k0 = k[0] & m[0];
+ k2 = k[2] & m[2];
+ k5 = k[5] & m[5];
+
+ crc0 = crc32_u64(k0, seed);
+ crc1 = crc32_u64(k0 >> 32, k[1] & m[1]);
+
+ crc2 = crc32_u64(k2, k[3] & m[3]);
+ crc3 = crc32_u64(k2 >> 32, k[4] & m[4]);
+
+ crc4 = crc32_u64(k5, k[6] & m[6]);
+ crc5 = crc32_u64(k5 >> 32, k[7] & m[7]);
+
+ crc0 = crc32_u64(crc
[dpdk-dev] [PATCH V4 3/4] examples/pipeline: add support for learner tables
Add application-level support for learner tables.
Signed-off-by: Cristian Dumitrescu
---
examples/pipeline/cli.c | 174
1 file changed, 174 insertions(+)
diff --git a/examples/pipeline/cli.c b/examples/pipeline/cli.c
index a29be05ef4..ad6e3db8d7 100644
--- a/examples/pipeline/cli.c
+++ b/examples/pipeline/cli.c
@@ -1829,6 +1829,104 @@ cmd_pipeline_selector_show(char **tokens,
snprintf(out, out_size, MSG_ARG_INVALID, "selector_name");
}
+static int
+pipeline_learner_default_entry_add(struct rte_swx_ctl_pipeline *p,
+ const char *learner_name,
+ FILE *file,
+ uint32_t *file_line_number)
+{
+ char *line = NULL;
+ uint32_t line_id = 0;
+ int status = 0;
+
+ /* Buffer allocation. */
+ line = malloc(MAX_LINE_SIZE);
+ if (!line)
+ return -ENOMEM;
+
+ /* File read. */
+ for (line_id = 1; ; line_id++) {
+ struct rte_swx_table_entry *entry;
+ int is_blank_or_comment;
+
+ if (fgets(line, MAX_LINE_SIZE, file) == NULL)
+ break;
+
+ entry = rte_swx_ctl_pipeline_learner_default_entry_read(p,
+
learner_name,
+ line,
+
&is_blank_or_comment);
+ if (!entry) {
+ if (is_blank_or_comment)
+ continue;
+
+ status = -EINVAL;
+ goto error;
+ }
+
+ status = rte_swx_ctl_pipeline_learner_default_entry_add(p,
+
learner_name,
+ entry);
+ table_entry_free(entry);
+ if (status)
+ goto error;
+ }
+
+error:
+ *file_line_number = line_id;
+ free(line);
+ return status;
+}
+
+static const char cmd_pipeline_learner_default_help[] =
+"pipeline learner default \n";
+
+static void
+cmd_pipeline_learner_default(char **tokens,
+uint32_t n_tokens,
+char *out,
+size_t out_size,
+void *obj)
+{
+ struct pipeline *p;
+ char *pipeline_name, *learner_name, *file_name;
+ FILE *file = NULL;
+ uint32_t file_line_number = 0;
+ int status;
+
+ if (n_tokens != 6) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ pipeline_name = tokens[1];
+ p = pipeline_find(obj, pipeline_name);
+ if (!p || !p->ctl) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "pipeline_name");
+ return;
+ }
+
+ learner_name = tokens[3];
+
+ file_name = tokens[5];
+ file = fopen(file_name, "r");
+ if (!file) {
+ snprintf(out, out_size, "Cannot open file %s.\n", file_name);
+ return;
+ }
+
+ status = pipeline_learner_default_entry_add(p->ctl,
+ learner_name,
+ file,
+ &file_line_number);
+ if (status)
+ snprintf(out, out_size, "Invalid entry in file %s at line %u\n",
+file_name,
+file_line_number);
+
+ fclose(file);
+}
+
static const char cmd_pipeline_commit_help[] =
"pipeline commit\n";
@@ -2503,6 +2601,64 @@ cmd_pipeline_stats(char **tokens,
out += strlen(out);
}
}
+
+ snprintf(out, out_size, "\nLearner tables:\n");
+ out_size -= strlen(out);
+ out += strlen(out);
+
+ for (i = 0; i < info.n_learners; i++) {
+ struct rte_swx_ctl_learner_info learner_info;
+ uint64_t n_pkts_action[info.n_actions];
+ struct rte_swx_learner_stats stats = {
+ .n_pkts_hit = 0,
+ .n_pkts_miss = 0,
+ .n_pkts_action = n_pkts_action,
+ };
+ uint32_t j;
+
+ status = rte_swx_ctl_learner_info_get(p->p, i, &learner_info);
+ if (status) {
+ snprintf(out, out_size, "Learner table info get
error.");
+ return;
+ }
+
+ status = rte_swx_ctl_pipeline_learner_stats_read(p->p,
learner_info.name, &stats);
+ if (status) {
+ snprintf(out, out_size, "Learner table stats read
error.");
+
[dpdk-dev] [PATCH V4 2/4] pipeline: add support for learner tables
Add pipeline level support for learner tables.
Signed-off-by: Cristian Dumitrescu
---
V2: Added more configuration consistency checks.
V3: Fixed one coding style indentation error.
V4: Fixed a pointer dereferencing issue in function
rte_swx_ctl_pipeline_learner_stats_read().
lib/pipeline/rte_swx_ctl.c | 479 +++-
lib/pipeline/rte_swx_ctl.h | 185 +
lib/pipeline/rte_swx_pipeline.c | 1041 --
lib/pipeline/rte_swx_pipeline.h | 77 ++
lib/pipeline/rte_swx_pipeline_spec.c | 470 +++-
lib/pipeline/version.map |8 +
6 files changed, 2205 insertions(+), 55 deletions(-)
diff --git a/lib/pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c
index dc093860de..86b58e21dc 100644
--- a/lib/pipeline/rte_swx_ctl.c
+++ b/lib/pipeline/rte_swx_ctl.c
@@ -123,12 +123,26 @@ struct selector {
struct rte_swx_table_selector_params params;
};
+struct learner {
+ struct rte_swx_ctl_learner_info info;
+ struct rte_swx_ctl_table_match_field_info *mf;
+ struct rte_swx_ctl_table_action_info *actions;
+ uint32_t action_data_size;
+
+ /* The pending default action: this is NOT the current default action;
+* this will be the new default action after the next commit, if the
+* next commit operation is successful.
+*/
+ struct rte_swx_table_entry *pending_default;
+};
+
struct rte_swx_ctl_pipeline {
struct rte_swx_ctl_pipeline_info info;
struct rte_swx_pipeline *p;
struct action *actions;
struct table *tables;
struct selector *selectors;
+ struct learner *learners;
struct rte_swx_table_state *ts;
struct rte_swx_table_state *ts_next;
int numa_node;
@@ -924,6 +938,70 @@ selector_params_get(struct rte_swx_ctl_pipeline *ctl,
uint32_t selector_id)
return 0;
}
+static void
+learner_pending_default_free(struct learner *l)
+{
+ if (!l->pending_default)
+ return;
+
+ free(l->pending_default->action_data);
+ free(l->pending_default);
+ l->pending_default = NULL;
+}
+
+
+static void
+learner_free(struct rte_swx_ctl_pipeline *ctl)
+{
+ uint32_t i;
+
+ if (!ctl->learners)
+ return;
+
+ for (i = 0; i < ctl->info.n_learners; i++) {
+ struct learner *l = &ctl->learners[i];
+
+ free(l->mf);
+ free(l->actions);
+
+ learner_pending_default_free(l);
+ }
+
+ free(ctl->learners);
+ ctl->learners = NULL;
+}
+
+static struct learner *
+learner_find(struct rte_swx_ctl_pipeline *ctl, const char *learner_name)
+{
+ uint32_t i;
+
+ for (i = 0; i < ctl->info.n_learners; i++) {
+ struct learner *l = &ctl->learners[i];
+
+ if (!strcmp(learner_name, l->info.name))
+ return l;
+ }
+
+ return NULL;
+}
+
+static uint32_t
+learner_action_data_size_get(struct rte_swx_ctl_pipeline *ctl, struct learner
*l)
+{
+ uint32_t action_data_size = 0, i;
+
+ for (i = 0; i < l->info.n_actions; i++) {
+ uint32_t action_id = l->actions[i].action_id;
+ struct action *a = &ctl->actions[action_id];
+
+ if (a->data_size > action_data_size)
+ action_data_size = a->data_size;
+ }
+
+ return action_data_size;
+}
+
static void
table_state_free(struct rte_swx_ctl_pipeline *ctl)
{
@@ -954,6 +1032,14 @@ table_state_free(struct rte_swx_ctl_pipeline *ctl)
rte_swx_table_selector_free(ts->obj);
}
+ /* For each learner table, free its table state. */
+ for (i = 0; i < ctl->info.n_learners; i++) {
+ struct rte_swx_table_state *ts = &ctl->ts_next[i];
+
+ /* Default action data. */
+ free(ts->default_action_data);
+ }
+
free(ctl->ts_next);
ctl->ts_next = NULL;
}
@@ -1020,6 +1106,29 @@ table_state_create(struct rte_swx_ctl_pipeline *ctl)
}
}
+ /* Learner tables. */
+ for (i = 0; i < ctl->info.n_learners; i++) {
+ struct learner *l = &ctl->learners[i];
+ struct rte_swx_table_state *ts = &ctl->ts[i];
+ struct rte_swx_table_state *ts_next = &ctl->ts_next[i];
+
+ /* Table object: duplicate from the current table state. */
+ ts_next->obj = ts->obj;
+
+ /* Default action data: duplicate from the current table state.
*/
+ ts_next->default_action_data = malloc(l->action_data_size);
+ if (!ts_next->default_action_data) {
+ status = -ENOMEM;
+ goto error;
+ }
+
+ memcpy(ts_next->default_action_data,
+ ts->default_action_data,
+ l->action_data_size);
+
+ ts_next->default_action_id = ts->
[dpdk-dev] [PATCH V4 4/4] examples/pipeline: add learner table example
Added the files to illustrate the learner table usage.
Signed-off-by: Cristian Dumitrescu
---
V2: Added description to the .spec file.
examples/pipeline/examples/learner.cli | 37 +++
examples/pipeline/examples/learner.spec | 127
2 files changed, 164 insertions(+)
create mode 100644 examples/pipeline/examples/learner.cli
create mode 100644 examples/pipeline/examples/learner.spec
diff --git a/examples/pipeline/examples/learner.cli
b/examples/pipeline/examples/learner.cli
new file mode 100644
index 00..af7792624f
--- /dev/null
+++ b/examples/pipeline/examples/learner.cli
@@ -0,0 +1,37 @@
+; SPDX-License-Identifier: BSD-3-Clause
+; Copyright(c) 2020 Intel Corporation
+
+;
+; Customize the LINK parameters to match your setup.
+;
+mempool MEMPOOL0 buffer 2304 pool 32K cache 256 cpu 0
+
+link LINK0 dev :18:00.0 rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on
+link LINK1 dev :18:00.1 rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on
+link LINK2 dev :3b:00.0 rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on
+link LINK3 dev :3b:00.1 rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on
+
+;
+; PIPELINE0 setup.
+;
+pipeline PIPELINE0 create 0
+
+pipeline PIPELINE0 port in 0 link LINK0 rxq 0 bsz 32
+pipeline PIPELINE0 port in 1 link LINK1 rxq 0 bsz 32
+pipeline PIPELINE0 port in 2 link LINK2 rxq 0 bsz 32
+pipeline PIPELINE0 port in 3 link LINK3 rxq 0 bsz 32
+
+pipeline PIPELINE0 port out 0 link LINK0 txq 0 bsz 32
+pipeline PIPELINE0 port out 1 link LINK1 txq 0 bsz 32
+pipeline PIPELINE0 port out 2 link LINK2 txq 0 bsz 32
+pipeline PIPELINE0 port out 3 link LINK3 txq 0 bsz 32
+pipeline PIPELINE0 port out 4 sink none
+
+pipeline PIPELINE0 build ./examples/pipeline/examples/learner.spec
+
+;
+; Pipelines-to-threads mapping.
+;
+thread 1 pipeline PIPELINE0 enable
+
+; Once the application has started, the command to get the CLI prompt is:
telnet 0.0.0.0 8086
diff --git a/examples/pipeline/examples/learner.spec
b/examples/pipeline/examples/learner.spec
new file mode 100644
index 00..d635422282
--- /dev/null
+++ b/examples/pipeline/examples/learner.spec
@@ -0,0 +1,127 @@
+; SPDX-License-Identifier: BSD-3-Clause
+; Copyright(c) 2020 Intel Corporation
+
+; The learner tables are very useful for learning and connection tracking.
+;
+; As opposed to regular tables, which are read-only for the data plane, the
learner tables can be
+; updated by the data plane without any control plane intervention. The
"learning" process typically
+; takes place by having the default action (i.e. the table action which is
executed on lookup miss)
+; explicitly add to the table with a specific action the key that just missed
the lookup operation.
+; Each table key expires automatically after a configurable timeout period if
not hit during this
+; interval.
+;
+; This example demonstrates a simple connection tracking setup, where the
connections are identified
+; by the IPv4 destination address. The forwarding action assigned to each new
connection gets the
+; output port as argument, with the output port of each connection generated
by a counter that is
+; persistent between packets. On top of the usual table stats, the learner
table stats include the
+; number of packets with learning related events.
+
+//
+// Headers
+//
+struct ethernet_h {
+ bit<48> dst_addr
+ bit<48> src_addr
+ bit<16> ethertype
+}
+
+struct ipv4_h {
+ bit<8> ver_ihl
+ bit<8> diffserv
+ bit<16> total_len
+ bit<16> identification
+ bit<16> flags_offset
+ bit<8> ttl
+ bit<8> protocol
+ bit<16> hdr_checksum
+ bit<32> src_addr
+ bit<32> dst_addr
+}
+
+header ethernet instanceof ethernet_h
+header ipv4 instanceof ipv4_h
+
+//
+// Meta-data
+//
+struct metadata_t {
+ bit<32> port_in
+ bit<32> port_out
+
+ // Arguments for the "fwd_action" action.
+ bit<32> fwd_action_arg_port_out
+}
+
+metadata instanceof metadata_t
+
+//
+// Registers.
+//
+regarray counter size 1 initval 0
+
+//
+// Actions
+//
+struct fwd_action_args_t {
+ bit<32> port_out
+}
+
+action fwd_action args instanceof fwd_action_args_t {
+ mov m.port_out t.port_out
+ return
+}
+
+action learn_action args none {
+ // Read current counter value into m.fwd_action_arg_port_out.
+ regrd m.fwd_action_arg_port_out counter 0
+
+ // Increment the counter.
+ regadd counter 0 1
+
+ // Limit the output port values to 0 .. 3.
+ and m.fwd_action_arg_port_out 3
+
+ // Add the current lookup key to the table with fwd_action as the key
action. The action
+ // arguments are read from the packet meta-data (the
m.fwd_action_arg_port_out field). These
+ // packet meta-data fields have to be written before the "learn"
instruction is invoked.
+ learn fwd_action
+
+ // Send the current packet to the same output port.
+ mov m.port_out m.fwd_action_arg_port_out
+
+ return
+}
+
+//
+// Ta
Re: [dpdk-dev] [PATCH] checkpatch: enable volatile warning
Hi, Apologies for the delayed response! > On Mar 10, 2021, at 9:10 AM, Stephen Hemminger > wrote: > > On Wed, 10 Mar 2021 12:10:01 +0100 > Thomas Monjalon wrote: > >> 10/03/2021 12:04, Dharmik Thakkar: >>> Enable volatile considered harmful warning since use of volatile >>> is suspect. >>> >>> Suggested-by: Stephen Hemminger >>> Signed-off-by: Dharmik Thakkar >>> Reviewed-by: Ruifeng Wang >> >> git grep -w volatile | wc -l >> 1796 >> >> How much is it suspect? >> >> > > Many seem to be unsafe. > testpmd: uses flags values in unsafe manner > it also uses volatile when accessing hardware registers > > test-alarm is expecting that alarm() is a signal > (it is not) > > test-atomic is ok > test-barrier is doing barriers and not using __atomic > > drivers use volatile to mark hardware registers. > > It is still true volatile is not enough are not weak memory model. Agree, and this warning should help avoid such unsafe / incorrect use of volatile for future patches.
[dpdk-dev] [PATCH] examples/performance-thread: fix build issue with clang 12.0.1
From: Jerin Jacob
In clang 12.0.1 version, the use of pthread_yield() deprecated,
use sched_yield() instead.
log:
Compiling C object
examples/dpdk-pthread_shim.p/performance-thread_pthread_shim_main.c.o
../examples/performance-thread/pthread_shim/main.c: In function
'helloworld_pthread':
../examples/performance-thread/pthread_shim/main.c:75:9: warning:
'pthread_yield' is deprecated: pthread_yield is deprecated, use
sched_yield instead [-Wdeprecated-declarations]
Fixes: 433ba6228f9a ("examples/performance-thread: add pthread_shim app")
Bugzilla ID: 745
Cc: alia...@oss.nvidia.com
Signed-off-by: Jerin Jacob
---
examples/performance-thread/pthread_shim/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/performance-thread/pthread_shim/main.c
b/examples/performance-thread/pthread_shim/main.c
index 257de50692..7ce6cfb0c8 100644
--- a/examples/performance-thread/pthread_shim/main.c
+++ b/examples/performance-thread/pthread_shim/main.c
@@ -72,7 +72,7 @@ void *helloworld_pthread(void *arg)
print_count++;
/* yield thread to give opportunity for lock contention */
- pthread_yield();
+ sched_yield();
/* retrieve arg from TLS */
uint64_t thread_no = (uint64_t) pthread_getspecific(key);
--
2.32.0
[dpdk-dev] [Bug 745] performance-thread build failure with clang 12.0.1
https://bugs.dpdk.org/show_bug.cgi?id=745 Jerin (jerinjac...@gmail.com) changed: What|Removed |Added Status|CONFIRMED |RESOLVED Resolution|--- |FIXED --- Comment #2 from Jerin (jerinjac...@gmail.com) --- http://patches.dpdk.org/project/dpdk/patch/20210816131914.544110-1-jer...@marvell.com/ -- You are receiving this mail because: You are the assignee for the bug.
Re: [dpdk-dev] [PATCH] net/nfp: remove compile time log
On 7/29/2021 1:18 PM, Heinrich Kuhn wrote:
>
>
> On 2021/07/23 16:14, Thomas Monjalon wrote:
>> Please review.
>>
>> 28/06/2021 13:13, Andrew Rybchenko:
>>> Hi Heinrich,
>>>
>>> could you take a look at the patch?
>>>
>>> Thanks,
>>> Andrew.
>>>
>>> On 5/18/21 1:41 PM, Ferruh Yigit wrote:
Logging should be converted to dynamic log.
Signed-off-by: Ferruh Yigit
---
drivers/net/nfp/nfp_net_logs.h | 7 ---
1 file changed, 7 deletions(-)
diff --git a/drivers/net/nfp/nfp_net_logs.h
b/drivers/net/nfp/nfp_net_logs.h
index 27dd87611b94..76cc94cb6565 100644
--- a/drivers/net/nfp/nfp_net_logs.h
+++ b/drivers/net/nfp/nfp_net_logs.h
@@ -30,14 +30,7 @@ extern int nfp_logtype_init;
#define ASSERT(x) do { } while (0)
#endif
-#define RTE_LIBRTE_NFP_NET_DEBUG_CPP
-
-#ifdef RTE_LIBRTE_NFP_NET_DEBUG_CPP
-#define PMD_CPP_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
-#else
#define PMD_CPP_LOG(level, fmt, args...) do { } while (0)
-#endif
extern int nfp_logtype_driver;
#define PMD_DRV_LOG(level, fmt, args...) \
>>
>>
>>
> Hi Andrew,
>
> Apologies for the delay, looks good thanks
>
> Reviewed-by: Heinrich Kuhn
>
Applied to dpdk-next-net/main, thanks.
Re: [dpdk-dev] [PATCH v1 1/2] examples/fips_validation: fix unused malloc
> -Original Message-
> From: Power, Ciara
> Sent: Thursday, August 12, 2021 3:25 PM
> To: dev@dpdk.org
> Cc: sta...@dpdk.org; Zhang, Roy Fan ; Power,
> Ciara ; damianx.no...@intel.com; Kovacevic,
> Marko
> Subject: [PATCH v1 1/2] examples/fips_validation: fix unused malloc
>
> The val.val pointer is allocated memory, however this memory is then
> freed in get_writeback_data() without being used beforehand.
> The pointer is then allocated memory again before use,
> so the very first allocation is removed as it was unnecessary.
>
> Fixes: f4797bae0050 ("examples/fips_validation: support plain SHA")
> Cc: damianx.no...@intel.com
> Cc: sta...@dpdk.org
>
> Signed-off-by: Ciara Power
> ---
> examples/fips_validation/main.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/examples/fips_validation/main.c
> b/examples/fips_validation/main.c
> index c175fe6ac2..2db00620ce 100644
> --- a/examples/fips_validation/main.c
> +++ b/examples/fips_validation/main.c
> @@ -1635,7 +1635,6 @@ fips_mct_sha_test(void)
> int ret;
> uint32_t i, j;
>
> - val.val = rte_malloc(NULL, (MAX_DIGEST_SIZE*SHA_MD_BLOCK), 0);
> for (i = 0; i < SHA_MD_BLOCK; i++)
> md[i].val = rte_malloc(NULL, (MAX_DIGEST_SIZE*2), 0);
>
> --
> 2.25.1
Acked-by: Fan Zhang
Re: [dpdk-dev] [PATCH v1 2/2] examples/fips_validation: fix resetting pointer
> -Original Message-
> From: Power, Ciara
> Sent: Thursday, August 12, 2021 3:25 PM
> To: dev@dpdk.org
> Cc: sta...@dpdk.org; Zhang, Roy Fan ; Power,
> Ciara ; Kovacevic, Marko
>
> Subject: [PATCH v1 2/2] examples/fips_validation: fix resetting pointer
>
> The env.digest memory was freed, but the pointer was not set to NULL
> afterwards. This caused an "Invalid Memory" error, as the pointer tries
> to free twice.
>
> Fixes: 952e10cdad5e ("examples/fips_validation: support scatter gather list")
> Cc: roy.fan.zh...@intel.com
> Cc: sta...@dpdk.org
>
> Signed-off-by: Ciara Power
> ---
> examples/fips_validation/main.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/examples/fips_validation/main.c
> b/examples/fips_validation/main.c
> index 2db00620ce..5d14513a58 100644
> --- a/examples/fips_validation/main.c
> +++ b/examples/fips_validation/main.c
> @@ -1846,8 +1846,10 @@ fips_test_one_file(void)
>
> fips_test_clear();
>
> - if (env.digest)
> + if (env.digest) {
> rte_free(env.digest);
> + env.digest = NULL;
> + }
> if (env.mbuf)
> rte_pktmbuf_free(env.mbuf);
>
> --
> 2.25.1
Acked-by: Fan Zhang
Re: [dpdk-dev] 5/6] eal/arm64: support register dump for oops
On Tue, Aug 3, 2021 at 4:20 AM David Christensen
wrote:
>
>
>
> On 7/30/21 1:49 AM, jer...@marvell.com wrote:
> > From: Jerin Jacob
> >
> > Dump the arm64 arch state register in oops
> > handling routine.
> >
> > Signed-off-by: Jerin Jacob
> > ---
> > lib/eal/unix/eal_oops.c | 19 +++
> > 1 file changed, 19 insertions(+)
> >
> > diff --git a/lib/eal/unix/eal_oops.c b/lib/eal/unix/eal_oops.c
> > index da71481ade..7469610d96 100644
> > --- a/lib/eal/unix/eal_oops.c
> > +++ b/lib/eal/unix/eal_oops.c
> > @@ -162,6 +162,25 @@ archinfo_dump(ucontext_t *uc)
> > stack_code_dump((void *)mc->gregs[REG_RSP], (void
> > *)mc->gregs[REG_RIP]);
> > }
> >
> > +#elif defined(RTE_ARCH_ARM64) && defined(RTE_EXEC_ENV_LINUX)
> > +
> > +static void
> > +archinfo_dump(ucontext_t *uc)
> > +{
> > + mcontext_t *mc = &uc->uc_mcontext;
> > + int i;
> > +
> > + oops_print("PC : 0x%.16llx", mc->pc);
> > + oops_print("SP : 0x%.16llx\n", mc->sp);
> > + for (i = 0; i < 31; i++)
> ~~~
> Maybe <= instead of < ?? 31 is a strange number of registers and the
> line feed doesn't seem to line things up for PSTATEn below.
Based on spec
https://elixir.bootlin.com/linux/v4.5/source/arch/arm64/include/uapi/asm/sigcontext.h
it is 0 from 30 as r31 is SP, it is already part as struct sigcontext::sp.
>
> > + oops_print("X%.2d: 0x%.16llx%s", i, mc->regs[i],
> > +i & 0x1 ? "\n" : " ");
>
> Dave
Re: [dpdk-dev] [PATCH v16] app/testpmd: support multi-process
On 8/2/2021 1:33 PM, Thomas Monjalon wrote: 02/08/2021 03:51, Min Hu (Connor): 在 2021/7/26 15:28, Min Hu (Connor) 写道: 在 2021/7/26 14:30, Thomas Monjalon 写道: 26/07/2021 02:26, Min Hu (Connor): 在 2021/7/24 19:45, Thomas Monjalon 写道: 10/07/2021 05:50, Min Hu (Connor): This patch adds multi-process support for testpmd. For example the following commands run two testpmd processes: * the primary process: ./dpdk-testpmd --proc-type=auto -l 0-1 -- -i \ --rxq=4 --txq=4 --num-procs=2 --proc-id=0 * the secondary process: ./dpdk-testpmd --proc-type=auto -l 2-3 -- -i \ --rxq=4 --txq=4 --num-procs=2 --proc-id=1 Signed-off-by: Min Hu (Connor) Signed-off-by: Lijun Ou Signed-off-by: Andrew Rybchenko Acked-by: Xiaoyun Li Acked-by: Ajit Khaparde Reviewed-by: Ferruh Yigit --- V16: * revert unrelated changes. * add some restrictions in doc. I didn't see clear agreement to integrate this feature in DPDK 21.08. BTW, the testpmd maintainer was not Cc'ed. Hi, Thomas, This patch has two "acked" and one "reviewed-by". And Xiaoyun Li is the maintainer, I has already Cc'ed to him/her, please check it out, thanks. Andrew's comment from v15: " IMHO, as I state above, current state is insufficient to consider is a start point to be applied. " Hi, Andrew, Thomos, What is the least thing should be done for this patch to meet the state sufficient to be applied? Hi, all, How about this patch, could it be applied? I was not confident enough to apply it in 21.08. When others will be back, we'll discuss it again for 21.11. For 21.11 release. Acked-by: Aman Deep Singh
Re: [dpdk-dev] [PATCH v4 2/2] net: added macro to extract MAC address bytes
On Mon, 16 Aug 2021 15:27:28 +0530
Aman Singh wrote:
> Added macros to simplify print of MAC address.
> The six bytes of a MAC address are extracted in
> a macro here, to improve code readablity.
>
> Signed-off-by: Aman Singh
> Reviewed-by: Ferruh Yigit
> ---
> The change in the document will be done in seperate patch.
> To ensure document has direct reference of the code as shown in
> commit 413c75c33c40 ("doc: show how to include code in guides").
NAK
The DPDK already has rte_ether_format_addr()
why does so much code not use it?
Re: [dpdk-dev] [PATCH 1/2] app/testpmd: fix csumonly mode when run without outer chksum
> -Original Message-
> From: Nithin Dabilpuram
> Sent: Monday, August 16, 2021 18:56
> To: Li, Xiaoyun
> Cc: jer...@marvell.com; dev@dpdk.org; jia@intel.com; sta...@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH 1/2] app/testpmd: fix csumonly mode when run
> without outer chksum
>
> On Mon, Aug 16, 2021 at 08:48:20AM +, Li, Xiaoyun wrote:
> > Hi
> >
> > > -Original Message-
> > > From: Nithin Dabilpuram
> > > Sent: Monday, August 16, 2021 15:10
> > > To: Li, Xiaoyun
> > > Cc: jer...@marvell.com; dev@dpdk.org; Nithin Dabilpuram
> > > ; jia@intel.com; sta...@dpdk.org
> > > Subject: [PATCH 1/2] app/testpmd: fix csumonly mode when run without
> > > outer chksum
> > >
> > > Donot use outer metadata when neither outer ip checksum nor outer
> > > udp checksum is enabled. PMD's will ignore the outer_l2_len and
> > > outer_l3_len in cases where none of the outer checksum is enabled
> > > and hence only l2_len and l3_len will be used to calculate the offsets
> > > for L2
> or L3 header.
> >
> > I don't understand.
> > In process_outer_chksum, only PKT_TX_OUTER_IPV6 Will be set if it's ipv6
> packets.
> > So PKT_TX_OUTER_IPV6 means this packet is tunnel ipv6 packet. So it actually
> needs outer l2 len and outer l3 len put them to hw.
> > At least i40e needs outer l2 len and outer l3 len as far as I know.
>
> Ok, do you mean m->outer_l2_len and m->outer_l3_len will be referred in i40e
> driver even when both DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM and
> DEV_TX_OFFLOAD_OUTER_UDP_CKSUM are not enabled in ethdev Tx offloads ?
>
> I thought as per spec, those fields will only be used when the Outer offloads
> are
> enabled.
Checked again. You're right. Tx offloads are enough.
>
> >
> > >
> > > Fixes: 3c32113a1aac ("app/testpmd: fix IPv6 tunnel checksum")
> > > Cc: jia@intel.com
> > > Cc: sta...@dpdk.org
> > >
> > > Signed-off-by: Nithin Dabilpuram
> > > ---
> > > app/test-pmd/csumonly.c | 3 +--
> > > 1 file changed, 1 insertion(+), 2 deletions(-)
> > >
> > > diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index
> > > 607c889..38cc256 100644
> > > --- a/app/test-pmd/csumonly.c
> > > +++ b/app/test-pmd/csumonly.c
> > > @@ -961,8 +961,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
> > > (tx_offloads &
> > >DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) ||
> > > (tx_offloads &
> > > - DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) ||
> > > - (tx_ol_flags & PKT_TX_OUTER_IPV6)) {
> > > + DEV_TX_OFFLOAD_OUTER_UDP_CKSUM)) {
> > > m->outer_l2_len = info.outer_l2_len;
> > > m->outer_l3_len = info.outer_l3_len;
> > > m->l2_len = info.l2_len;
> > > --
> > > 2.8.4
> >
Re: [dpdk-dev] [PATCH 1/2] app/testpmd: fix csumonly mode when run without outer chksum
> -Original Message-
> From: Nithin Dabilpuram
> Sent: Monday, August 16, 2021 15:10
> To: Li, Xiaoyun
> Cc: jer...@marvell.com; dev@dpdk.org; Nithin Dabilpuram
> ; jia@intel.com; sta...@dpdk.org
> Subject: [PATCH 1/2] app/testpmd: fix csumonly mode when run without outer
> chksum
>
> Donot use outer metadata when neither outer ip checksum nor outer udp
> checksum is enabled. PMD's will ignore the outer_l2_len and outer_l3_len in
> cases where none of the outer checksum is enabled and hence only l2_len and
> l3_len will be used to calculate the offsets for L2 or L3 header.
>
> Fixes: 3c32113a1aac ("app/testpmd: fix IPv6 tunnel checksum")
> Cc: jia@intel.com
> Cc: sta...@dpdk.org
>
> Signed-off-by: Nithin Dabilpuram
> ---
> app/test-pmd/csumonly.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index
> 607c889..38cc256 100644
> --- a/app/test-pmd/csumonly.c
> +++ b/app/test-pmd/csumonly.c
> @@ -961,8 +961,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
> (tx_offloads &
>DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) ||
> (tx_offloads &
> - DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) ||
> - (tx_ol_flags & PKT_TX_OUTER_IPV6)) {
> + DEV_TX_OFFLOAD_OUTER_UDP_CKSUM)) {
> m->outer_l2_len = info.outer_l2_len;
> m->outer_l3_len = info.outer_l3_len;
> m->l2_len = info.l2_len;
> --
> 2.8.4
Acked-by: Xiaoyun Li
Re: [dpdk-dev] [PATCH 2/2] app/testpmd: fix verbose mode dump for Tx
> -Original Message-
> From: Nithin Dabilpuram
> Sent: Monday, August 16, 2021 15:10
> To: Li, Xiaoyun
> Cc: jer...@marvell.com; dev@dpdk.org; Nithin Dabilpuram
> ; rasl...@mellanox.com; sta...@dpdk.org
> Subject: [PATCH 2/2] app/testpmd: fix verbose mode dump for Tx
>
> Fix verbose mode dump for Tx to dump tx offload flags instead of Rx offload
> flags.
>
> Fixes: d862c45b5955 ("app/testpmd: move dumping packets to a separate
> function")
> Cc: rasl...@mellanox.com
> Cc: sta...@dpdk.org
>
> Signed-off-by: Nithin Dabilpuram
> ---
> app/test-pmd/util.c | 6 +-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c index 5dd7157..14a9a25
> 100644
> --- a/app/test-pmd/util.c
> +++ b/app/test-pmd/util.c
> @@ -275,7 +275,11 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue,
> struct rte_mbuf *pkts[],
> " - %s queue=0x%x", is_rx ? "Receive" : "Send",
> (unsigned int) queue);
> MKDUMPSTR(print_buf, buf_size, cur_len, "\n");
> - rte_get_rx_ol_flag_list(mb->ol_flags, buf, sizeof(buf));
> + if (is_rx)
> + rte_get_rx_ol_flag_list(mb->ol_flags, buf, sizeof(buf));
> + else
> + rte_get_tx_ol_flag_list(mb->ol_flags, buf, sizeof(buf));
> +
> MKDUMPSTR(print_buf, buf_size, cur_len,
> " ol_flags: %s\n", buf);
> if (rte_mbuf_check(mb, 1, &reason) < 0)
> --
> 2.8.4
Acked-by: Xiaoyun Li
[dpdk-dev] [PATCH v2 0/6] support oops handling
From: Jerin Jacob v2: - Fix powerpc build (David Christensen) It is handy to get detailed OOPS information like Linux kernel when DPDK application crashes without losing any of the features provided by coredump infrastructure by the OS. This patch series introduces the APIs to handle OOPS in DPDK. Following section details the implementation and API interface to application. On rte_eal_init() invocation, the EAL library installs the oops handler for the essential signals. The rte_oops_signals_enabled() API provides the list of signals the library installed by the EAL. The default EAL oops handler decodes the oops message using rte_oops_decode() and then calls the signal handler installed by the application before invoking the rte_eal_init(). This scheme will also enable the use of the default coredump handler(for gdb etc.) provided by OS if the application does not install any specific signal handler. The second case where the application installs the signal handler after the rte_eal_init() invocation, rte_oops_decode() provides the means of decoding the oops message in the application's fault handler. Patch split: Patch 1/6: defines the API and stub implementation for Unix systems Patch 2/6: The API implementation Patch 3/6: add an optional libunwind dependency to DPDK for better backtrace in oops. Patch 4/6: x86 specific archinfo like x86 register dump on oops Patch 5/6: arm64 specific archinfo like arm64 register dump on oops Patch 6/6: UT for the new APIs Example command for the build, run, and output logs of an x86-64 linux machine. meson --buildtype debug build ninja -C build echo "oops_autotest" | ./build/app/test/dpdk-test --no-huge -c 0x2 Signal info: PID: 2439496 Signal number: 11 Fault address: 0x5 Backtrace: -- [ 0x55e8b56d5cee]: test_oops_generate()+0x75 [ 0x55e8b5459843]: unit_test_suite_runner()+0x1aa [ 0x55e8b56d605c]: test_oops()+0x13 [ 0x55e8b544bdfc]: cmd_autotest_parsed()+0x55 [ 0x55e8b6063a0d]: cmdline_parse()+0x319 [ 0x55e8b6061dea]: cmdline_valid_buffer()+0x35 [ 0x55e8b6066bd8]: rdline_char_in()+0xc48 [ 0x55e8b606221c]: cmdline_in()+0x62 [ 0x55e8b6062495]: cmdline_interact()+0x56 [ 0x55e8b5459314]: main()+0x65e [ 0x7f54b25d2b25]: __libc_start_main()+0xd5 [ 0x55e8b544bc9e]: _start()+0x2e Arch info: -- R8 : 0x R9 : 0x R10: 0x7f54b25b8b48 R11: 0x7f54b25e7930 R12: 0x7fffc695e610 R13: 0x R14: 0x R15: 0x RAX: 0x0005 RBX: 0x0001 RCX: 0x7f54b278a943 RDX: 0x3769043bf13a2594 RBP: 0x7fffc6958340 RSP: 0x7fffc6958330 RSI: 0x RDI: 0x55e8c4c1e380 RIP: 0x55e8b56d5cee EFL: 0x00010246 Stack dump: -- 0x7fffc6958330: 0x600 0x7fffc6958334: 0x0 0x7fffc6958338: 0x30cfeac5 0x7fffc695833c: 0x0 0x7fffc6958340: 0xe08395c6 0x7fffc6958344: 0xff7f 0x7fffc6958348: 0x439845b5 0x7fffc695834c: 0xe855 0x7fffc6958350: 0x0 0x7fffc6958354: 0xb00 0x7fffc6958358: 0x20445bb9 0x7fffc695835c: 0xe855 0x7fffc6958360: 0x925506b6 0x7fffc6958364: 0x0 0x7fffc6958368: 0x0 0x7fffc695836c: 0x0 Code dump: -- 0x55e8b56d5cee: 0xc700 0x55e8b56d5cf2: 0xeb12 0x55e8b56d5cf6: 0xfb6054b 0x55e8b56d5cfa: 0x87540f84 0x55e8b56d5cfe: 0xc07407b8 0x55e8b56d5d02: 0x0 0x55e8b56d5d06: 0xeb05b8ff 0x55e8b56d5d0a: 0xffc9 0x55e8b56d5d0e: 0xc3554889 0x55e8b56d5d12: 0xe54881ec 0x55e8b56d5d16: 0xc000 0x55e8b56d5d1a: 0x89bd4cff 0x55e8b56d5d1e: 0x4889 0x55e8b56d5d22: 0xb540 Jerin Jacob (6): eal: introduce oops handling API eal: oops handling API implementation eal: support libunwind based backtrace eal/x86: support register dump for oops eal/arm64: support register dump for oops test/oops: support unit test case for oops handling APIs .github/workflows/build.yml | 2 +- .travis.yml | 2 +- app/test/meson.build | 2 + app/test/test_oops.c | 121 ++ config/meson.build | 8 + doc/api/doxy-api-index.md| 3 +- lib/eal/common/eal_private.h | 3 + lib/eal/freebsd/eal.c| 6 + lib/eal/include/meson.build | 1 + lib/eal/include/rte_oops.h | 100 lib/eal/linux/eal.c | 6 + lib/eal/unix/eal_oops.c | 298 +++ lib/eal/unix/meson.build | 1 + lib/eal/version.map | 4 + 14 files changed, 554 insertions(+), 3 deletions(-) create mode 100644 app/test/test_oops.c create mode 100644 lib/eal/include/rte_oops.h create mode 100644 lib/eal/unix/eal_oops.c -- 2.32.0
[dpdk-dev] [PATCH v2 1/6] eal: introduce oops handling API
From: Jerin Jacob
Introducing oops handling API with following specification
and enable stub implementation for Linux and FreeBSD.
On rte_eal_init() invocation, the EAL library installs the
oops handler for the essential signals.
The rte_oops_signals_enabled() API provides the list
of signals the library installed by the EAL.
The default EAL oops handler decodes the oops message using
rte_oops_decode() and then calls the signal handler
installed by the application before invoking the rte_eal_init().
This scheme will also enable the use of the default coredump
handler(for gdb etc.) provided by OS if the application does
not install any specific signal handler.
The second case where the application installs the signal
handler after the rte_eal_init() invocation, rte_oops_decode()
provides the means of decoding the oops message in
the application's fault handler.
Signed-off-by: Jerin Jacob
---
doc/api/doxy-api-index.md| 3 +-
lib/eal/common/eal_private.h | 3 ++
lib/eal/freebsd/eal.c| 6 +++
lib/eal/include/meson.build | 1 +
lib/eal/include/rte_oops.h | 100 +++
lib/eal/linux/eal.c | 6 +++
lib/eal/unix/eal_oops.c | 36 +
lib/eal/unix/meson.build | 1 +
lib/eal/version.map | 4 ++
9 files changed, 159 insertions(+), 1 deletion(-)
create mode 100644 lib/eal/include/rte_oops.h
create mode 100644 lib/eal/unix/eal_oops.c
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index 1992107a03..0d0da35205 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -215,7 +215,8 @@ The public API headers are grouped by topics:
[log](@ref rte_log.h),
[errno] (@ref rte_errno.h),
[trace] (@ref rte_trace.h),
- [trace_point](@ref rte_trace_point.h)
+ [trace_point](@ref rte_trace_point.h),
+ [oops] (@ref rte_oops.h)
- **misc**:
[EAL config] (@ref rte_eal.h),
diff --git a/lib/eal/common/eal_private.h b/lib/eal/common/eal_private.h
index 64cf4e81c8..c3a490d803 100644
--- a/lib/eal/common/eal_private.h
+++ b/lib/eal/common/eal_private.h
@@ -716,6 +716,9 @@ void __rte_thread_init(unsigned int lcore_id, rte_cpuset_t
*cpuset);
*/
void __rte_thread_uninit(void);
+int eal_oops_init(void);
+void eal_oops_fini(void);
+
/**
* asprintf(3) replacement for Windows.
*/
diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
index 6cee5ae369..3c098708c6 100644
--- a/lib/eal/freebsd/eal.c
+++ b/lib/eal/freebsd/eal.c
@@ -692,6 +692,11 @@ rte_eal_init(int argc, char **argv)
return -1;
}
+ if (eal_oops_init()) {
+ rte_eal_init_alert("oops init failed.");
+ rte_errno = ENOENT;
+ }
+
thread_id = pthread_self();
eal_reset_internal_config(internal_conf);
@@ -974,6 +979,7 @@ rte_eal_cleanup(void)
rte_trace_save();
eal_trace_fini();
eal_cleanup_config(internal_conf);
+ eal_oops_fini();
return 0;
}
diff --git a/lib/eal/include/meson.build b/lib/eal/include/meson.build
index 88a9eba12f..6c74bdb7b5 100644
--- a/lib/eal/include/meson.build
+++ b/lib/eal/include/meson.build
@@ -30,6 +30,7 @@ headers += files(
'rte_malloc.h',
'rte_memory.h',
'rte_memzone.h',
+'rte_oops.h',
'rte_pci_dev_feature_defs.h',
'rte_pci_dev_features.h',
'rte_per_lcore.h',
diff --git a/lib/eal/include/rte_oops.h b/lib/eal/include/rte_oops.h
new file mode 100644
index 00..ff82c409ec
--- /dev/null
+++ b/lib/eal/include/rte_oops.h
@@ -0,0 +1,100 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2020 Marvell.
+ */
+
+#ifndef _RTE_OOPS_H_
+#define _RTE_OOPS_H_
+
+#include
+#include
+#include
+
+/**
+ * @file
+ *
+ * RTE oops API
+ *
+ * This file provides the oops handling APIs to RTE applications.
+ *
+ * On rte_eal_init() invocation, the EAL library installs the oops handler for
+ * the essential signals. The rte_oops_signals_enabled() API provides the list
+ * of signals the library installed by the EAL.
+ *
+ * The default EAL oops handler decodes the oops message using
rte_oops_decode()
+ * and then calls the signal handler installed by the application before
+ * invoking the rte_eal_init(). This scheme will also enable the use of
+ * the default coredump handler(for gdb etc.) provided by OS if the application
+ * does not install any specific signal handler.
+ *
+ * The second case where the application installs the signal handler after
+ * the rte_eal_init() invocation, rte_oops_decode() provides the means of
+ * decoding the oops message in the application's fault handler.
+ *
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Maximum number of oops signals enabled in EAL.
+ * @see rte_oops_signals_enabled()
+ */
+#define RTE_OOPS_SIGNALS_MA
[dpdk-dev] [PATCH v2 2/6] eal: oops handling API implementation
From: Jerin Jacob
Implement the base oops handling APIs.
Signed-off-by: Jerin Jacob
---
lib/eal/unix/eal_oops.c | 176 ++--
1 file changed, 169 insertions(+), 7 deletions(-)
diff --git a/lib/eal/unix/eal_oops.c b/lib/eal/unix/eal_oops.c
index 53b580f733..7b12cfd5f5 100644
--- a/lib/eal/unix/eal_oops.c
+++ b/lib/eal/unix/eal_oops.c
@@ -2,35 +2,197 @@
* Copyright(C) 2021 Marvell.
*/
+#include
+#include
+#include
+#include
+#include
+#include
+#include
#include
#include "eal_private.h"
-void
-rte_oops_decode(int sig, siginfo_t *info, ucontext_t *uc)
+#define oops_print(...) rte_log(RTE_LOG_ERR, RTE_LOGTYPE_EAL, __VA_ARGS__)
+
+static int oops_signals[] = {SIGSEGV, SIGBUS, SIGILL, SIGABRT, SIGFPE, SIGSYS};
+
+struct oops_signal {
+ int sig;
+ bool enabled;
+ struct sigaction sa;
+};
+
+static struct oops_signal signals_db[RTE_DIM(oops_signals)];
+
+static void
+back_trace_dump(ucontext_t *context)
+{
+ RTE_SET_USED(context);
+
+ rte_dump_stack();
+}
+static void
+siginfo_dump(int sig, siginfo_t *info)
+{
+ oops_print("PID: %" PRIdMAX "\n", (intmax_t)getpid());
+
+ if (info == NULL)
+ return;
+ if (sig != info->si_signo)
+ oops_print("Invalid signal info\n");
+
+ oops_print("Signal number: %d\n", info->si_signo);
+ oops_print("Fault address: %p\n", info->si_addr);
+}
+
+static void
+mem32_dump(void *ptr)
+{
+ uint32_t *p = ptr;
+ int i;
+
+ for (i = 0; i < 16; i++)
+ oops_print("%p: 0x%x\n", p + i, rte_be_to_cpu_32(p[i]));
+}
+
+static void
+stack_dump_header(void)
+{
+ oops_print("Stack dump:\n");
+ oops_print("--\n");
+}
+
+static void
+code_dump_header(void)
+{
+ oops_print("Code dump:\n");
+ oops_print("--\n");
+}
+
+static void
+stack_code_dump(void *stack, void *code)
+{
+ if (stack == NULL || code == NULL)
+ return;
+
+ oops_print("\n");
+ stack_dump_header();
+ mem32_dump(stack);
+ oops_print("\n");
+
+ code_dump_header();
+ mem32_dump(code);
+ oops_print("\n");
+}
+static void
+archinfo_dump(ucontext_t *uc)
{
- RTE_SET_USED(sig);
- RTE_SET_USED(info);
RTE_SET_USED(uc);
+ stack_code_dump(NULL, NULL);
+}
+
+static void
+default_signal_handler_invoke(int sig)
+{
+ unsigned int idx;
+
+ for (idx = 0; idx < RTE_DIM(oops_signals); idx++) {
+ /* Skip disabled signals */
+ if (signals_db[idx].sig != sig)
+ continue;
+ if (!signals_db[idx].enabled)
+ continue;
+ /* Replace with stored handler */
+ sigaction(sig, &signals_db[idx].sa, NULL);
+ kill(getpid(), sig);
+ }
+}
+
+void
+rte_oops_decode(int sig, siginfo_t *info, ucontext_t *uc)
+{
+ oops_print("Signal info:\n");
+ oops_print("\n");
+ siginfo_dump(sig, info);
+ oops_print("\n");
+
+ oops_print("Backtrace:\n");
+ oops_print("--\n");
+ back_trace_dump(uc);
+ oops_print("\n");
+
+ oops_print("Arch info:\n");
+ oops_print("--\n");
+ if (uc)
+ archinfo_dump(uc);
+}
+
+static void
+eal_oops_handler(int sig, siginfo_t *info, void *ctx)
+{
+ ucontext_t *uc = ctx;
+
+ rte_oops_decode(sig, info, uc);
+ default_signal_handler_invoke(sig);
}
int
rte_oops_signals_enabled(int *signals)
{
- RTE_SET_USED(signals);
+ int count = 0, sig[RTE_OOPS_SIGNALS_MAX];
+ unsigned int idx = 0;
- return 0;
+ for (idx = 0; idx < RTE_DIM(oops_signals); idx++) {
+ if (signals_db[idx].enabled) {
+ sig[count] = signals_db[idx].sig;
+ count++;
+ }
+ }
+ if (signals)
+ memcpy(signals, sig, sizeof(*signals) * count);
+
+ return count;
}
int
eal_oops_init(void)
{
- return 0;
+ unsigned int idx, rc = 0;
+ struct sigaction sa;
+
+ RTE_BUILD_BUG_ON(RTE_DIM(oops_signals) > RTE_OOPS_SIGNALS_MAX);
+
+ sigemptyset(&sa.sa_mask);
+ sa.sa_sigaction = &eal_oops_handler;
+ sa.sa_flags = SA_RESTART | SA_SIGINFO | SA_ONSTACK;
+
+ for (idx = 0; idx < RTE_DIM(oops_signals); idx++) {
+ signals_db[idx].sig = oops_signals[idx];
+ /* Get exiting sigaction */
+ rc = sigaction(signals_db[idx].sig, NULL, &signals_db[idx].sa);
+ if (rc)
+ continue;
+ /* Replace with oops handler */
+ rc = sigaction(signals_db[idx].sig, &sa, NULL);
+ if (rc)
+ continue;
+ signals_db[idx].enabled = true;
+ }
+ return rc;
}
void
eal_oops_fini(void)
{
+ unsigned int idx;
+
+ fo
[dpdk-dev] [PATCH v2 3/6] eal: support libunwind based backtrace
From: Jerin Jacob
adding optional libwind library dependency to DPDK for
enhanced backtrace based on ucontext.
Signed-off-by: Jerin Jacob
---
.github/workflows/build.yml | 2 +-
.travis.yml | 2 +-
config/meson.build | 8 +++
lib/eal/unix/eal_oops.c | 47 +
4 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7dac20ddeb..caaca207a6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -93,7 +93,7 @@ jobs:
run: sudo apt install -y ccache libnuma-dev python3-setuptools
python3-wheel python3-pip python3-pyelftools ninja-build libbsd-dev
libpcap-dev libibverbs-dev libcrypto++-dev libfdt-dev libjansson-dev
-libarchive-dev
+libarchive-dev libunwind-dev
- name: Install libabigail build dependencies if no cache is available
if: env.ABI_CHECKS == 'true' && steps.libabigail-cache.outputs.cache-hit
!= 'true'
run: sudo apt install -y autoconf automake libtool pkg-config libxml2-dev
diff --git a/.travis.yml b/.travis.yml
index 23067d9e3c..e72b156014 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ addons:
packages: &required_packages
- [libnuma-dev, python3-setuptools, python3-wheel, python3-pip,
python3-pyelftools, ninja-build]
- [libbsd-dev, libpcap-dev, libibverbs-dev, libcrypto++-dev, libfdt-dev,
libjansson-dev]
- - [libarchive-dev]
+ - [libarchive-dev, libunwind-dev]
_aarch64_packages: &aarch64_packages
- *required_packages
diff --git a/config/meson.build b/config/meson.build
index e80421003b..26a85dab6b 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -236,6 +236,14 @@ if cc.get_id() == 'clang' and dpdk_conf.get('RTE_ARCH_64')
== false
dpdk_extra_ldflags += '-latomic'
endif
+# check for libunwind
+unwind_dep = dependency('libunwind', required: false, method: 'pkg-config')
+if unwind_dep.found() and cc.has_header('libunwind.h', dependencies:
unwind_dep)
+dpdk_conf.set('RTE_USE_LIBUNWIND', 1)
+add_project_link_arguments('-lunwind', language: 'c')
+dpdk_extra_ldflags += '-lunwind'
+endif
+
# add -include rte_config to cflags
add_project_arguments('-include', 'rte_config.h', language: 'c')
diff --git a/lib/eal/unix/eal_oops.c b/lib/eal/unix/eal_oops.c
index 7b12cfd5f5..a7f00ecd4e 100644
--- a/lib/eal/unix/eal_oops.c
+++ b/lib/eal/unix/eal_oops.c
@@ -26,6 +26,50 @@ struct oops_signal {
static struct oops_signal signals_db[RTE_DIM(oops_signals)];
+#if defined(RTE_USE_LIBUNWIND)
+
+#define BACKTRACE_DEPTH 256
+#define UNW_LOCAL_ONLY
+#include
+
+static void
+back_trace_dump(ucontext_t *context)
+{
+ unw_cursor_t cursor;
+ unw_word_t ip, off;
+ int rc, level = 0;
+ char name[256];
+
+ if (context == NULL) {
+ rte_dump_stack();
+ return;
+ }
+
+ rc = unw_init_local(&cursor, (unw_context_t *)context);
+ if (rc < 0)
+ goto fail;
+
+ for (;;) {
+ rc = unw_get_reg(&cursor, UNW_REG_IP, &ip);
+ if (rc < 0)
+ goto fail;
+ rc = unw_get_proc_name(&cursor, name, sizeof(name), &off);
+ if (rc == 0)
+ oops_print("[%16p]: %s()+0x%" PRIx64 "\n", (void *)ip,
+ name, (uint64_t)off);
+ else
+ oops_print("[%16p]: \n", (void *)ip);
+ rc = unw_step(&cursor);
+ if (rc <= 0 || ++level >= BACKTRACE_DEPTH)
+ break;
+ }
+ return;
+fail:
+ oops_print("libunwind call failed %s\n", unw_strerror(rc));
+}
+
+#else
+
static void
back_trace_dump(ucontext_t *context)
{
@@ -33,6 +77,9 @@ back_trace_dump(ucontext_t *context)
rte_dump_stack();
}
+
+#endif
+
static void
siginfo_dump(int sig, siginfo_t *info)
{
--
2.32.0
[dpdk-dev] [PATCH v2 4/6] eal/x86: support register dump for oops
From: Jerin Jacob
Dump the x86 arch state register in oops
handling routine.
Signed-off-by: Jerin Jacob
---
lib/eal/unix/eal_oops.c | 34 ++
1 file changed, 34 insertions(+)
diff --git a/lib/eal/unix/eal_oops.c b/lib/eal/unix/eal_oops.c
index a7f00ecd4e..a0f9526d96 100644
--- a/lib/eal/unix/eal_oops.c
+++ b/lib/eal/unix/eal_oops.c
@@ -133,6 +133,38 @@ stack_code_dump(void *stack, void *code)
mem32_dump(code);
oops_print("\n");
}
+
+#if defined(RTE_ARCH_X86_64) && defined(RTE_EXEC_ENV_LINUX)
+static void
+archinfo_dump(ucontext_t *uc)
+{
+
+ mcontext_t *mc = &uc->uc_mcontext;
+
+ oops_print("R8 : 0x%.16llx ", mc->gregs[REG_R8]);
+ oops_print("R9 : 0x%.16llx\n", mc->gregs[REG_R9]);
+ oops_print("R10: 0x%.16llx ", mc->gregs[REG_R10]);
+ oops_print("R11: 0x%.16llx\n", mc->gregs[REG_R11]);
+ oops_print("R12: 0x%.16llx ", mc->gregs[REG_R12]);
+ oops_print("R13: 0x%.16llx\n", mc->gregs[REG_R13]);
+ oops_print("R14: 0x%.16llx ", mc->gregs[REG_R14]);
+ oops_print("R15: 0x%.16llx\n", mc->gregs[REG_R15]);
+ oops_print("RAX: 0x%.16llx ", mc->gregs[REG_RAX]);
+ oops_print("RBX: 0x%.16llx\n", mc->gregs[REG_RBX]);
+ oops_print("RCX: 0x%.16llx ", mc->gregs[REG_RCX]);
+ oops_print("RDX: 0x%.16llx\n", mc->gregs[REG_RDX]);
+ oops_print("RBP: 0x%.16llx ", mc->gregs[REG_RBP]);
+ oops_print("RSP: 0x%.16llx\n", mc->gregs[REG_RSP]);
+ oops_print("RSI: 0x%.16llx ", mc->gregs[REG_RSI]);
+ oops_print("RDI: 0x%.16llx\n", mc->gregs[REG_RDI]);
+ oops_print("RIP: 0x%.16llx ", mc->gregs[REG_RIP]);
+ oops_print("EFL: 0x%.16llx\n", mc->gregs[REG_EFL]);
+
+ stack_code_dump((void *)mc->gregs[REG_RSP], (void *)mc->gregs[REG_RIP]);
+}
+
+#else
+
static void
archinfo_dump(ucontext_t *uc)
{
@@ -141,6 +173,8 @@ archinfo_dump(ucontext_t *uc)
stack_code_dump(NULL, NULL);
}
+#endif
+
static void
default_signal_handler_invoke(int sig)
{
--
2.32.0
[dpdk-dev] [PATCH v2 5/6] eal/arm64: support register dump for oops
From: Jerin Jacob
Dump the arm64 arch state register in oops
handling routine.
Signed-off-by: Jerin Jacob
---
lib/eal/unix/eal_oops.c | 19 +++
1 file changed, 19 insertions(+)
diff --git a/lib/eal/unix/eal_oops.c b/lib/eal/unix/eal_oops.c
index a0f9526d96..9c783f936a 100644
--- a/lib/eal/unix/eal_oops.c
+++ b/lib/eal/unix/eal_oops.c
@@ -163,6 +163,25 @@ archinfo_dump(ucontext_t *uc)
stack_code_dump((void *)mc->gregs[REG_RSP], (void *)mc->gregs[REG_RIP]);
}
+#elif defined(RTE_ARCH_ARM64) && defined(RTE_EXEC_ENV_LINUX)
+
+static void
+archinfo_dump(ucontext_t *uc)
+{
+ mcontext_t *mc = &uc->uc_mcontext;
+ int i;
+
+ oops_print("PC : 0x%.16llx ", mc->pc);
+ oops_print("SP : 0x%.16llx\n", mc->sp);
+ for (i = 0; i < 31; i++)
+ oops_print("X%.2d: 0x%.16llx%s", i, mc->regs[i],
+ i & 0x1 ? "\n" : " ");
+
+ oops_print("PSTATE: 0x%.16llx\n", mc->pstate);
+
+ stack_code_dump((void *)mc->sp, (void *)mc->pc);
+}
+
#else
static void
--
2.32.0
[dpdk-dev] [PATCH v2 6/6] test/oops: support unit test case for oops handling APIs
From: Jerin Jacob
Added unit test cases for all the oops handling APIs.
Signed-off-by: Jerin Jacob
---
app/test/meson.build | 2 +
app/test/test_oops.c | 121 +++
2 files changed, 123 insertions(+)
create mode 100644 app/test/test_oops.c
diff --git a/app/test/meson.build b/app/test/meson.build
index a7611686ad..1e471ab351 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -97,6 +97,7 @@ test_sources = files(
'test_metrics.c',
'test_mcslock.c',
'test_mp_secondary.c',
+'test_oops.c',
'test_per_lcore.c',
'test_pflock.c',
'test_pmd_perf.c',
@@ -236,6 +237,7 @@ fast_tests = [
['memzone_autotest', false],
['meter_autotest', true],
['multiprocess_autotest', false],
+['oops_autotest', true],
['per_lcore_autotest', true],
['pflock_autotest', true],
['prefetch_autotest', true],
diff --git a/app/test/test_oops.c b/app/test/test_oops.c
new file mode 100644
index 00..60a7f259c7
--- /dev/null
+++ b/app/test/test_oops.c
@@ -0,0 +1,121 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell
+ */
+
+#include
+#include
+
+#include
+#include
+
+#include "test.h"
+
+static jmp_buf pc;
+static bool detected_segfault;
+
+static void
+segv_handler(int sig, siginfo_t *info, void *ctx)
+{
+ detected_segfault = true;
+ rte_oops_decode(sig, info, (ucontext_t *)ctx);
+ longjmp(pc, 1);
+}
+
+/* OS specific way install the signal segfault handler*/
+static int
+segv_handler_install(void)
+{
+ struct sigaction sa;
+
+ sigemptyset(&sa.sa_mask);
+ sa.sa_sigaction = &segv_handler;
+ sa.sa_flags = SA_SIGINFO;
+
+ return sigaction(SIGSEGV, &sa, NULL);
+}
+
+static int
+test_oops_generate(void)
+{
+ int rc;
+
+ rc = segv_handler_install();
+ TEST_ASSERT_EQUAL(rc, 0, "rc=%d\n", rc);
+
+ detected_segfault = false;
+ rc = setjmp(pc); /* Save the execution state */
+ if (rc == 0) {
+ /* Generate a segfault */
+ *(volatile int *)0x05 = 0;
+ } else { /* logjump from segv_handler */
+ if (detected_segfault)
+ return TEST_SUCCESS;
+
+ }
+ return TEST_FAILED;
+}
+
+static int
+test_signal_handler_installed(int count, int *signals)
+{
+ int i, rc, verified = 0;
+ struct sigaction sa;
+
+ for (i = 0; i < count; i++) {
+ rc = sigaction(signals[i], NULL, &sa);
+ if (rc) {
+ printf("Failed to get sigaction for %d", signals[i]);
+ continue;
+ }
+ if (sa.sa_handler != SIG_DFL)
+ verified++;
+ }
+ TEST_ASSERT_EQUAL(count, verified, "count=%d verified=%d\n", count,
+ verified);
+ return TEST_SUCCESS;
+}
+
+static int
+test_oops_signals_enabled(void)
+{
+ int *signals = NULL;
+ int i, rc;
+
+ rc = rte_oops_signals_enabled(signals);
+ TEST_ASSERT_NOT_EQUAL(rc, 0, "rc=%d\n", rc);
+
+ signals = malloc(sizeof(int) * rc);
+ rc = rte_oops_signals_enabled(signals);
+ TEST_ASSERT_NOT_EQUAL(rc, 0, "rc=%d\n", rc);
+ free(signals);
+
+ signals = malloc(sizeof(int) * RTE_OOPS_SIGNALS_MAX);
+ rc = rte_oops_signals_enabled(signals);
+ TEST_ASSERT_NOT_EQUAL(rc, 0, "rc=%d\n", rc);
+
+ for (i = 0; i < rc; i++)
+ TEST_ASSERT_NOT_EQUAL(signals[i], 0, "idx=%d val=%d\n", i,
+ signals[i]);
+
+ rc = test_signal_handler_installed(rc, signals);
+ free(signals);
+
+ return rc;
+}
+
+static struct unit_test_suite oops_tests = {
+ .suite_name = "oops autotest",
+ .setup = NULL,
+ .teardown = NULL,
+ .unit_test_cases = {
+ TEST_CASE(test_oops_signals_enabled),
+ TEST_CASE(test_oops_generate),
+ TEST_CASES_END()}};
+
+static int
+test_oops(void)
+{
+ return unit_test_suite_runner(&oops_tests);
+}
+
+REGISTER_TEST_COMMAND(oops_autotest, test_oops);
--
2.32.0
[dpdk-dev] [PATCH] net/ice: fix wrong rxdid
Since DPDK 20.11 the default rxdid is changed from 16 to 22, but the
DCF data path didn't change, the patch fix the gap.
Fixes: 12443386a0b0 ("net/ice: support flex Rx descriptor RxDID22")
Cc: sta...@dpdk.org
Signed-off-by: Qi Zhang
---
drivers/net/ice/ice_dcf.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c
index 4c2e0c7216..5b23cc90e0 100644
--- a/drivers/net/ice/ice_dcf.c
+++ b/drivers/net/ice/ice_dcf.c
@@ -847,7 +847,7 @@ ice_dcf_init_rss(struct ice_dcf_hw *hw)
#define IAVF_RXDID_LEGACY_0 0
#define IAVF_RXDID_LEGACY_1 1
-#define IAVF_RXDID_COMMS_GENERIC 16
+#define IAVF_RXDID_COMMS_OVS_1 22
int
ice_dcf_configure_queues(struct ice_dcf_hw *hw)
@@ -895,8 +895,8 @@ ice_dcf_configure_queues(struct ice_dcf_hw *hw)
if (hw->vf_res->vf_cap_flags &
VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC &&
hw->supported_rxdid &
- BIT(IAVF_RXDID_COMMS_GENERIC)) {
- vc_qp->rxq.rxdid = IAVF_RXDID_COMMS_GENERIC;
+ BIT(IAVF_RXDID_COMMS_OVS_1)) {
+ vc_qp->rxq.rxdid = IAVF_RXDID_COMMS_OVS_1;
PMD_DRV_LOG(NOTICE, "request RXDID == %d in "
"Queue[%d]", vc_qp->rxq.rxdid, i);
} else {
--
2.26.2
Re: [dpdk-dev] [PATCH v2 2/6] eal: oops handling API implementation
On Tue, 17 Aug 2021 08:57:19 +0530
wrote:
> +#define oops_print(...) rte_log(RTE_LOG_ERR, RTE_LOGTYPE_EAL, __VA_ARGS__)
It is problematic to call rte_log from a signal handler.
The malloc pool maybe corrupted and rte_log can call functions that
use malloc.
Even rte_dump_stack() is unsafe from these signals.
> +
> +static int oops_signals[] = {SIGSEGV, SIGBUS, SIGILL, SIGABRT, SIGFPE,
> SIGSYS};
Should be constant.
> +
> +struct oops_signal {
> + int sig;
Redundant, you defined the oops_signals above.
> + bool enabled;
Redundant, you can just compare with action.
> + struct sigaction sa;
> +};
> +
> +static struct oops_signal signals_db[RTE_DIM(oops_signals)];
> +
> +static void
> +back_trace_dump(ucontext_t *context)
> +{
> + RTE_SET_USED(context);
> +
> + rte_dump_stack();
> +}
rte_dump_stack() is not safe in signal handler:
Recommend backtrace_symbols_fd ??
Better yet use libunwind
> +static void
> +siginfo_dump(int sig, siginfo_t *info)
> +{
> + oops_print("PID: %" PRIdMAX "\n", (intmax_t)getpid());
> +
> + if (info == NULL)
> + return;
> + if (sig != info->si_signo)
> + oops_print("Invalid signal info\n");
> +
> + oops_print("Signal number: %d\n", info->si_signo);
> + oops_print("Fault address: %p\n", info->si_addr);
> +}
> +
> +static void
> +mem32_dump(void *ptr)
Should be const
> +{
> + uint32_t *p = ptr;
> + int i;
> +
> + for (i = 0; i < 16; i++)
> + oops_print("%p: 0x%x\n", p + i, rte_be_to_cpu_32(p[i]));
> +}
Why reinvent hexdump?
> +
> +static void
> +stack_dump_header(void)
> +{
> + oops_print("Stack dump:\n");
> + oops_print("--\n");
> +}
> +
> +static void
> +code_dump_header(void)
> +{
> + oops_print("Code dump:\n");
> + oops_print("--\n");
> +}
> +
> +static void
> +stack_code_dump(void *stack, void *code)
> +{
> + if (stack == NULL || code == NULL)
> + return;
> +
> + oops_print("\n");
> + stack_dump_header();
> + mem32_dump(stack);
> + oops_print("\n");
> +
> + code_dump_header();
> + mem32_dump(code);
> + oops_print("\n");
> +}
> +static void
> +archinfo_dump(ucontext_t *uc)
> {
> - RTE_SET_USED(sig);
> - RTE_SET_USED(info);
> RTE_SET_USED(uc);
>
> + stack_code_dump(NULL, NULL);
> +}
> +
> +static void
> +default_signal_handler_invoke(int sig)
> +{
> + unsigned int idx;
> +
> + for (idx = 0; idx < RTE_DIM(oops_signals); idx++) {
> + /* Skip disabled signals */
> + if (signals_db[idx].sig != sig)
> + continue;
> + if (!signals_db[idx].enabled)
> + continue;
> + /* Replace with stored handler */
> + sigaction(sig, &signals_db[idx].sa, NULL);
> + kill(getpid(), sig);
If you use SA_RESETHAND, you don't need this stuff.
> + }
> +}
> +
> +void
> +rte_oops_decode(int sig, siginfo_t *info, ucontext_t *uc)
> +{
> + oops_print("Signal info:\n");
> + oops_print("\n");
> + siginfo_dump(sig, info);
> + oops_print("\n");
> +
> + oops_print("Backtrace:\n");
> + oops_print("--\n");
> + back_trace_dump(uc);
> + oops_print("\n");
> +
> + oops_print("Arch info:\n");
> + oops_print("--\n");
> + if (uc)
> + archinfo_dump(uc);
> +}
> +
> +static void
> +eal_oops_handler(int sig, siginfo_t *info, void *ctx)
> +{
> + ucontext_t *uc = ctx;
> +
> + rte_oops_decode(sig, info, uc);
> + default_signal_handler_invoke(sig);
If you use SA_RESETHAND, then just doing raise(sig) here.
> }
>
> int
> rte_oops_signals_enabled(int *signals)
Why is this necessary and exported?
> {
> - RTE_SET_USED(signals);
> + int count = 0, sig[RTE_OOPS_SIGNALS_MAX];
> + unsigned int idx = 0;
>
> - return 0;
> + for (idx = 0; idx < RTE_DIM(oops_signals); idx++) {
> + if (signals_db[idx].enabled) {
> + sig[count] = signals_db[idx].sig;
> + count++;
> + }
> + }
> + if (signals)
> + memcpy(signals, sig, sizeof(*signals) * count);
> +
> + return count;
> }
>
> int
> eal_oops_init(void)
> {
> - return 0;
> + unsigned int idx, rc = 0;
> + struct sigaction sa;
> +
> + RTE_BUILD_BUG_ON(RTE_DIM(oops_signals) > RTE_OOPS_SIGNALS_MAX);
> +
> + sigemptyset(&sa.sa_mask);
> + sa.sa_sigaction = &eal_oops_handler;
> + sa.sa_flags = SA_RESTART | SA_SIGINFO | SA_ONSTACK;
> +
> + for (idx = 0; idx < RTE_DIM(oops_signals); idx++) {
> + signals_db[idx].sig = oops_signals[idx];
> + /* Get exiting sigaction */
> + rc = sigaction(signals_db[idx].sig, NULL, &signals_db[idx].sa);
> + if (rc)
> + continue;
> + /* Replace with oops handler */
> + rc = sigaction(signals_db[idx].sig, &sa, NULL);
>
Re: [dpdk-dev] [PATCH v2 1/6] eal: introduce oops handling API
On Tue, 17 Aug 2021 08:57:18 +0530 wrote: > From: Jerin Jacob > > Introducing oops handling API with following specification > and enable stub implementation for Linux and FreeBSD. > > On rte_eal_init() invocation, the EAL library installs the > oops handler for the essential signals. > The rte_oops_signals_enabled() API provides the list > of signals the library installed by the EAL. This is a big change, and many applications already handle these signals themselves. Therefore adding this needs to be opt-in and not enabled by default.
[dpdk-dev] [PATCH] examples/vhost: fix memory leak on forwarding packets.
In function virtio_tx_local(), when the device receiving the packet
is the same as the device to which the packet is forwarded,
or the device is removed, we return but not free the packet,
it will cause a memory leak.
Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application")
Cc: sta...@dpdk.org
Signed-off-by: Wenwu Ma
---
examples/vhost/main.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index bc3d71c898..07fd90ec64 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -965,6 +965,7 @@ virtio_tx_local(struct vhost_dev *vdev, struct rte_mbuf *m)
return -1;
if (vdev->vid == dst_vdev->vid) {
+ rte_pktmbuf_free(m);
RTE_LOG_DP(DEBUG, VHOST_DATA,
"(%d) TX: src and dst MAC is same. Dropping packet.\n",
vdev->vid);
@@ -975,6 +976,7 @@ virtio_tx_local(struct vhost_dev *vdev, struct rte_mbuf *m)
"(%d) TX: MAC address is local\n", dst_vdev->vid);
if (unlikely(dst_vdev->remove)) {
+ rte_pktmbuf_free(m);
RTE_LOG_DP(DEBUG, VHOST_DATA,
"(%d) device is marked for removal\n", dst_vdev->vid);
return 0;
--
2.25.1
Re: [dpdk-dev] [PATCH] examples/vhost: fix memory leak on forwarding packets.
Acked-by: Cheng Jiang
> -Original Message-
> From: Ma, WenwuX
> Sent: Wednesday, August 18, 2021 1:13 AM
> To: dev@dpdk.org
> Cc: maxime.coque...@redhat.com; Xia, Chenbo ;
> Jiang, Cheng1 ; Hu, Jiayu ;
> Ma, WenwuX ; sta...@dpdk.org
> Subject: [PATCH] examples/vhost: fix memory leak on forwarding packets.
>
> In function virtio_tx_local(), when the device receiving the packet is the
> same as the device to which the packet is forwarded, or the device is
> removed, we return but not free the packet, it will cause a memory leak.
>
> Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Wenwu Ma
> ---
> examples/vhost/main.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/examples/vhost/main.c b/examples/vhost/main.c index
> bc3d71c898..07fd90ec64 100644
> --- a/examples/vhost/main.c
> +++ b/examples/vhost/main.c
> @@ -965,6 +965,7 @@ virtio_tx_local(struct vhost_dev *vdev, struct
> rte_mbuf *m)
> return -1;
>
> if (vdev->vid == dst_vdev->vid) {
> + rte_pktmbuf_free(m);
> RTE_LOG_DP(DEBUG, VHOST_DATA,
> "(%d) TX: src and dst MAC is same. Dropping
> packet.\n",
> vdev->vid);
> @@ -975,6 +976,7 @@ virtio_tx_local(struct vhost_dev *vdev, struct
> rte_mbuf *m)
> "(%d) TX: MAC address is local\n", dst_vdev->vid);
>
> if (unlikely(dst_vdev->remove)) {
> + rte_pktmbuf_free(m);
> RTE_LOG_DP(DEBUG, VHOST_DATA,
> "(%d) device is marked for removal\n", dst_vdev-
> >vid);
> return 0;
> --
> 2.25.1
Re: [dpdk-dev] [PATCH v1 1/2] net/iavf: remove redundant default RSS field for IP fragment packets
Hi Ferruh,
This patch removes support of IPID for both IPv4 and IPv6 fragment packets,
because it is not expected in default RSS.
The impact is that IPID will not be used to calculate the hash value in default
RSS for IP fragment packet.
I will rework commit log and send v2 patch later.
> -Original Message-
> From: Yigit, Ferruh
> Sent: Friday, August 13, 2021 7:59 PM
> To: Wu, Wenjun1 ; dev@dpdk.org; Wu, Jingjing
> ; Xing, Beilei ; Zhang, Qi Z
>
> Subject: Re: [dpdk-dev] [PATCH v1 1/2] net/iavf: remove redundant default
> RSS field for IP fragment packets
>
> On 8/2/2021 9:36 AM, Wenjun Wu wrote:
> > This patch removes redundant default RSS field for IP fragment
> > packets, only src MAC address and dst MAC address are needed.
> >
>
> Hi Wenjun,
>
> The impact is not clear, from the description I take this as code refactoring
> without any impact but can you please clarify this in the commit log?
>
> Also patch title it too long, can we update as following:
> net/iavf: fix default RSS field for IP fragment packets
>
> If so can you please put the Fixes tag? This way patch can be backported too.
>
>
> > Signed-off-by: Wenjun Wu
> > ---
> > drivers/net/iavf/iavf_hash.c | 26 ++
> > 1 file changed, 2 insertions(+), 24 deletions(-)
> >
> > diff --git a/drivers/net/iavf/iavf_hash.c
> > b/drivers/net/iavf/iavf_hash.c index 2b03dad858..eba55ecea5 100644
> > --- a/drivers/net/iavf/iavf_hash.c
> > +++ b/drivers/net/iavf/iavf_hash.c
> > @@ -624,34 +624,12 @@ iavf_rss_hash_set(struct iavf_adapter *ad,
> uint64_t rss_hf, bool add)
> > }
> >
> > if (rss_hf & ETH_RSS_FRAG_IPV4) {
> > - struct virtchnl_proto_hdrs hdr = {
> > - .tunnel_level = TUNNEL_LEVEL_OUTER,
> > - .count = 3,
> > - .proto_hdr = {
> > - proto_hdr_eth,
> > - proto_hdr_ipv4,
> > - {
> > - VIRTCHNL_PROTO_HDR_IPV4_FRAG,
> > -
> FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_FRAG_PKID),
> > - {BUFF_NOUSED},
> > - },
> > - },
> > - };
> > - rss_cfg.proto_hdrs = hdr;
> > + rss_cfg.proto_hdrs = outer_ipv4_tmplt;
> > iavf_add_del_rss_cfg(ad, &rss_cfg, add);
> > }
> >
> > if (rss_hf & ETH_RSS_FRAG_IPV6) {
> > - struct virtchnl_proto_hdrs hdr = {
> > - .tunnel_level = TUNNEL_LEVEL_OUTER,
> > - .count = 3,
> > - .proto_hdr = {
> > - proto_hdr_eth,
> > - proto_hdr_ipv6,
> > - proto_hdr_ipv6_frag,
> > - },
> > - };
> > - rss_cfg.proto_hdrs = hdr;
> > + rss_cfg.proto_hdrs = outer_ipv6_tmplt;
> > iavf_add_del_rss_cfg(ad, &rss_cfg, add);
> > }
> >
> >
Re: [dpdk-dev] [PATCH] version: 21.11-rc0
On Sun, Aug 8, 2021 at 9:27 PM Thomas Monjalon wrote: > diff --git a/doc/guides/rel_notes/release_21_11.rst > b/doc/guides/rel_notes/release_21_11.rst > new file mode 100644 > index 00..d707a554ef > --- /dev/null > +++ b/doc/guides/rel_notes/release_21_11.rst > @@ -0,0 +1,136 @@ [snip] > +Known Issues > + > + > +.. This section should contain new known issues in this release. Sample > format: > + > + * **Add title in present tense with full stop.** > + > + Add a short 1-2 sentence description of the known issue > + in the present tense. Add information on any known workarounds. > + > + This section is a comment. Do not overwrite or remove it. > + Also, make sure to start the actual text at the margin. > + === > + > + The known issue "**Last mbuf segment not implicitly reset.**" added in 21.08 release notes still applies to 21.11. But this can be fixed later, patches are starting to accumulate and some CI failures are due to patches being applied to 21.08. The rest lgtm, so: Acked-by: David Marchand Applied, thanks. On this last subject, this mail is a ping to CI labs owners. 21.11 release won't preserve ABI compat with previous releases, so please disable ABI checks until 22.02. -- David Marchand
Re: [dpdk-dev] [PATCH] net/iavf: support FDIR L3 fields for IP fragment packets
Hi Ferruh, I am sorry my description caused confusion. I will split this patch into two, rework the commit log and send it later. > -Original Message- > From: Yigit, Ferruh > Sent: Friday, August 13, 2021 10:00 PM > To: Wu, Wenjun1 ; dev@dpdk.org; Wu, Jingjing > ; Xing, Beilei ; Zhang, Qi Z > > Subject: Re: [dpdk-dev] [PATCH] net/iavf: support FDIR L3 fields for IP > fragment packets > > On 8/2/2021 8:57 AM, Wenjun Wu wrote: > > Add support of FDIR L3 fields for both IPv4 and IPv6 fragment packets. > > > > Description mentions from both IPv4 & IPv6 but only IPv6 macro is updated, > is this expected? > > Is following correct: > Before this patch flow director rules were not applied to fragmented IPv4 & > IPv6 packets (so packets were not able to sent to specific queues), but after > this patch it does. > Is it the case that HW configuration was missing and hash is not calculated > for > these kind of packets etc.. If you have more details can you please provide? > Also what was happening to these packets previously, sent to queue 0 by > default? > > Overall can please provide more description and check below question > related to 'field_selector'? > > Thanks, > ferruh > > > Signed-off-by: Wenjun Wu > > --- > > drivers/net/iavf/iavf_fdir.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/iavf/iavf_fdir.c > > b/drivers/net/iavf/iavf_fdir.c index da3eec8b59..32b06044f2 100644 > > --- a/drivers/net/iavf/iavf_fdir.c > > +++ b/drivers/net/iavf/iavf_fdir.c > > @@ -57,7 +57,7 @@ > > IAVF_INSET_IPV6_HOP_LIMIT) > > > > #define IAVF_FDIR_INSET_ETH_IPV6_FRAG_EXT (\ > > - IAVF_INSET_IPV6_ID) > > + IAVF_FDIR_INSET_ETH_IPV6 | IAVF_INSET_IPV6_ID) > > > > #define IAVF_FDIR_INSET_ETH_IPV6_UDP (\ > > IAVF_INSET_IPV6_SRC | IAVF_INSET_IPV6_DST | \ @@ -664,6 +664,7 > @@ > > iavf_fdir_add_fragment_hdr(struct virtchnl_proto_hdrs *hdrs, int layer) > > /* adding dummy fragment header */ > > hdr1 = &hdrs->proto_hdr[layer]; > > VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, IPV4_FRAG); > > + hdr1->field_selector = 0; > > Is this change related to new support, or fixing something that was missing > previously? > > > hdrs->count = ++layer; > > } > > > >
