[PATCH 1/2] test/crypto: allow retries with stats test
Stats need not be reflected instantly after the operation. Relax the
test case to have retries to allow slower updates.
Signed-off-by: Anoob Joseph
---
app/test/test_cryptodev.h| 1 +
app/test/test_cryptodev_security_ipsec.c | 11 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/app/test/test_cryptodev.h b/app/test/test_cryptodev.h
index b479ab8a2a..bb54a33d62 100644
--- a/app/test/test_cryptodev.h
+++ b/app/test/test_cryptodev.h
@@ -9,6 +9,7 @@
#define MAX_NUM_OPS_INFLIGHT(4096)
#define MIN_NUM_OPS_INFLIGHT(128)
#define DEFAULT_NUM_OPS_INFLIGHT(128)
+#define TEST_STATS_RETRIES (100)
#define DEFAULT_NUM_XFORMS (2)
#define NUM_MBUFS (8191)
diff --git a/app/test/test_cryptodev_security_ipsec.c
b/app/test/test_cryptodev_security_ipsec.c
index 1aba1ad993..e6a81ca186 100644
--- a/app/test/test_cryptodev_security_ipsec.c
+++ b/app/test/test_cryptodev_security_ipsec.c
@@ -1103,9 +1103,12 @@ test_ipsec_stats_verify(void *ctx,
enum rte_security_ipsec_sa_direction dir)
{
struct rte_security_stats stats = {0};
- int ret = TEST_SUCCESS;
+ int retries = 0, ret = TEST_SUCCESS;
if (flags->stats_success) {
+stats_get:
+ ret = TEST_SUCCESS;
+
if (rte_security_session_stats_get(ctx, sess, &stats) < 0)
return TEST_FAILED;
@@ -1118,6 +1121,12 @@ test_ipsec_stats_verify(void *ctx,
stats.ipsec.ierrors != 0)
ret = TEST_FAILED;
}
+
+ if (ret == TEST_FAILED && retries < TEST_STATS_RETRIES) {
+ retries++;
+ rte_delay_ms(1);
+ goto stats_get;
+ }
}
return ret;
--
2.45.2
[PATCH 2/2] crypto/cnxk: remove delay in stats
Having 1 ms delay for retrieving stats per session would mean
significant delay for a system with large number of sessions. If
accurate stats are required, application can call stats again
after a delay and get most updated stats.
Signed-off-by: Anoob Joseph
---
drivers/crypto/cnxk/cn10k_ipsec.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/crypto/cnxk/cn10k_ipsec.c
b/drivers/crypto/cnxk/cn10k_ipsec.c
index 7517602fa4..8123a5f97b 100644
--- a/drivers/crypto/cnxk/cn10k_ipsec.c
+++ b/drivers/crypto/cnxk/cn10k_ipsec.c
@@ -350,13 +350,11 @@ cn10k_ipsec_stats_get(struct cnxk_cpt_qp *qp, struct
cn10k_sec_session *sess,
if (sess->ipsec.is_outbound) {
out_sa = &sa->out_sa;
roc_cpt_lf_ctx_flush(&qp->lf, out_sa, false);
- rte_delay_ms(1);
stats->ipsec.opackets = out_sa->ctx.mib_pkts;
stats->ipsec.obytes = out_sa->ctx.mib_octs;
} else {
in_sa = &sa->in_sa;
roc_cpt_lf_ctx_flush(&qp->lf, in_sa, false);
- rte_delay_ms(1);
stats->ipsec.ipackets = in_sa->ctx.mib_pkts;
stats->ipsec.ibytes = in_sa->ctx.mib_octs;
}
--
2.45.2
Re: [PATCH] app/test-pmd: remove unnecessary cast
On 8/23/2024 5:26 PM, Stephen Hemminger wrote:
> The list of builtin cmdline commands has unnecessary cast which
> blocks compiler type checking.
>
> Signed-off-by: Stephen Hemminger
>
Fixes: af75078fece3 ("first public release")
Cc: sta...@dpdk.org
I think good to backport this, to prevent any fixes later around these
lines cause apply failures to stable trees.
I can't see the initial intention of the cast, but removing looks OK.
Acked-by: Ferruh Yigit
Applied to dpdk-next-net/main, thanks.k
[PATCH] ip_frag: support IPv6 reassembly with extensions
From: Vignesh PS
Add support to ip_frag library to perform IPv6 reassembly
when extension headers are present before the fragment
extension in the packet.
Signed-off-by: Vignesh PS
---
.mailmap | 1 +
lib/ip_frag/ip_frag_common.h | 2 +
lib/ip_frag/ip_reassembly.h | 2 +
lib/ip_frag/rte_ipv6_reassembly.c | 68 +++
4 files changed, 64 insertions(+), 9 deletions(-)
diff --git a/.mailmap b/.mailmap
index 4a508bafad..69b229a5b7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1548,6 +1548,7 @@ Viacheslav Ovsiienko
Victor Kaplansky
Victor Raj
Vidya Sagar Velumuri
+Vignesh PS
Vignesh Sridhar
Vijayakumar Muthuvel Manickam
Vijaya Mohan Guvva
diff --git a/lib/ip_frag/ip_frag_common.h b/lib/ip_frag/ip_frag_common.h
index 51fc9d47fb..db2665e846 100644
--- a/lib/ip_frag/ip_frag_common.h
+++ b/lib/ip_frag/ip_frag_common.h
@@ -169,6 +169,8 @@ ip_frag_reset(struct ip_frag_pkt *fp, uint64_t tms)
fp->total_size = UINT32_MAX;
fp->frag_size = 0;
fp->last_idx = IP_MIN_FRAG_NUM;
+ fp->exts_len = 0;
+ fp->next_proto = NULL;
fp->frags[IP_LAST_FRAG_IDX] = zero_frag;
fp->frags[IP_FIRST_FRAG_IDX] = zero_frag;
}
diff --git a/lib/ip_frag/ip_reassembly.h b/lib/ip_frag/ip_reassembly.h
index 54afed5417..429e74f1b3 100644
--- a/lib/ip_frag/ip_reassembly.h
+++ b/lib/ip_frag/ip_reassembly.h
@@ -54,6 +54,8 @@ struct __rte_cache_aligned ip_frag_pkt {
uint32_t total_size; /* expected reassembled size */
uint32_t frag_size;/* size of fragments received */
uint32_t last_idx; /* index of next entry to fill */
+ uint32_t exts_len; /* length of extension hdrs for
first fragment */
+ uint8_t *next_proto; /* pointer of the next_proto
field */
struct ip_frag frags[IP_MAX_FRAG_NUM]; /* fragments */
};
diff --git a/lib/ip_frag/rte_ipv6_reassembly.c
b/lib/ip_frag/rte_ipv6_reassembly.c
index 88863a98d1..8decf592a6 100644
--- a/lib/ip_frag/rte_ipv6_reassembly.c
+++ b/lib/ip_frag/rte_ipv6_reassembly.c
@@ -91,19 +91,19 @@ ipv6_frag_reassemble(struct ip_frag_pkt *fp)
/* update ipv6 header for the reassembled datagram */
ip_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv6_hdr *, m->l2_len);
+ payload_len += fp->exts_len;
ip_hdr->payload_len = rte_cpu_to_be_16(payload_len);
/*
* remove fragmentation header. note that per RFC2460, we need to update
* the last non-fragmentable header with the "next header" field to
contain
-* type of the first fragmentable header, but we currently don't support
-* other headers, so we assume there are no other headers and thus
update
-* the main IPv6 header instead.
+* type of the first fragmentable header.
*/
- move_len = m->l2_len + m->l3_len - sizeof(*frag_hdr);
- frag_hdr = (struct rte_ipv6_fragment_ext *) (ip_hdr + 1);
- ip_hdr->proto = frag_hdr->next_header;
+ frag_hdr = (struct rte_ipv6_fragment_ext *)
+ ((uint8_t *) (ip_hdr + 1) + fp->exts_len);
+ *fp->next_proto = frag_hdr->next_header;
+ move_len = m->l2_len + m->l3_len - sizeof(*frag_hdr);
ip_frag_memmove(rte_pktmbuf_mtod_offset(m, char *, sizeof(*frag_hdr)),
rte_pktmbuf_mtod(m, char*), move_len);
@@ -112,6 +112,39 @@ ipv6_frag_reassemble(struct ip_frag_pkt *fp)
return m;
}
+/*
+ * Function to crawl through the extension header stack.
+ * This function breaks as soon a the fragment header is
+ * found and returns the total length the traversed exts
+ * and the last extension before the fragment header
+ */
+static inline uint32_t
+ip_frag_get_last_exthdr(struct rte_ipv6_hdr *ip_hdr, uint8_t **last_ext)
+{
+ uint32_t total_len = 0;
+ uint8_t num_exts = 0;
+ size_t ext_len = 0;
+ *last_ext = (uint8_t *)(ip_hdr + 1);
+ int next_proto = ip_hdr->proto;
+#define MAX_NUM_IPV6_EXTS 8
+
+ while (next_proto != IPPROTO_FRAGMENT &&
+ num_exts < MAX_NUM_IPV6_EXTS &&
+ (next_proto = rte_ipv6_get_next_ext(
+ *last_ext, next_proto, &ext_len)) >= 0) {
+
+ total_len += ext_len;
+
+ if (next_proto == IPPROTO_FRAGMENT)
+ return total_len;
+
+ *last_ext += ext_len;
+ num_exts++;
+ }
+
+ return total_len;
+}
+
/*
* Process new mbuf with fragment of IPV6 datagram.
* Incoming mbuf should have its l2_len/l3_len fields setup correctly.
@@ -139,6 +172,8 @@ rte_ipv6_frag_reassemble_packet(struct rte_ip_frag_tbl *tbl,
{
struct ip_frag_pkt *fp;
struct ip_frag_key key;
+ uint8_t *last_ipv6_ext;
+ uint32_t exts_len;
uint16_t ip_ofs;
int32_t ip_len;
int32_t trim;
@@ -154,10 +189,10 @@ rte_ipv6_frag_reassem
[PATCH v2 1/4] power: refactor core power management library
This patch introduces a comprehensive refactor to the core power
management library. The primary focus is on improving modularity
and organization by relocating specific driver implementations
from the 'lib/power' directory to dedicated directories within
'drivers/power/core/*'. The adjustment of meson.build files
enables the selective activation of individual drivers.
These changes contribute to a significant enhancement in code
organization, providing a clearer structure for driver implementations.
The refactor aims to improve overall code clarity and boost
maintainability. Additionally, it establishes a foundation for
future development, allowing for more focused work on individual
drivers and seamless integration of forthcoming enhancements.
v2:
- added NULL check for global_core_ops in rte_power_get_core_ops
Signed-off-by: Sivaprasad Tummala
---
drivers/meson.build | 1 +
.../power/acpi/acpi_cpufreq.c | 22 +-
.../power/acpi/acpi_cpufreq.h | 6 +-
drivers/power/acpi/meson.build| 10 +
.../power/amd_pstate/amd_pstate_cpufreq.c | 24 +-
.../power/amd_pstate/amd_pstate_cpufreq.h | 8 +-
drivers/power/amd_pstate/meson.build | 10 +
.../power/cppc/cppc_cpufreq.c | 22 +-
.../power/cppc/cppc_cpufreq.h | 8 +-
drivers/power/cppc/meson.build| 10 +
.../power/kvm_vm}/guest_channel.c | 0
.../power/kvm_vm}/guest_channel.h | 0
.../power/kvm_vm/kvm_vm.c | 22 +-
.../power/kvm_vm/kvm_vm.h | 6 +-
drivers/power/kvm_vm/meson.build | 16 +
drivers/power/meson.build | 12 +
drivers/power/pstate/meson.build | 10 +
.../power/pstate/pstate_cpufreq.c | 22 +-
.../power/pstate/pstate_cpufreq.h | 6 +-
lib/power/meson.build | 7 +-
lib/power/power_common.c | 2 +-
lib/power/power_common.h | 16 +-
lib/power/rte_power.c | 291 ++
lib/power/rte_power.h | 139 ++---
lib/power/rte_power_core_ops.h| 208 +
lib/power/version.map | 14 +
26 files changed, 621 insertions(+), 271 deletions(-)
rename lib/power/power_acpi_cpufreq.c => drivers/power/acpi/acpi_cpufreq.c
(95%)
rename lib/power/power_acpi_cpufreq.h => drivers/power/acpi/acpi_cpufreq.h
(98%)
create mode 100644 drivers/power/acpi/meson.build
rename lib/power/power_amd_pstate_cpufreq.c =>
drivers/power/amd_pstate/amd_pstate_cpufreq.c (95%)
rename lib/power/power_amd_pstate_cpufreq.h =>
drivers/power/amd_pstate/amd_pstate_cpufreq.h (97%)
create mode 100644 drivers/power/amd_pstate/meson.build
rename lib/power/power_cppc_cpufreq.c => drivers/power/cppc/cppc_cpufreq.c
(95%)
rename lib/power/power_cppc_cpufreq.h => drivers/power/cppc/cppc_cpufreq.h
(97%)
create mode 100644 drivers/power/cppc/meson.build
rename {lib/power => drivers/power/kvm_vm}/guest_channel.c (100%)
rename {lib/power => drivers/power/kvm_vm}/guest_channel.h (100%)
rename lib/power/power_kvm_vm.c => drivers/power/kvm_vm/kvm_vm.c (82%)
rename lib/power/power_kvm_vm.h => drivers/power/kvm_vm/kvm_vm.h (98%)
create mode 100644 drivers/power/kvm_vm/meson.build
create mode 100644 drivers/power/meson.build
create mode 100644 drivers/power/pstate/meson.build
rename lib/power/power_pstate_cpufreq.c =>
drivers/power/pstate/pstate_cpufreq.c (96%)
rename lib/power/power_pstate_cpufreq.h =>
drivers/power/pstate/pstate_cpufreq.h (98%)
create mode 100644 lib/power/rte_power_core_ops.h
diff --git a/drivers/meson.build b/drivers/meson.build
index 66931d4241..9d77e0deab 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -29,6 +29,7 @@ subdirs = [
'event', # depends on common, bus, mempool and net.
'baseband', # depends on common and bus.
'gpu',# depends on common and bus.
+'power', # depends on common (in future).
]
if meson.is_cross_build()
diff --git a/lib/power/power_acpi_cpufreq.c b/drivers/power/acpi/acpi_cpufreq.c
similarity index 95%
rename from lib/power/power_acpi_cpufreq.c
rename to drivers/power/acpi/acpi_cpufreq.c
index 81996e1c13..8637c69703 100644
--- a/lib/power/power_acpi_cpufreq.c
+++ b/drivers/power/acpi/acpi_cpufreq.c
@@ -10,7 +10,7 @@
#include
#include
-#include "power_acpi_cpufreq.h"
+#include "acpi_cpufreq.h"
#include "power_common.h"
#define STR_SIZE 1024
@@ -577,3 +577,23 @@ int power_acpi_get_capabilities(unsigned int lcore_id,
return 0;
}
+
+static struct rte_power_core_ops acpi_ops = {
+ .name = "acpi",
+ .init = power_acpi_cpufreq_init,
+ .exit = power_acpi_cpufreq_exit,
+ .check_env_support = power_acpi_cpufreq_check_supported,
+ .get_avail_fre
[PATCH v2 0/4] power: refactor power management library
This patchset refactors the power management library, addressing both
core and uncore power management. The primary changes involve the
creation of dedicated directories for each driver within
'drivers/power/core/*' and 'drivers/power/uncore/*'.
This refactor significantly improves code organization, enhances
clarity, and boosts maintainability. It lays the foundation for more
focused development on individual drivers and facilitates seamless integration
of future enhancements, particularly the AMD uncore driver.
Furthermore, this effort aims to streamline code maintenance by
consolidating common functions for cpufreq and cppc across various
core drivers, thus reducing code duplication.
Sivaprasad Tummala (4):
power: refactor core power management library
power: refactor uncore power management library
test/power: removed function pointer validations
power/amd_uncore: uncore power management support for AMD EPYC
processors
app/test/test_power.c | 95 -
app/test/test_power_cpufreq.c | 52 ---
app/test/test_power_kvm_vm.c | 36 --
drivers/meson.build | 1 +
.../power/acpi/acpi_cpufreq.c | 22 +-
.../power/acpi/acpi_cpufreq.h | 6 +-
drivers/power/acpi/meson.build| 10 +
.../power/amd_pstate/amd_pstate_cpufreq.c | 24 +-
.../power/amd_pstate/amd_pstate_cpufreq.h | 8 +-
drivers/power/amd_pstate/meson.build | 10 +
drivers/power/amd_uncore/amd_uncore.c | 328 ++
drivers/power/amd_uncore/amd_uncore.h | 226
drivers/power/amd_uncore/meson.build | 20 ++
.../power/cppc/cppc_cpufreq.c | 22 +-
.../power/cppc/cppc_cpufreq.h | 8 +-
drivers/power/cppc/meson.build| 10 +
.../power/intel_uncore/intel_uncore.c | 18 +-
.../power/intel_uncore/intel_uncore.h | 8 +-
drivers/power/intel_uncore/meson.build| 6 +
.../power/kvm_vm}/guest_channel.c | 0
.../power/kvm_vm}/guest_channel.h | 0
.../power/kvm_vm/kvm_vm.c | 22 +-
.../power/kvm_vm/kvm_vm.h | 6 +-
drivers/power/kvm_vm/meson.build | 16 +
drivers/power/meson.build | 14 +
drivers/power/pstate/meson.build | 10 +
.../power/pstate/pstate_cpufreq.c | 22 +-
.../power/pstate/pstate_cpufreq.h | 6 +-
examples/l3fwd-power/main.c | 12 +-
lib/power/meson.build | 9 +-
lib/power/power_common.c | 2 +-
lib/power/power_common.h | 16 +-
lib/power/rte_power.c | 291 ++--
lib/power/rte_power.h | 139 +---
lib/power/rte_power_core_ops.h| 208 +++
lib/power/rte_power_uncore.c | 205 +--
lib/power/rte_power_uncore.h | 87 +++--
lib/power/rte_power_uncore_ops.h | 239 +
lib/power/version.map | 15 +
39 files changed, 1604 insertions(+), 625 deletions(-)
rename lib/power/power_acpi_cpufreq.c => drivers/power/acpi/acpi_cpufreq.c
(95%)
rename lib/power/power_acpi_cpufreq.h => drivers/power/acpi/acpi_cpufreq.h
(98%)
create mode 100644 drivers/power/acpi/meson.build
rename lib/power/power_amd_pstate_cpufreq.c =>
drivers/power/amd_pstate/amd_pstate_cpufreq.c (95%)
rename lib/power/power_amd_pstate_cpufreq.h =>
drivers/power/amd_pstate/amd_pstate_cpufreq.h (97%)
create mode 100644 drivers/power/amd_pstate/meson.build
create mode 100644 drivers/power/amd_uncore/amd_uncore.c
create mode 100644 drivers/power/amd_uncore/amd_uncore.h
create mode 100644 drivers/power/amd_uncore/meson.build
rename lib/power/power_cppc_cpufreq.c => drivers/power/cppc/cppc_cpufreq.c
(95%)
rename lib/power/power_cppc_cpufreq.h => drivers/power/cppc/cppc_cpufreq.h
(97%)
create mode 100644 drivers/power/cppc/meson.build
rename lib/power/power_intel_uncore.c =>
drivers/power/intel_uncore/intel_uncore.c (95%)
rename lib/power/power_intel_uncore.h =>
drivers/power/intel_uncore/intel_uncore.h (97%)
create mode 100644 drivers/power/intel_uncore/meson.build
rename {lib/power => drivers/power/kvm_vm}/guest_channel.c (100%)
rename {lib/power => drivers/power/kvm_vm}/guest_channel.h (100%)
rename lib/power/power_kvm_vm.c => drivers/power/kvm_vm/kvm_vm.c (82%)
rename lib/power/power_kvm_vm.h => drivers/power/kvm_vm/kvm_vm.h (98%)
create mode 100644 drivers/power/kvm_vm/meson.build
create mode 100644 drivers/power/meson.build
create mode 100644 drivers/power/pstate/meson.build
rename lib/power/power_pstate_cpufreq.c =>
drivers/power/pstate/pstate_cpufreq.c (96%)
rename lib/power/power_pstate_cpufreq.h =>
drivers/power/pstate/pstate_cpufreq.h (98%)
create mode 100644 lib/
[PATCH v2 2/4] power: refactor uncore power management library
This patch refactors the power management library, addressing uncore
power management. The primary changes involve the creation of dedicated
directories for each driver within 'drivers/power/uncore/*'. The
adjustment of meson.build files enables the selective activation
of individual drivers.
This refactor significantly improves code organization, enhances
clarity and boosts maintainability. It lays the foundation for more
focused development on individual drivers and facilitates seamless
integration of future enhancements, particularly the AMD uncore driver.
Signed-off-by: Sivaprasad Tummala
---
.../power/intel_uncore/intel_uncore.c | 18 +-
.../power/intel_uncore/intel_uncore.h | 8 +-
drivers/power/intel_uncore/meson.build| 6 +
drivers/power/meson.build | 3 +-
lib/power/meson.build | 2 +-
lib/power/rte_power_uncore.c | 205 ++-
lib/power/rte_power_uncore.h | 87 ---
lib/power/rte_power_uncore_ops.h | 239 ++
lib/power/version.map | 1 +
9 files changed, 405 insertions(+), 164 deletions(-)
rename lib/power/power_intel_uncore.c =>
drivers/power/intel_uncore/intel_uncore.c (95%)
rename lib/power/power_intel_uncore.h =>
drivers/power/intel_uncore/intel_uncore.h (97%)
create mode 100644 drivers/power/intel_uncore/meson.build
create mode 100644 lib/power/rte_power_uncore_ops.h
diff --git a/lib/power/power_intel_uncore.c
b/drivers/power/intel_uncore/intel_uncore.c
similarity index 95%
rename from lib/power/power_intel_uncore.c
rename to drivers/power/intel_uncore/intel_uncore.c
index 4eb9c5900a..804ad5d755 100644
--- a/lib/power/power_intel_uncore.c
+++ b/drivers/power/intel_uncore/intel_uncore.c
@@ -8,7 +8,7 @@
#include
-#include "power_intel_uncore.h"
+#include "intel_uncore.h"
#include "power_common.h"
#define MAX_NUMA_DIE 8
@@ -475,3 +475,19 @@ power_intel_uncore_get_num_dies(unsigned int pkg)
return count;
}
+
+static struct rte_power_uncore_ops intel_uncore_ops = {
+ .name = "intel-uncore",
+ .init = power_intel_uncore_init,
+ .exit = power_intel_uncore_exit,
+ .get_avail_freqs = power_intel_uncore_freqs,
+ .get_num_pkgs = power_intel_uncore_get_num_pkgs,
+ .get_num_dies = power_intel_uncore_get_num_dies,
+ .get_num_freqs = power_intel_uncore_get_num_freqs,
+ .get_freq = power_get_intel_uncore_freq,
+ .set_freq = power_set_intel_uncore_freq,
+ .freq_max = power_intel_uncore_freq_max,
+ .freq_min = power_intel_uncore_freq_min,
+};
+
+RTE_POWER_REGISTER_UNCORE_OPS(intel_uncore_ops);
diff --git a/lib/power/power_intel_uncore.h
b/drivers/power/intel_uncore/intel_uncore.h
similarity index 97%
rename from lib/power/power_intel_uncore.h
rename to drivers/power/intel_uncore/intel_uncore.h
index 20a3ba8ebe..f2ce2f0c66 100644
--- a/lib/power/power_intel_uncore.h
+++ b/drivers/power/intel_uncore/intel_uncore.h
@@ -2,8 +2,8 @@
* Copyright(c) 2022 Intel Corporation
*/
-#ifndef POWER_INTEL_UNCORE_H
-#define POWER_INTEL_UNCORE_H
+#ifndef INTEL_UNCORE_H
+#define INTEL_UNCORE_H
/**
* @file
@@ -11,7 +11,7 @@
*/
#include "rte_power.h"
-#include "rte_power_uncore.h"
+#include "rte_power_uncore_ops.h"
#ifdef __cplusplus
extern "C" {
@@ -223,4 +223,4 @@ power_intel_uncore_get_num_dies(unsigned int pkg);
}
#endif
-#endif /* POWER_INTEL_UNCORE_H */
+#endif /* INTEL_UNCORE_H */
diff --git a/drivers/power/intel_uncore/meson.build
b/drivers/power/intel_uncore/meson.build
new file mode 100644
index 00..876df8ad14
--- /dev/null
+++ b/drivers/power/intel_uncore/meson.build
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Intel Corporation
+# Copyright(c) 2024 Advanced Micro Devices, Inc.
+
+sources = files('intel_uncore.c')
+deps += ['power']
diff --git a/drivers/power/meson.build b/drivers/power/meson.build
index 8c7215c639..c83047af94 100644
--- a/drivers/power/meson.build
+++ b/drivers/power/meson.build
@@ -6,7 +6,8 @@ drivers = [
'amd_pstate',
'cppc',
'kvm_vm',
-'pstate'
+'pstate',
+'intel_uncore'
]
std_deps = ['power']
diff --git a/lib/power/meson.build b/lib/power/meson.build
index f3e3451cdc..9b13d98810 100644
--- a/lib/power/meson.build
+++ b/lib/power/meson.build
@@ -13,7 +13,6 @@ if not is_linux
endif
sources = files(
'power_common.c',
-'power_intel_uncore.c',
'rte_power.c',
'rte_power_uncore.c',
'rte_power_pmd_mgmt.c',
@@ -24,6 +23,7 @@ headers = files(
'rte_power_guest_channel.h',
'rte_power_pmd_mgmt.h',
'rte_power_uncore.h',
+'rte_power_uncore_ops.h',
)
if cc.has_argument('-Wno-cast-qual')
cflags += '-Wno-cast-qual'
diff --git a/lib/power/rte_power_uncore.c b/lib/power/rte_power_uncore.c
index 48c75a5da0..9f8771224f 100644
--- a/lib/power/
[PATCH v2 3/4] test/power: removed function pointer validations
After refactoring the power library, power management operations are now
consistently supported regardless of the operating environment, making
function pointer checks unnecessary and thus removed from applications.
v2:
- removed function pointer validation in l3fwd-power app.
Signed-off-by: Sivaprasad Tummala
---
app/test/test_power.c | 95 ---
app/test/test_power_cpufreq.c | 52 ---
app/test/test_power_kvm_vm.c | 36 -
examples/l3fwd-power/main.c | 12 ++---
4 files changed, 4 insertions(+), 191 deletions(-)
diff --git a/app/test/test_power.c b/app/test/test_power.c
index 403adc22d6..5df5848c70 100644
--- a/app/test/test_power.c
+++ b/app/test/test_power.c
@@ -24,86 +24,6 @@ test_power(void)
#include
-static int
-check_function_ptrs(void)
-{
- enum power_management_env env = rte_power_get_env();
-
- const bool not_null_expected = !(env == PM_ENV_NOT_SET);
-
- const char *inject_not_string1 = not_null_expected ? " not" : "";
- const char *inject_not_string2 = not_null_expected ? "" : " not";
-
- if ((rte_power_freqs == NULL) == not_null_expected) {
- printf("rte_power_freqs should%s be NULL, environment has%s
been "
- "initialised\n", inject_not_string1,
- inject_not_string2);
- return -1;
- }
- if ((rte_power_get_freq == NULL) == not_null_expected) {
- printf("rte_power_get_freq should%s be NULL, environment has%s
been "
- "initialised\n", inject_not_string1,
- inject_not_string2);
- return -1;
- }
- if ((rte_power_set_freq == NULL) == not_null_expected) {
- printf("rte_power_set_freq should%s be NULL, environment has%s
been "
- "initialised\n", inject_not_string1,
- inject_not_string2);
- return -1;
- }
- if ((rte_power_freq_up == NULL) == not_null_expected) {
- printf("rte_power_freq_up should%s be NULL, environment has%s
been "
- "initialised\n", inject_not_string1,
- inject_not_string2);
- return -1;
- }
- if ((rte_power_freq_down == NULL) == not_null_expected) {
- printf("rte_power_freq_down should%s be NULL, environment has%s
been "
- "initialised\n", inject_not_string1,
- inject_not_string2);
- return -1;
- }
- if ((rte_power_freq_max == NULL) == not_null_expected) {
- printf("rte_power_freq_max should%s be NULL, environment has%s
been "
- "initialised\n", inject_not_string1,
- inject_not_string2);
- return -1;
- }
- if ((rte_power_freq_min == NULL) == not_null_expected) {
- printf("rte_power_freq_min should%s be NULL, environment has%s
been "
- "initialised\n", inject_not_string1,
- inject_not_string2);
- return -1;
- }
- if ((rte_power_turbo_status == NULL) == not_null_expected) {
- printf("rte_power_turbo_status should%s be NULL, environment
has%s been "
- "initialised\n", inject_not_string1,
- inject_not_string2);
- return -1;
- }
- if ((rte_power_freq_enable_turbo == NULL) == not_null_expected) {
- printf("rte_power_freq_enable_turbo should%s be NULL,
environment has%s been "
- "initialised\n", inject_not_string1,
- inject_not_string2);
- return -1;
- }
- if ((rte_power_freq_disable_turbo == NULL) == not_null_expected) {
- printf("rte_power_freq_disable_turbo should%s be NULL,
environment has%s been "
- "initialised\n", inject_not_string1,
- inject_not_string2);
- return -1;
- }
- if ((rte_power_get_capabilities == NULL) == not_null_expected) {
- printf("rte_power_get_capabilities should%s be NULL,
environment has%s been "
- "initialised\n", inject_not_string1,
- inject_not_string2);
- return -1;
- }
-
- return 0;
-}
-
static int
test_power(void)
{
@@ -124,10 +44,6 @@ test_power(void)
return -1;
}
- /* Verify that function pointers are NULL */
- if (check_function_ptrs() < 0)
- goto fail_all;
-
rte_power_unset_env();
/* Perform tests for valid environments.*/
@@ -154,22 +70,11 @@ test_power(void)
[PATCH v2 4/4] power/amd_uncore: uncore power management support for AMD EPYC processors
This patch introduces driver support for power management of uncore
components in AMD EPYC processors.
v2:
- fixed typo in comments section.
- added fabric frequency get support for legacy platforms.
Signed-off-by: Sivaprasad Tummala
---
drivers/power/amd_uncore/amd_uncore.c | 328 ++
drivers/power/amd_uncore/amd_uncore.h | 226 ++
drivers/power/amd_uncore/meson.build | 20 ++
drivers/power/meson.build | 1 +
4 files changed, 575 insertions(+)
create mode 100644 drivers/power/amd_uncore/amd_uncore.c
create mode 100644 drivers/power/amd_uncore/amd_uncore.h
create mode 100644 drivers/power/amd_uncore/meson.build
diff --git a/drivers/power/amd_uncore/amd_uncore.c
b/drivers/power/amd_uncore/amd_uncore.c
new file mode 100644
index 00..e667a783cd
--- /dev/null
+++ b/drivers/power/amd_uncore/amd_uncore.c
@@ -0,0 +1,328 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 Advanced Micro Devices, Inc.
+ */
+
+#include
+#include
+#include
+
+#include
+
+#include "amd_uncore.h"
+#include "power_common.h"
+#include "e_smi/e_smi.h"
+
+#define MAX_NUMA_DIE 8
+
+struct __rte_cache_aligned uncore_power_info {
+ unsigned int die; /* Core die id */
+ unsigned int pkg; /* Package id */
+ uint32_t freqs[RTE_MAX_UNCORE_FREQS]; /* Frequency array */
+ uint32_t nb_freqs; /* Number of available freqs */
+ uint32_t curr_idx; /* Freq index in freqs array */
+ uint32_t max_freq;/* System max uncore freq */
+ uint32_t min_freq;/* System min uncore freq */
+};
+
+static struct uncore_power_info uncore_info[RTE_MAX_NUMA_NODES][MAX_NUMA_DIE];
+static int esmi_initialized;
+static int hsmp_proto_ver;
+
+static int
+set_uncore_freq_internal(struct uncore_power_info *ui, uint32_t idx)
+{
+ int ret;
+
+ if (idx >= RTE_MAX_UNCORE_FREQS || idx >= ui->nb_freqs) {
+ POWER_LOG(DEBUG, "Invalid uncore frequency index %u, which "
+ "should be less than %u", idx, ui->nb_freqs);
+ return -1;
+ }
+
+ ret = esmi_apb_disable(ui->pkg, idx);
+ if (ret != ESMI_SUCCESS) {
+ POWER_LOG(ERR, "DF P-state '%u' set failed for pkg %02u",
+ idx, ui->pkg);
+ return -1;
+ }
+
+ POWER_DEBUG_LOG("DF P-state '%u' to be set for pkg %02u die %02u",
+ idx, ui->pkg, ui->die);
+
+ /* write the minimum value first if the target freq is less than
current max */
+ ui->curr_idx = idx;
+
+ return 0;
+}
+
+static int
+power_init_for_setting_uncore_freq(struct uncore_power_info *ui)
+{
+ switch (hsmp_proto_ver) {
+ case HSMP_PROTO_VER5:
+ ui->max_freq = 180; /* Hz */
+ ui->min_freq = 120; /* Hz */
+ break;
+ case HSMP_PROTO_VER2:
+ default:
+ ui->max_freq = 160; /* Hz */
+ ui->min_freq = 120; /* Hz */
+ }
+
+ return 0;
+}
+
+/*
+ * Get the available uncore frequencies of the specific die.
+ */
+static int
+power_get_available_uncore_freqs(struct uncore_power_info *ui)
+{
+ ui->nb_freqs = 3;
+ if (ui->nb_freqs >= RTE_MAX_UNCORE_FREQS) {
+ POWER_LOG(ERR, "Too many available uncore frequencies: %d",
+ num_uncore_freqs);
+ return -1;
+ }
+
+ /* Generate the uncore freq bucket array. */
+ switch (hsmp_proto_ver) {
+ case HSMP_PROTO_VER5:
+ ui->freqs[0] = 180;
+ ui->freqs[1] = 144;
+ ui->freqs[2] = 120;
+ case HSMP_PROTO_VER2:
+ default:
+ ui->freqs[0] = 160;
+ ui->freqs[1] = 1333000;
+ ui->freqs[2] = 120;
+ }
+
+ POWER_DEBUG_LOG("%d frequency(s) of pkg %02u die %02u are available",
+ ui->num_uncore_freqs, ui->pkg, ui->die);
+
+ return 0;
+}
+
+static int
+check_pkg_die_values(unsigned int pkg, unsigned int die)
+{
+ unsigned int max_pkgs, max_dies;
+ max_pkgs = power_amd_uncore_get_num_pkgs();
+ if (max_pkgs == 0)
+ return -1;
+ if (pkg >= max_pkgs) {
+ POWER_LOG(DEBUG, "Package number %02u can not exceed %u",
+ pkg, max_pkgs);
+ return -1;
+ }
+
+ max_dies = power_amd_uncore_get_num_dies(pkg);
+ if (max_dies == 0)
+ return -1;
+ if (die >= max_dies) {
+ POWER_LOG(DEBUG, "Die number %02u can not exceed %u",
+ die, max_dies);
+ return -1;
+ }
+
+ return 0;
+}
+
+static void
+power_amd_uncore_esmi_init(void)
+{
+ if (esmi_init() == ESMI_SUCCESS) {
+ if (esmi_hsmp_proto_ver_get(&
[PATCH v2 0/4] power: refactor power management library
This patchset refactors the power management library, addressing both
core and uncore power management. The primary changes involve the
creation of dedicated directories for each driver within
'drivers/power/core/*' and 'drivers/power/uncore/*'.
This refactor significantly improves code organization, enhances
clarity, and boosts maintainability. It lays the foundation for more
focused development on individual drivers and facilitates seamless integration
of future enhancements, particularly the AMD uncore driver.
Furthermore, this effort aims to streamline code maintenance by
consolidating common functions for cpufreq and cppc across various
core drivers, thus reducing code duplication.
Sivaprasad Tummala (4):
power: refactor core power management library
power: refactor uncore power management library
test/power: removed function pointer validations
power/amd_uncore: uncore power management support for AMD EPYC
processors
app/test/test_power.c | 95 -
app/test/test_power_cpufreq.c | 52 ---
app/test/test_power_kvm_vm.c | 36 --
drivers/meson.build | 1 +
.../power/acpi/acpi_cpufreq.c | 22 +-
.../power/acpi/acpi_cpufreq.h | 6 +-
drivers/power/acpi/meson.build| 10 +
.../power/amd_pstate/amd_pstate_cpufreq.c | 24 +-
.../power/amd_pstate/amd_pstate_cpufreq.h | 8 +-
drivers/power/amd_pstate/meson.build | 10 +
drivers/power/amd_uncore/amd_uncore.c | 328 ++
drivers/power/amd_uncore/amd_uncore.h | 226
drivers/power/amd_uncore/meson.build | 20 ++
.../power/cppc/cppc_cpufreq.c | 22 +-
.../power/cppc/cppc_cpufreq.h | 8 +-
drivers/power/cppc/meson.build| 10 +
.../power/intel_uncore/intel_uncore.c | 18 +-
.../power/intel_uncore/intel_uncore.h | 8 +-
drivers/power/intel_uncore/meson.build| 6 +
.../power/kvm_vm}/guest_channel.c | 0
.../power/kvm_vm}/guest_channel.h | 0
.../power/kvm_vm/kvm_vm.c | 22 +-
.../power/kvm_vm/kvm_vm.h | 6 +-
drivers/power/kvm_vm/meson.build | 16 +
drivers/power/meson.build | 14 +
drivers/power/pstate/meson.build | 10 +
.../power/pstate/pstate_cpufreq.c | 22 +-
.../power/pstate/pstate_cpufreq.h | 6 +-
examples/l3fwd-power/main.c | 12 +-
lib/power/meson.build | 9 +-
lib/power/power_common.c | 2 +-
lib/power/power_common.h | 16 +-
lib/power/rte_power.c | 291 ++--
lib/power/rte_power.h | 139 +---
lib/power/rte_power_core_ops.h| 208 +++
lib/power/rte_power_uncore.c | 205 +--
lib/power/rte_power_uncore.h | 87 +++--
lib/power/rte_power_uncore_ops.h | 239 +
lib/power/version.map | 15 +
39 files changed, 1604 insertions(+), 625 deletions(-)
rename lib/power/power_acpi_cpufreq.c => drivers/power/acpi/acpi_cpufreq.c
(95%)
rename lib/power/power_acpi_cpufreq.h => drivers/power/acpi/acpi_cpufreq.h
(98%)
create mode 100644 drivers/power/acpi/meson.build
rename lib/power/power_amd_pstate_cpufreq.c =>
drivers/power/amd_pstate/amd_pstate_cpufreq.c (95%)
rename lib/power/power_amd_pstate_cpufreq.h =>
drivers/power/amd_pstate/amd_pstate_cpufreq.h (97%)
create mode 100644 drivers/power/amd_pstate/meson.build
create mode 100644 drivers/power/amd_uncore/amd_uncore.c
create mode 100644 drivers/power/amd_uncore/amd_uncore.h
create mode 100644 drivers/power/amd_uncore/meson.build
rename lib/power/power_cppc_cpufreq.c => drivers/power/cppc/cppc_cpufreq.c
(95%)
rename lib/power/power_cppc_cpufreq.h => drivers/power/cppc/cppc_cpufreq.h
(97%)
create mode 100644 drivers/power/cppc/meson.build
rename lib/power/power_intel_uncore.c =>
drivers/power/intel_uncore/intel_uncore.c (95%)
rename lib/power/power_intel_uncore.h =>
drivers/power/intel_uncore/intel_uncore.h (97%)
create mode 100644 drivers/power/intel_uncore/meson.build
rename {lib/power => drivers/power/kvm_vm}/guest_channel.c (100%)
rename {lib/power => drivers/power/kvm_vm}/guest_channel.h (100%)
rename lib/power/power_kvm_vm.c => drivers/power/kvm_vm/kvm_vm.c (82%)
rename lib/power/power_kvm_vm.h => drivers/power/kvm_vm/kvm_vm.h (98%)
create mode 100644 drivers/power/kvm_vm/meson.build
create mode 100644 drivers/power/meson.build
create mode 100644 drivers/power/pstate/meson.build
rename lib/power/power_pstate_cpufreq.c =>
drivers/power/pstate/pstate_cpufreq.c (96%)
rename lib/power/power_pstate_cpufreq.h =>
drivers/power/pstate/pstate_cpufreq.h (98%)
create mode 100644 lib/
Re: [PATCH] net/pcap: set live interface as non-blocking
On 8/24/2024 7:07 PM, Stephen Hemminger wrote:
> The DPDK PMD's are supposed to be non-blocking and poll for packets.
> Configure PCAP to do this on live interface.
>
> Bugzilla ID: 1526
> Reported-by: Ofer Dagan
> Signed-off-by: Stephen Hemminger
>
Bugzilla ID: 1526
Fixes: 4c173302c307 ("pcap: add new driver")
Cc: sta...@dpdk.org
Acked-by: Ferruh Yigit
Applied to dpdk-next-net/main, thanks.
RE: [RFC PATCH 1/2] power: fix power library with --lcores
[AMD Official Use Only - AMD Internal Distribution Only]
Hi Stephen,
> -Original Message-
> From: Stephen Hemminger
> Sent: Wednesday, July 24, 2024 8:10 PM
> To: Tummala, Sivaprasad
> Cc: david.h...@intel.com; anatoly.bura...@intel.com;
> tho...@monjalon.net; Yigit, Ferruh ;
> david.march...@redhat.com; dev@dpdk.org
> Subject: Re: [RFC PATCH 1/2] power: fix power library with --lcores
>
> Caution: This message originated from an External Source. Use proper caution
> when opening attachments, clicking links, or responding.
>
>
> On Wed, 24 Jul 2024 13:03:35 +
> Sivaprasad Tummala
> mailto:sivaprasad.tumm...@amd.com>> wrote:
>
> > + lcore_cpus = rte_lcore_cpuset(lcore_id);
> > + if (CPU_COUNT(&lcore_cpus) != 1) {
> > + POWER_LOG(ERR, "Power library doesn't support lcore %u mapping
> "
> > + "to %u cpus", lcore_id,
> > CPU_COUNT(&lcore_cpus));
> > + return -1;
> > + }
> > + for (cpu = 0; cpu < CPU_SETSIZE; cpu++) {
> > + if (CPU_ISSET(cpu, &lcore_cpus))
> > + break;
> > + }
>
> You are copy and pasting the same code into multiple places which indicates it
> should be an API function.
ACK! Will fix this in next version.
Re: [PATCH v2 1/4] power: refactor core power management library
On Mon, 26 Aug 2024 13:06:46 +
Sivaprasad Tummala wrote:
> +static struct rte_power_core_ops acpi_ops = {
> + .name = "acpi",
> + .init = power_acpi_cpufreq_init,
> + .exit = power_acpi_cpufreq_exit,
> + .check_env_support = power_acpi_cpufreq_check_supported,
> + .get_avail_freqs = power_acpi_cpufreq_freqs,
> + .get_freq = power_acpi_cpufreq_get_freq,
> + .set_freq = power_acpi_cpufreq_set_freq,
> + .freq_down = power_acpi_cpufreq_freq_down,
> + .freq_up = power_acpi_cpufreq_freq_up,
> + .freq_max = power_acpi_cpufreq_freq_max,
> + .freq_min = power_acpi_cpufreq_freq_min,
> + .turbo_status = power_acpi_turbo_status,
> + .enable_turbo = power_acpi_enable_turbo,
> + .disable_turbo = power_acpi_disable_turbo,
> + .get_caps = power_acpi_get_capabilities
> +};
> +
Can this be made const?
It is good for security and overall safety to have structures with
function pointers marked const.
Re: [PATCH v3] net/cpfl: fix cpfl parser issue
On Fri, Aug 23, 2024 at 11:14:50AM +, Praveen Shetty wrote:
> CPFL parser was incorrectly parsing the mask value of the
> next_proto_id field from recipe.json file as a string
> instead of unsigned integer.
>
> Fixes: 41f20298ee8c ("net/cpfl: parse flow offloading hint from JSON")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Praveen Shetty
>
> ---
> v2:
> * Fixed CI issues.
> v3:
> * Addressed review comments.
> ---
> drivers/net/cpfl/cpfl_flow_parser.c | 34 +++--
> 1 file changed, 22 insertions(+), 12 deletions(-)
>
Acked-by: Bruce Richardson
Applied to dpdk-next-net-intel,
thanks,
/Bruce
Re: [PATCH v1] net/ice: fix incorrect reading of PHY timestamp
On Fri, Aug 23, 2024 at 11:01:33AM +, Soumyadeep Hore wrote:
> In E830 adapters, PHY timestamp for Tx packets should be read once
> the ready status of PHY timestamp registers is 1.
>
> Fixes: 881169950d80 ("net/ice/base: implement initial PTP support for E830")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Soumyadeep Hore
> ---
> drivers/net/ice/base/ice_ptp_hw.c | 68 ---
> 1 file changed, 44 insertions(+), 24 deletions(-)
>
Since this is a patch to the base code for "ice", should it be, or can it
be, included in the patchset for the base code update for this release [1].
[1] https://patches.dpdk.org/project/dpdk/list/?series=32832
Re: [PATCH] ip_frag: support IPv6 reassembly with extensions
On Mon, 26 Aug 2024 13:23:28 +0200
wrote:
> diff --git a/lib/ip_frag/ip_reassembly.h b/lib/ip_frag/ip_reassembly.h
> index 54afed5417..429e74f1b3 100644
> --- a/lib/ip_frag/ip_reassembly.h
> +++ b/lib/ip_frag/ip_reassembly.h
> @@ -54,6 +54,8 @@ struct __rte_cache_aligned ip_frag_pkt {
> uint32_t total_size; /* expected reassembled size */
> uint32_t frag_size;/* size of fragments received */
> uint32_t last_idx; /* index of next entry to fill */
> + uint32_t exts_len; /* length of extension hdrs for
> first fragment */
> + uint8_t *next_proto; /* pointer of the next_proto
> field */
> struct ip_frag frags[IP_MAX_FRAG_NUM]; /* fragments */
> };
This creates a 32 bit hole in the structure.
Better to put next_proto after the start field.
> +
> + while (next_proto != IPPROTO_FRAGMENT &&
> + num_exts < MAX_NUM_IPV6_EXTS &&
> + (next_proto = rte_ipv6_get_next_ext(
> + *last_ext, next_proto, &ext_len)) >= 0) {
I would break up this loop condition for clarity.
Something like:
while (next_proto != IPPROTO_FRAGMENT && num_exts < MAX_NUM_IPV6_EXTS) {
next_proto = rte_ipv6_get_next_ext(*last_ext, next_proto,
&ext_len);
if (next_proto < 0)
break
Also, need a new test cases for this.
Re: [GRO] check whether ip_id continuity needs to be checked when two TCP packets are merged.
On Thu, 20 Apr 2023 02:30:41 + "Hu, Jiayu" wrote: > Hi Cheng, > > > -Original Message- > > From: jiangheng (G) > > Sent: Saturday, April 15, 2023 10:46 PM > > To: us...@dpdk.org; Hu, Jiayu ; dev@dpdk.org > > Subject: [GRO] check whether ip_id continuity needs to be checked when > > two TCP packets are merged. > > > > Hi jiayu.hu > > > > It cannot be guaranteed that 16bit identification field of ip packets in the > > same tcp stream will be continuous. > > Please help check whether ip_id continuity needs to be checked when two > > TCP packets are merged? > > Seems to modify the following code, gro will aggregate better, and work > > better: > > > > diff --git a/lib/gro/gro_tcp4.h b/lib/gro/gro_tcp4.h index > > 212f97a042..06faead7b5 100644 > > --- a/lib/gro/gro_tcp4.h > > +++ b/lib/gro/gro_tcp4.h > > @@ -291,12 +291,10 @@ check_seq_option(struct gro_tcp4_item *item, > > /* check if the two packets are neighbors */ > > len = pkt_orig->pkt_len - l2_offset - pkt_orig->l2_len - > > pkt_orig->l3_len - tcp_hl_orig; > > - if ((sent_seq == item->sent_seq + len) && (is_atomic || > > - (ip_id == item->ip_id + 1))) > > + if (sent_seq == item->sent_seq + len) > > For atomic packets, the IP ID field is ignored, as it can be set in various > ways. > For non-atomic packets, it follows Linux kernel tcp_gro_receive(). > > Is this change specific to your case? Can you give more details on why it > helps? > > Thanks, > Jiayu Agreed, DPDK GRO should follow Linux to avoid bugs.
Re: [PATCH v1] net/ice: fix incorrect reading of PHY timestamp
Recheck-request: iol-marvell-Functional
On Fri, Aug 23, 2024 at 7:56 AM Soumyadeep Hore
wrote:
>
> In E830 adapters, PHY timestamp for Tx packets should be read once
> the ready status of PHY timestamp registers is 1.
>
> Fixes: 881169950d80 ("net/ice/base: implement initial PTP support for E830")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Soumyadeep Hore
> ---
> drivers/net/ice/base/ice_ptp_hw.c | 68 ---
> 1 file changed, 44 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/net/ice/base/ice_ptp_hw.c
> b/drivers/net/ice/base/ice_ptp_hw.c
> index 004f659eae..41367105b2 100644
> --- a/drivers/net/ice/base/ice_ptp_hw.c
> +++ b/drivers/net/ice/base/ice_ptp_hw.c
> @@ -5526,6 +5526,27 @@ ice_ptp_port_cmd_e830(struct ice_hw *hw, enum
> ice_ptp_tmr_cmd cmd,
>lock_sbq);
> }
>
> +/**
> + * ice_get_phy_tx_tstamp_ready_e830 - Read Tx memory status register
> + * @hw: pointer to the HW struct
> + * @port: the PHY port to read
> + * @tstamp_ready: contents of the Tx memory status register
> + *
> + */
> +static int
> +ice_get_phy_tx_tstamp_ready_e830(struct ice_hw *hw, u8 port, u64
> *tstamp_ready)
> +{
> + u64 hi;
> + u32 lo;
> +
> + lo = rd32(hw, E830_PRTMAC_TS_TX_MEM_VALID_L);
> + hi = (u64)rd32(hw, E830_PRTMAC_TS_TX_MEM_VALID_H) << 32;
> +
> + *tstamp_ready = hi | lo;
> +
> + return 0;
> +}
> +
> /**
> * ice_read_phy_tstamp_e830 - Read a PHY timestamp out of the external PHY
> * @hw: pointer to the HW struct
> @@ -5539,10 +5560,30 @@ ice_ptp_port_cmd_e830(struct ice_hw *hw, enum
> ice_ptp_tmr_cmd cmd,
> static int
> ice_read_phy_tstamp_e830(struct ice_hw *hw, u8 lport, u8 idx, u64 *tstamp)
> {
> - u32 hi_addr = E830_HIGH_TX_MEMORY_BANK(idx, lport);
> - u32 lo_addr = E830_LOW_TX_MEMORY_BANK(idx, lport);
> + u32 hi_addr, lo_addr;
> u32 lo_val, hi_val, lo;
> - u8 hi;
> + u8 hi, ret;
> + u64 start_time, curr_time;
> + u64 tstamp_ready = 0;
> +
> + start_time = rte_get_timer_cycles() / (rte_get_timer_hz() / 1000);
> +
> + /* To check the ready status of HY Timestamp register for fetching
> timestamp */
> + while (!(tstamp_ready & BIT_ULL(0))) {
> + ret = ice_get_phy_tx_tstamp_ready_e830(hw, lport,
> &tstamp_ready);
> + if (ret) {
> + PMD_DRV_LOG(ERR, "Failed to get phy ready for
> timestamp");
> + return -1;
> + }
> + curr_time = rte_get_timer_cycles() / (rte_get_timer_hz() /
> 1000);
> + if (curr_time - start_time > 1000) {
> + PMD_DRV_LOG(ERR, "Timeout to get phy ready for
> timestamp");
> + return -1;
> + }
> + }
> +
> + hi_addr = E830_HIGH_TX_MEMORY_BANK(idx, lport);
> + lo_addr = E830_LOW_TX_MEMORY_BANK(idx, lport);
>
> lo_val = rd32(hw, lo_addr);
> hi_val = rd32(hw, hi_addr);
> @@ -5558,27 +5599,6 @@ ice_read_phy_tstamp_e830(struct ice_hw *hw, u8 lport,
> u8 idx, u64 *tstamp)
> return 0;
> }
>
> -/**
> - * ice_get_phy_tx_tstamp_ready_e830 - Read Tx memory status register
> - * @hw: pointer to the HW struct
> - * @port: the PHY port to read
> - * @tstamp_ready: contents of the Tx memory status register
> - *
> - */
> -static int
> -ice_get_phy_tx_tstamp_ready_e830(struct ice_hw *hw, u8 port, u64
> *tstamp_ready)
> -{
> - u64 hi;
> - u32 lo;
> -
> - lo = rd32(hw, E830_PRTMAC_TS_TX_MEM_VALID_L);
> - hi = (u64)rd32(hw, E830_PRTMAC_TS_TX_MEM_VALID_H) << 32;
> -
> - *tstamp_ready = hi | lo;
> -
> - return 0;
> -}
> -
> /* Device agnostic functions
> *
> * The following functions implement shared behavior common to both E822/E823
> --
> 2.43.0
>
Re: [PATCH v3 00/12] Align ICE shared code with Base driver
Recheck-request: iol-marvell-Functional On Fri, Aug 23, 2024 at 6:51 AM Soumyadeep Hore wrote: > > Updating the latest shared code patches to ICE base driver. > > --- > v3: > - Addressed comments givn by reviewer > --- > v2: > - Addressed comments given by reviewer > - Corrected errors in Camel Case > --- > > Dan Nowlin (2): > net/ice: correct Tx Scheduler AQ command RD bit for E825C > net/ice: support optional flags in signature segment header > > Fabio Pricoco (1): > net/ice: update iteration of TLVs in Preserved Fields Area > > Jacob Keller (1): > net/ice: avoid reading past end of PFA > > Norbert Zulinski (2): > net/ice: updates for ptp init in E825C > net/ice: update PTP init > > Oleg Akhrem (1): > net/ice: address compilation errors > > Paul Greenwalt (3): > net/ice: add new tag definitions > net/ice: fix link speed for 200G > net/ice: update E830 50G branding strings > > Przemyslaw Gierszynski (1): > net/ice: add support for FEC auto-detect for E830 > > Yogesh Bhosale (1): > net/ice: use correct format specifiers for unsigned ints > > drivers/net/ice/base/ice_adminq_cmd.h | 2 +- > drivers/net/ice/base/ice_cgu_regs.h | 19 + > drivers/net/ice/base/ice_common.c | 66 > drivers/net/ice/base/ice_ddp.c| 31 +++- > drivers/net/ice/base/ice_ddp.h| 5 +- > drivers/net/ice/base/ice_devids.h | 12 +-- > drivers/net/ice/base/ice_hw_autogen.h | 14 > drivers/net/ice/base/ice_nvm.c| 36 ++--- > drivers/net/ice/base/ice_ptp_consts.h | 75 ++ > drivers/net/ice/base/ice_ptp_hw.c | 106 +- > drivers/net/ice/base/ice_ptp_hw.h | 21 + > drivers/net/ice/ice_ethdev.c | 6 +- > 12 files changed, 285 insertions(+), 108 deletions(-) > > -- > 2.43.0 >
[PATCH v3] bus/fslmc/dpaa2: replace system("echo ...") with file i/o
Using system() is a bad idea in driver code because it introduces
a number of potential security issues. The codeql analysis tool
flags this a potential security issue.
Instead just use normal stdio to do the same thing.
Compile test only, do not have this hardware and therefore can
not test this.
Signed-off-by: Stephen Hemminger
Reviewed-by: Sachin Saxena
---
v3 - remove unneccessary pre-allocation of the line buffer
drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 32 +++-
1 file changed, 20 insertions(+), 12 deletions(-)
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
index 4aec7b2cd8..d8a98326d9 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
@@ -125,12 +125,12 @@ static void
dpaa2_affine_dpio_intr_to_respective_core(int32_t dpio_id, int cpu_id)
{
#define STRING_LEN 28
-#define COMMAND_LEN50
+#define AFFINITY_LEN 128
uint32_t cpu_mask = 1;
- int ret;
size_t len = 0;
char *temp = NULL, *token = NULL;
- char string[STRING_LEN], command[COMMAND_LEN];
+ char string[STRING_LEN];
+ char smp_affinity[AFFINITY_LEN];
FILE *file;
snprintf(string, STRING_LEN, "dpio.%d", dpio_id);
@@ -155,17 +155,25 @@ dpaa2_affine_dpio_intr_to_respective_core(int32_t
dpio_id, int cpu_id)
}
cpu_mask = cpu_mask << cpu_id;
- snprintf(command, COMMAND_LEN, "echo %X > /proc/irq/%s/smp_affinity",
-cpu_mask, token);
- ret = system(command);
- if (ret < 0)
- DPAA2_BUS_DEBUG(
- "Failed to affine interrupts on respective core");
- else
- DPAA2_BUS_DEBUG(" %s command is executed", command);
-
+ snprintf(smp_affinity, AFFINITY_LEN, "/proc/irq/%s/smp_affinity",
token);
free(temp);
fclose(file);
+
+ file = fopen(smp_affinity, "w");
+ if (file == NULL) {
+ DPAA2_BUS_WARN("Failed to open %s", smp_affinity);
+ return;
+ }
+ fprintf(file, "%X\n", cpu_mask);
+ fflush(file);
+
+ if (ferror(file)) {
+ fclose(file);
+ DPAA2_BUS_WARN("Failed to write to %s", smp_affinity);
+ return;
+ }
+
+ fclose(file);
}
static int dpaa2_dpio_intr_init(struct dpaa2_dpio_dev *dpio_dev)
--
2.43.0
Re: [PATCH v3 01/12] dts: fix default device error handling mode
On Wed, Aug 21, 2024 at 10:53 AM Juraj Linkeš
wrote:
>
> The device_error_handling_mode of testpmd port may not be present, e.g.
> in VM ports.
>
> Fixes: 61d5bc9bf974 ("dts: add port info command to testpmd shell")
>
> Signed-off-by: Juraj Linkeš
Reviewed-by: Jeremy Spewock
Re: [PATCH v3 02/12] dts: add the aenum dependency
On Wed, Aug 21, 2024 at 10:53 AM Juraj Linkeš wrote: > > Regular Python enumerations create only one instance for members with > the same value, such as: > class MyEnum(Enum): > foo = 1 > bar = 1 > > MyEnum.foo and MyEnum.bar are aliases that return the same instance. I didn't know this was a thing in Python Enums. It was very strange to me at first, but thinking about this more it makes some sense. > > DTS needs to return different instances in the above scenario so that we > can map capabilities with different names to the same function that > retrieves the capabilities. > > Signed-off-by: Juraj Linkeš Reviewed-by: Jeremy Spewock
Re: [PATCH v3 03/12] dts: add test case decorators
On Wed, Aug 21, 2024 at 10:53 AM Juraj Linkeš
wrote:
> class DTSRunner:
> @@ -232,9 +231,9 @@ def _get_test_suites_with_cases(
>
> for test_suite_config in test_suite_configs:
> test_suite_class =
> self._get_test_suite_class(test_suite_config.test_suite)
> -test_cases = []
> -func_test_cases, perf_test_cases = self._filter_test_cases(
> -test_suite_class, test_suite_config.test_cases
> +test_cases: list[type[TestCase]] = []
If TestCase is just a class, why is the `type[]` in the annotation
required? Are these not specific instances of the TestCase class? I
figured they would need to be in order for you to run the specific
test case methods. Maybe this has something to do with the class being
a Protocol?
> +func_test_cases, perf_test_cases =
> test_suite_class.get_test_cases(
> +test_suite_config.test_cases
> )
> if func:
> test_cases.extend(func_test_cases)
> @@ -309,57 +308,6 @@ def is_test_suite(object) -> bool:
> f"Couldn't find any valid test suites in
> {test_suite_module.__name__}."
> )
>
> @@ -120,6 +123,68 @@ def _process_links(self) -> None:
> ):
> self._port_links.append(PortLink(sut_port=sut_port,
> tg_port=tg_port))
>
> +@classmethod
> +def get_test_cases(
> +cls, test_case_sublist: Sequence[str] | None = None
> +) -> tuple[set[type["TestCase"]], set[type["TestCase"]]]:
> +"""Filter `test_case_subset` from this class.
> +
> +Test cases are regular (or bound) methods decorated with
> :func:`func_test`
> +or :func:`perf_test`.
> +
> +Args:
> +test_case_sublist: Test case names to filter from this class.
> +If empty or :data:`None`, return all test cases.
> +
> +Returns:
> +The filtered test case functions. This method returns functions
> as opposed to methods,
> +as methods are bound to instances and this method only has
> access to the class.
> +
> +Raises:
> +ConfigurationError: If a test case from `test_case_subset` is
> not found.
> +"""
> +
> +for test_case_name, test_case_function in inspect.getmembers(cls,
> is_test_case):
> +if test_case_name in test_case_sublist_copy:
> +# if test_case_sublist_copy is non-empty, remove the found
> test case
> +# so that we can look at the remainder at the end
> +test_case_sublist_copy.remove(test_case_name)
> +elif test_case_sublist:
> +# if the original list is not empty (meaning we're filtering
> test cases),
> +# we're dealing with a test case we would've
I think this part of the comment about "we're dealing with a test case
we would've removed in the other branch" confused me a little bit. It
could just be a me thing, but I think this would have been more clear
for me if it was something more like "The original list is not empty
(meaning we're filtering test cases). Since we didn't remove this test
case in the other branch, it doesn't match the filter and we don't
want to run it."
> +# removed in the other branch; since we didn't, we don't
> want to run it
> +continue
> +
> +match test_case_function.test_type:
> +case TestCaseType.PERFORMANCE:
> +perf_test_cases.add(test_case_function)
> +case TestCaseType.FUNCTIONAL:
> +func_test_cases.add(test_case_function)
> +
> +if test_case_sublist_copy:
> +raise ConfigurationError(
> +f"Test cases {test_case_sublist_copy} not found among
> functions of {cls.__name__}."
> +)
> +
> +return func_test_cases, perf_test_cases
> +
> 2.34.1
>
Re: [PATCH v3 04/12] dts: add mechanism to skip test cases or suites
On Wed, Aug 21, 2024 at 10:53 AM Juraj Linkeš wrote: > --- a/dts/framework/test_result.py > +++ b/dts/framework/test_result.py > @@ -75,6 +75,20 @@ def create_config(self) -> TestSuiteConfig: > test_cases=[test_case.__name__ for test_case in self.test_cases], > ) > > +@property > +def skip(self) -> bool: > +"""Skip the test suite if all test cases or the suite itself are to > be skipped. > + > +Returns: > +:data:`True` if the test suite should be skipped, :data:`False` > otherwise. > +""" > +all_test_cases_skipped = True > +for test_case in self.test_cases: > +if not test_case.skip: > +all_test_cases_skipped = False > +break You could also potentially implement this using the built-in `all()` function. It would become a simple one-liner like `all_test_cases_skipped = all(test_case.skip for test_case in self.test_cases)`. That's probably short enough to even just put in the return statement though if you wanted to. > +return all_test_cases_skipped or self.test_suite_class.skip > + > > class Result(Enum): > """The possible states that a setup, a teardown or a test case may end > up in.""" > @@ -86,12 +100,12 @@ class Result(Enum): > #: > ERROR = auto() > #: > -SKIP = auto() > -#: > BLOCK = auto() > +#: > +SKIP = auto() > > def __bool__(self) -> bool: > -"""Only PASS is True.""" > +"""Only :attr:`PASS` is True.""" > return self is self.PASS > > > @@ -169,12 +183,13 @@ def update_setup(self, result: Result, error: Exception > | None = None) -> None: > self.setup_result.result = result > self.setup_result.error = error > > -if result in [Result.BLOCK, Result.ERROR, Result.FAIL]: > -self.update_teardown(Result.BLOCK) > -self._block_result() > +if result != Result.PASS: > +result_to_mark = Result.BLOCK if result != Result.SKIP else > Result.SKIP > +self.update_teardown(result_to_mark) > +self._mark_results(result_to_mark) > > -def _block_result(self) -> None: > -r"""Mark the result as :attr:`~Result.BLOCK`\ed. > +def _mark_results(self, result) -> None: Is it worth adding the type annotation for `result` here and to the other places where this is implemented? I guess it doesn't matter that much since it is a private method. > +"""Mark the result as well as the child result as `result`. Are these methods even marking their own result or only their children? It seems like it's only really updating the children recursively and its result would have already been updated before this was called. > > The blocking of child results should be done in overloaded methods. > """ >
Re: [PATCH v3 05/12] dts: add support for simpler topologies
I just had one question below, otherwise: Reviewed-by: Jeremy Spewock On Wed, Aug 21, 2024 at 10:53 AM Juraj Linkeš wrote: > diff --git a/dts/framework/testbed_model/topology.py > b/dts/framework/testbed_model/topology.py > new file mode 100644 > index 00..19632ee890 > --- /dev/null > +++ b/dts/framework/testbed_model/topology.py > + > + > +class TopologyType(IntEnum): > +"""Supported topology types.""" > + > +#: A topology with no Traffic Generator. > +no_link = 0 > +#: A topology with one physical link between the SUT node and the TG > node. > +one_link = 1 > +#: A topology with two physical links between the Sut node and the TG > node. > +two_links = 2 > + > + > +class Topology: > +"""Testbed topology. > + > +The topology contains ports processed into ingress and egress ports. > +It's assumed that port0 of the SUT node is connected to port0 of the TG > node and so on. Do we need to make this assumption when you are comparing the port directly to its peer and matching the addresses? I think you could specify in conf.yaml that port 0 on the SUT is one of your ports and its peer is port 1 on the TG and because you do the matching, this would work fine. > +If there are no ports on a node, dummy ports (ports with no actual > values) are stored. > +If there is only one link available, the ports of this link are stored > +as both ingress and egress ports. > + > +The dummy ports shouldn't be used. It's up to > :class:`~framework.runner.DTSRunner` > +to ensure no test case or suite requiring actual links is executed > +when the topology prohibits it and up to the developers to make sure > that test cases > +not requiring any links don't use any ports. Otherwise, the underlying > methods > +using the ports will fail. > + > +Attributes: > +type: The type of the topology. > +tg_port_egress: The egress port of the TG node. > +sut_port_ingress: The ingress port of the SUT node. > +sut_port_egress: The egress port of the SUT node. > +tg_port_ingress: The ingress port of the TG node. > +""" > + > +type: TopologyType > +tg_port_egress: Port > +sut_port_ingress: Port > +sut_port_egress: Port > +tg_port_ingress: Port > + > +def __init__(self, sut_ports: Iterable[Port], tg_ports: Iterable[Port]): > +"""Create the topology from `sut_ports` and `tg_ports`. > + > +Args: > +sut_ports: The SUT node's ports. > +tg_ports: The TG node's ports. > +""" > +port_links = [] > +for sut_port in sut_ports: > +for tg_port in tg_ports: > +if (sut_port.identifier, sut_port.peer) == ( > +tg_port.peer, > +tg_port.identifier, > +): > +port_links.append(PortLink(sut_port=sut_port, > tg_port=tg_port)) > + > +self.type = TopologyType(len(port_links)) >
Re: [PATCH v3 06/12] dst: add basic capability support
Just one comment about adding something to a doc-string, otherwise looks good to me: Reviewed-by: Jeremy Spewock On Wed, Aug 21, 2024 at 10:53 AM Juraj Linkeš wrote: > diff --git a/dts/framework/test_result.py b/dts/framework/test_result.py > index 306b100bc6..b4b58ef348 100644 > --- a/dts/framework/test_result.py > +++ b/dts/framework/test_result.py > @@ -25,10 +25,12 @@ > > import os.path > from collections.abc import MutableSequence > -from dataclasses import dataclass > +from dataclasses import dataclass, field > from enum import Enum, auto > from typing import Union > > +from framework.testbed_model.capability import Capability > + > from .config import ( > OS, > Architecture, > @@ -63,6 +65,12 @@ class is to hold a subset of test cases (which could be > all test cases) because > > test_suite_class: type[TestSuite] > test_cases: list[type[TestCase]] > +required_capabilities: set[Capability] = field(default_factory=set, > init=False) This should probably be added to the Attributes section of the doc-string for the class. When it's there, it might also be useful to explain that this is used by the runner to determine what capabilities need to be searched for to mark the suite for being skipped. The only reason I think that would be useful is it helps differentiate this list of capabilities from the list of required capabilities that every test suite and test case has. > + > +def __post_init__(self): > +"""Gather the required capabilities of the test suite and all test > cases.""" > +for test_object in [self.test_suite_class] + self.test_cases: > + > self.required_capabilities.update(test_object.required_capabilities) >
Re: [PATCH v3 07/12] dts: add testpmd port information caching
On Wed, Aug 21, 2024 at 10:53 AM Juraj Linkeš wrote: > > When using port information multiple times in a testpmd shell instance > lifespan, it's desirable to not get the information each time, so > caching is added. In case the information changes, there's a way to > force the update. > > Signed-off-by: Juraj Linkeš Reviewed-by: Jeremy Spewock
Re: [PATCH v3 08/12] dts: add NIC capability support
On Wed, Aug 21, 2024 at 10:53 AM Juraj Linkeš
wrote:
> @dataclass
> class TestPmdPort(TextParser):
> """Dataclass representing the result of testpmd's ``show port info``
> command."""
> @@ -962,3 +1043,96 @@ def _close(self) -> None:
> self.stop()
> self.send_command("quit", "Bye...")
> return super()._close()
> +
> +"""
> +== Capability retrieval methods ==
> +"""
> +
> +def get_capabilities_rxq_info(
> +self,
> +supported_capabilities: MutableSet["NicCapability"],
> +unsupported_capabilities: MutableSet["NicCapability"],
> +) -> None:
> +"""Get all rxq capabilities and divide them into supported and
> unsupported.
> +
> +Args:
> +supported_capabilities: Supported capabilities will be added to
> this set.
> +unsupported_capabilities: Unsupported capabilities will be added
> to this set.
> +"""
> +self._logger.debug("Getting rxq capabilities.")
> +command = f"show rxq info {self.ports[0].id} 0"
> +rxq_info = TestPmdRxqInfo.parse(self.send_command(command))
> +if rxq_info.rx_scattered_packets:
> +supported_capabilities.add(NicCapability.SCATTERED_RX_ENABLED)
> +else:
> +unsupported_capabilities.add(NicCapability.SCATTERED_RX_ENABLED)
> +
> +"""
> +== Decorator methods ==
> +"""
> +
> +@staticmethod
> +def config_mtu_9000(testpmd_method: TestPmdShellSimpleMethod) ->
> TestPmdShellDecoratedMethod:
It might be more valuable for me to make a method for configuring the
MTU of all ports so that you don't have to do the loops yourself, I
can add this to the MTU patch once I update that and rebase it on
main.
> +"""Configure MTU to 9000 on all ports, run `testpmd_method`, then
> revert.
> +
> +Args:
> +testpmd_method: The method to decorate.
> +
> +Returns:
> +The method decorated with setting and reverting MTU.
> +"""
> +
> +def wrapper(testpmd_shell: Self):
> +original_mtus = []
> +for port in testpmd_shell.ports:
> +original_mtus.append((port.id, port.mtu))
> +testpmd_shell.set_port_mtu(port_id=port.id, mtu=9000,
> verify=False)
> +testpmd_method(testpmd_shell)
> +for port_id, mtu in original_mtus:
> +testpmd_shell.set_port_mtu(port_id=port_id, mtu=mtu if mtu
> else 1500, verify=False)
> +
> +return wrapper
> diff --git a/dts/framework/testbed_model/capability.py
> b/dts/framework/testbed_model/capability.py
> index 8899f07f76..9a79e6ebb3 100644
> --- a/dts/framework/testbed_model/capability.py
> +++ b/dts/framework/testbed_model/capability.py
> @@ -5,14 +5,40 @@
>
> This module provides a protocol that defines the common attributes of test
> cases and suites
> and support for test environment capabilities.
> +
> +Many test cases are testing features not available on all hardware.
> +
> +The module also allows developers to mark test cases or suites a requiring
> certain
small typo: I think you meant " mark test cases or suites *as*
requiring certain..."
> +hardware capabilities with the :func:`requires` decorator.
> +
> +Example:
> +.. code:: python
> +
> +from framework.test_suite import TestSuite, func_test
> +from framework.testbed_model.capability import NicCapability,
> requires
> +class TestPmdBufferScatter(TestSuite):
> +# only the test case requires the scattered_rx capability
> +# other test cases may not require it
> +@requires(NicCapability.scattered_rx)
Is it worth updating this to what the enum actually holds
(SCATTERED_RX_ENABLED) or not really since it is just an example in a
doc-string? I think it could do either way, but it might be better to
keep it consistent at least to start.
> +@func_test
> +def test_scatter_mbuf_2048(self):
>
> @@ -96,6 +122,128 @@ def __hash__(self) -> int:
> """The subclasses must be hashable so that they can be stored in
> sets."""
>
>
> +@dataclass
> +class DecoratedNicCapability(Capability):
> +"""A wrapper around
> :class:`~framework.remote_session.testpmd_shell.NicCapability`.
> +
> +Some NIC capabilities are only present or listed as supported only under
> certain conditions,
> +such as when a particular configuration is in place. This is achieved by
> allowing users to pass
> +a decorator function that decorates the function that gets the support
> status of the capability.
> +
> +New instances should be created with the :meth:`create_unique` class
> method to ensure
> +there are no duplicate instances.
> +
> +Attributes:
> +nic_capability: The NIC capability that partly defines each instance.
> +capability_decorator: The decorator function that will be passed the
> function associated
> +with `n
Re: [PATCH v3 09/12] dts: add topology capability
On Wed, Aug 21, 2024 at 10:53 AM Juraj Linkeš wrote: > > Add support for marking test cases as requiring a certain topology. The > default topology is a two link topology and the other supported > topologies are one link and no link topologies. > > The TestProtocol of test suites and cases is extended with the topology > type each test suite or case requires. Each test case starts out as > requiring a two link topology and can be marked as requiring as > topology directly (by decorating the test case) or through its test > suite. If a test suite is decorated as requiring a certain topology, all > its test cases are marked as such. If both test suite and a test case > are decorated as requiring a topology, the test case cannot require a > more complex topology than the whole suite (but it can require a less > complex one). If a test suite is not decorated, this has no effect on > required test case topology. > > Since the default topology is defined as a reference to one of the > actual topologies, the NoAliasEnum from the aenum package is utilized, > which removes the aliasing of Enums so that TopologyType.two_links and > TopologyType.default are distinct. This is needed to distinguish between > a user passed value and the default value being used (which is used when > a test suite is or isn't decorated). > > Signed-off-by: Juraj Linkeš This patch looks good to me outside of some of the overlapping comments from the DecoratedNicCapability class (mainly just _get_unique).
Re: [PATCH v3 10/12] doc: add DTS capability doc sources
On Wed, Aug 21, 2024 at 10:53 AM Juraj Linkeš wrote: > > Add new files to generate DTS API documentation from. > > Signed-off-by: Juraj Linkeš Reviewed-by: Jeremy Spewock
Re: [PATCH v3 11/12] dts: add Rx offload capabilities
On Wed, Aug 21, 2024 at 10:53 AM Juraj Linkeš
wrote:
> diff --git a/dts/framework/remote_session/testpmd_shell.py
> b/dts/framework/remote_session/testpmd_shell.py
> index 48c31124d1..f83569669e 100644
> --- a/dts/framework/remote_session/testpmd_shell.py
> +++ b/dts/framework/remote_session/testpmd_shell.py
> @@ -659,6 +659,103 @@ class TestPmdPortStats(TextParser):
> tx_bps: int = field(metadata=TextParser.find_int(r"Tx-bps:\s+(\d+)"))
>
>
> +class RxOffloadCapability(Flag):
> +"""Rx offload capabilities of a device."""
> +
> +#:
> +RX_OFFLOAD_VLAN_STRIP = auto()
> +#: Device supports L3 checksum offload.
> +RX_OFFLOAD_IPV4_CKSUM = auto()
> +#: Device supports L4 checksum offload.
> +RX_OFFLOAD_UDP_CKSUM = auto()
> +#: Device supports L4 checksum offload.
> +RX_OFFLOAD_TCP_CKSUM = auto()
> +#: Device supports Large Receive Offload.
> +RX_OFFLOAD_TCP_LRO = auto()
> +#: Device supports QinQ (queue in queue) offload.
> +RX_OFFLOAD_QINQ_STRIP = auto()
> +#: Device supports inner packet L3 checksum.
> +RX_OFFLOAD_OUTER_IPV4_CKSUM = auto()
> +#: Device supports MACsec.
> +RX_OFFLOAD_MACSEC_STRIP = auto()
> +#: Device supports filtering of a VLAN Tag identifier.
> +RX_OFFLOAD_VLAN_FILTER = 1 << 9
> +#: Device supports VLAN offload.
> +RX_OFFLOAD_VLAN_EXTEND = auto()
> +#: Device supports receiving segmented mbufs.
> +RX_OFFLOAD_SCATTER = 1 << 13
I know you mentioned in the commit message that the auto() can cause
problems with mypy/sphinx, is that why this one is a specific value
instead? Regardless, I think we should probably make it consistent so
that either all of them are bit-shifts or none of them are unless
there is a specific reason that the scatter offload is different.
> +#: Device supports Timestamp.
> +RX_OFFLOAD_TIMESTAMP = auto()
> +#: Device supports crypto processing while packet is received in NIC.
> +RX_OFFLOAD_SECURITY = auto()
> +#: Device supports CRC stripping.
> +RX_OFFLOAD_KEEP_CRC = auto()
> +#: Device supports L4 checksum offload.
> +RX_OFFLOAD_SCTP_CKSUM = auto()
> +#: Device supports inner packet L4 checksum.
> +RX_OFFLOAD_OUTER_UDP_CKSUM = auto()
> +#: Device supports RSS hashing.
> +RX_OFFLOAD_RSS_HASH = auto()
> +#: Device supports
> +RX_OFFLOAD_BUFFER_SPLIT = auto()
> +#: Device supports all checksum capabilities.
> +RX_OFFLOAD_CHECKSUM = RX_OFFLOAD_IPV4_CKSUM | RX_OFFLOAD_UDP_CKSUM |
> RX_OFFLOAD_TCP_CKSUM
> +#: Device supports all VLAN capabilities.
> +RX_OFFLOAD_VLAN = (
> +RX_OFFLOAD_VLAN_STRIP
> +| RX_OFFLOAD_VLAN_FILTER
> +| RX_OFFLOAD_VLAN_EXTEND
> +| RX_OFFLOAD_QINQ_STRIP
> +)
>
> @@ -1048,6 +1145,42 @@ def _close(self) -> None:
> == Capability retrieval methods ==
> """
>
> +def get_capabilities_rx_offload(
> +self,
> +supported_capabilities: MutableSet["NicCapability"],
> +unsupported_capabilities: MutableSet["NicCapability"],
> +) -> None:
> +"""Get all rx offload capabilities and divide them into supported
> and unsupported.
> +
> +Args:
> +supported_capabilities: Supported capabilities will be added to
> this set.
> +unsupported_capabilities: Unsupported capabilities will be added
> to this set.
> +"""
> +self._logger.debug("Getting rx offload capabilities.")
> +command = f"show port {self.ports[0].id} rx_offload capabilities"
Is it desirable to only get the capabilities of the first port? In the
current framework I suppose it doesn't matter all that much since you
can only use the first few ports in the list of ports anyway, but will
there ever be a case where a test run has 2 different devices included
in the list of ports? Of course it's possible that it will happen, but
is it practical? Because, if so, then we would want this to aggregate
what all the devices are capable of and have capabilities basically
say "at least one of the ports in the list of ports is capable of
these things."
This consideration also applies to the rxq info capability gathering as well.
> +rx_offload_capabilities_out = self.send_command(command)
> +rx_offload_capabilities =
> RxOffloadCapabilities.parse(rx_offload_capabilities_out)
> +self._update_capabilities_from_flag(
> +supported_capabilities,
> +unsupported_capabilities,
> +RxOffloadCapability,
> +rx_offload_capabilities.per_port |
> rx_offload_capabilities.per_queue,
> +)
> +
>
> def __call__(
> self,
> diff --git a/dts/tests/TestSuite_pmd_buffer_scatter.py
> b/dts/tests/TestSuite_pmd_buffer_scatter.py
> index 89ece2ef56..64c48b0793 100644
> --- a/dts/tests/TestSuite_pmd_buffer_scatter.py
> +++ b/dts/tests/TestSuite_pmd_buffer_scatter.py
> @@ -28,6 +28,7 @@
> from framework.testbed_model.capability import NicCa
Re: [PATCH v3 12/12] dts: add NIC capabilities from show port info
On Wed, Aug 21, 2024 at 10:53 AM Juraj Linkeš wrote: > > Add the capabilities advertised by the testpmd command "show port info" > so that test cases may be marked as requiring those capabilities: > RUNTIME_RX_QUEUE_SETUP > RUNTIME_TX_QUEUE_SETUP > RXQ_SHARE > FLOW_RULE_KEEP > FLOW_SHARED_OBJECT_KEEP > > These names are copy pasted from the existing DeviceCapabilitiesFlag > class. Dynamic addition of Enum members runs into problems with typing > (mypy doesn't know about the members) and documentation generation > (Sphinx doesn't know about the members). > > Signed-off-by: Juraj Linkeš Reviewed-by: Jeremy Spewock
Re: [PATCH v3 00/12] dts: add test skipping based on capabilities
Hey Juraj, Thanks for the series! This is definitely a large shift in how the framework operates, but I think a lot of these changes are hugely helpful and the code is very well written in general. I left some comments mostly about places where I think some things could be a little more clear, and one about a functional difference that I think could be useful, but let me know what you think. Also, I tried to apply this patch to help with the review process but I couldn't get it to work. I think this is mainly due to the fact that this uses the MTU updating commit on main, and my version of that patch is far behind main right now, so we probably just resolved conflicts differently somehow. I will work on updating that series now and break the MTU patch into its own series to make it easier to use. Thanks, Jeremy
Re: [RFC 3/6] ring/soring: introduce Staged Ordered Ring
On 2024-08-15 10:53, Konstantin Ananyev wrote:
From: Konstantin Ananyev
Staged-Ordered-Ring (SORING) provides a SW abstraction for 'ordered' queues
with multiple processing 'stages'.
It is based on conventional DPDK rte_ring, re-uses many of its concepts,
and even substantial part of its code.
It can be viewed as an 'extension' of rte_ring functionality.
In particular, main SORING properties:
- circular ring buffer with fixed size objects
- producer, consumer plus multiple processing stages in the middle.
- allows to split objects processing into multiple stages.
- objects remain in the same ring while moving from one stage to the other,
initial order is preserved, no extra copying needed.
- preserves the ingress order of objects within the queue across multiple
stages, i.e.:
at the same stage multiple threads can process objects from the ring in
any order, but for the next stage objects will always appear in the
original order.
- each stage (and producer/consumer) can be served by single and/or
multiple threads.
- number of stages, size and number of objects in the ring are
configurable at ring initialization time.
Data-path API provides four main operations:
- enqueue/dequeue works in the same manner as for conventional rte_ring,
all rte_ring synchronization types are supported.
- acquire/release - for each stage there is an acquire (start) and
release (finish) operation.
after some objects are 'acquired' - given thread can safely assume that
it has exclusive possession of these objects till 'release' for them is
invoked.
Note that right now user has to release exactly the same number of
objects that was acquired before.
After 'release', objects can be 'acquired' by next stage and/or dequeued
by the consumer (in case of last stage).
Expected use-case: applications that uses pipeline model
(probably with multiple stages) for packet processing, when preserving
incoming packet order is important. I.E.: IPsec processing, etc.
How does SORING related to Eventdev? Would it be feasible to reshape
this into a SW event device?
Signed-off-by: Konstantin Ananyev
---
lib/ring/meson.build | 4 +-
lib/ring/rte_soring.c | 144 ++
lib/ring/rte_soring.h | 270 ++
lib/ring/soring.c | 431 ++
lib/ring/soring.h | 124
lib/ring/version.map | 13 ++
6 files changed, 984 insertions(+), 2 deletions(-)
create mode 100644 lib/ring/rte_soring.c
create mode 100644 lib/ring/rte_soring.h
create mode 100644 lib/ring/soring.c
create mode 100644 lib/ring/soring.h
diff --git a/lib/ring/meson.build b/lib/ring/meson.build
index 7fca958ed7..21f2c12989 100644
--- a/lib/ring/meson.build
+++ b/lib/ring/meson.build
@@ -1,8 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
-sources = files('rte_ring.c')
-headers = files('rte_ring.h')
+sources = files('rte_ring.c', 'rte_soring.c', 'soring.c')
+headers = files('rte_ring.h', 'rte_soring.h')
# most sub-headers are not for direct inclusion
indirect_headers += files (
'rte_ring_core.h',
diff --git a/lib/ring/rte_soring.c b/lib/ring/rte_soring.c
new file mode 100644
index 00..17b1b73a42
--- /dev/null
+++ b/lib/ring/rte_soring.c
@@ -0,0 +1,144 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 Huawei Technologies Co., Ltd
+ */
+
+#include "soring.h"
+#include
+
+RTE_LOG_REGISTER_DEFAULT(soring_logtype, INFO);
+#define RTE_LOGTYPE_SORING soring_logtype
+#define SORING_LOG(level, ...) \
+ RTE_LOG_LINE(level, SORING, "" __VA_ARGS__)
+
+static uint32_t
+soring_calc_elem_num(uint32_t count)
+{
+ return rte_align32pow2(count + 1);
+}
+
+static int
+soring_check_param(uint32_t esize, uint32_t stsize, uint32_t count,
+ uint32_t stages)
+{
+ if (stages == 0) {
+ SORING_LOG(ERR, "invalid number of stages: %u", stages);
+ return -EINVAL;
+ }
+
+ /* Check if element size is a multiple of 4B */
+ if (esize == 0 || esize % 4 != 0) {
+ SORING_LOG(ERR, "invalid element size: %u", esize);
+ return -EINVAL;
+ }
+
+ /* Check if ret-code size is a multiple of 4B */
+ if (stsize % 4 != 0) {
+ SORING_LOG(ERR, "invalid retcode size: %u", stsize);
+ return -EINVAL;
+ }
+
+/* count must be a power of 2 */
+ if (rte_is_power_of_2(count) == 0 ||
+ (count > RTE_SORING_ELEM_MAX + 1)) {
+ SORING_LOG(ERR, "invalid number of elements: %u", count);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+/*
+ * Calculate size offsets for SORING internal data layout.
+ */
+static size_t
+soring_get_szofs(uint32_t esize, uint32_t stsize, uint32_t count,
+ uint32_t stages, size_t *elst_ofs, size_t *state_ofs,
+ size_t *stage_ofs)
+{
+ size_t sz;
+ c
[PATCH v1 0/1] dts: allow for updating MTU with testpmd
From: Jeremy Spewock There are mechanisms to update the MTU of ports in the framework already, but only when those ports are bound to their kernel drivers. This series adds the functionality needed within testpmd to change the MTU of ports on the SUT which are bound to their DPDK driver. Jeremy Spewock (1): dts: add methods for modifying MTU to testpmd shell dts/framework/remote_session/testpmd_shell.py | 27 +++ 1 file changed, 27 insertions(+) -- 2.46.0
[PATCH v1 1/1] dts: add methods for modifying MTU to testpmd shell
From: Jeremy Spewock
There are methods within DTS currently that support updating the MTU of
ports on a node, but the methods for doing this in a linux session rely
on the ip command and the port being bound to the kernel driver. Since
test suites are run while bound to the driver for DPDK, there needs to
be a way to modify the value while bound to said driver as well. This is
done by using testpmd to modify the MTU.
Depends-on: patch-142952 ("dts: add ability to start/stop testpmd
ports")
Signed-off-by: Jeremy Spewock
---
dts/framework/remote_session/testpmd_shell.py | 27 +++
1 file changed, 27 insertions(+)
diff --git a/dts/framework/remote_session/testpmd_shell.py
b/dts/framework/remote_session/testpmd_shell.py
index ca24b28070..0d2c972b8f 100644
--- a/dts/framework/remote_session/testpmd_shell.py
+++ b/dts/framework/remote_session/testpmd_shell.py
@@ -888,6 +888,33 @@ def show_port_stats(self, port_id: int) ->
TestPmdPortStats:
return TestPmdPortStats.parse(output)
+@requires_stopped_ports
+def set_port_mtu(self, port_id: int, mtu: int, verify: bool = True) ->
None:
+"""Change the MTU of a port using testpmd.
+
+Some PMDs require that the port be stopped before changing the MTU,
and it does no harm to
+stop the port before configuring in cases where it isn't required, so
we first stop ports,
+then update the MTU, then start the ports again afterwards.
+
+Args:
+port_id: ID of the port to adjust the MTU on.
+mtu: Desired value for the MTU to be set to.
+verify: If `verify` is :data:`True` then the output will be
scanned in an attempt to
+verify that the mtu was properly set on the port. Defaults to
:data:`True`.
+
+Raises:
+InteractiveCommandExecutionError: If `verify` is :data:`True` and
the MTU was not
+properly updated on the port matching `port_id`.
+"""
+set_mtu_output = self.send_command(f"port config mtu {port_id} {mtu}")
+if verify and (f"MTU: {mtu}" not in self.send_command(f"show port info
{port_id}")):
+self._logger.debug(
+f"Failed to set mtu to {mtu} on port {port_id}." f" Output
was:\n{set_mtu_output}"
+)
+raise InteractiveCommandExecutionError(
+f"Test pmd failed to update mtu of port {port_id} to {mtu}"
+)
+
def _close(self) -> None:
"""Overrides :meth:`~.interactive_shell.close`."""
self.stop()
--
2.46.0
Re: [PATCH v2 1/2] dts: add csum HW offload to testpmd shell
On Fri, Aug 23, 2024 at 10:54 AM Jeremy Spewock
wrote:
> On Wed, Aug 21, 2024 at 12:25 PM Dean Marx wrote:
> >
> > add csum_set_hw method to testpmd shell class. Port over
> > set_verbose and port start/stop from queue start/stop suite.
>
> Since we had that discussion in a DTS meeting about there not really
> being a rule against multiple dependencies or anything like that, I
> think it might be better if we start moving to just always depending
> on other patches rather than duplicating code in between multiple
> series'. Not a call out to you at all because I think I have multiple
> patches open right now where I also borrow from other suites because I
> didn't want long dependency lists, but I think the lists of
> dependencies might end up being easier to track than where the code is
> from. It also makes for more targeted commit messages.
>
> Let me know what you think though. This might be something worth
> talking about with the larger development group as well to get more
> opinions on it.
>
I actually like that idea a lot, I'm going to add the dependency and remove
the corresponding methods, especially since it probably makes the
maintainer's jobs easier when there's less code duplication. I can also
send a message in the slack chat about this to see what other people think.
> > +class ChecksumOffloadOptions(Flag):
> > +"""Flag representing checksum hardware offload layer options."""
> > +
> > +#:
> > +ip = auto()
> > +#:
> > +udp = auto()
> > +#:
> > +tcp = auto()
> > +#:
> > +sctp = auto()
> > +#:
> > +outerip = auto()
> > +#:
> > +outerudp = auto()
> > +
> > +def __str__(self):
> > +"""String method for use in csum_set_hw."""
> > +if self == ChecksumOffloadOptions.outerip:
> > +return "outer-ip"
> > +elif self == ChecksumOffloadOptions.outerudp:
> > +return "outer-udp"
>
> It might be easier to name these values outer_ip and outer_udp and
> then just do a str.replace("_", "-") on them to get the same result.
>
Makes sense, I ended up just getting rid of the __str__ method entirely and
iterating through the options within the csum set hw method with the
__members__ method you mentioned later in this review. I was able to create
a for loop that looks like this:
for name, offload in ChecksumOffloadOptions.__members__.items():
if offload in layer:
(action)
where .items() returns all the flags in a dictionary, where the key is a
string of the flag name and the offload value is the actual flag instance
from the class. This way I could just call name = name.replace("_", "-")
within the loop and use name for send_command and offload for comparing
flags.
> I honestly didn't know the `title()` method of a string existed in
> python until I just did a little searching and it seems strange to me,
> but it would be helpful for this use case. It also is weird to me that
> they would have everything other than outer-ip and outer-udp be all
> upper case.
Yeah it is really odd, I'm not sure if they had consistency in mind while
developing this part of testpmd. The title command is a great idea though,
I added that to the second part of the csum method and it really simplified
everything.
[PATCH v2 0/1] dts: allow for updating MTU with testpmd
From: Jeremy Spewock v2: * allow for setting the MTU of all ports with testpmd. * update doc-string Jeremy Spewock (1): dts: add methods for modifying MTU to testpmd shell dts/framework/remote_session/testpmd_shell.py | 44 +++ 1 file changed, 44 insertions(+) -- 2.46.0
[PATCH v2 1/1] dts: add methods for modifying MTU to testpmd shell
From: Jeremy Spewock
There are methods within DTS currently that support updating the MTU of
ports on a node, but the methods for doing this in a linux session rely
on the ip command and the port being bound to the kernel driver. Since
test suites are run while bound to the driver for DPDK, there needs to
be a way to modify the value while bound to said driver as well. This is
done by using testpmd to modify the MTU.
Depends-on: patch-142952 ("dts: add ability to start/stop testpmd
ports")
Signed-off-by: Jeremy Spewock
---
dts/framework/remote_session/testpmd_shell.py | 44 +++
1 file changed, 44 insertions(+)
diff --git a/dts/framework/remote_session/testpmd_shell.py
b/dts/framework/remote_session/testpmd_shell.py
index ca24b28070..6891f63bef 100644
--- a/dts/framework/remote_session/testpmd_shell.py
+++ b/dts/framework/remote_session/testpmd_shell.py
@@ -888,6 +888,50 @@ def show_port_stats(self, port_id: int) ->
TestPmdPortStats:
return TestPmdPortStats.parse(output)
+@requires_stopped_ports
+def set_port_mtu(self, port_id: int, mtu: int, verify: bool = True) ->
None:
+"""Change the MTU of a port using testpmd.
+
+Some PMDs require that the port be stopped before changing the MTU,
and it does no harm to
+stop the port before configuring in cases where it isn't required, so
ports are stopped
+prior to changing their MTU.
+
+Args:
+port_id: ID of the port to adjust the MTU on.
+mtu: Desired value for the MTU to be set to.
+verify: If `verify` is :data:`True` then the output will be
scanned in an attempt to
+verify that the mtu was properly set on the port. Defaults to
:data:`True`.
+
+Raises:
+InteractiveCommandExecutionError: If `verify` is :data:`True` and
the MTU was not
+properly updated on the port matching `port_id`.
+"""
+set_mtu_output = self.send_command(f"port config mtu {port_id} {mtu}")
+if verify and (f"MTU: {mtu}" not in self.send_command(f"show port info
{port_id}")):
+self._logger.debug(
+f"Failed to set mtu to {mtu} on port {port_id}." f" Output
was:\n{set_mtu_output}"
+)
+raise InteractiveCommandExecutionError(
+f"Test pmd failed to update mtu of port {port_id} to {mtu}"
+)
+
+def set_port_mtu_all(self, mtu: int, verify: bool = True) -> None:
+"""Change the MTU of all ports using testpmd.
+
+Runs :meth:`set_port_mtu` for every port that testpmd is aware of.
+
+Args:
+mtu: Desired value for the MTU to be set to.
+verify: Whether to verify that setting the MTU on each port was
successful or not.
+Defaults to :data:`True`.
+
+Raises:
+InteractiveCommandExecutionError: If `verify` is :data:`True` and
the MTU was not
+properly updated on at least one port.
+"""
+for port_id in range(len(self._app_params.ports)):
+self.set_port_mtu(port_id, mtu, verify)
+
def _close(self) -> None:
"""Overrides :meth:`~.interactive_shell.close`."""
self.stop()
--
2.46.0
Re: [PATCH v2 2/2] dts: checksum offload test suite
> You could probably combine this line with the previous since they are > from the same module. > > > +from scapy.packet import Raw # type: ignore[import-untyped] > > I think you can also import `Packet` from this module if you wanted to > combine another two lines as well. > > Wow I didn't even notice that good catch > > + > > +from framework.remote_session.testpmd_shell import ( > > +SimpleForwardingModes, > > This reminds me of a question I've had for a little while now which > is, should this be imported from the module that it originates from > (params) or is it fine to just grab it from the testpmd shell where it > is also imported? I guess I don't really see this causing a problem at > all since there isn't really a chance of any circular imports in this > case or things that would be breaking, but I just don't know if there > is any kind of guideline regarding these scenarios. > I briefly looked for some best practice guidelines about this kind of thing but I couldn't find anything explicit. However, I'm going to assume it's probably preferred to do a direct import like you mentioned so I'm going to change that. > > +testpmd.start() > > +self.send_packet_and_capture(packet=packet) > > +verbose_output = testpmd.extract_verbose_output(testpmd.stop()) > > +for packet in verbose_output: > > +if packet.dst_mac == "00:00:00:00:00:01": > > Since this method is the one that relies on this MAC address being set > on the packet, it might be helpful to set that MAC on the packet > before sending it in the same method. Why this address is the one you > were searching for would then be clear at just a glance at the send > method which could be useful. That or you could note in the doc-string > what you expect the MAC to be. > Funny that you mentioned this because I actually tried to set the destination mac address within the send_packet_and_verify_checksums method and I couldn't get it to work no matter what I tried. For some reason even though the mac address was the one I set after send_packet_and_capture, none of the packets in verbose_output would have that mac address. I tried debugging for a while but I just couldn't get it to work, even with the adjust_addresses patch applied it was breaking so I just removed it entirely and set them all in the test cases, which worked fine. I did add an extra arg to the send_and_verify_checksums method called ID, which I passed the mac_id variable to so that it's cleaner. > > > +if OLFlag.RTE_MBUF_F_RX_L4_CKSUM_GOOD in > packet.ol_flags: > > +isIP = True > > +else: > > +isIP = False > > +if OLFlag.RTE_MBUF_F_RX_L4_CKSUM_GOOD in > packet.ol_flags: > > +isL4 = True > > +else: > > +isL4 = False > > +else: > > +isIP = False > > +isL4 = False > > Would having this else statement break the booleans if there was > another noise packet after the one that you sent in the verbose > output? I think that would make both of these booleans false by the > end of the loop even if one was supposed to be true. You might be able > to fix this however with either a break statement after you find the > first packet with the right MAC address, or you could use the built-in > `any()` function that python offers. > Yeah you're right, not sure what I was thinking there haha. I simplified it back down to two lines in the new version. > > Not really important at all (especially because it won't affect the > order that the cases are run in) but it might make sense to put the > two individual tests of l3_rx and l4_rx before the test of both of > them combined. Again, super nit-picky, but it makes sense in my head > to see the individual parts tested and then see them tested together. > I'll leave it up to you if you think it makes sense to just leave it > as is :). > Makes sense to me, swapped them > > > + > > +def test_vlan_checksum(self) -> None: > > +"""Tests VLAN Rx checksum hardware offload and verify packet > reception.""" > > What is this testing? Just that the checksums work with VLANs also > set? That's fine if so I just wasn't sure initially since it looks > like the method is checking to see if you can receive the packets and > then if the checksums are right. > Yes it's just testing to ensure checksums work with VLAN packets according to the test plan. I'm not entirely sure why they also check to make sure they're received, but it was in the test plan so I just left it in there. Other than that, all the docstring errors and function names were fixed in both patches. Thanks for the review Jeremy!
[PATCH v3 0/2] dts: port over checksum offload suite
Port over checksum hardware offload testing suite from old DTS. The suite verifies the ability of the PMD to recognize whether an incoming packet has valid or invalid L4/IP checksum values. - v1: * In the original test plan, there were two Tx checksum test cases. I removed them due to the lack of consistency in testpmd with Tx checksum flags, either not being displayed during packet transmission or showing values that did not align with the original test plan. v2: * Added filter for verbose output using dst mac address v3: * Refactored csum set hw method to iterate over an instance with multiple flags * Fixed docstring errors and method names to be match functionality Dean Marx (2): dts: add csum HW offload to testpmd shell dts: checksum offload test suite dts/framework/config/conf_yaml_schema.json| 3 +- dts/framework/remote_session/testpmd_shell.py | 51 dts/tests/TestSuite_checksum_offload.py | 257 ++ 3 files changed, 310 insertions(+), 1 deletion(-) create mode 100644 dts/tests/TestSuite_checksum_offload.py -- 2.44.0
[PATCH v3 1/2] dts: add csum HW offload to testpmd shell
add csum_set_hw method to testpmd shell class. Port over
set_verbose and port start/stop from queue start/stop suite.
Signed-off-by: Dean Marx
---
dts/framework/remote_session/testpmd_shell.py | 51 +++
1 file changed, 51 insertions(+)
diff --git a/dts/framework/remote_session/testpmd_shell.py
b/dts/framework/remote_session/testpmd_shell.py
index 43e9f56517..f0074be9ef 100644
--- a/dts/framework/remote_session/testpmd_shell.py
+++ b/dts/framework/remote_session/testpmd_shell.py
@@ -334,6 +334,23 @@ def make_parser(cls) -> ParserFn:
)
+class ChecksumOffloadOptions(Flag):
+"""Flag representing checksum hardware offload layer options."""
+
+#:
+ip = auto()
+#:
+udp = auto()
+#:
+tcp = auto()
+#:
+sctp = auto()
+#:
+outer_ip = auto()
+#:
+outer_udp = auto()
+
+
class DeviceErrorHandlingMode(StrEnum):
"""Enum representing the device error handling mode."""
@@ -806,6 +823,40 @@ def show_port_stats(self, port_id: int) ->
TestPmdPortStats:
return TestPmdPortStats.parse(output)
+def csum_set_hw(self, layer: ChecksumOffloadOptions, port_id: int, verify:
bool = True) -> None:
+"""Enables hardware checksum offloading on the specified layer.
+
+Args:
+layer: The layer that checksum offloading should be enabled on.
+port_id: The port number to enable checksum offloading on, should
be within 0-32.
+verify: If :data:`True` the output of the command will be scanned
in an attempt to
+verify that checksum offloading was enabled on the port.
+
+Raises:
+InteractiveCommandExecutionError: If checksum offload is not
enabled successfully.
+"""
+for name, offload in ChecksumOffloadOptions.__members__.items():
+if offload in layer:
+name = name.replace("_", "-")
+csum_output = self.send_command(f"csum set {name} hw
{port_id}")
+if verify:
+if ("Bad arguments" in csum_output
+or f"Please stop port {port_id} first" in csum_output
+or f"checksum offload is not supported by port
{port_id}" in csum_output):
+self._logger.debug(f"Csum set hw error:\n{csum_output}")
+raise InteractiveCommandExecutionError(
+f"Failed to set csum hw {name} mode on port {port_id}"
+)
+success = False
+if "-" in name:
+name.title()
+else:
+name.upper()
+if f"{name} checksum offload is hw" in csum_output:
+success = True
+if not success and verify:
+self._logger.debug(f"Failed to set csum hw mode on port
{port_id}:\n{csum_output}")
+
def _close(self) -> None:
"""Overrides :meth:`~.interactive_shell.close`."""
self.stop()
--
2.44.0
[PATCH v3 2/2] dts: checksum offload test suite
test suite for verifying layer 3/4 checksum offload
features on poll mode driver.
Depends-on: patch-143033
("dts: add text parser for testpmd verbose output")
Depends-on: patch-142691
("dts: add send_packets to test suites and rework packet addressing")
Depends-on: patch-143005
("dts: add functions to testpmd shell")
Signed-off-by: Dean Marx
---
dts/framework/config/conf_yaml_schema.json | 3 +-
dts/tests/TestSuite_checksum_offload.py| 257 +
2 files changed, 259 insertions(+), 1 deletion(-)
create mode 100644 dts/tests/TestSuite_checksum_offload.py
diff --git a/dts/framework/config/conf_yaml_schema.json
b/dts/framework/config/conf_yaml_schema.json
index f02a310bb5..a83a6786df 100644
--- a/dts/framework/config/conf_yaml_schema.json
+++ b/dts/framework/config/conf_yaml_schema.json
@@ -187,7 +187,8 @@
"enum": [
"hello_world",
"os_udp",
-"pmd_buffer_scatter"
+"pmd_buffer_scatter",
+"checksum_offload"
]
},
"test_target": {
diff --git a/dts/tests/TestSuite_checksum_offload.py
b/dts/tests/TestSuite_checksum_offload.py
new file mode 100644
index 00..7467eb5242
--- /dev/null
+++ b/dts/tests/TestSuite_checksum_offload.py
@@ -0,0 +1,257 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 University of New Hampshire
+
+"""DPDK checksum offload testing suite.
+
+This suite verifies L3/L4 checksum offload features of the Poll Mode Driver.
+On the Rx side, IPv4 and UDP/TCP checksum by hardware is checked to ensure
+checksum flags match expected flags. On the Tx side, IPv4/UDP, IPv4/TCP,
+IPv6/UDP, and IPv6/TCP insertion by hardware is checked to checksum flags
+match expected flags.
+
+"""
+
+from typing import List
+
+from scapy.layers.inet import IP, TCP, UDP # type: ignore[import-untyped]
+from scapy.layers.inet6 import IPv6 # type: ignore[import-untyped]
+from scapy.layers.sctp import SCTP # type: ignore[import-untyped]
+from scapy.layers.l2 import Dot1Q, Ether # type: ignore[import-untyped]
+from scapy.packet import Packet, Raw # type: ignore[import-untyped]
+
+from framework.params.testpmd import SimpleForwardingModes
+from framework.remote_session.testpmd_shell import (
+TestPmdShell,
+OLFlag,
+ChecksumOffloadOptions
+)
+from framework.test_suite import TestSuite
+
+
+class TestChecksumOffload(TestSuite):
+"""Checksum offload test suite.
+
+This suite consists of 6 test cases:
+1. Insert checksum on transmit packet
+2. Do not insert checksum on transmit packet
+3. Hardware checksum check L4 Rx
+4. Hardware checksum check L3 Rx
+5. Validate Rx checksum valid flags
+6. Checksum offload with vlan
+
+"""
+
+def set_up_suite(self) -> None:
+"""Set up the test suite.
+
+Setup:
+Verify that at least two port links are created when the
+test run is initialized.
+"""
+self.verify(len(self._port_links) > 1, "Not enough port links.")
+
+def send_packets_and_verify(
+self, packet_list: List[Packet], load: str, should_receive: bool
+) -> None:
+"""Iterates through a list of packets and verifies they are received.
+
+Args:
+packet_list: List of Scapy packets to send and verify.
+load: Raw layer load attribute in the sent packet.
+should_receive: Indicates whether the packet should be received
+by the traffic generator.
+"""
+for i in range(0, len(packet_list)):
+received_packets =
self.send_packet_and_capture(packet=packet_list[i])
+received = any(
+packet.haslayer(Raw) and load in str(packet.load) for packet
in received_packets
+)
+self.verify(
+received == should_receive,
+f"Packet was {'dropped' if should_receive else 'received'}"
+)
+
+def send_packet_and_verify_checksum(
+self, packet: Packet, goodL4: bool, goodIP: bool, testpmd:
TestPmdShell, id: str
+) -> None:
+"""Send packet and verify verbose output matches expected output.
+
+Args:
+packet: Scapy packet to send to DUT.
+goodL4: Verifies RTE_MBUF_F_RX_L4_CKSUM_GOOD in verbose output
+if :data:`True`, or RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN if
:data:`False`.
+goodIP: Verifies RTE_MBUF_F_RX_IP_CKSUM_GOOD in verbose output
+if :data:`True`, or RTE_MBUF_F_RX_IP_CKSUM_UNKNOWN if
:data:`False`.
+testpmd: Testpmd shell session to analyze verbose output of.
+id: The destination mac address that matches the sent packet in
verbose output.
+"""
+testpmd.start()
+self.send_packet_and_capture(packet=packet)
+verbose_output = testpmd.extract_verbose_output(testpmd.stop())
+for packet in verbose_output:
+if packet.dst_mac == id:
+isIP = OLFlag.RTE_MBUF_F_RX_IP
[DPDK/core Bug 1527] Running ring_stress_autotest with > 112 CPUs hangs test
https://bugs.dpdk.org/show_bug.cgi?id=1527
Bug ID: 1527
Summary: Running ring_stress_autotest with > 112 CPUs hangs
test
Product: DPDK
Version: 24.07
Hardware: All
OS: All
Status: UNCONFIRMED
Severity: normal
Priority: Normal
Component: core
Assignee: dev@dpdk.org
Reporter: d...@linux.ibm.com
Target Milestone: ---
System: IBM POWER9 system (PowerNV) with 128 CPUs (2 NUMA nodes), 256GB RAM
** Unverified on x86_64 system with similar size **
OS: RHEL 8.10 (gcc 8.5.0 & gcc 13.2.1)
DPDK: 24.07 (& all prior releases as far back as 21.05)
Running the ring stress autotest causes the test to hang as follows:
~/src/dpdk/build/app/test/dpdk-test --log-level=debug -l 2-127 --no-pci
--no-huge ring_stress_autotest
EAL: Detected CPU lcores: 128
EAL: Detected NUMA nodes: 2
EAL: Static memory layout is selected, amount of reserved memory can be
adjusted with -m or --socket-mem
EAL: Detected static linkage of DPDK
EAL: Multi-process socket /run/user/1000/dpdk/rte/mp_socket
EAL: Selected IOVA mode 'VA'
APP: HPET is not enabled, using TSC as default timer
RTE>>ring_stress_autotest
TEST-CASE MP/MC MT-WRK_ENQ_DEQ-MST_NONE-PRCS START
lcore_stat_dump(AGGREGATE)={
nb_cycle=30720070618(6137.93 usec),
DEQ+ENQ={
nb_call=24261400,
nb_obj=861278043,
nb_cycle=3701862086301,
obj/call(avg): 35.50
cycles/obj(avg): 4298.10
cycles/call(avg): 152582.38
max cycles/call=16721609(32659.39 usec),
min cycles/call=346(0.68 usec),
},
};
TEST-CASE MP/MC MT-WRK_ENQ_DEQ-MST_NONE-PRCS OK
TEST-CASE MP/MC MT-WRK_ENQ_DEQ-MST_NONE-AVG START
lcore_stat_dump(AGGREGATE)={
nb_cycle=30720078841(6153.99 usec),
DEQ+ENQ={
nb_call=24328571,
nb_obj=863669930,
nb_cycle=3840005487992,
obj/call(avg): 35.50
cycles/obj(avg): 4446.15
cycles/call(avg): 157839.34
},
};
TEST-CASE MP/MC MT-WRK_ENQ_DEQ-MST_NONE-AVG OK
TEST-CASE MT_RTS MT-WRK_ENQ_DEQ-MST_NONE-PRCS START
<<< Test hangs at this point, have waited up to 24 hours to complete >>>
--
You are receiving this mail because:
You are the assignee for the bug.
Re: [PATCH v3] net/gve: add support for TSO in DQO RDA
Acked-by: Rushil Gupta
Thanks!
On Fri, Aug 9, 2024 at 11:49 AM Tathagat Priyadarshi
wrote:
>
> The patch intends on adding support for TSO in DQO RDA format.
>
> Signed-off-by: Tathagat Priyadarshi
> Signed-off-by: Varun Lakkur Ambaji Rao
> ---
> drivers/net/gve/gve_tx_dqo.c | 26 +++---
> 1 file changed, 23 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/gve/gve_tx_dqo.c b/drivers/net/gve/gve_tx_dqo.c
> index b9d6d01..731c287 100644
> --- a/drivers/net/gve/gve_tx_dqo.c
> +++ b/drivers/net/gve/gve_tx_dqo.c
> @@ -72,6 +72,17 @@
> txq->complq_tail = next;
> }
>
I see that we are not populating the flex metadata here like the linux
driver. These metadata fields allow guest vm to send metadata to fxp.
However; that can be a separate change.
> +static inline void
> +gve_tx_fill_seg_desc_dqo(volatile union gve_tx_desc_dqo *desc, struct
> rte_mbuf *tx_pkt)
> +{
> + uint32_t hlen = tx_pkt->l2_len + tx_pkt->l3_len + tx_pkt->l4_len;
> + desc->tso_ctx.cmd_dtype.dtype = GVE_TX_TSO_CTX_DESC_DTYPE_DQO;
> + desc->tso_ctx.cmd_dtype.tso = 1;
> + desc->tso_ctx.mss = (uint16_t)tx_pkt->tso_segsz;
> + desc->tso_ctx.tso_total_len = tx_pkt->pkt_len - hlen;
> + desc->tso_ctx.header_len = (uint8_t)hlen;
> +}
> +
> uint16_t
> gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
> {
> @@ -89,6 +100,7 @@
> uint16_t sw_id;
> uint64_t bytes;
> uint16_t first_sw_id;
> + uint8_t tso;
> uint8_t csum;
>
> sw_ring = txq->sw_ring;
> @@ -109,15 +121,23 @@
> gve_tx_clean_dqo(txq);
> }
>
> - if (txq->nb_free < tx_pkt->nb_segs)
> - break;
> -
> ol_flags = tx_pkt->ol_flags;
> nb_used = tx_pkt->nb_segs;
> first_sw_id = sw_id;
>
> + tso = !!(ol_flags & RTE_MBUF_F_TX_TCP_SEG);
> csum = !!(ol_flags & GVE_TX_CKSUM_OFFLOAD_MASK_DQO);
>
> + nb_used += tso;
> + if (txq->nb_free < nb_used)
> + break;
> +
> + if (tso) {
> + txd = &txr[tx_id];
> + gve_tx_fill_seg_desc_dqo(txd, tx_pkt);
> + tx_id = (tx_id + 1) & mask;
> + }
> +
> do {
> if (sw_ring[sw_id] != NULL)
> PMD_DRV_LOG(DEBUG, "Overwriting an entry in
> sw_ring");
> --
> 1.8.3.1
>
NXP roadmap for 24.11
Hi, Please find below roadmap of NXP for 24.11 release: bus/fslmc: Upgrade MC firmware to 10.39 for DPAA2 platform. Latest MC version with general bug fixes, TM issue fix for >8 queues, and API enhancements for flow distribution statistics. net/dpaa2: = - Flow APIs implementation enhancement and bug fixes. net/dpaa: - IEEE1588 support The DPAA driver supports IEEE1588 (Precision Time Protocol) for precise clock synchronization. - OH port support Introducing Offline (O/H) port support, enabling hardware-based packet processing and loopback capabilities. This feature allows for efficient packet exchange between applications, leveraging two queues for receive and send operations. With a maximum speed of 3.75 Mpps (2.5 Gbps), O/H ports facilitate communication between applications, enabling use cases like inter-process communication and packet processing. net/eQoS: The eQoS Ethernet Driver is a new DPDK driver proposed for the 24.11 release, supporting NXP's i.MX8MP, i.MX8DXL, i.MX91, and i.MX93 platforms. net/enetc: - support new ethernet enetc4 driver version4 of existing Enetc driver on NXP i.MX95 platform, featuring: * Virtual Functions (VFs) for virtualized environments * VF-PF messaging for enhanced feature control * Multiple queues with RSS-based distribution for optimized network performance net/enetfec: == Improves enetfec driver with: - Coverity bug fixes, addressing potential security vulnerabilities - Datapath logic fixes to resolve non-cache coherent platform issues crypto/dpaax: === - Improves crypto/dpaax functionality with: - Fixes for PDCP descriptors, ensuring accurate data processing - Debugging enhancements for easier issue identification and resolution - Memory leak fixes, preventing resource waste and ensuring stability - optimizations These enhancements improve the reliability, stability, performance and debuggability of crypto on dpaax platforms. dma/dpaax: == Complete overhaul of the DMA driver code for DPAA1 and DPAA2 platforms, focusing on: - Simplified code structure for improved maintainability - Enhanced readability for easier understanding and debugging - Future-proof design for seamless integration of upcoming features Apart from that: * Enhances the memory dump in proc-info application. * Enhances the l3fwd application for route rules. * Suggestions and fixes some meson related options related to installation directories, binaries and source code. Regards, Gagan
[PATCH] net/octeon_ep: add device removal event callback
From: Vamsi Attunuru
Patch adds an event callback to catch any device removal
event occurred during driver probe. This callback helps
in terminating the execution if there is any device removal
event during the driver probe.
Patch also moves global register configuration into dev_configure()
routine and also validates register reads for any invalid
return values from hardware during driver probe.
Signed-off-by: Vamsi Attunuru
---
Depends-on: patch-142958 ("net/octeon_ep: extend mailbox functionality")
drivers/net/octeon_ep/cnxk_ep_vf.c| 2 +
drivers/net/octeon_ep/otx2_ep_vf.c| 2 +
drivers/net/octeon_ep/otx_ep_ethdev.c | 58 +++
drivers/net/octeon_ep/otx_ep_mbox.c | 11 +
drivers/net/octeon_ep/otx_ep_vf.c | 2 +
5 files changed, 59 insertions(+), 16 deletions(-)
diff --git a/drivers/net/octeon_ep/cnxk_ep_vf.c
b/drivers/net/octeon_ep/cnxk_ep_vf.c
index 39b28de2d0..68b89fce4f 100644
--- a/drivers/net/octeon_ep/cnxk_ep_vf.c
+++ b/drivers/net/octeon_ep/cnxk_ep_vf.c
@@ -408,6 +408,8 @@ cnxk_ep_vf_setup_device(struct otx_ep_device *otx_ep)
/* Get IOQs (RPVF] count */
reg_val = oct_ep_read64(otx_ep->hw_addr + CNXK_EP_R_IN_CONTROL(0));
+ if (reg_val == (uint64_t)-1)
+ return -ENODEV;
otx_ep->sriov_info.rings_per_vf =
((reg_val >> CNXK_EP_R_IN_CTL_RPVF_POS) &
CNXK_EP_R_IN_CTL_RPVF_MASK);
diff --git a/drivers/net/octeon_ep/otx2_ep_vf.c
b/drivers/net/octeon_ep/otx2_ep_vf.c
index 2aeebb4675..34f7d59b19 100644
--- a/drivers/net/octeon_ep/otx2_ep_vf.c
+++ b/drivers/net/octeon_ep/otx2_ep_vf.c
@@ -587,6 +587,8 @@ otx2_ep_vf_setup_device(struct otx_ep_device *otx_ep)
/* Get IOQs (RPVF] count */
reg_val = oct_ep_read64(otx_ep->hw_addr + SDP_VF_R_IN_CONTROL(0));
+ if (reg_val == (uint64_t)-1)
+ return -ENODEV;
otx_ep->sriov_info.rings_per_vf = ((reg_val >> SDP_VF_R_IN_CTL_RPVF_POS)
& SDP_VF_R_IN_CTL_RPVF_MASK);
diff --git a/drivers/net/octeon_ep/otx_ep_ethdev.c
b/drivers/net/octeon_ep/otx_ep_ethdev.c
index 196ed69123..3cf0aa4be5 100644
--- a/drivers/net/octeon_ep/otx_ep_ethdev.c
+++ b/drivers/net/octeon_ep/otx_ep_ethdev.c
@@ -319,7 +319,6 @@ otx_ep_chip_specific_setup(struct otx_ep_device *otx_epvf)
case PCI_DEVID_OCTEONTX_EP_VF:
otx_epvf->chip_id = dev_id;
ret = otx_ep_vf_setup_device(otx_epvf);
- otx_epvf->fn_list.disable_io_queues(otx_epvf);
break;
case PCI_DEVID_CN9K_EP_NET_VF:
case PCI_DEVID_CN98XX_EP_NET_VF:
@@ -327,9 +326,6 @@ otx_ep_chip_specific_setup(struct otx_ep_device *otx_epvf)
case PCI_DEVID_CNF95O_EP_NET_VF:
otx_epvf->chip_id = dev_id;
ret = otx2_ep_vf_setup_device(otx_epvf);
- otx_epvf->fn_list.disable_io_queues(otx_epvf);
- if (otx_ep_ism_setup(otx_epvf))
- ret = -EINVAL;
break;
case PCI_DEVID_CN10KA_EP_NET_VF:
case PCI_DEVID_CN10KB_EP_NET_VF:
@@ -337,9 +333,6 @@ otx_ep_chip_specific_setup(struct otx_ep_device *otx_epvf)
case PCI_DEVID_CNF10KB_EP_NET_VF:
otx_epvf->chip_id = dev_id;
ret = cnxk_ep_vf_setup_device(otx_epvf);
- otx_epvf->fn_list.disable_io_queues(otx_epvf);
- if (otx_ep_ism_setup(otx_epvf))
- ret = -EINVAL;
break;
default:
otx_ep_err("Unsupported device\n");
@@ -348,6 +341,11 @@ otx_ep_chip_specific_setup(struct otx_ep_device *otx_epvf)
if (!ret)
otx_ep_info("OTX_EP dev_id[%d]\n", dev_id);
+ else
+ return ret;
+
+ if (dev_id != PCI_DEVID_OCTEONTX_EP_VF)
+ ret = otx_ep_ism_setup(otx_epvf);
return ret;
}
@@ -365,8 +363,6 @@ otx_epdev_init(struct otx_ep_device *otx_epvf)
goto setup_fail;
}
- otx_epvf->fn_list.setup_device_regs(otx_epvf);
-
otx_epvf->eth_dev->tx_pkt_burst = &cnxk_ep_xmit_pkts;
otx_epvf->eth_dev->rx_pkt_burst = &otx_ep_recv_pkts;
if (otx_epvf->chip_id == PCI_DEVID_OCTEONTX_EP_VF) {
@@ -416,6 +412,10 @@ otx_ep_dev_configure(struct rte_eth_dev *eth_dev)
otx_ep_err("invalid num queues\n");
return -EINVAL;
}
+
+ otx_epvf->fn_list.setup_device_regs(otx_epvf);
+ otx_epvf->fn_list.disable_io_queues(otx_epvf);
+
otx_ep_info("OTX_EP Device is configured with num_txq %d num_rxq %d\n",
eth_dev->data->nb_rx_queues, eth_dev->data->nb_tx_queues);
@@ -734,6 +734,16 @@ otx_ep_eth_dev_uninit(struct rte_eth_dev *eth_dev)
return 0;
}
+static void
+otx_epdev_event_callback(const char *device_name, enum rte_dev_event_type type,
+__rte_unused void *arg)
+{
+ if (type == RTE_DEV_EVENT_REMOVE)
+ otx_ep_
