test/crypto: add IPsec AES-CTR cases

[dpdk.git] / app / test / test_bpf.c

diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c
index ef861d0..2d755a8 100644 (file)
--- a/app/test/test_bpf.c
+++ b/app/test/test_bpf.c
@@ -23,7 +23,7 @@
 /*
  * Basic functional tests for librte_bpf.
  * The main procedure - load eBPF program, execute it and
- * compare restuls with expected values.
+ * compare results with expected values.
  */
 
 struct dummy_offset {
@@ -1569,32 +1569,32 @@ test_xadd1_check(uint64_t rc, const void *arg)
        memset(&dfe, 0, sizeof(dfe));
 
        rv = 1;
-       rte_atomic32_add((rte_atomic32_t *)&dfe.u32, rv);
-       rte_atomic64_add((rte_atomic64_t *)&dfe.u64, rv);
+       __atomic_fetch_add(&dfe.u32, rv, __ATOMIC_RELAXED);
+       __atomic_fetch_add(&dfe.u64, rv, __ATOMIC_RELAXED);
 
        rv = -1;
-       rte_atomic32_add((rte_atomic32_t *)&dfe.u32, rv);
-       rte_atomic64_add((rte_atomic64_t *)&dfe.u64, rv);
+       __atomic_fetch_add(&dfe.u32, rv, __ATOMIC_RELAXED);
+       __atomic_fetch_add(&dfe.u64, rv, __ATOMIC_RELAXED);
 
        rv = (int32_t)TEST_FILL_1;
-       rte_atomic32_add((rte_atomic32_t *)&dfe.u32, rv);
-       rte_atomic64_add((rte_atomic64_t *)&dfe.u64, rv);
+       __atomic_fetch_add(&dfe.u32, rv, __ATOMIC_RELAXED);
+       __atomic_fetch_add(&dfe.u64, rv, __ATOMIC_RELAXED);
 
        rv = TEST_MUL_1;
-       rte_atomic32_add((rte_atomic32_t *)&dfe.u32, rv);
-       rte_atomic64_add((rte_atomic64_t *)&dfe.u64, rv);
+       __atomic_fetch_add(&dfe.u32, rv, __ATOMIC_RELAXED);
+       __atomic_fetch_add(&dfe.u64, rv, __ATOMIC_RELAXED);
 
        rv = TEST_MUL_2;
-       rte_atomic32_add((rte_atomic32_t *)&dfe.u32, rv);
-       rte_atomic64_add((rte_atomic64_t *)&dfe.u64, rv);
+       __atomic_fetch_add(&dfe.u32, rv, __ATOMIC_RELAXED);
+       __atomic_fetch_add(&dfe.u64, rv, __ATOMIC_RELAXED);
 
        rv = TEST_JCC_2;
-       rte_atomic32_add((rte_atomic32_t *)&dfe.u32, rv);
-       rte_atomic64_add((rte_atomic64_t *)&dfe.u64, rv);
+       __atomic_fetch_add(&dfe.u32, rv, __ATOMIC_RELAXED);
+       __atomic_fetch_add(&dfe.u64, rv, __ATOMIC_RELAXED);
 
        rv = TEST_JCC_3;
-       rte_atomic32_add((rte_atomic32_t *)&dfe.u32, rv);
-       rte_atomic64_add((rte_atomic64_t *)&dfe.u64, rv);
+       __atomic_fetch_add(&dfe.u32, rv, __ATOMIC_RELAXED);
+       __atomic_fetch_add(&dfe.u64, rv, __ATOMIC_RELAXED);
 
        return cmp_res(__func__, 1, rc, &dfe, dft, sizeof(dfe));
 }
@@ -2407,7 +2407,7 @@ static const struct ebpf_insn test_call5_prog[] = {
        },
 };
 
-/* String comparision impelementation, return 0 if equal else difference */
+/* String comparison implementation, return 0 if equal else difference */
 static uint32_t
 dummy_func5(const char *s1, const char *s2)
 {
@@ -2707,7 +2707,7 @@ test_ld_mbuf1_check(uint64_t rc, const void *arg)
 }
 
 /*
- * same as ld_mbuf1, but then trancate the mbuf by 1B,
+ * same as ld_mbuf1, but then truncate the mbuf by 1B,
  * so load of last 4B fail.
  */
 static void
@@ -3250,7 +3250,7 @@ test_bpf(void)
 
 REGISTER_TEST_COMMAND(bpf_autotest, test_bpf);
 
-#ifdef RTE_PORT_PCAP
+#ifdef RTE_HAS_LIBPCAP
 #include <pcap/pcap.h>
 
 static void
@@ -3359,8 +3359,8 @@ static const char * const sample_filters[] = {
        "dst net 192.168.0.0/24",
        "dst net 192.168.0.0 mask 255.255.255.0",
        "port 53",
-       "host dpdk.org and not (port 80 or port 25)",
-       "host dpdk.org and not port 80 and not port 25",
+       "host 192.0.2.1 and not (port 80 or port 25)",
+       "host 2001:4b98:db0::8 and not port 80 and not port 25",
        "port not 53 and not arp",
        "(tcp[0:2] > 1500 and tcp[0:2] < 1550) or (tcp[2:2] > 1500 and tcp[2:2] < 1550)",
        "ether proto 0x888e",
@@ -3447,4 +3447,4 @@ test_bpf_convert(void)
 }
 
 REGISTER_TEST_COMMAND(bpf_convert_autotest, test_bpf_convert);
-#endif /* RTE_PORT_PCAP */
+#endif /* RTE_HAS_LIBPCAP */