test/crypto: rename some tests

[dpdk.git] / app / test-pmd / config.c

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 14be759..593677e 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -68,6 +68,9 @@
 #ifdef RTE_LIBRTE_IXGBE_PMD
 #include <rte_pmd_ixgbe.h>
 #endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+#include <rte_pmd_bnxt.h>
+#endif
 
 #include "testpmd.h"
 
@@ -939,8 +942,11 @@ static const struct {
        MK_FLOW_ITEM(TCP, sizeof(struct rte_flow_item_tcp)),
        MK_FLOW_ITEM(SCTP, sizeof(struct rte_flow_item_sctp)),
        MK_FLOW_ITEM(VXLAN, sizeof(struct rte_flow_item_vxlan)),
+       MK_FLOW_ITEM(E_TAG, sizeof(struct rte_flow_item_e_tag)),
+       MK_FLOW_ITEM(NVGRE, sizeof(struct rte_flow_item_nvgre)),
        MK_FLOW_ITEM(MPLS, sizeof(struct rte_flow_item_mpls)),
        MK_FLOW_ITEM(GRE, sizeof(struct rte_flow_item_gre)),
+       MK_FLOW_ITEM(FUZZY, sizeof(struct rte_flow_item_fuzzy)),
 };
 
 /** Compute storage space needed by item specification. */
@@ -1406,6 +1412,22 @@ port_flow_list(portid_t port_id, uint32_t n, const uint32_t group[n])
        }
 }
 
+/** Restrict ingress traffic to the defined flow rules. */
+int
+port_flow_isolate(portid_t port_id, int set)
+{
+       struct rte_flow_error error;
+
+       /* Poisoning to make sure PMDs update it in case of error. */
+       memset(&error, 0x66, sizeof(error));
+       if (rte_flow_isolate(port_id, set, &error))
+               return port_flow_complain(&error);
+       printf("Ingress traffic on port %u is %s to the defined flow rules\n",
+              port_id,
+              set ? "now restricted" : "not restricted anymore");
+       return 0;
+}
+
 /*
  * RX/TX ring descriptors display functions.
  */
@@ -2979,10 +3001,10 @@ fdir_set_flex_payload(portid_t port_id, struct rte_eth_flex_payload_cfg *cfg)
 
 }
 
-#ifdef RTE_LIBRTE_IXGBE_PMD
 void
 set_vf_traffic(portid_t port_id, uint8_t is_rx, uint16_t vf, uint8_t on)
 {
+#ifdef RTE_LIBRTE_IXGBE_PMD
        int diag;
 
        if (is_rx)
@@ -2992,15 +3014,15 @@ set_vf_traffic(portid_t port_id, uint8_t is_rx, uint16_t vf, uint8_t on)
 
        if (diag == 0)
                return;
-       if(is_rx)
-               printf("rte_pmd_ixgbe_set_vf_rx for port_id=%d failed "
-                       "diag=%d\n", port_id, diag);
-       else
-               printf("rte_pmd_ixgbe_set_vf_tx for port_id=%d failed "
-                       "diag=%d\n", port_id, diag);
-
-}
+       printf("rte_pmd_ixgbe_set_vf_%s for port_id=%d failed diag=%d\n",
+                       is_rx ? "rx" : "tx", port_id, diag);
+       return;
 #endif
+       printf("VF %s setting not supported for port %d\n",
+                       is_rx ? "Rx" : "Tx", port_id);
+       RTE_SET_USED(vf);
+       RTE_SET_USED(on);
+}
 
 int
 set_queue_rate_limit(portid_t port_id, uint16_t queue_idx, uint16_t rate)
@@ -3024,20 +3046,27 @@ set_queue_rate_limit(portid_t port_id, uint16_t queue_idx, uint16_t rate)
        return diag;
 }
 
-#ifdef RTE_LIBRTE_IXGBE_PMD
 int
 set_vf_rate_limit(portid_t port_id, uint16_t vf, uint16_t rate, uint64_t q_msk)
 {
-       int diag;
+       int diag = -ENOTSUP;
 
-       diag = rte_pmd_ixgbe_set_vf_rate_limit(port_id, vf, rate, q_msk);
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       if (diag == -ENOTSUP)
+               diag = rte_pmd_ixgbe_set_vf_rate_limit(port_id, vf, rate,
+                                                      q_msk);
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+       if (diag == -ENOTSUP)
+               diag = rte_pmd_bnxt_set_vf_rate_limit(port_id, vf, rate, q_msk);
+#endif
        if (diag == 0)
                return diag;
-       printf("rte_pmd_ixgbe_set_vf_rate_limit for port_id=%d failed diag=%d\n",
+
+       printf("set_vf_rate_limit for port_id=%d failed diag=%d\n",
                port_id, diag);
        return diag;
 }
-#endif
 
 /*
  * Functions to manage the set of filtered Multicast MAC addresses.
@@ -3280,6 +3309,27 @@ open_ddp_package_file(const char *file_path, uint32_t *size)
        return buf;
 }
 
+int
+save_ddp_package_file(const char *file_path, uint8_t *buf, uint32_t size)
+{
+       FILE *fh = fopen(file_path, "wb");
+
+       if (fh == NULL) {
+               printf("%s: Failed to open %s\n", __func__, file_path);
+               return -1;
+       }
+
+       if (fwrite(buf, 1, size, fh) != size) {
+               fclose(fh);
+               printf("%s: File write operation failed\n", __func__);
+               return -1;
+       }
+
+       fclose(fh);
+
+       return 0;
+}
+
 int
 close_ddp_package_file(uint8_t *buf)
 {