examples/fips_validation: support self-test only

[dpdk.git] / lib / librte_acl / acl_run_scalar.c

diff --git a/lib/librte_acl/acl_run_scalar.c b/lib/librte_acl/acl_run_scalar.c
index 40691ce..3d61e79 100644 (file)
--- a/lib/librte_acl/acl_run_scalar.c
+++ b/lib/librte_acl/acl_run_scalar.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include "acl_run.h"
@@ -147,10 +118,6 @@ rte_acl_classify_scalar(const struct rte_acl_ctx *ctx, const uint8_t **data,
        struct completion cmplt[MAX_SEARCHES_SCALAR];
        struct parms parms[MAX_SEARCHES_SCALAR];
 
-       if (categories != 1 &&
-               ((RTE_ACL_RESULTS_MULTIPLIER - 1) & categories) != 0)
-               return -EINVAL;
-
        acl_set_flow(&flows, cmplt, RTE_DIM(cmplt), data, results, num,
                categories, ctx->trans_table);
 
@@ -162,31 +129,34 @@ rte_acl_classify_scalar(const struct rte_acl_ctx *ctx, const uint8_t **data,
        transition0 = index_array[0];
        transition1 = index_array[1];
 
+       while ((transition0 | transition1) & RTE_ACL_NODE_MATCH) {
+               transition0 = acl_match_check(transition0,
+                       0, ctx, parms, &flows, resolve_priority_scalar);
+               transition1 = acl_match_check(transition1,
+                       1, ctx, parms, &flows, resolve_priority_scalar);
+       }
+
        while (flows.started > 0) {
 
                input0 = GET_NEXT_4BYTES(parms, 0);
                input1 = GET_NEXT_4BYTES(parms, 1);
 
                for (n = 0; n < 4; n++) {
-                       if (likely((transition0 & RTE_ACL_NODE_MATCH) == 0))
-                               transition0 = scalar_transition(flows.trans,
-                                       transition0, (uint8_t)input0);
 
+                       transition0 = scalar_transition(flows.trans,
+                               transition0, (uint8_t)input0);
                        input0 >>= CHAR_BIT;
 
-                       if (likely((transition1 & RTE_ACL_NODE_MATCH) == 0))
-                               transition1 = scalar_transition(flows.trans,
-                                       transition1, (uint8_t)input1);
-
+                       transition1 = scalar_transition(flows.trans,
+                               transition1, (uint8_t)input1);
                        input1 >>= CHAR_BIT;
-
                }
-               if ((transition0 | transition1) & RTE_ACL_NODE_MATCH) {
+
+               while ((transition0 | transition1) & RTE_ACL_NODE_MATCH) {
                        transition0 = acl_match_check(transition0,
                                0, ctx, parms, &flows, resolve_priority_scalar);
                        transition1 = acl_match_check(transition1,
                                1, ctx, parms, &flows, resolve_priority_scalar);
-
                }
        }
        return 0;