mirror of
https://github.com/openvswitch/ovs
synced 2025-09-01 14:55:18 +00:00
dpif-netdev: Move dpcls lookup structures to .h
This commit moves some data-structures to be available in the dpif-netdev-private.h header. This allows specific implementations of the subtable lookup function to include just that header file, and not require that the code exists in dpif-netdev.c Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com> Tested-by: Malvika Gupta <malvika.gupta@arm.com> Acked-by: Ilya Maximets <i.maximets@samsung.com> Signed-off-by: Ian Stokes <ian.stokes@intel.com>
This commit is contained in:
Harry van Haaren
committed by
Ian Stokes
Ian Stokes
parent
aadede3dda
commit
f5ace7cd8a
@@ -80,6 +80,7 @@ lib_libopenvswitch_la_SOURCES = \
|
||||
lib/dpdk.h \
|
||||
lib/dpif-netdev.c \
|
||||
lib/dpif-netdev.h \
|
||||
lib/dpif-netdev-private.h \
|
||||
lib/dpif-netdev-perf.c \
|
||||
lib/dpif-netdev-perf.h \
|
||||
lib/dpif-provider.h \
|
||||
|
||||
109
lib/dpif-netdev-private.h
Normal file
109
lib/dpif-netdev-private.h
Normal file
@@ -0,0 +1,109 @@
|
||||
/*
|
||||
* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2015 Nicira, Inc.
|
||||
* Copyright (c) 2019 Intel Corperation.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at:
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef DPIF_NETDEV_PRIVATE_H
|
||||
#define DPIF_NETDEV_PRIVATE_H 1
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "dpif.h"
|
||||
#include "cmap.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* Forward declaration for lookup_func typedef. */
|
||||
struct dpcls_subtable;
|
||||
struct dpcls_rule;
|
||||
|
||||
/* Must be public as it is instantiated in subtable struct below. */
|
||||
struct netdev_flow_key {
|
||||
uint32_t hash; /* Hash function differs for different users. */
|
||||
uint32_t len; /* Length of the following miniflow (incl. map). */
|
||||
struct miniflow mf;
|
||||
uint64_t buf[FLOW_MAX_PACKET_U64S];
|
||||
};
|
||||
|
||||
/* A rule to be inserted to the classifier. */
|
||||
struct dpcls_rule {
|
||||
struct cmap_node cmap_node; /* Within struct dpcls_subtable 'rules'. */
|
||||
struct netdev_flow_key *mask; /* Subtable's mask. */
|
||||
struct netdev_flow_key flow; /* Matching key. */
|
||||
/* 'flow' must be the last field, additional space is allocated here. */
|
||||
};
|
||||
|
||||
/* Lookup function for a subtable in the dpcls. This function is called
|
||||
* by each subtable with an array of packets, and a bitmask of packets to
|
||||
* perform the lookup on. Using a function pointer gives flexibility to
|
||||
* optimize the lookup function based on subtable properties and the
|
||||
* CPU instruction set available at runtime.
|
||||
*/
|
||||
typedef
|
||||
uint32_t (*dpcls_subtable_lookup_func)(struct dpcls_subtable *subtable,
|
||||
uint32_t keys_map,
|
||||
const struct netdev_flow_key *keys[],
|
||||
struct dpcls_rule **rules);
|
||||
|
||||
/* Prototype for generic lookup func, using same code path as before. */
|
||||
uint32_t
|
||||
dpcls_subtable_lookup_generic(struct dpcls_subtable *subtable,
|
||||
uint32_t keys_map,
|
||||
const struct netdev_flow_key *keys[],
|
||||
struct dpcls_rule **rules);
|
||||
|
||||
/* A set of rules that all have the same fields wildcarded. */
|
||||
struct dpcls_subtable {
|
||||
/* The fields are only used by writers. */
|
||||
struct cmap_node cmap_node OVS_GUARDED; /* Within dpcls 'subtables_map'. */
|
||||
|
||||
/* These fields are accessed by readers. */
|
||||
struct cmap rules; /* Contains "struct dpcls_rule"s. */
|
||||
uint32_t hit_cnt; /* Number of match hits in subtable in current
|
||||
optimization interval. */
|
||||
|
||||
/* The lookup function to use for this subtable. If there is a known
|
||||
* property of the subtable (eg: only 3 bits of miniflow metadata is
|
||||
* used for the lookup) then this can point at an optimized version of
|
||||
* the lookup function for this particular subtable. */
|
||||
dpcls_subtable_lookup_func lookup_func;
|
||||
|
||||
struct netdev_flow_key mask; /* Wildcards for fields (const). */
|
||||
/* 'mask' must be the last field, additional space is allocated here. */
|
||||
};
|
||||
|
||||
/* Iterate through netdev_flow_key TNL u64 values specified by 'FLOWMAP'. */
|
||||
#define NETDEV_FLOW_KEY_FOR_EACH_IN_FLOWMAP(VALUE, KEY, FLOWMAP) \
|
||||
MINIFLOW_FOR_EACH_IN_FLOWMAP (VALUE, &(KEY)->mf, FLOWMAP)
|
||||
|
||||
/* Generates a mask for each bit set in the subtable's miniflow. */
|
||||
void
|
||||
netdev_flow_key_gen_masks(const struct netdev_flow_key *tbl,
|
||||
uint64_t *mf_masks,
|
||||
const uint32_t mf_bits_u0,
|
||||
const uint32_t mf_bits_u1);
|
||||
|
||||
/* Matches a dpcls rule against the incoming packet in 'target' */
|
||||
bool dpcls_rule_matches_key(const struct dpcls_rule *rule,
|
||||
const struct netdev_flow_key *target);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* netdev-private.h */
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
#include <config.h>
|
||||
#include "dpif-netdev.h"
|
||||
#include "dpif-netdev-private.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
@@ -128,15 +129,6 @@ static struct odp_support dp_netdev_support = {
|
||||
.ct_orig_tuple6 = true,
|
||||
};
|
||||
|
||||
/* Stores a miniflow with inline values */
|
||||
|
||||
struct netdev_flow_key {
|
||||
uint32_t hash; /* Hash function differs for different users. */
|
||||
uint32_t len; /* Length of the following miniflow (incl. map). */
|
||||
struct miniflow mf;
|
||||
uint64_t buf[FLOW_MAX_PACKET_U64S];
|
||||
};
|
||||
|
||||
/* EMC cache and SMC cache compose the datapath flow cache (DFC)
|
||||
*
|
||||
* Exact match cache for frequently used flows
|
||||
@@ -243,14 +235,6 @@ struct dpcls {
|
||||
struct pvector subtables;
|
||||
};
|
||||
|
||||
/* A rule to be inserted to the classifier. */
|
||||
struct dpcls_rule {
|
||||
struct cmap_node cmap_node; /* Within struct dpcls_subtable 'rules'. */
|
||||
struct netdev_flow_key *mask; /* Subtable's mask. */
|
||||
struct netdev_flow_key flow; /* Matching key. */
|
||||
/* 'flow' must be the last field, additional space is allocated here. */
|
||||
};
|
||||
|
||||
/* Data structure to keep packet order till fastpath processing. */
|
||||
struct dp_packet_flow_map {
|
||||
struct dp_packet *packet;
|
||||
@@ -268,7 +252,7 @@ static bool dpcls_lookup(struct dpcls *cls,
|
||||
const struct netdev_flow_key *keys[],
|
||||
struct dpcls_rule **rules, size_t cnt,
|
||||
int *num_lookups_p);
|
||||
static bool dpcls_rule_matches_key(const struct dpcls_rule *rule,
|
||||
bool dpcls_rule_matches_key(const struct dpcls_rule *rule,
|
||||
const struct netdev_flow_key *target);
|
||||
/* Set of supported meter flags */
|
||||
#define DP_SUPPORTED_METER_FLAGS_MASK \
|
||||
@@ -2784,10 +2768,6 @@ netdev_flow_key_init_masked(struct netdev_flow_key *dst,
|
||||
(dst_u64 - miniflow_get_values(&dst->mf)) * 8);
|
||||
}
|
||||
|
||||
/* Iterate through netdev_flow_key TNL u64 values specified by 'FLOWMAP'. */
|
||||
#define NETDEV_FLOW_KEY_FOR_EACH_IN_FLOWMAP(VALUE, KEY, FLOWMAP) \
|
||||
MINIFLOW_FOR_EACH_IN_FLOWMAP(VALUE, &(KEY)->mf, FLOWMAP)
|
||||
|
||||
/* Returns a hash value for the bits of 'key' where there are 1-bits in
|
||||
* 'mask'. */
|
||||
static inline uint32_t
|
||||
@@ -7683,48 +7663,6 @@ dpif_dummy_register(enum dummy_level level)
|
||||
|
||||
/* Datapath Classifier. */
|
||||
|
||||
/* Forward declaration for lookup_func typedef. */
|
||||
struct dpcls_subtable;
|
||||
|
||||
/* Lookup function for a subtable in the dpcls. This function is called
|
||||
* by each subtable with an array of packets, and a bitmask of packets to
|
||||
* perform the lookup on. Using a function pointer gives flexibility to
|
||||
* optimize the lookup function based on subtable properties and the
|
||||
* CPU instruction set available at runtime.
|
||||
*/
|
||||
typedef
|
||||
uint32_t (*dpcls_subtable_lookup_func)(struct dpcls_subtable *subtable,
|
||||
uint32_t keys_map,
|
||||
const struct netdev_flow_key *keys[],
|
||||
struct dpcls_rule **rules);
|
||||
|
||||
/* Prototype for generic lookup func, using same code path as before. */
|
||||
uint32_t
|
||||
dpcls_subtable_lookup_generic(struct dpcls_subtable *subtable,
|
||||
uint32_t keys_map,
|
||||
const struct netdev_flow_key *keys[],
|
||||
struct dpcls_rule **rules);
|
||||
|
||||
/* A set of rules that all have the same fields wildcarded. */
|
||||
struct dpcls_subtable {
|
||||
/* The fields are only used by writers. */
|
||||
struct cmap_node cmap_node OVS_GUARDED; /* Within dpcls 'subtables_map'. */
|
||||
|
||||
/* These fields are accessed by readers. */
|
||||
struct cmap rules; /* Contains "struct dpcls_rule"s. */
|
||||
uint32_t hit_cnt; /* Number of match hits in subtable in current
|
||||
optimization interval. */
|
||||
|
||||
/* The lookup function to use for this subtable. If there is a known
|
||||
* property of the subtable (eg: only 3 bits of miniflow metadata is
|
||||
* used for the lookup) then this can point at an optimized version of
|
||||
* the lookup function for this particular subtable. */
|
||||
dpcls_subtable_lookup_func lookup_func;
|
||||
|
||||
struct netdev_flow_key mask; /* Wildcards for fields (const). */
|
||||
/* 'mask' must be the last field, additional space is allocated here. */
|
||||
};
|
||||
|
||||
static void
|
||||
dpcls_subtable_destroy_cb(struct dpcls_subtable *subtable)
|
||||
{
|
||||
@@ -7928,7 +7866,7 @@ dpcls_remove(struct dpcls *cls, struct dpcls_rule *rule)
|
||||
|
||||
/* Returns true if 'target' satisfies 'key' in 'mask', that is, if each 1-bit
|
||||
* in 'mask' the values in 'key' and 'target' are the same. */
|
||||
static bool
|
||||
bool
|
||||
dpcls_rule_matches_key(const struct dpcls_rule *rule,
|
||||
const struct netdev_flow_key *target)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user