[PATCH v14 3/3] drivers/net: add diagnostics macros to make code portable
It was a common pattern to have "GCC diagnostic ignored" pragmas sprinkled over the code and only activate these pragmas for certain compilers (gcc and clang). Clang supports GCC's pragma for compatibility with existing source code, so #pragma GCC diagnostic and #pragma clang diagnostic are synonyms for Clang (https://clang.llvm.org/docs/UsersManual.html). Now that effort is being made to make the code compatible with MSVC these expressions would become more complex. It makes sense to hide this complexity behind macros. This makes maintenance easier as these macros are defined in a single place. As a plus the code becomes more readable as well. Signed-off-by: Andre Muezerie --- drivers/net/axgbe/axgbe_rxtx.h| 9 --- drivers/net/cpfl/cpfl_rxtx_vec_common.h | 4 - drivers/net/dpaa2/dpaa2_rxtx.c| 15 +--- drivers/net/fm10k/fm10k_rxtx_vec.c| 21 ++ drivers/net/hns3/hns3_rxtx_vec_neon.h | 6 +- .../net/i40e/i40e_recycle_mbufs_vec_common.c | 2 - drivers/net/i40e/i40e_rxtx_common_avx.h | 22 +++--- drivers/net/i40e/i40e_rxtx_vec_altivec.c | 18 ++--- drivers/net/i40e/i40e_rxtx_vec_avx2.c | 30 drivers/net/i40e/i40e_rxtx_vec_avx512.c | 28 +++ drivers/net/i40e/i40e_rxtx_vec_common.h | 4 - drivers/net/i40e/i40e_rxtx_vec_neon.c | 35 - drivers/net/i40e/i40e_rxtx_vec_sse.c | 28 +++ drivers/net/iavf/iavf_rxtx_vec_avx2.c | 60 +++ drivers/net/iavf/iavf_rxtx_vec_avx512.c | 62 drivers/net/iavf/iavf_rxtx_vec_common.h | 10 +-- drivers/net/iavf/iavf_rxtx_vec_neon.c | 22 +++--- drivers/net/iavf/iavf_rxtx_vec_sse.c | 38 +- drivers/net/ice/ice_rxtx_common_avx.h | 18 ++--- drivers/net/ice/ice_rxtx_vec_avx2.c | 74 +-- drivers/net/ice/ice_rxtx_vec_avx512.c | 64 +++- drivers/net/ice/ice_rxtx_vec_common.h | 4 - drivers/net/ice/ice_rxtx_vec_sse.c| 28 +++ drivers/net/idpf/idpf_rxtx_vec_common.h | 4 - .../ixgbe/ixgbe_recycle_mbufs_vec_common.c| 2 - drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c | 18 ++--- drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c| 20 ++--- drivers/net/mlx5/mlx5_flow.c | 5 +- drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 5 -- drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 18 ++--- drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 61 --- drivers/net/ngbe/ngbe_rxtx_vec_neon.c | 8 +- drivers/net/tap/tap_flow.c| 6 +- drivers/net/txgbe/txgbe_rxtx_vec_neon.c | 8 +- drivers/net/virtio/virtio_rxtx_simple.c | 4 - 35 files changed, 316 insertions(+), 445 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.h b/drivers/net/axgbe/axgbe_rxtx.h index a326ba9ac8..f5f74a0a39 100644 --- a/drivers/net/axgbe/axgbe_rxtx.h +++ b/drivers/net/axgbe/axgbe_rxtx.h @@ -6,15 +6,6 @@ #ifndef _AXGBE_RXTX_H_ #define _AXGBE_RXTX_H_ -/* to suppress gcc warnings related to descriptor casting*/ -#ifdef RTE_TOOLCHAIN_GCC -#pragma GCC diagnostic ignored "-Wcast-qual" -#endif - -#ifdef RTE_TOOLCHAIN_CLANG -#pragma GCC diagnostic ignored "-Wcast-qual" -#endif - /* Descriptor related defines */ #define AXGBE_MAX_RING_DESC4096 /*should be power of 2*/ #define AXGBE_TX_DESC_MIN_FREE (AXGBE_MAX_RING_DESC >> 3) diff --git a/drivers/net/cpfl/cpfl_rxtx_vec_common.h b/drivers/net/cpfl/cpfl_rxtx_vec_common.h index 479e1ddcb9..5b98f86932 100644 --- a/drivers/net/cpfl/cpfl_rxtx_vec_common.h +++ b/drivers/net/cpfl/cpfl_rxtx_vec_common.h @@ -11,10 +11,6 @@ #include "cpfl_ethdev.h" #include "cpfl_rxtx.h" -#ifndef __INTEL_COMPILER -#pragma GCC diagnostic ignored "-Wcast-qual" -#endif - #define CPFL_SCALAR_PATH 0 #define CPFL_VECTOR_PATH 1 #define CPFL_RX_NO_VECTOR_FLAGS ( \ diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index e3b6c7e460..bfb5542bbc 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -1962,14 +1962,6 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) return num_tx; } -#if defined(RTE_TOOLCHAIN_GCC) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wcast-qual" -#elif defined(RTE_TOOLCHAIN_CLANG) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wcast-qual" -#endif - /* This function loopbacks all the received packets.*/ uint16_t dpaa2_dev_loopback_rx(void *queue, @@ -2083,7 +2075,7 @@ dpaa2_dev_loopback_rx(void *queue, if (unlikely((status & QBMAN_DQ_STAT_VALIDFRAME) == 0)) continue; } - fd[num_rx] = (struct qbman_fd *)qbman_result_DQ_fd(dq_storage); + fd[num_rx] = RTE_PTR_UNQUAL(qbman_result_DQ_fd(dq_storage)); dq_storage++;
[PATCH v14 2/3] drivers/common: add diagnostics macros to make code portable
It was a common pattern to have "GCC diagnostic ignored" pragmas
sprinkled over the code and only activate these pragmas for certain
compilers (gcc and clang). Clang supports GCC's pragma for
compatibility with existing source code, so #pragma GCC diagnostic
and #pragma clang diagnostic are synonyms for Clang
(https://clang.llvm.org/docs/UsersManual.html).
Now that effort is being made to make the code compatible with MSVC
these expressions would become more complex. It makes sense to hide
this complexity behind macros. This makes maintenance easier as these
macros are defined in a single place. As a plus the code becomes
more readable as well.
Signed-off-by: Andre Muezerie
---
drivers/common/idpf/idpf_common_rxtx_avx512.c | 72 +--
1 file changed, 34 insertions(+), 38 deletions(-)
diff --git a/drivers/common/idpf/idpf_common_rxtx_avx512.c
b/drivers/common/idpf/idpf_common_rxtx_avx512.c
index b8450b03ae..81052e72c1 100644
--- a/drivers/common/idpf/idpf_common_rxtx_avx512.c
+++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c
@@ -6,10 +6,6 @@
#include "idpf_common_device.h"
#include "idpf_common_rxtx.h"
-#ifndef __INTEL_COMPILER
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#endif
-
#define IDPF_DESCS_PER_LOOP_AVX 8
#define PKTLEN_SHIFT 10
@@ -34,7 +30,7 @@ idpf_singleq_rearm_common(struct idpf_rx_queue *rxq)
dma_addr0 = _mm_setzero_si128();
for (i = 0; i < IDPF_VPMD_DESCS_PER_LOOP; i++) {
rxp[i] = &rxq->fake_mbuf;
- _mm_store_si128((__m128i *)&rxdp[i].read,
+ _mm_store_si128(RTE_CAST_PTR(__m128i *,
&rxdp[i].read),
dma_addr0);
}
}
@@ -108,8 +104,8 @@ idpf_singleq_rearm_common(struct idpf_rx_queue *rxq)
dma_addr4_7 = _mm512_add_epi64(dma_addr4_7, hdr_room);
/* flush desc with pa dma_addr */
- _mm512_store_si512((__m512i *)&rxdp->read, dma_addr0_3);
- _mm512_store_si512((__m512i *)&(rxdp + 4)->read, dma_addr4_7);
+ _mm512_store_si512(RTE_CAST_PTR(__m512i *, &rxdp->read),
dma_addr0_3);
+ _mm512_store_si512(RTE_CAST_PTR(__m512i *, &(rxdp + 4)->read),
dma_addr4_7);
}
rxq->rxrearm_start += IDPF_RXQ_REARM_THRESH;
@@ -164,8 +160,8 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq)
dma_addr0 = _mm_setzero_si128();
for (i = 0; i < IDPF_VPMD_DESCS_PER_LOOP; i++) {
rxp[i] = &rxq->fake_mbuf;
- _mm_storeu_si128((__m128i
*)&rxdp[i].read,
-dma_addr0);
+ _mm_storeu_si128(RTE_CAST_PTR
+ (__m128i *,
&rxdp[i].read), dma_addr0);
}
}
rte_atomic_fetch_add_explicit(&rxq->rx_stats.mbuf_alloc_failed,
@@ -216,10 +212,10 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq)
iovas1);
const __m512i desc6_7 = _mm512_bsrli_epi128(desc4_5, 8);
- _mm512_storeu_si512((void *)rxdp, desc0_1);
- _mm512_storeu_si512((void *)(rxdp + 2), desc2_3);
- _mm512_storeu_si512((void *)(rxdp + 4), desc4_5);
- _mm512_storeu_si512((void *)(rxdp + 6), desc6_7);
+ _mm512_storeu_si512(RTE_CAST_PTR(void *, rxdp), desc0_1);
+ _mm512_storeu_si512(RTE_CAST_PTR(void *, (rxdp + 2)), desc2_3);
+ _mm512_storeu_si512(RTE_CAST_PTR(void *, (rxdp + 4)), desc4_5);
+ _mm512_storeu_si512(RTE_CAST_PTR(void *, (rxdp + 6)), desc6_7);
rxp += IDPF_DESCS_PER_LOOP_AVX;
rxdp += IDPF_DESCS_PER_LOOP_AVX;
@@ -337,28 +333,28 @@ _idpf_singleq_recv_raw_pkts_avx512(struct idpf_rx_queue
*rxq,
__m512i raw_desc0_3, raw_desc4_7;
const __m128i raw_desc7 =
- _mm_load_si128((void *)(rxdp + 7));
+ _mm_load_si128(RTE_CAST_PTR(const __m128i *, rxdp + 7));
rte_compiler_barrier();
const __m128i raw_desc6 =
- _mm_load_si128((void *)(rxdp + 6));
+ _mm_load_si128(RTE_CAST_PTR(const __m128i *, rxdp + 6));
rte_compiler_barrier();
const __m128i raw_desc5 =
- _mm_load_si128((void *)(rxdp + 5));
+ _mm_load_si128(RTE_CAST_PTR(const __m128i *, rxdp + 5));
rte_compiler_barrier();
const __m128i raw_desc4 =
- _mm_load_si128((void *)(rxdp + 4));
+ _mm_load_si128(RTE_CAST_PTR(const __m128i *, rxdp + 4)
[PATCH v14 1/3] eal: add diagnostics macros to make code portable
It was a common pattern to have "GCC diagnostic ignored" pragmas
sprinkled over the code and only activate these pragmas for certain
compilers (gcc and clang). Clang supports GCC's pragma for
compatibility with existing source code, so #pragma GCC diagnostic
and #pragma clang diagnostic are synonyms for Clang
(https://clang.llvm.org/docs/UsersManual.html).
Now that effort is being made to make the code compatible with MSVC
these expressions would become more complex. It makes sense to hide
this complexity behind macros. This makes maintenance easier as these
macros are defined in a single place. As a plus the code becomes
more readable as well.
Signed-off-by: Andre Muezerie
---
lib/eal/include/rte_common.h | 50
1 file changed, 50 insertions(+)
diff --git a/lib/eal/include/rte_common.h b/lib/eal/include/rte_common.h
index 40592f71b1..26da7a7476 100644
--- a/lib/eal/include/rte_common.h
+++ b/lib/eal/include/rte_common.h
@@ -156,6 +156,56 @@ typedef uint16_t unaligned_uint16_t;
#define RTE_DEPRECATED(x)
#endif
+/**
+ * Macros to cause the compiler to remember the state of the diagnostics as of
+ * each push, and restore to that point at each pop.
+ */
+#if !defined(__INTEL_COMPILER) && !defined(RTE_TOOLCHAIN_MSVC)
+#define __rte_diagnostic_push _Pragma("GCC diagnostic push")
+#define __rte_diagnostic_pop _Pragma("GCC diagnostic pop")
+#else
+#define __rte_diagnostic_push
+#define __rte_diagnostic_pop
+#endif
+
+/**
+ * Macro to disable compiler warnings about removing a type
+ * qualifier from the target type.
+ */
+#if !defined(__INTEL_COMPILER) && !defined(RTE_TOOLCHAIN_MSVC)
+#define __rte_diagnostic_ignored_wcast_qual \
+ _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
+#else
+#define __rte_diagnostic_ignored_wcast_qual
+#endif
+
+/**
+ * Workaround to discard qualifiers (such as const, volatile, restrict) from a
pointer,
+ * without the compiler emitting a warning.
+ *
+ * Once the project uses C23, the definition below can be used instead
+ * (-Wcast-qual will emit a warning with this new definition though)
+ * #define RTE_PTR_UNQUAL(X) ((typeof_unqual(*X)*)(X))
+ */
+#define RTE_PTR_UNQUAL(X) ((void *)(uintptr_t)(X))
+
+/**
+ * Workaround to discard qualifiers (such as const, volatile, restrict) from a
pointer
+ * and cast it to a specific type, without the compiler emitting a warning.
+ *
+ * @warning
+ * Although this macro can be abused for casting a pointer to point to a
different type,
+ * alignment may be incorrect when casting to point to a larger type. E.g.:
+ * struct s {
+ * uint16_t a;
+ * uint8_t b;
+ * uint8_t c;
+ * uint8_t d;
+ * } v;
+ * uint16_t * p = RTE_CAST_PTR(uint16_t *, &v.c); // "p" is not 16 bit
aligned!
+ */
+#define RTE_CAST_PTR(type, ptr) ((type)(uintptr_t)(ptr))
+
/**
* Mark a function or variable to a weak reference.
*/
--
2.47.2.vfs.0.1
[PATCH v14 0/3] add diagnostics macros to make code portable
v14: * Renamed RTE_PTR_DROP_QUALIFIERS into RTE_PTR_UNQUAL to more resemble C23 typeof_unqual. * Added macro RTE_CAST_PTR to make the cast more readable when removing a type qualifier from a pointer. v13: * Renamed RTE_IGNORE_CAST_QUAL into RTE_PTR_DROP_QUALIFIERS. * Added (void *) cast to RTE_PTR_DROP_QUALIFIERS to avoid the need for casting the result in most places where the macro is used. v12: * Added macro RTE_IGNORE_CAST_QUAL and used it as a more compact and readable form to suppress warnings where a cast is used to remove a type qualifier. v11: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v10: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v9: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v8: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v7: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v6: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v5: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v4: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v3: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v2: * Removed __rte_diagnostic_ignored_wstrict_aliasing (introduced in v1). * Removed the pragmas from many files where they were not needed. * In the files where the pragmas were indeed needed, reduced the scope during which they are active, reducing the chance that unforeseen issues are hidden due to warning suppression. Andre Muezerie (3): eal: add diagnostics macros to make code portable drivers/common: add diagnostics macros to make code portable drivers/net: add diagnostics macros to make code portable drivers/common/idpf/idpf_common_rxtx_avx512.c | 72 +- drivers/net/axgbe/axgbe_rxtx.h| 9 --- drivers/net/cpfl/cpfl_rxtx_vec_common.h | 4 - drivers/net/dpaa2/dpaa2_rxtx.c| 15 +--- drivers/net/fm10k/fm10k_rxtx_vec.c| 21 ++ drivers/net/hns3/hns3_rxtx_vec_neon.h | 6 +- .../net/i40e/i40e_recycle_mbufs_vec_common.c | 2 - drivers/net/i40e/i40e_rxtx_common_avx.h | 22 +++--- drivers/net/i40e/i40e_rxtx_vec_altivec.c | 18 ++--- drivers/net/i40e/i40e_rxtx_vec_avx2.c | 30 drivers/net/i40e/i40e_rxtx_vec_avx512.c | 28 +++ drivers/net/i40e/i40e_rxtx_vec_common.h | 4 - drivers/net/i40e/i40e_rxtx_vec_neon.c | 35 - drivers/net/i40e/i40e_rxtx_vec_sse.c | 28 +++ drivers/net/iavf/iavf_rxtx_vec_avx2.c | 60 +++ drivers/net/iavf/iavf_rxtx_vec_avx512.c | 62 drivers/net/iavf/iavf_rxtx_vec_common.h | 10 +-- drivers/net/iavf/iavf_rxtx_vec_neon.c | 22 +++--- drivers/net/iavf/iavf_rxtx_vec_sse.c | 38 +- drivers/net/ice/ice_rxtx_common_avx.h | 18 ++--- drivers/net/ice/ice_rxtx_vec_avx2.c | 74 +-- drivers/net/ice/ice_rxtx_vec_avx512.c | 64 +++- drivers/net/ice/ice_rxtx_vec_common.h | 4 - drivers/net/ice/ice_rxtx_vec_sse.c| 28 +++ drivers/net/idpf/idpf_rxtx_vec_common.h | 4 - .../ixgbe/ixgbe_recycle_mbufs_vec_common.c| 2 - drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c | 18 ++--- drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c| 20 ++--- drivers/net/mlx5/mlx5_flow.c | 5 +- drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 5 -- drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 18 ++--- drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 61 --- drivers/net/ngbe/ngbe_rxtx_vec_neon.c | 8 +- drivers/net/tap/tap_flow.c| 6 +- drivers/net/txgbe/txgbe_rxtx_vec_neon.c | 8 +- drivers/net/virtio/virtio_rxtx_simple.c | 4 - lib/eal/include/rte_common.h | 50 + 37 files changed, 400 insertions(+), 483 deletions(-) -- Series-acked-by: Bruce Richardson 2.47.2.vfs.0.1
Re: [PATCH v13 3/3] drivers/net: add diagnostics macros to make code portable
On Thu, Jan 16, 2025 at 07:56:52PM -0800, Andre Muezerie wrote:
> On Thu, Jan 16, 2025 at 10:08:07AM +0100, Morten Brørup wrote:
> > > From: Andre Muezerie [mailto:andre...@linux.microsoft.com]
> > > Sent: Thursday, 16 January 2025 02.55
> > >
> > > It was a common pattern to have "GCC diagnostic ignored" pragmas
> > > sprinkled over the code and only activate these pragmas for certain
> > > compilers (gcc and clang). Clang supports GCC's pragma for
> > > compatibility with existing source code, so #pragma GCC diagnostic
> > > and #pragma clang diagnostic are synonyms for Clang
> > > (https://clang.llvm.org/docs/UsersManual.html).
> > >
> > > Now that effort is being made to make the code compatible with MSVC
> > > these expressions would become more complex. It makes sense to hide
> > > this complexity behind macros. This makes maintenance easier as these
> > > macros are defined in a single place. As a plus the code becomes
> > > more readable as well.
> >
> > Here is some food for thought and discussion...
> >
> > > @@ -2083,7 +2075,7 @@ dpaa2_dev_loopback_rx(void *queue,
> > > if (unlikely((status & QBMAN_DQ_STAT_VALIDFRAME) ==
> > > 0))
> > > continue;
> > > }
> > > - fd[num_rx] = (struct qbman_fd *)qbman_result_DQ_fd(dq_storage);
> > > + fd[num_rx] =
> > > RTE_PTR_DROP_QUALIFIERS(qbman_result_DQ_fd(dq_storage));
> >
> > I do not think this makes the code more readable; quite the opposite.
> > Before this, I could see which type the variable was being cast to.
> >
> > How about a macro that resembles "traditional" type casting:
> >
> > /**
> > * Workaround to discard qualifiers (such as const, volatile, restrict)
> > from a pointer,
> > * without the compiler emitting a warning.
> > *
> > * @warning
> > * Although this macro can be abused for casting a pointer to point to a
> > different type,
> > * alignment may be incorrect when casting to point to a larger type. E.g.:
> > * struct s {
> > * uint16_t a;
> > * uint8_t b;
> > * uint8_t c;
> > * uint8_t d;
> > * } v;
> > * uint16_t * p = RTE_CAST_PTR(uint16_t *, &v.c); // "p" is not 16 bit
> > aligned!
> > */
> > #define RTE_CAST_PTR(type, ptr) \
> > ((type)(uintptr_t)(ptr))
> >
> >
> > Writing the above warning lead me down another path...
> > Can we somehow use __typeof_unqual__?
> > It is available in both GCC [1] and MSVC [2].
> >
> > [1]: https://gcc.gnu.org/onlinedocs/gcc/Typeof.html
> > [2]:
> > https://learn.microsoft.com/en-us/cpp/c-language/typeof-unqual-c?view=msvc-170
> >
> >
> > We are making a workaround, and should take care to not endorse overusing
> > it.
> > Especially for other purposes than intended.
> >
> > Unfortunately, I think some of the type casts don't just remove qualifiers,
> > but does exactly what my warning above describes: Casts a pointer to
> > completely different type.
> > If the new type is a larger type, the pointer's alignment becomes invalid,
> > and if the compiler considers alignment a "qualifier", -Wcast-qual emits a
> > warning about it.
> >
> >
> > Backtracking a bit...
> > If the macro is intended to remove qualifiers, and not to cast to a
> > different type, RTE_PTR_DROP_QUALIFIERS(ptr) might be better than
> > RTE_CAST_PTR(type, ptr).
> > For brevity and to resemble the C23 keyword typeof_unqual, it could be
> > named RTE_PTR_UNQUAL instead of RTE_PTR_DROP_QUALIFIERS.
> >
>
> These are great suggestions, and __typeof_unqual__ seems to be exactly what
> we need to drop the qualifiers. I'll look more closely at the code and find
> out where a cast is actually being used for other purposes than removing the
> qualifier.
I took a closer look at the code and this is what I found:
* Only 2 places where qualifiers were being dropped were not casting to a
different type. I used RTE_PTR_UNQUAL in those as suggested, for clarity.
* I experimented with C23 typeof_unqual. It indeed works on gcc, clang and
MSVC, but there are some details:
a) With gcc the project needs to be compiled with -std=c2x. Many other
warnings show up, unrelated to the scope of this patchset. Some look suspicious
and should be looked at. An error also showed up, for which I sent out a small
patch.
b) When using typeof_unqual and passing "-Wcast-qual" to the compiler, a
warning about the qualifier being dropped is emitted. The project currently
uses "-Wcast-qual"
Due to (a) I decided to not use typeof_unqual for now, but it would be trivial
to change the macro in the future to do so.
* All other places where I was using RTE_PTR_DROP_QUALIFIERS I'm using
RTE_CAST_PTR now. I also think that the code became more readable by doing so.
Re: [PATCH v13 3/3] drivers/net: add diagnostics macros to make code portable
On Thu, Jan 16, 2025 at 08:57:27AM +, Bruce Richardson wrote: > On Wed, Jan 15, 2025 at 05:55:11PM -0800, Andre Muezerie wrote: > > It was a common pattern to have "GCC diagnostic ignored" pragmas > > sprinkled over the code and only activate these pragmas for certain > > compilers (gcc and clang). Clang supports GCC's pragma for > > compatibility with existing source code, so #pragma GCC diagnostic > > and #pragma clang diagnostic are synonyms for Clang > > (https://clang.llvm.org/docs/UsersManual.html). > > > > Now that effort is being made to make the code compatible with MSVC > > these expressions would become more complex. It makes sense to hide > > this complexity behind macros. This makes maintenance easier as these > > macros are defined in a single place. As a plus the code becomes > > more readable as well. > > > > Signed-off-by: Andre Muezerie > > --- > Acked-by: Bruce Richardson > > On a stylistic note, I think you can be slightly less aggressive in > wrapping the new code in the patch. DPDK allows lines up to 100 long > without wrapping, so please don't wrap at 80. > > Thanks, > /Bruce Thanks for calling this out. I followed you suggestion in the v14 series of this patchset.
[PATCH] drivers/net: fix indication of allocation
When experimenting with the -std=c2x compiler option the error below
popped up:
../drivers/net/bnxt/tf_core/tf_sram_mgr.c:952:39: error: incompatible
types when assigning to type ‘_Bool *’ from type ‘_Bool’
The code indicates that the intention was to assign false to the bool
being pointed to, not to the pointer itself.
Fixes: 37ff91c158a3 ("net/bnxt: add SRAM manager model")
Cc: sta...@dpdk.org
Signed-off-by: Andre Muezerie
---
drivers/net/bnxt/tf_core/tf_sram_mgr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/tf_sram_mgr.c
b/drivers/net/bnxt/tf_core/tf_sram_mgr.c
index 87e8882fed..0dffd74cd5 100644
--- a/drivers/net/bnxt/tf_core/tf_sram_mgr.c
+++ b/drivers/net/bnxt/tf_core/tf_sram_mgr.c
@@ -949,7 +949,7 @@ int tf_sram_mgr_is_allocated(void *sram_handle,
tf_sram_slice_2_str(parms->slice_size),
tf_sram_bank_2_str(parms->bank_id));
- parms->is_allocated = false;
+ *parms->is_allocated = false;
goto done;
}
@@ -964,7 +964,7 @@ int tf_sram_mgr_is_allocated(void *sram_handle,
if (block == NULL) {
TFP_DRV_LOG(ERR, "block not found in list 0x%x\n",
parms->sram_offset);
- parms->is_allocated = false;
+ *parms->is_allocated = false;
goto done;
}
--
2.47.2.vfs.0.1
Re: [PATCH v2 2/2] ethdev: fix some functions are available in the new event
在 2025/1/16 23:18, Thomas Monjalon 写道:
16/01/2025 12:40, Huisong Li:
During probing, before the port becomes generally available, the
rte_eth_dev_socket_id() and rte_eth_dev_owner_*() are available to
application.
Fixes: 7dcd73e37965 ("drivers/bus: set device NUMA node to unknown by default")
Fixes: 53ef1b34776b ("ethdev: add sanity checks in control APIs")
Cc: sta...@dpdk.org
Signed-off-by: Huisong Li
[...]
/** The port is being probed, i.e. allocated and not yet available.
* It is too early to check validity, query infos, and configure
-* the port.
+* the port. But some functions, like rte_eth_dev_socket_id() and
+* rte_eth_dev_owner_*() are available to application.
I would add "the" before "application".
With this minor change,
Acked-by: Thomas Monjalon
Ack
.
Re: [PATCH v2 1/2] ethdev: clarify something about the new event
在 2025/1/17 2:31, Stephen Hemminger 写道:
On Thu, 16 Jan 2025 19:40:33 +0800
Huisong Li wrote:
If application verify the validity of the port id or configure this port in
the new event callback, application may happen to the port id is invalid.
In case of similar confusion, this patch have to clarify something about
RTE_ETH_EVENT_NEW in code.
Signed-off-by: Huisong Li
---
lib/ethdev/rte_ethdev.h | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index 1f71cad244..ee7197aa97 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -4128,7 +4128,11 @@ enum rte_eth_event_type {
RTE_ETH_EVENT_VF_MBOX, /**< message from the VF received by PF */
RTE_ETH_EVENT_MACSEC, /**< MACsec offload related event */
RTE_ETH_EVENT_INTR_RMV, /**< device removal event */
- RTE_ETH_EVENT_NEW, /**< port is probed */
+ /** The port is being probed, i.e. allocated and not yet available.
+* It is too early to check validity, query infos, and configure
+* the port.
+*/
+ RTE_ETH_EVENT_NEW,
RTE_ETH_EVENT_DESTROY, /**< port is released */
RTE_ETH_EVENT_IPSEC,/**< IPsec offload related event */
RTE_ETH_EVENT_FLOW_AGED,/**< New aged-out flows is detected */
All the comments in event_type need some editing to make them more
readable. It is good style when having a list to make sure that
each item in a list agrees in terms of wording, verb tense,
capitalization, description, etc.
I am not sure if it is appropriate just to modify the event type comments.
After all, it is common issue in doc.
This can be addressed by a later patch, ideally by looking
at the resulting API doc and fixing the source to match.
Re: [PATCH v4 00/24] Reduce code duplication across Intel NIC drivers
On Thu, Jan 16, 2025 at 09:36:30PM +0100, Morten Brørup wrote: > > From: Bruce Richardson [mailto:bruce.richard...@intel.com] > > Sent: Thursday, 16 January 2025 18.46 > > > > On Thu, Jan 16, 2025 at 11:10:47PM +0530, Jerin Jacob wrote: > > > On Thu, Jan 16, 2025 at 10:50 PM Bruce Richardson > > > wrote: > > > > > > > > On Fri, Dec 20, 2024 at 02:38:57PM +, Bruce Richardson wrote: > > > > > This RFC attempts to reduce the amount of code duplication across > > a > > > > > number of Intel NIC drivers, specifically: ixgbe, i40e, iavf, and > > ice. > > > > > > > > > > The first patch extract a function from the Rx side, otherwise > > the > > > > > majority of the changes are on the Tx side, leading to a > > converged Tx > > > > > queue structure across the 4 drivers, and a large number of > > common > > > > > functions. > > > > > > > > > > > > > When considering the changes in this patchset, I'm still not > > entirely > > > > satisfied with where to place the common code in the repo. Using > > the > > > > "drivers/common" seems wrong to me, as it's for code common across > > devices, > > > > and having a "_common_intel" (or common_intel) folder inside > > drivers/net > > > > > > driver/common/intel is OK. I think. > > > > > > > seems a bit ugly to me. > > > > > > > > What would people think of me taking a leaf out of the kernel > > directory > > > > structure playbook, and moving the intel drivers into a separate > > > > subdirectory "drivers/net/intel"? I've done up a prototype RFC > > patch for > > > > > > I thought the reason for not keeping the company name was to - not > > > change the directory structure > > > if NIC block is bought by another company (driver/net/bnxk was with > > > Boradcom then moved to Marvell) or acquired by another company. > > > (Cavium->Marvell) > > > > > > > > I hadn't thought of that. > > > > However, in our case I believe the reason we don't use this scheme is > > that > > we a) never needed to and AFAIK b) it has never been proposed. > > > > In practice, if we do this for the intel drivers, it does not need to > > be > > done by other vendors unless they want to do so, or have a lot of > > drivers > > in DPDK. Also, renaming vendor directories is not going to be a serious > > problem, so long as the underlying device directory name remains the > > same. > > For compatibility of output, my RFC patch strips off all paths but the > > last, so intel/i40e remains just "i40e" in terms of all generated > > objects. > > > > /Bruce > > If we proceed with drivers/net/intel/i40e, will new patches be titled > "net/intel/i40e: new feature", or still just "net/i40e: ..."? > > The key is getting rid of code duplication, so either directory structure is > fine with me, drivers/net/intel/common, or drivers/common/intel. > > Considering Jerin's input about NICs getting new owner companies, I have a > slight preference for Jerin's suggestion. > For the second suggestion, drivers/common/intel wouldn't work as a name on it's own since it's too generic, and doesn't specify that this is common net driver code. So the resulting name would be "drivers/common/intel_net" or "intel_eth". My preference is definitely against using drivers/common, but I am ok to continue to use the "_common_intel" folder name in "net" as in the v4 patchset, or (my slight preference) to have "drivers/net/intel/common" folder with the other drivers moved to that "drivers/net/intel" folder too. /Bruce
Re: [PATCH] vhost: fix misleading log when setting max queue num
On 1/9/25 3:31 PM, Maxime Coquelin wrote:
rte_vhost_driver_set_max_queue_num API returns early when
called for a Vhost-user device, as this API is intended to
limit the maximum number of queue pairs supported by VDUSE
devices. However, a log mentioning the maximim number of
queue pairs is being set is emitted unconditionally, which
may confuse the end user.
This patch moves this log after the backend type is
checked, so that it is only called with VDUSE backends.
The check on the requested value is also moved at the same
place.
Fixes: e1808999d36b ("vhost: restrict set max queue pair API to VDUSE")
Cc: sta...@dpdk.org
Signed-off-by: Maxime Coquelin
---
lib/vhost/socket.c | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
With suggested changes from Kevin:
Applied to next-virtio/for-next-net
Thanks,
Maxime
[PATCH v3 1/2] ethdev: clarify something about the new event
If application verify the validity of the port id or configure this port in
the new event callback, application may happen to the port id is invalid.
In case of similar confusion, this patch have to clarify something about
RTE_ETH_EVENT_NEW in code.
Signed-off-by: Huisong Li
Acked-by: Thomas Monjalon
---
lib/ethdev/rte_ethdev.h | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index 1f71cad244..ee7197aa97 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -4128,7 +4128,11 @@ enum rte_eth_event_type {
RTE_ETH_EVENT_VF_MBOX, /**< message from the VF received by PF */
RTE_ETH_EVENT_MACSEC, /**< MACsec offload related event */
RTE_ETH_EVENT_INTR_RMV, /**< device removal event */
- RTE_ETH_EVENT_NEW, /**< port is probed */
+ /** The port is being probed, i.e. allocated and not yet available.
+* It is too early to check validity, query infos, and configure
+* the port.
+*/
+ RTE_ETH_EVENT_NEW,
RTE_ETH_EVENT_DESTROY, /**< port is released */
RTE_ETH_EVENT_IPSEC,/**< IPsec offload related event */
RTE_ETH_EVENT_FLOW_AGED,/**< New aged-out flows is detected */
--
2.22.0
[PATCH v3 0/2] ethdev: clarify something about new event
I've had some issues when I add the verification of the port id in the event callback, which are discussed in another patch series[1]. So this series clarify something about RTE_ETH_EVENT_NEW based on the previous discussion. [1] https://patches.dpdk.org/project/dpdk/cover/20250113025521.32703-1-lihuis...@huawei.com/ --- -v3: - add "the" before application as Thomas suggested. - add Acked-by Thomas Monjalon -v2: fix some descriptions as Thomas suggested. Huisong Li (2): ethdev: clarify something about the new event ethdev: fix some functions are available in the new event lib/ethdev/rte_ethdev.c | 14 +++--- lib/ethdev/rte_ethdev.h | 7 ++- 2 files changed, 17 insertions(+), 4 deletions(-) -- 2.22.0
Re: [PATCH 1/1] vhost: fix missing gso_size validity check
On 12/20/24 4:45 AM, Yunjian Wang wrote:
The value of tso_segsz cannot be 0, instead check that value of
gso_size was set.
Fixes: d0cf91303d73 ("vhost: add Tx offload capabilities")
Cc: sta...@dpdk.org
Signed-off-by: Yunjian Wang
---
lib/vhost/virtio_net.c | 3 +++
1 file changed, 3 insertions(+)
Applied to next-virtio/for-next-net
Thanks,
Maxime
Re: [PATCH v3 0/3] vhost: fix and improve dequeue error path
On 1/16/25 10:54 AM, Maxime Coquelin wrote: This series starts with a fix for a regression in the Vhost dequeue error path. The other patches improve the error handling to reduce the chance of such regressions in the future. Changes in v3: == - Squashed patches 2 & 3 (David) - Simplify RARP handling further (David Changes in v2: == - Add RARP handling refactoring Maxime Coquelin (3): vhost: fix missing packets count reset when not ready vhost: rework dequeue paths error handling vhost: improve RARP handling in dequeue paths lib/vhost/virtio_net.c | 110 ++--- 1 file changed, 47 insertions(+), 63 deletions(-) Applied to next-virtio/for-next-net Thanks, Maxime
[PATCH v3 15/15] net/ngbe: add some ops which PF has implemented
Some RXTX operations like queue setup and release, packet type get, and
Tx done cleanup have been supported on PF device. There are ops
functions directly added.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 3 +++
drivers/net/ngbe/ngbe_ethdev_vf.c| 5 +
2 files changed, 8 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 909f1e00f8..3f56e0aa26 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -15,6 +15,7 @@ TSO = Y
Promiscuous mode = Y
Allmulticast mode= Y
VLAN filter = Y
+Inline crypto= Y
CRC offload = P
VLAN offload = P
QinQ offload = P
@@ -22,8 +23,10 @@ L3 checksum offload = P
L4 checksum offload = P
Inner L3 checksum= P
Inner L4 checksum= P
+Packet type parsing = Y
Rx descriptor status = Y
Tx descriptor status = Y
+Free Tx mbuf on demand = Y
Basic stats = Y
Extended stats = Y
Registers dump = Y
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index bbd9fea328..5d68f1602d 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -1327,6 +1327,7 @@ static const struct eth_dev_ops ngbevf_eth_dev_ops = {
.allmulticast_enable = ngbevf_dev_allmulticast_enable,
.allmulticast_disable = ngbevf_dev_allmulticast_disable,
.dev_infos_get= ngbevf_dev_info_get,
+ .dev_supported_ptypes_get = ngbe_dev_supported_ptypes_get,
.mtu_set = ngbevf_dev_set_mtu,
.vlan_filter_set = ngbevf_vlan_filter_set,
.vlan_strip_queue_set = ngbevf_vlan_strip_queue_set,
@@ -1339,8 +1340,12 @@ static const struct eth_dev_ops ngbevf_eth_dev_ops = {
.rx_queue_intr_disable = ngbevf_dev_rx_queue_intr_disable,
.mac_addr_add = ngbevf_add_mac_addr,
.mac_addr_remove = ngbevf_remove_mac_addr,
+ .set_mc_addr_list = ngbe_dev_set_mc_addr_list,
+ .rxq_info_get = ngbe_rxq_info_get,
+ .txq_info_get = ngbe_txq_info_get,
.mac_addr_set = ngbevf_set_default_mac_addr,
.get_reg = ngbevf_get_regs,
+ .tx_done_cleanup = ngbe_dev_tx_done_cleanup,
};
RTE_PMD_REGISTER_PCI(net_ngbe_vf, rte_ngbevf_pmd);
--
2.21.0.windows.1
[PATCH v17 0/4] add support for self monitoring
This series adds self monitoring support i.e allows to configure and
read performance measurement unit (PMU) counters in runtime without
using perf utility. This has certain advantages when application runs on
isolated cores running dedicated tasks.
Events can be read directly using rte_pmu_read() or using dedicated
tracepoint rte_eal_trace_pmu_read(). The latter will cause events to be
stored inside CTF file.
By design, all enabled events are grouped together and the same group
is attached to lcores that use self monitoring funtionality.
Events are enabled by names, which need to be read from standard
location under sysfs i.e
/sys/bus/event_source/devices/PMU/events
where PMU is a core pmu i.e one measuring cpu events. As of today
raw events are not supported.
v17:
- improve docs
- use safer strtok_r()
v16:
- fix build issue related to ALLOW_EXPERIMENTAL_API not always defined
- rename tracepoints upfront to make it easier to decouple for tracing
- minor doc improvements
- make sure non EAL threads can't read PMU
v15:
- add some basic logs related to API failures
- get rid of thread-local-storage
- do not support MT-safety (which was buggy anyway) in management APIs
(rte_pmu_init(),
rte_pmu_fini(), rte_pmu_add_{event,events_by_pattern}() as it impacts
rte_pmu_read()
performance because more logic needs to be incorporated to handle all corner
cases
- improve documentation slightly
- various other improvements here and there
v14:
- replace __atomic_xxx with rte_atomic_xxx
- rebase to dpdk/main since that's a new feature
v13:
- allow init/fini calling from multiple contexts
- get rid of conditional compilation and return erors in case APIs are
used on unsupported OS
v12:
- rebase old series
- slightly refresh existing documentation
- make sure compiler won't optimize accesses to certain variables during
event readout
- drop previous Acked-by to respin a fresh review cycle
v11:
- skip fast test in case init fails
v10:
- check permissions before using counters
- do not use internal symbols in exported functions
- address review comments
v9:
- fix 'maybe-uninitialized' warning reported by CI
v8:
- just rebase series
v7:
- use per-lcore event group instead of global table index by lcore-id
- don't add pmu_autotest to fast tests because due to lack of suported
on every arch
v6:
- move codebase to the separate library
- address review comments
v5:
- address review comments
- fix sign extension while reading pmu on x86
- fix regex mentioned in doc
- various minor changes/improvements here and there
v4:
- fix freeing mem detected by debug_autotest
v3:
- fix shared build
v2:
- fix problems reported by test build infra
Tomasz Duszynski (4):
lib: add generic support for reading PMU events
pmu: support reading ARM PMU events in runtime
pmu: support reading Intel x86_64 PMU events in runtime
eal: add PMU support to tracing library
MAINTAINERS | 5 +
app/test/meson.build | 1 +
app/test/test_pmu.c | 55 +++
app/test/test_trace_perf.c | 10 +
doc/api/doxy-api-index.md| 3 +-
doc/api/doxy-api.conf.in | 1 +
doc/guides/prog_guide/glossary.rst | 3 +
doc/guides/prog_guide/profile_app.rst| 38 ++
doc/guides/prog_guide/trace_lib.rst | 32 ++
doc/guides/rel_notes/release_25_03.rst | 7 +
lib/eal/common/eal_common_trace.c| 5 +-
lib/eal/common/eal_common_trace_pmu.c| 38 ++
lib/eal/common/eal_common_trace_points.c | 5 +
lib/eal/common/eal_trace.h | 4 +
lib/eal/common/meson.build | 1 +
lib/eal/include/rte_eal_trace.h | 11 +
lib/eal/meson.build | 3 +
lib/eal/version.map | 1 +
lib/meson.build | 1 +
lib/pmu/meson.build | 22 +
lib/pmu/pmu_arm64.c | 94
lib/pmu/pmu_private.h| 32 ++
lib/pmu/rte_pmu.c| 537 +++
lib/pmu/rte_pmu.h| 251 +++
lib/pmu/rte_pmu_pmc_arm64.h | 30 ++
lib/pmu/rte_pmu_pmc_x86_64.h | 24 +
lib/pmu/version.map | 15 +
27 files changed, 1227 insertions(+), 2 deletions(-)
create mode 100644 app/test/test_pmu.c
create mode 100644 lib/eal/common/eal_common_trace_pmu.c
create mode 100644 lib/pmu/meson.build
create mode 100644 lib/pmu/pmu_arm64.c
create mode 100644 lib/pmu/pmu_private.h
create mode 100644 lib/pmu/rte_pmu.c
create mode 100644 lib/pmu/rte_pmu.h
create mode 100644 lib/pmu/rte_pmu_pmc_arm64.h
create mode 100644 lib/pmu/rte_pmu_pmc_x86_64.h
create mode 100644 lib/pmu/version.map
--
2.34.1
[PATCH v17 1/4] lib: add generic support for reading PMU events
Add support for programming PMU counters and reading their values
in runtime bypassing kernel completely.
This is especially useful in cases where CPU cores are isolated
i.e run dedicated tasks. In such cases one cannot use standard
perf utility without sacrificing latency and performance.
Signed-off-by: Tomasz Duszynski
---
MAINTAINERS| 5 +
app/test/meson.build | 1 +
app/test/test_pmu.c| 49 +++
doc/api/doxy-api-index.md | 3 +-
doc/api/doxy-api.conf.in | 1 +
doc/guides/prog_guide/glossary.rst | 3 +
doc/guides/prog_guide/profile_app.rst | 33 ++
doc/guides/rel_notes/release_25_03.rst | 7 +
lib/eal/meson.build| 3 +
lib/meson.build| 1 +
lib/pmu/meson.build| 13 +
lib/pmu/pmu_private.h | 32 ++
lib/pmu/rte_pmu.c | 474 +
lib/pmu/rte_pmu.h | 227
lib/pmu/version.map| 14 +
15 files changed, 865 insertions(+), 1 deletion(-)
create mode 100644 app/test/test_pmu.c
create mode 100644 lib/pmu/meson.build
create mode 100644 lib/pmu/pmu_private.h
create mode 100644 lib/pmu/rte_pmu.c
create mode 100644 lib/pmu/rte_pmu.h
create mode 100644 lib/pmu/version.map
diff --git a/MAINTAINERS b/MAINTAINERS
index b86cdd266b..226f41e36b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1868,6 +1868,11 @@ M: Nithin Dabilpuram
M: Pavan Nikhilesh
F: lib/node/
+PMU - EXPERIMENTAL
+M: Tomasz Duszynski
+F: lib/pmu/
+F: app/test/test_pmu*
+
Test Applications
-
diff --git a/app/test/meson.build b/app/test/meson.build
index 48cf77fda9..fb9fa9faf8 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -142,6 +142,7 @@ source_file_deps = {
'test_pmd_perf.c': ['ethdev', 'net'] + packet_burst_generator_deps,
'test_pmd_ring.c': ['net_ring', 'ethdev', 'bus_vdev'],
'test_pmd_ring_perf.c': ['ethdev', 'net_ring', 'bus_vdev'],
+'test_pmu.c': ['pmu'],
'test_power.c': ['power'],
'test_power_cpufreq.c': ['power'],
'test_power_intel_uncore.c': ['power'],
diff --git a/app/test/test_pmu.c b/app/test/test_pmu.c
new file mode 100644
index 00..210190e583
--- /dev/null
+++ b/app/test/test_pmu.c
@@ -0,0 +1,49 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2025 Marvell International Ltd.
+ */
+
+#include
+
+#include "test.h"
+
+static int
+test_pmu_read(void)
+{
+ const char *name = NULL;
+ int tries = 10, event;
+ uint64_t val = 0;
+
+ if (name == NULL) {
+ printf("PMU not supported on this arch\n");
+ return TEST_SKIPPED;
+ }
+
+ if (rte_pmu_init() < 0)
+ return TEST_FAILED;
+
+ event = rte_pmu_add_event(name);
+ while (tries--)
+ val += rte_pmu_read(event);
+
+ rte_pmu_fini();
+
+ return val ? TEST_SUCCESS : TEST_FAILED;
+}
+
+static struct unit_test_suite pmu_tests = {
+ .suite_name = "pmu autotest",
+ .setup = NULL,
+ .teardown = NULL,
+ .unit_test_cases = {
+ TEST_CASE(test_pmu_read),
+ TEST_CASES_END()
+ }
+};
+
+static int
+test_pmu(void)
+{
+ return unit_test_suite_runner(&pmu_tests);
+}
+
+REGISTER_FAST_TEST(pmu_autotest, true, true, test_pmu);
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index b2fc24b3e4..adf5950899 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -242,7 +242,8 @@ The public API headers are grouped by topics:
[log](@ref rte_log.h),
[errno](@ref rte_errno.h),
[trace](@ref rte_trace.h),
- [trace_point](@ref rte_trace_point.h)
+ [trace_point](@ref rte_trace_point.h),
+ [pmu](@ref rte_pmu.h)
- **misc**:
[EAL config](@ref rte_eal.h),
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index d23352d300..f26317d346 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -69,6 +69,7 @@ INPUT = @TOPDIR@/doc/api/doxy-api-index.md \
@TOPDIR@/lib/pdcp \
@TOPDIR@/lib/pdump \
@TOPDIR@/lib/pipeline \
+ @TOPDIR@/lib/pmu \
@TOPDIR@/lib/port \
@TOPDIR@/lib/power \
@TOPDIR@/lib/ptr_compress \
diff --git a/doc/guides/prog_guide/glossary.rst
b/doc/guides/prog_guide/glossary.rst
index 8d6349701e..fd995373f2 100644
--- a/doc/guides/prog_guide/glossary.rst
+++ b/doc/guides/prog_guide/glossary.rst
@@ -164,6 +164,9 @@ pktmbuf
PMD
Poll Mode Driver
+PMU
+ Performance Monitoring Unit
+
QoS
Quality of Service
diff --git a/doc/guides/prog_guide/profile_app.rst
b/doc/guides/prog_guide/profile_app.rst
index a6b5fb4d5e..9a18aa0a26 100644
--- a/doc/guides/prog_guide/profile_app.
[PATCH v17 2/4] pmu: support reading ARM PMU events in runtime
Add support for reading ARM PMU events in runtime.
Signed-off-by: Tomasz Duszynski
---
app/test/test_pmu.c | 4 ++
lib/pmu/meson.build | 8
lib/pmu/pmu_arm64.c | 94 +
lib/pmu/rte_pmu.h | 4 ++
lib/pmu/rte_pmu_pmc_arm64.h | 30
5 files changed, 140 insertions(+)
create mode 100644 lib/pmu/pmu_arm64.c
create mode 100644 lib/pmu/rte_pmu_pmc_arm64.h
diff --git a/app/test/test_pmu.c b/app/test/test_pmu.c
index 210190e583..e0c11e4898 100644
--- a/app/test/test_pmu.c
+++ b/app/test/test_pmu.c
@@ -13,6 +13,10 @@ test_pmu_read(void)
int tries = 10, event;
uint64_t val = 0;
+#if defined(RTE_ARCH_ARM64)
+ name = "cpu_cycles";
+#endif
+
if (name == NULL) {
printf("PMU not supported on this arch\n");
return TEST_SKIPPED;
diff --git a/lib/pmu/meson.build b/lib/pmu/meson.build
index 46eebda155..467841e431 100644
--- a/lib/pmu/meson.build
+++ b/lib/pmu/meson.build
@@ -10,4 +10,12 @@ endif
headers = files('rte_pmu.h')
sources = files('rte_pmu.c')
+indirect_headers += files(
+'rte_pmu_pmc_arm64.h',
+)
+
+if dpdk_conf.has('RTE_ARCH_ARM64')
+sources += files('pmu_arm64.c')
+endif
+
deps += ['log']
diff --git a/lib/pmu/pmu_arm64.c b/lib/pmu/pmu_arm64.c
new file mode 100644
index 00..a23f1864df
--- /dev/null
+++ b/lib/pmu/pmu_arm64.c
@@ -0,0 +1,94 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2025 Marvell International Ltd.
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+#include "pmu_private.h"
+
+#define PERF_USER_ACCESS_PATH "/proc/sys/kernel/perf_user_access"
+
+static int restore_uaccess;
+
+static int
+read_attr_int(const char *path, int *val)
+{
+ char buf[BUFSIZ];
+ int ret, fd;
+
+ fd = open(path, O_RDONLY);
+ if (fd == -1)
+ return -errno;
+
+ ret = read(fd, buf, sizeof(buf));
+ if (ret == -1) {
+ close(fd);
+
+ return -errno;
+ }
+
+ *val = strtol(buf, NULL, 10);
+ close(fd);
+
+ return 0;
+}
+
+static int
+write_attr_int(const char *path, int val)
+{
+ char buf[BUFSIZ];
+ int num, ret, fd;
+
+ fd = open(path, O_WRONLY);
+ if (fd == -1)
+ return -errno;
+
+ num = snprintf(buf, sizeof(buf), "%d", val);
+ ret = write(fd, buf, num);
+ if (ret == -1) {
+ close(fd);
+
+ return -errno;
+ }
+
+ close(fd);
+
+ return 0;
+}
+
+int
+pmu_arch_init(void)
+{
+ int ret;
+
+ ret = read_attr_int(PERF_USER_ACCESS_PATH, &restore_uaccess);
+ if (ret)
+ return ret;
+
+ /* user access already enabled */
+ if (restore_uaccess == 1)
+ return 0;
+
+ return write_attr_int(PERF_USER_ACCESS_PATH, 1);
+}
+
+void
+pmu_arch_fini(void)
+{
+ write_attr_int(PERF_USER_ACCESS_PATH, restore_uaccess);
+}
+
+void
+pmu_arch_fixup_config(uint64_t config[3])
+{
+ /* select 64 bit counters */
+ config[1] |= RTE_BIT64(0);
+ /* enable userspace access */
+ config[1] |= RTE_BIT64(1);
+}
diff --git a/lib/pmu/rte_pmu.h b/lib/pmu/rte_pmu.h
index a158091115..171c52e692 100644
--- a/lib/pmu/rte_pmu.h
+++ b/lib/pmu/rte_pmu.h
@@ -37,6 +37,10 @@ extern "C" {
#include
#include
+#if defined(RTE_ARCH_ARM64)
+#include "rte_pmu_pmc_arm64.h"
+#endif
+
/** Maximum number of events in a group */
#define RTE_MAX_NUM_GROUP_EVENTS 8
diff --git a/lib/pmu/rte_pmu_pmc_arm64.h b/lib/pmu/rte_pmu_pmc_arm64.h
new file mode 100644
index 00..2952f5d65e
--- /dev/null
+++ b/lib/pmu/rte_pmu_pmc_arm64.h
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2025 Marvell.
+ */
+#ifndef _RTE_PMU_PMC_ARM64_H_
+#define _RTE_PMU_PMC_ARM64_H_
+
+#include
+
+static __rte_always_inline uint64_t
+rte_pmu_pmc_read(int index)
+{
+ uint64_t val;
+
+ if (index == 31) {
+ /* CPU Cycles (0x11) must be read via pmccntr_el0 */
+ asm volatile("mrs %0, pmccntr_el0" : "=r" (val));
+ } else {
+ asm volatile(
+ "msr pmselr_el0, %x0\n"
+ "mrs %0, pmxevcntr_el0\n"
+ : "=r" (val)
+ : "rZ" (index)
+ );
+ }
+
+ return val;
+}
+#define rte_pmu_pmc_read rte_pmu_pmc_read
+
+#endif /* _RTE_PMU_PMC_ARM64_H_ */
--
2.34.1
[PATCH v17 3/4] pmu: support reading Intel x86_64 PMU events in runtime
Add support for reading Intel x86_64 PMU events in runtime.
Signed-off-by: Tomasz Duszynski
---
app/test/test_pmu.c | 2 ++
lib/pmu/meson.build | 1 +
lib/pmu/rte_pmu.h| 2 ++
lib/pmu/rte_pmu_pmc_x86_64.h | 24
4 files changed, 29 insertions(+)
create mode 100644 lib/pmu/rte_pmu_pmc_x86_64.h
diff --git a/app/test/test_pmu.c b/app/test/test_pmu.c
index e0c11e4898..addb078005 100644
--- a/app/test/test_pmu.c
+++ b/app/test/test_pmu.c
@@ -15,6 +15,8 @@ test_pmu_read(void)
#if defined(RTE_ARCH_ARM64)
name = "cpu_cycles";
+#elif defined(RTE_ARCH_X86_64)
+ name = "cpu-cycles";
#endif
if (name == NULL) {
diff --git a/lib/pmu/meson.build b/lib/pmu/meson.build
index 467841e431..ad16ead11f 100644
--- a/lib/pmu/meson.build
+++ b/lib/pmu/meson.build
@@ -12,6 +12,7 @@ sources = files('rte_pmu.c')
indirect_headers += files(
'rte_pmu_pmc_arm64.h',
+'rte_pmu_pmc_x86_64.h',
)
if dpdk_conf.has('RTE_ARCH_ARM64')
diff --git a/lib/pmu/rte_pmu.h b/lib/pmu/rte_pmu.h
index 171c52e692..c66898d1d3 100644
--- a/lib/pmu/rte_pmu.h
+++ b/lib/pmu/rte_pmu.h
@@ -39,6 +39,8 @@ extern "C" {
#if defined(RTE_ARCH_ARM64)
#include "rte_pmu_pmc_arm64.h"
+#elif defined(RTE_ARCH_X86_64)
+#include "rte_pmu_pmc_x86_64.h"
#endif
/** Maximum number of events in a group */
diff --git a/lib/pmu/rte_pmu_pmc_x86_64.h b/lib/pmu/rte_pmu_pmc_x86_64.h
new file mode 100644
index 00..9ba6e5bae8
--- /dev/null
+++ b/lib/pmu/rte_pmu_pmc_x86_64.h
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2025 Marvell.
+ */
+#ifndef _RTE_PMU_PMC_X86_64_H_
+#define _RTE_PMU_PMC_X86_64_H_
+
+#include
+
+static __rte_always_inline uint64_t
+rte_pmu_pmc_read(int index)
+{
+ uint64_t low, high;
+
+ asm volatile(
+ "rdpmc\n"
+ : "=a" (low), "=d" (high)
+ : "c" (index)
+ );
+
+ return low | (high << 32);
+}
+#define rte_pmu_pmc_read rte_pmu_pmc_read
+
+#endif /* _RTE_PMU_PMC_X86_64_H_ */
--
2.34.1
[PATCH v17 4/4] eal: add PMU support to tracing library
In order to profile app one needs to store significant amount of samples
somewhere for an analysis later on. Since trace library supports
storing data in a CTF format lets take advantage of that and add a
dedicated PMU tracepoint.
Signed-off-by: Tomasz Duszynski
---
app/test/test_trace_perf.c | 10
doc/guides/prog_guide/profile_app.rst| 5 ++
doc/guides/prog_guide/trace_lib.rst | 32 +++
lib/eal/common/eal_common_trace.c| 5 +-
lib/eal/common/eal_common_trace_pmu.c| 38 ++
lib/eal/common/eal_common_trace_points.c | 5 ++
lib/eal/common/eal_trace.h | 4 ++
lib/eal/common/meson.build | 1 +
lib/eal/include/rte_eal_trace.h | 11
lib/eal/version.map | 1 +
lib/pmu/rte_pmu.c| 67 +++-
lib/pmu/rte_pmu.h| 24 +++--
lib/pmu/version.map | 1 +
13 files changed, 198 insertions(+), 6 deletions(-)
create mode 100644 lib/eal/common/eal_common_trace_pmu.c
diff --git a/app/test/test_trace_perf.c b/app/test/test_trace_perf.c
index 8257cc02be..28f908ce40 100644
--- a/app/test/test_trace_perf.c
+++ b/app/test/test_trace_perf.c
@@ -114,6 +114,10 @@ worker_fn_##func(void *arg) \
#define GENERIC_DOUBLE rte_eal_trace_generic_double(3.6)
#define GENERIC_STR rte_eal_trace_generic_str("hello world")
#define VOID_FP app_dpdk_test_fp()
+#ifdef RTE_LIB_PMU
+/* 0 corresponds first event passed via --trace= */
+#define READ_PMU rte_pmu_trace_read(0)
+#endif
WORKER_DEFINE(GENERIC_VOID)
WORKER_DEFINE(GENERIC_U64)
@@ -122,6 +126,9 @@ WORKER_DEFINE(GENERIC_FLOAT)
WORKER_DEFINE(GENERIC_DOUBLE)
WORKER_DEFINE(GENERIC_STR)
WORKER_DEFINE(VOID_FP)
+#ifdef RTE_LIB_PMU
+WORKER_DEFINE(READ_PMU)
+#endif
static void
run_test(const char *str, lcore_function_t f, struct test_data *data, size_t
sz)
@@ -174,6 +181,9 @@ test_trace_perf(void)
run_test("double", worker_fn_GENERIC_DOUBLE, data, sz);
run_test("string", worker_fn_GENERIC_STR, data, sz);
run_test("void_fp", worker_fn_VOID_FP, data, sz);
+#ifdef RTE_LIB_PMU
+ run_test("read_pmu", worker_fn_READ_PMU, data, sz);
+#endif
rte_free(data);
return TEST_SUCCESS;
diff --git a/doc/guides/prog_guide/profile_app.rst
b/doc/guides/prog_guide/profile_app.rst
index 9a18aa0a26..525b5012ed 100644
--- a/doc/guides/prog_guide/profile_app.rst
+++ b/doc/guides/prog_guide/profile_app.rst
@@ -40,6 +40,11 @@ Current implementation imposes certain limitations:
* Each EAL lcore measures same group of events
+Alternatively tracing library can be used which offers dedicated tracepoint
+``rte_pmu_trace_read()``.
+
+Refer to :doc:`../prog_guide/trace_lib` for more details.
+
Profiling on x86
diff --git a/doc/guides/prog_guide/trace_lib.rst
b/doc/guides/prog_guide/trace_lib.rst
index d9b17abe90..1cbfd42656 100644
--- a/doc/guides/prog_guide/trace_lib.rst
+++ b/doc/guides/prog_guide/trace_lib.rst
@@ -46,6 +46,7 @@ DPDK tracing library features
trace format and is compatible with ``LTTng``.
For detailed information, refer to
`Common Trace Format
[PATCH] test: improve resiliency of malloc autotest
The test case "test_multi_alloc_statistics" was brittle in that it did
some allocations and frees and then checked statistics without
considering the initial state of the malloc heaps. This meant that,
depending on what allocations/frees were done beforehand, the test can
sometimes fail.
We can improve resiliency by running the test using a new malloc heap,
which means it is unaffected by any previous allocations.
Bugzilla ID: 1579
Fixes: a40a1f8231b4 ("app: various tests update")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
app/test/test_malloc.c | 28
1 file changed, 28 insertions(+)
diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c
index 02a7d8ef20..a2f2f6f8a6 100644
--- a/app/test/test_malloc.c
+++ b/app/test/test_malloc.c
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#define N 1
@@ -272,6 +273,28 @@ test_multi_alloc_statistics(void)
size_t size = 2048;
int align = 1024;
int overhead = 0;
+ const size_t heap_size = (1 << 21);
+
+ if (rte_malloc_heap_create(__func__) != 0) {
+ printf("Failed to create test malloc heap\n");
+ return -1;
+ }
+ /* allocate some memory using malloc and add it to our test heap. */
+ void *memory = mmap(NULL, heap_size, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ if (memory == MAP_FAILED) {
+ printf("Failed to allocate memory\n");
+ return -1;
+ }
+ if (rte_malloc_heap_memory_add(__func__, memory, heap_size, NULL, 1,
heap_size) != 0) {
+ printf("Failed to add memory to heap\n");
+ return -1;
+ }
+ socket = rte_malloc_heap_get_socket(__func__);
+ if (socket < 0) {
+ printf("Failed to get socket for test malloc heap.\n");
+ return -1;
+ }
/* Dynamically calculate the overhead by allocating one cacheline and
* then comparing what was allocated from the heap.
@@ -371,6 +394,11 @@ test_multi_alloc_statistics(void)
printf("Malloc statistics are incorrect - freed alloc\n");
return -1;
}
+
+ /* cleanup */
+ rte_malloc_heap_memory_remove(__func__, memory, heap_size);
+ rte_malloc_heap_destroy(__func__);
+ munmap(memory, heap_size);
return 0;
}
--
2.43.0
Re: [PATCH v2] test: improve resiliency of malloc autotest
On Fri, Jan 17, 2025 at 05:20:41PM +0300, Dmitry Kozlyuk wrote:
> 2025-01-17 13:52 (UTC+), Bruce Richardson:
> > The test case "test_multi_alloc_statistics" was brittle in that it did
> > some allocations and frees and then checked statistics without
> > considering the initial state of the malloc heaps. This meant that,
> > depending on what allocations/frees were done beforehand, the test can
> > sometimes fail.
> >
> > We can improve resiliency by running the test using a new malloc heap,
> > which means it is unaffected by any previous allocations.
> >
> > Bugzilla ID: 1579
> > Fixes: a40a1f8231b4 ("app: various tests update")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Bruce Richardson
> > ---
> > v2:
> > * removed unnecessary extra include
> > * only added new code for non-windows, since using mmap for allocation.
>
> Why is it necessary to use `mmap()` and not portable `malloc()`?
> Even the comment in the patch says "malloc" :)
I did originally use malloc, but malloc didn't give us aligned memory so
the call to add the memory to the heap was subsequently failing.
However, I see that the unit tests in the CI are failing on some
architectures, probably because of alignment again, because of using a
single 2MB block of memory. I was going to do a v3 where I queried the
pagesize and used N*pgsize as the parameter to "add" rather than saying
it's a 1x2MB block. Instead, though, I'll rework the code
to use malloc and then manually align instead.
/Bruce
[PATCH v2] test: improve resiliency of malloc autotest
The test case "test_multi_alloc_statistics" was brittle in that it did
some allocations and frees and then checked statistics without
considering the initial state of the malloc heaps. This meant that,
depending on what allocations/frees were done beforehand, the test can
sometimes fail.
We can improve resiliency by running the test using a new malloc heap,
which means it is unaffected by any previous allocations.
Bugzilla ID: 1579
Fixes: a40a1f8231b4 ("app: various tests update")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
v2:
* removed unnecessary extra include
* only added new code for non-windows, since using mmap for allocation.
---
app/test/test_malloc.c | 31 +++
1 file changed, 31 insertions(+)
diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c
index 02a7d8ef20..62e4445ebc 100644
--- a/app/test/test_malloc.c
+++ b/app/test/test_malloc.c
@@ -272,6 +272,30 @@ test_multi_alloc_statistics(void)
size_t size = 2048;
int align = 1024;
int overhead = 0;
+#ifndef RTE_EXEC_ENV_WINDOWS
+ const size_t heap_size = (1 << 21);
+
+ if (rte_malloc_heap_create(__func__) != 0) {
+ printf("Failed to create test malloc heap\n");
+ return -1;
+ }
+ /* allocate some memory using malloc and add it to our test heap. */
+ void *memory = mmap(NULL, heap_size, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ if (memory == MAP_FAILED) {
+ printf("Failed to allocate memory\n");
+ return -1;
+ }
+ if (rte_malloc_heap_memory_add(__func__, memory, heap_size, NULL, 1,
heap_size) != 0) {
+ printf("Failed to add memory to heap\n");
+ return -1;
+ }
+ socket = rte_malloc_heap_get_socket(__func__);
+ if (socket < 0) {
+ printf("Failed to get socket for test malloc heap.\n");
+ return -1;
+ }
+#endif
/* Dynamically calculate the overhead by allocating one cacheline and
* then comparing what was allocated from the heap.
@@ -371,6 +395,13 @@ test_multi_alloc_statistics(void)
printf("Malloc statistics are incorrect - freed alloc\n");
return -1;
}
+
+#ifndef RTE_EXEC_ENV_WINDOWS
+ /* cleanup */
+ rte_malloc_heap_memory_remove(__func__, memory, heap_size);
+ rte_malloc_heap_destroy(__func__);
+ munmap(memory, heap_size);
+#endif
return 0;
}
--
2.43.0
Re: [PATCH v2] test: improve resiliency of malloc autotest
2025-01-17 13:52 (UTC+), Bruce Richardson:
> The test case "test_multi_alloc_statistics" was brittle in that it did
> some allocations and frees and then checked statistics without
> considering the initial state of the malloc heaps. This meant that,
> depending on what allocations/frees were done beforehand, the test can
> sometimes fail.
>
> We can improve resiliency by running the test using a new malloc heap,
> which means it is unaffected by any previous allocations.
>
> Bugzilla ID: 1579
> Fixes: a40a1f8231b4 ("app: various tests update")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Bruce Richardson
> ---
> v2:
> * removed unnecessary extra include
> * only added new code for non-windows, since using mmap for allocation.
Why is it necessary to use `mmap()` and not portable `malloc()`?
Even the comment in the patch says "malloc" :)
[PATCH v1 1/2] dts: add fwd restart decorator to rx capabilities
Some testpmd runtime functions require that forwarding be stopped before
attempting to execute them, depending on the NIC and vendor. Adding a
decorator to these testpmdshell methods to stop, execute, and then start
forwarding again abstracts this concern away for test suite developers,
and makes for cleaner, easier to read code.
Signed-off-by: Nicholas Pratte
---
dts/framework/remote_session/testpmd_shell.py | 26 ++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/dts/framework/remote_session/testpmd_shell.py
b/dts/framework/remote_session/testpmd_shell.py
index c01ee74b21..c008cb3792 100644
--- a/dts/framework/remote_session/testpmd_shell.py
+++ b/dts/framework/remote_session/testpmd_shell.py
@@ -1390,6 +1390,28 @@ def _wrapper(self: "TestPmdShell", *args: P.args,
**kwargs: P.kwargs):
return _wrapper
+def requires_forwarding_restart(func: TestPmdShellMethod) ->
TestPmdShellMethod:
+"""Decorator for :class:`TestPmdShell` commands methods that requires
forwarding restart.
+
+If the decorated method is called while a :class:`TestPmdShell` is
actively forwarding, then
+forwarding is ceased, the wrapped function is executed, and forwarding is
started again.
+
+Args:
+func: The :class:`TestPmdShell` method to decorate.
+"""
+
+@functools.wraps(func)
+def _wrapper(self: "TestPmdShell", *args: P.args, **kwargs: P.kwargs):
+if self.currently_forwarding:
+self._logger.debug("Forwarding needs to be restarted to continue.")
+self.stop()
+retval = func(self, *args, **kwargs)
+self.start()
+return retval
+
+return _wrapper
+
+
def add_remove_mtu(mtu: int = 1500) -> Callable[[TestPmdShellMethod],
TestPmdShellMethod]:
"""Configure MTU to `mtu` on all ports, run the decorated function, then
revert.
@@ -1438,6 +1460,7 @@ class TestPmdShell(DPDKShell):
_command_extra_chars: ClassVar[str] = "\n"
ports_started: bool
+currently_forwarding: bool
def __init__(
self,
@@ -1462,6 +1485,7 @@ def __init__(
name,
)
self.ports_started = not self._app_params.disable_device_start
+self.currently_forwarding = not self._app_params.auto_start
self._ports = None
@property
@@ -1836,7 +1860,7 @@ def csum_set_hw(
{port_id}:\n{csum_output}"""
)
-@requires_started_ports
+@requires_forwarding_restart
@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.
--
2.47.1
[PATCH v1 2/2] dts: add mtu update and jumbo frames test suite
A functional test suite that assesses MTU updating and forwarding within
a DPDK application.
This suite consolidates the previous 'mtu_update' and 'jumbo_frames' test
suites from the old dts framework into a single, comprehensive test suite,
and it covers all of mtu the adjustment options within the ethdev api.
Bugzilla ID: 1421
Signed-off-by: Nicholas Pratte
Signed-off-by: Alex Chapman
---
dts/tests/TestSuite_mtu_update_fwding.py | 278 +++
1 file changed, 278 insertions(+)
create mode 100644 dts/tests/TestSuite_mtu_update_fwding.py
diff --git a/dts/tests/TestSuite_mtu_update_fwding.py
b/dts/tests/TestSuite_mtu_update_fwding.py
new file mode 100644
index 00..caafc41576
--- /dev/null
+++ b/dts/tests/TestSuite_mtu_update_fwding.py
@@ -0,0 +1,278 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 Arm Limited
+# Copyright(c) 2023-2024 University of New Hampshire
+"""MTU update and jumbo frame forwarding test suite.
+
+A suite of tests to ensures the consistency of jumbo and standard frame
transmission within a DPDK
+application. If a NIC receives a packet that is greater than its assigned MTU
length, then that
+packet should be dropped. Likewise, if a NIC receives a packet that is less
than or equal to a
+designated MTU length, the packet should be accepted.
+
+The definition of MTU between individual vendors varies with a +/- difference
of 9 bytes, at most.
+To universally test MTU functionality, and not concern over individual vendor
behavior, this test
+suite compensates using a 9 byte upper and lower bound when testing a set MTU
boundary.
+"""
+
+from scapy.layers.inet import IP
+from scapy.layers.l2 import Ether
+from scapy.packet import Raw
+
+from framework.remote_session.testpmd_shell import TestPmdShell
+from framework.test_suite import TestSuite, func_test
+
+STANDARD_FRAME = 1518 # --max-pkt-len will subtract l2 information at a
minimum of 18 bytes.
+JUMBO_FRAME = 9018
+
+STANDARD_MTU = 1500
+JUMBO_MTU = 9000
+
+IP_HEADER_LEN = 20
+VENDOR_AGNOSTIC_PADDING = 9 # Used as a work around for varying MTU
definitions between vendors.
+
+
+class TestMtuUpdateFwding(TestSuite):
+"""DPDK PMD jumbo frames and MTU update test suite.
+
+Assess the expected behavior of frames greater than, less then, or equal
to a designated MTU
+size in a DPDK application.
+
+Verify the behavior of both runtime MTU and pre-runtime MTU adjustments
within DPDK
+applications. (TestPMD's CLI and runtime MTU adjustment options leverage
different logical
+in components within ethdev to set a value).
+
+Test cases will verify that any frame greater than an assigned MTU are
dropped and packets
+less than or equal to a designated MTU are forwarded and fully intact.
+"""
+
+def set_up_suite(self) -> None:
+"""Set up the test suite.
+
+Setup:
+Set traffic generator MTU lengths to a size greater than scope of
all
+test cases.
+"""
+self.tg_node.main_session.configure_port_mtu(JUMBO_MTU + 200,
self._tg_port_egress)
+self.tg_node.main_session.configure_port_mtu(JUMBO_MTU + 200,
self._tg_port_ingress)
+
+def send_packet_and_verify(self, pkt_size: int, should_receive: bool) ->
None:
+"""Generate, send a packet, and assess its behavior based on a given
packet size.
+
+Generates a packet based on a specified size and sends it to the SUT.
The desired packet's
+payload size is calculated, and a string of arbrity size, containing a
single character,
+is placed in the packet as payload. This method assesses whether or
not it was forwarded,
+depending on the test case, and does so via a check of the
previously-inserted packet
+payload.
+
+Args:
+pkt_size: Size of packet to be generated and sent.
+should_receive: Indicate whether the test case expects to receive
the packet or not.
+"""
+padding = pkt_size - IP_HEADER_LEN
+# Insert '' as placeholder 'CRC' error correction.
+packet = Ether() / Raw(load="") / IP(len=pkt_size) / Raw(load="X"
* padding)
+received_packets = self.send_packet_and_capture(packet)
+found = any(
+("X" * padding) in str(packets.load)
+for packets in received_packets
+if hasattr(packets, "load")
+)
+
+if should_receive:
+self.verify(found, "Did not receive packet.")
+else:
+self.verify(not found, "Received packet.")
+
+def assess_mtu_boundary(self, testpmd_shell: TestPmdShell, mtu: int) ->
None:
+"""Sets the new MTU and verifies packets at the set boundary.
+
+Ensure that packets smaller than or equal to a set MTU will be
received and packets larger
+will not.
+
+First, start testpmd and update the MTU. Then ensure the new value
appears
+on port info for all ports.
+Next, start p
[PATCH v1 0/2] dts: mtu update and jumbo frames test suite
v(1): * refactored suite consolidating these two test suites: inbox.dpdk.org/dev/20241023153906.1522920-2-luca.vizza...@arm.com/ inbox.dpdk.org/dev/20240726141307.14410-3-npra...@iol.unh.edu/ * Suite is 'redesigned' to assess both runtime and pre-runtime mtu configuration in testpmd, as these use different components of ethdev. * add some additional packet forward testing to the original mtu update suite to synchronize with test cases present in jumbo frames * removed or consolidated redundant test cases from original jumbo frames suite to mirror 'mtu_update's functional tests. For anyone who may need better context on the current situation of mtu and how it is understood within dpdk as an application, you may find the following inbox archives insightful. inbox.dpdk.org/dev/0f4866fc-b76d-cf83-75e8-86326c028...@intel.com/ inbox.dpdk.org/dev/20211018134854.1258938-5-ferruh.yi...@intel.com/ inbox.dpdk.org/dev/e2554b78-cdda-aa33-ac6d-59a543a10...@intel.com/ Nicholas Pratte (2): dts: add fwd restart decorator to rx capabilities dts: add mtu update and jumbo frames test suite dts/framework/remote_session/testpmd_shell.py | 26 +- dts/tests/TestSuite_mtu_update_fwding.py | 278 ++ 2 files changed, 303 insertions(+), 1 deletion(-) create mode 100644 dts/tests/TestSuite_mtu_update_fwding.py -- 2.47.1
[PATCH v3] test: improve resiliency of malloc autotest
The test case "test_multi_alloc_statistics" was brittle in that it did
some allocations and frees and then checked statistics without
considering the initial state of the malloc heaps. This meant that,
depending on what allocations/frees were done beforehand, the test can
sometimes fail.
We can improve resiliency by running the test using a new malloc heap,
which means it is unaffected by any previous allocations.
Bugzilla ID: 1579
Fixes: a40a1f8231b4 ("app: various tests update")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
v3:
* switched allocation from mmap to malloc allowing it work on windows
* use explicit alignment of the malloc return value to ensure memory
added to heap is page-aligned.
v2:
* removed unnecessary extra include
* only added new code for non-windows, since using mmap for allocation.
---
app/test/test_malloc.c | 35 +++
1 file changed, 35 insertions(+)
diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c
index 02a7d8ef20..9e73c0da09 100644
--- a/app/test/test_malloc.c
+++ b/app/test/test_malloc.c
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#define N 1
@@ -272,6 +273,34 @@ test_multi_alloc_statistics(void)
size_t size = 2048;
int align = 1024;
int overhead = 0;
+ const size_t pgsz = rte_mem_page_size();
+ const size_t heap_size = (1 << 21);
+
+ if (pgsz < heap_size) {
+ printf("Page size is smaller than heap size\n");
+ return TEST_SKIPPED;
+ }
+
+ if (rte_malloc_heap_create(__func__) != 0) {
+ printf("Failed to create test malloc heap\n");
+ return -1;
+ }
+ /* Allocate some memory using malloc and add it to our test heap. */
+ void *unaligned_memory = malloc(heap_size + pgsz);
+ if (unaligned_memory == NULL) {
+ printf("Failed to allocate memory\n");
+ return -1;
+ }
+ void *memory = RTE_PTR_ALIGN(unaligned_memory, pgsz);
+ if (rte_malloc_heap_memory_add(__func__, memory, heap_size, NULL, 1,
heap_size) != 0) {
+ printf("Failed to add memory to heap\n");
+ return -1;
+ }
+ socket = rte_malloc_heap_get_socket(__func__);
+ if (socket < 0) {
+ printf("Failed to get socket for test malloc heap.\n");
+ return -1;
+ }
/* Dynamically calculate the overhead by allocating one cacheline and
* then comparing what was allocated from the heap.
@@ -371,6 +400,12 @@ test_multi_alloc_statistics(void)
printf("Malloc statistics are incorrect - freed alloc\n");
return -1;
}
+
+ /* cleanup */
+ rte_malloc_heap_memory_remove(__func__, memory, heap_size);
+ rte_malloc_heap_destroy(__func__);
+ free(unaligned_memory);
+
return 0;
}
--
2.43.0
Re: [RFC PATCH] net: move intel drivers to intel subdirectory
On Thu, Jan 16, 2025 at 6:22 PM Bruce Richardson
wrote:
> diff --git a/drivers/meson.build b/drivers/meson.build
> index 495e21b54a..89545e618e 100644
> --- a/drivers/meson.build
> +++ b/drivers/meson.build
> @@ -47,7 +47,7 @@ enable_drivers = run_command(list_dir_globs,
> enable_drivers, check: true).stdout
> require_drivers = true
> if enable_drivers.length() == 0
> require_drivers = false
> -enable_drivers = run_command(list_dir_globs, '*/*', check:
> true).stdout().split()
> +enable_drivers = run_command(list_dir_globs, '*/*,*/*/*', check:
> true).stdout().split()
> endif
>
> # these drivers must always be enabled, otherwise the build breaks
> @@ -143,6 +143,10 @@ foreach subpath:subdirs
> testpmd_sources = []
> require_iova_in_mbuf = true
>
> +if name.contains('/')
> +name = name.split('/')[1]
> +endif
> +
> if not enable_drivers.contains(drv_path)
> build = false
> reason = 'not in enabled drivers build config'
Nice trick.
This makes this move transparent when it comes to library names,
dependency object name, log prefix etc...
We maintain consistency in git history, so check-git-log.sh may need
some update to handle this special case (iow requiring, for example,
net/i40e and not net/intel/i40e prefix for title of commits touching
this driver).
--
David Marchand
Re: [RFC PATCH] net: move intel drivers to intel subdirectory
On Thu, Jan 16, 2025 at 6:34 PM Bruce Richardson
wrote:
>
> On Thu, Jan 16, 2025 at 05:22:21PM +, Bruce Richardson wrote:
> > Consolidate all Intel HW NIC drivers into a driver/net/intel This
> > matches the layout used for drivers in the kernel, and potentially
> > enabling easier sharing among drivers.
> >
> > Signed-off-by: Bruce Richardson
> > ---
> Apologies, I somehow missed one change when making this RFC. If anyone is
> testing it, to get a clean build apply the below 2 line change:
Well.. this can only be noticed when building from scratch.
>
> /Bruce
>
> diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build
> index 20dea23206..94f5afa08d 100644
> --- a/drivers/raw/ifpga/meson.build
> +++ b/drivers/raw/ifpga/meson.build
> @@ -18,7 +18,7 @@ sources = files('ifpga_rawdev.c', 'rte_pmd_ifpga.c',
> 'afu_pmd_core.c',
> 'afu_pmd_he_hssi.c')
>
> includes += include_directories('base')
> -includes += include_directories('../../net/ipn3ke')
> -includes += include_directories('../../net/i40e')
> +includes += include_directories('../../net/intel/ipn3ke')
> +includes += include_directories('../../net/intel/i40e')
>
> headers = files('rte_pmd_ifpga.h')
Are those include_directories() needed?
raw/ifpga is already flagged as depending on those drivers, and as a
result their include path should already be pulled.
--
David Marchand
Re: [PATCH] net/af_packet: provide packet drop stats
On Fri, 17 Jan 2025 07:20:05 +
Stefan Lässer wrote:
> > -Original Message-
> > From: Stephen Hemminger
> > Sent: Thursday, January 16, 2025 5:25 PM
> > To: Stefan Lässer
> > Cc: John W. Linville ; dev@dpdk.org
> > Subject: Re: [PATCH] net/af_packet: provide packet drop stats
> >
> > On Thu, 16 Jan 2025 17:17:03 +0100
> > Stefan Laesser wrote:
> >
> > > The Linux kernel provides the ability to query the packet drop counter
> > > of a socket. This information can be provided when the user requests
> > > stats.
> > >
> > > It is important to note that each call to getsockopt with
> > > PACKET_STATISTICS resets the internal counters. So the caller needs to
> > > keep track of the total count on its own.
> > >
> > > Next, I have added a counter for the case when mbuf couldn't be
> > > allocated.
> > >
> > > Signed-off-by: Stefan Laesser
> > > ---
> > > drivers/net/af_packet/rte_eth_af_packet.c | 32
> > > +--
> > > 1 file changed, 30 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/net/af_packet/rte_eth_af_packet.c
> > > b/drivers/net/af_packet/rte_eth_af_packet.c
> > > index ceb8d9356a..a771dd854d 100644
> > > --- a/drivers/net/af_packet/rte_eth_af_packet.c
> > > +++ b/drivers/net/af_packet/rte_eth_af_packet.c
> > > @@ -58,6 +58,8 @@ struct __rte_cache_aligned pkt_rx_queue {
> > >
> > > volatile unsigned long rx_pkts;
> > > volatile unsigned long rx_bytes;
> > > + volatile unsigned long rx_nombuf;
> > > + volatile unsigned long rx_dropped_pkts;
> > > };
> > >
> > > struct __rte_cache_aligned pkt_tx_queue { @@ -145,8 +147,10 @@
> > > eth_af_packet_rx(void *queue, struct rte_mbuf **bufs, uint16_t
> > > nb_pkts)
> > >
> > > /* allocate the next mbuf */
> > > mbuf = rte_pktmbuf_alloc(pkt_q->mb_pool);
> > > - if (unlikely(mbuf == NULL))
> > > + if (unlikely(mbuf == NULL)) {
> > > + pkt_q->rx_nombuf++;
> > > break;
> > > + }
> > >
> > > /* packet will fit in the mbuf, go ahead and receive it */
> > > rte_pktmbuf_pkt_len(mbuf) = rte_pktmbuf_data_len(mbuf)
> > =
> > > ppd->tp_snaplen; @@ -417,17 +421,37 @@ static int
> > > eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats
> > > *igb_stats) {
> > > unsigned i, imax;
> > > - unsigned long rx_total = 0, tx_total = 0, tx_err_total = 0;
> > > + unsigned long rx_total = 0, rx_dropped_total = 0, rx_nombuf_total =
> > 0;
> > > + unsigned long tx_total = 0, tx_err_total = 0;
> > > unsigned long rx_bytes_total = 0, tx_bytes_total = 0;
> > > const struct pmd_internals *internal = dev->data->dev_private;
> > >
> > > + struct tpacket_stats iface_stats;
> > > + socklen_t iface_stats_len = sizeof(struct tpacket_stats);
> >
> > This declaration could be moved inside the loop.
>
> Yes, you are right - I will move it inside the loop.
>
> > > +
> > > imax = (internal->nb_queues < RTE_ETHDEV_QUEUE_STAT_CNTRS ?
> > > internal->nb_queues : RTE_ETHDEV_QUEUE_STAT_CNTRS);
> > > for (i = 0; i < imax; i++) {
> > > + /* query dropped packets counter from socket */
> > > + if (internal->rx_queue[i].sockfd != -1 &&
> > > + getsockopt(internal->rx_queue[i].sockfd,
> > SOL_PACKET,
> > > + PACKET_STATISTICS,
> > &iface_stats,
> > > + &iface_stats_len) > -1) {
> > > + /*
> > > + * keep total because each call to getsocketopt with
> > PACKET_STATISTICS
> > > + * reset the counter of the socket
> > > + */
> > > + internal->rx_queue[i].rx_dropped_pkts +=
> > iface_stats.tp_drops;
> > > + }
> > > +
> > > igb_stats->q_ipackets[i] = internal->rx_queue[i].rx_pkts;
> > > igb_stats->q_ibytes[i] = internal->rx_queue[i].rx_bytes;
> > > + igb_stats->q_errors[i] = internal-
> > >rx_queue[i].rx_dropped_pkts;
> >
> > Dropped packets are not errors; at least most other drivers do not report
> > missed packets as errors. Should be imissed statistic.
>
> The struct rte_eth_stats currently does not contain q_imissed. It only has
> q_ipackets, q_opackets, q_ibytes, q_obytes and q_errors. The latter is
> described as
> "Total number of queue packets received that are dropped.". This is why I
> have choosen
> q_errors because the field comment sounds like a good match to me.
The comment is open to interpretation.
My preference is that all drivers behave the same, and the reference is one of
the original Intel drivers (ixge, e1000, etc) since they were the first.
>
> As there is no q_imissed, I suggest removing this line from my patch and just
> adding the imissed total counter:
>
> igb_stats->q_ipackets[i] = internal->rx_queue[i].rx_pkts;
> igb_stats->q_ibytes[i] = internal->rx_queue[i].rx_bytes;
> - igb_stats->q_errors[i] = internal->rx_queue[i].rx_drop
Re: [PATCH] Skip vfio in the scenario of non-privileged mode
On Fri, 17 Jan 2025 15:28:47 +0800
Yang Ming wrote:
> DPDK detect vfio container according the existence of vfio
> module. But for container with non-privileged mode, there is
> possibility that no VFIO_DIR(/dev/vfio) mapping from host to
> container when host have both Intel NIC and Mellanox NIC but
> this conntainer only allocate VFs from Mellanox NIC.
> In this case, vfio kernel module has already been loaded from
> the host.
> This scenario will cause the error log occurs in DPDK primary
> process as below:
> 'EAL: cannot open VFIO container, error 2 (No such file or
> directory)'
> 'EAL: VFIO support could not be initialized'
> Because `rte_vfio_enable()` call `rte_vfio_get_container_fd()`
> to execute `vfio_container_fd = open(VFIO_CONTAINER_PATH,
> O_RDWR);` but VFIO_CONTAINER_PATH(/dev/vfio/vfio) doesn't exist
> in this container.
> This scenario will also lead to the delay of DPDK secondary
> process because `default_vfio_cfg->vfio_enabled = 0` and
> `default_vfio_cfg->vfio_container_fd = -1`, socket error will
> be set in DPDK primary process when it sync this info to
> the secondary process.
> This patch use to skip this kind of useless detection for this
> scenario.
>
> Signed-off-by: Yang Ming
> ---
> lib/eal/linux/eal_vfio.c | 11 +++
> 1 file changed, 11 insertions(+)
>
> diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
> index 7132e24cba..1679d29263 100644
> --- a/lib/eal/linux/eal_vfio.c
> +++ b/lib/eal/linux/eal_vfio.c
> @@ -7,6 +7,7 @@
> #include
> #include
> #include
> +#include
>
> #include
> #include
> @@ -1083,6 +1084,7 @@ rte_vfio_enable(const char *modname)
> /* initialize group list */
> int i, j;
> int vfio_available;
> + DIR *dir;
> const struct internal_config *internal_conf =
> eal_get_internal_configuration();
>
> @@ -1119,6 +1121,15 @@ rte_vfio_enable(const char *modname)
> return 0;
> }
>
> + /* return 0 if VFIO directory not exist for container with
> non-privileged mode */
> + dir = opendir(VFIO_DIR);
> + if (dir == NULL) {
> + EAL_LOG(DEBUG,
> + "VFIO directory not exist, skipping VFIO support...");
> + return 0;
> + }
> + closedir(dir);
You need to test the non-container cases.
If vfio is loaded /dev/vfio is a character device (not a directory)
Also looks suspicious that VFIO_DIR is defined but never used currently.
Re: [PATCH v2 01/15] net/ngbe: add ethdev probe and remove for VF device
On Fri, 17 Jan 2025 18:41:00 +0800 Zaiyu Wang wrote: > Introduce virtual function driver in ngbe PMD, add simple init and > uninit function to probe and remove the device. > > Signed-off-by: Zaiyu Wang > --- > doc/guides/nics/features/ngbe_vf.ini | 11 ++ > drivers/net/ngbe/base/meson.build| 1 + > drivers/net/ngbe/base/ngbe.h | 1 + > drivers/net/ngbe/base/ngbe_hw.c | 4 + > drivers/net/ngbe/base/ngbe_vf.c | 26 + > drivers/net/ngbe/base/ngbe_vf.h | 13 +++ > drivers/net/ngbe/meson.build | 1 + > drivers/net/ngbe/ngbe_ethdev_vf.c| 163 +++ > 8 files changed, 220 insertions(+) > create mode 100644 doc/guides/nics/features/ngbe_vf.ini > create mode 100644 drivers/net/ngbe/base/ngbe_vf.c > create mode 100644 drivers/net/ngbe/base/ngbe_vf.h > create mode 100644 drivers/net/ngbe/ngbe_ethdev_vf.c > > diff --git a/doc/guides/nics/features/ngbe_vf.ini > b/doc/guides/nics/features/ngbe_vf.ini > new file mode 100644 > index 00..71e7b8be81 > --- /dev/null > +++ b/doc/guides/nics/features/ngbe_vf.ini > @@ -0,0 +1,11 @@ > +; > +; Supported features of the 'ngbe_vf' network poll mode driver. > +; > +; Refer to default.ini for the full list of available PMD features. > +; > +[Features] > +Multiprocess aware = Y > +Linux= Y > +ARMv8= Y > +x86-32 = Y > +x86-64 = Y > \ No newline at end of file NAK Fix you editor settings.
[PATCH] net/ice: fix memory leak in scalar Rx
If the buffer splitting feature is configured and the payload mbuf
allocation fails, the previously allocated header mbuf may be returned not
fully initialized or a memory leak may occur.
This patch handles this case correctly by freeing the corresponding header
buffer.
Fixes: 629dad3ef325 ("net/ice: support buffer split in scalar Rx")
Cc: yuanx.w...@intel.com
Cc: sta...@dpdk.org
Signed-off-by: Vladimir Medvedkin
---
drivers/net/ice/ice_rxtx.c | 10 ++
1 file changed, 10 insertions(+)
diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 0c7106c7e0..f58df9bdfe 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -484,6 +484,7 @@ ice_alloc_rx_queue_mbufs(struct ice_rx_queue *rxq)
struct rte_mbuf *mbuf_pay;
mbuf_pay = rte_mbuf_raw_alloc(rxq->rxseg[1].mp);
if (unlikely(!mbuf_pay)) {
+ rte_pktmbuf_free(mbuf);
PMD_DRV_LOG(ERR, "Failed to allocate payload
mbuf for RX");
return -ENOMEM;
}
@@ -1900,6 +1901,8 @@ ice_rx_alloc_bufs(struct ice_rx_queue *rxq)
diag_pay = rte_mempool_get_bulk(rxq->rxseg[1].mp,
(void *)mbufs_pay, rxq->rx_free_thresh);
if (unlikely(diag_pay != 0)) {
+ rte_mempool_put_bulk(rxq->mp, (void *)rxep,
+ rxq->rx_free_thresh);
PMD_RX_LOG(ERR, "Failed to get payload mbufs in bulk");
return -ENOMEM;
}
@@ -2607,6 +2610,13 @@ ice_recv_pkts(void *rx_queue,
nmb_pay = rte_mbuf_raw_alloc(rxq->rxseg[1].mp);
if (unlikely(!nmb_pay)) {
rxq->vsi->adapter->pf.dev_data->rx_mbuf_alloc_failed++;
+ rxe->mbuf = NULL;
+ nb_hold--;
+ if (unlikely(rx_id == 0))
+ rx_id = rxq->nb_rx_desc;
+
+ rx_id--;
+ rte_pktmbuf_free(nmb);
break;
}
--
2.43.0
Re: [PATCH v5 01/15] net/xsc: add xsc PMD framework
On Tue, 07 Jan 2025 10:49:40 +0800 "WanRenyong" wrote: > diff --git a/doc/guides/rel_notes/release_25_03.rst > b/doc/guides/rel_notes/release_25_03.rst > index 426dfcd982..6f766add72 100644 > --- a/doc/guides/rel_notes/release_25_03.rst > +++ b/doc/guides/rel_notes/release_25_03.rst > @@ -55,6 +55,10 @@ New Features > Also, make sure to start the actual text at the margin. > === > > +* **Added Yunsilicon xsc net driver [EXPERIMENTAL].** > + > + * Added the PMD for Yunsilicon metaScale serials NICs. > + > > Removed Items > - This part will need to be rebased since release notes got updated on main branch
Re: [PATCH v4] vhost/user: clear ring addresses when getting vring base
On 11/27/24 3:03 AM, Jianping Zhao wrote:
Clear ring addresses during vring base retrieval to handle guest reboot
scenarios correctly. This is particularly important for vdpa-blk devices
where the following issue occurs:
When a guest OS with vdpa-blk device reboots, during UEFI stage, only
one vring is actually used and configured. However, QEMU still sends
enable messages for all configured queues. The remaining queues retain
their addresses from before reboot, which reference invalid memory
mappings in the rebooted guest.
The issue manifests in vq_is_ready():
static bool
vq_is_ready(struct virtio_net *dev, struct vhost_virtqueue *vq)
{
/* Only checks pointer validity, not address freshness */
rings_ok = vq->desc && vq->avail && vq->used;
...
}
vq_is_ready() incorrectly considers these queues as ready because it
only checks if desc/avail/used pointers are non-NULL, but cannot
detect that these addresses are stale from the previous boot.
Clear the ring addresses in vhost_user_get_vring_base() to force
the guest driver to reconfigure them before use. This ensures that
vq_is_ready() will return false for queues with stale addresses
until they are properly reconfigured by the guest driver.
Fixes: 3ea7052f4b1b ("vhost: postpone rings addresses translation")
Signed-off-by: Jianping Zhao
---
lib/vhost/vhost_user.c | 1 +
1 file changed, 1 insertion(+)
Applied to next-virtio/for-next-net.
Thanks,
Maxime
[PATCH v3 2/2] ethdev: fix some functions are available in the new event
During probing, before the port becomes generally available, the
rte_eth_dev_socket_id() and rte_eth_dev_owner_*() are available to
the application.
Fixes: 7dcd73e37965 ("drivers/bus: set device NUMA node to unknown by default")
Fixes: 53ef1b34776b ("ethdev: add sanity checks in control APIs")
Cc: sta...@dpdk.org
Signed-off-by: Huisong Li
Acked-by: Thomas Monjalon
---
lib/ethdev/rte_ethdev.c | 14 +++---
lib/ethdev/rte_ethdev.h | 3 ++-
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 6413c54e3b..9cfb397cee 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -600,9 +600,10 @@ rte_eth_dev_owner_get(const uint16_t port_id, struct
rte_eth_dev_owner *owner)
struct rte_eth_dev *ethdev;
int ret;
- RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
- ethdev = &rte_eth_devices[port_id];
+ if (port_id >= RTE_MAX_ETHPORTS)
+ return -ENODEV;
+ ethdev = &rte_eth_devices[port_id];
if (!eth_dev_is_allocated(ethdev)) {
RTE_ETHDEV_LOG_LINE(ERR, "Port ID %"PRIu16" is not allocated",
port_id);
@@ -635,8 +636,15 @@ int
rte_eth_dev_socket_id(uint16_t port_id)
{
int socket_id = SOCKET_ID_ANY;
+ struct rte_eth_dev *ethdev;
- if (!rte_eth_dev_is_valid_port(port_id)) {
+ if (port_id >= RTE_MAX_ETHPORTS) {
+ rte_errno = EINVAL;
+ return socket_id;
+ }
+
+ ethdev = &rte_eth_devices[port_id];
+ if (!eth_dev_is_allocated(ethdev)) {
rte_errno = EINVAL;
} else {
socket_id = rte_eth_devices[port_id].data->numa_node;
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index ee7197aa97..c4d4005094 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -4130,7 +4130,8 @@ enum rte_eth_event_type {
RTE_ETH_EVENT_INTR_RMV, /**< device removal event */
/** The port is being probed, i.e. allocated and not yet available.
* It is too early to check validity, query infos, and configure
-* the port.
+* the port. But some functions, like rte_eth_dev_socket_id() and
+* rte_eth_dev_owner_*() are available to the application.
*/
RTE_ETH_EVENT_NEW,
RTE_ETH_EVENT_DESTROY, /**< port is released */
--
2.22.0
RE: DPDK Release Status Meeting 2025-01-14
* The meeting occurs on every Thursday at 14:30 DST over Jitsi on https://meet.jit.si/DPDK Correction: The meeting occurs on every Tuesday at 14:30 DST
[PATCH v2 03/15] net/ngbe: add hardware configuration code for VF device
Add basic hardware configure flow and device information statement.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 7 +
drivers/net/ngbe/base/ngbe_mbx.h | 2 +
drivers/net/ngbe/base/ngbe_type.h| 5 +
drivers/net/ngbe/base/ngbe_vf.c | 235 +++
drivers/net/ngbe/base/ngbe_vf.h | 9 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 114 +
6 files changed, 372 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 71e7b8be81..4335efb812 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -4,6 +4,13 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+CRC offload = P
+VLAN offload = P
+QinQ offload = P
+L3 checksum offload = P
+L4 checksum offload = P
+Inner L3 checksum= P
+Inner L4 checksum= P
Multiprocess aware = Y
Linux= Y
ARMv8= Y
diff --git a/drivers/net/ngbe/base/ngbe_mbx.h b/drivers/net/ngbe/base/ngbe_mbx.h
index 83561fd4cf..27e977737d 100644
--- a/drivers/net/ngbe/base/ngbe_mbx.h
+++ b/drivers/net/ngbe/base/ngbe_mbx.h
@@ -57,6 +57,8 @@ enum ngbe_pfvf_api_rev {
#define NGBE_VF_GET_RSS_KEY0x0b/* get RSS key */
#define NGBE_VF_UPDATE_XCAST_MODE 0x0c
+#define NGBE_VF_BACKUP 0x8001 /* VF requests backup */
+
/* mode choices for NGBE_VF_UPDATE_XCAST_MODE */
enum ngbevf_xcast_modes {
NGBEVF_XCAST_MODE_NONE = 0,
diff --git a/drivers/net/ngbe/base/ngbe_type.h
b/drivers/net/ngbe/base/ngbe_type.h
index 35ebb7208a..4fd7080847 100644
--- a/drivers/net/ngbe/base/ngbe_type.h
+++ b/drivers/net/ngbe/base/ngbe_type.h
@@ -8,6 +8,9 @@
#define NGBE_LINK_UP_TIME 90 /* 9.0 Seconds */
+#define NGBE_RX_HDR_SIZE 256
+#define NGBE_RX_BUF_SIZE 2048
+
#define NGBE_FRAME_SIZE_MAX (9728) /* Maximum frame size, +FCS */
#define NGBE_FRAME_SIZE_DFT (1518) /* Default frame size, +FCS */
#define NGBE_NUM_POOL (32)
@@ -17,6 +20,7 @@
#define NGBE_MAX_QP (8)
#define NGBE_MAX_UTA 128
+#define NGBE_VF_INIT_TIMEOUT 200 /* Number of retries to clear RSTI */
#define NGBE_PCI_MASTER_DISABLE_TIMEOUT800
#define NGBE_SPI_TIMEOUT 1
@@ -480,6 +484,7 @@ struct ngbe_hw {
u32 q_tx_regs[8 * 4];
u32 gphy_efuse[2];
bool offset_loaded;
+ bool rx_loaded;
bool is_pf;
bool gpio_ctl;
bool lsc;
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
index 12aa3bca1a..7c8b082f97 100644
--- a/drivers/net/ngbe/base/ngbe_vf.c
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -7,6 +7,178 @@
#include "ngbe_mbx.h"
#include "ngbe_vf.h"
+/* ngbe_virt_clr_reg - Set register to default (power on) state.
+ * @hw: pointer to hardware structure
+ */
+static void ngbe_virt_clr_reg(struct ngbe_hw *hw)
+{
+ u32 vfsrrctl;
+
+ /* default values (BUF_SIZE = 2048, HDR_SIZE = 256) */
+ vfsrrctl = NGBE_RXCFG_HDRLEN(NGBE_RX_HDR_SIZE);
+ vfsrrctl |= NGBE_RXCFG_PKTLEN(NGBE_RX_BUF_SIZE);
+
+ wr32m(hw, NGBE_RXCFG(0),
+ (NGBE_RXCFG_HDRLEN_MASK | NGBE_RXCFG_PKTLEN_MASK),
+ vfsrrctl);
+
+
+ ngbe_flush(hw);
+}
+
+/**
+ * ngbe_start_hw_vf - Prepare hardware for Tx/Rx
+ * @hw: pointer to hardware structure
+ *
+ * Starts the hardware by filling the bus info structure and media type,
clears
+ * all on chip counters, initializes receive address registers, multicast
+ * table, VLAN filter table, calls routine to set up link and flow control
+ * settings, and leaves transmit and receive units disabled and uninitialized
+ **/
+s32 ngbe_start_hw_vf(struct ngbe_hw *hw)
+{
+ /* Clear adapter stopped flag */
+ hw->adapter_stopped = false;
+
+ return 0;
+}
+
+/**
+ * ngbe_init_hw_vf - virtual function hardware initialization
+ * @hw: pointer to hardware structure
+ *
+ * Initialize the hardware by resetting the hardware and then starting
+ * the hardware
+ **/
+s32 ngbe_init_hw_vf(struct ngbe_hw *hw)
+{
+ s32 status = hw->mac.start_hw(hw);
+
+ hw->mac.get_mac_addr(hw, hw->mac.addr);
+
+ return status;
+}
+
+/**
+ * ngbe_reset_hw_vf - Performs hardware reset
+ * @hw: pointer to hardware structure
+ *
+ * Resets the hardware by resetting the transmit and receive units, masks and
+ * clears all interrupts.
+ **/
+s32 ngbe_reset_hw_vf(struct ngbe_hw *hw)
+{
+ struct ngbe_mbx_info *mbx = &hw->mbx;
+ u32 timeout = NGBE_VF_INIT_TIMEOUT;
+ s32 ret_val = NGBE_ERR_INVALID_MAC_ADDR;
+ u32 msgbuf[NGBE_VF_PERMADDR_MSG_LEN];
+ u8 *addr = (u8 *)(&msgbuf[1]);
+
+ /* Call adapter stop to disable tx/rx and clear interrupts */
+ hw->mac.stop_hw(hw);
+
+ /* reset the api version */
+ hw->api_version = ngbe_mbox_api_10;
+
+ /* backup msix vectors */
+ mbx->timeout
[PATCH v2 02/15] net/ngbe: add support for PF-VF mailbox interface
Add basic code of PF-VF mailbox implementation to serve the communication
between VF and PF devices.
Signed-off-by: Zaiyu Wang
---
drivers/net/ngbe/base/ngbe_mbx.c | 338 ++
drivers/net/ngbe/base/ngbe_mbx.h | 29 +++
drivers/net/ngbe/base/ngbe_type.h | 7 +
drivers/net/ngbe/base/ngbe_vf.c | 56 +
drivers/net/ngbe/base/ngbe_vf.h | 1 +
5 files changed, 431 insertions(+)
diff --git a/drivers/net/ngbe/base/ngbe_mbx.c b/drivers/net/ngbe/base/ngbe_mbx.c
index bc0adbb3ec..a96a4aced7 100644
--- a/drivers/net/ngbe/base/ngbe_mbx.c
+++ b/drivers/net/ngbe/base/ngbe_mbx.c
@@ -109,6 +109,344 @@ s32 ngbe_check_for_rst(struct ngbe_hw *hw, u16 mbx_id)
return ret_val;
}
+/**
+ * ngbe_poll_for_msg - Wait for message notification
+ * @hw: pointer to the HW structure
+ * @mbx_id: id of mailbox to write
+ *
+ * returns SUCCESS if it successfully received a message notification
+ **/
+STATIC s32 ngbe_poll_for_msg(struct ngbe_hw *hw, u16 mbx_id)
+{
+ struct ngbe_mbx_info *mbx = &hw->mbx;
+ int countdown = mbx->timeout;
+
+ if (!countdown || !mbx->check_for_msg)
+ goto out;
+
+ while (countdown && mbx->check_for_msg(hw, mbx_id)) {
+ countdown--;
+ if (!countdown)
+ break;
+ usec_delay(mbx->usec_delay);
+ }
+
+ if (countdown == 0)
+ DEBUGOUT("Polling for VF%d mailbox message timedout", mbx_id);
+
+out:
+ return countdown ? 0 : NGBE_ERR_MBX;
+}
+
+/**
+ * ngbe_poll_for_ack - Wait for message acknowledgment
+ * @hw: pointer to the HW structure
+ * @mbx_id: id of mailbox to write
+ *
+ * returns SUCCESS if it successfully received a message acknowledgment
+ **/
+STATIC s32 ngbe_poll_for_ack(struct ngbe_hw *hw, u16 mbx_id)
+{
+ struct ngbe_mbx_info *mbx = &hw->mbx;
+ int countdown = mbx->timeout;
+
+ if (!countdown || !mbx->check_for_ack)
+ goto out;
+
+ while (countdown && mbx->check_for_ack(hw, mbx_id)) {
+ countdown--;
+ if (!countdown)
+ break;
+ usec_delay(mbx->usec_delay);
+ }
+
+ if (countdown == 0)
+ DEBUGOUT("Polling for VF%d mailbox ack timedout", mbx_id);
+
+out:
+ return countdown ? 0 : NGBE_ERR_MBX;
+}
+
+/**
+ * ngbe_read_posted_mbx - Wait for message notification and receive message
+ * @hw: pointer to the HW structure
+ * @msg: The message buffer
+ * @size: Length of buffer
+ * @mbx_id: id of mailbox to write
+ *
+ * returns SUCCESS if it successfully received a message notification and
+ * copied it into the receive buffer.
+ **/
+s32 ngbe_read_posted_mbx(struct ngbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
+{
+ struct ngbe_mbx_info *mbx = &hw->mbx;
+ s32 ret_val = NGBE_ERR_MBX;
+
+ if (!mbx->read)
+ goto out;
+
+ ret_val = ngbe_poll_for_msg(hw, mbx_id);
+
+ /* if ack received read message, otherwise we timed out */
+ if (!ret_val)
+ ret_val = mbx->read(hw, msg, size, mbx_id);
+out:
+ return ret_val;
+}
+
+/**
+ * ngbe_write_posted_mbx - Write a message to the mailbox, wait for ack
+ * @hw: pointer to the HW structure
+ * @msg: The message buffer
+ * @size: Length of buffer
+ * @mbx_id: id of mailbox to write
+ *
+ * returns SUCCESS if it successfully copied message into the buffer and
+ * received an ack to that message within delay * timeout period
+ **/
+s32 ngbe_write_posted_mbx(struct ngbe_hw *hw, u32 *msg, u16 size,
+ u16 mbx_id)
+{
+ struct ngbe_mbx_info *mbx = &hw->mbx;
+ s32 ret_val = NGBE_ERR_MBX;
+
+ /* exit if either we can't write or there isn't a defined timeout */
+ if (!mbx->write || !mbx->timeout)
+ goto out;
+
+ /* send msg */
+ ret_val = mbx->write(hw, msg, size, mbx_id);
+
+ /* if msg sent wait until we receive an ack */
+ if (!ret_val)
+ ret_val = ngbe_poll_for_ack(hw, mbx_id);
+out:
+ return ret_val;
+}
+
+/**
+ * ngbe_read_v2p_mailbox - read v2p mailbox
+ * @hw: pointer to the HW structure
+ *
+ * This function is used to read the v2p mailbox without losing the read to
+ * clear status bits.
+ **/
+STATIC u32 ngbe_read_v2p_mailbox(struct ngbe_hw *hw)
+{
+ u32 v2p_mailbox = rd32(hw, NGBE_VFMBCTL);
+
+ v2p_mailbox |= hw->mbx.v2p_mailbox;
+ hw->mbx.v2p_mailbox |= v2p_mailbox & NGBE_VFMBCTL_R2C_BITS;
+
+ return v2p_mailbox;
+}
+
+/**
+ * ngbe_check_for_bit_vf - Determine if a status bit was set
+ * @hw: pointer to the HW structure
+ * @mask: bitmask for bits to be tested and cleared
+ *
+ * This function is used to check for the read to clear bits within
+ * the V2P mailbox.
+ **/
+STATIC s32 ngbe_check_for_bit_vf(struct ngbe_hw *hw, u32 mask)
+{
+ u32 v2p_mailbox = ngbe_read_v2p_mailbox(hw);
+ s32 ret_val = NGBE_ERR_MBX;
+
+ if (v2p_
[PATCH v2 01/15] net/ngbe: add ethdev probe and remove for VF device
Introduce virtual function driver in ngbe PMD, add simple init and
uninit function to probe and remove the device.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 11 ++
drivers/net/ngbe/base/meson.build| 1 +
drivers/net/ngbe/base/ngbe.h | 1 +
drivers/net/ngbe/base/ngbe_hw.c | 4 +
drivers/net/ngbe/base/ngbe_vf.c | 26 +
drivers/net/ngbe/base/ngbe_vf.h | 13 +++
drivers/net/ngbe/meson.build | 1 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 163 +++
8 files changed, 220 insertions(+)
create mode 100644 doc/guides/nics/features/ngbe_vf.ini
create mode 100644 drivers/net/ngbe/base/ngbe_vf.c
create mode 100644 drivers/net/ngbe/base/ngbe_vf.h
create mode 100644 drivers/net/ngbe/ngbe_ethdev_vf.c
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
new file mode 100644
index 00..71e7b8be81
--- /dev/null
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -0,0 +1,11 @@
+;
+; Supported features of the 'ngbe_vf' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Multiprocess aware = Y
+Linux= Y
+ARMv8= Y
+x86-32 = Y
+x86-64 = Y
\ No newline at end of file
diff --git a/drivers/net/ngbe/base/meson.build
b/drivers/net/ngbe/base/meson.build
index 390b0f9c12..dd68100bf8 100644
--- a/drivers/net/ngbe/base/meson.build
+++ b/drivers/net/ngbe/base/meson.build
@@ -10,6 +10,7 @@ sources = [
'ngbe_phy_rtl.c',
'ngbe_phy_mvl.c',
'ngbe_phy_yt.c',
+'ngbe_vf.c',
]
error_cflags = []
diff --git a/drivers/net/ngbe/base/ngbe.h b/drivers/net/ngbe/base/ngbe.h
index 1d17c2f115..da20829c40 100644
--- a/drivers/net/ngbe/base/ngbe.h
+++ b/drivers/net/ngbe/base/ngbe.h
@@ -11,5 +11,6 @@
#include "ngbe_eeprom.h"
#include "ngbe_phy.h"
#include "ngbe_hw.h"
+#include "ngbe_vf.h"
#endif /* _NGBE_H_ */
diff --git a/drivers/net/ngbe/base/ngbe_hw.c b/drivers/net/ngbe/base/ngbe_hw.c
index 29944f5070..e29a1946e5 100644
--- a/drivers/net/ngbe/base/ngbe_hw.c
+++ b/drivers/net/ngbe/base/ngbe_hw.c
@@ -9,6 +9,7 @@
#include "ngbe_eeprom.h"
#include "ngbe_mng.h"
#include "ngbe_hw.h"
+#include "ngbe_vf.h"
static s32 ngbe_is_lldp(struct ngbe_hw *hw)
{
@@ -2113,6 +2114,9 @@ s32 ngbe_init_shared_code(struct ngbe_hw *hw)
case ngbe_mac_em:
ngbe_init_ops_pf(hw);
break;
+ case ngbe_mac_em_vf:
+ ngbe_init_ops_vf(hw);
+ break;
default:
status = NGBE_ERR_DEVICE_NOT_SUPPORTED;
break;
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
new file mode 100644
index 00..91b8d1bbe2
--- /dev/null
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018-2025 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
+ */
+
+#include "ngbe_type.h"
+#include "ngbe_vf.h"
+
+/**
+ * ngbe_init_ops_vf - Initialize the pointers for vf
+ * @hw: pointer to hardware structure
+ *
+ * This will assign function pointers, adapter-specific functions can
+ * override the assignment of generic function pointers by assigning
+ * their own adapter-specific function pointers.
+ * Does not touch the hardware.
+ **/
+s32 ngbe_init_ops_vf(struct ngbe_hw *hw)
+{
+ struct ngbe_mac_info *mac = &hw->mac;
+
+ mac->max_tx_queues = 1;
+ mac->max_rx_queues = 1;
+
+ return 0;
+}
diff --git a/drivers/net/ngbe/base/ngbe_vf.h b/drivers/net/ngbe/base/ngbe_vf.h
new file mode 100644
index 00..7982ea231e
--- /dev/null
+++ b/drivers/net/ngbe/base/ngbe_vf.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018-2025 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
+ */
+
+#ifndef _NGBE_VF_H_
+#define _NGBE_VF_H_
+
+#include "ngbe_type.h"
+
+s32 ngbe_init_ops_vf(struct ngbe_hw *hw);
+
+#endif /* __NGBE_VF_H__ */
diff --git a/drivers/net/ngbe/meson.build b/drivers/net/ngbe/meson.build
index 402cea1c13..f4f8f7ee79 100644
--- a/drivers/net/ngbe/meson.build
+++ b/drivers/net/ngbe/meson.build
@@ -15,6 +15,7 @@ sources = files(
'ngbe_ptypes.c',
'ngbe_pf.c',
'ngbe_rxtx.c',
+'ngbe_ethdev_vf.c',
)
deps += ['hash']
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
new file mode 100644
index 00..164a97fac1
--- /dev/null
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -0,0 +1,163 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018-2025 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "ngbe_logs.h"
+#include "base/ngbe.h"
+#include "ngbe_ethdev.h"
+#include "ngbe_rxtx.h"
+#include "ngbe_regs_
[PATCH v2 09/15] net/ngbe: add interrupt support for VF device
Add VF device interrupt handler, support to enable and disable RX queue
interrupt, and configure misx interrupt.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 1 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 227 +++
2 files changed, 228 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 48f3bd73bb..0fde7f9563 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -5,6 +5,7 @@
;
[Features]
Unicast MAC filter = Y
+Rx interrupt = Y
MTU update = Y
Scattered Rx = Y
LRO = Y
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index a6048807cc..69e0e82652 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -18,11 +18,15 @@
#define NGBEVF_PMD_NAME "rte_ngbevf_pmd" /* PMD name */
static int ngbevf_dev_close(struct rte_eth_dev *dev);
+static void ngbevf_intr_disable(struct rte_eth_dev *dev);
+static void ngbevf_intr_enable(struct rte_eth_dev *dev);
static int ngbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask);
static void ngbevf_set_vfta_all(struct rte_eth_dev *dev, bool on);
+static void ngbevf_configure_msix(struct rte_eth_dev *dev);
static int ngbevf_dev_promiscuous_enable(struct rte_eth_dev *dev);
static int ngbevf_dev_promiscuous_disable(struct rte_eth_dev *dev);
static void ngbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index);
+static void ngbevf_dev_interrupt_handler(void *param);
/*
* The set of PCI devices this driver supports (for VF)
@@ -110,6 +114,7 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
int err;
uint32_t tc, tcs;
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
+ struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
struct ngbe_hw *hw = ngbe_dev_hw(eth_dev);
struct ngbe_vfta *shadow_vfta = NGBE_DEV_VFTA(eth_dev);
struct ngbe_hwstrip *hwstrip = NGBE_DEV_HWSTRIP(eth_dev);
@@ -173,6 +178,9 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
/* init_mailbox_params */
hw->mbx.init_params(hw);
+ /* Disable the interrupts for VF */
+ ngbevf_intr_disable(eth_dev);
+
hw->mac.num_rar_entries = 32; /* The MAX of the underlying PF */
err = hw->mac.reset_hw(hw);
@@ -240,6 +248,11 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
/* enter promiscuous mode */
ngbevf_dev_promiscuous_enable(eth_dev);
+ rte_intr_callback_register(intr_handle,
+ ngbevf_dev_interrupt_handler, eth_dev);
+ rte_intr_enable(intr_handle);
+ ngbevf_intr_enable(eth_dev);
+
PMD_INIT_LOG(DEBUG, "port %d vendorID=0x%x deviceID=0x%x mac.type=%s",
eth_dev->data->port_id, pci_dev->id.vendor_id,
pci_dev->id.device_id, "ngbe_mac_sp_vf");
@@ -332,6 +345,39 @@ ngbevf_dev_info_get(struct rte_eth_dev *dev,
return 0;
}
+static void
+ngbevf_intr_disable(struct rte_eth_dev *dev)
+{
+ struct ngbe_interrupt *intr = ngbe_dev_intr(dev);
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
+
+ PMD_INIT_FUNC_TRACE();
+
+ /* Clear interrupt mask to stop from interrupts being generated */
+ wr32(hw, NGBE_VFIMS, NGBE_VFIMS_MASK);
+
+ ngbe_flush(hw);
+
+ /* Clear mask value. */
+ intr->mask_misc = NGBE_VFIMS_MASK;
+}
+
+static void
+ngbevf_intr_enable(struct rte_eth_dev *dev)
+{
+ struct ngbe_interrupt *intr = ngbe_dev_intr(dev);
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
+
+ PMD_INIT_FUNC_TRACE();
+
+ /* VF enable interrupt autoclean */
+ wr32(hw, NGBE_VFIMC, NGBE_VFIMC_MASK);
+
+ ngbe_flush(hw);
+
+ intr->mask_misc = 0;
+}
+
static int
ngbevf_dev_configure(struct rte_eth_dev *dev)
{
@@ -370,6 +416,8 @@ static int
ngbevf_dev_close(struct rte_eth_dev *dev)
{
struct ngbe_hw *hw = ngbe_dev_hw(dev);
+ struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
+ struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
PMD_INIT_FUNC_TRACE();
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
@@ -387,9 +435,16 @@ ngbevf_dev_close(struct rte_eth_dev *dev)
dev->rx_pkt_burst = NULL;
dev->tx_pkt_burst = NULL;
+ /* Disable the interrupts for VF */
+ ngbevf_intr_disable(dev);
+
rte_free(dev->data->mac_addrs);
dev->data->mac_addrs = NULL;
+ rte_intr_disable(intr_handle);
+ rte_intr_callback_unregister(intr_handle,
+ngbevf_dev_interrupt_handler, dev);
+
return 0;
}
@@ -492,6 +547,113 @@ ngbevf_vlan_offload_set(struct rte_eth_dev *dev, int mask)
return 0;
}
+static int
+ngbevf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
+{
+ struct rte_pci_device *pci_dev = RTE_ET
[PATCH v2 06/15] net/ngbe: add add/remove/set mac addr ops for VF device
Generate a random MAC address if none was assigned by PF during
the initialization of VF device. And support to add and remove
MAC address.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 1 +
drivers/net/ngbe/base/ngbe_type.h| 1 +
drivers/net/ngbe/base/ngbe_vf.c | 83 +++
drivers/net/ngbe/base/ngbe_vf.h | 4 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 146 +++
5 files changed, 235 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 570b5ac25b..6f16f2b079 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -4,6 +4,7 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+Unicast MAC filter = Y
MTU update = Y
Promiscuous mode = Y
Allmulticast mode= Y
diff --git a/drivers/net/ngbe/base/ngbe_type.h
b/drivers/net/ngbe/base/ngbe_type.h
index f780b92efa..7a3b52ffd4 100644
--- a/drivers/net/ngbe/base/ngbe_type.h
+++ b/drivers/net/ngbe/base/ngbe_type.h
@@ -335,6 +335,7 @@ struct ngbe_mac_info {
/* RAR */
s32 (*set_rar)(struct ngbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
u32 enable_addr);
+ s32 (*set_uc_addr)(struct ngbe_hw *hw, u32 index, u8 *addr);
s32 (*clear_rar)(struct ngbe_hw *hw, u32 index);
s32 (*set_vmdq)(struct ngbe_hw *hw, u32 rar, u32 vmdq);
s32 (*clear_vmdq)(struct ngbe_hw *hw, u32 rar, u32 vmdq);
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
index c0436c7b8a..47fee7e14d 100644
--- a/drivers/net/ngbe/base/ngbe_vf.c
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -191,6 +191,40 @@ STATIC s32 ngbevf_write_msg_read_ack(struct ngbe_hw *hw,
u32 *msg,
return mbx->read_posted(hw, retmsg, size, 0);
}
+/**
+ * ngbe_set_rar_vf - set device MAC address
+ * @hw: pointer to hardware structure
+ * @index: Receive address register to write
+ * @addr: Address to put into receive address register
+ * @vmdq: VMDq "set" or "pool" index
+ * @enable_addr: set flag that address is active
+ **/
+s32 ngbe_set_rar_vf(struct ngbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
+u32 enable_addr)
+{
+ u32 msgbuf[3];
+ u8 *msg_addr = (u8 *)(&msgbuf[1]);
+ s32 ret_val;
+
+ UNREFERENCED_PARAMETER(vmdq, enable_addr, index);
+
+ memset(msgbuf, 0, 12);
+ msgbuf[0] = NGBE_VF_SET_MAC_ADDR;
+ memcpy(msg_addr, addr, 6);
+ ret_val = ngbevf_write_msg_read_ack(hw, msgbuf, msgbuf, 3);
+
+ msgbuf[0] &= ~NGBE_VT_MSGTYPE_CTS;
+
+ /* if nacked the address was rejected, use "perm_addr" */
+ if (!ret_val &&
+ (msgbuf[0] == (NGBE_VF_SET_MAC_ADDR | NGBE_VT_MSGTYPE_NACK))) {
+ ngbe_get_mac_addr_vf(hw, hw->mac.addr);
+ return NGBE_ERR_MBX;
+ }
+
+ return ret_val;
+}
+
/**
* ngbevf_update_xcast_mode - Update Multicast mode
* @hw: pointer to the HW structure
@@ -228,6 +262,51 @@ s32 ngbevf_update_xcast_mode(struct ngbe_hw *hw, int
xcast_mode)
return 0;
}
+/**
+ * ngbe_get_mac_addr_vf - Read device MAC address
+ * @hw: pointer to the HW structure
+ * @mac_addr: the MAC address
+ **/
+s32 ngbe_get_mac_addr_vf(struct ngbe_hw *hw, u8 *mac_addr)
+{
+ int i;
+
+ for (i = 0; i < ETH_ADDR_LEN; i++)
+ mac_addr[i] = hw->mac.perm_addr[i];
+
+ return 0;
+}
+
+s32 ngbevf_set_uc_addr_vf(struct ngbe_hw *hw, u32 index, u8 *addr)
+{
+ u32 msgbuf[3], msgbuf_chk;
+ u8 *msg_addr = (u8 *)(&msgbuf[1]);
+ s32 ret_val;
+
+ memset(msgbuf, 0, sizeof(msgbuf));
+ /*
+* If index is one then this is the start of a new list and needs
+* indication to the PF so it can do it's own list management.
+* If it is zero then that tells the PF to just clear all of
+* this VF's macvlans and there is no new list.
+*/
+ msgbuf[0] |= index << NGBE_VT_MSGINFO_SHIFT;
+ msgbuf[0] |= NGBE_VF_SET_MACVLAN;
+ msgbuf_chk = msgbuf[0];
+ if (addr)
+ memcpy(msg_addr, addr, 6);
+
+ ret_val = ngbevf_write_msg_read_ack(hw, msgbuf, msgbuf, 3);
+ if (!ret_val) {
+ msgbuf[0] &= ~NGBE_VT_MSGTYPE_CTS;
+
+ if (msgbuf[0] == (msgbuf_chk | NGBE_VT_MSGTYPE_NACK))
+ return NGBE_ERR_OUT_OF_MEM;
+ }
+
+ return ret_val;
+}
+
/**
* ngbevf_rlpml_set_vf - Set the maximum receive packet length
* @hw: pointer to the HW structure
@@ -359,8 +438,12 @@ s32 ngbe_init_ops_vf(struct ngbe_hw *hw)
mac->reset_hw = ngbe_reset_hw_vf;
mac->start_hw = ngbe_start_hw_vf;
mac->stop_hw = ngbe_stop_hw_vf;
+ mac->get_mac_addr = ngbe_get_mac_addr_vf;
mac->negotiate_api_version = ngbevf_negotiate_api_version;
+ /* RAR, Multicast */
+ mac->set_rar = ngbe_set_rar_vf;
+ mac->set_uc_addr = ng
[PATCH v2 08/15] net/ngbe: add VLAN related ops for VF device
Add support for VLAN filter, offload and strip set feature.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 1 +
drivers/net/ngbe/base/ngbe_vf.c | 33 +++-
drivers/net/ngbe/base/ngbe_vf.h | 2 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 112 +++
4 files changed, 147 insertions(+), 1 deletion(-)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index ad123684c5..48f3bd73bb 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -11,6 +11,7 @@ LRO = Y
TSO = Y
Promiscuous mode = Y
Allmulticast mode= Y
+VLAN filter = Y
CRC offload = P
VLAN offload = P
QinQ offload = P
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
index 47fee7e14d..039f87423d 100644
--- a/drivers/net/ngbe/base/ngbe_vf.c
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -262,6 +262,36 @@ s32 ngbevf_update_xcast_mode(struct ngbe_hw *hw, int
xcast_mode)
return 0;
}
+/**
+ * ngbe_set_vfta_vf - Set/Unset vlan filter table address
+ * @hw: pointer to the HW structure
+ * @vlan: 12 bit VLAN ID
+ * @vind: unused by VF drivers
+ * @vlan_on: if true then set bit, else clear bit
+ * @vlvf_bypass: boolean flag indicating updating default pool is okay
+ *
+ * Turn on/off specified VLAN in the VLAN filter table.
+ **/
+s32 ngbe_set_vfta_vf(struct ngbe_hw *hw, u32 vlan, u32 vind,
+ bool vlan_on, bool vlvf_bypass)
+{
+ u32 msgbuf[2];
+ s32 ret_val;
+
+ UNREFERENCED_PARAMETER(vind, vlvf_bypass);
+
+ msgbuf[0] = NGBE_VF_SET_VLAN;
+ msgbuf[1] = vlan;
+ /* Setting the 8 bit field MSG INFO to TRUE indicates "add" */
+ msgbuf[0] |= vlan_on << NGBE_VT_MSGINFO_SHIFT;
+
+ ret_val = ngbevf_write_msg_read_ack(hw, msgbuf, msgbuf, 2);
+ if (!ret_val && (msgbuf[0] & NGBE_VT_MSGTYPE_ACK))
+ return 0;
+
+ return ret_val | (msgbuf[0] & NGBE_VT_MSGTYPE_NACK);
+}
+
/**
* ngbe_get_mac_addr_vf - Read device MAC address
* @hw: pointer to the HW structure
@@ -441,10 +471,11 @@ s32 ngbe_init_ops_vf(struct ngbe_hw *hw)
mac->get_mac_addr = ngbe_get_mac_addr_vf;
mac->negotiate_api_version = ngbevf_negotiate_api_version;
- /* RAR, Multicast */
+ /* RAR, Multicast, VLAN */
mac->set_rar = ngbe_set_rar_vf;
mac->set_uc_addr = ngbevf_set_uc_addr_vf;
mac->update_xcast_mode = ngbevf_update_xcast_mode;
+ mac->set_vfta = ngbe_set_vfta_vf;
mac->set_rlpml = ngbevf_rlpml_set_vf;
mac->max_tx_queues = 1;
diff --git a/drivers/net/ngbe/base/ngbe_vf.h b/drivers/net/ngbe/base/ngbe_vf.h
index 3f328a0221..596f41dcb0 100644
--- a/drivers/net/ngbe/base/ngbe_vf.h
+++ b/drivers/net/ngbe/base/ngbe_vf.h
@@ -21,6 +21,8 @@ s32 ngbe_set_rar_vf(struct ngbe_hw *hw, u32 index, u8 *addr,
u32 vmdq,
u32 enable_addr);
s32 ngbevf_set_uc_addr_vf(struct ngbe_hw *hw, u32 index, u8 *addr);
s32 ngbevf_update_xcast_mode(struct ngbe_hw *hw, int xcast_mode);
+s32 ngbe_set_vfta_vf(struct ngbe_hw *hw, u32 vlan, u32 vind,
+ bool vlan_on, bool vlvf_bypass);
s32 ngbevf_rlpml_set_vf(struct ngbe_hw *hw, u16 max_size);
int ngbevf_negotiate_api_version(struct ngbe_hw *hw, int api);
int ngbevf_get_queues(struct ngbe_hw *hw, unsigned int *num_tcs,
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index f664656c42..a6048807cc 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -18,6 +18,8 @@
#define NGBEVF_PMD_NAME "rte_ngbevf_pmd" /* PMD name */
static int ngbevf_dev_close(struct rte_eth_dev *dev);
+static int ngbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask);
+static void ngbevf_set_vfta_all(struct rte_eth_dev *dev, bool on);
static int ngbevf_dev_promiscuous_enable(struct rte_eth_dev *dev);
static int ngbevf_dev_promiscuous_disable(struct rte_eth_dev *dev);
static void ngbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index);
@@ -109,6 +111,8 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
uint32_t tc, tcs;
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
struct ngbe_hw *hw = ngbe_dev_hw(eth_dev);
+ struct ngbe_vfta *shadow_vfta = NGBE_DEV_VFTA(eth_dev);
+ struct ngbe_hwstrip *hwstrip = NGBE_DEV_HWSTRIP(eth_dev);
struct rte_ether_addr *perm_addr =
(struct rte_ether_addr *)hw->mac.perm_addr;
@@ -152,6 +156,12 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
ngbe_map_device_id(hw);
hw->hw_addr = (void *)pci_dev->mem_resource[0].addr;
+ /* initialize the vfta */
+ memset(shadow_vfta, 0, sizeof(*shadow_vfta));
+
+ /* initialize the hw strip bitmap*/
+ memset(hwstrip, 0, sizeof(*hwstrip));
+
/* Initialize the shared code (base
[PATCH v2 10/15] net/ngbe: add link update ops for VF device
Add support to check link feature for VF device, including link speed,
duplex mode and link state.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 1 +
drivers/net/ngbe/base/ngbe_vf.c | 96
drivers/net/ngbe/base/ngbe_vf.h | 2 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 9 +++
4 files changed, 108 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 0fde7f9563..fd9c30f559 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -4,6 +4,7 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+Link status = Y
Unicast MAC filter = Y
Rx interrupt = Y
MTU update = Y
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
index 039f87423d..52b86afc56 100644
--- a/drivers/net/ngbe/base/ngbe_vf.c
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -337,6 +337,99 @@ s32 ngbevf_set_uc_addr_vf(struct ngbe_hw *hw, u32 index,
u8 *addr)
return ret_val;
}
+/**
+ * ngbe_check_mac_link_vf - Get link/speed status
+ * @hw: pointer to hardware structure
+ * @speed: pointer to link speed
+ * @link_up: true is link is up, false otherwise
+ * @autoneg_wait_to_complete: true when waiting for completion is needed
+ *
+ * Reads the links register to determine if link is up and the current speed
+ **/
+s32 ngbe_check_mac_link_vf(struct ngbe_hw *hw, u32 *speed,
+ bool *link_up, bool wait_to_complete)
+{
+ /**
+* for a quick link status checking, wait_to_compelet == 0,
+* skip PF link status checking
+*/
+ bool no_pflink_check = 0;
+ struct ngbe_mbx_info *mbx = &hw->mbx;
+ struct ngbe_mac_info *mac = &hw->mac;
+ s32 ret_val = 0;
+ u32 links_reg;
+ u32 in_msg = 0;
+
+ UNREFERENCED_PARAMETER(wait_to_complete);
+
+ /* If we were hit with a reset drop the link */
+ if (!mbx->check_for_rst(hw, 0) || !mbx->timeout)
+ mac->get_link_status = true;
+
+ if (!mac->get_link_status)
+ goto out;
+
+ /* if link status is down no point in checking to see if pf is up */
+ links_reg = rd32(hw, NGBE_VFSTATUS);
+ if (!(links_reg & NGBE_VFSTATUS_BW_MASK))
+ goto out;
+
+ /* for SFP+ modules and DA cables it can take up to 500usecs
+* before the link status is correct
+*/
+ if (mac->type == ngbe_mac_em_vf) {
+ if (po32m(hw, NGBE_VFSTATUS, NGBE_VFSTATUS_BW_MASK,
+ 0, NULL, 5, 100))
+ goto out;
+ }
+
+ if (links_reg & NGBE_VFSTATUS_BW_1G)
+ *speed = NGBE_LINK_SPEED_1GB_FULL;
+ else if (links_reg & NGBE_VFSTATUS_BW_100M)
+ *speed = NGBE_LINK_SPEED_100M_FULL;
+ else if (links_reg & NGBE_VFSTATUS_BW_10M)
+ *speed = NGBE_LINK_SPEED_10M_FULL;
+ else
+ *speed = NGBE_LINK_SPEED_UNKNOWN;
+
+ if (no_pflink_check) {
+ if (*speed == NGBE_LINK_SPEED_UNKNOWN)
+ mac->get_link_status = true;
+ else
+ mac->get_link_status = false;
+
+ goto out;
+ }
+
+ /* if the read failed it could just be a mailbox collision, best wait
+* until we are called again and don't report an error
+*/
+ if (mbx->read(hw, &in_msg, 1, 0))
+ goto out;
+
+ if (!(in_msg & NGBE_VT_MSGTYPE_CTS)) {
+ /* msg is not CTS and is NACK we must have lost CTS status */
+ if (in_msg & NGBE_VT_MSGTYPE_NACK)
+ ret_val = -1;
+ goto out;
+ }
+
+ /* the pf is talking, if we timed out in the past we reinit */
+ if (!mbx->timeout) {
+ ret_val = -1;
+ goto out;
+ }
+
+ /* if we passed all the tests above then the link is up and we no
+* longer need to check for link
+*/
+ mac->get_link_status = false;
+
+out:
+ *link_up = !mac->get_link_status;
+ return ret_val;
+}
+
/**
* ngbevf_rlpml_set_vf - Set the maximum receive packet length
* @hw: pointer to the HW structure
@@ -471,6 +564,9 @@ s32 ngbe_init_ops_vf(struct ngbe_hw *hw)
mac->get_mac_addr = ngbe_get_mac_addr_vf;
mac->negotiate_api_version = ngbevf_negotiate_api_version;
+ /* Link */
+ mac->check_link = ngbe_check_mac_link_vf;
+
/* RAR, Multicast, VLAN */
mac->set_rar = ngbe_set_rar_vf;
mac->set_uc_addr = ngbevf_set_uc_addr_vf;
diff --git a/drivers/net/ngbe/base/ngbe_vf.h b/drivers/net/ngbe/base/ngbe_vf.h
index 596f41dcb0..5cf225dd35 100644
--- a/drivers/net/ngbe/base/ngbe_vf.h
+++ b/drivers/net/ngbe/base/ngbe_vf.h
@@ -17,6 +17,8 @@ s32 ngbe_start_hw_vf(struct ngbe_hw *hw);
s32 ngbe_reset_hw_vf(struct ngbe_hw *hw);
s3
[PATCH v2 00/15] net/ngbe: add VF driver support
This patch adds support to VF device for ngbe PMD. --- v2: - update description of patch content - fix build issue - formatting and cleanup --- Zaiyu Wang (15): net/ngbe: add ethdev probe and remove for VF device net/ngbe: add support for PF-VF mailbox interface net/ngbe: add hardware configuration code for VF device net/ngbe: add promiscuous and allmulticast ops for VF device net/ngbe: add set MTU ops for VF device net/ngbe: add add/remove/set mac addr ops for VF device net/ngbe: add datapath init code for VF device net/ngbe: add VLAN related ops for VF device net/ngbe: add interrupt support for VF device net/ngbe: add link update ops for VF device net/ngbe: add stats and xstats ops for VF device net/ngbe: add start/stop/reset/close ops for VF device net/ngbe: add multicast MAC filter ops for VF device net/ngbe: add dump registers ops for VF device net/ngbe: add some ops which PF has implemented doc/guides/nics/features/ngbe_vf.ini | 37 + doc/guides/nics/ngbe.rst | 11 + drivers/net/ngbe/base/meson.build|1 + drivers/net/ngbe/base/ngbe.h |1 + drivers/net/ngbe/base/ngbe_hw.c |4 + drivers/net/ngbe/base/ngbe_mbx.c | 338 +++ drivers/net/ngbe/base/ngbe_mbx.h | 31 + drivers/net/ngbe/base/ngbe_type.h| 15 + drivers/net/ngbe/base/ngbe_vf.c | 671 + drivers/net/ngbe/base/ngbe_vf.h | 68 ++ drivers/net/ngbe/meson.build |1 + drivers/net/ngbe/ngbe_ethdev.h |6 + drivers/net/ngbe/ngbe_ethdev_vf.c| 1350 ++ drivers/net/ngbe/ngbe_rxtx.c | 209 14 files changed, 2743 insertions(+) create mode 100644 doc/guides/nics/features/ngbe_vf.ini create mode 100644 drivers/net/ngbe/base/ngbe_vf.c create mode 100644 drivers/net/ngbe/base/ngbe_vf.h create mode 100644 drivers/net/ngbe/ngbe_ethdev_vf.c -- 2.21.0.windows.1
[PATCH v2 07/15] net/ngbe: add datapath init code for VF device
Add support for datapath init, including RX and TX unit init.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 5 +
doc/guides/nics/ngbe.rst | 11 ++
drivers/net/ngbe/ngbe_ethdev.h | 6 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 63
drivers/net/ngbe/ngbe_rxtx.c | 209 +++
5 files changed, 294 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 6f16f2b079..ad123684c5 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -6,6 +6,9 @@
[Features]
Unicast MAC filter = Y
MTU update = Y
+Scattered Rx = Y
+LRO = Y
+TSO = Y
Promiscuous mode = Y
Allmulticast mode= Y
CRC offload = P
@@ -15,6 +18,8 @@ L3 checksum offload = P
L4 checksum offload = P
Inner L3 checksum= P
Inner L4 checksum= P
+Rx descriptor status = Y
+Tx descriptor status = Y
Multiprocess aware = Y
Linux= Y
ARMv8= Y
diff --git a/doc/guides/nics/ngbe.rst b/doc/guides/nics/ngbe.rst
index e31600c95a..b002fa4c19 100644
--- a/doc/guides/nics/ngbe.rst
+++ b/doc/guides/nics/ngbe.rst
@@ -42,6 +42,17 @@ Prerequisites
Configuration
-
+Compilation Options
+~~~
+
+The following build-time options may be enabled on build time using.
+
+``-Dc_args=`` meson argument (e.g.
``-Dc_args=-DRTE_LIBRTE_NGBE_PF_DISABLE_STRIP_CRC``).
+
+- ``RTE_LIBRTE_NGBE_PF_DISABLE_STRIP_CRC`` (undefined by default)
+
+ Decide to enable or disable HW CRC in VF PMD.
+
Dynamic Logging Parameters
~~
diff --git a/drivers/net/ngbe/ngbe_ethdev.h b/drivers/net/ngbe/ngbe_ethdev.h
index 7af58a57ac..37c6459f51 100644
--- a/drivers/net/ngbe/ngbe_ethdev.h
+++ b/drivers/net/ngbe/ngbe_ethdev.h
@@ -241,6 +241,12 @@ int
ngbe_tx_burst_mode_get(struct rte_eth_dev *dev, __rte_unused uint16_t queue_id,
struct rte_eth_burst_mode *mode);
+int ngbevf_dev_rx_init(struct rte_eth_dev *dev);
+
+void ngbevf_dev_tx_init(struct rte_eth_dev *dev);
+
+void ngbevf_dev_rxtx_start(struct rte_eth_dev *dev);
+
uint16_t ngbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts);
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index e4a62a7df9..f664656c42 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -115,6 +115,34 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
PMD_INIT_FUNC_TRACE();
eth_dev->dev_ops = &ngbevf_eth_dev_ops;
+ eth_dev->rx_descriptor_status = ngbe_dev_rx_descriptor_status;
+ eth_dev->tx_descriptor_status = ngbe_dev_tx_descriptor_status;
+ eth_dev->rx_pkt_burst = &ngbe_recv_pkts;
+ eth_dev->tx_pkt_burst = &ngbe_xmit_pkts;
+
+ /* for secondary processes, we don't initialise any further as primary
+* has already done this work. Only check we don't need a different
+* RX function
+*/
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+ struct ngbe_tx_queue *txq;
+ uint16_t nb_tx_queues = eth_dev->data->nb_tx_queues;
+ /* TX queue function in primary, set by last queue initialized
+* Tx queue may not initialized by primary process
+*/
+ if (eth_dev->data->tx_queues) {
+ txq = eth_dev->data->tx_queues[nb_tx_queues - 1];
+ ngbe_set_tx_function(eth_dev, txq);
+ } else {
+ /* Use default TX function if we get here */
+ PMD_INIT_LOG(NOTICE,
+"No TX queues configured yet. Using
default TX function.");
+ }
+
+ ngbe_set_rx_function(eth_dev);
+
+ return 0;
+ }
rte_eth_copy_pci_info(eth_dev, pci_dev);
@@ -294,6 +322,40 @@ ngbevf_dev_info_get(struct rte_eth_dev *dev,
return 0;
}
+static int
+ngbevf_dev_configure(struct rte_eth_dev *dev)
+{
+ struct rte_eth_conf *conf = &dev->data->dev_conf;
+ struct ngbe_adapter *adapter = ngbe_dev_adapter(dev);
+
+ PMD_INIT_LOG(DEBUG, "Configured Virtual Function port id: %d",
+dev->data->port_id);
+
+ /*
+* VF has no ability to enable/disable HW CRC
+* Keep the persistent behavior the same as Host PF
+*/
+#ifndef RTE_LIBRTE_NGBE_PF_DISABLE_STRIP_CRC
+ if (conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_KEEP_CRC) {
+ PMD_INIT_LOG(NOTICE, "VF can't disable HW CRC Strip");
+ conf->rxmode.offloads &= ~RTE_ETH_RX_OFFLOAD_KEEP_CRC;
+ }
+#else
+ if (!(conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_KEEP_CRC)) {
+ PMD_INIT_LOG(NOTICE, "VF can't enable HW CRC Strip");
+ conf->rxmode.offloads |=
[PATCH v2 04/15] net/ngbe: add promiscuous and allmulticast ops for VF device
Support to enable and disable promiscuous and allmulticast mode on VF
device.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 2 +
drivers/net/ngbe/base/ngbe_type.h| 1 +
drivers/net/ngbe/base/ngbe_vf.c | 39 +++
drivers/net/ngbe/base/ngbe_vf.h | 1 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 96
5 files changed, 139 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 4335efb812..f8928c5a6c 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -4,6 +4,8 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+Promiscuous mode = Y
+Allmulticast mode= Y
CRC offload = P
VLAN offload = P
QinQ offload = P
diff --git a/drivers/net/ngbe/base/ngbe_type.h
b/drivers/net/ngbe/base/ngbe_type.h
index 4fd7080847..29dcd5f912 100644
--- a/drivers/net/ngbe/base/ngbe_type.h
+++ b/drivers/net/ngbe/base/ngbe_type.h
@@ -351,6 +351,7 @@ struct ngbe_mac_info {
void (*set_mac_anti_spoofing)(struct ngbe_hw *hw, bool enable, int vf);
void (*set_vlan_anti_spoofing)(struct ngbe_hw *hw,
bool enable, int vf);
+ s32 (*update_xcast_mode)(struct ngbe_hw *hw, int xcast_mode);
/* Flow Control */
s32 (*fc_enable)(struct ngbe_hw *hw);
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
index 7c8b082f97..ccf7148b9c 100644
--- a/drivers/net/ngbe/base/ngbe_vf.c
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -191,6 +191,43 @@ STATIC s32 ngbevf_write_msg_read_ack(struct ngbe_hw *hw,
u32 *msg,
return mbx->read_posted(hw, retmsg, size, 0);
}
+/**
+ * ngbevf_update_xcast_mode - Update Multicast mode
+ * @hw: pointer to the HW structure
+ * @xcast_mode: new multicast mode
+ *
+ * Updates the Multicast Mode of VF.
+ **/
+s32 ngbevf_update_xcast_mode(struct ngbe_hw *hw, int xcast_mode)
+{
+ u32 msgbuf[2];
+ s32 err;
+
+ switch (hw->api_version) {
+ case ngbe_mbox_api_12:
+ /* New modes were introduced in 1.3 version */
+ if (xcast_mode > NGBEVF_XCAST_MODE_ALLMULTI)
+ return NGBE_ERR_FEATURE_NOT_SUPPORTED;
+ /* Fall through */
+ case ngbe_mbox_api_13:
+ break;
+ default:
+ return NGBE_ERR_FEATURE_NOT_SUPPORTED;
+ }
+
+ msgbuf[0] = NGBE_VF_UPDATE_XCAST_MODE;
+ msgbuf[1] = xcast_mode;
+
+ err = ngbevf_write_msg_read_ack(hw, msgbuf, msgbuf, 2);
+ if (err)
+ return err;
+
+ msgbuf[0] &= ~NGBE_VT_MSGTYPE_CTS;
+ if (msgbuf[0] == (NGBE_VF_UPDATE_XCAST_MODE | NGBE_VT_MSGTYPE_NACK))
+ return NGBE_ERR_FEATURE_NOT_SUPPORTED;
+ return 0;
+}
+
/**
* ngbevf_negotiate_api_version - Negotiate supported API version
* @hw: pointer to the HW structure
@@ -301,6 +338,8 @@ s32 ngbe_init_ops_vf(struct ngbe_hw *hw)
mac->stop_hw = ngbe_stop_hw_vf;
mac->negotiate_api_version = ngbevf_negotiate_api_version;
+ mac->update_xcast_mode = ngbevf_update_xcast_mode;
+
mac->max_tx_queues = 1;
mac->max_rx_queues = 1;
diff --git a/drivers/net/ngbe/base/ngbe_vf.h b/drivers/net/ngbe/base/ngbe_vf.h
index da846dda45..79891e8389 100644
--- a/drivers/net/ngbe/base/ngbe_vf.h
+++ b/drivers/net/ngbe/base/ngbe_vf.h
@@ -16,6 +16,7 @@ s32 ngbe_init_hw_vf(struct ngbe_hw *hw);
s32 ngbe_start_hw_vf(struct ngbe_hw *hw);
s32 ngbe_reset_hw_vf(struct ngbe_hw *hw);
s32 ngbe_stop_hw_vf(struct ngbe_hw *hw);
+s32 ngbevf_update_xcast_mode(struct ngbe_hw *hw, int xcast_mode);
int ngbevf_negotiate_api_version(struct ngbe_hw *hw, int api);
int ngbevf_get_queues(struct ngbe_hw *hw, unsigned int *num_tcs,
unsigned int *default_tc);
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index ed8400f6ed..28000471b5 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -18,6 +18,8 @@
#define NGBEVF_PMD_NAME "rte_ngbevf_pmd" /* PMD name */
static int ngbevf_dev_close(struct rte_eth_dev *dev);
+static int ngbevf_dev_promiscuous_enable(struct rte_eth_dev *dev);
+static int ngbevf_dev_promiscuous_disable(struct rte_eth_dev *dev);
/*
* The set of PCI devices this driver supports (for VF)
@@ -155,6 +157,9 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
return -EIO;
}
+ /* enter promiscuous mode */
+ ngbevf_dev_promiscuous_enable(eth_dev);
+
PMD_INIT_LOG(DEBUG, "port %d vendorID=0x%x deviceID=0x%x mac.type=%s",
eth_dev->data->port_id, pci_dev->id.vendor_id,
pci_dev->id.device_id, "ngbe_mac_sp_vf");
@@ -264,11 +269,102 @@ ngbevf_dev_close(struct rte_eth_dev *dev)
return 0;
}
+static int
+ngbevf_dev_promiscuous_enable(struct
[PATCH v2 05/15] net/ngbe: add set MTU ops for VF device
Support to update MTU for VF device.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 1 +
drivers/net/ngbe/base/ngbe_type.h| 1 +
drivers/net/ngbe/base/ngbe_vf.c | 24 +++
drivers/net/ngbe/base/ngbe_vf.h | 1 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 36
5 files changed, 63 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index f8928c5a6c..570b5ac25b 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -4,6 +4,7 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+MTU update = Y
Promiscuous mode = Y
Allmulticast mode= Y
CRC offload = P
diff --git a/drivers/net/ngbe/base/ngbe_type.h
b/drivers/net/ngbe/base/ngbe_type.h
index 29dcd5f912..f780b92efa 100644
--- a/drivers/net/ngbe/base/ngbe_type.h
+++ b/drivers/net/ngbe/base/ngbe_type.h
@@ -352,6 +352,7 @@ struct ngbe_mac_info {
void (*set_vlan_anti_spoofing)(struct ngbe_hw *hw,
bool enable, int vf);
s32 (*update_xcast_mode)(struct ngbe_hw *hw, int xcast_mode);
+ s32 (*set_rlpml)(struct ngbe_hw *hw, u16 max_size);
/* Flow Control */
s32 (*fc_enable)(struct ngbe_hw *hw);
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
index ccf7148b9c..c0436c7b8a 100644
--- a/drivers/net/ngbe/base/ngbe_vf.c
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -228,6 +228,29 @@ s32 ngbevf_update_xcast_mode(struct ngbe_hw *hw, int
xcast_mode)
return 0;
}
+/**
+ * ngbevf_rlpml_set_vf - Set the maximum receive packet length
+ * @hw: pointer to the HW structure
+ * @max_size: value to assign to max frame size
+ **/
+s32 ngbevf_rlpml_set_vf(struct ngbe_hw *hw, u16 max_size)
+{
+ u32 msgbuf[2];
+ s32 retval;
+
+ msgbuf[0] = NGBE_VF_SET_LPE;
+ msgbuf[1] = max_size;
+
+ retval = ngbevf_write_msg_read_ack(hw, msgbuf, msgbuf, 2);
+ if (retval)
+ return retval;
+ if ((msgbuf[0] & NGBE_VF_SET_LPE) &&
+ (msgbuf[0] & NGBE_VT_MSGTYPE_NACK))
+ return NGBE_ERR_MBX;
+
+ return 0;
+}
+
/**
* ngbevf_negotiate_api_version - Negotiate supported API version
* @hw: pointer to the HW structure
@@ -339,6 +362,7 @@ s32 ngbe_init_ops_vf(struct ngbe_hw *hw)
mac->negotiate_api_version = ngbevf_negotiate_api_version;
mac->update_xcast_mode = ngbevf_update_xcast_mode;
+ mac->set_rlpml = ngbevf_rlpml_set_vf;
mac->max_tx_queues = 1;
mac->max_rx_queues = 1;
diff --git a/drivers/net/ngbe/base/ngbe_vf.h b/drivers/net/ngbe/base/ngbe_vf.h
index 79891e8389..a64de9d332 100644
--- a/drivers/net/ngbe/base/ngbe_vf.h
+++ b/drivers/net/ngbe/base/ngbe_vf.h
@@ -17,6 +17,7 @@ s32 ngbe_start_hw_vf(struct ngbe_hw *hw);
s32 ngbe_reset_hw_vf(struct ngbe_hw *hw);
s32 ngbe_stop_hw_vf(struct ngbe_hw *hw);
s32 ngbevf_update_xcast_mode(struct ngbe_hw *hw, int xcast_mode);
+s32 ngbevf_rlpml_set_vf(struct ngbe_hw *hw, u16 max_size);
int ngbevf_negotiate_api_version(struct ngbe_hw *hw, int api);
int ngbevf_get_queues(struct ngbe_hw *hw, unsigned int *num_tcs,
unsigned int *default_tc);
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index 28000471b5..f53c17cc82 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -269,6 +269,41 @@ ngbevf_dev_close(struct rte_eth_dev *dev)
return 0;
}
+static int
+ngbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
+{
+ struct ngbe_hw *hw;
+ uint32_t max_frame = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN;
+ struct rte_eth_dev_data *dev_data = dev->data;
+
+ hw = ngbe_dev_hw(dev);
+
+ if (mtu < RTE_ETHER_MIN_MTU ||
+ max_frame > RTE_ETHER_MAX_JUMBO_FRAME_LEN)
+ return -EINVAL;
+
+ /* If device is started, refuse mtu that requires the support of
+* scattered packets when this feature has not been enabled before.
+*/
+ if (dev_data->dev_started && !dev_data->scattered_rx &&
+ (max_frame + 2 * RTE_VLAN_HLEN >
+dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM)) {
+ PMD_INIT_LOG(ERR, "Stop port first.");
+ return -EINVAL;
+ }
+
+ /*
+* When supported by the underlying PF driver, use the NGBE_VF_SET_MTU
+* request of the version 2.0 of the mailbox API.
+* For now, use the NGBE_VF_SET_LPE request of the version 1.0
+* of the mailbox API.
+*/
+ if (ngbevf_rlpml_set_vf(hw, max_frame))
+ return -EINVAL;
+
+ return 0;
+}
+
static int
ngbevf_dev_promiscuous_enable(struct rte_eth_dev *dev)
{
@@ -366,6 +401,7 @@ static const struct eth_dev_ops ngbevf_eth_dev_ops = {
.allmulticast_enable
[PATCH v2 12/15] net/ngbe: add start/stop/reset/close ops for VF device
Add the complete configuration process for start/stop/reset/close ops,
so that applications can enable the device correctly.
Signed-off-by: Zaiyu Wang
---
drivers/net/ngbe/ngbe_ethdev_vf.c | 170 +-
1 file changed, 169 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index 46710f7273..53d7767220 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -553,12 +553,151 @@ ngbevf_dev_configure(struct rte_eth_dev *dev)
return 0;
}
+static int
+ngbevf_dev_start(struct rte_eth_dev *dev)
+{
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
+ uint32_t intr_vector = 0;
+ struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
+ struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
+
+ int err, mask = 0;
+
+ PMD_INIT_FUNC_TRACE();
+
+ err = hw->mac.reset_hw(hw);
+ if (err) {
+ PMD_INIT_LOG(ERR, "Unable to reset vf hardware (%d)", err);
+ return err;
+ }
+ hw->mac.get_link_status = true;
+
+ /* negotiate mailbox API version to use with the PF. */
+ ngbevf_negotiate_api(hw);
+
+ ngbevf_dev_tx_init(dev);
+
+ /* This can fail when allocating mbufs for descriptor rings */
+ err = ngbevf_dev_rx_init(dev);
+
+ /**
+* In this case, reuses the MAC address assigned by VF
+* initialization.
+*/
+ if (err != 0 && err != NGBE_ERR_INVALID_MAC_ADDR) {
+ PMD_INIT_LOG(ERR, "Unable to initialize RX hardware (%d)", err);
+ ngbe_dev_clear_queues(dev);
+ return err;
+ }
+
+ /* Set vfta */
+ ngbevf_set_vfta_all(dev, 1);
+
+ /* Set HW strip */
+ mask = RTE_ETH_VLAN_STRIP_MASK | RTE_ETH_VLAN_FILTER_MASK |
+ RTE_ETH_VLAN_EXTEND_MASK;
+ err = ngbevf_vlan_offload_config(dev, mask);
+ if (err) {
+ PMD_INIT_LOG(ERR, "Unable to set VLAN offload (%d)", err);
+ ngbe_dev_clear_queues(dev);
+ return err;
+ }
+
+ ngbevf_dev_rxtx_start(dev);
+
+ /* check and configure queue intr-vector mapping */
+ if (rte_intr_cap_multiple(intr_handle) &&
+ dev->data->dev_conf.intr_conf.rxq) {
+ /* According to datasheet, only vector 0/1/2 can be used,
+* now only one vector is used for Rx queue
+*/
+ intr_vector = 1;
+ if (rte_intr_efd_enable(intr_handle, intr_vector))
+ return -1;
+ }
+
+ if (rte_intr_dp_is_en(intr_handle)) {
+ if (rte_intr_vec_list_alloc(intr_handle, "intr_vec",
+ dev->data->nb_rx_queues)) {
+ PMD_INIT_LOG(ERR,
+"Failed to allocate %d rx_queues intr_vec",
+dev->data->nb_rx_queues);
+ return -ENOMEM;
+ }
+ }
+
+ ngbevf_configure_msix(dev);
+
+ /* When a VF port is bound to VFIO-PCI, only miscellaneous interrupt
+* is mapped to VFIO vector 0 in eth_ngbevf_dev_init( ).
+* If previous VFIO interrupt mapping setting in eth_ngbevf_dev_init( )
+* is not cleared, it will fail when following rte_intr_enable( ) tries
+* to map Rx queue interrupt to other VFIO vectors.
+* So clear uio/vfio intr/evevnfd first to avoid failure.
+*/
+ rte_intr_disable(intr_handle);
+
+ rte_intr_enable(intr_handle);
+
+ /* Re-enable interrupt for VF */
+ ngbevf_intr_enable(dev);
+
+ /*
+* Update link status right before return, because it may
+* start link configuration process in a separate thread.
+*/
+ ngbevf_dev_link_update(dev, 0);
+
+ hw->adapter_stopped = false;
+
+ return 0;
+}
+
+static int
+ngbevf_dev_stop(struct rte_eth_dev *dev)
+{
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
+ struct ngbe_adapter *adapter = ngbe_dev_adapter(dev);
+ struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
+ struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
+
+ if (hw->adapter_stopped)
+ return 0;
+
+ PMD_INIT_FUNC_TRACE();
+
+ ngbevf_intr_disable(dev);
+
+ hw->adapter_stopped = 1;
+ hw->mac.stop_hw(hw);
+
+ /*
+* Clear what we set, but we still keep shadow_vfta to
+* restore after device starts
+*/
+ ngbevf_set_vfta_all(dev, 0);
+
+ /* Clear stored conf */
+ dev->data->scattered_rx = 0;
+
+ ngbe_dev_clear_queues(dev);
+
+ /* Clean datapath event and queue/vec mapping */
+ rte_intr_efd_disable(intr_handle);
+ rte_intr_vec_list_free(intr_handle);
+
+ adapter->rss_reta_updated = 0;
+
+ return 0;
+}
+
static int
ngbevf_dev_close(struct rte_
[PATCH v2 13/15] net/ngbe: add multicast MAC filter ops for VF device
Add support to update multicast MAC filter.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 1 +
drivers/net/ngbe/base/ngbe_vf.c | 81
drivers/net/ngbe/base/ngbe_vf.h | 3 ++
3 files changed, 85 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 3a45d7ec5f..ceb310e719 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -6,6 +6,7 @@
[Features]
Link status = Y
Unicast MAC filter = Y
+Multicast MAC filter = Y
Rx interrupt = Y
MTU update = Y
Scattered Rx = Y
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
index 52b86afc56..e7b94cd44e 100644
--- a/drivers/net/ngbe/base/ngbe_vf.c
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -179,6 +179,39 @@ s32 ngbe_stop_hw_vf(struct ngbe_hw *hw)
return 0;
}
+/**
+ * ngbe_mta_vector - Determines bit-vector in multicast table to set
+ * @hw: pointer to hardware structure
+ * @mc_addr: the multicast address
+ **/
+STATIC s32 ngbe_mta_vector(struct ngbe_hw *hw, u8 *mc_addr)
+{
+ u32 vector = 0;
+
+ switch (hw->mac.mc_filter_type) {
+ case 0: /* use bits [47:36] of the address */
+ vector = ((mc_addr[4] >> 4) | (((u16)mc_addr[5]) << 4));
+ break;
+ case 1: /* use bits [46:35] of the address */
+ vector = ((mc_addr[4] >> 3) | (((u16)mc_addr[5]) << 5));
+ break;
+ case 2: /* use bits [45:34] of the address */
+ vector = ((mc_addr[4] >> 2) | (((u16)mc_addr[5]) << 6));
+ break;
+ case 3: /* use bits [43:32] of the address */
+ vector = ((mc_addr[4]) | (((u16)mc_addr[5]) << 8));
+ break;
+ default: /* Invalid mc_filter_type */
+ DEBUGOUT("MC filter type param set incorrectly");
+ ASSERT(0);
+ break;
+ }
+
+ /* vector can only be 12-bits or boundary will be exceeded */
+ vector &= 0xFFF;
+ return vector;
+}
+
STATIC s32 ngbevf_write_msg_read_ack(struct ngbe_hw *hw, u32 *msg,
u32 *retmsg, u16 size)
{
@@ -225,6 +258,53 @@ s32 ngbe_set_rar_vf(struct ngbe_hw *hw, u32 index, u8
*addr, u32 vmdq,
return ret_val;
}
+/**
+ * ngbe_update_mc_addr_list_vf - Update Multicast addresses
+ * @hw: pointer to the HW structure
+ * @mc_addr_list: array of multicast addresses to program
+ * @mc_addr_count: number of multicast addresses to program
+ * @next: caller supplied function to return next address in list
+ * @clear: unused
+ *
+ * Updates the Multicast Table Array.
+ **/
+s32 ngbe_update_mc_addr_list_vf(struct ngbe_hw *hw, u8 *mc_addr_list,
+u32 mc_addr_count, ngbe_mc_addr_itr next,
+bool clear)
+{
+ struct ngbe_mbx_info *mbx = &hw->mbx;
+ u32 msgbuf[NGBE_P2VMBX_SIZE];
+ u16 *vector_list = (u16 *)&msgbuf[1];
+ u32 vector;
+ u32 cnt, i;
+ u32 vmdq;
+
+ UNREFERENCED_PARAMETER(clear);
+
+ /* Each entry in the list uses 1 16 bit word. We have 30
+* 16 bit words available in our HW msg buffer (minus 1 for the
+* msg type). That's 30 hash values if we pack 'em right. If
+* there are more than 30 MC addresses to add then punt the
+* extras for now and then add code to handle more than 30 later.
+* It would be unusual for a server to request that many multi-cast
+* addresses except for in large enterprise network environments.
+*/
+
+ DEBUGOUT("MC Addr Count = %d", mc_addr_count);
+
+ cnt = (mc_addr_count > 30) ? 30 : mc_addr_count;
+ msgbuf[0] = NGBE_VF_SET_MULTICAST;
+ msgbuf[0] |= cnt << NGBE_VT_MSGINFO_SHIFT;
+
+ for (i = 0; i < cnt; i++) {
+ vector = ngbe_mta_vector(hw, next(hw, &mc_addr_list, &vmdq));
+ DEBUGOUT("Hash value = 0x%03X", vector);
+ vector_list[i] = (u16)vector;
+ }
+
+ return mbx->write_posted(hw, msgbuf, NGBE_P2VMBX_SIZE, 0);
+}
+
/**
* ngbevf_update_xcast_mode - Update Multicast mode
* @hw: pointer to the HW structure
@@ -570,6 +650,7 @@ s32 ngbe_init_ops_vf(struct ngbe_hw *hw)
/* RAR, Multicast, VLAN */
mac->set_rar = ngbe_set_rar_vf;
mac->set_uc_addr = ngbevf_set_uc_addr_vf;
+ mac->update_mc_addr_list = ngbe_update_mc_addr_list_vf;
mac->update_xcast_mode = ngbevf_update_xcast_mode;
mac->set_vfta = ngbe_set_vfta_vf;
mac->set_rlpml = ngbevf_rlpml_set_vf;
diff --git a/drivers/net/ngbe/base/ngbe_vf.h b/drivers/net/ngbe/base/ngbe_vf.h
index abe1655f8e..5621ca49cb 100644
--- a/drivers/net/ngbe/base/ngbe_vf.h
+++ b/drivers/net/ngbe/base/ngbe_vf.h
@@ -54,6 +54,9 @@ s32 ngbe_check_mac_link_vf(struct ngbe_hw *hw, u32 *speed,
s32 ngbe_set_rar_vf(struct n
[PATCH v2 14/15] net/ngbe: add dump registers ops for VF device
Add support to dump registers for VF device. Currently we only support a
small number of registers. More registers will be added as needed.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 1 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 73
2 files changed, 74 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index ceb310e719..909f1e00f8 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -26,6 +26,7 @@ Rx descriptor status = Y
Tx descriptor status = Y
Basic stats = Y
Extended stats = Y
+Registers dump = Y
Multiprocess aware = Y
Linux= Y
ARMv8= Y
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index 53d7767220..0dfc07a8fd 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -16,6 +16,35 @@
#include "ngbe_rxtx.h"
#include "ngbe_regs_group.h"
+static const struct reg_info ngbevf_regs_general[] = {
+ {NGBE_VFRST, 1, 1, "NGBE_VFRST"},
+ {NGBE_VFSTATUS, 1, 1, "NGBE_VFSTATUS"},
+ {NGBE_VFMBCTL, 1, 1, "NGBE_VFMAILBOX"},
+ {NGBE_VFMBX, 16, 4, "NGBE_VFMBX"},
+ {NGBE_VFPBWRAP, 1, 1, "NGBE_VFPBWRAP"},
+ {0, 0, 0, ""}
+};
+
+static const struct reg_info ngbevf_regs_interrupt[] = {
+ {0, 0, 0, ""}
+};
+
+static const struct reg_info ngbevf_regs_rxdma[] = {
+ {0, 0, 0, ""}
+};
+
+static const struct reg_info ngbevf_regs_tx[] = {
+ {0, 0, 0, ""}
+};
+
+/* VF registers */
+static const struct reg_info *ngbevf_regs[] = {
+ ngbevf_regs_general,
+ ngbevf_regs_interrupt,
+ ngbevf_regs_rxdma,
+ ngbevf_regs_tx,
+ NULL};
+
#define NGBEVF_PMD_NAME "rte_ngbevf_pmd" /* PMD name */
static int ngbevf_dev_close(struct rte_eth_dev *dev);
static int ngbevf_dev_link_update(struct rte_eth_dev *dev,
@@ -1081,6 +1110,49 @@ ngbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
return 0;
}
+static int
+ngbevf_get_reg_length(struct rte_eth_dev *dev __rte_unused)
+{
+ int count = 0;
+ int g_ind = 0;
+ const struct reg_info *reg_group;
+
+ while ((reg_group = ngbevf_regs[g_ind++]))
+ count += ngbe_regs_group_count(reg_group);
+
+ return count;
+}
+
+static int
+ngbevf_get_regs(struct rte_eth_dev *dev,
+ struct rte_dev_reg_info *regs)
+{
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
+ uint32_t *data = regs->data;
+ int g_ind = 0;
+ int count = 0;
+ const struct reg_info *reg_group;
+
+ if (data == NULL) {
+ regs->length = ngbevf_get_reg_length(dev);
+ regs->width = sizeof(uint32_t);
+ return 0;
+ }
+
+ /* Support only full register dump */
+ if (regs->length == 0 ||
+ regs->length == (uint32_t)ngbevf_get_reg_length(dev)) {
+ regs->version = hw->mac.type << 24 | hw->revision_id << 16 |
+ hw->device_id;
+ while ((reg_group = ngbevf_regs[g_ind++]))
+ count += ngbe_read_regs_group(dev, &data[count],
+ reg_group);
+ return 0;
+ }
+
+ return -ENOTSUP;
+}
+
static int
ngbevf_dev_promiscuous_enable(struct rte_eth_dev *dev)
{
@@ -1265,6 +1337,7 @@ static const struct eth_dev_ops ngbevf_eth_dev_ops = {
.mac_addr_add = ngbevf_add_mac_addr,
.mac_addr_remove = ngbevf_remove_mac_addr,
.mac_addr_set = ngbevf_set_default_mac_addr,
+ .get_reg = ngbevf_get_regs,
};
RTE_PMD_REGISTER_PCI(net_ngbe_vf, rte_ngbevf_pmd);
--
2.21.0.windows.1
[PATCH v2 15/15] net/ngbe: add some ops which PF has implemented
Some RXTX operations like queue setup and release, packet type get, and
Tx done cleanup have been supported on PF device. There are ops
functions directly added.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 3 +++
drivers/net/ngbe/ngbe_ethdev_vf.c| 5 +
2 files changed, 8 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 909f1e00f8..3f56e0aa26 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -15,6 +15,7 @@ TSO = Y
Promiscuous mode = Y
Allmulticast mode= Y
VLAN filter = Y
+Inline crypto= Y
CRC offload = P
VLAN offload = P
QinQ offload = P
@@ -22,8 +23,10 @@ L3 checksum offload = P
L4 checksum offload = P
Inner L3 checksum= P
Inner L4 checksum= P
+Packet type parsing = Y
Rx descriptor status = Y
Tx descriptor status = Y
+Free Tx mbuf on demand = Y
Basic stats = Y
Extended stats = Y
Registers dump = Y
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index 0dfc07a8fd..8c74ef308e 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -1324,6 +1324,7 @@ static const struct eth_dev_ops ngbevf_eth_dev_ops = {
.allmulticast_enable = ngbevf_dev_allmulticast_enable,
.allmulticast_disable = ngbevf_dev_allmulticast_disable,
.dev_infos_get= ngbevf_dev_info_get,
+ .dev_supported_ptypes_get = ngbe_dev_supported_ptypes_get,
.mtu_set = ngbevf_dev_set_mtu,
.vlan_filter_set = ngbevf_vlan_filter_set,
.vlan_strip_queue_set = ngbevf_vlan_strip_queue_set,
@@ -1336,8 +1337,12 @@ static const struct eth_dev_ops ngbevf_eth_dev_ops = {
.rx_queue_intr_disable = ngbevf_dev_rx_queue_intr_disable,
.mac_addr_add = ngbevf_add_mac_addr,
.mac_addr_remove = ngbevf_remove_mac_addr,
+ .set_mc_addr_list = ngbe_dev_set_mc_addr_list,
+ .rxq_info_get = ngbe_rxq_info_get,
+ .txq_info_get = ngbe_txq_info_get,
.mac_addr_set = ngbevf_set_default_mac_addr,
.get_reg = ngbevf_get_regs,
+ .tx_done_cleanup = ngbe_dev_tx_done_cleanup,
};
RTE_PMD_REGISTER_PCI(net_ngbe_vf, rte_ngbevf_pmd);
--
2.21.0.windows.1
[PATCH v2 11/15] net/ngbe: add stats and xstats ops for VF device
Add support to get stats and extended stats by reading hardware
registers.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 2 +
drivers/net/ngbe/base/ngbe_vf.h | 32 +++
drivers/net/ngbe/ngbe_ethdev_vf.c| 138 +++
3 files changed, 172 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index fd9c30f559..3a45d7ec5f 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -23,6 +23,8 @@ Inner L3 checksum= P
Inner L4 checksum= P
Rx descriptor status = Y
Tx descriptor status = Y
+Basic stats = Y
+Extended stats = Y
Multiprocess aware = Y
Linux= Y
ARMv8= Y
diff --git a/drivers/net/ngbe/base/ngbe_vf.h b/drivers/net/ngbe/base/ngbe_vf.h
index 5cf225dd35..abe1655f8e 100644
--- a/drivers/net/ngbe/base/ngbe_vf.h
+++ b/drivers/net/ngbe/base/ngbe_vf.h
@@ -11,6 +11,38 @@
#define NGBE_VF_MAX_TX_QUEUES 1
#define NGBE_VF_MAX_RX_QUEUES 1
+struct ngbevf_hw_stats {
+ u64 base_vfgprc;
+ u64 base_vfgptc;
+ u64 base_vfgorc;
+ u64 base_vfgotc;
+ u64 base_vfmprc;
+
+ u64 last_vfgprc;
+ u64 last_vfgptc;
+ u64 last_vfgorc;
+ u64 last_vfgotc;
+ u64 last_vfmprc;
+ u64 last_vfbprc;
+ u64 last_vfmptc;
+ u64 last_vfbptc;
+
+ u64 vfgprc;
+ u64 vfgptc;
+ u64 vfgorc;
+ u64 vfgotc;
+ u64 vfmprc;
+ u64 vfbprc;
+ u64 vfmptc;
+ u64 vfbptc;
+
+ u64 saved_reset_vfgprc;
+ u64 saved_reset_vfgptc;
+ u64 saved_reset_vfgorc;
+ u64 saved_reset_vfgotc;
+ u64 saved_reset_vfmprc;
+};
+
s32 ngbe_init_ops_vf(struct ngbe_hw *hw);
s32 ngbe_init_hw_vf(struct ngbe_hw *hw);
s32 ngbe_start_hw_vf(struct ngbe_hw *hw);
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index 7669eec2db..46710f7273 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -22,6 +22,7 @@ static int ngbevf_dev_link_update(struct rte_eth_dev *dev,
int wait_to_complete);
static void ngbevf_intr_disable(struct rte_eth_dev *dev);
static void ngbevf_intr_enable(struct rte_eth_dev *dev);
+static int ngbevf_dev_stats_reset(struct rte_eth_dev *dev);
static int ngbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask);
static void ngbevf_set_vfta_all(struct rte_eth_dev *dev, bool on);
static void ngbevf_configure_msix(struct rte_eth_dev *dev);
@@ -65,6 +66,13 @@ static const struct rte_eth_desc_lim tx_desc_lim = {
static const struct eth_dev_ops ngbevf_eth_dev_ops;
+static const struct rte_ngbe_xstats_name_off rte_ngbevf_stats_strings[] = {
+ {"rx_multicast_packets", offsetof(struct ngbevf_hw_stats, vfmprc)},
+};
+
+#define NGBEVF_NB_XSTATS (sizeof(rte_ngbevf_stats_strings) / \
+ sizeof(rte_ngbevf_stats_strings[0]))
+
/*
* Negotiate mailbox API version with the PF.
* After reset API version is always set to the basic one (ngbe_mbox_api_10).
@@ -180,6 +188,9 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
/* init_mailbox_params */
hw->mbx.init_params(hw);
+ /* Reset the hw statistics */
+ ngbevf_dev_stats_reset(eth_dev);
+
/* Disable the interrupts for VF */
ngbevf_intr_disable(eth_dev);
@@ -298,6 +309,128 @@ static struct rte_pci_driver rte_ngbevf_pmd = {
.remove = eth_ngbevf_pci_remove,
};
+static int ngbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
+ struct rte_eth_xstat_name *xstats_names, unsigned int limit)
+{
+ unsigned int i;
+
+ if (limit < NGBEVF_NB_XSTATS && xstats_names != NULL)
+ return -ENOMEM;
+
+ if (xstats_names != NULL)
+ for (i = 0; i < NGBEVF_NB_XSTATS; i++)
+ snprintf(xstats_names[i].name,
+ sizeof(xstats_names[i].name),
+ "%s", rte_ngbevf_stats_strings[i].name);
+ return NGBEVF_NB_XSTATS;
+}
+
+static void
+ngbevf_update_stats(struct rte_eth_dev *dev)
+{
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
+ struct ngbevf_hw_stats *hw_stats = (struct ngbevf_hw_stats *)
+ NGBE_DEV_STATS(dev);
+
+ /* Good Rx packet, include VF loopback */
+ NGBE_UPDCNT32(NGBE_QPRXPKT(0),
+ hw_stats->last_vfgprc, hw_stats->vfgprc);
+
+ /* Good Rx octets, include VF loopback */
+ NGBE_UPDCNT36(NGBE_QPRXOCTL(0),
+ hw_stats->last_vfgorc, hw_stats->vfgorc);
+
+ /* Rx Multicst Packet */
+ NGBE_UPDCNT32(NGBE_QPRXMPKT(0),
+ hw_stats->last_vfmprc, hw_stats->vfmprc);
+
+ /* Rx Broadcast Packet */
+ NGBE_UPDCNT32(NGBE_QPRXBPKT(0),
+ hw_stats->last_vfbprc, hw_stats->vfbprc);
+
+ hw->rx_loaded = 0;
+
+ /* Good Tx packet, include VF loopback */
+ N
[PATCH v1 0/2] Update Base code for TXPP Implementation
Updating Base Code for TXPP Feature Implementation. Paul Greenwalt (2): net/ice: add tstamp descriptor net/ice: add Tx Time queue context configuration support drivers/net/ice/base/ice_adminq_cmd.h | 55 +++ drivers/net/ice/base/ice_common.c | 96 +++ drivers/net/ice/base/ice_common.h | 9 +++ drivers/net/ice/base/ice_lan_tx_rx.h | 43 4 files changed, 203 insertions(+) -- 2.43.0
[PATCH v1 2/2] net/ice: add Tx Time queue context configuration support
From: Paul Greenwalt
Tx Packet Pacing (TXPP) functionality is in addition to the Tx LAN queue
flow, so it has a separate Tx Time queue context.
Add Tx Time queue context data structures, and two new related AQCs.
- ice_aq_set_txtimeq (opcode 0x0C35) to set Tx Time queue(s) context
- ice_aq_operate_txtimeq (opcode 0x0C37) to enable/disable Tx Time
queue(s)
Signed-off-by: Paul Greenwalt
Signed-off-by: Soumyadeep Hore
---
drivers/net/ice/base/ice_adminq_cmd.h | 55 +++
drivers/net/ice/base/ice_common.c | 96 +++
drivers/net/ice/base/ice_common.h | 9 +++
drivers/net/ice/base/ice_lan_tx_rx.h | 37 +++
4 files changed, 197 insertions(+)
diff --git a/drivers/net/ice/base/ice_adminq_cmd.h
b/drivers/net/ice/base/ice_adminq_cmd.h
index 3ec207927b..1fa8bbad29 100644
--- a/drivers/net/ice/base/ice_adminq_cmd.h
+++ b/drivers/net/ice/base/ice_adminq_cmd.h
@@ -2975,6 +2975,55 @@ struct ice_aqc_move_txqs_data {
struct ice_aqc_move_txqs_elem txqs[STRUCT_HACK_VAR_LEN];
};
+/* Set Tx Time LAN Queue (indirect 0x0C35) */
+struct ice_aqc_set_txtimeqs {
+ __le16 q_id;
+ __le16 q_amount;
+ u8 reserved[4];
+ __le32 addr_high;
+ __le32 addr_low;
+};
+
+/* This is the descriptor of each queue entry for the Set Tx Time Queue
+ * command (0x0C35). Only used within struct ice_aqc_set_txtime_qgrp.
+ */
+struct ice_aqc_set_txtimeqs_perq {
+ u8 reserved[4];
+ u8 txtime_ctx[25];
+ u8 reserved1[3];
+};
+
+/* The format of the command buffer for Set Tx Time Queue (0x0C35)
+ * is an array of the following structs. Please note that the length of
+ * each struct ice_aqc_set_txtime_qgrp is variable due to the variable
+ * number of queues in each group!
+ */
+struct ice_aqc_set_txtime_qgrp {
+ u8 reserved[8];
+ struct ice_aqc_set_txtimeqs_perq txtimeqs[STRUCT_HACK_VAR_LEN];
+};
+
+/* Operate Tx Time Queue (indirect 0x0C37) */
+struct ice_aqc_ena_dis_txtimeqs {
+ __le16 q_id;
+ __le16 q_amount;
+ u8 cmd_type;
+#define ICE_AQC_TXTIME_CMD_TYPE_S 0
+#define ICE_AQC_TXTIME_CMD_TYPE_M (0x1 << ICE_AQC_Q_CMD_TYPE_S)
+#define ICE_AQC_TXTIME_CMD_TYPE_Q_ENA 1
+ u8 reserved[3];
+ __le32 addr_high;
+ __le32 addr_low;
+};
+#pragma pack(1)
+
+struct ice_aqc_ena_dis_txtime_qgrp {
+ u8 reserved[5];
+ __le16 fail_txtime_q;
+ u8 reserved1[1];
+};
+#pragma pack()
+
/* Download Package (indirect 0x0C40) */
/* Also used for Update Package (indirect 0x0C41 and 0x0C42) */
struct ice_aqc_download_pkg {
@@ -3297,6 +3346,8 @@ struct ice_aq_desc {
struct ice_aqc_add_txqs add_txqs;
struct ice_aqc_dis_txqs dis_txqs;
struct ice_aqc_move_txqs move_txqs;
+ struct ice_aqc_set_txtimeqs set_txtimeqs;
+ struct ice_aqc_ena_dis_txtimeqs operate_txtimeqs;
struct ice_aqc_txqs_cleanup txqs_cleanup;
struct ice_aqc_add_get_update_free_vsi vsi_cmd;
struct ice_aqc_add_update_free_vsi_resp add_update_free_vsi_res;
@@ -3576,6 +3627,10 @@ enum ice_adminq_opc {
ice_aqc_opc_txqs_cleanup= 0x0C31,
ice_aqc_opc_move_recfg_txqs = 0x0C32,
+ /* Tx Time queue commands */
+ ice_aqc_opc_set_txtimeqs= 0x0C35,
+ ice_aqc_opc_ena_dis_txtimeqs= 0x0C37,
+
/* package commands */
ice_aqc_opc_download_pkg= 0x0C40,
ice_aqc_opc_upload_section = 0x0C41,
diff --git a/drivers/net/ice/base/ice_common.c
b/drivers/net/ice/base/ice_common.c
index c8047ca59f..fce9b070cf 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -1660,6 +1660,31 @@ ice_clear_tx_drbell_q_ctx(struct ice_hw *hw, u32
tx_drbell_q_index)
return 0;
}
+/* Tx time Queue Context */
+const struct ice_ctx_ele ice_txtime_ctx_info[] = {
+ /* FieldWidth LSB */
+ ICE_CTX_STORE(ice_txtime_ctx, base, 57, 0),
+ ICE_CTX_STORE(ice_txtime_ctx, pf_num, 3, 57),
+ ICE_CTX_STORE(ice_txtime_ctx, vmvf_num, 10, 60),
+ ICE_CTX_STORE(ice_txtime_ctx, vmvf_type,2, 70),
+ ICE_CTX_STORE(ice_txtime_ctx, src_vsi, 10, 72),
+ ICE_CTX_STORE(ice_txtime_ctx, cpuid,8, 82),
+ ICE_CTX_STORE(ice_txtime_ctx, tphrd_desc, 1, 90),
+ ICE_CTX_STORE(ice_txtime_ctx, qlen, 13, 91),
+ ICE_CTX_STORE(ice_txtime_ctx, timer_num,3, 104),
+ ICE_CTX_STORE(ice_txtime_ctx, txtime_ena_q, 1, 107),
+ ICE_CTX_STORE(ice_txtime_ctx, drbell_mode_32, 1, 108),
+ ICE_CTX_STORE(ice_txtime_ctx, ts_res,
[PATCH v1 1/2] net/ice: add tstamp descriptor
From: Paul Greenwalt
The Tx packet pacing (TXPP) tstamp queue descriptor is a 32bit format.
- Tx queue descriptor ring index, bits 12:0
- Time Stamp, bits 31:13
Add struct ice_ts_desc to hold the 32bit descriptor.
Signed-off-by: Paul Greenwalt
Signed-off-by: Soumyadeep Hore
---
drivers/net/ice/base/ice_lan_tx_rx.h | 6 ++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/ice/base/ice_lan_tx_rx.h
b/drivers/net/ice/base/ice_lan_tx_rx.h
index 209b8e5c43..bcc6e9a716 100644
--- a/drivers/net/ice/base/ice_lan_tx_rx.h
+++ b/drivers/net/ice/base/ice_lan_tx_rx.h
@@ -1269,6 +1269,12 @@ struct ice_tx_drbell_q_ctx {
};
#pragma pack()
+/* Tx time stamp descriptor */
+struct ice_ts_desc {
+ __le32 tx_desc_idx_tstamp;
+};
+#define ICE_TS_DESC(R, i) (&(((struct ice_ts_desc *)((R)->desc))[i]))
+
/* The ice_ptype_lkup table is used to convert from the 10-bit ptype in the
* hardware to a bit-field that can be used by SW to more easily determine the
* packet type.
--
2.43.0
[DPDK/eventdev Bug 1616] libtmp_rte_event_dlb2 sse fails to compile
https://bugs.dpdk.org/show_bug.cgi?id=1616
Bug ID: 1616
Summary: libtmp_rte_event_dlb2 sse fails to compile
Product: DPDK
Version: 24.11
Hardware: x86
OS: All
Status: UNCONFIRMED
Severity: major
Priority: Normal
Component: eventdev
Assignee: dev@dpdk.org
Reporter: i...@semenov.dev
Target Milestone: ---
libtmp_rte_event_dlb2 fails to compile on CPUs without AVX512 support
On CPUs without AVX512 is used file dlb2_sse.c instead of dlb2_avx512.c and it
hasn't been updated in dpdk 24.11.
AVX512 varian is compiling without any issues
FAILED: drivers/libtmp_rte_event_dlb2.a.p/event_dlb2_dlb2_sse.c.o
cc -Idrivers/libtmp_rte_event_dlb2.a.p -Idrivers -I../drivers
-Idrivers/event/dlb2 -I../drivers/event/dlb2 -Ilib/eventdev -I../lib/eventdev
-I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include
-Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include
-I../lib/eal/x86/include -I../kernel/linux -Ilib/eal/common -I../lib/eal/common
-Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log
-Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/ring
-I../lib/ring -Ilib/ethdev -I../lib/ethdev -Ilib/net -I../lib/net -Ilib/mbuf
-I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/meter -I../lib/meter
-Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Ilib/timer -I../lib/timer
-Ilib/cryptodev -I../lib/cryptodev -Ilib/dmadev -I../lib/dmadev -Ilib/pci
-I../lib/pci -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux
-fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra
-std=c11 -O3 -include rte_config.h -Wcast-qual -Wdeprecated -Wformat
-Wformat-nonliteral -Wformat-security -Wmissing-declarations
-Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith
-Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings
-Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC
-march=native -mno-avx512f -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API
-Wno-format-truncation -Wno-address-of-packed-member
-DRTE_LOG_DEFAULT_LOGTYPE=pmd.event.dlb2 -MD -MQ
drivers/libtmp_rte_event_dlb2.a.p/event_dlb2_dlb2_sse.c.o -MF
drivers/libtmp_rte_event_dlb2.a.p/event_dlb2_dlb2_sse.c.o.d -o
drivers/libtmp_rte_event_dlb2.a.p/event_dlb2_dlb2_sse.c.o -c
../drivers/event/dlb2/dlb2_sse.c
../drivers/event/dlb2/dlb2_sse.c: In function 'dlb2_event_build_hcws':
../drivers/event/dlb2/dlb2_sse.c:193:28: error: 'struct dlb2_port' has no
member named 'cq_weight'
193 | if (qm_port->cq_weight) {
|
--
You are receiving this mail because:
You are the assignee for the bug.
[PATCH v3 01/15] net/ngbe: add ethdev probe and remove for VF device
Introduce virtual function driver in ngbe PMD, add simple init and
uninit function to probe and remove the device.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 11 ++
drivers/net/ngbe/base/meson.build| 1 +
drivers/net/ngbe/base/ngbe.h | 1 +
drivers/net/ngbe/base/ngbe_hw.c | 4 +
drivers/net/ngbe/base/ngbe_vf.c | 26 +
drivers/net/ngbe/base/ngbe_vf.h | 13 +++
drivers/net/ngbe/meson.build | 1 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 163 +++
8 files changed, 220 insertions(+)
create mode 100644 doc/guides/nics/features/ngbe_vf.ini
create mode 100644 drivers/net/ngbe/base/ngbe_vf.c
create mode 100644 drivers/net/ngbe/base/ngbe_vf.h
create mode 100644 drivers/net/ngbe/ngbe_ethdev_vf.c
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
new file mode 100644
index 00..71e7b8be81
--- /dev/null
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -0,0 +1,11 @@
+;
+; Supported features of the 'ngbe_vf' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Multiprocess aware = Y
+Linux= Y
+ARMv8= Y
+x86-32 = Y
+x86-64 = Y
\ No newline at end of file
diff --git a/drivers/net/ngbe/base/meson.build
b/drivers/net/ngbe/base/meson.build
index 390b0f9c12..dd68100bf8 100644
--- a/drivers/net/ngbe/base/meson.build
+++ b/drivers/net/ngbe/base/meson.build
@@ -10,6 +10,7 @@ sources = [
'ngbe_phy_rtl.c',
'ngbe_phy_mvl.c',
'ngbe_phy_yt.c',
+'ngbe_vf.c',
]
error_cflags = []
diff --git a/drivers/net/ngbe/base/ngbe.h b/drivers/net/ngbe/base/ngbe.h
index 1d17c2f115..da20829c40 100644
--- a/drivers/net/ngbe/base/ngbe.h
+++ b/drivers/net/ngbe/base/ngbe.h
@@ -11,5 +11,6 @@
#include "ngbe_eeprom.h"
#include "ngbe_phy.h"
#include "ngbe_hw.h"
+#include "ngbe_vf.h"
#endif /* _NGBE_H_ */
diff --git a/drivers/net/ngbe/base/ngbe_hw.c b/drivers/net/ngbe/base/ngbe_hw.c
index 29944f5070..e29a1946e5 100644
--- a/drivers/net/ngbe/base/ngbe_hw.c
+++ b/drivers/net/ngbe/base/ngbe_hw.c
@@ -9,6 +9,7 @@
#include "ngbe_eeprom.h"
#include "ngbe_mng.h"
#include "ngbe_hw.h"
+#include "ngbe_vf.h"
static s32 ngbe_is_lldp(struct ngbe_hw *hw)
{
@@ -2113,6 +2114,9 @@ s32 ngbe_init_shared_code(struct ngbe_hw *hw)
case ngbe_mac_em:
ngbe_init_ops_pf(hw);
break;
+ case ngbe_mac_em_vf:
+ ngbe_init_ops_vf(hw);
+ break;
default:
status = NGBE_ERR_DEVICE_NOT_SUPPORTED;
break;
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
new file mode 100644
index 00..91b8d1bbe2
--- /dev/null
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018-2025 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
+ */
+
+#include "ngbe_type.h"
+#include "ngbe_vf.h"
+
+/**
+ * ngbe_init_ops_vf - Initialize the pointers for vf
+ * @hw: pointer to hardware structure
+ *
+ * This will assign function pointers, adapter-specific functions can
+ * override the assignment of generic function pointers by assigning
+ * their own adapter-specific function pointers.
+ * Does not touch the hardware.
+ **/
+s32 ngbe_init_ops_vf(struct ngbe_hw *hw)
+{
+ struct ngbe_mac_info *mac = &hw->mac;
+
+ mac->max_tx_queues = 1;
+ mac->max_rx_queues = 1;
+
+ return 0;
+}
diff --git a/drivers/net/ngbe/base/ngbe_vf.h b/drivers/net/ngbe/base/ngbe_vf.h
new file mode 100644
index 00..7982ea231e
--- /dev/null
+++ b/drivers/net/ngbe/base/ngbe_vf.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018-2025 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
+ */
+
+#ifndef _NGBE_VF_H_
+#define _NGBE_VF_H_
+
+#include "ngbe_type.h"
+
+s32 ngbe_init_ops_vf(struct ngbe_hw *hw);
+
+#endif /* __NGBE_VF_H__ */
diff --git a/drivers/net/ngbe/meson.build b/drivers/net/ngbe/meson.build
index 402cea1c13..f4f8f7ee79 100644
--- a/drivers/net/ngbe/meson.build
+++ b/drivers/net/ngbe/meson.build
@@ -15,6 +15,7 @@ sources = files(
'ngbe_ptypes.c',
'ngbe_pf.c',
'ngbe_rxtx.c',
+'ngbe_ethdev_vf.c',
)
deps += ['hash']
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
new file mode 100644
index 00..164a97fac1
--- /dev/null
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -0,0 +1,163 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018-2025 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "ngbe_logs.h"
+#include "base/ngbe.h"
+#include "ngbe_ethdev.h"
+#include "ngbe_rxtx.h"
+#include "ngbe_regs_
[PATCH v3 00/15] net/ngbe: add VF driver support
This patch adds support to VF device for ngbe PMD. --- v2: - update description of patch content - fix build issue - formatting and cleanup --- v3: - fix Intel-compilation error --- Zaiyu Wang (15): net/ngbe: add ethdev probe and remove for VF device net/ngbe: add support for PF-VF mailbox interface net/ngbe: add hardware configuration code for VF device net/ngbe: add promiscuous and allmulticast ops for VF device net/ngbe: add set MTU ops for VF device net/ngbe: add add/remove/set mac addr ops for VF device net/ngbe: add datapath init code for VF device net/ngbe: add VLAN related ops for VF device net/ngbe: add interrupt support for VF device net/ngbe: add link update ops for VF device net/ngbe: add stats and xstats ops for VF device net/ngbe: add start/stop/reset/close ops for VF device net/ngbe: add multicast MAC filter ops for VF device net/ngbe: add dump registers ops for VF device net/ngbe: add some ops which PF has implemented doc/guides/nics/features/ngbe_vf.ini | 37 + doc/guides/nics/ngbe.rst | 11 + drivers/net/ngbe/base/meson.build|1 + drivers/net/ngbe/base/ngbe.h |1 + drivers/net/ngbe/base/ngbe_hw.c |4 + drivers/net/ngbe/base/ngbe_mbx.c | 338 +++ drivers/net/ngbe/base/ngbe_mbx.h | 31 + drivers/net/ngbe/base/ngbe_type.h| 15 + drivers/net/ngbe/base/ngbe_vf.c | 671 + drivers/net/ngbe/base/ngbe_vf.h | 68 ++ drivers/net/ngbe/meson.build |1 + drivers/net/ngbe/ngbe_ethdev.h |6 + drivers/net/ngbe/ngbe_ethdev_vf.c| 1353 ++ drivers/net/ngbe/ngbe_rxtx.c | 209 14 files changed, 2746 insertions(+) create mode 100644 doc/guides/nics/features/ngbe_vf.ini create mode 100644 drivers/net/ngbe/base/ngbe_vf.c create mode 100644 drivers/net/ngbe/base/ngbe_vf.h create mode 100644 drivers/net/ngbe/ngbe_ethdev_vf.c -- 2.21.0.windows.1
[PATCH v3 03/15] net/ngbe: add hardware configuration code for VF device
Add basic hardware configure flow and device information statement.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 7 +
drivers/net/ngbe/base/ngbe_mbx.h | 2 +
drivers/net/ngbe/base/ngbe_type.h| 5 +
drivers/net/ngbe/base/ngbe_vf.c | 235 +++
drivers/net/ngbe/base/ngbe_vf.h | 9 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 114 +
6 files changed, 372 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 71e7b8be81..4335efb812 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -4,6 +4,13 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+CRC offload = P
+VLAN offload = P
+QinQ offload = P
+L3 checksum offload = P
+L4 checksum offload = P
+Inner L3 checksum= P
+Inner L4 checksum= P
Multiprocess aware = Y
Linux= Y
ARMv8= Y
diff --git a/drivers/net/ngbe/base/ngbe_mbx.h b/drivers/net/ngbe/base/ngbe_mbx.h
index 83561fd4cf..27e977737d 100644
--- a/drivers/net/ngbe/base/ngbe_mbx.h
+++ b/drivers/net/ngbe/base/ngbe_mbx.h
@@ -57,6 +57,8 @@ enum ngbe_pfvf_api_rev {
#define NGBE_VF_GET_RSS_KEY0x0b/* get RSS key */
#define NGBE_VF_UPDATE_XCAST_MODE 0x0c
+#define NGBE_VF_BACKUP 0x8001 /* VF requests backup */
+
/* mode choices for NGBE_VF_UPDATE_XCAST_MODE */
enum ngbevf_xcast_modes {
NGBEVF_XCAST_MODE_NONE = 0,
diff --git a/drivers/net/ngbe/base/ngbe_type.h
b/drivers/net/ngbe/base/ngbe_type.h
index 35ebb7208a..4fd7080847 100644
--- a/drivers/net/ngbe/base/ngbe_type.h
+++ b/drivers/net/ngbe/base/ngbe_type.h
@@ -8,6 +8,9 @@
#define NGBE_LINK_UP_TIME 90 /* 9.0 Seconds */
+#define NGBE_RX_HDR_SIZE 256
+#define NGBE_RX_BUF_SIZE 2048
+
#define NGBE_FRAME_SIZE_MAX (9728) /* Maximum frame size, +FCS */
#define NGBE_FRAME_SIZE_DFT (1518) /* Default frame size, +FCS */
#define NGBE_NUM_POOL (32)
@@ -17,6 +20,7 @@
#define NGBE_MAX_QP (8)
#define NGBE_MAX_UTA 128
+#define NGBE_VF_INIT_TIMEOUT 200 /* Number of retries to clear RSTI */
#define NGBE_PCI_MASTER_DISABLE_TIMEOUT800
#define NGBE_SPI_TIMEOUT 1
@@ -480,6 +484,7 @@ struct ngbe_hw {
u32 q_tx_regs[8 * 4];
u32 gphy_efuse[2];
bool offset_loaded;
+ bool rx_loaded;
bool is_pf;
bool gpio_ctl;
bool lsc;
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
index 12aa3bca1a..7c8b082f97 100644
--- a/drivers/net/ngbe/base/ngbe_vf.c
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -7,6 +7,178 @@
#include "ngbe_mbx.h"
#include "ngbe_vf.h"
+/* ngbe_virt_clr_reg - Set register to default (power on) state.
+ * @hw: pointer to hardware structure
+ */
+static void ngbe_virt_clr_reg(struct ngbe_hw *hw)
+{
+ u32 vfsrrctl;
+
+ /* default values (BUF_SIZE = 2048, HDR_SIZE = 256) */
+ vfsrrctl = NGBE_RXCFG_HDRLEN(NGBE_RX_HDR_SIZE);
+ vfsrrctl |= NGBE_RXCFG_PKTLEN(NGBE_RX_BUF_SIZE);
+
+ wr32m(hw, NGBE_RXCFG(0),
+ (NGBE_RXCFG_HDRLEN_MASK | NGBE_RXCFG_PKTLEN_MASK),
+ vfsrrctl);
+
+
+ ngbe_flush(hw);
+}
+
+/**
+ * ngbe_start_hw_vf - Prepare hardware for Tx/Rx
+ * @hw: pointer to hardware structure
+ *
+ * Starts the hardware by filling the bus info structure and media type,
clears
+ * all on chip counters, initializes receive address registers, multicast
+ * table, VLAN filter table, calls routine to set up link and flow control
+ * settings, and leaves transmit and receive units disabled and uninitialized
+ **/
+s32 ngbe_start_hw_vf(struct ngbe_hw *hw)
+{
+ /* Clear adapter stopped flag */
+ hw->adapter_stopped = false;
+
+ return 0;
+}
+
+/**
+ * ngbe_init_hw_vf - virtual function hardware initialization
+ * @hw: pointer to hardware structure
+ *
+ * Initialize the hardware by resetting the hardware and then starting
+ * the hardware
+ **/
+s32 ngbe_init_hw_vf(struct ngbe_hw *hw)
+{
+ s32 status = hw->mac.start_hw(hw);
+
+ hw->mac.get_mac_addr(hw, hw->mac.addr);
+
+ return status;
+}
+
+/**
+ * ngbe_reset_hw_vf - Performs hardware reset
+ * @hw: pointer to hardware structure
+ *
+ * Resets the hardware by resetting the transmit and receive units, masks and
+ * clears all interrupts.
+ **/
+s32 ngbe_reset_hw_vf(struct ngbe_hw *hw)
+{
+ struct ngbe_mbx_info *mbx = &hw->mbx;
+ u32 timeout = NGBE_VF_INIT_TIMEOUT;
+ s32 ret_val = NGBE_ERR_INVALID_MAC_ADDR;
+ u32 msgbuf[NGBE_VF_PERMADDR_MSG_LEN];
+ u8 *addr = (u8 *)(&msgbuf[1]);
+
+ /* Call adapter stop to disable tx/rx and clear interrupts */
+ hw->mac.stop_hw(hw);
+
+ /* reset the api version */
+ hw->api_version = ngbe_mbox_api_10;
+
+ /* backup msix vectors */
+ mbx->timeout
[PATCH v3 02/15] net/ngbe: add support for PF-VF mailbox interface
Add basic code of PF-VF mailbox implementation to serve the communication
between VF and PF devices.
Signed-off-by: Zaiyu Wang
---
drivers/net/ngbe/base/ngbe_mbx.c | 338 ++
drivers/net/ngbe/base/ngbe_mbx.h | 29 +++
drivers/net/ngbe/base/ngbe_type.h | 7 +
drivers/net/ngbe/base/ngbe_vf.c | 56 +
drivers/net/ngbe/base/ngbe_vf.h | 1 +
5 files changed, 431 insertions(+)
diff --git a/drivers/net/ngbe/base/ngbe_mbx.c b/drivers/net/ngbe/base/ngbe_mbx.c
index bc0adbb3ec..a96a4aced7 100644
--- a/drivers/net/ngbe/base/ngbe_mbx.c
+++ b/drivers/net/ngbe/base/ngbe_mbx.c
@@ -109,6 +109,344 @@ s32 ngbe_check_for_rst(struct ngbe_hw *hw, u16 mbx_id)
return ret_val;
}
+/**
+ * ngbe_poll_for_msg - Wait for message notification
+ * @hw: pointer to the HW structure
+ * @mbx_id: id of mailbox to write
+ *
+ * returns SUCCESS if it successfully received a message notification
+ **/
+STATIC s32 ngbe_poll_for_msg(struct ngbe_hw *hw, u16 mbx_id)
+{
+ struct ngbe_mbx_info *mbx = &hw->mbx;
+ int countdown = mbx->timeout;
+
+ if (!countdown || !mbx->check_for_msg)
+ goto out;
+
+ while (countdown && mbx->check_for_msg(hw, mbx_id)) {
+ countdown--;
+ if (!countdown)
+ break;
+ usec_delay(mbx->usec_delay);
+ }
+
+ if (countdown == 0)
+ DEBUGOUT("Polling for VF%d mailbox message timedout", mbx_id);
+
+out:
+ return countdown ? 0 : NGBE_ERR_MBX;
+}
+
+/**
+ * ngbe_poll_for_ack - Wait for message acknowledgment
+ * @hw: pointer to the HW structure
+ * @mbx_id: id of mailbox to write
+ *
+ * returns SUCCESS if it successfully received a message acknowledgment
+ **/
+STATIC s32 ngbe_poll_for_ack(struct ngbe_hw *hw, u16 mbx_id)
+{
+ struct ngbe_mbx_info *mbx = &hw->mbx;
+ int countdown = mbx->timeout;
+
+ if (!countdown || !mbx->check_for_ack)
+ goto out;
+
+ while (countdown && mbx->check_for_ack(hw, mbx_id)) {
+ countdown--;
+ if (!countdown)
+ break;
+ usec_delay(mbx->usec_delay);
+ }
+
+ if (countdown == 0)
+ DEBUGOUT("Polling for VF%d mailbox ack timedout", mbx_id);
+
+out:
+ return countdown ? 0 : NGBE_ERR_MBX;
+}
+
+/**
+ * ngbe_read_posted_mbx - Wait for message notification and receive message
+ * @hw: pointer to the HW structure
+ * @msg: The message buffer
+ * @size: Length of buffer
+ * @mbx_id: id of mailbox to write
+ *
+ * returns SUCCESS if it successfully received a message notification and
+ * copied it into the receive buffer.
+ **/
+s32 ngbe_read_posted_mbx(struct ngbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
+{
+ struct ngbe_mbx_info *mbx = &hw->mbx;
+ s32 ret_val = NGBE_ERR_MBX;
+
+ if (!mbx->read)
+ goto out;
+
+ ret_val = ngbe_poll_for_msg(hw, mbx_id);
+
+ /* if ack received read message, otherwise we timed out */
+ if (!ret_val)
+ ret_val = mbx->read(hw, msg, size, mbx_id);
+out:
+ return ret_val;
+}
+
+/**
+ * ngbe_write_posted_mbx - Write a message to the mailbox, wait for ack
+ * @hw: pointer to the HW structure
+ * @msg: The message buffer
+ * @size: Length of buffer
+ * @mbx_id: id of mailbox to write
+ *
+ * returns SUCCESS if it successfully copied message into the buffer and
+ * received an ack to that message within delay * timeout period
+ **/
+s32 ngbe_write_posted_mbx(struct ngbe_hw *hw, u32 *msg, u16 size,
+ u16 mbx_id)
+{
+ struct ngbe_mbx_info *mbx = &hw->mbx;
+ s32 ret_val = NGBE_ERR_MBX;
+
+ /* exit if either we can't write or there isn't a defined timeout */
+ if (!mbx->write || !mbx->timeout)
+ goto out;
+
+ /* send msg */
+ ret_val = mbx->write(hw, msg, size, mbx_id);
+
+ /* if msg sent wait until we receive an ack */
+ if (!ret_val)
+ ret_val = ngbe_poll_for_ack(hw, mbx_id);
+out:
+ return ret_val;
+}
+
+/**
+ * ngbe_read_v2p_mailbox - read v2p mailbox
+ * @hw: pointer to the HW structure
+ *
+ * This function is used to read the v2p mailbox without losing the read to
+ * clear status bits.
+ **/
+STATIC u32 ngbe_read_v2p_mailbox(struct ngbe_hw *hw)
+{
+ u32 v2p_mailbox = rd32(hw, NGBE_VFMBCTL);
+
+ v2p_mailbox |= hw->mbx.v2p_mailbox;
+ hw->mbx.v2p_mailbox |= v2p_mailbox & NGBE_VFMBCTL_R2C_BITS;
+
+ return v2p_mailbox;
+}
+
+/**
+ * ngbe_check_for_bit_vf - Determine if a status bit was set
+ * @hw: pointer to the HW structure
+ * @mask: bitmask for bits to be tested and cleared
+ *
+ * This function is used to check for the read to clear bits within
+ * the V2P mailbox.
+ **/
+STATIC s32 ngbe_check_for_bit_vf(struct ngbe_hw *hw, u32 mask)
+{
+ u32 v2p_mailbox = ngbe_read_v2p_mailbox(hw);
+ s32 ret_val = NGBE_ERR_MBX;
+
+ if (v2p_
[PATCH v3 04/15] net/ngbe: add promiscuous and allmulticast ops for VF device
Support to enable and disable promiscuous and allmulticast mode on VF
device.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 2 +
drivers/net/ngbe/base/ngbe_type.h| 1 +
drivers/net/ngbe/base/ngbe_vf.c | 39 +++
drivers/net/ngbe/base/ngbe_vf.h | 1 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 96
5 files changed, 139 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 4335efb812..f8928c5a6c 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -4,6 +4,8 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+Promiscuous mode = Y
+Allmulticast mode= Y
CRC offload = P
VLAN offload = P
QinQ offload = P
diff --git a/drivers/net/ngbe/base/ngbe_type.h
b/drivers/net/ngbe/base/ngbe_type.h
index 4fd7080847..29dcd5f912 100644
--- a/drivers/net/ngbe/base/ngbe_type.h
+++ b/drivers/net/ngbe/base/ngbe_type.h
@@ -351,6 +351,7 @@ struct ngbe_mac_info {
void (*set_mac_anti_spoofing)(struct ngbe_hw *hw, bool enable, int vf);
void (*set_vlan_anti_spoofing)(struct ngbe_hw *hw,
bool enable, int vf);
+ s32 (*update_xcast_mode)(struct ngbe_hw *hw, int xcast_mode);
/* Flow Control */
s32 (*fc_enable)(struct ngbe_hw *hw);
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
index 7c8b082f97..ccf7148b9c 100644
--- a/drivers/net/ngbe/base/ngbe_vf.c
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -191,6 +191,43 @@ STATIC s32 ngbevf_write_msg_read_ack(struct ngbe_hw *hw,
u32 *msg,
return mbx->read_posted(hw, retmsg, size, 0);
}
+/**
+ * ngbevf_update_xcast_mode - Update Multicast mode
+ * @hw: pointer to the HW structure
+ * @xcast_mode: new multicast mode
+ *
+ * Updates the Multicast Mode of VF.
+ **/
+s32 ngbevf_update_xcast_mode(struct ngbe_hw *hw, int xcast_mode)
+{
+ u32 msgbuf[2];
+ s32 err;
+
+ switch (hw->api_version) {
+ case ngbe_mbox_api_12:
+ /* New modes were introduced in 1.3 version */
+ if (xcast_mode > NGBEVF_XCAST_MODE_ALLMULTI)
+ return NGBE_ERR_FEATURE_NOT_SUPPORTED;
+ /* Fall through */
+ case ngbe_mbox_api_13:
+ break;
+ default:
+ return NGBE_ERR_FEATURE_NOT_SUPPORTED;
+ }
+
+ msgbuf[0] = NGBE_VF_UPDATE_XCAST_MODE;
+ msgbuf[1] = xcast_mode;
+
+ err = ngbevf_write_msg_read_ack(hw, msgbuf, msgbuf, 2);
+ if (err)
+ return err;
+
+ msgbuf[0] &= ~NGBE_VT_MSGTYPE_CTS;
+ if (msgbuf[0] == (NGBE_VF_UPDATE_XCAST_MODE | NGBE_VT_MSGTYPE_NACK))
+ return NGBE_ERR_FEATURE_NOT_SUPPORTED;
+ return 0;
+}
+
/**
* ngbevf_negotiate_api_version - Negotiate supported API version
* @hw: pointer to the HW structure
@@ -301,6 +338,8 @@ s32 ngbe_init_ops_vf(struct ngbe_hw *hw)
mac->stop_hw = ngbe_stop_hw_vf;
mac->negotiate_api_version = ngbevf_negotiate_api_version;
+ mac->update_xcast_mode = ngbevf_update_xcast_mode;
+
mac->max_tx_queues = 1;
mac->max_rx_queues = 1;
diff --git a/drivers/net/ngbe/base/ngbe_vf.h b/drivers/net/ngbe/base/ngbe_vf.h
index da846dda45..79891e8389 100644
--- a/drivers/net/ngbe/base/ngbe_vf.h
+++ b/drivers/net/ngbe/base/ngbe_vf.h
@@ -16,6 +16,7 @@ s32 ngbe_init_hw_vf(struct ngbe_hw *hw);
s32 ngbe_start_hw_vf(struct ngbe_hw *hw);
s32 ngbe_reset_hw_vf(struct ngbe_hw *hw);
s32 ngbe_stop_hw_vf(struct ngbe_hw *hw);
+s32 ngbevf_update_xcast_mode(struct ngbe_hw *hw, int xcast_mode);
int ngbevf_negotiate_api_version(struct ngbe_hw *hw, int api);
int ngbevf_get_queues(struct ngbe_hw *hw, unsigned int *num_tcs,
unsigned int *default_tc);
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index ed8400f6ed..28000471b5 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -18,6 +18,8 @@
#define NGBEVF_PMD_NAME "rte_ngbevf_pmd" /* PMD name */
static int ngbevf_dev_close(struct rte_eth_dev *dev);
+static int ngbevf_dev_promiscuous_enable(struct rte_eth_dev *dev);
+static int ngbevf_dev_promiscuous_disable(struct rte_eth_dev *dev);
/*
* The set of PCI devices this driver supports (for VF)
@@ -155,6 +157,9 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
return -EIO;
}
+ /* enter promiscuous mode */
+ ngbevf_dev_promiscuous_enable(eth_dev);
+
PMD_INIT_LOG(DEBUG, "port %d vendorID=0x%x deviceID=0x%x mac.type=%s",
eth_dev->data->port_id, pci_dev->id.vendor_id,
pci_dev->id.device_id, "ngbe_mac_sp_vf");
@@ -264,11 +269,102 @@ ngbevf_dev_close(struct rte_eth_dev *dev)
return 0;
}
+static int
+ngbevf_dev_promiscuous_enable(struct
[PATCH v3 05/15] net/ngbe: add set MTU ops for VF device
Support to update MTU for VF device.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 1 +
drivers/net/ngbe/base/ngbe_type.h| 1 +
drivers/net/ngbe/base/ngbe_vf.c | 24 +++
drivers/net/ngbe/base/ngbe_vf.h | 1 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 36
5 files changed, 63 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index f8928c5a6c..570b5ac25b 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -4,6 +4,7 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+MTU update = Y
Promiscuous mode = Y
Allmulticast mode= Y
CRC offload = P
diff --git a/drivers/net/ngbe/base/ngbe_type.h
b/drivers/net/ngbe/base/ngbe_type.h
index 29dcd5f912..f780b92efa 100644
--- a/drivers/net/ngbe/base/ngbe_type.h
+++ b/drivers/net/ngbe/base/ngbe_type.h
@@ -352,6 +352,7 @@ struct ngbe_mac_info {
void (*set_vlan_anti_spoofing)(struct ngbe_hw *hw,
bool enable, int vf);
s32 (*update_xcast_mode)(struct ngbe_hw *hw, int xcast_mode);
+ s32 (*set_rlpml)(struct ngbe_hw *hw, u16 max_size);
/* Flow Control */
s32 (*fc_enable)(struct ngbe_hw *hw);
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
index ccf7148b9c..c0436c7b8a 100644
--- a/drivers/net/ngbe/base/ngbe_vf.c
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -228,6 +228,29 @@ s32 ngbevf_update_xcast_mode(struct ngbe_hw *hw, int
xcast_mode)
return 0;
}
+/**
+ * ngbevf_rlpml_set_vf - Set the maximum receive packet length
+ * @hw: pointer to the HW structure
+ * @max_size: value to assign to max frame size
+ **/
+s32 ngbevf_rlpml_set_vf(struct ngbe_hw *hw, u16 max_size)
+{
+ u32 msgbuf[2];
+ s32 retval;
+
+ msgbuf[0] = NGBE_VF_SET_LPE;
+ msgbuf[1] = max_size;
+
+ retval = ngbevf_write_msg_read_ack(hw, msgbuf, msgbuf, 2);
+ if (retval)
+ return retval;
+ if ((msgbuf[0] & NGBE_VF_SET_LPE) &&
+ (msgbuf[0] & NGBE_VT_MSGTYPE_NACK))
+ return NGBE_ERR_MBX;
+
+ return 0;
+}
+
/**
* ngbevf_negotiate_api_version - Negotiate supported API version
* @hw: pointer to the HW structure
@@ -339,6 +362,7 @@ s32 ngbe_init_ops_vf(struct ngbe_hw *hw)
mac->negotiate_api_version = ngbevf_negotiate_api_version;
mac->update_xcast_mode = ngbevf_update_xcast_mode;
+ mac->set_rlpml = ngbevf_rlpml_set_vf;
mac->max_tx_queues = 1;
mac->max_rx_queues = 1;
diff --git a/drivers/net/ngbe/base/ngbe_vf.h b/drivers/net/ngbe/base/ngbe_vf.h
index 79891e8389..a64de9d332 100644
--- a/drivers/net/ngbe/base/ngbe_vf.h
+++ b/drivers/net/ngbe/base/ngbe_vf.h
@@ -17,6 +17,7 @@ s32 ngbe_start_hw_vf(struct ngbe_hw *hw);
s32 ngbe_reset_hw_vf(struct ngbe_hw *hw);
s32 ngbe_stop_hw_vf(struct ngbe_hw *hw);
s32 ngbevf_update_xcast_mode(struct ngbe_hw *hw, int xcast_mode);
+s32 ngbevf_rlpml_set_vf(struct ngbe_hw *hw, u16 max_size);
int ngbevf_negotiate_api_version(struct ngbe_hw *hw, int api);
int ngbevf_get_queues(struct ngbe_hw *hw, unsigned int *num_tcs,
unsigned int *default_tc);
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index 28000471b5..f53c17cc82 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -269,6 +269,41 @@ ngbevf_dev_close(struct rte_eth_dev *dev)
return 0;
}
+static int
+ngbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
+{
+ struct ngbe_hw *hw;
+ uint32_t max_frame = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN;
+ struct rte_eth_dev_data *dev_data = dev->data;
+
+ hw = ngbe_dev_hw(dev);
+
+ if (mtu < RTE_ETHER_MIN_MTU ||
+ max_frame > RTE_ETHER_MAX_JUMBO_FRAME_LEN)
+ return -EINVAL;
+
+ /* If device is started, refuse mtu that requires the support of
+* scattered packets when this feature has not been enabled before.
+*/
+ if (dev_data->dev_started && !dev_data->scattered_rx &&
+ (max_frame + 2 * RTE_VLAN_HLEN >
+dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM)) {
+ PMD_INIT_LOG(ERR, "Stop port first.");
+ return -EINVAL;
+ }
+
+ /*
+* When supported by the underlying PF driver, use the NGBE_VF_SET_MTU
+* request of the version 2.0 of the mailbox API.
+* For now, use the NGBE_VF_SET_LPE request of the version 1.0
+* of the mailbox API.
+*/
+ if (ngbevf_rlpml_set_vf(hw, max_frame))
+ return -EINVAL;
+
+ return 0;
+}
+
static int
ngbevf_dev_promiscuous_enable(struct rte_eth_dev *dev)
{
@@ -366,6 +401,7 @@ static const struct eth_dev_ops ngbevf_eth_dev_ops = {
.allmulticast_enable
[PATCH v3 06/15] net/ngbe: add add/remove/set mac addr ops for VF device
Generate a random MAC address if none was assigned by PF during
the initialization of VF device. And support to add and remove
MAC address.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 1 +
drivers/net/ngbe/base/ngbe_type.h| 1 +
drivers/net/ngbe/base/ngbe_vf.c | 83 +++
drivers/net/ngbe/base/ngbe_vf.h | 4 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 146 +++
5 files changed, 235 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 570b5ac25b..6f16f2b079 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -4,6 +4,7 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+Unicast MAC filter = Y
MTU update = Y
Promiscuous mode = Y
Allmulticast mode= Y
diff --git a/drivers/net/ngbe/base/ngbe_type.h
b/drivers/net/ngbe/base/ngbe_type.h
index f780b92efa..7a3b52ffd4 100644
--- a/drivers/net/ngbe/base/ngbe_type.h
+++ b/drivers/net/ngbe/base/ngbe_type.h
@@ -335,6 +335,7 @@ struct ngbe_mac_info {
/* RAR */
s32 (*set_rar)(struct ngbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
u32 enable_addr);
+ s32 (*set_uc_addr)(struct ngbe_hw *hw, u32 index, u8 *addr);
s32 (*clear_rar)(struct ngbe_hw *hw, u32 index);
s32 (*set_vmdq)(struct ngbe_hw *hw, u32 rar, u32 vmdq);
s32 (*clear_vmdq)(struct ngbe_hw *hw, u32 rar, u32 vmdq);
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
index c0436c7b8a..47fee7e14d 100644
--- a/drivers/net/ngbe/base/ngbe_vf.c
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -191,6 +191,40 @@ STATIC s32 ngbevf_write_msg_read_ack(struct ngbe_hw *hw,
u32 *msg,
return mbx->read_posted(hw, retmsg, size, 0);
}
+/**
+ * ngbe_set_rar_vf - set device MAC address
+ * @hw: pointer to hardware structure
+ * @index: Receive address register to write
+ * @addr: Address to put into receive address register
+ * @vmdq: VMDq "set" or "pool" index
+ * @enable_addr: set flag that address is active
+ **/
+s32 ngbe_set_rar_vf(struct ngbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
+u32 enable_addr)
+{
+ u32 msgbuf[3];
+ u8 *msg_addr = (u8 *)(&msgbuf[1]);
+ s32 ret_val;
+
+ UNREFERENCED_PARAMETER(vmdq, enable_addr, index);
+
+ memset(msgbuf, 0, 12);
+ msgbuf[0] = NGBE_VF_SET_MAC_ADDR;
+ memcpy(msg_addr, addr, 6);
+ ret_val = ngbevf_write_msg_read_ack(hw, msgbuf, msgbuf, 3);
+
+ msgbuf[0] &= ~NGBE_VT_MSGTYPE_CTS;
+
+ /* if nacked the address was rejected, use "perm_addr" */
+ if (!ret_val &&
+ (msgbuf[0] == (NGBE_VF_SET_MAC_ADDR | NGBE_VT_MSGTYPE_NACK))) {
+ ngbe_get_mac_addr_vf(hw, hw->mac.addr);
+ return NGBE_ERR_MBX;
+ }
+
+ return ret_val;
+}
+
/**
* ngbevf_update_xcast_mode - Update Multicast mode
* @hw: pointer to the HW structure
@@ -228,6 +262,51 @@ s32 ngbevf_update_xcast_mode(struct ngbe_hw *hw, int
xcast_mode)
return 0;
}
+/**
+ * ngbe_get_mac_addr_vf - Read device MAC address
+ * @hw: pointer to the HW structure
+ * @mac_addr: the MAC address
+ **/
+s32 ngbe_get_mac_addr_vf(struct ngbe_hw *hw, u8 *mac_addr)
+{
+ int i;
+
+ for (i = 0; i < ETH_ADDR_LEN; i++)
+ mac_addr[i] = hw->mac.perm_addr[i];
+
+ return 0;
+}
+
+s32 ngbevf_set_uc_addr_vf(struct ngbe_hw *hw, u32 index, u8 *addr)
+{
+ u32 msgbuf[3], msgbuf_chk;
+ u8 *msg_addr = (u8 *)(&msgbuf[1]);
+ s32 ret_val;
+
+ memset(msgbuf, 0, sizeof(msgbuf));
+ /*
+* If index is one then this is the start of a new list and needs
+* indication to the PF so it can do it's own list management.
+* If it is zero then that tells the PF to just clear all of
+* this VF's macvlans and there is no new list.
+*/
+ msgbuf[0] |= index << NGBE_VT_MSGINFO_SHIFT;
+ msgbuf[0] |= NGBE_VF_SET_MACVLAN;
+ msgbuf_chk = msgbuf[0];
+ if (addr)
+ memcpy(msg_addr, addr, 6);
+
+ ret_val = ngbevf_write_msg_read_ack(hw, msgbuf, msgbuf, 3);
+ if (!ret_val) {
+ msgbuf[0] &= ~NGBE_VT_MSGTYPE_CTS;
+
+ if (msgbuf[0] == (msgbuf_chk | NGBE_VT_MSGTYPE_NACK))
+ return NGBE_ERR_OUT_OF_MEM;
+ }
+
+ return ret_val;
+}
+
/**
* ngbevf_rlpml_set_vf - Set the maximum receive packet length
* @hw: pointer to the HW structure
@@ -359,8 +438,12 @@ s32 ngbe_init_ops_vf(struct ngbe_hw *hw)
mac->reset_hw = ngbe_reset_hw_vf;
mac->start_hw = ngbe_start_hw_vf;
mac->stop_hw = ngbe_stop_hw_vf;
+ mac->get_mac_addr = ngbe_get_mac_addr_vf;
mac->negotiate_api_version = ngbevf_negotiate_api_version;
+ /* RAR, Multicast */
+ mac->set_rar = ngbe_set_rar_vf;
+ mac->set_uc_addr = ng
[PATCH v3 10/15] net/ngbe: add link update ops for VF device
Add support to check link feature for VF device, including link speed,
duplex mode and link state.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 1 +
drivers/net/ngbe/base/ngbe_vf.c | 96
drivers/net/ngbe/base/ngbe_vf.h | 2 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 9 +++
4 files changed, 108 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 0fde7f9563..fd9c30f559 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -4,6 +4,7 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+Link status = Y
Unicast MAC filter = Y
Rx interrupt = Y
MTU update = Y
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
index 039f87423d..52b86afc56 100644
--- a/drivers/net/ngbe/base/ngbe_vf.c
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -337,6 +337,99 @@ s32 ngbevf_set_uc_addr_vf(struct ngbe_hw *hw, u32 index,
u8 *addr)
return ret_val;
}
+/**
+ * ngbe_check_mac_link_vf - Get link/speed status
+ * @hw: pointer to hardware structure
+ * @speed: pointer to link speed
+ * @link_up: true is link is up, false otherwise
+ * @autoneg_wait_to_complete: true when waiting for completion is needed
+ *
+ * Reads the links register to determine if link is up and the current speed
+ **/
+s32 ngbe_check_mac_link_vf(struct ngbe_hw *hw, u32 *speed,
+ bool *link_up, bool wait_to_complete)
+{
+ /**
+* for a quick link status checking, wait_to_compelet == 0,
+* skip PF link status checking
+*/
+ bool no_pflink_check = 0;
+ struct ngbe_mbx_info *mbx = &hw->mbx;
+ struct ngbe_mac_info *mac = &hw->mac;
+ s32 ret_val = 0;
+ u32 links_reg;
+ u32 in_msg = 0;
+
+ UNREFERENCED_PARAMETER(wait_to_complete);
+
+ /* If we were hit with a reset drop the link */
+ if (!mbx->check_for_rst(hw, 0) || !mbx->timeout)
+ mac->get_link_status = true;
+
+ if (!mac->get_link_status)
+ goto out;
+
+ /* if link status is down no point in checking to see if pf is up */
+ links_reg = rd32(hw, NGBE_VFSTATUS);
+ if (!(links_reg & NGBE_VFSTATUS_BW_MASK))
+ goto out;
+
+ /* for SFP+ modules and DA cables it can take up to 500usecs
+* before the link status is correct
+*/
+ if (mac->type == ngbe_mac_em_vf) {
+ if (po32m(hw, NGBE_VFSTATUS, NGBE_VFSTATUS_BW_MASK,
+ 0, NULL, 5, 100))
+ goto out;
+ }
+
+ if (links_reg & NGBE_VFSTATUS_BW_1G)
+ *speed = NGBE_LINK_SPEED_1GB_FULL;
+ else if (links_reg & NGBE_VFSTATUS_BW_100M)
+ *speed = NGBE_LINK_SPEED_100M_FULL;
+ else if (links_reg & NGBE_VFSTATUS_BW_10M)
+ *speed = NGBE_LINK_SPEED_10M_FULL;
+ else
+ *speed = NGBE_LINK_SPEED_UNKNOWN;
+
+ if (no_pflink_check) {
+ if (*speed == NGBE_LINK_SPEED_UNKNOWN)
+ mac->get_link_status = true;
+ else
+ mac->get_link_status = false;
+
+ goto out;
+ }
+
+ /* if the read failed it could just be a mailbox collision, best wait
+* until we are called again and don't report an error
+*/
+ if (mbx->read(hw, &in_msg, 1, 0))
+ goto out;
+
+ if (!(in_msg & NGBE_VT_MSGTYPE_CTS)) {
+ /* msg is not CTS and is NACK we must have lost CTS status */
+ if (in_msg & NGBE_VT_MSGTYPE_NACK)
+ ret_val = -1;
+ goto out;
+ }
+
+ /* the pf is talking, if we timed out in the past we reinit */
+ if (!mbx->timeout) {
+ ret_val = -1;
+ goto out;
+ }
+
+ /* if we passed all the tests above then the link is up and we no
+* longer need to check for link
+*/
+ mac->get_link_status = false;
+
+out:
+ *link_up = !mac->get_link_status;
+ return ret_val;
+}
+
/**
* ngbevf_rlpml_set_vf - Set the maximum receive packet length
* @hw: pointer to the HW structure
@@ -471,6 +564,9 @@ s32 ngbe_init_ops_vf(struct ngbe_hw *hw)
mac->get_mac_addr = ngbe_get_mac_addr_vf;
mac->negotiate_api_version = ngbevf_negotiate_api_version;
+ /* Link */
+ mac->check_link = ngbe_check_mac_link_vf;
+
/* RAR, Multicast, VLAN */
mac->set_rar = ngbe_set_rar_vf;
mac->set_uc_addr = ngbevf_set_uc_addr_vf;
diff --git a/drivers/net/ngbe/base/ngbe_vf.h b/drivers/net/ngbe/base/ngbe_vf.h
index 596f41dcb0..5cf225dd35 100644
--- a/drivers/net/ngbe/base/ngbe_vf.h
+++ b/drivers/net/ngbe/base/ngbe_vf.h
@@ -17,6 +17,8 @@ s32 ngbe_start_hw_vf(struct ngbe_hw *hw);
s32 ngbe_reset_hw_vf(struct ngbe_hw *hw);
s3
[PATCH v3 07/15] net/ngbe: add datapath init code for VF device
Add support for datapath init, including RX and TX unit init.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 5 +
doc/guides/nics/ngbe.rst | 11 ++
drivers/net/ngbe/ngbe_ethdev.h | 6 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 63
drivers/net/ngbe/ngbe_rxtx.c | 209 +++
5 files changed, 294 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 6f16f2b079..ad123684c5 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -6,6 +6,9 @@
[Features]
Unicast MAC filter = Y
MTU update = Y
+Scattered Rx = Y
+LRO = Y
+TSO = Y
Promiscuous mode = Y
Allmulticast mode= Y
CRC offload = P
@@ -15,6 +18,8 @@ L3 checksum offload = P
L4 checksum offload = P
Inner L3 checksum= P
Inner L4 checksum= P
+Rx descriptor status = Y
+Tx descriptor status = Y
Multiprocess aware = Y
Linux= Y
ARMv8= Y
diff --git a/doc/guides/nics/ngbe.rst b/doc/guides/nics/ngbe.rst
index e31600c95a..b002fa4c19 100644
--- a/doc/guides/nics/ngbe.rst
+++ b/doc/guides/nics/ngbe.rst
@@ -42,6 +42,17 @@ Prerequisites
Configuration
-
+Compilation Options
+~~~
+
+The following build-time options may be enabled on build time using.
+
+``-Dc_args=`` meson argument (e.g.
``-Dc_args=-DRTE_LIBRTE_NGBE_PF_DISABLE_STRIP_CRC``).
+
+- ``RTE_LIBRTE_NGBE_PF_DISABLE_STRIP_CRC`` (undefined by default)
+
+ Decide to enable or disable HW CRC in VF PMD.
+
Dynamic Logging Parameters
~~
diff --git a/drivers/net/ngbe/ngbe_ethdev.h b/drivers/net/ngbe/ngbe_ethdev.h
index 7af58a57ac..37c6459f51 100644
--- a/drivers/net/ngbe/ngbe_ethdev.h
+++ b/drivers/net/ngbe/ngbe_ethdev.h
@@ -241,6 +241,12 @@ int
ngbe_tx_burst_mode_get(struct rte_eth_dev *dev, __rte_unused uint16_t queue_id,
struct rte_eth_burst_mode *mode);
+int ngbevf_dev_rx_init(struct rte_eth_dev *dev);
+
+void ngbevf_dev_tx_init(struct rte_eth_dev *dev);
+
+void ngbevf_dev_rxtx_start(struct rte_eth_dev *dev);
+
uint16_t ngbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts);
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index e4a62a7df9..f664656c42 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -115,6 +115,34 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
PMD_INIT_FUNC_TRACE();
eth_dev->dev_ops = &ngbevf_eth_dev_ops;
+ eth_dev->rx_descriptor_status = ngbe_dev_rx_descriptor_status;
+ eth_dev->tx_descriptor_status = ngbe_dev_tx_descriptor_status;
+ eth_dev->rx_pkt_burst = &ngbe_recv_pkts;
+ eth_dev->tx_pkt_burst = &ngbe_xmit_pkts;
+
+ /* for secondary processes, we don't initialise any further as primary
+* has already done this work. Only check we don't need a different
+* RX function
+*/
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+ struct ngbe_tx_queue *txq;
+ uint16_t nb_tx_queues = eth_dev->data->nb_tx_queues;
+ /* TX queue function in primary, set by last queue initialized
+* Tx queue may not initialized by primary process
+*/
+ if (eth_dev->data->tx_queues) {
+ txq = eth_dev->data->tx_queues[nb_tx_queues - 1];
+ ngbe_set_tx_function(eth_dev, txq);
+ } else {
+ /* Use default TX function if we get here */
+ PMD_INIT_LOG(NOTICE,
+"No TX queues configured yet. Using
default TX function.");
+ }
+
+ ngbe_set_rx_function(eth_dev);
+
+ return 0;
+ }
rte_eth_copy_pci_info(eth_dev, pci_dev);
@@ -294,6 +322,40 @@ ngbevf_dev_info_get(struct rte_eth_dev *dev,
return 0;
}
+static int
+ngbevf_dev_configure(struct rte_eth_dev *dev)
+{
+ struct rte_eth_conf *conf = &dev->data->dev_conf;
+ struct ngbe_adapter *adapter = ngbe_dev_adapter(dev);
+
+ PMD_INIT_LOG(DEBUG, "Configured Virtual Function port id: %d",
+dev->data->port_id);
+
+ /*
+* VF has no ability to enable/disable HW CRC
+* Keep the persistent behavior the same as Host PF
+*/
+#ifndef RTE_LIBRTE_NGBE_PF_DISABLE_STRIP_CRC
+ if (conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_KEEP_CRC) {
+ PMD_INIT_LOG(NOTICE, "VF can't disable HW CRC Strip");
+ conf->rxmode.offloads &= ~RTE_ETH_RX_OFFLOAD_KEEP_CRC;
+ }
+#else
+ if (!(conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_KEEP_CRC)) {
+ PMD_INIT_LOG(NOTICE, "VF can't enable HW CRC Strip");
+ conf->rxmode.offloads |=
[PATCH v3 08/15] net/ngbe: add VLAN related ops for VF device
Add support for VLAN filter, offload and strip set feature.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 1 +
drivers/net/ngbe/base/ngbe_vf.c | 33 +++-
drivers/net/ngbe/base/ngbe_vf.h | 2 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 112 +++
4 files changed, 147 insertions(+), 1 deletion(-)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index ad123684c5..48f3bd73bb 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -11,6 +11,7 @@ LRO = Y
TSO = Y
Promiscuous mode = Y
Allmulticast mode= Y
+VLAN filter = Y
CRC offload = P
VLAN offload = P
QinQ offload = P
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
index 47fee7e14d..039f87423d 100644
--- a/drivers/net/ngbe/base/ngbe_vf.c
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -262,6 +262,36 @@ s32 ngbevf_update_xcast_mode(struct ngbe_hw *hw, int
xcast_mode)
return 0;
}
+/**
+ * ngbe_set_vfta_vf - Set/Unset vlan filter table address
+ * @hw: pointer to the HW structure
+ * @vlan: 12 bit VLAN ID
+ * @vind: unused by VF drivers
+ * @vlan_on: if true then set bit, else clear bit
+ * @vlvf_bypass: boolean flag indicating updating default pool is okay
+ *
+ * Turn on/off specified VLAN in the VLAN filter table.
+ **/
+s32 ngbe_set_vfta_vf(struct ngbe_hw *hw, u32 vlan, u32 vind,
+ bool vlan_on, bool vlvf_bypass)
+{
+ u32 msgbuf[2];
+ s32 ret_val;
+
+ UNREFERENCED_PARAMETER(vind, vlvf_bypass);
+
+ msgbuf[0] = NGBE_VF_SET_VLAN;
+ msgbuf[1] = vlan;
+ /* Setting the 8 bit field MSG INFO to TRUE indicates "add" */
+ msgbuf[0] |= vlan_on << NGBE_VT_MSGINFO_SHIFT;
+
+ ret_val = ngbevf_write_msg_read_ack(hw, msgbuf, msgbuf, 2);
+ if (!ret_val && (msgbuf[0] & NGBE_VT_MSGTYPE_ACK))
+ return 0;
+
+ return ret_val | (msgbuf[0] & NGBE_VT_MSGTYPE_NACK);
+}
+
/**
* ngbe_get_mac_addr_vf - Read device MAC address
* @hw: pointer to the HW structure
@@ -441,10 +471,11 @@ s32 ngbe_init_ops_vf(struct ngbe_hw *hw)
mac->get_mac_addr = ngbe_get_mac_addr_vf;
mac->negotiate_api_version = ngbevf_negotiate_api_version;
- /* RAR, Multicast */
+ /* RAR, Multicast, VLAN */
mac->set_rar = ngbe_set_rar_vf;
mac->set_uc_addr = ngbevf_set_uc_addr_vf;
mac->update_xcast_mode = ngbevf_update_xcast_mode;
+ mac->set_vfta = ngbe_set_vfta_vf;
mac->set_rlpml = ngbevf_rlpml_set_vf;
mac->max_tx_queues = 1;
diff --git a/drivers/net/ngbe/base/ngbe_vf.h b/drivers/net/ngbe/base/ngbe_vf.h
index 3f328a0221..596f41dcb0 100644
--- a/drivers/net/ngbe/base/ngbe_vf.h
+++ b/drivers/net/ngbe/base/ngbe_vf.h
@@ -21,6 +21,8 @@ s32 ngbe_set_rar_vf(struct ngbe_hw *hw, u32 index, u8 *addr,
u32 vmdq,
u32 enable_addr);
s32 ngbevf_set_uc_addr_vf(struct ngbe_hw *hw, u32 index, u8 *addr);
s32 ngbevf_update_xcast_mode(struct ngbe_hw *hw, int xcast_mode);
+s32 ngbe_set_vfta_vf(struct ngbe_hw *hw, u32 vlan, u32 vind,
+ bool vlan_on, bool vlvf_bypass);
s32 ngbevf_rlpml_set_vf(struct ngbe_hw *hw, u16 max_size);
int ngbevf_negotiate_api_version(struct ngbe_hw *hw, int api);
int ngbevf_get_queues(struct ngbe_hw *hw, unsigned int *num_tcs,
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index f664656c42..a6048807cc 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -18,6 +18,8 @@
#define NGBEVF_PMD_NAME "rte_ngbevf_pmd" /* PMD name */
static int ngbevf_dev_close(struct rte_eth_dev *dev);
+static int ngbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask);
+static void ngbevf_set_vfta_all(struct rte_eth_dev *dev, bool on);
static int ngbevf_dev_promiscuous_enable(struct rte_eth_dev *dev);
static int ngbevf_dev_promiscuous_disable(struct rte_eth_dev *dev);
static void ngbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index);
@@ -109,6 +111,8 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
uint32_t tc, tcs;
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
struct ngbe_hw *hw = ngbe_dev_hw(eth_dev);
+ struct ngbe_vfta *shadow_vfta = NGBE_DEV_VFTA(eth_dev);
+ struct ngbe_hwstrip *hwstrip = NGBE_DEV_HWSTRIP(eth_dev);
struct rte_ether_addr *perm_addr =
(struct rte_ether_addr *)hw->mac.perm_addr;
@@ -152,6 +156,12 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
ngbe_map_device_id(hw);
hw->hw_addr = (void *)pci_dev->mem_resource[0].addr;
+ /* initialize the vfta */
+ memset(shadow_vfta, 0, sizeof(*shadow_vfta));
+
+ /* initialize the hw strip bitmap*/
+ memset(hwstrip, 0, sizeof(*hwstrip));
+
/* Initialize the shared code (base
[PATCH v3 09/15] net/ngbe: add interrupt support for VF device
Add VF device interrupt handler, support to enable and disable RX queue
interrupt, and configure misx interrupt.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 1 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 230 +++
2 files changed, 231 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 48f3bd73bb..0fde7f9563 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -5,6 +5,7 @@
;
[Features]
Unicast MAC filter = Y
+Rx interrupt = Y
MTU update = Y
Scattered Rx = Y
LRO = Y
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index a6048807cc..e1ba8b02d2 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -18,11 +18,15 @@
#define NGBEVF_PMD_NAME "rte_ngbevf_pmd" /* PMD name */
static int ngbevf_dev_close(struct rte_eth_dev *dev);
+static void ngbevf_intr_disable(struct rte_eth_dev *dev);
+static void ngbevf_intr_enable(struct rte_eth_dev *dev);
static int ngbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask);
static void ngbevf_set_vfta_all(struct rte_eth_dev *dev, bool on);
+static void ngbevf_configure_msix(struct rte_eth_dev *dev);
static int ngbevf_dev_promiscuous_enable(struct rte_eth_dev *dev);
static int ngbevf_dev_promiscuous_disable(struct rte_eth_dev *dev);
static void ngbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index);
+static void ngbevf_dev_interrupt_handler(void *param);
/*
* The set of PCI devices this driver supports (for VF)
@@ -110,6 +114,7 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
int err;
uint32_t tc, tcs;
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
+ struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
struct ngbe_hw *hw = ngbe_dev_hw(eth_dev);
struct ngbe_vfta *shadow_vfta = NGBE_DEV_VFTA(eth_dev);
struct ngbe_hwstrip *hwstrip = NGBE_DEV_HWSTRIP(eth_dev);
@@ -173,6 +178,9 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
/* init_mailbox_params */
hw->mbx.init_params(hw);
+ /* Disable the interrupts for VF */
+ ngbevf_intr_disable(eth_dev);
+
hw->mac.num_rar_entries = 32; /* The MAX of the underlying PF */
err = hw->mac.reset_hw(hw);
@@ -240,6 +248,11 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
/* enter promiscuous mode */
ngbevf_dev_promiscuous_enable(eth_dev);
+ rte_intr_callback_register(intr_handle,
+ ngbevf_dev_interrupt_handler, eth_dev);
+ rte_intr_enable(intr_handle);
+ ngbevf_intr_enable(eth_dev);
+
PMD_INIT_LOG(DEBUG, "port %d vendorID=0x%x deviceID=0x%x mac.type=%s",
eth_dev->data->port_id, pci_dev->id.vendor_id,
pci_dev->id.device_id, "ngbe_mac_sp_vf");
@@ -332,6 +345,39 @@ ngbevf_dev_info_get(struct rte_eth_dev *dev,
return 0;
}
+static void
+ngbevf_intr_disable(struct rte_eth_dev *dev)
+{
+ struct ngbe_interrupt *intr = ngbe_dev_intr(dev);
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
+
+ PMD_INIT_FUNC_TRACE();
+
+ /* Clear interrupt mask to stop from interrupts being generated */
+ wr32(hw, NGBE_VFIMS, NGBE_VFIMS_MASK);
+
+ ngbe_flush(hw);
+
+ /* Clear mask value. */
+ intr->mask_misc = NGBE_VFIMS_MASK;
+}
+
+static void
+ngbevf_intr_enable(struct rte_eth_dev *dev)
+{
+ struct ngbe_interrupt *intr = ngbe_dev_intr(dev);
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
+
+ PMD_INIT_FUNC_TRACE();
+
+ /* VF enable interrupt autoclean */
+ wr32(hw, NGBE_VFIMC, NGBE_VFIMC_MASK);
+
+ ngbe_flush(hw);
+
+ intr->mask_misc = 0;
+}
+
static int
ngbevf_dev_configure(struct rte_eth_dev *dev)
{
@@ -370,6 +416,8 @@ static int
ngbevf_dev_close(struct rte_eth_dev *dev)
{
struct ngbe_hw *hw = ngbe_dev_hw(dev);
+ struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
+ struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
PMD_INIT_FUNC_TRACE();
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
@@ -387,9 +435,16 @@ ngbevf_dev_close(struct rte_eth_dev *dev)
dev->rx_pkt_burst = NULL;
dev->tx_pkt_burst = NULL;
+ /* Disable the interrupts for VF */
+ ngbevf_intr_disable(dev);
+
rte_free(dev->data->mac_addrs);
dev->data->mac_addrs = NULL;
+ rte_intr_disable(intr_handle);
+ rte_intr_callback_unregister(intr_handle,
+ngbevf_dev_interrupt_handler, dev);
+
return 0;
}
@@ -492,6 +547,113 @@ ngbevf_vlan_offload_set(struct rte_eth_dev *dev, int mask)
return 0;
}
+static int
+ngbevf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
+{
+ struct rte_pci_device *pci_dev = RTE_ET
[PATCH v3 13/15] net/ngbe: add multicast MAC filter ops for VF device
Add support to update multicast MAC filter.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 1 +
drivers/net/ngbe/base/ngbe_vf.c | 81
drivers/net/ngbe/base/ngbe_vf.h | 3 ++
3 files changed, 85 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index 3a45d7ec5f..ceb310e719 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -6,6 +6,7 @@
[Features]
Link status = Y
Unicast MAC filter = Y
+Multicast MAC filter = Y
Rx interrupt = Y
MTU update = Y
Scattered Rx = Y
diff --git a/drivers/net/ngbe/base/ngbe_vf.c b/drivers/net/ngbe/base/ngbe_vf.c
index 52b86afc56..e7b94cd44e 100644
--- a/drivers/net/ngbe/base/ngbe_vf.c
+++ b/drivers/net/ngbe/base/ngbe_vf.c
@@ -179,6 +179,39 @@ s32 ngbe_stop_hw_vf(struct ngbe_hw *hw)
return 0;
}
+/**
+ * ngbe_mta_vector - Determines bit-vector in multicast table to set
+ * @hw: pointer to hardware structure
+ * @mc_addr: the multicast address
+ **/
+STATIC s32 ngbe_mta_vector(struct ngbe_hw *hw, u8 *mc_addr)
+{
+ u32 vector = 0;
+
+ switch (hw->mac.mc_filter_type) {
+ case 0: /* use bits [47:36] of the address */
+ vector = ((mc_addr[4] >> 4) | (((u16)mc_addr[5]) << 4));
+ break;
+ case 1: /* use bits [46:35] of the address */
+ vector = ((mc_addr[4] >> 3) | (((u16)mc_addr[5]) << 5));
+ break;
+ case 2: /* use bits [45:34] of the address */
+ vector = ((mc_addr[4] >> 2) | (((u16)mc_addr[5]) << 6));
+ break;
+ case 3: /* use bits [43:32] of the address */
+ vector = ((mc_addr[4]) | (((u16)mc_addr[5]) << 8));
+ break;
+ default: /* Invalid mc_filter_type */
+ DEBUGOUT("MC filter type param set incorrectly");
+ ASSERT(0);
+ break;
+ }
+
+ /* vector can only be 12-bits or boundary will be exceeded */
+ vector &= 0xFFF;
+ return vector;
+}
+
STATIC s32 ngbevf_write_msg_read_ack(struct ngbe_hw *hw, u32 *msg,
u32 *retmsg, u16 size)
{
@@ -225,6 +258,53 @@ s32 ngbe_set_rar_vf(struct ngbe_hw *hw, u32 index, u8
*addr, u32 vmdq,
return ret_val;
}
+/**
+ * ngbe_update_mc_addr_list_vf - Update Multicast addresses
+ * @hw: pointer to the HW structure
+ * @mc_addr_list: array of multicast addresses to program
+ * @mc_addr_count: number of multicast addresses to program
+ * @next: caller supplied function to return next address in list
+ * @clear: unused
+ *
+ * Updates the Multicast Table Array.
+ **/
+s32 ngbe_update_mc_addr_list_vf(struct ngbe_hw *hw, u8 *mc_addr_list,
+u32 mc_addr_count, ngbe_mc_addr_itr next,
+bool clear)
+{
+ struct ngbe_mbx_info *mbx = &hw->mbx;
+ u32 msgbuf[NGBE_P2VMBX_SIZE];
+ u16 *vector_list = (u16 *)&msgbuf[1];
+ u32 vector;
+ u32 cnt, i;
+ u32 vmdq;
+
+ UNREFERENCED_PARAMETER(clear);
+
+ /* Each entry in the list uses 1 16 bit word. We have 30
+* 16 bit words available in our HW msg buffer (minus 1 for the
+* msg type). That's 30 hash values if we pack 'em right. If
+* there are more than 30 MC addresses to add then punt the
+* extras for now and then add code to handle more than 30 later.
+* It would be unusual for a server to request that many multi-cast
+* addresses except for in large enterprise network environments.
+*/
+
+ DEBUGOUT("MC Addr Count = %d", mc_addr_count);
+
+ cnt = (mc_addr_count > 30) ? 30 : mc_addr_count;
+ msgbuf[0] = NGBE_VF_SET_MULTICAST;
+ msgbuf[0] |= cnt << NGBE_VT_MSGINFO_SHIFT;
+
+ for (i = 0; i < cnt; i++) {
+ vector = ngbe_mta_vector(hw, next(hw, &mc_addr_list, &vmdq));
+ DEBUGOUT("Hash value = 0x%03X", vector);
+ vector_list[i] = (u16)vector;
+ }
+
+ return mbx->write_posted(hw, msgbuf, NGBE_P2VMBX_SIZE, 0);
+}
+
/**
* ngbevf_update_xcast_mode - Update Multicast mode
* @hw: pointer to the HW structure
@@ -570,6 +650,7 @@ s32 ngbe_init_ops_vf(struct ngbe_hw *hw)
/* RAR, Multicast, VLAN */
mac->set_rar = ngbe_set_rar_vf;
mac->set_uc_addr = ngbevf_set_uc_addr_vf;
+ mac->update_mc_addr_list = ngbe_update_mc_addr_list_vf;
mac->update_xcast_mode = ngbevf_update_xcast_mode;
mac->set_vfta = ngbe_set_vfta_vf;
mac->set_rlpml = ngbevf_rlpml_set_vf;
diff --git a/drivers/net/ngbe/base/ngbe_vf.h b/drivers/net/ngbe/base/ngbe_vf.h
index abe1655f8e..5621ca49cb 100644
--- a/drivers/net/ngbe/base/ngbe_vf.h
+++ b/drivers/net/ngbe/base/ngbe_vf.h
@@ -54,6 +54,9 @@ s32 ngbe_check_mac_link_vf(struct ngbe_hw *hw, u32 *speed,
s32 ngbe_set_rar_vf(struct n
[PATCH v3 12/15] net/ngbe: add start/stop/reset/close ops for VF device
Add the complete configuration process for start/stop/reset/close ops,
so that applications can enable the device correctly.
Signed-off-by: Zaiyu Wang
---
drivers/net/ngbe/ngbe_ethdev_vf.c | 170 +-
1 file changed, 169 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index 93d801a1f3..e0e5950672 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -553,12 +553,151 @@ ngbevf_dev_configure(struct rte_eth_dev *dev)
return 0;
}
+static int
+ngbevf_dev_start(struct rte_eth_dev *dev)
+{
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
+ uint32_t intr_vector = 0;
+ struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
+ struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
+
+ int err, mask = 0;
+
+ PMD_INIT_FUNC_TRACE();
+
+ err = hw->mac.reset_hw(hw);
+ if (err) {
+ PMD_INIT_LOG(ERR, "Unable to reset vf hardware (%d)", err);
+ return err;
+ }
+ hw->mac.get_link_status = true;
+
+ /* negotiate mailbox API version to use with the PF. */
+ ngbevf_negotiate_api(hw);
+
+ ngbevf_dev_tx_init(dev);
+
+ /* This can fail when allocating mbufs for descriptor rings */
+ err = ngbevf_dev_rx_init(dev);
+
+ /**
+* In this case, reuses the MAC address assigned by VF
+* initialization.
+*/
+ if (err != 0 && err != NGBE_ERR_INVALID_MAC_ADDR) {
+ PMD_INIT_LOG(ERR, "Unable to initialize RX hardware (%d)", err);
+ ngbe_dev_clear_queues(dev);
+ return err;
+ }
+
+ /* Set vfta */
+ ngbevf_set_vfta_all(dev, 1);
+
+ /* Set HW strip */
+ mask = RTE_ETH_VLAN_STRIP_MASK | RTE_ETH_VLAN_FILTER_MASK |
+ RTE_ETH_VLAN_EXTEND_MASK;
+ err = ngbevf_vlan_offload_config(dev, mask);
+ if (err) {
+ PMD_INIT_LOG(ERR, "Unable to set VLAN offload (%d)", err);
+ ngbe_dev_clear_queues(dev);
+ return err;
+ }
+
+ ngbevf_dev_rxtx_start(dev);
+
+ /* check and configure queue intr-vector mapping */
+ if (rte_intr_cap_multiple(intr_handle) &&
+ dev->data->dev_conf.intr_conf.rxq) {
+ /* According to datasheet, only vector 0/1/2 can be used,
+* now only one vector is used for Rx queue
+*/
+ intr_vector = 1;
+ if (rte_intr_efd_enable(intr_handle, intr_vector))
+ return -1;
+ }
+
+ if (rte_intr_dp_is_en(intr_handle)) {
+ if (rte_intr_vec_list_alloc(intr_handle, "intr_vec",
+ dev->data->nb_rx_queues)) {
+ PMD_INIT_LOG(ERR,
+"Failed to allocate %d rx_queues intr_vec",
+dev->data->nb_rx_queues);
+ return -ENOMEM;
+ }
+ }
+
+ ngbevf_configure_msix(dev);
+
+ /* When a VF port is bound to VFIO-PCI, only miscellaneous interrupt
+* is mapped to VFIO vector 0 in eth_ngbevf_dev_init( ).
+* If previous VFIO interrupt mapping setting in eth_ngbevf_dev_init( )
+* is not cleared, it will fail when following rte_intr_enable( ) tries
+* to map Rx queue interrupt to other VFIO vectors.
+* So clear uio/vfio intr/evevnfd first to avoid failure.
+*/
+ rte_intr_disable(intr_handle);
+
+ rte_intr_enable(intr_handle);
+
+ /* Re-enable interrupt for VF */
+ ngbevf_intr_enable(dev);
+
+ /*
+* Update link status right before return, because it may
+* start link configuration process in a separate thread.
+*/
+ ngbevf_dev_link_update(dev, 0);
+
+ hw->adapter_stopped = false;
+
+ return 0;
+}
+
+static int
+ngbevf_dev_stop(struct rte_eth_dev *dev)
+{
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
+ struct ngbe_adapter *adapter = ngbe_dev_adapter(dev);
+ struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
+ struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
+
+ if (hw->adapter_stopped)
+ return 0;
+
+ PMD_INIT_FUNC_TRACE();
+
+ ngbevf_intr_disable(dev);
+
+ hw->adapter_stopped = 1;
+ hw->mac.stop_hw(hw);
+
+ /*
+* Clear what we set, but we still keep shadow_vfta to
+* restore after device starts
+*/
+ ngbevf_set_vfta_all(dev, 0);
+
+ /* Clear stored conf */
+ dev->data->scattered_rx = 0;
+
+ ngbe_dev_clear_queues(dev);
+
+ /* Clean datapath event and queue/vec mapping */
+ rte_intr_efd_disable(intr_handle);
+ rte_intr_vec_list_free(intr_handle);
+
+ adapter->rss_reta_updated = 0;
+
+ return 0;
+}
+
static int
ngbevf_dev_close(struct rte_
[PATCH v3 11/15] net/ngbe: add stats and xstats ops for VF device
Add support to get stats and extended stats by reading hardware
registers.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 2 +
drivers/net/ngbe/base/ngbe_vf.h | 32 +++
drivers/net/ngbe/ngbe_ethdev_vf.c| 138 +++
3 files changed, 172 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index fd9c30f559..3a45d7ec5f 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -23,6 +23,8 @@ Inner L3 checksum= P
Inner L4 checksum= P
Rx descriptor status = Y
Tx descriptor status = Y
+Basic stats = Y
+Extended stats = Y
Multiprocess aware = Y
Linux= Y
ARMv8= Y
diff --git a/drivers/net/ngbe/base/ngbe_vf.h b/drivers/net/ngbe/base/ngbe_vf.h
index 5cf225dd35..abe1655f8e 100644
--- a/drivers/net/ngbe/base/ngbe_vf.h
+++ b/drivers/net/ngbe/base/ngbe_vf.h
@@ -11,6 +11,38 @@
#define NGBE_VF_MAX_TX_QUEUES 1
#define NGBE_VF_MAX_RX_QUEUES 1
+struct ngbevf_hw_stats {
+ u64 base_vfgprc;
+ u64 base_vfgptc;
+ u64 base_vfgorc;
+ u64 base_vfgotc;
+ u64 base_vfmprc;
+
+ u64 last_vfgprc;
+ u64 last_vfgptc;
+ u64 last_vfgorc;
+ u64 last_vfgotc;
+ u64 last_vfmprc;
+ u64 last_vfbprc;
+ u64 last_vfmptc;
+ u64 last_vfbptc;
+
+ u64 vfgprc;
+ u64 vfgptc;
+ u64 vfgorc;
+ u64 vfgotc;
+ u64 vfmprc;
+ u64 vfbprc;
+ u64 vfmptc;
+ u64 vfbptc;
+
+ u64 saved_reset_vfgprc;
+ u64 saved_reset_vfgptc;
+ u64 saved_reset_vfgorc;
+ u64 saved_reset_vfgotc;
+ u64 saved_reset_vfmprc;
+};
+
s32 ngbe_init_ops_vf(struct ngbe_hw *hw);
s32 ngbe_init_hw_vf(struct ngbe_hw *hw);
s32 ngbe_start_hw_vf(struct ngbe_hw *hw);
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index 01e9d5d8ee..93d801a1f3 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -22,6 +22,7 @@ static int ngbevf_dev_link_update(struct rte_eth_dev *dev,
int wait_to_complete);
static void ngbevf_intr_disable(struct rte_eth_dev *dev);
static void ngbevf_intr_enable(struct rte_eth_dev *dev);
+static int ngbevf_dev_stats_reset(struct rte_eth_dev *dev);
static int ngbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask);
static void ngbevf_set_vfta_all(struct rte_eth_dev *dev, bool on);
static void ngbevf_configure_msix(struct rte_eth_dev *dev);
@@ -65,6 +66,13 @@ static const struct rte_eth_desc_lim tx_desc_lim = {
static const struct eth_dev_ops ngbevf_eth_dev_ops;
+static const struct rte_ngbe_xstats_name_off rte_ngbevf_stats_strings[] = {
+ {"rx_multicast_packets", offsetof(struct ngbevf_hw_stats, vfmprc)},
+};
+
+#define NGBEVF_NB_XSTATS (sizeof(rte_ngbevf_stats_strings) / \
+ sizeof(rte_ngbevf_stats_strings[0]))
+
/*
* Negotiate mailbox API version with the PF.
* After reset API version is always set to the basic one (ngbe_mbox_api_10).
@@ -180,6 +188,9 @@ eth_ngbevf_dev_init(struct rte_eth_dev *eth_dev)
/* init_mailbox_params */
hw->mbx.init_params(hw);
+ /* Reset the hw statistics */
+ ngbevf_dev_stats_reset(eth_dev);
+
/* Disable the interrupts for VF */
ngbevf_intr_disable(eth_dev);
@@ -298,6 +309,128 @@ static struct rte_pci_driver rte_ngbevf_pmd = {
.remove = eth_ngbevf_pci_remove,
};
+static int ngbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
+ struct rte_eth_xstat_name *xstats_names, unsigned int limit)
+{
+ unsigned int i;
+
+ if (limit < NGBEVF_NB_XSTATS && xstats_names != NULL)
+ return -ENOMEM;
+
+ if (xstats_names != NULL)
+ for (i = 0; i < NGBEVF_NB_XSTATS; i++)
+ snprintf(xstats_names[i].name,
+ sizeof(xstats_names[i].name),
+ "%s", rte_ngbevf_stats_strings[i].name);
+ return NGBEVF_NB_XSTATS;
+}
+
+static void
+ngbevf_update_stats(struct rte_eth_dev *dev)
+{
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
+ struct ngbevf_hw_stats *hw_stats = (struct ngbevf_hw_stats *)
+ NGBE_DEV_STATS(dev);
+
+ /* Good Rx packet, include VF loopback */
+ NGBE_UPDCNT32(NGBE_QPRXPKT(0),
+ hw_stats->last_vfgprc, hw_stats->vfgprc);
+
+ /* Good Rx octets, include VF loopback */
+ NGBE_UPDCNT36(NGBE_QPRXOCTL(0),
+ hw_stats->last_vfgorc, hw_stats->vfgorc);
+
+ /* Rx Multicst Packet */
+ NGBE_UPDCNT32(NGBE_QPRXMPKT(0),
+ hw_stats->last_vfmprc, hw_stats->vfmprc);
+
+ /* Rx Broadcast Packet */
+ NGBE_UPDCNT32(NGBE_QPRXBPKT(0),
+ hw_stats->last_vfbprc, hw_stats->vfbprc);
+
+ hw->rx_loaded = 0;
+
+ /* Good Tx packet, include VF loopback */
+ N
[PATCH v3 14/15] net/ngbe: add dump registers ops for VF device
Add support to dump registers for VF device. Currently we only support a
small number of registers. More registers will be added as needed.
Signed-off-by: Zaiyu Wang
---
doc/guides/nics/features/ngbe_vf.ini | 1 +
drivers/net/ngbe/ngbe_ethdev_vf.c| 73
2 files changed, 74 insertions(+)
diff --git a/doc/guides/nics/features/ngbe_vf.ini
b/doc/guides/nics/features/ngbe_vf.ini
index ceb310e719..909f1e00f8 100644
--- a/doc/guides/nics/features/ngbe_vf.ini
+++ b/doc/guides/nics/features/ngbe_vf.ini
@@ -26,6 +26,7 @@ Rx descriptor status = Y
Tx descriptor status = Y
Basic stats = Y
Extended stats = Y
+Registers dump = Y
Multiprocess aware = Y
Linux= Y
ARMv8= Y
diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c
b/drivers/net/ngbe/ngbe_ethdev_vf.c
index e0e5950672..bbd9fea328 100644
--- a/drivers/net/ngbe/ngbe_ethdev_vf.c
+++ b/drivers/net/ngbe/ngbe_ethdev_vf.c
@@ -16,6 +16,35 @@
#include "ngbe_rxtx.h"
#include "ngbe_regs_group.h"
+static const struct reg_info ngbevf_regs_general[] = {
+ {NGBE_VFRST, 1, 1, "NGBE_VFRST"},
+ {NGBE_VFSTATUS, 1, 1, "NGBE_VFSTATUS"},
+ {NGBE_VFMBCTL, 1, 1, "NGBE_VFMAILBOX"},
+ {NGBE_VFMBX, 16, 4, "NGBE_VFMBX"},
+ {NGBE_VFPBWRAP, 1, 1, "NGBE_VFPBWRAP"},
+ {0, 0, 0, ""}
+};
+
+static const struct reg_info ngbevf_regs_interrupt[] = {
+ {0, 0, 0, ""}
+};
+
+static const struct reg_info ngbevf_regs_rxdma[] = {
+ {0, 0, 0, ""}
+};
+
+static const struct reg_info ngbevf_regs_tx[] = {
+ {0, 0, 0, ""}
+};
+
+/* VF registers */
+static const struct reg_info *ngbevf_regs[] = {
+ ngbevf_regs_general,
+ ngbevf_regs_interrupt,
+ ngbevf_regs_rxdma,
+ ngbevf_regs_tx,
+ NULL};
+
#define NGBEVF_PMD_NAME "rte_ngbevf_pmd" /* PMD name */
static int ngbevf_dev_close(struct rte_eth_dev *dev);
static int ngbevf_dev_link_update(struct rte_eth_dev *dev,
@@ -1081,6 +1110,49 @@ ngbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
return 0;
}
+static int
+ngbevf_get_reg_length(struct rte_eth_dev *dev __rte_unused)
+{
+ int count = 0;
+ int g_ind = 0;
+ const struct reg_info *reg_group;
+
+ while ((reg_group = ngbevf_regs[g_ind++]))
+ count += ngbe_regs_group_count(reg_group);
+
+ return count;
+}
+
+static int
+ngbevf_get_regs(struct rte_eth_dev *dev,
+ struct rte_dev_reg_info *regs)
+{
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
+ uint32_t *data = regs->data;
+ int g_ind = 0;
+ int count = 0;
+ const struct reg_info *reg_group;
+
+ if (data == NULL) {
+ regs->length = ngbevf_get_reg_length(dev);
+ regs->width = sizeof(uint32_t);
+ return 0;
+ }
+
+ /* Support only full register dump */
+ if (regs->length == 0 ||
+ regs->length == (uint32_t)ngbevf_get_reg_length(dev)) {
+ regs->version = hw->mac.type << 24 | hw->revision_id << 16 |
+ hw->device_id;
+ while ((reg_group = ngbevf_regs[g_ind++]))
+ count += ngbe_read_regs_group(dev, &data[count],
+ reg_group);
+ return 0;
+ }
+
+ return -ENOTSUP;
+}
+
static int
ngbevf_dev_promiscuous_enable(struct rte_eth_dev *dev)
{
@@ -1268,6 +1340,7 @@ static const struct eth_dev_ops ngbevf_eth_dev_ops = {
.mac_addr_add = ngbevf_add_mac_addr,
.mac_addr_remove = ngbevf_remove_mac_addr,
.mac_addr_set = ngbevf_set_default_mac_addr,
+ .get_reg = ngbevf_get_regs,
};
RTE_PMD_REGISTER_PCI(net_ngbe_vf, rte_ngbevf_pmd);
--
2.21.0.windows.1
