[ovs-dev] [v2 v2 6/6] dpif-netdev: Add configure to enable autovalidator at build time.
Kumar Amber
kumar.amber at intel.com
Wed Apr 28 09:19:31 UTC 2021
This commit adds a new command to allow the user to enable
autovalidatior by default at build time thus allowing for
runnig unit test by default.
$ ./configure --enable-mfex-default-autovalidator
Signed-off-by: Kumar Amber <kumar.amber at intel.com>
Co-authored-by: Harry van Haaren <harry.van.haaren at intel.com>
Signed-off-by: Harry van Haaren <harry.van.haaren at intel.com>
---
Documentation/topics/dpdk/bridge.rst | 5 +++++
NEWS | 10 ++++++++++
acinclude.m4 | 16 ++++++++++++++++
configure.ac | 1 +
lib/dpif-netdev-private-extract.c | 15 +++++++++++++++
lib/dpif-netdev-private-extract.h | 5 +++++
lib/dpif-netdev.c | 4 ++--
7 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/Documentation/topics/dpdk/bridge.rst b/Documentation/topics/dpdk/bridge.rst
index 92fc3594f..3dc21666b 100644
--- a/Documentation/topics/dpdk/bridge.rst
+++ b/Documentation/topics/dpdk/bridge.rst
@@ -302,6 +302,11 @@ To set the Miniflow autovalidator, use this command ::
$ ovs-appctl dpif-netdev/miniflow-parser-set autovalidator
+A compile time option is available in order to test it with the OVS unit
+test suite. Use the following configure option ::
+
+ $ ./configure --enable-mfex-default-autovalidator
+
Running Fuzzy test with Autovalidator
+++++++++++++++++++++++++++++++++++++
diff --git a/NEWS b/NEWS
index 34a42250a..e3a547d91 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,16 @@ Post-v2.15.0
* Optimize dp_netdev_output by enhancing compiler optimization potential.
* Optimize netdev sending by assuming the happy case, and using fallback
for if the netdev doesnt meet the required HWOL needs of a packet.
+ * Add command line option to switch between mfex function pointers.
+ * Add miniflow extract auto-validator function to compare different
+ miniflow extract implementations against default implementation.
+ * Add study function to miniflow function table which studies packet
+ and automatically chooses the best miniflow implementation for that
+ traffic.
+ * Add AVX512 based optimized miniflow extract function for traffic type
+ IP/UDP.
+ * Add build time configure command to enable auto-validatior as default
+ miniflow implementation at build time.
v2.15.0 - 15 Feb 2021
diff --git a/acinclude.m4 b/acinclude.m4
index 5fbcd9872..e2704cfda 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -14,6 +14,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+dnl Set OVS MFEX Autovalidator as default miniflow extract at compile time?
+dnl This enables automatically running all unit tests with all MFEX
+dnl implementations.
+AC_DEFUN([OVS_CHECK_MFEX_AUTOVALIDATOR], [
+ AC_ARG_ENABLE([mfex-default-autovalidator],
+ [AC_HELP_STRING([--enable-mfex-default-autovalidator], [Enable MFEX autovalidator as default miniflow_extract implementation.])],
+ [autovalidator=yes],[autovalidator=no])
+ AC_MSG_CHECKING([whether MFEX Autovalidator is default implementation])
+ if test "$autovalidator" != yes; then
+ AC_MSG_RESULT([no])
+ else
+ OVS_CFLAGS="$OVS_CFLAGS -DMFEX_AUTOVALIDATOR_DEFAULT"
+ AC_MSG_RESULT([yes])
+ fi
+])
+
dnl Set OVS DPCLS Autovalidator as default subtable search at compile time?
dnl This enables automatically running all unit tests with all DPCLS
dnl implementations.
diff --git a/configure.ac b/configure.ac
index e45685a6c..46c402892 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,6 +186,7 @@ OVS_ENABLE_SPARSE
OVS_CTAGS_IDENTIFIERS
OVS_CHECK_DPCLS_AUTOVALIDATOR
OVS_CHECK_DPIF_AVX512_DEFAULT
+OVS_CHECK_MFEX_AUTOVALIDATOR
OVS_CHECK_BINUTILS_AVX512
AC_ARG_VAR(KARCH, [Kernel Architecture String])
diff --git a/lib/dpif-netdev-private-extract.c b/lib/dpif-netdev-private-extract.c
index 060c1939a..e88c6fb77 100644
--- a/lib/dpif-netdev-private-extract.c
+++ b/lib/dpif-netdev-private-extract.c
@@ -173,3 +173,18 @@ dpif_miniflow_extract_autovalidator(struct dp_packet_batch *packets,
/* Always return full hitmask as scalar mfex will always work. */
return (1ULL << cnt) - 1;
}
+
+miniflow_extract_func
+dpif_miniflow_extract_get_default(void)
+{
+
+#ifdef MFEX_AUTOVALIDATOR_DEFAULT
+ ovs_assert(mfex_impls[0].extract_func ==
+ dpif_miniflow_extract_autovalidator);
+ VLOG_INFO("Default miniflow Extract implementation %s \n",
+ mfex_impls[0].name);
+ return mfex_impls[0].extract_func;
+#else
+ return NULL;
+#endif
+}
diff --git a/lib/dpif-netdev-private-extract.h b/lib/dpif-netdev-private-extract.h
index e7b45c2b1..967dc10e7 100644
--- a/lib/dpif-netdev-private-extract.h
+++ b/lib/dpif-netdev-private-extract.h
@@ -129,4 +129,9 @@ mfex_avx512_ipv4_udp(struct dp_packet_batch *packets,
uint32_t keys_size, odp_port_t in_port,
void *pmd_handle);
+/* Retrieve the default miniflow extract or auto-validator
+ * based upon build time configuration choosen by the user. */
+miniflow_extract_func
+dpif_miniflow_extract_get_default(void);
+
#endif /* DPIF_NETDEV_AVX512_EXTRACT */
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index ebdaf33aa..41fc6c09e 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -6250,8 +6250,8 @@ dp_netdev_configure_pmd(struct dp_netdev_pmd_thread *pmd, struct dp_netdev *dp,
/* Initialize DPIF function pointer to the default configured version. */
pmd->netdev_input_func = dp_netdev_impl_get_default();
- /*Init default miniflow_extract function */
- pmd->miniflow_extract_opt = NULL;
+ /* Init default miniflow_extract function */
+ pmd->miniflow_extract_opt = dpif_miniflow_extract_get_default();
/* init the 'flow_cache' since there is no
* actual thread created for NON_PMD_CORE_ID. */
--
2.25.1
More information about the dev
mailing list